mesa: remove FEATURE_es2_glsl and related defines.

Signed-off-by: Oliver McFadden <oliver.mcfadden@linux.intel.com>
Reviewed-by: Brian Paul <brianp@vmware.com>

diff --git a/src/mesa/main/api_validate.c b/src/mesa/main/api_validate.c
index d0d2ca4d4516e9449ebc3708f73beb40cf1f3c92..d8cf6b8ff57d3b78436c508bd029fa97a42184e9 100644 (file)
--- a/src/mesa/main/api_validate.c
+++ b/src/mesa/main/api_validate.c
@@ -110,25 +110,20 @@ check_valid_to_render(struct gl_context *ctx, const char *function)
    }
 
    switch (ctx->API) {
-#if FEATURE_es2_glsl
    case API_OPENGLES2:
       /* For ES2, we can draw if any vertex array is enabled (and we
        * should always have a vertex program/shader). */
       if (ctx->Array.ArrayObj->_Enabled == 0x0 || !ctx->VertexProgram._Current)
         return GL_FALSE;
       break;
-#endif
 
-#if FEATURE_ES1
    case API_OPENGLES:
       /* For OpenGL ES, only draw if we have vertex positions
        */
       if (!ctx->Array.ArrayObj->VertexAttrib[VERT_ATTRIB_POS].Enabled)
         return GL_FALSE;
       break;
-#endif
 
-#if FEATURE_GL
    case API_OPENGL:
    case API_OPENGL_CORE:
       {
@@ -151,7 +146,6 @@ check_valid_to_render(struct gl_context *ctx, const char *function)
          }
       }
       break;
-#endif
 
    default:
       ASSERT_NO_FEATURE();

diff --git a/src/mesa/main/mfeatures.h b/src/mesa/main/mfeatures.h
index 005d6694927fe00322141afd0f4356479980991c..578cb6a4b9425d460d11c47c8b74e9610fee5360 100644 (file)
--- a/src/mesa/main/mfeatures.h
+++ b/src/mesa/main/mfeatures.h
@@ -84,8 +84,6 @@
 #define FEATURE_remap_table               0
 #endif
 
-#define FEATURE_es2_glsl                  FEATURE_ES2
-
 #define FEATURE_ARB_fragment_program      1
 #define FEATURE_ARB_vertex_program        1
 #define FEATURE_ARB_vertex_shader         1

diff --git a/src/mesa/program/program.c b/src/mesa/program/program.c
index becb77c1d604727bfc68384bc2a5ece7ad0d1988..7d827b78b5b0b46e9af7ea0e6bddfbed60932a29 100644 (file)
--- a/src/mesa/program/program.c
+++ b/src/mesa/program/program.c
@@ -85,12 +85,8 @@ _mesa_init_program(struct gl_context *ctx)
 
 #if FEATURE_NV_vertex_program || FEATURE_ARB_vertex_program
    ctx->VertexProgram.Enabled = GL_FALSE;
-#if FEATURE_es2_glsl
    ctx->VertexProgram.PointSizeEnabled =
       (ctx->API == API_OPENGLES2) ? GL_TRUE : GL_FALSE;
-#else
-   ctx->VertexProgram.PointSizeEnabled = GL_FALSE;
-#endif
    ctx->VertexProgram.TwoSideEnabled = GL_FALSE;
    _mesa_reference_vertprog(ctx, &ctx->VertexProgram.Current,
                             ctx->Shared->DefaultVertexProgram);