diff options
| author | Eric Anholt <eric@anholt.net> | 2014-04-23 15:30:27 -0700 |
|---|---|---|
| committer | Eric Anholt <eric@anholt.net> | 2014-04-30 14:33:17 -0700 |
| commit | c703658b3965bf2e4f3593a0d54be03e8e8b1436 (patch) | |
| tree | b5b6b201cbc4816dec9b6f51c0da3570b50585a3 /src/mesa/main/texstate.c | |
| parent | 3dfe56c53bc7f37b65b72408fe3470ecfd218595 (diff) | |
| download | external_mesa3d-c703658b3965bf2e4f3593a0d54be03e8e8b1436.zip external_mesa3d-c703658b3965bf2e4f3593a0d54be03e8e8b1436.tar.gz external_mesa3d-c703658b3965bf2e4f3593a0d54be03e8e8b1436.tar.bz2 | |
mesa: Drop _EnabledUnits.
The field wasn't really valid, since we've got more than 32 units now. It
turns out it was mostly just used for checking != 0, or checking for fixed
function coordinates, though.
v2: Fix mis-conversion in xm_line.c (caught by Ken).
Reviewed-by: Matt Turner <mattst88@gmail.com> (v1)
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Diffstat (limited to 'src/mesa/main/texstate.c')
| -rw-r--r-- | src/mesa/main/texstate.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/src/mesa/main/texstate.c b/src/mesa/main/texstate.c index b68920c..36c543b 100644 --- a/src/mesa/main/texstate.c +++ b/src/mesa/main/texstate.c @@ -546,7 +546,6 @@ update_texture_state( struct gl_context *ctx ) /* TODO: only set this if there are actual changes */ ctx->NewState |= _NEW_TEXTURE; - ctx->Texture._EnabledUnits = 0x0; ctx->Texture._GenFlags = 0x0; ctx->Texture._TexMatEnabled = 0x0; ctx->Texture._TexGenEnabled = 0x0; @@ -635,8 +634,6 @@ update_texture_state( struct gl_context *ctx ) } /* if we get here, we know this texture unit is enabled */ - - ctx->Texture._EnabledUnits |= (1 << unit); ctx->Texture._MaxEnabledTexImageUnit = unit; if (enabledTargetsByStage[MESA_SHADER_FRAGMENT]) @@ -796,7 +793,6 @@ _mesa_init_texture(struct gl_context *ctx) /* Texture group */ ctx->Texture.CurrentUnit = 0; /* multitexture */ - ctx->Texture._EnabledUnits = 0x0; /* Appendix F.2 of the OpenGL ES 3.0 spec says: * |