fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-05 00:58:05 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

vulkan/device_select: Only call vkGetPhysicalDeviceProperties2 if the device supports it.

Browse source 
vkGetPhysicalDeviceProperties2 is not allowed to be used with a 1.0 device
because it's  a vulkan 1.1 function.

Closes: #4396
Fixes: 38ce8d4d ("vulkan/device_select: Stop using device properties 2.")
Reviewed-by: Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/9462>
(cherry picked from commit fb1100d718)
This commit is contained in:
Georg Lehmann 2021-03-08 17:39:09 +01:00 • committed by Dylan Baker
parent 433bf80df7
commit 5db0651bfe
2 changed files with 10 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.pick_status.json
View file

@ -571,7 +571,7 @@
"description": "vulkan/device_select: Only call vkGetPhysicalDeviceProperties2 if the device supports it.",
"nominated": true,
"nomination_type": 1,
"resolution": 0,
"resolution": 1,
"master_sha": null,
"because_sha": "38ce8d4d00c2b0e567b6dd36876cf171acb1dbc7"
},

17
src/vulkan/device-select-layer/device_select_layer.c
View file

@ -193,6 +193,13 @@ static void device_select_DestroyInstance(VkInstance instance, const VkAllocatio
free(info);
}
static void get_device_properties(const struct instance_info *info, VkPhysicalDevice device, VkPhysicalDeviceProperties2 *properties)
{
info->GetPhysicalDeviceProperties(device, &properties->properties);
if (info->GetPhysicalDeviceProperties2 && properties->properties.apiVersion >= VK_API_VERSION_1_1)
info->GetPhysicalDeviceProperties2(device, properties);
}
static void print_gpu(const struct instance_info *info, unsigned index, VkPhysicalDevice device)
{
@ -205,10 +212,7 @@ static void print_gpu(const struct instance_info *info, unsigned index, VkPhysic
};
if (info->has_vulkan11 && info->has_pci_bus)
properties.pNext = &ext_pci_properties;
if (info->GetPhysicalDeviceProperties2)
info->GetPhysicalDeviceProperties2(device, &properties);
else
info->GetPhysicalDeviceProperties(device, &properties.properties);
get_device_properties(info, device, &properties);
switch(properties.properties.deviceType) {
case VK_PHYSICAL_DEVICE_TYPE_OTHER:
@ -251,10 +255,7 @@ static bool fill_drm_device_info(const struct instance_info *info,
if (info->has_vulkan11 && info->has_pci_bus)
properties.pNext = &ext_pci_properties;
if (info->GetPhysicalDeviceProperties2)
info->GetPhysicalDeviceProperties2(device, &properties);
else
info->GetPhysicalDeviceProperties(device, &properties.properties);
get_device_properties(info, device, &properties);
drm_device->cpu_device = properties.properties.deviceType == VK_PHYSICAL_DEVICE_TYPE_CPU;
drm_device->dev_info.vendor_id = properties.properties.vendorID;