diff options
| author | Chad Versace <chad.versace@linux.intel.com> | 2014-07-08 22:21:43 -0700 |
|---|---|---|
| committer | Chad Versace <chad.versace@linux.intel.com> | 2014-07-15 13:26:50 -0700 |
| commit | 30bd8331bb7aff8890e398f26bb5cd23351b3a31 (patch) | |
| tree | 2274ab123c301841e54bddb18f76f733d88f89b1 /tests | |
| parent | 3be65c42796814eb751c6ce36ed52e30e7a0bb5a (diff) | |
util/gl: Unify extension detection between GL and GLES
Now that piglit-dispatch supports every OpenGL API, there is no
longer a need to provide separate implementations for GL and GLES.
This patch is safe for GLES because glGetStringi() is available in
OpenGL ES 3.0.
This patch brings us one step closer to unifying Piglit's CMake files.
Signed-off-by: Chad Versace <chad.versace@linux.intel.com>
Reviewed-by: Brian Paul <brianp@vmware.com>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/util/piglit-util-gl-common.c | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/tests/util/piglit-util-gl-common.c b/tests/util/piglit-util-gl-common.c index 41fb2456e..7fa95ff3b 100644 --- a/tests/util/piglit-util-gl-common.c +++ b/tests/util/piglit-util-gl-common.c @@ -71,7 +71,6 @@ static const char** gl_extension_array_from_getstring() return piglit_split_string_to_array(gl_extensions_string, " "); } -#if defined(PIGLIT_USE_OPENGL) static const char** gl_extension_array_from_getstringi() { const char **strings; @@ -89,7 +88,6 @@ static const char** gl_extension_array_from_getstringi() return (const char**) strings; } -#endif static void initialize_piglit_extension_support(void) { @@ -97,19 +95,11 @@ static void initialize_piglit_extension_support(void) return; } -#if defined(PIGLIT_USE_OPENGL_ES1) || \ - defined(PIGLIT_USE_OPENGL_ES2) || \ - defined(PIGLIT_USE_OPENGL_ES3) - gl_extensions = gl_extension_array_from_getstring(); -#elif defined(PIGLIT_USE_OPENGL) if (piglit_get_gl_version() < 30) { gl_extensions = gl_extension_array_from_getstring(); } else { gl_extensions = gl_extension_array_from_getstringi(); } -#else -#error Need code implemented to read extensions -#endif } void piglit_gl_reinitialize_extensions() |