mesa: remove FEATURE_ARB_fragment_shader define.

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

diff --git a/src/mesa/main/extensions.c b/src/mesa/main/extensions.c
index aaee0afb1347230d62fdab3181ab3a46a9d16d1e..39f6630e4df2050d5793465b9e83c625546ab694 100644 (file)
--- a/src/mesa/main/extensions.c
+++ b/src/mesa/main/extensions.c
@@ -401,9 +401,7 @@ _mesa_enable_sw_extensions(struct gl_context *ctx)
    ctx->Extensions.ARB_fragment_program = GL_TRUE;
    ctx->Extensions.ARB_fragment_program_shadow = GL_TRUE;
 #endif
-#if FEATURE_ARB_fragment_shader
    ctx->Extensions.ARB_fragment_shader = GL_TRUE;
-#endif
 #if FEATURE_ARB_framebuffer_object
    ctx->Extensions.ARB_framebuffer_object = GL_TRUE;
 #endif
@@ -581,9 +579,7 @@ _mesa_enable_1_5_extensions(struct gl_context *ctx)
 void
 _mesa_enable_2_0_extensions(struct gl_context *ctx)
 {
-#if FEATURE_ARB_fragment_shader
    ctx->Extensions.ARB_fragment_shader = GL_TRUE;
-#endif
    ctx->Extensions.ARB_point_sprite = GL_TRUE;
    ctx->Extensions.EXT_blend_equation_separate = GL_TRUE;
    ctx->Extensions.ARB_texture_non_power_of_two = GL_TRUE;

diff --git a/src/mesa/main/mfeatures.h b/src/mesa/main/mfeatures.h
index 22cb15acc4de9939a1d2c998235b25729d931e1a..d9ec213101e225acfe11d65b135c7cc94e6b9d94 100644 (file)
--- a/src/mesa/main/mfeatures.h
+++ b/src/mesa/main/mfeatures.h
@@ -86,8 +86,7 @@
 
 #define FEATURE_ARB_fragment_program      1
 #define FEATURE_ARB_vertex_program        1
-#define FEATURE_ARB_fragment_shader       1
-#define FEATURE_ARB_shader_objects        FEATURE_ARB_fragment_shader
+#define FEATURE_ARB_shader_objects        1
 #define FEATURE_ARB_shading_language_100  FEATURE_ARB_shader_objects
 #define FEATURE_ARB_geometry_shader4      FEATURE_ARB_shader_objects
 

diff --git a/src/mesa/main/shaderapi.c b/src/mesa/main/shaderapi.c
index 2e70860cc4caeb78b65f311c81bb51ec8d06f0ec..393f5efc2c14de985b3bc0952cbaaed31cdced07 100644 (file)
--- a/src/mesa/main/shaderapi.c
+++ b/src/mesa/main/shaderapi.c
@@ -167,10 +167,8 @@ static bool
 validate_shader_target(const struct gl_context *ctx, GLenum type)
 {
    switch (type) {
-#if FEATURE_ARB_fragment_shader
    case GL_FRAGMENT_SHADER:
       return ctx->Extensions.ARB_fragment_shader;
-#endif
    case GL_VERTEX_SHADER:
       return ctx->Extensions.ARB_vertex_shader;
 #if FEATURE_ARB_geometry_shader4
@@ -874,7 +872,6 @@ use_shader_program(struct gl_context *ctx, GLenum type,
       }
       break;
 #endif
-#if FEATURE_ARB_fragment_shader
    case GL_FRAGMENT_SHADER:
       target = &ctx->Shader.CurrentFragmentProgram;
       if ((shProg == NULL)
@@ -882,7 +879,6 @@ use_shader_program(struct gl_context *ctx, GLenum type,
         shProg = NULL;
       }
       break;
-#endif
    default:
       return false;
    }
@@ -903,7 +899,6 @@ use_shader_program(struct gl_context *ctx, GLenum type,
         /* Empty for now. */
         break;
 #endif
-#if FEATURE_ARB_fragment_shader
       case GL_FRAGMENT_SHADER:
         if (*target == ctx->Shader._CurrentFragmentProgram) {
            _mesa_reference_shader_program(ctx,
@@ -911,7 +906,6 @@ use_shader_program(struct gl_context *ctx, GLenum type,
                                           NULL);
         }
         break;
-#endif
       }
 
       _mesa_reference_shader_program(ctx, target, shProg);