OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

mesa: Remove yet more remnants of NV_fragment_program.

Browse Source 
Reviewed-by: Brian Paul <brianp@vmware.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
This commit is contained in:
Kenneth Graunke
2012-10-14 16:27:51 -07:00
parent e5f03f23a0
commit 58c466519d
6 changed files with 8 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/mesa/drivers/dri/r200/r200_vertprog.c
View File

@@ -1213,7 +1213,6 @@ r200NewProgram(struct gl_context *ctx, GLenum target, GLuint id)
vp = CALLOC_STRUCT(r200_vertex_program); vp = CALLOC_STRUCT(r200_vertex_program);
return _mesa_init_vertex_program(ctx, &vp->mesa_program, target, id); return _mesa_init_vertex_program(ctx, &vp->mesa_program, target, id);
case GL_FRAGMENT_PROGRAM_ARB: case GL_FRAGMENT_PROGRAM_ARB:
case GL_FRAGMENT_PROGRAM_NV:
return _mesa_init_fragment_program( ctx, CALLOC_STRUCT(gl_fragment_program), target, id ); return _mesa_init_fragment_program( ctx, CALLOC_STRUCT(gl_fragment_program), target, id );
default: default:
_mesa_problem(ctx, "Bad target in r200NewProgram"); _mesa_problem(ctx, "Bad target in r200NewProgram");

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

@@ -302,7 +302,6 @@ static const struct extension extension_table[] = {
{ "GL_NV_draw_buffers", o(dummy_true), ES2, 2011 }, { "GL_NV_draw_buffers", o(dummy_true), ES2, 2011 },
{ "GL_NV_fbo_color_attachments", o(EXT_framebuffer_object), ES2, 2010 }, { "GL_NV_fbo_color_attachments", o(EXT_framebuffer_object), ES2, 2010 },
{ "GL_NV_fog_distance", o(NV_fog_distance), GLL, 2001 }, { "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_fragment_program_option", o(NV_fragment_program_option), GLL, 2005 },
{ "GL_NV_light_max_exponent", o(NV_light_max_exponent), GLL, 1999 }, { "GL_NV_light_max_exponent", o(NV_light_max_exponent), GLL, 1999 },
{ "GL_NV_packed_depth_stencil", o(EXT_packed_depth_stencil), GL, 2000 }, { "GL_NV_packed_depth_stencil", o(EXT_packed_depth_stencil), GL, 2000 },

3
src/mesa/main/getstring.c
View File

@@ -137,8 +137,7 @@ _mesa_GetString( GLenum name )
return shading_language_version(ctx); return shading_language_version(ctx);
case GL_PROGRAM_ERROR_STRING_NV: case GL_PROGRAM_ERROR_STRING_NV:
if (ctx->API == API_OPENGL && 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)) { ctx->Extensions.ARB_vertex_program)) {
return (const GLubyte *) ctx->Program.ErrorString; return (const GLubyte *) ctx->Program.ErrorString;
} }

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

@@ -1922,7 +1922,7 @@ struct gl_program
GLuint Id; GLuint Id;
GLubyte *String; /**< Null-terminated program text */ GLubyte *String; /**< Null-terminated program text */
GLint RefCount; 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 */ GLenum Format; /**< String encoding format */
struct prog_instruction *Instructions; struct prog_instruction *Instructions;
@@ -3055,7 +3055,6 @@ struct gl_extensions
GLboolean NV_blend_square; GLboolean NV_blend_square;
GLboolean NV_conditional_render; GLboolean NV_conditional_render;
GLboolean NV_fog_distance; GLboolean NV_fog_distance;
GLboolean NV_fragment_program;
GLboolean NV_fragment_program_option; GLboolean NV_fragment_program_option;
GLboolean NV_light_max_exponent; GLboolean NV_light_max_exponent;
GLboolean NV_point_sprite; GLboolean NV_point_sprite;

13
src/mesa/program/prog_instruction.h
View File

@@ -297,8 +297,7 @@ struct prog_dst_register
* \name Conditional destination update control. * \name Conditional destination update control.
* *
* \since * \since
* NV_fragment_program, NV_fragment_program_option, NV_vertex_program2, * NV_fragment_program_option, NV_vertex_program2, NV_vertex_program2_option.
* NV_vertex_program2_option.
*/ */
/*@{*/ /*@{*/
/** /**
@@ -330,8 +329,7 @@ struct prog_instruction
* register. * register.
* *
* \since * \since
* NV_fragment_program, NV_fragment_program_option, NV_vertex_program2, * NV_fragment_program_option, NV_vertex_program2, NV_vertex_program2_option.
* NV_vertex_program2_option.
*/ */
GLuint CondUpdate:1; GLuint CondUpdate:1;
@@ -344,8 +342,7 @@ struct prog_instruction
* code registers 0 and 1 are available. * code registers 0 and 1 are available.
* *
* \since * \since
* NV_fragment_program, NV_fragment_program_option, NV_vertex_program2, * NV_fragment_program_option, NV_vertex_program2, NV_vertex_program2_option.
* NV_vertex_program2_option.
*/ */
GLuint CondDst:1; GLuint CondDst:1;
@@ -356,7 +353,7 @@ struct prog_instruction
* Value is one of the SATURATE_* tokens. * Value is one of the SATURATE_* tokens.
* *
* \since * \since
* NV_fragment_program, NV_fragment_program_option, NV_vertex_program3. * NV_fragment_program_option, NV_vertex_program3.
*/ */
GLuint SaturateMode:2; GLuint SaturateMode:2;
@@ -364,7 +361,7 @@ struct prog_instruction
* Per-instruction selectable precision: FLOAT32, FLOAT16, FIXED12. * Per-instruction selectable precision: FLOAT32, FLOAT16, FIXED12.
* *
* \since * \since
* NV_fragment_program, NV_fragment_program_option. * NV_fragment_program_option.
*/ */
GLuint Precision:3; GLuint Precision:3;

3
src/mesa/state_tracker/st_cb_program.c
View File

@@ -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); return _mesa_init_vertex_program(ctx, &prog->Base, target, id);
} }
case GL_FRAGMENT_PROGRAM_ARB: case GL_FRAGMENT_PROGRAM_ARB: {
case GL_FRAGMENT_PROGRAM_NV: {
struct st_fragment_program *prog = ST_CALLOC_STRUCT(st_fragment_program); struct st_fragment_program *prog = ST_CALLOC_STRUCT(st_fragment_program);
return _mesa_init_fragment_program(ctx, &prog->Base, target, id); return _mesa_init_fragment_program(ctx, &prog->Base, target, id);
} }