mirrors/SDL
1
0
Fork 0
mirror of https://github.com/libsdl-org/SDL.git synced 2026-02-12 23:03:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

gpu: Check for Vulkan conformance while checking the device rank.

Browse Source 
This should behave largely the same, except now Dozen is given a pass for WSL.

This is a better fix for #14915.
This commit is contained in:
Ethan Lee
2026-01-30 09:20:26 -05:00
parent fb794acff7
commit ad70aac0db
1 changed files with 43 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

64
src/gpu/vulkan/SDL_gpu_vulkan.c
View File

@@ -11877,26 +11877,53 @@ static bool VULKAN_INTERNAL_GetDeviceRank(
1 // VK_PHYSICAL_DEVICE_TYPE_CPU
};
const Uint8 *devicePriority = renderer->preferLowPower ? DEVICE_PRIORITY_LOWPOWER : DEVICE_PRIORITY_HIGHPERFORMANCE;
bool isConformant;
VkPhysicalDeviceType deviceType;
if (physicalDeviceExtensions->MSFT_layered_driver) {
if (physicalDeviceExtensions->KHR_driver_properties || physicalDeviceExtensions->MSFT_layered_driver) {
VkPhysicalDeviceProperties2KHR physicalDeviceProperties;
VkPhysicalDeviceDriverPropertiesKHR physicalDeviceDriverProperties;
VkPhysicalDeviceLayeredDriverPropertiesMSFT physicalDeviceLayeredDriverProperties;
void** ppNext = &physicalDeviceProperties.pNext;
physicalDeviceProperties.sType =
VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PROPERTIES_2;
physicalDeviceProperties.pNext = &physicalDeviceLayeredDriverProperties;
physicalDeviceLayeredDriverProperties.sType =
VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_LAYERED_DRIVER_PROPERTIES_MSFT;
physicalDeviceLayeredDriverProperties.pNext = NULL;
if (physicalDeviceExtensions->KHR_driver_properties) {
*ppNext = &physicalDeviceDriverProperties;
ppNext = &physicalDeviceDriverProperties.pNext;
physicalDeviceDriverProperties.sType =
VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DRIVER_PROPERTIES_KHR;
}
if (physicalDeviceExtensions->MSFT_layered_driver) {
*ppNext = &physicalDeviceLayeredDriverProperties;
ppNext = &physicalDeviceLayeredDriverProperties.pNext;
physicalDeviceLayeredDriverProperties.sType =
VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_LAYERED_DRIVER_PROPERTIES_MSFT;
}
*ppNext = NULL;
renderer->vkGetPhysicalDeviceProperties2KHR(
physicalDevice,
&physicalDeviceProperties);
if (physicalDeviceLayeredDriverProperties.underlyingAPI != VK_LAYERED_DRIVER_UNDERLYING_API_NONE_MSFT) {
if (physicalDeviceExtensions->KHR_driver_properties) {
isConformant = (physicalDeviceDriverProperties.conformanceVersion.major >= 1);
} else {
isConformant = true; // We can't check this, so just assume it's conformant
}
if (physicalDeviceExtensions->MSFT_layered_driver && physicalDeviceLayeredDriverProperties.underlyingAPI != VK_LAYERED_DRIVER_UNDERLYING_API_NONE_MSFT) {
deviceType = VK_PHYSICAL_DEVICE_TYPE_OTHER;
/* Dozen hasn't been tested for conformance and it probably won't be,
* but WSL may need this so let's be generous.
* -flibit
*/
isConformant = true;
} else {
deviceType = physicalDeviceProperties.properties.deviceType;
}
@@ -11906,6 +11933,7 @@ static bool VULKAN_INTERNAL_GetDeviceRank(
physicalDevice,
&physicalDeviceProperties);
deviceType = physicalDeviceProperties.deviceType;
isConformant = true; // We can't check this, so just assume it's conformant
}
if (renderer->requireHardwareAcceleration) {
@@ -11917,6 +11945,15 @@ static bool VULKAN_INTERNAL_GetDeviceRank(
}
}
/* As far as I know, the only drivers available to users that are also
* non-conformant are incomplete Mesa drivers and Vulkan-on-12. hasvk is one
* example of a non-conformant driver that's built by default.
* -flibit
*/
if (!isConformant) {
return 0;
}
/* Apply a large bias on the devicePriority so that we always respect the order in the priority arrays.
* We also rank by e.g. VRAM which should have less influence than the device type.
*/
@@ -12192,21 +12229,6 @@ static Uint8 VULKAN_INTERNAL_DeterminePhysicalDevice(VulkanRenderer *renderer, V
renderer->vkGetPhysicalDeviceProperties2KHR(
renderer->physicalDevice,
&renderer->physicalDeviceProperties);
/* FIXME: This is very much a last resort to avoid WIP drivers.
*
* As far as I know, the only drivers available to users that are also
* non-conformant are incomplete Mesa drivers. hasvk is one example.
*
* It'd be nice to detect this sooner, but if this device is truly the
* best device on the system, it's the same outcome anyhow.
* -flibit
*/
if (renderer->physicalDeviceDriverProperties.conformanceVersion.major < 1) {
SDL_stack_free(physicalDevices);
SDL_stack_free(physicalDeviceExtensions);
return 0;
}
} else {
renderer->physicalDeviceProperties.pNext = NULL;