diff options
author | Paul Berry <stereotype441@gmail.com> | 2012-10-30 14:03:28 -0700 |
---|---|---|
committer | Paul Berry <stereotype441@gmail.com> | 2012-11-06 12:57:39 -0800 |
commit | 5708e2711366e4dd1f19275c943b04706fd9c633 (patch) | |
tree | 2d937547be5bab79c2024924bd0d4d9dc82c2ca4 /src/mesa/main | |
parent | 0d61f879a1f2e6bb37368731a29d5267e1c25195 (diff) |
dispatch: Remove a few FEATURE_ES1 conditionals.
This allows the GLES1.1 dispatch sanity test to be run on all builds,
even builds that do not include GLES1 support.
Reviewed-by: Jordan Justen <jordan.l.justen@intel.com>
Reviewed-by: Matt Turner <mattst88@gmail.com>
Diffstat (limited to 'src/mesa/main')
-rw-r--r-- | src/mesa/main/api_exec.c | 2 | ||||
-rw-r--r-- | src/mesa/main/es1_conversion.c | 4 | ||||
-rw-r--r-- | src/mesa/main/get.c | 2 | ||||
-rw-r--r-- | src/mesa/main/tests/dispatch_sanity.cpp | 9 | ||||
-rw-r--r-- | src/mesa/main/texgen.c | 2 |
5 files changed, 1 insertions, 18 deletions
diff --git a/src/mesa/main/api_exec.c b/src/mesa/main/api_exec.c index bc5f71f0dd9..ab785b16471 100644 --- a/src/mesa/main/api_exec.c +++ b/src/mesa/main/api_exec.c @@ -870,7 +870,6 @@ _mesa_create_exec_table(struct gl_context *ctx) SET_InvalidateFramebuffer(exec, _mesa_InvalidateFramebuffer); } -#if FEATURE_ES1 if (ctx->API == API_OPENGLES) { SET_AlphaFuncxOES(exec, _es_AlphaFuncx); SET_ClearColorxOES(exec, _es_ClearColorx); @@ -929,7 +928,6 @@ _mesa_create_exec_table(struct gl_context *ctx) SET_TexParameterxvOES(exec, _es_TexParameterxv); SET_TranslatexOES(exec, _es_Translatex); } -#endif return exec; } diff --git a/src/mesa/main/es1_conversion.c b/src/mesa/main/es1_conversion.c index 758fb1a668d..993147c4760 100644 --- a/src/mesa/main/es1_conversion.c +++ b/src/mesa/main/es1_conversion.c @@ -1,8 +1,6 @@ #include <stdbool.h> #include "main/mfeatures.h" -#if FEATURE_ES1 - #include "api_loopback.h" #include "api_exec.h" #include "blend.h" @@ -938,5 +936,3 @@ _es_Translatex(GLfixed x, GLfixed y, GLfixed z) (GLfloat) (y / 65536.0f), (GLfloat) (z / 65536.0f)); } - -#endif /* FEATURE_ES1 */ diff --git a/src/mesa/main/get.c b/src/mesa/main/get.c index fccad670d57..afae089321b 100644 --- a/src/mesa/main/get.c +++ b/src/mesa/main/get.c @@ -1686,7 +1686,6 @@ _mesa_GetInteger64Indexedv( GLenum pname, GLuint index, GLint64 *params ) } } -#if FEATURE_ES1 void GLAPIENTRY _mesa_GetFixedv(GLenum pname, GLfixed *params) { @@ -1772,4 +1771,3 @@ _mesa_GetFixedv(GLenum pname, GLfixed *params) break; } } -#endif diff --git a/src/mesa/main/tests/dispatch_sanity.cpp b/src/mesa/main/tests/dispatch_sanity.cpp index d198d9539aa..b0475da1a5b 100644 --- a/src/mesa/main/tests/dispatch_sanity.cpp +++ b/src/mesa/main/tests/dispatch_sanity.cpp @@ -74,13 +74,10 @@ struct function { }; extern const struct function gl_core_functions_possible[]; +extern const struct function gles11_functions_possible[]; extern const struct function gles2_functions_possible[]; extern const struct function gles3_functions_possible[]; -#if FEATURE_ES1 -extern const struct function gles11_functions_possible[]; -#endif /* FEATURE_ES1 */ - class DispatchSanity_test : public ::testing::Test { public: virtual void SetUp(); @@ -177,14 +174,12 @@ TEST_F(DispatchSanity_test, GL31_CORE) validate_nops(&ctx); } -#if FEATURE_ES1 TEST_F(DispatchSanity_test, GLES11) { SetUpCtx(API_OPENGLES, 11); validate_functions(&ctx, gles11_functions_possible); validate_nops(&ctx); } -#endif /* FEATURE_ES1 */ TEST_F(DispatchSanity_test, GLES2) { @@ -898,7 +893,6 @@ const struct function gl_core_functions_possible[] = { { NULL, 0, -1 } }; -#if FEATURE_ES1 const struct function gles11_functions_possible[] = { { "glActiveTexture", 11, _gloffset_ActiveTextureARB }, { "glAlphaFunc", 11, _gloffset_AlphaFunc }, @@ -1092,7 +1086,6 @@ const struct function gles11_functions_possible[] = { { "glViewport", 11, _gloffset_Viewport }, { NULL, 0, -1 } }; -#endif /* FEATURE_ES1 */ const struct function gles2_functions_possible[] = { { "glActiveTexture", 20, _gloffset_ActiveTextureARB }, diff --git a/src/mesa/main/texgen.c b/src/mesa/main/texgen.c index c5a87864464..3ce413d5c98 100644 --- a/src/mesa/main/texgen.c +++ b/src/mesa/main/texgen.c @@ -212,7 +212,6 @@ _mesa_TexGend(GLenum coord, GLenum pname, GLdouble param ) _mesa_TexGenfv( coord, pname, p ); } -#if FEATURE_ES1 void GLAPIENTRY _es_GetTexGenfv(GLenum coord, GLenum pname, GLfloat *params) @@ -250,7 +249,6 @@ _es_TexGenfv(GLenum coord, GLenum pname, const GLfloat *params) _mesa_TexGenfv(GL_R, pname, params); } -#endif static void GLAPIENTRY _mesa_TexGendv(GLenum coord, GLenum pname, const GLdouble *params ) |