diff options
| author | Brian Paul <brianp@vmware.com> | 2009-05-01 09:37:14 -0600 |
|---|---|---|
| committer | Brian Paul <brianp@vmware.com> | 2009-05-01 09:37:14 -0600 |
| commit | b9196c1fa39dd566c5d7ab340e353b77714edb5f (patch) | |
| tree | ecc4f85989f40699ccd118a00af63f68273fcb22 /src/mesa/drivers/dri/r200/r200_state.c | |
| parent | 3f25219c7bf0f090502489928f0f018e62c4f6cf (diff) | |
| parent | dca190e9432d4ed122bdd534922d0c3d85791c6a (diff) | |
Merge branch 'const-buffer-changes'
Conflicts:
src/mesa/drivers/dri/i965/brw_curbe.c
src/mesa/drivers/dri/i965/brw_vs_emit.c
src/mesa/drivers/dri/i965/brw_wm_glsl.c
Diffstat (limited to 'src/mesa/drivers/dri/r200/r200_state.c')
| -rw-r--r-- | src/mesa/drivers/dri/r200/r200_state.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/mesa/drivers/dri/r200/r200_state.c b/src/mesa/drivers/dri/r200/r200_state.c index 2fcc87c0f5..28ba5f49bc 100644 --- a/src/mesa/drivers/dri/r200/r200_state.c +++ b/src/mesa/drivers/dri/r200/r200_state.c @@ -2484,7 +2484,7 @@ void r200ValidateState( GLcontext *ctx ) r200UpdateDrawBuffer(ctx); } - if (new_state & (_NEW_TEXTURE | _NEW_PROGRAM)) { + if (new_state & (_NEW_TEXTURE | _NEW_PROGRAM | _NEW_PROGRAM_CONSTANTS)) { r200UpdateTextureState( ctx ); new_state |= rmesa->NewGLState; /* may add TEXTURE_MATRIX */ r200UpdateLocalViewer( ctx ); @@ -2523,6 +2523,7 @@ void r200ValidateState( GLcontext *ctx ) } if (new_state & (_NEW_PROGRAM| + _NEW_PROGRAM_CONSTANTS | /* need to test for pretty much anything due to possible parameter bindings */ _NEW_MODELVIEW|_NEW_PROJECTION|_NEW_TRANSFORM| _NEW_LIGHT|_NEW_TEXTURE|_NEW_TEXTURE_MATRIX| |