commit 2e2ad61ef1b085642bbb49297b4308758d9b892a
author Erik Faye-Lund <erik.faye-lund@collabora.com> Tue Mar 26 22:07:47 2019 +0100
committer Erik Faye-Lund <erik.faye-lund@collabora.com> Mon Oct 28 08:51:44 2019 +0000
tree 20565ca2ddea3df9f7a500be6be8d79a4fb6bc05
parent 806f040bb3fdbb77e2bf987e9d8a0d9b049bef38

zink: add curr_cmdbuf-helper

Acked-by: Jordan Justen <jordan.l.justen@intel.com>

src/gallium/drivers/zink/zink_context.c

diff --git a/src/gallium/drivers/zink/zink_context.c b/src/gallium/drivers/zink/zink_context.c
index c868e7c..13e630c 100644
--- a/src/gallium/drivers/zink/zink_context.c
+++ b/src/gallium/drivers/zink/zink_context.c
@@ -994,7 +994,7 @@
 
    if (pfence)
       zink_fence_reference(zink_screen(pctx->screen), (struct zink_fence **)pfence,
-                           ctx->cmdbufs[0].fence);
+                           zink_context_curr_cmdbuf(ctx)->fence);
 }
 
 static void

src/gallium/drivers/zink/zink_context.h

diff --git a/src/gallium/drivers/zink/zink_context.h b/src/gallium/drivers/zink/zink_context.h
index 629321c..ed5fe18 100644
--- a/src/gallium/drivers/zink/zink_context.h
+++ b/src/gallium/drivers/zink/zink_context.h
@@ -105,6 +105,12 @@
    return (struct zink_context *)context;
 }
 
+static inline struct zink_cmdbuf *
+zink_context_curr_cmdbuf(struct zink_context *ctx)
+{
+   return ctx->cmdbufs + 0;
+}
+
 void
 zink_resource_barrier(VkCommandBuffer cmdbuf, struct zink_resource *res,
                       VkImageAspectFlags aspect, VkImageLayout new_layout);