diff options
| author | Eric Anholt <eric@anholt.net> | 2014-04-23 17:14:26 -0700 |
|---|---|---|
| committer | Eric Anholt <eric@anholt.net> | 2014-04-30 14:33:20 -0700 |
| commit | ff9c3e8e5a22597c83505479e918981377f8fdf4 (patch) | |
| tree | dd21df42cde090b65d94cda00de32d4db6c18d89 /src/mesa/main/ff_fragment_shader.cpp | |
| parent | 62d46332d8ed7a6270bc4e0520cf52668efd33b5 (diff) | |
| download | external_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/main/ff_fragment_shader.cpp')
| -rw-r--r-- | src/mesa/main/ff_fragment_shader.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/mesa/main/ff_fragment_shader.cpp b/src/mesa/main/ff_fragment_shader.cpp index 66c18fa..f1ef38e 100644 --- a/src/mesa/main/ff_fragment_shader.cpp +++ b/src/mesa/main/ff_fragment_shader.cpp @@ -430,7 +430,7 @@ static GLuint make_state_key( struct gl_context *ctx, struct state_key *key ) const struct gl_sampler_object *samp; GLenum format; - if (!texUnit->_ReallyEnabled || !texUnit->Enabled) + if (!texUnit->_Current || !texUnit->Enabled) continue; samp = _mesa_get_samplerobj(ctx, i); |