[Piglit] [PATCH 1/5] ext_texture_array: Allow compressed test to run with GL_EXT_texture_compression_dxt1

Ian Romanick idr at freedesktop.org
Wed Dec 2 08:43:52 PST 2015


From: Ian Romanick <ian.d.romanick at intel.com>

All of the data is pre-compressed DXT1 textures, so there is no need for
any of the more functional S3TC related extensions.

Also... GL_ARB_texture_compress is a required part of OpenGL 1.3.  Since
the test already requires OpenGL 2.1, there is no reason to also check
for the extension.

Signed-off-by: Ian Romanick <ian.d.romanick at intel.com>
---
 tests/spec/ext_texture_array/compressed.c | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/tests/spec/ext_texture_array/compressed.c b/tests/spec/ext_texture_array/compressed.c
index 65d495c..cc45cc9 100644
--- a/tests/spec/ext_texture_array/compressed.c
+++ b/tests/spec/ext_texture_array/compressed.c
@@ -184,9 +184,14 @@ piglit_init(int argc, char **argv)
 	/* Make sure required GL features are present */
 #ifdef PIGLIT_USE_OPENGL
 	piglit_require_gl_version(21);
-	piglit_require_extension("GL_ARB_texture_compression");
-	piglit_require_extension("GL_EXT_texture_compression_s3tc");
 	piglit_require_extension("GL_EXT_texture_array");
+
+	if (!piglit_is_extension_supported("GL_EXT_texture_compression_s3tc") &&
+	    !piglit_is_extension_supported("GL_EXT_texture_compression_dxt1")) {
+                printf("Test requires either GL_EXT_texture_compression_s3tc "
+		       "or GL_EXT_texture_compression_dxt1.\n");
+                piglit_report_result(PIGLIT_SKIP);
+        }
 #endif
 
 	/* We're using texture unit 0 for this entire test */
-- 
2.5.0



More information about the Piglit mailing list