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

swrast: Remove support for the NV_fragment_program extension.

Browse Source 
No hardware drivers support this, it's obsolete, and unlikely to be
useful without NV_vertex_program, which is gone now.

Reviewed-by: Brian Paul <brianp@vmware.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
This commit is contained in:
Kenneth Graunke
2012-10-11 13:42:40 -07:00
parent ed8d87c6a6
commit 492feddb03
3 changed files with 1 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -474,7 +474,6 @@ _mesa_enable_sw_extensions(struct gl_context *ctx)
ctx->Extensions.NV_texture_env_combine4 = GL_TRUE; ctx->Extensions.NV_texture_env_combine4 = GL_TRUE;
ctx->Extensions.NV_texture_rectangle = GL_TRUE; ctx->Extensions.NV_texture_rectangle = GL_TRUE;
/*ctx->Extensions.NV_texgen_reflection = GL_TRUE;*/ /*ctx->Extensions.NV_texgen_reflection = GL_TRUE;*/
ctx->Extensions.NV_fragment_program = GL_TRUE;
ctx->Extensions.NV_fragment_program_option = GL_TRUE; ctx->Extensions.NV_fragment_program_option = GL_TRUE;
ctx->Extensions.EXT_gpu_program_parameters = GL_TRUE; ctx->Extensions.EXT_gpu_program_parameters = GL_TRUE;
_mesa_enable_extension(ctx, "GL_3DFX_texture_compression_FXT1"); _mesa_enable_extension(ctx, "GL_3DFX_texture_compression_FXT1");

4
src/mesa/swrast/s_context.c
View File

@@ -251,9 +251,7 @@ _swrast_update_fog_state( struct gl_context *ctx )
SWcontext *swrast = SWRAST_CONTEXT(ctx); SWcontext *swrast = SWRAST_CONTEXT(ctx);
const struct gl_fragment_program *fp = ctx->FragmentProgram._Current; const struct gl_fragment_program *fp = ctx->FragmentProgram._Current;
assert((fp == NULL) || assert(fp == NULL || fp->Base.Target == GL_FRAGMENT_PROGRAM_ARB);
(fp->Base.Target == GL_FRAGMENT_PROGRAM_ARB) ||
(fp->Base.Target == GL_FRAGMENT_PROGRAM_NV));
/* determine if fog is needed, and if so, which fog mode */ /* determine if fog is needed, and if so, which fog mode */
swrast->_FogEnabled = (!_swrast_use_fragment_program(ctx) && swrast->_FogEnabled = (!_swrast_use_fragment_program(ctx) &&

5
src/mesa/swrast/s_fragprog.c
View File

@@ -164,11 +164,6 @@ init_machine(struct gl_context *ctx, struct gl_program_machine *machine,
{ {
GLfloat *wpos = span->array->attribs[FRAG_ATTRIB_WPOS][col]; GLfloat *wpos = span->array->attribs[FRAG_ATTRIB_WPOS][col];
if (program->Base.Target == GL_FRAGMENT_PROGRAM_NV) {
/* Clear temporary registers (undefined for ARB_f_p) */
memset(machine->Temporaries, 0, MAX_PROGRAM_TEMPS * 4 * sizeof(GLfloat));
}
/* ARB_fragment_coord_conventions */ /* ARB_fragment_coord_conventions */
if (program->OriginUpperLeft) if (program->OriginUpperLeft)
wpos[1] = ctx->DrawBuffer->Height - 1 - wpos[1]; wpos[1] = ctx->DrawBuffer->Height - 1 - wpos[1];