diff options
| author | Eric Anholt <eric@anholt.net> | 2014-04-23 15:45:50 -0700 |
|---|---|---|
| committer | Eric Anholt <eric@anholt.net> | 2014-04-30 14:21:59 -0700 |
| commit | 3dfe56c53bc7f37b65b72408fe3470ecfd218595 (patch) | |
| tree | 9c9c9689d1e13e3ff24124576051dce3be7f402b /src/mesa/swrast | |
| parent | 1ad443ecdd694dd9bf3c4a5050d749fb80db6fa2 (diff) | |
| download | external_mesa3d-3dfe56c53bc7f37b65b72408fe3470ecfd218595.zip external_mesa3d-3dfe56c53bc7f37b65b72408fe3470ecfd218595.tar.gz external_mesa3d-3dfe56c53bc7f37b65b72408fe3470ecfd218595.tar.bz2 | |
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 <mattst88@gmail.com>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Diffstat (limited to 'src/mesa/swrast')
| -rw-r--r-- | src/mesa/swrast/s_context.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/mesa/swrast/s_context.c b/src/mesa/swrast/s_context.c index 0748500..9fe12f1 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; |