diff options
| author | Ian Romanick <[email protected]> | 2015-11-09 11:15:04 -0800 |
|---|---|---|
| committer | Ian Romanick <[email protected]> | 2015-11-24 11:31:30 -0800 |
| commit | 47b3a0d23504de43ce2dc028e84037f7cd89bd89 (patch) | |
| tree | d38107bc5d2deb705a9b481ae64e041ff6b36bb0 /src/mesa | |
| parent | c63f9c735dfbd572b671f739ba5df0c2ad9a388a (diff) | |
meta: Don't save or restore the active client texture
This setting is only used by glTexCoordPointer and related glEnable
calls. Since the preceeding commits removed all of those, it is not
necessary to save, reset to default, or restore this state.
Signed-off-by: Ian Romanick <[email protected]>
Reviewed-by: Anuj Phogat <[email protected]>
Diffstat (limited to 'src/mesa')
| -rw-r--r-- | src/mesa/drivers/common/meta.c | 3 | ||||
| -rw-r--r-- | src/mesa/drivers/common/meta.h | 1 |
2 files changed, 0 insertions, 4 deletions
diff --git a/src/mesa/drivers/common/meta.c b/src/mesa/drivers/common/meta.c index 55b061dd30a..5610e9ff80f 100644 --- a/src/mesa/drivers/common/meta.c +++ b/src/mesa/drivers/common/meta.c @@ -660,7 +660,6 @@ _mesa_meta_begin(struct gl_context *ctx, GLbitfield state) GLuint u, tgt; save->ActiveUnit = ctx->Texture.CurrentUnit; - save->ClientActiveUnit = ctx->Array.ActiveTexture; save->EnvMode = ctx->Texture.Unit[0].EnvMode; /* Disable all texture units */ @@ -693,7 +692,6 @@ _mesa_meta_begin(struct gl_context *ctx, GLbitfield state) /* set defaults for unit[0] */ _mesa_ActiveTexture(GL_TEXTURE0); - _mesa_ClientActiveTexture(GL_TEXTURE0); _mesa_TexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); } @@ -1120,7 +1118,6 @@ _mesa_meta_end(struct gl_context *ctx) /* restore current unit state */ _mesa_ActiveTexture(GL_TEXTURE0 + save->ActiveUnit); - _mesa_ClientActiveTexture(GL_TEXTURE0 + save->ClientActiveUnit); } if (state & MESA_META_TRANSFORM) { diff --git a/src/mesa/drivers/common/meta.h b/src/mesa/drivers/common/meta.h index ae6e2b5ae1b..21495eecd27 100644 --- a/src/mesa/drivers/common/meta.h +++ b/src/mesa/drivers/common/meta.h @@ -146,7 +146,6 @@ struct save_state /** MESA_META_TEXTURE */ GLuint ActiveUnit; - GLuint ClientActiveUnit; /** for unit[0] only */ struct gl_texture_object *CurrentTexture[NUM_TEXTURE_TARGETS]; /** mask of TEXTURE_2D_BIT, etc */ |