[Piglit] [PATCH 2/2] Fix ARB_draw_instanced feature-macro-disabled tests.

Kenneth Graunke kenneth at whitecape.org
Mon Mar 12 00:10:17 PDT 2012


If the GL supports the GL_ARB_draw_instanced extension, the preprocessor
macro must exist regardless of whether or not the shader enables the
extension.  (In fact, this allows them to check if it's supported!)

This patch changes the tests to only run if GL_ARB_draw_instanced is
_not_ supported by the driver, in which case it's an error to define
the preprocessor macro.

Signed-off-by: Kenneth Graunke <kenneth at whitecape.org>
---
 .../preprocessor/feature-macro-disabled.frag       |    2 +-
 .../preprocessor/feature-macro-disabled.vert       |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/spec/arb_draw_instanced/preprocessor/feature-macro-disabled.frag b/tests/spec/arb_draw_instanced/preprocessor/feature-macro-disabled.frag
index 5a4a627..0f95e1b 100644
--- a/tests/spec/arb_draw_instanced/preprocessor/feature-macro-disabled.frag
+++ b/tests/spec/arb_draw_instanced/preprocessor/feature-macro-disabled.frag
@@ -1,7 +1,7 @@
 /* [config]
  * expect_result: pass
  * glsl_version: 1.10
- * require_extensions: GL_ARB_draw_instanced
+ * require_extensions: !GL_ARB_draw_instanced
  * [end config]
  */
 
diff --git a/tests/spec/arb_draw_instanced/preprocessor/feature-macro-disabled.vert b/tests/spec/arb_draw_instanced/preprocessor/feature-macro-disabled.vert
index 5a4a627..0f95e1b 100644
--- a/tests/spec/arb_draw_instanced/preprocessor/feature-macro-disabled.vert
+++ b/tests/spec/arb_draw_instanced/preprocessor/feature-macro-disabled.vert
@@ -1,7 +1,7 @@
 /* [config]
  * expect_result: pass
  * glsl_version: 1.10
- * require_extensions: GL_ARB_draw_instanced
+ * require_extensions: !GL_ARB_draw_instanced
  * [end config]
  */
 
-- 
1.7.7.6



More information about the Piglit mailing list