Re: [Piglit] [PATCH 4/7] arb_draw_indirect: set KHR_no_error compatibility

Fri, 19 May 2017 02:21:33 -0700 

Reviewed-by: Samuel Pitoiset <samuel.pitoi...@gmail.com>

On 05/18/2017 04:00 AM, Timothy Arceri wrote:

---
  tests/spec/arb_draw_indirect/api-errors.c                      | 1 +
  tests/spec/arb_draw_indirect/draw-arrays-base-instance.c       | 1 +
  tests/spec/arb_draw_indirect/draw-arrays-instances.c           | 1 +
  tests/spec/arb_draw_indirect/draw-arrays-prim-restart.c        | 1 +
  tests/spec/arb_draw_indirect/draw-arrays-shared-binding.c      | 1 +
  tests/spec/arb_draw_indirect/draw-arrays.c                     | 1 +
  tests/spec/arb_draw_indirect/draw-elements-base-instance.c     | 1 +
  tests/spec/arb_draw_indirect/draw-elements-prim-restart-ugly.c | 1 +
  tests/spec/arb_draw_indirect/draw-elements-prim-restart.c      | 1 +
  tests/spec/arb_draw_indirect/draw-elements.c                   | 1 +
  tests/spec/arb_draw_indirect/transform-feedback.c              | 1 +
  tests/spec/arb_draw_indirect/vertexid.c                        | 1 +
  12 files changed, 12 insertions(+)

diff --git a/tests/spec/arb_draw_indirect/api-errors.c 
b/tests/spec/arb_draw_indirect/api-errors.c
index 7f25ea9..cac1a49 100644
--- a/tests/spec/arb_draw_indirect/api-errors.c
+++ b/tests/spec/arb_draw_indirect/api-errors.c
@@ -24,20 +24,21 @@
/* Test error behavior for GL_ARB_draw_indirect */ #include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN config.supports_gl_core_version = 31; config.window_visual = PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_RGB; 
+       config.khr_no_error_support = PIGLIT_HAS_ERRORS;
PIGLIT_GL_TEST_CONFIG_END enum piglit_result 
  piglit_display(void)
  {
        return PIGLIT_FAIL;
  }
diff --git a/tests/spec/arb_draw_indirect/draw-arrays-base-instance.c b/tests/spec/arb_draw_indirect/draw-arrays-base-instance.c 
index a083948..5835440 100644
--- a/tests/spec/arb_draw_indirect/draw-arrays-base-instance.c
+++ b/tests/spec/arb_draw_indirect/draw-arrays-base-instance.c
@@ -24,20 +24,21 @@
/* Basic test of glDrawArraysIndirect interaction with base instance */ #include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN config.supports_gl_core_version = 31; config.window_visual = PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_RGB; 
+       config.khr_no_error_support = PIGLIT_NO_ERRORS;
PIGLIT_GL_TEST_CONFIG_END GLuint vao; 
  GLint prog;
float green[] = {0,1,0}; 
  float blue[] = {0,0,1};
enum piglit_result 
diff --git a/tests/spec/arb_draw_indirect/draw-arrays-instances.c 
b/tests/spec/arb_draw_indirect/draw-arrays-instances.c
index 0e65db8..59d4725 100644
--- a/tests/spec/arb_draw_indirect/draw-arrays-instances.c
+++ b/tests/spec/arb_draw_indirect/draw-arrays-instances.c
@@ -24,20 +24,21 @@
/* Basic test of glDrawElementsIndirect */ #include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN config.supports_gl_core_version = 31; config.window_visual = PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_RGB; 
+       config.khr_no_error_support = PIGLIT_NO_ERRORS;
PIGLIT_GL_TEST_CONFIG_END GLuint vao; 
  GLint prog;
float green[] = {0,1,0}; 
  float blue[] = {0,0,1};
