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/ffvertex_prog.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/ffvertex_prog.c')
| -rw-r--r-- | src/mesa/main/ffvertex_prog.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/mesa/main/ffvertex_prog.c b/src/mesa/main/ffvertex_prog.c index bdabc3f45ff..728cf968b7e 100644 --- a/src/mesa/main/ffvertex_prog.c +++ b/src/mesa/main/ffvertex_prog.c @@ -239,7 +239,7 @@ static void make_state_key( struct gl_context *ctx, struct state_key *key ) for (i = 0; i < MAX_TEXTURE_COORD_UNITS; i++) { struct gl_texture_unit *texUnit = &ctx->Texture.Unit[i]; - if (texUnit->_ReallyEnabled) + if (texUnit->_Current) key->unit[i].texunit_really_enabled = 1; if (ctx->Point.PointSprite) |