Mesa (main): anv: handle push descriptor sets when they are sent with push constants

[GitLab Mirror]

Module: Mesa
Branch: main
Commit: 904bd8f358f5721a4d2ca19f2409dd6ff1d7599b
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=904bd8f358f5721a4d2ca19f2409dd6ff1d7599b

Author: Marcin Ślusarz <marcin.slusarz at intel.com>
Date:   Mon Jun 28 13:06:07 2021 +0200

anv: handle push descriptor sets when they are sent with push constants

When vkCmdPushDescriptorSetKHR is used, the descriptor set is allocated
internally without belonging to any pool. Such descriptor set will be
visible on the GPU side because it's a part of the dynamic state stream,
but we still have to store its address in the array of descriptor sets.

Complements: 379b9bb7b04 ("anv: Support fetching descriptor addresses from push constants")

Signed-off-by: Marcin Ślusarz <marcin.slusarz at intel.com>
Reviewed-by: Jason Ekstrand <jason at jlekstrand.net>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/11577>

---

 src/intel/vulkan/anv_cmd_buffer.c  | 25 +++++++++++++------------
 src/intel/vulkan/anv_private.h     | 22 ++++++++++++++++++++++
 src/intel/vulkan/genX_cmd_buffer.c | 16 ----------------
 3 files changed, 35 insertions(+), 28 deletions(-)

diff --git a/src/intel/vulkan/anv_cmd_buffer.c b/src/intel/vulkan/anv_cmd_buffer.c
index 1a98c178faa..df183507d2e 100644
--- a/src/intel/vulkan/anv_cmd_buffer.c
+++ b/src/intel/vulkan/anv_cmd_buffer.c
@@ -931,7 +931,12 @@ anv_cmd_buffer_bind_descriptor_set(struct anv_cmd_buffer *cmd_buffer,
    }
 
    VkShaderStageFlags dirty_stages = 0;
-   if (pipe_state->descriptors[set_index] != set) {
+   /* If it's a push descriptor set, we have to flag things as dirty
+    * regardless of whether or not the CPU-side data structure changed as we
+    * may have edited in-place.
+    */
+   if (pipe_state->descriptors[set_index] != set ||
+         anv_descriptor_set_is_push(set)) {
       pipe_state->descriptors[set_index] = set;
 
       /* Ray-tracing shaders are entirely bindless and so they don't have
@@ -941,23 +946,19 @@ anv_cmd_buffer_bind_descriptor_set(struct anv_cmd_buffer *cmd_buffer,
       if (bind_point == VK_PIPELINE_BIND_POINT_RAY_TRACING_KHR) {
          struct anv_push_constants *push = &pipe_state->push_constants;
 
-         push->desc_sets[set_index] = anv_address_physical(set->desc_addr);
+         struct anv_address addr = anv_descriptor_set_address(cmd_buffer, set);
+         push->desc_sets[set_index] = anv_address_physical(addr);
 
-         anv_reloc_list_add_bo(cmd_buffer->batch.relocs,
-                               cmd_buffer->batch.alloc,
-                               set->pool->bo);
+         if (addr.bo) {
+            anv_reloc_list_add_bo(cmd_buffer->batch.relocs,
+                                  cmd_buffer->batch.alloc,
+                                  addr.bo);
+         }
       }
 
       dirty_stages |= stages;
    }
 
-   /* If it's a push descriptor set, we have to flag things as dirty
-    * regardless of whether or not the CPU-side data structure changed as we
-    * may have edited in-place.
-    */
-   if (set->pool == NULL)
-      dirty_stages |= stages;
-
    if (dynamic_offsets) {
       if (set_layout->dynamic_offset_count > 0) {
          struct anv_push_constants *push = &pipe_state->push_constants;
diff --git a/src/intel/vulkan/anv_private.h b/src/intel/vulkan/anv_private.h
index 7b133f77235..e2dba5ed098 100644
--- a/src/intel/vulkan/anv_private.h
+++ b/src/intel/vulkan/anv_private.h
@@ -2060,6 +2060,12 @@ struct anv_descriptor_set {
    struct anv_descriptor descriptors[0];
 };
 
+static inline bool
+anv_descriptor_set_is_push(struct anv_descriptor_set *set)
+{
+   return set->pool == NULL;
+}
+
 struct anv_buffer_view {
    struct vk_object_base base;
 
@@ -2090,6 +2096,22 @@ struct anv_push_descriptor_set {
    struct anv_buffer_view buffer_views[MAX_PUSH_DESCRIPTORS];
 };
 
+static inline struct anv_address
+anv_descriptor_set_address(struct anv_cmd_buffer *cmd_buffer,
+                           struct anv_descriptor_set *set)
+{
+   if (anv_descriptor_set_is_push(set)) {
+      /* We have to flag push descriptor set as used on the GPU
+       * so that the next time we push descriptors, we grab a new memory.
+       */
+      struct anv_push_descriptor_set *push_set =
+         (struct anv_push_descriptor_set *)set;
+      push_set->set_used_on_gpu = true;
+   }
+
+   return set->desc_addr;
+}
+
 struct anv_descriptor_pool {
    struct vk_object_base base;
 
diff --git a/src/intel/vulkan/genX_cmd_buffer.c b/src/intel/vulkan/genX_cmd_buffer.c
index 217e19e48b5..4f428f2e5e2 100644
--- a/src/intel/vulkan/genX_cmd_buffer.c
+++ b/src/intel/vulkan/genX_cmd_buffer.c
@@ -2547,22 +2547,6 @@ cmd_buffer_alloc_push_constants(struct anv_cmd_buffer *cmd_buffer)
    cmd_buffer->state.push_constants_dirty |= VK_SHADER_STAGE_ALL_GRAPHICS;
 }
 
-static struct anv_address
-anv_descriptor_set_address(struct anv_cmd_buffer *cmd_buffer,
-                           struct anv_descriptor_set *set)
-{
-   if (set->pool == NULL) {
-      /* This is a push descriptor set.  We have to flag it as used on the GPU
-       * so that the next time we push descriptors, we grab a new memory.
-       */
-      struct anv_push_descriptor_set *push_set =
-         (struct anv_push_descriptor_set *)set;
-      push_set->set_used_on_gpu = true;
-   }
-
-   return set->desc_addr;
-}
-
 static VkResult
 emit_binding_table(struct anv_cmd_buffer *cmd_buffer,
                    struct anv_cmd_pipeline_state *pipe_state,