fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-04 20:38:06 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

swrast: simplify state update logic for fragment shader const buffers

Browse source
This commit is contained in:
Brian Paul 2009-04-21 17:00:01 -06:00
parent 3eeefa47d0
commit 7872b8e37e
1 changed files with 2 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
src/mesa/swrast/s_context.c
View file

@ -264,13 +264,7 @@ _swrast_update_fragment_program(GLcontext *ctx, GLbitfield newState)
{
const struct gl_fragment_program *fp = ctx->FragmentProgram._Current;
if (fp) {
#if 0
/* XXX Need a way to trigger the initial loading of parameters
* even when there's no recent state changes.
*/
if (fp->Base.Parameters->StateFlags & newState)
#endif
_mesa_load_state_parameters(ctx, fp->Base.Parameters);
_mesa_load_state_parameters(ctx, fp->Base.Parameters);
}
}
@ -524,13 +518,6 @@ _swrast_invalidate_state( GLcontext *ctx, GLbitfield new_state )
new_state = ~0;
}
{
const struct gl_fragment_program *fp = ctx->FragmentProgram._Current;
if (fp && (fp->Base.Parameters->StateFlags & new_state)) {
_mesa_load_state_parameters(ctx, fp->Base.Parameters);
}
}
if (new_state & swrast->InvalidateTriangleMask)
swrast->Triangle = _swrast_validate_triangle;
@ -647,17 +634,7 @@ _swrast_validate_derived( GLcontext *ctx )
if (swrast->NewState & (_NEW_FOG | _NEW_PROGRAM))
_swrast_update_fog_state( ctx );
if (swrast->NewState & (_NEW_MODELVIEW |
_NEW_PROJECTION |
_NEW_TEXTURE_MATRIX |
_NEW_FOG |
_NEW_LIGHT |
_NEW_LINE |
_NEW_TEXTURE |
_NEW_TRANSFORM |
_NEW_POINT |
_NEW_VIEWPORT |
_NEW_PROGRAM))
if (swrast->NewState & (_NEW_PROGRAM_CONSTANTS | _NEW_PROGRAM))
_swrast_update_fragment_program( ctx, swrast->NewState );
if (swrast->NewState & (_NEW_TEXTURE | _NEW_PROGRAM)) {