[Piglit] [PATCH v2 12/13] Remove GLEW workarounds.

Paul Berry stereotype441 at gmail.com
Mon Mar 12 14:41:46 PDT 2012


This patch removes workarounds that were in place to compensate for
bugs in GLEW.
---
 tests/spec/arb_instanced_arrays/instanced_arrays.c |    4 ----
 tests/util/CMakeLists.gl.txt                       |    7 -------
 2 files changed, 0 insertions(+), 11 deletions(-)

diff --git a/tests/spec/arb_instanced_arrays/instanced_arrays.c b/tests/spec/arb_instanced_arrays/instanced_arrays.c
index 2fd0c22..ce8318f 100644
--- a/tests/spec/arb_instanced_arrays/instanced_arrays.c
+++ b/tests/spec/arb_instanced_arrays/instanced_arrays.c
@@ -162,10 +162,6 @@ piglit_init(int argc, char **argv)
    piglit_require_GLSL();
    piglit_require_extension("GL_ARB_instanced_arrays");
 
-   /* Workaround a GLEW bug: */
-   glDrawArraysInstancedARB = (PFNGLDRAWARRAYSINSTANCEDARBPROC)piglit_get_proc_address("glDrawArraysInstancedARB");
-   glDrawElementsInstancedARB = (PFNGLDRAWELEMENTSINSTANCEDARBPROC)piglit_get_proc_address("glDrawElementsInstancedARB");
-
    VertShader = piglit_compile_shader_text(GL_VERTEX_SHADER, VertShaderText);
    assert(VertShader);
 
diff --git a/tests/util/CMakeLists.gl.txt b/tests/util/CMakeLists.gl.txt
index e6e80ab..2770872 100644
--- a/tests/util/CMakeLists.gl.txt
+++ b/tests/util/CMakeLists.gl.txt
@@ -16,13 +16,6 @@ set(UTIL_SOURCES
 	sized-internalformats.c
 	)
 
-# glew.c is copied verbatim from upstream and has C99 on MacOSX so silent the warnings
-if (C_COMPILER_FLAG_WDECL_AFTER_STMT)
-	set_property (SOURCE glew.c
-		PROPERTY COMPILE_FLAGS -Wno-declaration-after-statement
-	)
-endif ()
-
 IF(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
 	# XXX: This is currently duplicated wherever tests
 	# include "piglit-glx-util.h". Is it possible to refactor it?
-- 
1.7.7.6



More information about the Piglit mailing list