diff options
| author | Eric Anholt <eric@anholt.net> | 2013-05-10 16:56:32 -0700 |
|---|---|---|
| committer | Eric Anholt <eric@anholt.net> | 2013-06-17 14:32:17 -0700 |
| commit | b5d308283e33bd5a9f31e926651f5ed156100019 (patch) | |
| tree | 147918ef15bc4300dc9f8032bb071013041c29e8 /src | |
| parent | 5b193a839833c54351564ec46e8bdb9bba41d449 (diff) | |
glapi: Build and use piglit-dispatch for GLES2.
We still build separate binaries because we aren't dynamically loading
the GL for multi-API test sources, but we can almost completely use
the same source file for the two builds, relying on piglit-dispatch to
make up most of the difference.
Reviewed-by: Paul Berry <stereotype441@gmail.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/piglit/gl_wrap.h | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/src/piglit/gl_wrap.h b/src/piglit/gl_wrap.h index 14d24c3cd..240af3b7a 100644 --- a/src/piglit/gl_wrap.h +++ b/src/piglit/gl_wrap.h @@ -42,7 +42,9 @@ extern "C" { #include <windows.h> #endif -#if defined(PIGLIT_USE_OPENGL) +#if (defined(PIGLIT_USE_OPENGL) || \ + defined(PIGLIT_USE_OPENGL_ES2) || \ + defined(PIGLIT_USE_OPENGL_ES3)) # include "piglit-dispatch.h" #elif defined(PIGLIT_USE_OPENGL_ES1) @@ -57,12 +59,6 @@ extern "C" { # define GL_TEXTURE_CUBE_MAP_NEGATIVE_Y GL_TEXTURE_CUBE_MAP_NEGATIVE_Y_OES # define GL_TEXTURE_CUBE_MAP_NEGATIVE_Z GL_TEXTURE_CUBE_MAP_NEGATIVE_Z_OES -#elif defined(PIGLIT_USE_OPENGL_ES2) -# include <GLES2/gl2.h> -# include <GLES2/gl2ext.h> -#elif defined(PIGLIT_USE_OPENGL_ES3) -# include <GLES3/gl3.h> -# include <GLES3/gl3ext.h> #endif #ifdef __cplusplus |