summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrian <[email protected]>2007-10-17 15:59:59 -0600
committerBrian <[email protected]>2007-10-17 15:59:59 -0600
commit420c062cb68e4e313ef34bd879852a003101169e (patch)
treeeaede320065e5bdefaff8274266db74c54c3d502
parent5cb0d749b07be4ecbf4d4d7cde18aecdfe2dba38 (diff)
Assert that there's no outstanding current state that needs to be flushed from the vbo in _mesa_load_state_parameters().
Several of the state parameters use current state (such as materials). Need to make sure those values are not stale.
-rw-r--r--src/mesa/shader/prog_statevars.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/mesa/shader/prog_statevars.c b/src/mesa/shader/prog_statevars.c
index d37d7fb9bf4..9a745a77e55 100644
--- a/src/mesa/shader/prog_statevars.c
+++ b/src/mesa/shader/prog_statevars.c
@@ -815,6 +815,8 @@ _mesa_load_state_parameters(GLcontext *ctx,
if (!paramList)
return;
+ assert(ctx->Driver.NeedFlush == 0);
+
for (i = 0; i < paramList->NumParameters; i++) {
if (paramList->Parameters[i].Type == PROGRAM_STATE_VAR) {
_mesa_fetch_state(ctx,