[01/12] arb_internalformat_query2: fix framebuffer object dependency check

Submitted by apinheiro on May 13, 2016, 3:26 p.m.

Details

Message ID 1463153173-12219-2-git-send-email-apinheiro@igalia.com
State New
Headers show
Series "ARB_internalformat_query2 support for OpenGL ES and other fixes" ( rev: 1 ) in Piglit

Not browsing as part of any series.

Commit Message

apinheiro May 13, 2016, 3:26 p.m.
For most tests the dependency is not needed. For the ones that need
the functionality, the check is about supporting the extension or
being under gles.

Acked-by: Eduardo Lima <elima@igalia.com>
Acked-by: Antia Puentes <apuentes@igalia.com>
---
 tests/spec/arb_internalformat_query2/api-errors.c     | 1 -
 tests/spec/arb_internalformat_query2/minmax.c         | 3 ++-
 tests/spec/arb_internalformat_query2/samples-pnames.c | 1 -
 3 files changed, 2 insertions(+), 3 deletions(-)

Patch hide | download patch | download mbox

diff --git a/tests/spec/arb_internalformat_query2/api-errors.c b/tests/spec/arb_internalformat_query2/api-errors.c
index e88480c..c66b221 100644
--- a/tests/spec/arb_internalformat_query2/api-errors.c
+++ b/tests/spec/arb_internalformat_query2/api-errors.c
@@ -123,7 +123,6 @@  piglit_init(int argc, char **argv)
 {
 	bool pass = true;
 
-	piglit_require_extension("GL_ARB_framebuffer_object");
 	piglit_require_extension("GL_ARB_internalformat_query2");
 
 	/* The GL_ARB_internalformat_query2 spec says:
diff --git a/tests/spec/arb_internalformat_query2/minmax.c b/tests/spec/arb_internalformat_query2/minmax.c
index 680fc9c..d1da88a 100644
--- a/tests/spec/arb_internalformat_query2/minmax.c
+++ b/tests/spec/arb_internalformat_query2/minmax.c
@@ -283,7 +283,8 @@  piglit_init(int argc, char **argv)
                 piglit_is_extension_supported("GL_ARB_texture_multisample");
         GLint max_samples;
 
-        piglit_require_extension("GL_ARB_framebuffer_object");
+	if (!piglit_is_gles())
+                piglit_require_extension("GL_ARB_framebuffer_object");
         piglit_require_extension("GL_ARB_internalformat_query2");
 
         /* Need GL 3 or extensions to support the valid_formats[] above */
diff --git a/tests/spec/arb_internalformat_query2/samples-pnames.c b/tests/spec/arb_internalformat_query2/samples-pnames.c
index 7ec2f96..afa53ec 100644
--- a/tests/spec/arb_internalformat_query2/samples-pnames.c
+++ b/tests/spec/arb_internalformat_query2/samples-pnames.c
@@ -290,7 +290,6 @@  piglit_init(int argc, char **argv)
 {
         bool pass = true;
 
-        piglit_require_extension("GL_ARB_framebuffer_object");
         piglit_require_extension("GL_ARB_internalformat_query2");
 
         pass = check_num_sample_counts() && pass;