From 17ef151f6247770ec3e149aadfde16d2e2f693ef Mon Sep 17 00:00:00 2001
From: Mike Blumenkrantz <michael.blumenkrantz@gmail.com>
Date: Tue, 22 Dec 2020 10:24:26 -0500
Subject: [PATCH] zink: add explicit surface/bufferview batch-tracking
 functions

Reviewed-by: Dave Airlie <airlied@redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/9665>
---
 src/gallium/drivers/zink/zink_batch.c | 47 ++++++++++++++++++++---------------
 src/gallium/drivers/zink/zink_batch.h |  6 +++++
 2 files changed, 33 insertions(+), 20 deletions(-)

diff --git a/src/gallium/drivers/zink/zink_batch.c b/src/gallium/drivers/zink/zink_batch.c
index b76b5f0..07e507f 100644
--- a/src/gallium/drivers/zink/zink_batch.c
+++ b/src/gallium/drivers/zink/zink_batch.c
@@ -394,19 +394,32 @@ ptr_add_usage(struct zink_batch *batch, struct set *s, void *ptr, struct zink_ba
 }
 
 void
+zink_batch_reference_bufferview(struct zink_batch *batch, struct zink_buffer_view *buffer_view)
+{
+   if (!ptr_add_usage(batch, batch->state->bufferviews, buffer_view, &buffer_view->batch_uses))
+      return;
+   pipe_reference(NULL, &buffer_view->reference);
+   batch->has_work = true;
+}
+
+void
+zink_batch_reference_surface(struct zink_batch *batch, struct zink_surface *surface)
+{
+   if (!ptr_add_usage(batch, batch->state->surfaces, surface, &surface->batch_uses))
+      return;
+   struct pipe_surface *surf = NULL;
+   pipe_surface_reference(&surf, &surface->base);
+   batch->has_work = true;
+}
+
+void
 zink_batch_reference_sampler_view(struct zink_batch *batch,
                                   struct zink_sampler_view *sv)
 {
-   if (sv->base.target == PIPE_BUFFER) {
-      if (!ptr_add_usage(batch, batch->state->bufferviews, sv->buffer_view, &sv->buffer_view->batch_uses))
-         return;
-      pipe_reference(NULL, &sv->buffer_view->reference);
-   } else {
-      if (!ptr_add_usage(batch, batch->state->surfaces, sv->image_view, &sv->image_view->batch_uses))
-         return;
-      pipe_reference(NULL, &sv->image_view->base.reference);
-   }
-   batch->has_work = true;
+   if (sv->base.target == PIPE_BUFFER)
+      zink_batch_reference_bufferview(batch, sv->buffer_view);
+   else
+      zink_batch_reference_surface(batch, sv->image_view);
 }
 
 void
@@ -443,16 +456,10 @@ void
 zink_batch_reference_image_view(struct zink_batch *batch,
                                 struct zink_image_view *image_view)
 {
-   if (image_view->base.resource->target == PIPE_BUFFER) {
-      if (!ptr_add_usage(batch, batch->state->bufferviews, image_view->buffer_view, &image_view->buffer_view->batch_uses))
-         return;
-      pipe_reference(NULL, &image_view->buffer_view->reference);
-   } else {
-      if (!ptr_add_usage(batch, batch->state->surfaces, image_view->surface, &image_view->surface->batch_uses))
-         return;
-      pipe_reference(NULL, &image_view->surface->base.reference);
-   }
-   batch->has_work = true;
+   if (image_view->base.resource->target == PIPE_BUFFER)
+      zink_batch_reference_bufferview(batch, image_view->buffer_view);
+   else
+      zink_batch_reference_surface(batch, image_view->surface);
 }
 
 void
diff --git a/src/gallium/drivers/zink/zink_batch.h b/src/gallium/drivers/zink/zink_batch.h
index 73c7394..098eeef 100644
--- a/src/gallium/drivers/zink/zink_batch.h
+++ b/src/gallium/drivers/zink/zink_batch.h
@@ -33,6 +33,7 @@
 
 struct pipe_reference;
 
+struct zink_buffer_view;
 struct zink_context;
 struct zink_descriptor_set;
 struct zink_framebuffer;
@@ -139,6 +140,11 @@ void
 zink_batch_reference_image_view(struct zink_batch *batch,
                                 struct zink_image_view *image_view);
 
+void
+zink_batch_reference_bufferview(struct zink_batch *batch, struct zink_buffer_view *buffer_view);
+void
+zink_batch_reference_surface(struct zink_batch *batch, struct zink_surface *surface);
+
 bool
 zink_batch_add_desc_set(struct zink_batch *batch, struct zink_descriptor_set *zds);
 
-- 
2.7.4