[Piglit] [PATCH 1/3] tests: mark KHR_no_error incompatible tests
Timothy Arceri
tarceri at itsqueeze.com
Sat May 13 06:38:43 UTC 2017
There is still a huge number of tests to classify but this gives us
a good number of tests to start testing with.
---
Depends on [1]
[1] https://patchwork.freedesktop.org/series/24332/
tests/shaders/vp-bad-program.c | 1 +
tests/spec/arb_es2_compatibility/arb_es2_compatibility-fixed-type.c | 1 +
tests/spec/arb_vertex_type_10f_11f_11f_rev/api-errors.c | 1 +
tests/spec/gl-1.0/beginend-coverage.c | 1 +
tests/spec/gl-1.0/dlist-beginend.c | 1 +
tests/spec/gl-1.4/multidrawarrays-errors.c | 1 +
tests/texturing/copyteximage.c | 1 +
7 files changed, 7 insertions(+)
diff --git a/tests/shaders/vp-bad-program.c b/tests/shaders/vp-bad-program.c
index 284192b..784ff45 100644
--- a/tests/shaders/vp-bad-program.c
+++ b/tests/shaders/vp-bad-program.c
@@ -34,20 +34,21 @@
* Wine likes to do that to us to see how strict we are on the VP language.
*/
#include "piglit-util-gl.h"
PIGLIT_GL_TEST_CONFIG_BEGIN
config.supports_gl_compat_version = 10;
config.window_visual = PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_DOUBLE;
+ config.khr_no_error_support = PIGLIT_HAS_ERRORS;
PIGLIT_GL_TEST_CONFIG_END
enum piglit_result
piglit_display(void)
{
static const char *badprog =
"!!ARBvp1.0\n"
"NOTANOPCODE;\n"
"MOV result.position, vertex.position;\n";
diff --git a/tests/spec/arb_es2_compatibility/arb_es2_compatibility-fixed-type.c b/tests/spec/arb_es2_compatibility/arb_es2_compatibility-fixed-type.c
index 44d76b8..1fbc41c 100644
--- a/tests/spec/arb_es2_compatibility/arb_es2_compatibility-fixed-type.c
+++ b/tests/spec/arb_es2_compatibility/arb_es2_compatibility-fixed-type.c
@@ -25,20 +25,21 @@
#include "piglit-util-gl.h"
#include <stdarg.h>
PIGLIT_GL_TEST_CONFIG_BEGIN
config.supports_gl_compat_version = 10;
config.window_width = 250;
config.window_height = 250;
config.window_visual = PIGLIT_GL_VISUAL_RGBA | PIGLIT_GL_VISUAL_DOUBLE;
+ config.khr_no_error_support = PIGLIT_HAS_ERRORS;
PIGLIT_GL_TEST_CONFIG_END
static unsigned verts[4*4*4];
static unsigned opos[8] = {
50, 50,
150, 50,
50, 150,
150, 150
diff --git a/tests/spec/arb_vertex_type_10f_11f_11f_rev/api-errors.c b/tests/spec/arb_vertex_type_10f_11f_11f_rev/api-errors.c
index a50470c..5f47f19 100644
--- a/tests/spec/arb_vertex_type_10f_11f_11f_rev/api-errors.c
+++ b/tests/spec/arb_vertex_type_10f_11f_11f_rev/api-errors.c
@@ -25,20 +25,21 @@
* \file api-errors.c
*
* This tests a few error conditions from the ARB_vertex_type_10f_11f_11f_rev extension.
*/
#include "piglit-util-gl.h"
PIGLIT_GL_TEST_CONFIG_BEGIN
config.supports_gl_compat_version = 20;
config.window_visual = PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_DOUBLE;
+ config.khr_no_error_support = PIGLIT_HAS_ERRORS;
PIGLIT_GL_TEST_CONFIG_END
enum piglit_result
piglit_display()
{
return PIGLIT_FAIL; /* unreached */
}
#define TEST(name, err) \
diff --git a/tests/spec/gl-1.0/beginend-coverage.c b/tests/spec/gl-1.0/beginend-coverage.c
index bb704f8..d36cc11 100644
--- a/tests/spec/gl-1.0/beginend-coverage.c
+++ b/tests/spec/gl-1.0/beginend-coverage.c
@@ -44,20 +44,21 @@
* in the error INVALID OPERATION."
*/
#include "piglit-util-gl.h"
PIGLIT_GL_TEST_CONFIG_BEGIN
config.supports_gl_compat_version = 10;
config.window_visual = PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_RGBA;
+ config.khr_no_error_support = PIGLIT_HAS_ERRORS;
PIGLIT_GL_TEST_CONFIG_END
struct test {
const char *name;
void (*func)(void);
};
static uint32_t junk_storage[1024];
static void *junk = junk_storage;
diff --git a/tests/spec/gl-1.0/dlist-beginend.c b/tests/spec/gl-1.0/dlist-beginend.c
index 733376a..644b84c 100644
--- a/tests/spec/gl-1.0/dlist-beginend.c
+++ b/tests/spec/gl-1.0/dlist-beginend.c
@@ -24,20 +24,21 @@
/**
* Test some tricky cases of display lists and glBegin/End.
*/
#include "piglit-util-gl.h"
PIGLIT_GL_TEST_CONFIG_BEGIN
config.supports_gl_compat_version = 11;
config.window_visual = PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_RGBA;
+ config.khr_no_error_support = PIGLIT_HAS_ERRORS;
PIGLIT_GL_TEST_CONFIG_END
static const GLfloat red[] = {1.0, 0.0, 0.0, 1.0};
static const GLfloat green[] = {0.0, 1.0, 0.0, 1.0};
static const GLfloat black[] = {0.0, 0.0, 0.0, 0.0};
static bool
test_call_list_inside_begin_end(void)
diff --git a/tests/spec/gl-1.4/multidrawarrays-errors.c b/tests/spec/gl-1.4/multidrawarrays-errors.c
index 980925a..0dbe3c0 100644
--- a/tests/spec/gl-1.4/multidrawarrays-errors.c
+++ b/tests/spec/gl-1.4/multidrawarrays-errors.c
@@ -27,20 +27,21 @@
*
* Based loosely on dlist-multidrawarrays.c.
*/
#include "piglit-util-gl.h"
PIGLIT_GL_TEST_CONFIG_BEGIN
config.supports_gl_compat_version = 14;
config.window_visual = PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_RGBA;
+ config.khr_no_error_support = PIGLIT_HAS_ERRORS;
PIGLIT_GL_TEST_CONFIG_END
static const float verts[][2] = {
{ -1.0f, -1.0f },
{ 1.0f, -1.0f },
{ 1.0f, 1.0f },
{ -1.0f, 1.0f }
};
diff --git a/tests/texturing/copyteximage.c b/tests/texturing/copyteximage.c
index 6311bdf..3e8d81e 100644
--- a/tests/texturing/copyteximage.c
+++ b/tests/texturing/copyteximage.c
@@ -110,20 +110,21 @@ static const struct {
static int test_target = -1;
PIGLIT_GL_TEST_CONFIG_BEGIN
config.supports_gl_compat_version = 10;
config.window_width = IMAGE_SIZE*(ARRAY_SIZE(test_vectors)+1);
config.window_height = IMAGE_SIZE;
config.window_visual = PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_RGBA |
PIGLIT_GL_VISUAL_DEPTH | PIGLIT_GL_VISUAL_STENCIL;
+ config.khr_no_error_support = PIGLIT_HAS_ERRORS;
PIGLIT_GL_TEST_CONFIG_END
static const char array1D_shader_text[] =
"#extension GL_EXT_texture_array: require\n"
"uniform sampler1DArray s;\n"
"void main()\n"
"{\n"
" gl_FragColor = texture1DArray(s, gl_TexCoord[0].xy);\n"
"}\n"
--
2.9.3
More information about the Piglit
mailing list