nvk: align desc root table

Signed-off-by: Karol Herbst <kherbst@redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/24326>

diff --git a/src/nouveau/vulkan/nvk_cmd_buffer.h b/src/nouveau/vulkan/nvk_cmd_buffer.h
index abf6d44..dda3d2f 100644 (file)
--- a/src/nouveau/vulkan/nvk_cmd_buffer.h
+++ b/src/nouveau/vulkan/nvk_cmd_buffer.h
@@ -42,6 +42,9 @@ struct nvk_root_descriptor_table {
 
    /* Dynamic buffer bindings */
    struct nvk_buffer_address dynamic_buffers[NVK_MAX_DYNAMIC_BUFFERS];
+
+   /* enfore alignment to 0x100 as needed pre pascal */
+   uint8_t __padding[0x20];
 };
 
 /* helper macro for computing root descriptor byte offsets */

diff --git a/src/nouveau/vulkan/nvk_cmd_dispatch.c b/src/nouveau/vulkan/nvk_cmd_dispatch.c
index bdbdc16..fab2d63 100644 (file)
--- a/src/nouveau/vulkan/nvk_cmd_dispatch.c
+++ b/src/nouveau/vulkan/nvk_cmd_dispatch.c
@@ -121,6 +121,11 @@ nvk_flush_compute_state(struct nvk_cmd_buffer *cmd,
    desc->root.cs.block_size[1] = shader->cp.block_size[1];
    desc->root.cs.block_size[2] = shader->cp.block_size[2];
 
+   /* pre Pascal the constant buffer sizes need to be 0x100 aligned. As we simply allocated a
+    * buffer and upload data to it, make sure its size is 0x100 aligned.
+    */
+   STATIC_ASSERT((sizeof(desc->root) & 0xff) == 0);
+
    uint64_t root_desc_addr;
    result = nvk_cmd_buffer_upload_data(cmd, &desc->root, sizeof(desc->root),
                                        NVK_MIN_UBO_ALIGNMENT,