nvk: Implement VK_KHR_push_descriptor

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/24326>

diff --git a/src/nouveau/vulkan/nvk_cmd_buffer.c b/src/nouveau/vulkan/nvk_cmd_buffer.c
index 6913fb6..4c2facd 100644 (file)
--- a/src/nouveau/vulkan/nvk_cmd_buffer.c
+++ b/src/nouveau/vulkan/nvk_cmd_buffer.c
@@ -299,6 +299,9 @@ nvk_CmdBindDescriptorSets(VkCommandBuffer commandBuffer,
          desc->root.sets[set_idx] = nvk_descriptor_set_addr(set);
          desc->sets[set_idx] = set;
          desc->sets_dirty |= BITFIELD_BIT(set_idx);
+
+         /* Binding descriptors invalidates push descriptors */
+         desc->push_dirty &= ~BITFIELD_BIT(set_idx);
       }
 
       if (set_layout->dynamic_buffer_count > 0) {
@@ -340,3 +343,61 @@ nvk_CmdPushConstants(VkCommandBuffer commandBuffer,
       memcpy(desc->root.push + offset, pValues, size);
    }
 }
+
+VKAPI_ATTR void VKAPI_CALL
+nvk_CmdPushDescriptorSetKHR(VkCommandBuffer commandBuffer,
+                            VkPipelineBindPoint pipelineBindPoint,
+                            VkPipelineLayout layout,
+                            uint32_t set,
+                            uint32_t descriptorWriteCount,
+                            const VkWriteDescriptorSet *pDescriptorWrites)
+{
+   VK_FROM_HANDLE(nvk_cmd_buffer, cmd, commandBuffer);
+   VK_FROM_HANDLE(nvk_pipeline_layout, pipeline_layout, layout);
+   struct nvk_descriptor_state *desc =
+      nvk_get_descriptors_state(cmd, pipelineBindPoint);
+
+   assert(set < NVK_MAX_SETS);
+   if (unlikely(desc->push[set] == NULL)) {
+      desc->push[set] = vk_zalloc(&cmd->vk.pool->alloc,
+                                  sizeof(*desc->push[set]), 8,
+                                  VK_SYSTEM_ALLOCATION_SCOPE_OBJECT);
+      if (unlikely(desc->push[set] == NULL)) {
+         vk_command_buffer_set_error(&cmd->vk, VK_ERROR_OUT_OF_HOST_MEMORY);
+         return;
+      }
+   }
+
+   /* Pushing descriptors replaces whatever sets are bound */
+   desc->sets[set] = NULL;
+
+   nvk_push_descriptor_set_update(desc->push[set],
+                                  pipeline_layout->set[set].layout,
+                                  descriptorWriteCount, pDescriptorWrites);
+   desc->push_dirty |= BITFIELD_BIT(set);
+}
+
+void
+nvk_cmd_buffer_flush_push_descriptors(struct nvk_cmd_buffer *cmd,
+                                      struct nvk_descriptor_state *desc)
+{
+   VkResult result;
+
+   if (!desc->push_dirty)
+      return;
+
+   u_foreach_bit(set_idx, desc->push_dirty) {
+      struct nvk_push_descriptor_set *push_set = desc->push[set_idx];
+      uint64_t push_set_addr;
+      result = nvk_cmd_buffer_upload_data(cmd, push_set->data,
+                                          sizeof(push_set->data),
+                                          NVK_MIN_UBO_ALIGNMENT,
+                                          &push_set_addr);
+      if (unlikely(result != VK_SUCCESS)) {
+         vk_command_buffer_set_error(&cmd->vk, result);
+         return;
+      }
+
+      desc->root.sets[set_idx] = push_set_addr;
+   }
+}

diff --git a/src/nouveau/vulkan/nvk_cmd_buffer.h b/src/nouveau/vulkan/nvk_cmd_buffer.h
index deca45f..2ec6e63 100644 (file)
--- a/src/nouveau/vulkan/nvk_cmd_buffer.h
+++ b/src/nouveau/vulkan/nvk_cmd_buffer.h
@@ -14,6 +14,7 @@
 struct nvk_cmd_bo;
 struct nvk_cmd_pool;
 struct nvk_image_view;
