fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-04-21 01:10:44 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

vulkan: add a property struct setter function

Browse source 
This takes in a (VkBaseInStructure *), checks for its type, casts it
into the right property struct and then copies its fields over the right
way to `struct vk_properties`.

v2: a few fixups (zzyiwei)
- add missing brackets required by clang
- fix some indents
- optimize to aovid deep-copying VkPhysicalDeviceProperties
- update to use DETECT_OS_ANDROID as suggested
- cast to avoid -Wswitch for Android struct beyond VkStructureType

Signed-off-by: Yiwei Zhang <zzyiwei@chromium.org>
Tested-by: Oskar Viljasaar <oskar.viljasaar@gmail.com>
Reviewed-by: Konstantin Seurer <konstantin.seurer@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/29180>
This commit is contained in:
Oskar Viljasaar 2024-05-10 11:52:11 +03:00 • committed by Marge Bot
parent eb9a394e3c
commit f04bc27fe1
1 changed files with 60 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

62
src/vulkan/util/vk_physical_device_properties_gen.py
View file

@ -142,6 +142,10 @@ struct vk_properties {
% endfor
};
void
vk_set_physical_device_properties_struct(struct vk_properties *all_properties,
const VkBaseInStructure *pProperties);
#ifdef __cplusplus
}
#endif
@ -172,7 +176,7 @@ vk_common_GetPhysicalDeviceProperties2(VkPhysicalDevice physicalDevice,
switch ((int32_t)ext->sType) {
% for property_struct in property_structs:
% if property_struct.is_android:
#ifdef ANDROID
#if DETECT_OS_ANDROID
% endif
% if property_struct.name not in SPECIALIZED_PROPERTY_STRUCTS:
case ${property_struct.s_type}: {
@ -183,7 +187,7 @@ vk_common_GetPhysicalDeviceProperties2(VkPhysicalDevice physicalDevice,
break;
}
% if property_struct.is_android:
#endif /* ANDROID */
#endif /* DETECT_OS_ANDROID */
% endif
% endif
% endfor
@ -223,6 +227,60 @@ vk_common_GetPhysicalDeviceProperties2(VkPhysicalDevice physicalDevice,
}
}
}
void
vk_set_physical_device_properties_struct(struct vk_properties *all_properties,
const VkBaseInStructure *pProperties)
{
switch ((int32_t)pProperties->sType) {
case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PROPERTIES_2: {
const VkPhysicalDeviceProperties *properties = &((const VkPhysicalDeviceProperties2 *)pProperties)->properties;
% for prop in pdev_properties:
${copy_property("all_properties->" + prop.actual_name, "properties->" + prop.name, prop.decl)}
% endfor
break;
}
% for property_struct in property_structs:
% if property_struct.is_android:
#if DETECT_OS_ANDROID
% endif
% if property_struct.name not in SPECIALIZED_PROPERTY_STRUCTS:
case ${property_struct.s_type}: {
const ${property_struct.c_type} *properties = (const ${property_struct.c_type} *)pProperties;
% for prop in property_struct.properties:
${copy_property("all_properties->" + prop.actual_name, "properties->" + prop.name, prop.decl, "properties." + prop.length)}
% endfor
break;
}
% if property_struct.is_android:
#endif /* DETECT_OS_ANDROID */
% endif
% endif
% endfor
/* Don't assume anything with this struct type, and just copy things over */
case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_HOST_IMAGE_COPY_PROPERTIES_EXT: {
VkPhysicalDeviceHostImageCopyPropertiesEXT *properties = (void *)pProperties;
memcpy(all_properties->pCopySrcLayouts, properties->pCopySrcLayouts,
sizeof(VkImageLayout) * properties->copySrcLayoutCount);
all_properties->copySrcLayoutCount = properties->copySrcLayoutCount;
memcpy(all_properties->pCopyDstLayouts, properties->pCopyDstLayouts,
sizeof(VkImageLayout) * properties->copySrcLayoutCount);
all_properties->copyDstLayoutCount = properties->copyDstLayoutCount;
memcpy(all_properties->optimalTilingLayoutUUID, properties->optimalTilingLayoutUUID, VK_UUID_SIZE);
all_properties->identicalMemoryTypeRequirements = properties->identicalMemoryTypeRequirements;
break;
}
default:
break;
}
}
""")
def get_pdev_properties(doc, struct_name):