diff options
| author | Eric Anholt <eric@anholt.net> | 2014-04-23 17:21:57 -0700 |
|---|---|---|
| committer | Eric Anholt <eric@anholt.net> | 2014-04-30 14:33:20 -0700 |
| commit | 2f8749af20d4bcfc976e64d4bcaef87728c54b5c (patch) | |
| tree | 647872a26d2b5633c661ff310fed540d22fa60ec /src/mesa | |
| parent | 8061f90a64e81eeaf1508d29a0b2524961ef1ab8 (diff) | |
swrast: Drop remaining use of _ReallyEnabled.
The _MaxEnabledTexImageUnit check assures us that Unit[0].Current != NULL.
This is the last consumer of _ReallyEnabled outside of the radeons.
Reviewed-by: Matt Turner <mattst88@gmail.com>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Diffstat (limited to 'src/mesa')
| -rw-r--r-- | src/mesa/swrast/s_triangle.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/mesa/swrast/s_triangle.c b/src/mesa/swrast/s_triangle.c index ef02abec8c2..16490664322 100644 --- a/src/mesa/swrast/s_triangle.c +++ b/src/mesa/swrast/s_triangle.c @@ -1072,7 +1072,7 @@ _swrast_choose_triangle( struct gl_context *ctx ) && !_swrast_use_fragment_program(ctx) && !ctx->ATIFragmentShader._Enabled && ctx->Texture._MaxEnabledTexImageUnit == 0 - && ctx->Texture.Unit[0]._ReallyEnabled == TEXTURE_2D_BIT + && ctx->Texture.Unit[0]._Current->Target == GL_TEXTURE_2D && samp->WrapS == GL_REPEAT && samp->WrapT == GL_REPEAT && texObj2D->_Swizzle == SWIZZLE_NOOP |