swrast: Drop remaining use of _ReallyEnabled.
authorEric Anholt <eric@anholt.net>
Thu, 24 Apr 2014 00:21:57 +0000 (17:21 -0700)
committerEric Anholt <eric@anholt.net>
Wed, 30 Apr 2014 21:33:20 +0000 (14:33 -0700)
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>
src/mesa/swrast/s_triangle.c

index ef02abec8c2c718d2ee368c551e42b9c89fba1f7..16490664322aa3411b671ebb4dc20f1af4f1754b 100644 (file)
@@ -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