+struct nvk_push_descriptor_set;
 
 /** Root descriptor table.  This gets pushed to the GPU directly */
 struct nvk_root_descriptor_table {
@@ -39,6 +40,9 @@ struct nvk_descriptor_state {
    struct nvk_root_descriptor_table root;
    struct nvk_descriptor_set *sets[NVK_MAX_SETS];
    uint32_t sets_dirty;
+
+   struct nvk_push_descriptor_set *push[NVK_MAX_SETS];
+   uint32_t push_dirty;
 };
 
 struct nvk_attachment {
@@ -213,4 +217,8 @@ VkResult nvk_cmd_buffer_upload_data(struct nvk_cmd_buffer *cmd,
                                     const void *data, uint32_t size,
                                     uint32_t alignment, uint64_t *addr);
 
+void
+nvk_cmd_buffer_flush_push_descriptors(struct nvk_cmd_buffer *cmd,
+                                      struct nvk_descriptor_state *desc);
+
 #endif

diff --git a/src/nouveau/vulkan/nvk_cmd_dispatch.c b/src/nouveau/vulkan/nvk_cmd_dispatch.c
index 13a8592..ac3f086 100644 (file)
--- a/src/nouveau/vulkan/nvk_cmd_dispatch.c
+++ b/src/nouveau/vulkan/nvk_cmd_dispatch.c
@@ -69,6 +69,8 @@ nvk_CmdDispatch(VkCommandBuffer commandBuffer,
    struct nvk_descriptor_state *desc = &cmd->state.cs.descriptors;
    VkResult result;
 
+   nvk_cmd_buffer_flush_push_descriptors(cmd, desc);
+
    desc->root.cs.block_size[0] = shader->cp.block_size[0];
    desc->root.cs.block_size[1] = shader->cp.block_size[1];
    desc->root.cs.block_size[2] = shader->cp.block_size[2];

diff --git a/src/nouveau/vulkan/nvk_cmd_draw.c b/src/nouveau/vulkan/nvk_cmd_draw.c
index 30f318d..7a1c4e6 100644 (file)
--- a/src/nouveau/vulkan/nvk_cmd_draw.c
+++ b/src/nouveau/vulkan/nvk_cmd_draw.c
@@ -1034,9 +1034,11 @@ nvk_flush_dynamic_state(struct nvk_cmd_buffer *cmd)
 static void
 nvk_flush_descriptors(struct nvk_cmd_buffer *cmd)
 {
-   const struct nvk_descriptor_state *desc = &cmd->state.gfx.descriptors;
+   struct nvk_descriptor_state *desc = &cmd->state.gfx.descriptors;
    VkResult result;
 
+   nvk_cmd_buffer_flush_push_descriptors(cmd, desc);
+
    uint64_t root_table_addr;
    result = nvk_cmd_buffer_upload_data(cmd, &desc->root, sizeof(desc->root),
                                        NVK_MIN_UBO_ALIGNMENT,

diff --git a/src/nouveau/vulkan/nvk_descriptor_set.c b/src/nouveau/vulkan/nvk_descriptor_set.c
index 80b5f2b..af6812d 100644 (file)
--- a/src/nouveau/vulkan/nvk_descriptor_set.c
+++ b/src/nouveau/vulkan/nvk_descriptor_set.c
@@ -239,6 +239,58 @@ nvk_UpdateDescriptorSets(VkDevice device,
    }
 }
 
+void
+nvk_push_descriptor_set_update(struct nvk_push_descriptor_set *push_set,
+                               struct nvk_descriptor_set_layout *layout,
+                               uint32_t write_count,
+                               const VkWriteDescriptorSet *writes)
+{
+   assert(layout->descriptor_buffer_size < sizeof(push_set->data));
+   struct nvk_descriptor_set set = {
+      .layout = layout,
+      .mapped_ptr = push_set->data,
+   };
+
+   for (uint32_t w = 0; w < write_count; w++) {
+      const VkWriteDescriptorSet *write = &writes[w];
+      assert(write->dstSet == VK_NULL_HANDLE);
+
+      switch (write->descriptorType) {
+      case VK_DESCRIPTOR_TYPE_SAMPLER:
+      case VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER:
+      case VK_DESCRIPTOR_TYPE_SAMPLED_IMAGE:
+      case VK_DESCRIPTOR_TYPE_STORAGE_IMAGE:
+      case VK_DESCRIPTOR_TYPE_INPUT_ATTACHMENT:
+         for (uint32_t j = 0; j < write->descriptorCount; j++) {
+            write_image_view_desc(&set, write->pImageInfo + j,
+                                  write->dstBinding,
+                                  write->dstArrayElement + j,
+                                  write->descriptorType);
+         }
+         break;
+
+      case VK_DESCRIPTOR_TYPE_UNIFORM_TEXEL_BUFFER:
+      case VK_DESCRIPTOR_TYPE_STORAGE_TEXEL_BUFFER:
+         for (uint32_t j = 0; j < write->descriptorCount; j++) {
+            write_buffer_view_desc(&set, write->pTexelBufferView[j],
+                                   write->dstBinding, write->dstArrayElement + j);
+         }
+         break;
+
+      case VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER:
+      case VK_DESCRIPTOR_TYPE_STORAGE_BUFFER:
+         for (uint32_t j = 0; j < write->descriptorCount; j++) {
+            write_buffer_desc(&set, write->pBufferInfo + j, write->dstBinding,
+                              write->dstArrayElement + j);
+         }
+         break;
+
+      default:
+         break;
+      }
+   }
+}
+
 static void
 nvk_descriptor_set_destroy(struct nvk_device *device,
                            struct nvk_descriptor_pool *pool,

diff --git a/src/nouveau/vulkan/nvk_descriptor_set.h b/src/nouveau/vulkan/nvk_descriptor_set.h
index 9d5b280..fec0e95 100644 (file)
--- a/src/nouveau/vulkan/nvk_descriptor_set.h
+++ b/src/nouveau/vulkan/nvk_descriptor_set.h
@@ -46,7 +46,6 @@ VK_DEFINE_NONDISP_HANDLE_CASTS(nvk_descriptor_pool, base, VkDescriptorPool,
 struct nvk_descriptor_set {
    struct vk_object_base base;
    struct nvk_descriptor_set_layout *layout;
-   uint32_t buffer_count;
    uint32_t bo_offset;
    struct nouveau_ws_bo *bo;
    void *mapped_ptr;
@@ -66,4 +65,14 @@ nvk_descriptor_set_addr(const struct nvk_descriptor_set *set)
    return set->bo->offset + set->bo_offset;
 }
 
+struct nvk_push_descriptor_set {
+   uint32_t data[NVK_MAX_PUSH_DESCRIPTORS * NVK_MAX_DESCRIPTOR_SIZE];
+};
+
+void
+nvk_push_descriptor_set_update(struct nvk_push_descriptor_set *push_set,
+                               struct nvk_descriptor_set_layout *layout,
+                               uint32_t write_count,
+                               const VkWriteDescriptorSet *writes);
+
 #endif

diff --git a/src/nouveau/vulkan/nvk_descriptor_set_layout.c b/src/nouveau/vulkan/nvk_descriptor_set_layout.c
index a6a4a8f..87d7740 100644 (file)
--- a/src/nouveau/vulkan/nvk_descriptor_set_layout.c
+++ b/src/nouveau/vulkan/nvk_descriptor_set_layout.c
@@ -69,6 +69,8 @@ nvk_descriptor_stride_align_for_type(VkDescriptorType type,
    default:
       unreachable("Invalid descriptor type");
    }
+
+   assert(*stride <= NVK_MAX_DESCRIPTOR_SIZE);
 }
 
 VKAPI_ATTR VkResult VKAPI_CALL

diff --git a/src/nouveau/vulkan/nvk_physical_device.c b/src/nouveau/vulkan/nvk_physical_device.c
index 617ce2f..ee33b05 100644 (file)
--- a/src/nouveau/vulkan/nvk_physical_device.c
+++ b/src/nouveau/vulkan/nvk_physical_device.c
@@ -284,6 +284,7 @@ nvk_get_device_extensions(const struct nvk_physical_device *device,
       .KHR_dedicated_allocation = true,
       .KHR_get_memory_requirements2 = true,
       .KHR_format_feature_flags2 = true,
+      .KHR_push_descriptor = true,
 #ifdef NVK_USE_WSI_PLATFORM
       .KHR_swapchain = true,
       .KHR_swapchain_mutable_format = true,
@@ -447,6 +448,11 @@ nvk_GetPhysicalDeviceMemoryProperties2(VkPhysicalDevice physicalDevice,
    vk_foreach_struct(ext, pMemoryProperties->pNext)
    {
       switch (ext->sType) {
+      case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PUSH_DESCRIPTOR_PROPERTIES_KHR: {
+         VkPhysicalDevicePushDescriptorPropertiesKHR *p = (void *)ext;
+         p->maxPushDescriptors = NVK_MAX_PUSH_DESCRIPTORS;
+         break;
+      }
       default:
          nvk_debug_ignored_stype(ext->sType);
          break;

diff --git a/src/nouveau/vulkan/nvk_private.h b/src/nouveau/vulkan/nvk_private.h
index 4e8252b..fd7ef3d 100644 (file)
--- a/src/nouveau/vulkan/nvk_private.h
+++ b/src/nouveau/vulkan/nvk_private.h
@@ -22,6 +22,8 @@
 #define NVK_MAX_RTS 8
 #define NVK_MIN_UBO_ALIGNMENT 64
 #define NVK_MAX_VIEWPORTS 16
+#define NVK_MAX_DESCRIPTOR_SIZE 16
+#define NVK_MAX_PUSH_DESCRIPTORS 32
 
 /**
  * Warn on ignored extension structs.