OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

i915: gl_fragment_program::FogOption is always GL_NONE so don't check it

Browse Source 
Reviewed-by: Eric Anholt <eric@anholt.net>
Acked-by: Corbin Simpson <MostAwesomeDude@gmail.com>
Acked-by: Alex Deucher <alexdeucher@gmail.com>
This commit is contained in:
Ian Romanick
2011-04-15 18:46:57 -07:00
parent 8780c38983
commit df7555e763
2 changed files with 2 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/mesa/drivers/dri/i915/i915_fragprog.c
View File

@@ -1285,15 +1285,6 @@ i915ProgramStringNotify(struct gl_context * ctx,
if (target == GL_FRAGMENT_PROGRAM_ARB) { if (target == GL_FRAGMENT_PROGRAM_ARB) {
struct i915_fragment_program *p = (struct i915_fragment_program *) prog; struct i915_fragment_program *p = (struct i915_fragment_program *) prog;
p->translated = 0; 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); (void) _tnl_program_string(ctx, target, prog);

4
src/mesa/drivers/dri/i915/i915_state.c
View File

@@ -736,8 +736,8 @@ i915_update_fog(struct gl_context * ctx)
if (ctx->FragmentProgram._Current) { if (ctx->FragmentProgram._Current) {
/* Pull in static fog state from program */ /* Pull in static fog state from program */
mode = ctx->FragmentProgram._Current->FogOption; mode = GL_NONE;
enabled = (mode != GL_NONE); enabled = GL_FALSE;
try_pixel_fog = 0; try_pixel_fog = 0;
} }
else { else {