fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-24 19:40:10 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

radv: Don't use VK_OUTARRAY_MAKE()/vk_outarray_append()

Browse source 
MSVC doesn't support typeof(). If we want to keep compiling radv on
windows we need to use the typed variants of those macros.

Fixes: 10d69d5f0b ("radv: fix returning empty drmFormatModifierTilingFeatures")
Acked-by: Daniel Stone <daniels@collabora.com>
Acked-by: Erik Faye-Lund <erik.faye-lund@collabora.com>
Reviewed-by: Jason Ekstrand <jason.ekstrand@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/15518>
This commit is contained in:
Boris Brezillon 2022-03-23 02:36:00 -07:00 • committed by Marge Bot
parent 2daae1fab4
commit eb1d009a3e
1 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/amd/vulkan/radv_formats.c
View file

@ -1238,7 +1238,9 @@ radv_list_drm_format_modifiers(struct radv_physical_device *dev, VkFormat format
return;
}
VK_OUTARRAY_MAKE(out, mod_list->pDrmFormatModifierProperties, &mod_list->drmFormatModifierCount);
VK_OUTARRAY_MAKE_TYPED(VkDrmFormatModifierPropertiesEXT, out,
mod_list->pDrmFormatModifierProperties,
&mod_list->drmFormatModifierCount);
ac_get_supported_modifiers(&dev->rad_info, &radv_modifier_options,
vk_format_to_pipe_format(format), &mod_count, NULL);
@ -1266,7 +1268,7 @@ radv_list_drm_format_modifiers(struct radv_physical_device *dev, VkFormat format
if (!features)
continue;
vk_outarray_append(&out, out_props) {
vk_outarray_append_typed(VkDrmFormatModifierPropertiesEXT, &out, out_props) {
*out_props = (VkDrmFormatModifierPropertiesEXT) {
.drmFormatModifier = mods[i],
.drmFormatModifierPlaneCount = planes,
@ -1293,7 +1295,9 @@ radv_list_drm_format_modifiers_2(struct radv_physical_device *dev, VkFormat form
return;
}
VK_OUTARRAY_MAKE(out, mod_list->pDrmFormatModifierProperties, &mod_list->drmFormatModifierCount);
VK_OUTARRAY_MAKE_TYPED(VkDrmFormatModifierProperties2EXT, out,
mod_list->pDrmFormatModifierProperties,
&mod_list->drmFormatModifierCount);
ac_get_supported_modifiers(&dev->rad_info, &radv_modifier_options,
vk_format_to_pipe_format(format), &mod_count, NULL);
@ -1321,7 +1325,7 @@ radv_list_drm_format_modifiers_2(struct radv_physical_device *dev, VkFormat form
if (!features)
continue;
vk_outarray_append(&out, out_props) {
vk_outarray_append_typed(VkDrmFormatModifierProperties2EXT, &out, out_props) {
*out_props = (VkDrmFormatModifierProperties2EXT) {
.drmFormatModifier = mods[i],
.drmFormatModifierPlaneCount = planes,