commit bed8363aa6ab9f3dbd8052acc8c12d3de14f1399
author Brian Paul <brian.paul@tungstengraphics.com> Sat Nov 12 17:56:18 2005 +0000
committer Brian Paul <brian.paul@tungstengraphics.com> Sat Nov 12 17:56:18 2005 +0000
tree f5a7f9961456bad06b28db5b34413f7e73b6291f
parent de99760bf3511d05185799c4fb4347f9e5f420f4

update some assertions

src/mesa/shader/nvfragparse.c

diff --git a/src/mesa/shader/nvfragparse.c b/src/mesa/shader/nvfragparse.c
index 6a8d250..52b3675 100644
--- a/src/mesa/shader/nvfragparse.c
+++ b/src/mesa/shader/nvfragparse.c
@@ -1589,7 +1589,7 @@
          _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);
       }

src/mesa/shader/nvvertexec.c

diff --git a/src/mesa/shader/nvvertexec.c b/src/mesa/shader/nvvertexec.c
index a413dcb..0e0e459 100644
--- a/src/mesa/shader/nvvertexec.c
+++ b/src/mesa/shader/nvvertexec.c
@@ -260,7 +260,7 @@
             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,