diff options
Diffstat (limited to 'src/mesa/main/texstate.c')
| -rw-r--r-- | src/mesa/main/texstate.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/mesa/main/texstate.c b/src/mesa/main/texstate.c index 7e944120fa..9d30b2a8e7 100644 --- a/src/mesa/main/texstate.c +++ b/src/mesa/main/texstate.c @@ -585,7 +585,7 @@ update_texture_state( struct gl_context *ctx ) if (enabledTargets & (1 << texIndex)) { struct gl_texture_object *texObj = texUnit->CurrentTex[texIndex]; struct gl_sampler_object *sampler = texUnit->Sampler ? - texUnit->Sampler : &texObj->Sampler; + texUnit->Sampler : texObj->Sampler; if (!_mesa_is_texture_complete(texObj, sampler)) { _mesa_test_texobj_completeness(ctx, texObj); @@ -597,7 +597,6 @@ update_texture_state( struct gl_context *ctx ) } } } - if (!texUnit->_ReallyEnabled) { if (fprog) { /* If we get here it means the shader is expecting a texture |