diff options
| -rw-r--r-- | src/mesa/main/extensions.c | 1 | ||||
| -rw-r--r-- | src/mesa/swrast/s_context.c | 4 | ||||
| -rw-r--r-- | src/mesa/swrast/s_fragprog.c | 5 |
3 files changed, 1 insertions, 9 deletions
diff --git a/src/mesa/main/extensions.c b/src/mesa/main/extensions.c index 3b2fa310e86..fe291a6a854 100644 --- a/src/mesa/main/extensions.c +++ b/src/mesa/main/extensions.c @@ -474,7 +474,6 @@ _mesa_enable_sw_extensions(struct gl_context *ctx) ctx->Extensions.NV_texture_env_combine4 = GL_TRUE; ctx->Extensions.NV_texture_rectangle = 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.EXT_gpu_program_parameters = GL_TRUE; _mesa_enable_extension(ctx, "GL_3DFX_texture_compression_FXT1"); diff --git a/src/mesa/swrast/s_context.c b/src/mesa/swrast/s_context.c index 31a12dade1a..ef7ca2e1593 100644 --- a/src/mesa/swrast/s_context.c +++ b/src/mesa/swrast/s_context.c @@ -251,9 +251,7 @@ _swrast_update_fog_state( struct gl_context *ctx ) SWcontext *swrast = SWRAST_CONTEXT(ctx); const struct gl_fragment_program *fp = ctx->FragmentProgram._Current; - assert((fp == NULL) || - (fp->Base.Target == GL_FRAGMENT_PROGRAM_ARB) || - (fp->Base.Target == GL_FRAGMENT_PROGRAM_NV)); + assert(fp == NULL || fp->Base.Target == GL_FRAGMENT_PROGRAM_ARB); /* determine if fog is needed, and if so, which fog mode */ swrast->_FogEnabled = (!_swrast_use_fragment_program(ctx) && diff --git a/src/mesa/swrast/s_fragprog.c b/src/mesa/swrast/s_fragprog.c index 812189f0946..9b60893db3f 100644 --- a/src/mesa/swrast/s_fragprog.c +++ b/src/mesa/swrast/s_fragprog.c @@ -164,11 +164,6 @@ init_machine(struct gl_context *ctx, struct gl_program_machine *machine, { 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 */ if (program->OriginUpperLeft) wpos[1] = ctx->DrawBuffer->Height - 1 - wpos[1]; |