[Piglit] [PATCH 09/16] util/gl: Unify piglit_get_compressed_block_size() between GL and GLES

Chad Versace chad.versace at linux.intel.com
Wed Jul 9 14:56:51 PDT 2014


Now that piglit-dispatch supports every OpenGL API, there is no
longer a need to provide separate implementations for GL and GLES.

This patch brings us one step closer to unifying Piglit's CMake files.

Signed-off-by: Chad Versace <chad.versace at linux.intel.com>
---
 tests/util/piglit-util-gl-common.c | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/tests/util/piglit-util-gl-common.c b/tests/util/piglit-util-gl-common.c
index 7fa95ff..a20f8bf 100644
--- a/tests/util/piglit-util-gl-common.c
+++ b/tests/util/piglit-util-gl-common.c
@@ -431,14 +431,11 @@ piglit_get_compressed_block_size(GLenum format,
 				 unsigned *bw, unsigned *bh, unsigned *bytes)
 {
 	switch (format) {
-#if defined(PIGLIT_USE_OPENGL) || defined(PIGLIT_USE_OPENGL_ES2)
 	case GL_COMPRESSED_RGB_S3TC_DXT1_EXT:
 	case GL_COMPRESSED_RGBA_S3TC_DXT1_EXT:
 		*bw = *bh = 4;
 		*bytes = 8;
 		return true;
-#endif
-#if defined(PIGLIT_USE_OPENGL)
 	case GL_COMPRESSED_SRGB_S3TC_DXT1_EXT:
 	case GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT1_EXT:
 	case GL_COMPRESSED_RED_RGTC1:
@@ -465,7 +462,6 @@ piglit_get_compressed_block_size(GLenum format,
 		*bh = 4;
 		*bytes = 16;
 		return true;
-#endif
 	default:
 		/* return something rather than uninitialized values */
 		*bw = *bh = *bytes = 1;
-- 
2.0.0



More information about the Piglit mailing list