[Piglit] [PATCH] ext_framebuffer_multisample: skip negative-max-samples

[Chris Forbes]

If ARB_texture_multisample or ARB_internalformat_query are supported,
the limits and/or errors generated are different, so skip this test.

Signed-off-by: Chris Forbes <chrisf at ijw.co.nz>
---
 tests/spec/ext_framebuffer_multisample/negative-max-samples.c | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/tests/spec/ext_framebuffer_multisample/negative-max-samples.c b/tests/spec/ext_framebuffer_multisample/negative-max-samples.c
index cb6bf97..af34317 100644
--- a/tests/spec/ext_framebuffer_multisample/negative-max-samples.c
+++ b/tests/spec/ext_framebuffer_multisample/negative-max-samples.c
@@ -33,6 +33,11 @@
  *     "If either <width> or <height> is greater than
  *      MAX_RENDERBUFFER_SIZE_EXT, or if <samples> is greater than
  *      MAX_SAMPLES_EXT, then the error INVALID_VALUE is generated."
+ *
+ * Skips if ARB_texture_multisample or ARB_internalformat_query are
+ * supported. ARB_texture_multisample changes the error which should
+ * be generated; ARB_internalformat_query allows the limit for particular
+ * internalformats to be >MAX_SAMPLES.
  */
 
 PIGLIT_GL_TEST_CONFIG_BEGIN
@@ -60,6 +65,10 @@ piglit_init(int argc, char **argv)
 
 	piglit_require_extension("GL_EXT_framebuffer_multisample");
 
+	if (piglit_is_extension_supported("GL_ARB_texture_multisample") ||
+		piglit_is_extension_supported("GL_ARB_internalformat_query"))
+		piglit_report_result(PIGLIT_SKIP);
+
 	glGetIntegerv(GL_MAX_SAMPLES, &max_samples);
 
 	glGenRenderbuffersEXT(1, &rb);
-- 
1.8.1.5