aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorPaul Berry <stereotype441@gmail.com>2012-03-01 16:56:03 -0800
committerPaul Berry <stereotype441@gmail.com>2012-03-23 13:39:58 -0700
commit8b7badfc50fbd92911ef960a8f90a1efd3535d9d (patch)
tree097b99416071b5e0c590d0abf97237fd397adc6f /src
parent3a786312e69f1ebf0c9a180c0067eee4a9cb725b (diff)
downloadpiglit-8b7badfc50fbd92911ef960a8f90a1efd3535d9d.tar.gz
piglit-dispatch: Switch to using piglit-dispatch instead of GLEW.
Previous patches set up the piglit-dispatch infrastructure but did not use it. This patch enables piglit-dispatch and uses it instead of GLEW. - No piglit regressions on Intel SandyBridge (Linux) or the nVidia binary blob for Linux. - One regression on Mac OSX: after this patch, shaders/gpu_shader4_attribs incorrectly skips. This happens because the functions tested by shaders/gpu_shader4_attribs are defined in both EXT_gpu_shader4 and NV_vertex_program4 extensions. Piglit-dispatch is not yet capable of understanding that a function might be defined with the same name in multiple extension specs (because it is based on the gl.spec file from www.opengl.org, which fails to encode this information). I plan to address this in a future patch. - Spot checked on Microsoft Windows. v2: Remove redundant includes of GL headers.
Diffstat (limited to 'src')
-rw-r--r--src/piglit/gl_wrap.h12
1 files changed, 1 insertions, 11 deletions
diff --git a/src/piglit/gl_wrap.h b/src/piglit/gl_wrap.h
index 8fddd2f0..3ccc3658 100644
--- a/src/piglit/gl_wrap.h
+++ b/src/piglit/gl_wrap.h
@@ -43,17 +43,7 @@ extern "C" {
#endif
#if defined(USE_OPENGL)
-# include "glew.h"
- /* Include the real headers too, in case GLEW misses something. */
-# ifdef __APPLE__
-# include <OpenGL/gl.h>
-# include <OpenGL/glu.h>
-# include <OpenGL/glext.h>
-# else
-# include <GL/gl.h>
-# include <GL/glu.h>
-# include <GL/glext.h>
-# endif
+# include "piglit-dispatch.h"
#elif defined(USE_OPENGL_ES1)
# include <GLES/gl.h>