enum piglit_result 
diff --git a/tests/spec/arb_draw_indirect/draw-arrays-prim-restart.c 
b/tests/spec/arb_draw_indirect/draw-arrays-prim-restart.c
index f1e2247..4f4b71b 100644
--- a/tests/spec/arb_draw_indirect/draw-arrays-prim-restart.c
+++ b/tests/spec/arb_draw_indirect/draw-arrays-prim-restart.c
@@ -24,20 +24,21 @@
  /**
   * Test if primitive restart works with glDrawArraysIndirect.
   */
#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN 
        config.supports_gl_compat_version = 33;
        config.supports_gl_core_version = 33;
        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 const GLchar *vstext = 
        "#version 330\n"
        "attribute vec2 piglit_vertex;\n"
        "attribute int piglit_texcoord;\n"
        "out vec4 color;\n"
        "void main()\n"
        "{\n"
        "  gl_Position = vec4(piglit_vertex, 0.0, 1.0);\n"
diff --git a/tests/spec/arb_draw_indirect/draw-arrays-shared-binding.c 
b/tests/spec/arb_draw_indirect/draw-arrays-shared-binding.c
index d487e5d..45d11d4 100644
--- a/tests/spec/arb_draw_indirect/draw-arrays-shared-binding.c
+++ b/tests/spec/arb_draw_indirect/draw-arrays-shared-binding.c
@@ -26,20 +26,21 @@
   *
   * Test creates a VAO and tests sharing binding point with 2 enabled vertex
   * attribute arrays, one used for vertices and another for output colors.
   */
#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN 
        config.supports_gl_core_version = 31;
        config.window_visual = PIGLIT_GL_VISUAL_DOUBLE;
+       config.khr_no_error_support = PIGLIT_NO_ERRORS;
  PIGLIT_GL_TEST_CONFIG_END
static const char vs_text[] = 
        "attribute vec4 vertex;\n"
        "attribute vec4 colors;\n"
        "varying vec4 color;\n"
        "void main() {\n"
                "gl_Position = vertex;\n"
                "color = colors;\n"
        "}";
diff --git a/tests/spec/arb_draw_indirect/draw-arrays.c 
b/tests/spec/arb_draw_indirect/draw-arrays.c
index 9f1ecc6..33ae6b3 100644
--- a/tests/spec/arb_draw_indirect/draw-arrays.c
+++ b/tests/spec/arb_draw_indirect/draw-arrays.c
@@ -24,20 +24,21 @@
/* Basic test of glDrawArraysIndirect */ #include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN config.supports_gl_core_version = 31; config.window_visual = PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_RGB; 
+       config.khr_no_error_support = PIGLIT_NO_ERRORS;
PIGLIT_GL_TEST_CONFIG_END GLuint vao; 
  GLint prog;
float red[] = {1,0,0}; 
  float blue[] = {0,0,1};
enum piglit_result 
diff --git a/tests/spec/arb_draw_indirect/draw-elements-base-instance.c 
b/tests/spec/arb_draw_indirect/draw-elements-base-instance.c
index 98817c8..4656fe0 100644
--- a/tests/spec/arb_draw_indirect/draw-elements-base-instance.c
+++ b/tests/spec/arb_draw_indirect/draw-elements-base-instance.c
@@ -24,20 +24,21 @@
/* Basic test of glDrawElementsIndirect interaction with base instance */ #include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN config.supports_gl_core_version = 31; config.window_visual = PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_RGB; 
+       config.khr_no_error_support = PIGLIT_NO_ERRORS;
PIGLIT_GL_TEST_CONFIG_END GLuint vao; 
  GLint prog;
float green[] = {0,1,0}; 
  float blue[] = {0,0,1};
enum piglit_result 
diff --git a/tests/spec/arb_draw_indirect/draw-elements-prim-restart-ugly.c 
b/tests/spec/arb_draw_indirect/draw-elements-prim-restart-ugly.c
index 51eef9b..c78fad5 100644
--- a/tests/spec/arb_draw_indirect/draw-elements-prim-restart-ugly.c
+++ b/tests/spec/arb_draw_indirect/draw-elements-prim-restart-ugly.c
@@ -25,20 +25,21 @@
  /* Basic test of glDrawElementsIndirect interaction with primitive restart,
   * with a weird cut index. This requires a fallback on Ivybridge. */
