From: Eric Anholt Date: Wed, 23 Apr 2014 22:45:50 +0000 (-0700) Subject: swrast: Just use _EnabledCoordUnits for figuring out which texcoords to build. X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=3dfe56c53bc7f37b65b72408fe3470ecfd218595;p=mesa.git swrast: Just use _EnabledCoordUnits for figuring out which texcoords to build. _EnabledUnits is all of the first 32 image units that are used by fixed function or programs, while _EnabledCoordUnits is just which fixed function fragment shader texcoords need to be generated. This is a theoretical bugfix in the case of a vertex shader texturing from large texture image unit number (we'd end up flagging something other than a VARYING_SLOT_TEXn as needing to be generated), but it's actually just motivated by trying to kill _EnabledUnits. Reviewed-by: Matt Turner Reviewed-by: Kenneth Graunke --- diff --git a/src/mesa/swrast/s_context.c b/src/mesa/swrast/s_context.c index 07485006cb7..9fe12f14beb 100644 --- a/src/mesa/swrast/s_context.c +++ b/src/mesa/swrast/s_context.c @@ -523,7 +523,7 @@ _swrast_update_active_attribs(struct gl_context *ctx) if (swrast->_FogEnabled) attribsMask |= VARYING_BIT_FOGC; - attribsMask |= (ctx->Texture._EnabledUnits << VARYING_SLOT_TEX0); + attribsMask |= (ctx->Texture._EnabledCoordUnits << VARYING_SLOT_TEX0); } swrast->_ActiveAttribMask = attribsMask;