summaryrefslogtreecommitdiffstats
path: root/src/mesa/main/texstate.c
diff options
context:
space:
mode:
authorEric Anholt <[email protected]>2014-04-23 18:21:11 -0700
committerEric Anholt <[email protected]>2014-04-30 14:33:20 -0700
commite5e50fae6aaf2a1901f43f05f677e48f447087cc (patch)
tree7d4b1519c70688bec54ef72355029cd541d1f307 /src/mesa/main/texstate.c
parent741f5d58e649cbc35c0d8661616f4e718b4718f0 (diff)
mesa: Finish removing the _ReallyEnabled field.
Reviewed-by: Matt Turner <[email protected]> Reviewed-by: Kenneth Graunke <[email protected]>
Diffstat (limited to 'src/mesa/main/texstate.c')
-rw-r--r--src/mesa/main/texstate.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/src/mesa/main/texstate.c b/src/mesa/main/texstate.c
index 28e8bb1d196..24469da59b4 100644
--- a/src/mesa/main/texstate.c
+++ b/src/mesa/main/texstate.c
@@ -576,8 +576,6 @@ update_texture_state( struct gl_context *ctx )
enabledTargets |= enabledTargetsByStage[i];
}
- texUnit->_ReallyEnabled = 0x0;
-
if (enabledTargets == 0x0) {
_mesa_reference_texobj(&texUnit->_Current, NULL);
/* neither vertex nor fragment processing uses this unit */
@@ -600,14 +598,13 @@ update_texture_state( struct gl_context *ctx )
_mesa_test_texobj_completeness(ctx, texObj);
}
if (_mesa_is_texture_complete(texObj, sampler)) {
- texUnit->_ReallyEnabled = 1 << texIndex;
_mesa_reference_texobj(&texUnit->_Current, texObj);
break;
}
}
}
- if (!texUnit->_ReallyEnabled) {
+ if (texIndex == NUM_TEXTURE_TARGETS) {
if (prog[MESA_SHADER_FRAGMENT]) {
/* If we get here it means the shader is expecting a texture
* object, but there isn't one (or it's incomplete). Use the
@@ -626,7 +623,6 @@ update_texture_state( struct gl_context *ctx )
}
_mesa_reference_texobj(&texUnit->_Current, texObj);
- texUnit->_ReallyEnabled = 1 << texTarget;
}
else {
/* fixed-function: texture unit is really disabled */