fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-09 04:38:03 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

mesa: don't push/pop ctx->Texture._* derived states

Browse source 
They are always recomputed by _mesa_update_state, which will need the old
values, so that it can update other dependent states if needed.

Reviewed-by: Zoltán Böszörményi <zboszor@gmail.com>
Acked-by: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/8850>
This commit is contained in:
Marek Olšák 2021-02-03 13:54:34 -05:00 • committed by Marge Bot
parent 0dd87304ef
commit 06a8f852f7
3 changed files with 0 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/mesa/main/attrib.c
View file

@ -257,8 +257,6 @@ _mesa_PushAttrib(GLbitfield mask)
/* copy/save the bulk of texture state here */
head->Texture.CurrentUnit = ctx->Texture.CurrentUnit;
head->Texture._TexGenEnabled = ctx->Texture._TexGenEnabled;
head->Texture._GenFlags = ctx->Texture._GenFlags;
memcpy(&head->Texture.FixedFuncUnit, &ctx->Texture.FixedFuncUnit,
sizeof(ctx->Texture.FixedFuncUnit));
@ -700,11 +698,6 @@ pop_texture_group(struct gl_context *ctx, struct gl_texture_attrib_node *texstat
copy_texture_attribs(dst, src, tex);
}
if (!ctx->Driver.TexEnv && !ctx->Driver.TexGen) {
ctx->Texture._TexGenEnabled = texstate->_TexGenEnabled;
ctx->Texture._GenFlags = texstate->_GenFlags;
}
_mesa_ActiveTexture(GL_TEXTURE0_ARB + texstate->CurrentUnit);
_mesa_unlock_context_textures(ctx);
}

2
src/mesa/main/mtypes.h
View file

@ -5107,8 +5107,6 @@ struct gl_texture_attrib_node
{
GLuint CurrentUnit; /**< GL_ACTIVE_TEXTURE */
GLuint NumTexSaved;
GLbitfield8 _TexGenEnabled;
GLbitfield8 _GenFlags;
struct gl_fixedfunc_texture_unit FixedFuncUnit[MAX_TEXTURE_COORD_UNITS];
GLfloat LodBias[MAX_TEXTURE_UNITS];

3
src/mesa/main/texstate.c
View file

@ -72,9 +72,6 @@ _mesa_copy_texture_state( const struct gl_context *src, struct gl_context *dst )
assert(dst);
dst->Texture.CurrentUnit = src->Texture.CurrentUnit;
dst->Texture._GenFlags = src->Texture._GenFlags;
dst->Texture._TexGenEnabled = src->Texture._TexGenEnabled;
dst->Texture._TexMatEnabled = src->Texture._TexMatEnabled;
/* per-unit state */
for (u = 0; u < src->Const.MaxCombinedTextureImageUnits; u++) {