#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN config.supports_gl_core_version = 31; config.window_visual = PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_RGB; 
+       config.khr_no_error_support = PIGLIT_NO_ERRORS;
PIGLIT_GL_TEST_CONFIG_END GLuint vao; 
  GLint prog;
float red[] = {1,0,0}; 
  float blue[] = {0,0,1};
enum piglit_result 
diff --git a/tests/spec/arb_draw_indirect/draw-elements-prim-restart.c 
b/tests/spec/arb_draw_indirect/draw-elements-prim-restart.c
index 3f0435e..41328b3 100644
--- a/tests/spec/arb_draw_indirect/draw-elements-prim-restart.c
+++ b/tests/spec/arb_draw_indirect/draw-elements-prim-restart.c
@@ -24,20 +24,21 @@
/* Basic test of glDrawElementsIndirect interaction with primitive restart */ #include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN config.supports_gl_core_version = 31; config.window_visual = PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_RGB; 
+       config.khr_no_error_support = PIGLIT_NO_ERRORS;
PIGLIT_GL_TEST_CONFIG_END GLuint vao; 
  GLint prog;
float red[] = {1,0,0}; 
  float blue[] = {0,0,1};
enum piglit_result 
diff --git a/tests/spec/arb_draw_indirect/draw-elements.c 
b/tests/spec/arb_draw_indirect/draw-elements.c
index deb27e7..fb695ca 100644
--- a/tests/spec/arb_draw_indirect/draw-elements.c
+++ b/tests/spec/arb_draw_indirect/draw-elements.c
@@ -24,20 +24,21 @@
/* Basic test of glDrawElementsIndirect */ #include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN config.supports_gl_core_version = 31; config.window_visual = PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_RGB; 
+       config.khr_no_error_support = PIGLIT_NO_ERRORS;
PIGLIT_GL_TEST_CONFIG_END GLuint vao; 
  GLint prog;
float red[] = {1,0,0}; 
  float blue[] = {0,0,1};
enum piglit_result 
diff --git a/tests/spec/arb_draw_indirect/transform-feedback.c 
b/tests/spec/arb_draw_indirect/transform-feedback.c
index af3ea8f..8ce560d 100644
--- a/tests/spec/arb_draw_indirect/transform-feedback.c
+++ b/tests/spec/arb_draw_indirect/transform-feedback.c
@@ -28,20 +28,21 @@
   * Based on draw-arrays.c.
   */
#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN config.supports_gl_core_version = 31; config.window_visual = PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_RGB; 
+       config.khr_no_error_support = PIGLIT_NO_ERRORS;
PIGLIT_GL_TEST_CONFIG_END GLuint draw_vao; 
  GLint tf_prog, draw_prog;
  GLint tf_in;
float red[] = {1,0,0}; 
  float blue[] = {0,0,1};
diff --git a/tests/spec/arb_draw_indirect/vertexid.c b/tests/spec/arb_draw_indirect/vertexid.c 
index b650380..bba2b02 100644
--- a/tests/spec/arb_draw_indirect/vertexid.c
+++ b/tests/spec/arb_draw_indirect/vertexid.c
@@ -36,20 +36,21 @@
   */
#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN config.supports_gl_core_version = 31; 
        config.supports_gl_compat_version = 31;
config.window_visual = PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_RGBA; 
+       config.khr_no_error_support = PIGLIT_NO_ERRORS;
PIGLIT_GL_TEST_CONFIG_END static const float green[] = { 0, 1, 0, 1 }; 
  static const float blue[]    = { 0, 0, 1, 1 };
  static const float gold[]    = { 1, 1, 0, 1 };
  static const float magenta[] = { 1, 0, 1, 1 };
typedef struct { 
        GLuint count;


_______________________________________________
Piglit mailing list
Piglit@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/piglit

Reply via email to