[Mesa-dev] [PATCH 01/17] dispatch: Remove a few FEATURE_ES1 conditionals.

[Paul Berry]

This allows the GLES1.1 dispatch sanity test to be run on all builds,
even builds that do not include GLES1 support.
---
 src/mesa/main/api_exec.c                | 2 --
 src/mesa/main/es1_conversion.c          | 4 ----
 src/mesa/main/get.c                     | 2 --
 src/mesa/main/tests/dispatch_sanity.cpp | 9 +--------
 src/mesa/main/texgen.c                  | 2 --
 5 files changed, 1 insertion(+), 18 deletions(-)

diff --git a/src/mesa/main/api_exec.c b/src/mesa/main/api_exec.c
index 2d8d82a..da98c26 100644
--- a/src/mesa/main/api_exec.c
+++ b/src/mesa/main/api_exec.c
@@ -871,7 +871,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);
@@ -930,7 +929,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 758fb1a..993147c 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 c34d873..ddb6afa 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 fadf295..58313cd 100644
--- a/src/mesa/main/tests/dispatch_sanity.cpp
+++ b/src/mesa/main/tests/dispatch_sanity.cpp
@@ -72,13 +72,10 @@ struct function {
    int offset;
 };
 
+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();
@@ -143,7 +140,6 @@ validate_nops(const _glapi_proc *table)
    }
 }
 
-#if FEATURE_ES1
 TEST_F(DispatchSanity_test, GLES11)
 {
    ctx.Version = 11;
@@ -161,7 +157,6 @@ TEST_F(DispatchSanity_test, GLES11)
    validate_functions((_glapi_proc *) ctx.Exec, gles11_functions_possible);
    validate_nops((_glapi_proc *) ctx.Exec);
 }
-#endif /* FEATURE_ES1 */
 
 TEST_F(DispatchSanity_test, GLES2)
 {
@@ -200,7 +195,6 @@ TEST_F(DispatchSanity_test, GLES3)
    validate_nops((_glapi_proc *) ctx.Exec);
 }
 
-#if FEATURE_ES1
 const struct function gles11_functions_possible[] = {
    { "glActiveTexture", _gloffset_ActiveTextureARB },
    { "glAlphaFunc", _gloffset_AlphaFunc },
@@ -394,7 +388,6 @@ const struct function gles11_functions_possible[] = {
    { "glViewport", _gloffset_Viewport },
    { NULL, -1 }
 };
-#endif /* FEATURE_ES1 */
 
 const struct function gles2_functions_possible[] = {
    { "glActiveTexture", _gloffset_ActiveTextureARB },
diff --git a/src/mesa/main/texgen.c b/src/mesa/main/texgen.c
index c5a8786..3ce413d 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 )
-- 
1.8.0