From b1c1d099a97bf08a36f3bc2ebe847b55541e6dc5 Mon Sep 17 00:00:00 2001
From: Mike Blumenkrantz <michael.blumenkrantz@gmail.com>
Date: Thu, 7 Jul 2022 12:43:07 -0400
Subject: [PATCH] zink: always update sampler descriptor layouts on fb surface
 unbind

this will affect the layout

Reviewed-by: Dave Airlie <airlied@redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/17524>
---
 src/gallium/drivers/zink/zink_context.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/gallium/drivers/zink/zink_context.c b/src/gallium/drivers/zink/zink_context.c
index 19bec9b..10c449d 100644
--- a/src/gallium/drivers/zink/zink_context.c
+++ b/src/gallium/drivers/zink/zink_context.c
@@ -2679,8 +2679,11 @@ unbind_fb_surface(struct zink_context *ctx, struct pipe_surface *surf, unsigned
       ctx->rp_changed = true;
    }
    res->fb_binds--;
-   if (!res->fb_binds)
+   if (!res->fb_binds) {
       check_resource_for_batch_ref(ctx, res);
+      if (res->sampler_bind_count[0])
+         update_res_sampler_layouts(ctx, res);
+   }
 }
 
 void
-- 
2.7.4