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

mesa: 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:45:06 -07:00
parent 3aa21f93dc
commit f0188d4b08
2 changed files with 8 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/mesa/swrast/s_context.c
View File

@@ -248,18 +248,11 @@ _swrast_update_fog_state( struct gl_context *ctx )
SWcontext *swrast = SWRAST_CONTEXT(ctx);
const struct gl_fragment_program *fp = ctx->FragmentProgram._Current;
assert((fp == NULL) || (fp->Base.Target == GL_FRAGMENT_PROGRAM_ARB));
/* determine if fog is needed, and if so, which fog mode */
swrast->_FogEnabled = GL_FALSE;
if (fp && fp->Base.Target == GL_FRAGMENT_PROGRAM_ARB) {
if (fp->FogOption != GL_NONE) {
swrast->_FogEnabled = GL_TRUE;
swrast->_FogMode = fp->FogOption;
}
}
else if (ctx->Fog.Enabled) {
swrast->_FogEnabled = GL_TRUE;
swrast->_FogMode = ctx->Fog.Mode;
}
swrast->_FogEnabled = (fp == NULL && ctx->Fog.Enabled);
swrast->_FogMode = ctx->Fog.Mode;
}

12
src/mesa/tnl/t_context.c
View File

@@ -138,16 +138,12 @@ _tnl_InvalidateState( struct gl_context *ctx, GLuint new_state )
}
}
if (ctx->Fog.Enabled) {
/* fixed-function fog */
if (ctx->Fog.Enabled
|| (fp != NULL && (fp->Base.InputsRead & FRAG_BIT_FOGC) != 0)) {
/* Either fixed-function fog or a fragment program needs fog coord.
*/
RENDERINPUTS_SET( tnl->render_inputs_bitset, _TNL_ATTRIB_FOG );
}
else if (fp) {
if (fp->FogOption != GL_NONE || (fp->Base.InputsRead & FRAG_BIT_FOGC)) {
/* fragment program needs fog coord */
RENDERINPUTS_SET( tnl->render_inputs_bitset, _TNL_ATTRIB_FOG );
}
}
if (ctx->Polygon.FrontMode != GL_FILL ||
ctx->Polygon.BackMode != GL_FILL)