diff options
| author | Ian Romanick <ian.d.romanick@intel.com> | 2011-04-15 18:46:57 -0700 |
|---|---|---|
| committer | Ian Romanick <ian.d.romanick@intel.com> | 2011-04-21 17:33:26 -0700 |
| commit | df7555e763b9a4d989788e9b1cd25e8740649e79 (patch) | |
| tree | de4c3a4bf8398a6ada197fb963d97c40b986dc9c | |
| parent | 8780c38983d9570004b4faed754f9d6a102cfb76 (diff) | |
| download | external_mesa3d-df7555e763b9a4d989788e9b1cd25e8740649e79.zip external_mesa3d-df7555e763b9a4d989788e9b1cd25e8740649e79.tar.gz external_mesa3d-df7555e763b9a4d989788e9b1cd25e8740649e79.tar.bz2 | |
i915: gl_fragment_program::FogOption is always GL_NONE so don't check it
Reviewed-by: Eric Anholt <eric@anholt.net>
Acked-by: Corbin Simpson <MostAwesomeDude@gmail.com>
Acked-by: Alex Deucher <alexdeucher@gmail.com>
| -rw-r--r-- | src/mesa/drivers/dri/i915/i915_fragprog.c | 9 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/i915/i915_state.c | 4 |
2 files changed, 2 insertions, 11 deletions
diff --git a/src/mesa/drivers/dri/i915/i915_fragprog.c b/src/mesa/drivers/dri/i915/i915_fragprog.c index 7286e2b..bfc2f96 100644 --- a/src/mesa/drivers/dri/i915/i915_fragprog.c +++ b/src/mesa/drivers/dri/i915/i915_fragprog.c @@ -1285,15 +1285,6 @@ i915ProgramStringNotify(struct gl_context * ctx, if (target == GL_FRAGMENT_PROGRAM_ARB) { struct i915_fragment_program *p = (struct i915_fragment_program *) prog; p->translated = 0; - - /* Hack: make sure fog is correctly enabled according to this - * fragment program's fog options. - */ - if (p->FragProg.FogOption) { - /* add extra instructions to do fog, then turn off FogOption field */ - _mesa_append_fog_code(ctx, &p->FragProg, GL_TRUE); - p->FragProg.FogOption = GL_NONE; - } } (void) _tnl_program_string(ctx, target, prog); diff --git a/src/mesa/drivers/dri/i915/i915_state.c b/src/mesa/drivers/dri/i915/i915_state.c index 3b1af4c..5c7c0c3 100644 --- a/src/mesa/drivers/dri/i915/i915_state.c +++ b/src/mesa/drivers/dri/i915/i915_state.c @@ -736,8 +736,8 @@ i915_update_fog(struct gl_context * ctx) if (ctx->FragmentProgram._Current) { /* Pull in static fog state from program */ - mode = ctx->FragmentProgram._Current->FogOption; - enabled = (mode != GL_NONE); + mode = GL_NONE; + enabled = GL_FALSE; try_pixel_fog = 0; } else { |