From: Mike Blumenkrantz <michael.blumenkrantz@gmail.com>
Date: Fri, 3 Jul 2020 17:34:34 +0000 (-0400)
Subject: zink: don't leak sampler view textures
X-Git-Tag: upstream/21.0.0~3743
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=4f144dc92ce221e0c7106436a1c2a43da2e9f733;p=platform%2Fupstream%2Fmesa.git

zink: don't leak sampler view textures

by adding a batch reference for these textures during draw, we can successfully
destroy the resources without crashing

Reviewed-by: Erik Faye-Lun <erik.faye-lund@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/6924>
---

diff --git a/src/gallium/drivers/zink/zink_context.c b/src/gallium/drivers/zink/zink_context.c
index 0ea5a50..0b224ff 100644
--- a/src/gallium/drivers/zink/zink_context.c
+++ b/src/gallium/drivers/zink/zink_context.c
@@ -290,6 +290,7 @@ zink_sampler_view_destroy(struct pipe_context *pctx,
 {
    struct zink_sampler_view *view = zink_sampler_view(pview);
    vkDestroyImageView(zink_screen(pctx->screen)->dev, view->image_view, NULL);
+   pipe_resource_reference(&pview->texture, NULL);
    FREE(view);
 }
 
diff --git a/src/gallium/drivers/zink/zink_draw.c b/src/gallium/drivers/zink/zink_draw.c
index 5877ba0..6302436 100644
--- a/src/gallium/drivers/zink/zink_draw.c
+++ b/src/gallium/drivers/zink/zink_draw.c
@@ -390,6 +390,7 @@ zink_draw_vbo(struct pipe_context *pctx,
          } else {
             struct zink_sampler_view *sampler_view = zink_sampler_view(ctx->image_views[i][index]);
             zink_batch_reference_sampler_view(batch, sampler_view);
+            zink_batch_reference_resource_rw(batch, zink_resource(ctx->image_views[i][index]->texture), false);
          }
       }
    }