summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrian <[email protected]>2007-02-22 14:57:40 -0700
committerBrian <[email protected]>2007-02-22 14:57:40 -0700
commit3ed1acd13c7876288a5d1ab6d288b1654f0c2e6d (patch)
tree9796bada412891cb048edda334a7574ad1af26c9
parentb7aeac0de1c9c533f78c5d6acf358bdc206161ab (diff)
use MAX_PROGRAM_ENV_PARAMS
-rw-r--r--src/mesa/swrast/s_fragprog.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/mesa/swrast/s_fragprog.c b/src/mesa/swrast/s_fragprog.c
index 89907f73c60..a41b3ce1252 100644
--- a/src/mesa/swrast/s_fragprog.c
+++ b/src/mesa/swrast/s_fragprog.c
@@ -172,7 +172,7 @@ get_register_pointer( GLcontext *ctx,
ASSERT(source->Index < MAX_PROGRAM_LOCAL_PARAMS);
return program->Base.LocalParams[source->Index];
case PROGRAM_ENV_PARAM:
- ASSERT(source->Index < MAX_NV_FRAGMENT_PROGRAM_PARAMS);
+ ASSERT(source->Index < MAX_PROGRAM_ENV_PARAMS);
return ctx->FragmentProgram.Parameters[source->Index];
case PROGRAM_STATE_VAR:
/* Fallthrough */
@@ -557,7 +557,7 @@ init_machine_deriv( GLcontext *ctx,
/* XXX also need to do this when using valgrind */
/* Clear temporary registers (undefined for ARB_f_p) */
_mesa_bzero( (void*) machine->Temporaries,
- MAX_NV_FRAGMENT_PROGRAM_TEMPS * 4 * sizeof(GLfloat));
+ MAX_PROGRAM_TEMPS * 4 * sizeof(GLfloat));
}
/* Add derivatives */
@@ -1611,7 +1611,7 @@ init_machine( GLcontext *ctx, struct fp_machine *machine,
if (program->Base.Target == GL_FRAGMENT_PROGRAM_NV) {
/* Clear temporary registers (undefined for ARB_f_p) */
_mesa_bzero(machine->Temporaries,
- MAX_NV_FRAGMENT_PROGRAM_TEMPS * 4 * sizeof(GLfloat));
+ MAX_PROGRAM_TEMPS * 4 * sizeof(GLfloat));
}
/* Setup pointer to input attributes */