diff options
| -rw-r--r-- | src/mesa/drivers/dri/r200/r200_vertprog.c | 1 | ||||
| -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 | ||||
| -rw-r--r-- | src/mesa/program/prog_instruction.h | 13 | ||||
| -rw-r--r-- | src/mesa/state_tracker/st_cb_program.c | 3 |
6 files changed, 8 insertions, 16 deletions
diff --git a/src/mesa/drivers/dri/r200/r200_vertprog.c b/src/mesa/drivers/dri/r200/r200_vertprog.c index 4dc5d563962..a3d8be95126 100644 --- a/src/mesa/drivers/dri/r200/r200_vertprog.c +++ b/src/mesa/drivers/dri/r200/r200_vertprog.c @@ -1213,7 +1213,6 @@ r200NewProgram(struct gl_context *ctx, GLenum target, GLuint id) vp = CALLOC_STRUCT(r200_vertex_program); return _mesa_init_vertex_program(ctx, &vp->mesa_program, target, id); case GL_FRAGMENT_PROGRAM_ARB: - case GL_FRAGMENT_PROGRAM_NV: return _mesa_init_fragment_program( ctx, CALLOC_STRUCT(gl_fragment_program), target, id ); default: _mesa_problem(ctx, "Bad target in r200NewProgram"); 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; diff --git a/src/mesa/program/prog_instruction.h b/src/mesa/program/prog_instruction.h index 569294e92bf..8bb0c6541ba 100644 --- a/src/mesa/program/prog_instruction.h +++ b/src/mesa/program/prog_instruction.h @@ -297,8 +297,7 @@ struct prog_dst_register * \name Conditional destination update control. * * \since - * NV_fragment_program, NV_fragment_program_option, NV_vertex_program2, - * NV_vertex_program2_option. + * NV_fragment_program_option, NV_vertex_program2, NV_vertex_program2_option. */ /*@{*/ /** @@ -330,8 +329,7 @@ struct prog_instruction * register. * * \since - * NV_fragment_program, NV_fragment_program_option, NV_vertex_program2, - * NV_vertex_program2_option. + * NV_fragment_program_option, NV_vertex_program2, NV_vertex_program2_option. */ GLuint CondUpdate:1; @@ -344,8 +342,7 @@ struct prog_instruction * code registers 0 and 1 are available. * * \since - * NV_fragment_program, NV_fragment_program_option, NV_vertex_program2, - * NV_vertex_program2_option. + * NV_fragment_program_option, NV_vertex_program2, NV_vertex_program2_option. */ GLuint CondDst:1; @@ -356,7 +353,7 @@ struct prog_instruction * Value is one of the SATURATE_* tokens. * * \since - * NV_fragment_program, NV_fragment_program_option, NV_vertex_program3. + * NV_fragment_program_option, NV_vertex_program3. */ GLuint SaturateMode:2; @@ -364,7 +361,7 @@ struct prog_instruction * Per-instruction selectable precision: FLOAT32, FLOAT16, FIXED12. * * \since - * NV_fragment_program, NV_fragment_program_option. + * NV_fragment_program_option. */ GLuint Precision:3; diff --git a/src/mesa/state_tracker/st_cb_program.c b/src/mesa/state_tracker/st_cb_program.c index 617e7ce6429..e7732bdbd8e 100644 --- a/src/mesa/state_tracker/st_cb_program.c +++ b/src/mesa/state_tracker/st_cb_program.c @@ -99,8 +99,7 @@ st_new_program(struct gl_context *ctx, GLenum target, GLuint id) return _mesa_init_vertex_program(ctx, &prog->Base, target, id); } - case GL_FRAGMENT_PROGRAM_ARB: - case GL_FRAGMENT_PROGRAM_NV: { + case GL_FRAGMENT_PROGRAM_ARB: { struct st_fragment_program *prog = ST_CALLOC_STRUCT(st_fragment_program); return _mesa_init_fragment_program(ctx, &prog->Base, target, id); } |