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/i915/i915_context.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/i915/i915_context.c')
| -rw-r--r-- | src/mesa/drivers/dri/i915/i915_context.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/mesa/drivers/dri/i915/i915_context.c b/src/mesa/drivers/dri/i915/i915_context.c index 1f9f363df9..367d2a3b64 100644 --- a/src/mesa/drivers/dri/i915/i915_context.c +++ b/src/mesa/drivers/dri/i915/i915_context.c @@ -73,7 +73,7 @@ i915InvalidateState(GLcontext * ctx, GLuint new_state) p->params_uptodate = 0; } - if (new_state & (_NEW_FOG | _NEW_HINT | _NEW_PROGRAM)) + if (new_state & (_NEW_FOG | _NEW_HINT | _NEW_PROGRAM | _NEW_PROGRAM_CONSTANTS)) i915_update_fog(ctx); } |