@@ -11636,7 +11636,7 @@ static bool VULKAN_INTERNAL_TryAddDeviceFeatures_Vulkan_12_Or_Later(VkPhysicalDe
1163611636 return hasAdded ;
1163711637}
1163811638
11639- static bool VULKAN_INTERNAL_AddOptInVulkanOptions (SDL_PropertiesID props , VulkanRenderer * renderer )
11639+ static void VULKAN_INTERNAL_AddOptInVulkanOptions (SDL_PropertiesID props , VulkanRenderer * renderer )
1164011640{
1164111641 if (SDL_HasProperty (props , SDL_PROP_GPU_DEVICE_CREATE_VULKAN_OPTIONS_POINTER )) {
1164211642 SDL_GPUVulkanOptions * options = (SDL_GPUVulkanOptions * )SDL_GetPointerProperty (props , SDL_PROP_GPU_DEVICE_CREATE_VULKAN_OPTIONS_POINTER , NULL );
@@ -11693,10 +11693,11 @@ static bool VULKAN_INTERNAL_AddOptInVulkanOptions(SDL_PropertiesID props, Vulkan
1169311693 renderer -> additionalDeviceExtensionNames = options -> device_extension_names ;
1169411694 renderer -> additionalInstanceExtensionCount = options -> instance_extension_count ;
1169511695 renderer -> additionalInstanceExtensionNames = options -> instance_extension_names ;
11696+ } else if (renderer -> debugMode ) {
11697+ SDL_LogWarn (SDL_LOG_CATEGORY_GPU ,
11698+ "VULKAN_INTERNAL_AddOptInVulkanOptions: Additional options property was set, but value was null. This may be a bug." );
1169611699 }
1169711700 }
11698-
11699- return true;
1170011701}
1170111702
1170211703static Uint8 VULKAN_INTERNAL_CreateInstance (VulkanRenderer * renderer )
@@ -12338,13 +12339,11 @@ static bool VULKAN_PrepareDriver(SDL_VideoDevice *_this, SDL_PropertiesID props)
1233812339 renderer -> desiredVulkan10DeviceFeatures .imageCubeArray = VK_TRUE ;
1233912340
1234012341 // Handle opt-in device features
12341- bool featuresInitialized = VULKAN_INTERNAL_AddOptInVulkanOptions (props , renderer );
12342+ VULKAN_INTERNAL_AddOptInVulkanOptions (props , renderer );
1234212343
12343- if (featuresInitialized ) {
12344- result = VULKAN_INTERNAL_PrepareVulkan (renderer );
12345- if (result ) {
12346- renderer -> vkDestroyInstance (renderer -> instance , NULL );
12347- }
12344+ result = VULKAN_INTERNAL_PrepareVulkan (renderer );
12345+ if (result ) {
12346+ renderer -> vkDestroyInstance (renderer -> instance , NULL );
1234812347 }
1234912348
1235012349 SDL_free (renderer );
@@ -12393,12 +12392,7 @@ static SDL_GPUDevice *VULKAN_CreateDevice(bool debugMode, bool preferLowPower, S
1239312392 renderer -> desiredVulkan10DeviceFeatures .imageCubeArray = VK_TRUE ;
1239412393
1239512394 // Handle opt-in device features
12396- if (!VULKAN_INTERNAL_AddOptInVulkanOptions (props , renderer )) {
12397- SET_STRING_ERROR ("Failed to initialize additional Vulkan options!" );
12398- SDL_free (renderer );
12399- SDL_Vulkan_UnloadLibrary ();
12400- return NULL ;
12401- }
12395+ VULKAN_INTERNAL_AddOptInVulkanOptions (props , renderer );
1240212396
1240312397 if (!VULKAN_INTERNAL_PrepareVulkan (renderer )) {
1240412398 SET_STRING_ERROR ("Failed to initialize Vulkan!" );
0 commit comments