KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mesa: remove FEATURE_ARB_fragment_shader define. 

Signed-off-by: Oliver McFadden <oliver.mcfadden@linux.intel.com>
Reviewed-by: Brian Paul <brianp@vmware.com>
This commit is contained in:
Oliver McFadden 2012-09-11 09:55:24 +03:00
parent 6c4cddadaa
commit 7ada8d371e
3 changed files with 1 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/mesa/main/extensions.c
View File

@ -401,9 +401,7 @@ _mesa_enable_sw_extensions(struct gl_context *ctx)
ctx->Extensions.ARB_fragment_program = GL_TRUE; ctx->Extensions.ARB_fragment_program = GL_TRUE;
ctx->Extensions.ARB_fragment_program_shadow = GL_TRUE; ctx->Extensions.ARB_fragment_program_shadow = GL_TRUE;
#endif #endif
#if FEATURE_ARB_fragment_shader
ctx->Extensions.ARB_fragment_shader = GL_TRUE; ctx->Extensions.ARB_fragment_shader = GL_TRUE;
#endif
#if FEATURE_ARB_framebuffer_object #if FEATURE_ARB_framebuffer_object
ctx->Extensions.ARB_framebuffer_object = GL_TRUE; ctx->Extensions.ARB_framebuffer_object = GL_TRUE;
#endif #endif
@ -581,9 +579,7 @@ _mesa_enable_1_5_extensions(struct gl_context *ctx)
void void
_mesa_enable_2_0_extensions(struct gl_context *ctx) _mesa_enable_2_0_extensions(struct gl_context *ctx)
{ {
#if FEATURE_ARB_fragment_shader
ctx->Extensions.ARB_fragment_shader = GL_TRUE; ctx->Extensions.ARB_fragment_shader = GL_TRUE;
#endif
ctx->Extensions.ARB_point_sprite = GL_TRUE; ctx->Extensions.ARB_point_sprite = GL_TRUE;
ctx->Extensions.EXT_blend_equation_separate = GL_TRUE; ctx->Extensions.EXT_blend_equation_separate = GL_TRUE;
ctx->Extensions.ARB_texture_non_power_of_two = GL_TRUE; ctx->Extensions.ARB_texture_non_power_of_two = GL_TRUE;

3
src/mesa/main/mfeatures.h
View File

@ -86,8 +86,7 @@
#define FEATURE_ARB_fragment_program 1 #define FEATURE_ARB_fragment_program 1
#define FEATURE_ARB_vertex_program 1 #define FEATURE_ARB_vertex_program 1
#define FEATURE_ARB_fragment_shader 1 #define FEATURE_ARB_shader_objects 1
#define FEATURE_ARB_shader_objects FEATURE_ARB_fragment_shader
#define FEATURE_ARB_shading_language_100 FEATURE_ARB_shader_objects #define FEATURE_ARB_shading_language_100 FEATURE_ARB_shader_objects
#define FEATURE_ARB_geometry_shader4 FEATURE_ARB_shader_objects #define FEATURE_ARB_geometry_shader4 FEATURE_ARB_shader_objects

6
src/mesa/main/shaderapi.c
View File

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