diff options
| author | Kenneth Graunke <[email protected]> | 2012-10-14 16:27:51 -0700 |
|---|---|---|
| committer | Kenneth Graunke <[email protected]> | 2012-10-16 11:35:23 -0700 |
| commit | 58c466519d82fe040e9e20263058a03395a7b95b (patch) | |
| tree | 1213f5dbc9ddebf7a0bd3cd15a1aca97256c52e8 /src/mesa/main | |
| parent | e5f03f23a049c7d7960b75b1aaa2d0d1fb1e2d48 (diff) | |
mesa: Remove yet more remnants of NV_fragment_program.
Reviewed-by: Brian Paul <[email protected]>
Reviewed-by: Eric Anholt <[email protected]>
Diffstat (limited to 'src/mesa/main')
| -rw-r--r-- | src/mesa/main/extensions.c | 1 | ||||
| -rw-r--r-- | src/mesa/main/getstring.c | 3 | ||||
| -rw-r--r-- | src/mesa/main/mtypes.h | 3 |
3 files changed, 2 insertions, 5 deletions
diff --git a/src/mesa/main/extensions.c b/src/mesa/main/extensions.c index fe291a6a854..edee5967d92 100644 --- a/src/mesa/main/extensions.c +++ b/src/mesa/main/extensions.c @@ -302,7 +302,6 @@ static const struct extension extension_table[] = { { "GL_NV_draw_buffers", o(dummy_true), ES2, 2011 }, { "GL_NV_fbo_color_attachments", o(EXT_framebuffer_object), ES2, 2010 }, { "GL_NV_fog_distance", o(NV_fog_distance), GLL, 2001 }, - { "GL_NV_fragment_program", o(NV_fragment_program), GLL, 2001 }, { "GL_NV_fragment_program_option", o(NV_fragment_program_option), GLL, 2005 }, { "GL_NV_light_max_exponent", o(NV_light_max_exponent), GLL, 1999 }, { "GL_NV_packed_depth_stencil", o(EXT_packed_depth_stencil), GL, 2000 }, diff --git a/src/mesa/main/getstring.c b/src/mesa/main/getstring.c index 57c7b339b50..a04db0dc708 100644 --- a/src/mesa/main/getstring.c +++ b/src/mesa/main/getstring.c @@ -137,8 +137,7 @@ _mesa_GetString( GLenum name ) return shading_language_version(ctx); case GL_PROGRAM_ERROR_STRING_NV: if (ctx->API == API_OPENGL && - (ctx->Extensions.NV_fragment_program || - ctx->Extensions.ARB_fragment_program || + (ctx->Extensions.ARB_fragment_program || ctx->Extensions.ARB_vertex_program)) { return (const GLubyte *) ctx->Program.ErrorString; } diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h index 761dc7837d6..7444df9c46b 100644 --- a/src/mesa/main/mtypes.h +++ b/src/mesa/main/mtypes.h @@ -1922,7 +1922,7 @@ struct gl_program GLuint Id; GLubyte *String; /**< Null-terminated program text */ GLint RefCount; - GLenum Target; /**< GL_VERTEX/FRAGMENT_PROGRAM_ARB, GL_FRAGMENT_PROGRAM_NV */ + GLenum Target; /**< GL_VERTEX/FRAGMENT_PROGRAM_ARB */ GLenum Format; /**< String encoding format */ struct prog_instruction *Instructions; @@ -3055,7 +3055,6 @@ struct gl_extensions GLboolean NV_blend_square; GLboolean NV_conditional_render; GLboolean NV_fog_distance; - GLboolean NV_fragment_program; GLboolean NV_fragment_program_option; GLboolean NV_light_max_exponent; GLboolean NV_point_sprite; |