AlexIndustrial/mesa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

zink: rename 'template' struct member

Browse Source 
this is a c++ keyword

Reviewed-by: Dave Airlie <airlied@redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/11685>
This commit is contained in:
Mike Blumenkrantz
2021-05-12 07:39:12 -04:00
parent 48adc08b2d
commit 742805b1d7
3 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/gallium/drivers/zink/zink_descriptors.c
+2 -2
View File
@@ -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);
}
src/gallium/drivers/zink/zink_descriptors.h
+1 -1
View File
@@ -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 {
src/gallium/drivers/zink/zink_descriptors_lazy.c
+4 -4
View File
@@ -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,