diff options
| author | Keith Whitwell <keith@tungstengraphics.com> | 2005-05-09 17:59:13 +0000 |
|---|---|---|
| committer | Keith Whitwell <keith@tungstengraphics.com> | 2005-05-09 17:59:13 +0000 |
| commit | 435eff8b852f59e13554a57f83a48bf8035ec794 (patch) | |
| tree | a77da8461d2c9e0d197c057d4027da946cc0f7ad /src/mesa/drivers/dri/i915/i915_state.c | |
| parent | 276330b2412910777f7016f427909085f02acbb8 (diff) | |
i915 will use _TexEnvProgram (if active)
Diffstat (limited to 'src/mesa/drivers/dri/i915/i915_state.c')
| -rw-r--r-- | src/mesa/drivers/dri/i915/i915_state.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/src/mesa/drivers/dri/i915/i915_state.c b/src/mesa/drivers/dri/i915/i915_state.c index da8e1ed81e2..00b8a12627e 100644 --- a/src/mesa/drivers/dri/i915/i915_state.c +++ b/src/mesa/drivers/dri/i915/i915_state.c @@ -521,17 +521,17 @@ static void i915ShadeModel(GLcontext *ctx, GLenum mode) /* ============================================================= * Fog */ -static void update_fog( GLcontext *ctx ) +void i915_update_fog( GLcontext *ctx ) { i915ContextPtr i915 = I915_CONTEXT(ctx); GLenum mode; GLboolean enabled; GLboolean try_pixel_fog; - if (ctx->FragmentProgram.Enabled && ctx->FragmentProgram.Current) { + if (ctx->FragmentProgram._Active) { /* Pull in static fog state from program */ - mode = ctx->FragmentProgram.Current->FogOption; + mode = ctx->FragmentProgram._Current->FogOption; enabled = (mode != GL_NONE); try_pixel_fog = 1; } @@ -623,7 +623,6 @@ static void i915Fogfv(GLcontext *ctx, GLenum pname, const GLfloat *param) case GL_FOG_MODE: case GL_FOG_START: case GL_FOG_END: - update_fog( ctx ); break; case GL_FOG_DENSITY: @@ -658,7 +657,6 @@ static void i915Hint(GLcontext *ctx, GLenum target, GLenum state) { switch (target) { case GL_FOG_HINT: - update_fog( ctx ); break; default: break; @@ -703,7 +701,6 @@ static void i915Enable(GLcontext *ctx, GLenum cap, GLboolean state) break; case GL_FRAGMENT_PROGRAM_ARB: - update_fog( ctx ); break; case GL_DITHER: @@ -743,7 +740,6 @@ static void i915Enable(GLcontext *ctx, GLenum cap, GLboolean state) break; case GL_FOG: - update_fog( ctx ); break; case GL_CULL_FACE: |