diff options
| author | Eric Anholt <[email protected]> | 2014-04-23 17:14:26 -0700 |
|---|---|---|
| committer | Eric Anholt <[email protected]> | 2014-04-30 14:33:20 -0700 |
| commit | ff9c3e8e5a22597c83505479e918981377f8fdf4 (patch) | |
| tree | dd21df42cde090b65d94cda00de32d4db6c18d89 /src/mesa/main/texstate.c | |
| parent | 62d46332d8ed7a6270bc4e0520cf52668efd33b5 (diff) | |
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 <[email protected]>
Reviewed-by: Kenneth Graunke <[email protected]>
Diffstat (limited to 'src/mesa/main/texstate.c')
| -rw-r--r-- | src/mesa/main/texstate.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/mesa/main/texstate.c b/src/mesa/main/texstate.c index 5cbf7914b62..28e8bb1d196 100644 --- a/src/mesa/main/texstate.c +++ b/src/mesa/main/texstate.c @@ -371,7 +371,7 @@ update_texture_matrices( struct gl_context *ctx ) if (_math_matrix_is_dirty(ctx->TextureMatrixStack[u].Top)) { _math_matrix_analyse( ctx->TextureMatrixStack[u].Top ); - if (ctx->Texture.Unit[u]._ReallyEnabled && + if (ctx->Texture.Unit[u]._Current && ctx->TextureMatrixStack[u].Top->type != MATRIX_IDENTITY) ctx->Texture._TexMatEnabled |= ENABLE_TEXMAT(u); } |