diff options
| author | Keith Whitwell <keithw@vmware.com> | 2009-01-11 16:19:21 +0000 |
|---|---|---|
| committer | Keith Whitwell <keithw@vmware.com> | 2009-01-11 16:19:21 +0000 |
| commit | e37a3aed95ea91a7ddbabc4bed1fac7c451fe695 (patch) | |
| tree | 9efa59fb8015a58146d7a50a3b6039e5fbe3a60d /src/mesa/drivers/dri/i915/i915_state.c | |
| parent | 61e843ff4bf9b9e8c4a7a8a485cee852a4f1dd86 (diff) | |
| parent | 83a525af95bbb8012b9d7ee6b766621d6bb2d701 (diff) | |
Merge commit 'origin/gallium-0.2' into gallium-xlib-rework
Diffstat (limited to 'src/mesa/drivers/dri/i915/i915_state.c')
| -rw-r--r-- | src/mesa/drivers/dri/i915/i915_state.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/mesa/drivers/dri/i915/i915_state.c b/src/mesa/drivers/dri/i915/i915_state.c index 9d04358e4f..a53f120a81 100644 --- a/src/mesa/drivers/dri/i915/i915_state.c +++ b/src/mesa/drivers/dri/i915/i915_state.c @@ -569,7 +569,7 @@ i915_update_fog(GLcontext * ctx) GLboolean enabled; GLboolean try_pixel_fog; - if (ctx->FragmentProgram._Active) { + if (ctx->FragmentProgram._Current) { /* Pull in static fog state from program */ mode = ctx->FragmentProgram._Current->FogOption; enabled = (mode != GL_NONE); |