[Mesa-dev] [PATCH 10/14] swrast: Drop remaining use of _ReallyEnabled.

Eric Anholt eric at anholt.net
Thu Apr 24 17:50:17 PDT 2014


The _MaxEnabledTexImageUnit check assures us that Unit[0].Current != NULL.
This is the last consumer of _ReallyEnabled outside of the radeons.
---
 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
-- 
1.9.2



More information about the mesa-dev mailing list