Mesa (master): swrast: Drop remaining use of _ReallyEnabled.

Eric Anholt anholt at kemper.freedesktop.org
Wed Apr 30 21:53:45 UTC 2014


Module: Mesa
Branch: master
Commit: 2f8749af20d4bcfc976e64d4bcaef87728c54b5c
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=2f8749af20d4bcfc976e64d4bcaef87728c54b5c

Author: Eric Anholt <eric at anholt.net>
Date:   Wed Apr 23 17:21:57 2014 -0700

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 at gmail.com>
Reviewed-by: Kenneth Graunke <kenneth at whitecape.org>

---

 src/mesa/swrast/s_triangle.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/mesa/swrast/s_triangle.c b/src/mesa/swrast/s_triangle.c
index ef02abe..1649066 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




More information about the mesa-commit mailing list