update some assertions

diff --git a/src/mesa/shader/nvfragparse.c b/src/mesa/shader/nvfragparse.c
index 6a8d250d7ebe4eb006217f1fcce73bcff7aadfce..52b3675832449ac7677e243e3cd7af533dcb0585 100644 (file)
--- a/src/mesa/shader/nvfragparse.c
+++ b/src/mesa/shader/nvfragparse.c
@@ -1589,7 +1589,7 @@ PrintSrcReg(const struct fragment_program *program,
          _mesa_printf("{%g, %g, %g, %g}", v[0], v[1], v[2], v[3]);
       }
       else {
-         ASSERT(program->Parameters->Parameters[src->Index].Type
+         ASSERT(program->Base.Parameters->Parameters[src->Index].Type
                 == PROGRAM_NAMED_PARAM);
          _mesa_printf("%s", program->Base.Parameters->Parameters[src->Index].Name);
       }

diff --git a/src/mesa/shader/nvvertexec.c b/src/mesa/shader/nvvertexec.c
index a413dcbc29118610ea55e441cd96ffdc8d322508..0e0e459b28970076ff92189de2534d04bec2d32f 100644 (file)
--- a/src/mesa/shader/nvvertexec.c
+++ b/src/mesa/shader/nvvertexec.c
@@ -260,7 +260,7 @@ get_register_pointer( const struct prog_src_register *source,
             ASSERT(source->Index < MAX_NV_VERTEX_PROGRAM_PARAMS);
             return state->Parameters[source->Index];
          case PROGRAM_STATE_VAR:
-            ASSERT(source->Index < state->Current->Parameters->NumParameters);
+            ASSERT(source->Index < state->Current->Base.Parameters->NumParameters);
             return state->Current->Base.Parameters->ParameterValues[source->Index];
          default:
             _mesa_problem(NULL,