Mesa (master): tu: Handle null descriptors

[GitLab Mirror]

Module: Mesa
Branch: master
Commit: 0fb14420da1dad6d839f1633158890dd078eba78
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=0fb14420da1dad6d839f1633158890dd078eba78

Author: Connor Abbott <cwabbott0 at gmail.com>
Date:   Tue Nov 10 17:41:55 2020 +0100

tu: Handle null descriptors

Writing all 0's, including for the format, seems to work. Actually
setting the format seems to break textureSize() (getsize returns 1 for
some reason).

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

---

 src/freedreno/vulkan/tu_cmd_buffer.c     | 11 ++++++++---
 src/freedreno/vulkan/tu_descriptor_set.c | 24 ++++++++++++++++++++++--
 2 files changed, 30 insertions(+), 5 deletions(-)

diff --git a/src/freedreno/vulkan/tu_cmd_buffer.c b/src/freedreno/vulkan/tu_cmd_buffer.c
index 090ff45ae89..10065ca14c8 100644
--- a/src/freedreno/vulkan/tu_cmd_buffer.c
+++ b/src/freedreno/vulkan/tu_cmd_buffer.c
@@ -1593,10 +1593,15 @@ tu_CmdBindVertexBuffers2EXT(VkCommandBuffer commandBuffer,
    cmd->state.vertex_buffers.iova = tu_cs_draw_state(&cmd->sub_cs, &cs, 4 * MAX_VBS).iova;
 
    for (uint32_t i = 0; i < bindingCount; i++) {
-      struct tu_buffer *buf = tu_buffer_from_handle(pBuffers[i]);
+      if (pBuffers[i] == VK_NULL_HANDLE) {
+         cmd->state.vb[firstBinding + i].base = 0;
+         cmd->state.vb[firstBinding + i].size = 0;
+      } else {
+         struct tu_buffer *buf = tu_buffer_from_handle(pBuffers[i]);
+         cmd->state.vb[firstBinding + i].base = tu_buffer_iova(buf) + pOffsets[i];
+         cmd->state.vb[firstBinding + i].size = pSizes ? pSizes[i] : (buf->size - pOffsets[i]);
+      }
 
-      cmd->state.vb[firstBinding + i].base = tu_buffer_iova(buf) + pOffsets[i];
-      cmd->state.vb[firstBinding + i].size = pSizes ? pSizes[i] : (buf->size - pOffsets[i]);
       if (pStrides)
          cmd->state.vb[firstBinding + i].stride = pStrides[i];
    }
diff --git a/src/freedreno/vulkan/tu_descriptor_set.c b/src/freedreno/vulkan/tu_descriptor_set.c
index 46f8cc24b34..5930ee9988b 100644
--- a/src/freedreno/vulkan/tu_descriptor_set.c
+++ b/src/freedreno/vulkan/tu_descriptor_set.c
@@ -690,9 +690,13 @@ tu_FreeDescriptorSets(VkDevice _device,
 static void
 write_texel_buffer_descriptor(uint32_t *dst, const VkBufferView buffer_view)
 {
-   TU_FROM_HANDLE(tu_buffer_view, view, buffer_view);
+   if (buffer_view == VK_NULL_HANDLE) {
+      memset(dst, 0, A6XX_TEX_CONST_DWORDS * sizeof(uint32_t));
+   } else {
+      TU_FROM_HANDLE(tu_buffer_view, view, buffer_view);
 
-   memcpy(dst, view->descriptor, sizeof(view->descriptor));
+      memcpy(dst, view->descriptor, sizeof(view->descriptor));
+   }
 }
 
 static uint32_t get_range(struct tu_buffer *buf, VkDeviceSize offset,
@@ -710,6 +714,11 @@ write_buffer_descriptor(const struct tu_device *device,
                         uint32_t *dst,
                         const VkDescriptorBufferInfo *buffer_info)
 {
+   if (buffer_info->buffer == VK_NULL_HANDLE) {
+      memset(dst, 0, A6XX_TEX_CONST_DWORDS * sizeof(uint32_t));
+      return;
+   }
+
    TU_FROM_HANDLE(tu_buffer, buffer, buffer_info->buffer);
 
    assert((buffer_info->offset & 63) == 0); /* minStorageBufferOffsetAlignment */
@@ -735,12 +744,18 @@ write_buffer_descriptor(const struct tu_device *device,
 static void
 write_ubo_descriptor(uint32_t *dst, const VkDescriptorBufferInfo *buffer_info)
 {
+   if (buffer_info->buffer == VK_NULL_HANDLE) {
+      dst[0] = dst[1] = 0;
+      return;
+   }
+
    TU_FROM_HANDLE(tu_buffer, buffer, buffer_info->buffer);
 
    uint32_t range = get_range(buffer, buffer_info->offset, buffer_info->range);
    /* The HW range is in vec4 units */
    range = ALIGN_POT(range, 16) / 16;
    uint64_t va = tu_buffer_iova(buffer) + buffer_info->offset;
+
    dst[0] = A6XX_UBO_0_BASE_LO(va);
    dst[1] = A6XX_UBO_1_BASE_HI(va >> 32) | A6XX_UBO_1_SIZE(range);
 }
@@ -750,6 +765,11 @@ write_image_descriptor(uint32_t *dst,
                        VkDescriptorType descriptor_type,
                        const VkDescriptorImageInfo *image_info)
 {
+   if (image_info->imageView == VK_NULL_HANDLE) {
+      memset(dst, 0, A6XX_TEX_CONST_DWORDS * sizeof(uint32_t));
+      return;
+   }
+
    TU_FROM_HANDLE(tu_image_view, iview, image_info->imageView);
 
    if (descriptor_type == VK_DESCRIPTOR_TYPE_STORAGE_IMAGE) {