summaryrefslogtreecommitdiffstats
path: root/src/mesa/drivers/dri/r200/r200_state.c
diff options
context:
space:
mode:
authorEric Anholt <eric@anholt.net>2014-04-23 17:14:26 -0700
committerEric Anholt <eric@anholt.net>2014-04-30 14:33:20 -0700
commitff9c3e8e5a22597c83505479e918981377f8fdf4 (patch)
treedd21df42cde090b65d94cda00de32d4db6c18d89 /src/mesa/drivers/dri/r200/r200_state.c
parent62d46332d8ed7a6270bc4e0520cf52668efd33b5 (diff)
downloadexternal_mesa3d-ff9c3e8e5a22597c83505479e918981377f8fdf4.zip
external_mesa3d-ff9c3e8e5a22597c83505479e918981377f8fdf4.tar.gz
external_mesa3d-ff9c3e8e5a22597c83505479e918981377f8fdf4.tar.bz2
mesa: Replace use of _ReallyEnabled as a boolean with use of _Current.
I'm probably not the only person that has tried to kill _ReallyEnabled. This does the mechanical part of the work, and cleans _ReallyEnabled from i965. I think that using _Current makes texture management clearer: You can't have multiple targets in use in the same texture image unit at the same time, because there's just that one pointer. Reviewed-by: Matt Turner <mattst88@gmail.com> Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Diffstat (limited to 'src/mesa/drivers/dri/r200/r200_state.c')
-rw-r--r--src/mesa/drivers/dri/r200/r200_state.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/mesa/drivers/dri/r200/r200_state.c b/src/mesa/drivers/dri/r200/r200_state.c
index 7c46d11..2c7b652 100644
--- a/src/mesa/drivers/dri/r200/r200_state.c
+++ b/src/mesa/drivers/dri/r200/r200_state.c
@@ -2167,7 +2167,7 @@ static void update_texturematrix( struct gl_context *ctx )
rmesa->TexMatCompSel = 0;
for (unit = 0 ; unit < ctx->Const.MaxTextureUnits; unit++) {
- if (!ctx->Texture.Unit[unit]._ReallyEnabled)
+ if (!ctx->Texture.Unit[unit]._Current)
continue;
if (ctx->TextureMatrixStack[unit].Top->type != MATRIX_IDENTITY) {
@@ -2239,7 +2239,7 @@ static GLboolean r200ValidateBuffers(struct gl_context *ctx)
for (i = 0; i < ctx->Const.Program[MESA_SHADER_FRAGMENT].MaxTextureImageUnits; ++i) {
radeonTexObj *t;
- if (!ctx->Texture.Unit[i]._ReallyEnabled)
+ if (!ctx->Texture.Unit[i]._Current)
continue;
t = radeon_tex_obj(ctx->Texture.Unit[i]._Current);