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

[GitLab Mirror]

Module: Mesa
Branch: staging/21.0
Commit: 33127367ef78c27e3aa182eb38500e60e7a413ce
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=33127367ef78c27e3aa182eb38500e60e7a413ce

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>
(cherry picked from commit a1f16b59b3ce7e1498e08d57947bbc9cf78624ed)

Conflicts:
	src/mesa/main/texparam.c

---

 .pick_status.json        | 2 +-
 src/mesa/main/texparam.c | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/.pick_status.json b/.pick_status.json
index 5a70009a789..157cb54b839 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -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"
     },
diff --git a/src/mesa/main/texparam.c b/src/mesa/main/texparam.c
index d99ed4f1408..813d85b2ec0 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->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;
       }