From 9e2683c6f0229c395dbbb092b6b9004e889129ad Mon Sep 17 00:00:00 2001
From: Jesse Natalie <jenatali@microsoft.com>
Date: Wed, 1 Feb 2023 11:03:52 -0800
Subject: [PATCH] spirv2dxil: Set min UBO/SSBO alignments

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/21029>
---
 src/microsoft/spirv_to_dxil/dxil_spirv_nir.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/microsoft/spirv_to_dxil/dxil_spirv_nir.c b/src/microsoft/spirv_to_dxil/dxil_spirv_nir.c
index ee2f4b4b55e..510e746cff9 100644
--- a/src/microsoft/spirv_to_dxil/dxil_spirv_nir.c
+++ b/src/microsoft/spirv_to_dxil/dxil_spirv_nir.c
@@ -54,7 +54,10 @@ spirv_to_nir_options = {
       * instead of vulkan_resource_index. This makes it much easier to
       * get the DXIL handle for the SSBO.
       */
-   .use_deref_buffer_array_length = true
+   .use_deref_buffer_array_length = true,
+
+   .min_ubo_alignment = 256, /* D3D12_CONSTANT_BUFFER_DATA_PLACEMENT_ALIGNMENT */
+   .min_ssbo_alignment = 16, /* D3D12_RAW_UAV_SRV_BYTE_ALIGNMENT */
 };
 
 const struct spirv_to_nir_options*