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

mesa: flush glBegin/End before changing GL_DEPTH_STENCIL_TEXTURE_MODE

Browse source 
Fixes: 23e81b93bb "mesa: Add core API support for GL_ARB_stencil_texturing (from 4.3)."

Reviewed-by: Zoltán Böszörményi <zboszor@gmail.com>
Reviewed-by: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/8181>
(cherry picked from commit a1f16b59b3)

Conflicts:
	src/mesa/main/texparam.c
This commit is contained in:
Marek Olšák 2020-12-19 01:48:40 -05:00 • committed by Dylan Baker
parent 7bd9982ba1
commit 33127367ef
2 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.pick_status.json
View file

@ -283,7 +283,7 @@
"description": "mesa: flush glBegin/End before changing GL_DEPTH_STENCIL_TEXTURE_MODE",
"nominated": true,
"nomination_type": 1,
"resolution": 0,
"resolution": 1,
"master_sha": null,
"because_sha": "23e81b93bbe3966a842de507988eeaa7342e12ca"
},

2
src/mesa/main/texparam.c
View file

@ -506,6 +506,8 @@ set_tex_parameteri(struct gl_context *ctx,
if (texObj->Attrib.StencilSampling == stencil)
return GL_FALSE;
/* This should not be restored by glPopAttrib. */
FLUSH_VERTICES(ctx, _NEW_TEXTURE_OBJECT);
texObj->Attrib.StencilSampling = stencil;
return GL_TRUE;
}