--- tests/spec/gl-3.2/layered-rendering/blit.c | 1 + tests/spec/gl-3.2/layered-rendering/clear-color-all-types.c | 1 + .../layered-rendering/clear-color-mismatched-layer-count.c | 1 + tests/spec/gl-3.2/layered-rendering/clear-color.c | 1 + tests/spec/gl-3.2/layered-rendering/clear-depth.c | 1 + .../layered-rendering/framebuffer-layer-attachment-mismatch.c | 1 + .../spec/gl-3.2/layered-rendering/framebuffer-layer-complete.c | 1 + .../layered-rendering/framebuffer-layer-count-mismatch.c | 1 + .../gl-3.2/layered-rendering/framebuffer-layered-attachments.c | 1 + .../layered-rendering/framebuffertexture-buffer-textures.c | 10 +++++++--- .../gl-3.2/layered-rendering/framebuffertexture-defaults.c | 1 + tests/spec/gl-3.2/layered-rendering/framebuffertexture.c | 1 + tests/spec/gl-3.2/layered-rendering/gl-layer-cube-map.c | 1 + tests/spec/gl-3.2/layered-rendering/gl-layer-not-layered.c | 1 + tests/spec/gl-3.2/layered-rendering/gl-layer-render-clipped.c | 1 + tests/spec/gl-3.2/layered-rendering/gl-layer-render-storage.c | 1 + tests/spec/gl-3.2/layered-rendering/gl-layer-render.c | 1 + tests/spec/gl-3.2/layered-rendering/gl-layer.c | 1 + tests/spec/gl-3.2/layered-rendering/readpixels.c | 1 + 19 files changed, 25 insertions(+), 3 deletions(-)
diff --git a/tests/spec/gl-3.2/layered-rendering/blit.c b/tests/spec/gl-3.2/layered-rendering/blit.c index e5d865e..db17124 100644 --- a/tests/spec/gl-3.2/layered-rendering/blit.c +++ b/tests/spec/gl-3.2/layered-rendering/blit.c @@ -49,20 +49,21 @@ * *---*---* */ #include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN config.supports_gl_compat_version = 32; config.supports_gl_core_version = 32; config.window_visual = PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_DOUBLE; + config.khr_no_error_support = PIGLIT_NO_ERRORS; PIGLIT_GL_TEST_CONFIG_END /* Values Set in piglit init */ static const int texWidth = 32; static const int texHeight = 32; static const int texDepth = 2; static const float srcColors[2][3] = { {0.5, 0.4, 0.3}, {0, 1, 0} diff --git a/tests/spec/gl-3.2/layered-rendering/clear-color-all-types.c b/tests/spec/gl-3.2/layered-rendering/clear-color-all-types.c index 403bc04..bc1d0fd 100644 --- a/tests/spec/gl-3.2/layered-rendering/clear-color-all-types.c +++ b/tests/spec/gl-3.2/layered-rendering/clear-color-all-types.c @@ -64,20 +64,21 @@ #define TEX_LEVELS 6 #define TEX_SIZE (1 << (TEX_LEVELS - 1)) #define TEX_DEPTH 4 PIGLIT_GL_TEST_CONFIG_BEGIN config.supports_gl_compat_version = 32; config.supports_gl_core_version = 32; config.window_visual = PIGLIT_GL_VISUAL_RGBA | PIGLIT_GL_VISUAL_DOUBLE; + config.khr_no_error_support = PIGLIT_NO_ERRORS; PIGLIT_GL_TEST_CONFIG_END static GLenum texture_type; static int num_layers; static int layer_height; static GLuint probe_fbo = 0; static bool mipmapped; static int num_miplevels; diff --git a/tests/spec/gl-3.2/layered-rendering/clear-color-mismatched-layer-count.c b/tests/spec/gl-3.2/layered-rendering/clear-color-mismatched-layer-count.c index 63a43f3..d9b2cd5 100644 --- a/tests/spec/gl-3.2/layered-rendering/clear-color-mismatched-layer-count.c +++ b/tests/spec/gl-3.2/layered-rendering/clear-color-mismatched-layer-count.c @@ -47,20 +47,21 @@ #include "piglit-util-gl.h" #include "piglit-util.h" #define TEX_SIZE 128 PIGLIT_GL_TEST_CONFIG_BEGIN config.supports_gl_compat_version = 32; config.supports_gl_core_version = 32; config.window_visual = PIGLIT_GL_VISUAL_RGBA | PIGLIT_GL_VISUAL_DOUBLE; + config.khr_no_error_support = PIGLIT_NO_ERRORS; PIGLIT_GL_TEST_CONFIG_END static void check_completeness(const char *when, GLenum target) { GLenum fbstatus = glCheckFramebufferStatus(target); if (fbstatus != GL_FRAMEBUFFER_COMPLETE) { printf("Framebuffer incomplete when %s: %s\n", when, diff --git a/tests/spec/gl-3.2/layered-rendering/clear-color.c b/tests/spec/gl-3.2/layered-rendering/clear-color.c index 31233e3..32572b0 100644 --- a/tests/spec/gl-3.2/layered-rendering/clear-color.c +++ b/tests/spec/gl-3.2/layered-rendering/clear-color.c @@ -43,20 +43,21 @@ */ #include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN config.supports_gl_compat_version = 32; config.supports_gl_core_version = 32; config.window_visual = PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_DOUBLE; + config.khr_no_error_support = PIGLIT_NO_ERRORS; PIGLIT_GL_TEST_CONFIG_END static GLuint fbo[2]; static GLuint texture[2]; static const int layers = 3; bool display_layered_texture(int x, int y, int w, int h, int texWidth, int texHeight, GLenum textureType, GLuint texture, int layers) { diff --git a/tests/spec/gl-3.2/layered-rendering/clear-depth.c b/tests/spec/gl-3.2/layered-rendering/clear-depth.c index fb4b237..b58fcce 100644 --- a/tests/spec/gl-3.2/layered-rendering/clear-depth.c +++ b/tests/spec/gl-3.2/layered-rendering/clear-depth.c @@ -43,20 +43,21 @@ * Result: * Layer 1-4 of both tex1 and tex2 should be the clearDepth */ #include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN config.supports_gl_compat_version = 32; config.supports_gl_core_version = 32; + config.khr_no_error_support = PIGLIT_NO_ERRORS; PIGLIT_GL_TEST_CONFIG_END const char *vs_source = { "#version 150\n" "in vec4 piglit_vertex;\n" "void main()\n" "{\n" " gl_Position = piglit_vertex;\n" "}\n" diff --git a/tests/spec/gl-3.2/layered-rendering/framebuffer-layer-attachment-mismatch.c b/tests/spec/gl-3.2/layered-rendering/framebuffer-layer-attachment-mismatch.c index 67bfea2..b56818f 100644 --- a/tests/spec/gl-3.2/layered-rendering/framebuffer-layer-attachment-mismatch.c +++ b/tests/spec/gl-3.2/layered-rendering/framebuffer-layer-attachment-mismatch.c @@ -38,20 +38,21 @@ * by using a cube map texture and a 2D array texture containing 6 * layers. */ #include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN config.supports_gl_compat_version = 32; config.supports_gl_core_version = 32; + config.khr_no_error_support = PIGLIT_NO_ERRORS; PIGLIT_GL_TEST_CONFIG_END #define TEX_SIZE 32 static const GLenum cube_map_faces[6] = { GL_TEXTURE_CUBE_MAP_POSITIVE_X, GL_TEXTURE_CUBE_MAP_NEGATIVE_X, diff --git a/tests/spec/gl-3.2/layered-rendering/framebuffer-layer-complete.c b/tests/spec/gl-3.2/layered-rendering/framebuffer-layer-complete.c index ea12a04..95fdcb0 100644 --- a/tests/spec/gl-3.2/layered-rendering/framebuffer-layer-complete.c +++ b/tests/spec/gl-3.2/layered-rendering/framebuffer-layer-complete.c @@ -29,20 +29,21 @@ * layered. Additionally, all populated color attachments must be from textures * of the same target. */ #include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN config.supports_gl_compat_version = 32; config.supports_gl_core_version = 32; + config.khr_no_error_support = PIGLIT_NO_ERRORS; PIGLIT_GL_TEST_CONFIG_END const int texWidth = 30; const int texHeight = 30; const int texDepth = 2; GLuint create_bind_texture(GLenum textureType) { GLuint texture; diff --git a/tests/spec/gl-3.2/layered-rendering/framebuffer-layer-count-mismatch.c b/tests/spec/gl-3.2/layered-rendering/framebuffer-layer-count-mismatch.c index de9aae4..47a0e3a 100644 --- a/tests/spec/gl-3.2/layered-rendering/framebuffer-layer-count-mismatch.c +++ b/tests/spec/gl-3.2/layered-rendering/framebuffer-layer-count-mismatch.c @@ -51,20 +51,21 @@ * This test verifies that a framebuffer is considered complete even * if two different attachments have different layer counts. */ #include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN config.supports_gl_compat_version = 32; config.supports_gl_core_version = 32; + config.khr_no_error_support = PIGLIT_NO_ERRORS; PIGLIT_GL_TEST_CONFIG_END #define TEX_SIZE 32 void piglit_init(int argc, char **argv) { diff --git a/tests/spec/gl-3.2/layered-rendering/framebuffer-layered-attachments.c b/tests/spec/gl-3.2/layered-rendering/framebuffer-layered-attachments.c index 79f4e54..ea466e8 100644 --- a/tests/spec/gl-3.2/layered-rendering/framebuffer-layered-attachments.c +++ b/tests/spec/gl-3.2/layered-rendering/framebuffer-layered-attachments.c @@ -44,20 +44,21 @@ * texture, the texture level attached to the framebuffer attachment point is * an array of images, and the framebuffer attachment is considered layered. */ #include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN config.supports_gl_compat_version = 32; config.supports_gl_core_version = 32; + config.khr_no_error_support = PIGLIT_NO_ERRORS; PIGLIT_GL_TEST_CONFIG_END GLenum textureType[] = { GL_TEXTURE_3D, GL_TEXTURE_CUBE_MAP, GL_TEXTURE_1D_ARRAY, GL_TEXTURE_2D_ARRAY, GL_TEXTURE_2D_MULTISAMPLE_ARRAY }; diff --git a/tests/spec/gl-3.2/layered-rendering/framebuffertexture-buffer-textures.c b/tests/spec/gl-3.2/layered-rendering/framebuffertexture-buffer-textures.c index 936a9c4..4c565a3 100644 --- a/tests/spec/gl-3.2/layered-rendering/framebuffertexture-buffer-textures.c +++ b/tests/spec/gl-3.2/layered-rendering/framebuffertexture-buffer-textures.c @@ -28,20 +28,21 @@ * An INVALID_OPERATION error is generated if texture is the name * of a buffer texture. */ #include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN config.supports_gl_compat_version = 32; config.supports_gl_core_version = 32; + config.khr_no_error_support = PIGLIT_NO_ERRORS; PIGLIT_GL_TEST_CONFIG_END void piglit_init(int argc, char **argv) { bool pass = true; GLuint fbo, buff, tex; glGenFramebuffers(1, &fbo); @@ -50,24 +51,27 @@ piglit_init(int argc, char **argv) glGenBuffers(1, &buff); glBindBuffer(GL_TEXTURE_BUFFER, buff); glGenTextures(1, &tex); glBindTexture(GL_TEXTURE_BUFFER, tex); glTexBuffer(GL_TEXTURE_BUFFER, GL_RG32F, buff); pass = piglit_check_gl_error(GL_NO_ERROR) && pass; - /* Try to attach the buffer texture to the framebuffer */ - glFramebufferTexture(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, tex, 0); + if (!piglit_khr_no_error) { + /* Try to attach the buffer texture to the framebuffer */ + glFramebufferTexture(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, + tex, 0); - pass = piglit_check_gl_error(GL_INVALID_OPERATION) && pass; + pass = piglit_check_gl_error(GL_INVALID_OPERATION) && pass; + } piglit_report_result(pass ? PIGLIT_PASS : PIGLIT_FAIL); } enum piglit_result piglit_display(void) { /* UNREACHABLE! */ return PIGLIT_FAIL; } diff --git a/tests/spec/gl-3.2/layered-rendering/framebuffertexture-defaults.c b/tests/spec/gl-3.2/layered-rendering/framebuffertexture-defaults.c index a8b4e3e..4c9e47b 100644 --- a/tests/spec/gl-3.2/layered-rendering/framebuffertexture-defaults.c +++ b/tests/spec/gl-3.2/layered-rendering/framebuffertexture-defaults.c @@ -35,20 +35,21 @@ * of the attachment point specified by attachment are set to their default * values listed in table 6.23. */ #include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN config.supports_gl_compat_version = 32; config.supports_gl_core_version = 32; + config.khr_no_error_support = PIGLIT_NO_ERRORS; PIGLIT_GL_TEST_CONFIG_END bool check_texture_parameters(GLenum objType, int objName, int level, int layer, int layered) { int objectType = -1; int objectName = -1; int textureLevel = -1; int textureLayer = -1; int textureLayered = -1; diff --git a/tests/spec/gl-3.2/layered-rendering/framebuffertexture.c b/tests/spec/gl-3.2/layered-rendering/framebuffertexture.c index 88599de..6d11d7e 100644 --- a/tests/spec/gl-3.2/layered-rendering/framebuffertexture.c +++ b/tests/spec/gl-3.2/layered-rendering/framebuffertexture.c @@ -39,20 +39,21 @@ * texture, the texture level attached to the framebuffer attachment point * is an array of images, and the framebuffer attachment is considered layered." */ #include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN config.supports_gl_compat_version = 32; config.supports_gl_core_version = 32; + config.khr_no_error_support = PIGLIT_NO_ERRORS; PIGLIT_GL_TEST_CONFIG_END GLenum textureType[] = { GL_TEXTURE_1D, GL_TEXTURE_1D_ARRAY, GL_TEXTURE_2D, GL_TEXTURE_2D_ARRAY, GL_TEXTURE_2D_MULTISAMPLE, GL_TEXTURE_2D_MULTISAMPLE_ARRAY, diff --git a/tests/spec/gl-3.2/layered-rendering/gl-layer-cube-map.c b/tests/spec/gl-3.2/layered-rendering/gl-layer-cube-map.c index 167109d..bd3134a 100644 --- a/tests/spec/gl-3.2/layered-rendering/gl-layer-cube-map.c +++ b/tests/spec/gl-3.2/layered-rendering/gl-layer-cube-map.c @@ -36,20 +36,21 @@ * 4 TEXTURE_CUBE_MAP_POSITIVE_Z * 5 TEXTURE_CUBE_MAP_NEGATIVE_Z */ #include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN config.supports_gl_compat_version = 32; config.supports_gl_core_version = 32; + config.khr_no_error_support = PIGLIT_NO_ERRORS; PIGLIT_GL_TEST_CONFIG_END const char *vs_source = { "#version 150\n" "in vec4 piglit_vertex;\n" "out vec4 vert;\n" "void main() {\n" " gl_Position = piglit_vertex;\n" " vert = piglit_vertex;\n" diff --git a/tests/spec/gl-3.2/layered-rendering/gl-layer-not-layered.c b/tests/spec/gl-3.2/layered-rendering/gl-layer-not-layered.c index f57e7e7..1b288fa 100644 --- a/tests/spec/gl-3.2/layered-rendering/gl-layer-not-layered.c +++ b/tests/spec/gl-3.2/layered-rendering/gl-layer-not-layered.c @@ -29,20 +29,21 @@ * A layer number written by a geometry shader has no effect if * the framebuffer is not layered. */ #include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN config.supports_gl_compat_version = 32; config.supports_gl_core_version = 32; + config.khr_no_error_support = PIGLIT_NO_ERRORS; PIGLIT_GL_TEST_CONFIG_END const char *vs_source = { "#version 150\n" "in vec4 piglit_vertex;\n" "out vec4 vert;\n" "void main() {\n" " gl_Position = piglit_vertex;\n" " vert = piglit_vertex;\n" diff --git a/tests/spec/gl-3.2/layered-rendering/gl-layer-render-clipped.c b/tests/spec/gl-3.2/layered-rendering/gl-layer-render-clipped.c index 6e884ac..0d1bf00 100644 --- a/tests/spec/gl-3.2/layered-rendering/gl-layer-render-clipped.c +++ b/tests/spec/gl-3.2/layered-rendering/gl-layer-render-clipped.c @@ -32,20 +32,21 @@ */ #include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN config.supports_gl_compat_version = 32; config.supports_gl_core_version = 32; config.window_visual = PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_DOUBLE; + config.khr_no_error_support = PIGLIT_NO_ERRORS; PIGLIT_GL_TEST_CONFIG_END const char *vs_source = { "#version 150\n" "in vec4 piglit_vertex;\n" "out vec4 vert;\n" "void main() {\n" " gl_Position = piglit_vertex;\n" diff --git a/tests/spec/gl-3.2/layered-rendering/gl-layer-render-storage.c b/tests/spec/gl-3.2/layered-rendering/gl-layer-render-storage.c index 5b59b79..6a3125b 100644 --- a/tests/spec/gl-3.2/layered-rendering/gl-layer-render-storage.c +++ b/tests/spec/gl-3.2/layered-rendering/gl-layer-render-storage.c @@ -32,20 +32,21 @@ */ #include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN config.supports_gl_compat_version = 32; config.supports_gl_core_version = 32; config.window_visual = PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_DOUBLE; + config.khr_no_error_support = PIGLIT_NO_ERRORS; PIGLIT_GL_TEST_CONFIG_END GLenum textureType[] = { GL_TEXTURE_3D, GL_TEXTURE_CUBE_MAP, GL_TEXTURE_1D_ARRAY, GL_TEXTURE_2D_ARRAY, GL_TEXTURE_2D_MULTISAMPLE_ARRAY }; diff --git a/tests/spec/gl-3.2/layered-rendering/gl-layer-render.c b/tests/spec/gl-3.2/layered-rendering/gl-layer-render.c index f58e3c6..b6422dd 100644 --- a/tests/spec/gl-3.2/layered-rendering/gl-layer-render.c +++ b/tests/spec/gl-3.2/layered-rendering/gl-layer-render.c @@ -32,20 +32,21 @@ */ #include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN config.supports_gl_compat_version = 32; config.supports_gl_core_version = 32; config.window_visual = PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_DOUBLE; + config.khr_no_error_support = PIGLIT_NO_ERRORS; PIGLIT_GL_TEST_CONFIG_END GLenum textureType[] = { GL_TEXTURE_3D, GL_TEXTURE_CUBE_MAP, GL_TEXTURE_1D_ARRAY, GL_TEXTURE_2D_ARRAY, GL_TEXTURE_2D_MULTISAMPLE_ARRAY }; diff --git a/tests/spec/gl-3.2/layered-rendering/gl-layer.c b/tests/spec/gl-3.2/layered-rendering/gl-layer.c index 991db90..cd37276 100644 --- a/tests/spec/gl-3.2/layered-rendering/gl-layer.c +++ b/tests/spec/gl-3.2/layered-rendering/gl-layer.c @@ -44,20 +44,21 @@ * The first layer of both textures used, will have their values be green or * (0, 1, 0), and the remaining layers will be not set. */ #include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN config.supports_gl_compat_version = 32; config.supports_gl_core_version = 32; + config.khr_no_error_support = PIGLIT_NO_ERRORS; PIGLIT_GL_TEST_CONFIG_END const char *vs_source = { "#version 150\n" "in vec4 piglit_vertex;\n" "out vec4 vert;\n" "void main() {\n" " gl_Position = piglit_vertex;\n" " vert = piglit_vertex;\n" diff --git a/tests/spec/gl-3.2/layered-rendering/readpixels.c b/tests/spec/gl-3.2/layered-rendering/readpixels.c index 879bcdb..70a6247 100644 --- a/tests/spec/gl-3.2/layered-rendering/readpixels.c +++ b/tests/spec/gl-3.2/layered-rendering/readpixels.c @@ -30,20 +30,21 @@ * image at layer zero of the selected attachment is always used to obtain * pixel values. */ #include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN config.supports_gl_compat_version = 32; config.supports_gl_core_version = 32; + config.khr_no_error_support = PIGLIT_NO_ERRORS; PIGLIT_GL_TEST_CONFIG_END static const float color[3][3] = { {0.0, 1.0, 0.0}, {0.0, 0.0, 1.0} }; void piglit_init(int argc, char **argv) -- 2.9.4 _______________________________________________ Piglit mailing list Piglit@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/piglit