From 9f764486cb746259d42408c419b299b099d6dc51 Mon Sep 17 00:00:00 2001
From: Mike Blumenkrantz <michael.blumenkrantz@gmail.com>
Date: Wed, 13 Aug 2025 08:23:36 -0400
Subject: [PATCH] cso: unbind vertex buffers when unbinding context
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

cc: mesa-stable

Reviewed-by: Marek Olšák <marek.olsak@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/37276>
---
 src/gallium/auxiliary/cso_cache/cso_context.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/gallium/auxiliary/cso_cache/cso_context.c b/src/gallium/auxiliary/cso_cache/cso_context.c
index 98149af8537..d9b4e7399e4 100644
--- a/src/gallium/auxiliary/cso_cache/cso_context.c
+++ b/src/gallium/auxiliary/cso_cache/cso_context.c
@@ -440,6 +440,7 @@ cso_unbind_context(struct cso_context *cso)
          ctx->base.pipe->bind_ms_state(ctx->base.pipe, NULL);
       }
       ctx->base.pipe->bind_vertex_elements_state(ctx->base.pipe, NULL);
+      ctx->base.pipe->set_vertex_buffers(ctx->base.pipe, 0, NULL);
 
       if (ctx->has_streamout)
          ctx->base.pipe->set_stream_output_targets(ctx->base.pipe, 0, NULL, NULL, 0);