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

SDL GPU: Fix features not being enabled with Vulkan 1.1 (#14885)

Browse Source 
Use pre-Vulkan 1.2 structs to request features from a Vulkan 1.1 instance.

(cherry picked from commit 97b177c92f)
This commit is contained in:
Madeline Whitmore
2026-01-26 05:18:57 +13:00
committed by Sam Lantinga
parent 26352be1e5
commit e48e8a48ad
1 changed files with 49 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -12278,13 +12278,58 @@ static Uint8 VULKAN_INTERNAL_CreateLogicalDevice(
VkPhysicalDeviceFeatures2 featureList;
int minor = VK_VERSION_MINOR(features->desiredApiVersion);
struct {
VkPhysicalDevice16BitStorageFeatures storage;
VkPhysicalDeviceMultiviewFeatures multiview;
VkPhysicalDeviceProtectedMemoryFeatures protectedMem;
VkPhysicalDeviceSamplerYcbcrConversionFeatures ycbcr;
VkPhysicalDeviceShaderDrawParametersFeatures drawParams;
VkPhysicalDeviceVariablePointersFeatures varPointers;
} legacyFeatures;
if (features->usesCustomVulkanOptions && minor > 0) {
featureList.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FEATURES_2;
featureList.features = features->desiredVulkan10DeviceFeatures;
featureList.pNext = minor > 1 ? &features->desiredVulkan11DeviceFeatures : NULL;
features->desiredVulkan11DeviceFeatures.pNext = &features->desiredVulkan12DeviceFeatures;
features->desiredVulkan12DeviceFeatures.pNext = minor > 2 ? &features->desiredVulkan13DeviceFeatures : NULL;
features->desiredVulkan13DeviceFeatures.pNext = NULL;
if (minor > 1) {
featureList.pNext = &features->desiredVulkan11DeviceFeatures;
features->desiredVulkan11DeviceFeatures.pNext = &features->desiredVulkan12DeviceFeatures;
features->desiredVulkan12DeviceFeatures.pNext = minor > 2 ? &features->desiredVulkan13DeviceFeatures : NULL;
features->desiredVulkan13DeviceFeatures.pNext = NULL;
} else {
// Break VkPhysicalDeviceVulkan11Features into pre 1.2 structures for Vulkan 1.1 Support
SDL_zero(legacyFeatures);
legacyFeatures.storage.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_16BIT_STORAGE_FEATURES;
legacyFeatures.storage.storageBuffer16BitAccess = features->desiredVulkan11DeviceFeatures.storageBuffer16BitAccess;
legacyFeatures.storage.storageInputOutput16 = features->desiredVulkan11DeviceFeatures.storageInputOutput16;
legacyFeatures.storage.storagePushConstant16 = features->desiredVulkan11DeviceFeatures.storagePushConstant16;
legacyFeatures.storage.uniformAndStorageBuffer16BitAccess = features->desiredVulkan11DeviceFeatures.uniformAndStorageBuffer16BitAccess;
legacyFeatures.multiview.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MULTIVIEW_FEATURES;
legacyFeatures.multiview.multiview = features->desiredVulkan11DeviceFeatures.multiview;
legacyFeatures.multiview.multiviewGeometryShader = features->desiredVulkan11DeviceFeatures.multiviewGeometryShader;
legacyFeatures.multiview.multiviewTessellationShader = features->desiredVulkan11DeviceFeatures.multiviewTessellationShader;
legacyFeatures.protectedMem.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PROTECTED_MEMORY_FEATURES;
legacyFeatures.protectedMem.protectedMemory = features->desiredVulkan11DeviceFeatures.protectedMemory;
legacyFeatures.ycbcr.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SAMPLER_YCBCR_CONVERSION_FEATURES;
legacyFeatures.ycbcr.samplerYcbcrConversion = features->desiredVulkan11DeviceFeatures.samplerYcbcrConversion;
legacyFeatures.drawParams.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_DRAW_PARAMETERS_FEATURES;
legacyFeatures.drawParams.shaderDrawParameters = features->desiredVulkan11DeviceFeatures.shaderDrawParameters;
legacyFeatures.varPointers.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VARIABLE_POINTERS_FEATURES;
legacyFeatures.varPointers.variablePointers = features->desiredVulkan11DeviceFeatures.variablePointers;
legacyFeatures.varPointers.variablePointersStorageBuffer = features->desiredVulkan11DeviceFeatures.variablePointersStorageBuffer;
featureList.pNext = &legacyFeatures.storage;
legacyFeatures.storage.pNext = &legacyFeatures.multiview;
legacyFeatures.multiview.pNext = &legacyFeatures.protectedMem;
legacyFeatures.protectedMem.pNext = &legacyFeatures.ycbcr;
legacyFeatures.ycbcr.pNext = &legacyFeatures.drawParams;
legacyFeatures.drawParams.pNext = &legacyFeatures.varPointers;
}
deviceCreateInfo.pEnabledFeatures = NULL;
deviceCreateInfo.pNext = &featureList;
} else {