diff --git a/src/gallium/drivers/zink/zink_resource.c b/src/gallium/drivers/zink/zink_resource.c index e3c65a0918c..a6cbdf66d6f 100644 --- a/src/gallium/drivers/zink/zink_resource.c +++ b/src/gallium/drivers/zink/zink_resource.c @@ -463,7 +463,7 @@ get_image_usage_for_feats(struct zink_screen *screen, VkFormatFeatureFlags2 feat } static VkFormatFeatureFlags -find_modifier_feats(const struct zink_modifier_prop *prop, uint64_t modifier, uint64_t *mod) +find_modifier_feats(const struct zink_modifier_props *prop, uint64_t modifier, uint64_t *mod) { for (unsigned j = 0; j < prop->drmFormatModifierCount; j++) { if (prop->pDrmFormatModifierProperties[j].drmFormatModifier == modifier) { @@ -549,7 +549,7 @@ get_image_usage(struct zink_screen *screen, VkImageCreateInfo *ici, const struct *mod = DRM_FORMAT_MOD_INVALID; if (modifiers_count) { bool have_linear = false; - const struct zink_modifier_prop *prop = &screen->modifier_props[templ->format]; + const struct zink_modifier_props *prop = &screen->modifier_props[templ->format]; assert(tiling == VK_IMAGE_TILING_DRM_FORMAT_MODIFIER_EXT); bool found = false; uint64_t good_mod = 0; diff --git a/src/gallium/drivers/zink/zink_types.h b/src/gallium/drivers/zink/zink_types.h index 96a75ac9751..5c66213b77e 100644 --- a/src/gallium/drivers/zink/zink_types.h +++ b/src/gallium/drivers/zink/zink_types.h @@ -1370,7 +1370,7 @@ struct zink_transfer { /** screen types */ -struct zink_modifier_prop { +struct zink_modifier_props { uint32_t drmFormatModifierCount; VkDrmFormatModifierPropertiesEXT* pDrmFormatModifierProperties; }; @@ -1523,7 +1523,7 @@ struct zink_screen { } driconf; struct zink_format_props format_props[PIPE_FORMAT_COUNT]; - struct zink_modifier_prop modifier_props[PIPE_FORMAT_COUNT]; + struct zink_modifier_props modifier_props[PIPE_FORMAT_COUNT]; VkExtent2D maxSampleLocationGridSize[5]; VkPipelineLayout gfx_push_constant_layout;