Mesa (main): zink: rename 'template' struct member

[GitLab Mirror]

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

Author: Mike Blumenkrantz <michael.blumenkrantz at gmail.com>
Date:   Wed May 12 07:39:12 2021 -0400

zink: rename 'template' struct member

this is a c++ keyword

Reviewed-by: Dave Airlie <airlied at redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/11685>

---

 src/gallium/drivers/zink/zink_descriptors.c      | 4 ++--
 src/gallium/drivers/zink/zink_descriptors.h      | 2 +-
 src/gallium/drivers/zink/zink_descriptors_lazy.c | 8 ++++----
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/gallium/drivers/zink/zink_descriptors.c b/src/gallium/drivers/zink/zink_descriptors.c
index 4d5e901144e..a39e6441f66 100644
--- a/src/gallium/drivers/zink/zink_descriptors.c
+++ b/src/gallium/drivers/zink/zink_descriptors.c
@@ -1657,8 +1657,8 @@ zink_descriptor_layouts_deinit(struct zink_context *ctx)
       hash_table_foreach(&ctx->desc_set_layouts[i], he) {
          struct zink_descriptor_layout *layout = he->data;
          vkDestroyDescriptorSetLayout(screen->dev, layout->layout, NULL);
-         if (layout->template)
-            screen->vk.DestroyDescriptorUpdateTemplate(screen->dev, layout->template, NULL);
+         if (layout->desc_template)
+            screen->vk.DestroyDescriptorUpdateTemplate(screen->dev, layout->desc_template, NULL);
          ralloc_free(layout);
          _mesa_hash_table_remove(&ctx->desc_set_layouts[i], he);
       }
diff --git a/src/gallium/drivers/zink/zink_descriptors.h b/src/gallium/drivers/zink/zink_descriptors.h
index c78876aa317..79a08a84bc1 100644
--- a/src/gallium/drivers/zink/zink_descriptors.h
+++ b/src/gallium/drivers/zink/zink_descriptors.h
@@ -92,7 +92,7 @@ struct zink_descriptor_layout_key {
 
 struct zink_descriptor_layout {
    VkDescriptorSetLayout layout;
-   VkDescriptorUpdateTemplateKHR template;
+   VkDescriptorUpdateTemplateKHR desc_template;
 };
 
 struct zink_descriptor_pool_key {
diff --git a/src/gallium/drivers/zink/zink_descriptors_lazy.c b/src/gallium/drivers/zink/zink_descriptors_lazy.c
index 4e832ddfc0c..e9abd90025b 100644
--- a/src/gallium/drivers/zink/zink_descriptors_lazy.c
+++ b/src/gallium/drivers/zink/zink_descriptors_lazy.c
@@ -249,7 +249,7 @@ zink_descriptor_program_init_lazy(struct zink_context *ctx, struct zink_program
       bool is_push = i == 0;
       /* no need for empty templates */
       if (pg->dsl[i] == ctx->dd->dummy_dsl->layout ||
-          (!is_push && pg->dd->layouts[i]->template))
+          (!is_push && pg->dd->layouts[i]->desc_template))
          continue;
       template[i].sType = VK_STRUCTURE_TYPE_DESCRIPTOR_UPDATE_TEMPLATE_CREATE_INFO;
       assert(wd_count[i]);
@@ -269,7 +269,7 @@ zink_descriptor_program_init_lazy(struct zink_context *ctx, struct zink_program
       if (is_push)
          pg->dd->push_template = t;
       else
-         pg->dd->layouts[i]->template = t;
+         pg->dd->layouts[i]->desc_template = t;
    }
    return true;
 }
@@ -390,7 +390,7 @@ void
 zink_descriptor_set_update_lazy(struct zink_context *ctx, struct zink_program *pg, enum zink_descriptor_type type, VkDescriptorSet set)
 {
    struct zink_screen *screen = zink_screen(ctx->base.screen);
-   screen->vk.UpdateDescriptorSetWithTemplate(screen->dev, set, pg->dd->layouts[type + 1]->template, ctx);
+   screen->vk.UpdateDescriptorSetWithTemplate(screen->dev, set, pg->dd->layouts[type + 1]->desc_template, ctx);
 }
 
 void
@@ -445,7 +445,7 @@ zink_descriptors_update_lazy(struct zink_context *ctx, bool is_compute)
    if (pg->dd->binding_usage && changed_sets) {
       u_foreach_bit(type, changed_sets) {
          if (pg->dd->layout_key[type])
-            screen->vk.UpdateDescriptorSetWithTemplate(screen->dev, desc_sets[type + 1], pg->dd->layouts[type + 1]->template, ctx);
+            screen->vk.UpdateDescriptorSetWithTemplate(screen->dev, desc_sets[type + 1], pg->dd->layouts[type + 1]->desc_template, ctx);
          assert(type + 1 < pg->num_dsl);
          vkCmdBindDescriptorSets(bs->cmdbuf,
                                  is_compute ? VK_PIPELINE_BIND_POINT_COMPUTE : VK_PIPELINE_BIND_POINT_GRAPHICS,