diff options
| author | Brian Paul <brian.paul@tungstengraphics.com> | 2005-11-12 17:56:18 +0000 |
|---|---|---|
| committer | Brian Paul <brian.paul@tungstengraphics.com> | 2005-11-12 17:56:18 +0000 |
| commit | bed8363aa6ab9f3dbd8052acc8c12d3de14f1399 (patch) | |
| tree | f5a7f9961456bad06b28db5b34413f7e73b6291f | |
| parent | de99760bf3511d05185799c4fb4347f9e5f420f4 (diff) | |
update some assertions
| -rw-r--r-- | src/mesa/shader/nvfragparse.c | 2 | ||||
| -rw-r--r-- | src/mesa/shader/nvvertexec.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/mesa/shader/nvfragparse.c b/src/mesa/shader/nvfragparse.c index 6a8d250d7e..52b3675832 100644 --- 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 a413dcbc29..0e0e459b28 100644 --- 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, |