mirror of
https://github.com/libsdl-org/SDL.git
synced 2025-10-19 16:21:44 +00:00
The extension strings are const and don't need to be duplicated
This commit is contained in:
@@ -1574,12 +1574,12 @@ static VkResult VULKAN_CreateDeviceResources(SDL_Renderer *renderer, SDL_Propert
|
|||||||
instanceCreateInfo.pApplicationInfo = &appInfo;
|
instanceCreateInfo.pApplicationInfo = &appInfo;
|
||||||
char const *const *instanceExtensions = SDL_Vulkan_GetInstanceExtensions(&instanceCreateInfo.enabledExtensionCount);
|
char const *const *instanceExtensions = SDL_Vulkan_GetInstanceExtensions(&instanceCreateInfo.enabledExtensionCount);
|
||||||
|
|
||||||
char **instanceExtensionsCopy = SDL_calloc(instanceCreateInfo.enabledExtensionCount + 1, sizeof(const char *));
|
const char **instanceExtensionsCopy = SDL_calloc(instanceCreateInfo.enabledExtensionCount + 1, sizeof(const char *));
|
||||||
for (uint32_t i = 0; i < instanceCreateInfo.enabledExtensionCount; i++) {
|
for (uint32_t i = 0; i < instanceCreateInfo.enabledExtensionCount; i++) {
|
||||||
instanceExtensionsCopy[i] = SDL_strdup(instanceExtensions[i]);
|
instanceExtensionsCopy[i] = instanceExtensions[i];
|
||||||
}
|
}
|
||||||
if (rendererData->supportsEXTSwapchainColorspace) {
|
if (rendererData->supportsEXTSwapchainColorspace) {
|
||||||
instanceExtensionsCopy[instanceCreateInfo.enabledExtensionCount] = SDL_strdup(VK_EXT_SWAPCHAIN_COLOR_SPACE_EXTENSION_NAME);
|
instanceExtensionsCopy[instanceCreateInfo.enabledExtensionCount] = VK_EXT_SWAPCHAIN_COLOR_SPACE_EXTENSION_NAME;
|
||||||
instanceCreateInfo.enabledExtensionCount++;
|
instanceCreateInfo.enabledExtensionCount++;
|
||||||
}
|
}
|
||||||
instanceCreateInfo.ppEnabledExtensionNames = (const char *const *)instanceExtensionsCopy;
|
instanceCreateInfo.ppEnabledExtensionNames = (const char *const *)instanceExtensionsCopy;
|
||||||
@@ -1592,10 +1592,6 @@ static VkResult VULKAN_CreateDeviceResources(SDL_Renderer *renderer, SDL_Propert
|
|||||||
SDL_LogError(SDL_LOG_CATEGORY_RENDER, "vkCreateInstance(): %s\n", SDL_Vulkan_GetResultString(result));
|
SDL_LogError(SDL_LOG_CATEGORY_RENDER, "vkCreateInstance(): %s\n", SDL_Vulkan_GetResultString(result));
|
||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
|
|
||||||
for (uint32_t i = 0; i < instanceCreateInfo.enabledExtensionCount; i++) {
|
|
||||||
SDL_free(instanceExtensionsCopy[i]);
|
|
||||||
}
|
|
||||||
SDL_free(instanceExtensionsCopy);
|
SDL_free(instanceExtensionsCopy);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user