From a53b7f1ccb32a79e2053934b141dfd3a5d159aba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Ol=C5=A1=C3=A1k?= Date: Tue, 21 Feb 2023 00:28:52 -0500 Subject: [PATCH] mesa: fix glPopClientAttrib with fixed-func VP and zero-stride varyings This was missed. Fixes: 3a294ff01fb9d1d8b - mesa: move the _mesa_set_varying_vp_inputs call to where the state changes Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/8246 Acked-by: Pierre-Eric Pelloux-Prayer Part-of: (cherry picked from commit 0293f8d8ce8ff6175d9818874976584b81bd7a56) --- .pick_status.json | 2 +- src/mesa/main/attrib.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.pick_status.json b/.pick_status.json index 7a0b46d5045..9632ec2b166 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -5530,7 +5530,7 @@ "description": "mesa: fix glPopClientAttrib with fixed-func VP and zero-stride varyings", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": "3a294ff01fb9d1d8b4f984a364ed7ef469624c49" }, diff --git a/src/mesa/main/attrib.c b/src/mesa/main/attrib.c index f2eaddf09a4..af8816f1f05 100644 --- a/src/mesa/main/attrib.c +++ b/src/mesa/main/attrib.c @@ -1313,6 +1313,8 @@ restore_array_attrib(struct gl_context *ctx, } _mesa_update_edgeflag_state_vao(ctx); + _mesa_set_varying_vp_inputs(ctx, ctx->VertexProgram._VPModeInputFilter & + ctx->Array.VAO->_EnabledWithMapMode); }