Mesa (main): microsoft/spirv_to_dxil: Constify the descriptor binding mapping fields

[GitLab Mirror]

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

Author: Boris Brezillon <boris.brezillon at collabora.com>
Date:   Fri Apr 29 06:08:07 2022 -0700

microsoft/spirv_to_dxil: Constify the descriptor binding mapping fields

spirv_to_dxil() doesn't modify those, so let's constify them.

Reviewed-by: Jesse Natalie <jenatali at microsoft.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/16221>

---

 src/microsoft/spirv_to_dxil/spirv_to_dxil.h | 4 ++--
 src/microsoft/vulkan/dzn_descriptor_set.c   | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/microsoft/spirv_to_dxil/spirv_to_dxil.h b/src/microsoft/spirv_to_dxil/spirv_to_dxil.h
index 8cb6ab9de48..3be4936aa18 100644
--- a/src/microsoft/spirv_to_dxil/spirv_to_dxil.h
+++ b/src/microsoft/spirv_to_dxil/spirv_to_dxil.h
@@ -131,7 +131,7 @@ struct dxil_spirv_vulkan_binding {
 
 struct dxil_spirv_vulkan_descriptor_set {
    uint32_t binding_count;
-   struct dxil_spirv_vulkan_binding *bindings;
+   const struct dxil_spirv_vulkan_binding *bindings;
 };
 
 #define DXIL_SPIRV_MAX_VIEWPORT 16
@@ -148,7 +148,7 @@ struct dxil_spirv_runtime_conf {
    } push_constant_cbv;
 
    uint32_t descriptor_set_count;
-   struct dxil_spirv_vulkan_descriptor_set *descriptor_sets;
+   const struct dxil_spirv_vulkan_descriptor_set *descriptor_sets;
 
    // Set true if vertex and instance ids have already been converted to
    // zero-based. Otherwise, runtime_data will be required to lower them.
diff --git a/src/microsoft/vulkan/dzn_descriptor_set.c b/src/microsoft/vulkan/dzn_descriptor_set.c
index ddd70e485db..a9d09771c0c 100644
--- a/src/microsoft/vulkan/dzn_descriptor_set.c
+++ b/src/microsoft/vulkan/dzn_descriptor_set.c
@@ -531,7 +531,8 @@ dzn_pipeline_layout_create(struct dzn_device *device,
    layout->set_count = pCreateInfo->setLayoutCount;
    for (uint32_t j = 0; j < layout->set_count; j++) {
       VK_FROM_HANDLE(dzn_descriptor_set_layout, set_layout, pCreateInfo->pSetLayouts[j]);
-      struct dxil_spirv_vulkan_binding *bindings = layout->binding_translation[j].bindings;
+      struct dxil_spirv_vulkan_binding *bindings =
+         (struct dxil_spirv_vulkan_binding *)layout->binding_translation[j].bindings;
 
       layout->sets[j].dynamic_buffer_count = set_layout->dynamic_buffers.count;
       memcpy(layout->sets[j].range_desc_count, set_layout->range_desc_count,