diff options
| author | Marek Olšák <[email protected]> | 2017-03-23 22:59:08 +0100 |
|---|---|---|
| committer | Marek Olšák <[email protected]> | 2017-03-29 15:44:00 +0200 |
| commit | 96a1c2406db4ac79335a7f6e6d61d80d985df76e (patch) | |
| tree | 998ac489e36bcc1ce6f73f692a621f9e079d7209 /src/mesa/main/state.c | |
| parent | d68150f15d41756fa7153cd6b597ff52ec85a933 (diff) | |
mesa: don't use _NEW_TEXTURE mainly in mesa/main
v2: add missing %s
Reviewed-by: Edward O'Callaghan <[email protected]>
Reviewed-by: Timothy Arceri <[email protected]>
Reviewed-by: Nicolai Hähnle <[email protected]>
Diffstat (limited to 'src/mesa/main/state.c')
| -rw-r--r-- | src/mesa/main/state.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/mesa/main/state.c b/src/mesa/main/state.c index 71265a537ab..07629d8ccac 100644 --- a/src/mesa/main/state.c +++ b/src/mesa/main/state.c @@ -384,15 +384,15 @@ _mesa_update_state_locked( struct gl_context *ctx ) /* Determine which state flags effect vertex/fragment program state */ if (ctx->FragmentProgram._MaintainTexEnvProgram) { - prog_flags |= (_NEW_BUFFERS | _NEW_TEXTURE | _NEW_FOG | + prog_flags |= (_NEW_BUFFERS | _NEW_TEXTURE_OBJECT | _NEW_FOG | _NEW_VARYING_VP_INPUTS | _NEW_LIGHT | _NEW_POINT | _NEW_RENDERMODE | _NEW_PROGRAM | _NEW_FRAG_CLAMP | - _NEW_COLOR); + _NEW_COLOR | _NEW_TEXTURE_STATE); } if (ctx->VertexProgram._MaintainTnlProgram) { - prog_flags |= (_NEW_VARYING_VP_INPUTS | _NEW_TEXTURE | + prog_flags |= (_NEW_VARYING_VP_INPUTS | _NEW_TEXTURE_OBJECT | _NEW_TEXTURE_MATRIX | _NEW_TRANSFORM | _NEW_POINT | - _NEW_FOG | _NEW_LIGHT | + _NEW_FOG | _NEW_LIGHT | _NEW_TEXTURE_STATE | _MESA_NEW_NEED_EYE_COORDS); } @@ -409,7 +409,7 @@ _mesa_update_state_locked( struct gl_context *ctx ) if (new_state & _NEW_TEXTURE_MATRIX) _mesa_update_texture_matrices(ctx); - if (new_state & (_NEW_TEXTURE | _NEW_PROGRAM)) + if (new_state & (_NEW_TEXTURE_OBJECT | _NEW_TEXTURE_STATE | _NEW_PROGRAM)) _mesa_update_texture_state(ctx); if (new_state & _NEW_POLYGON) |