Mesa (master): mesa: flush glBegin/End before changing GL_DEPTH_STENCIL_TEXTURE_MODE

[GitLab Mirror]

Module: Mesa
Branch: master
Commit: a1f16b59b3ce7e1498e08d57947bbc9cf78624ed
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=a1f16b59b3ce7e1498e08d57947bbc9cf78624ed

Author: Marek Olšák <marek.olsak at amd.com>
Date:   Sat Dec 19 01:48:40 2020 -0500

mesa: flush glBegin/End before changing GL_DEPTH_STENCIL_TEXTURE_MODE

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

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

---

 src/mesa/main/texparam.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/mesa/main/texparam.c b/src/mesa/main/texparam.c
index a05615e2386..dffc509bece 100644
--- a/src/mesa/main/texparam.c
+++ b/src/mesa/main/texparam.c
@@ -506,6 +506,8 @@ set_tex_parameteri(struct gl_context *ctx,
          if (texObj->StencilSampling == stencil)
             return GL_FALSE;
 
+         /* This should not be restored by glPopAttrib. */
+         FLUSH_VERTICES(ctx, _NEW_TEXTURE_OBJECT);
          texObj->StencilSampling = stencil;
          return GL_TRUE;
       }