From e142bb1b0ce392fe58370f47eb1fdac52c78bc2e Mon Sep 17 00:00:00 2001 From: Sam Lantinga Date: Tue, 27 Feb 2024 20:13:15 -0800 Subject: [PATCH] The extension strings are const and don't need to be duplicated --- src/render/vulkan/SDL_render_vulkan.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/src/render/vulkan/SDL_render_vulkan.c b/src/render/vulkan/SDL_render_vulkan.c index e78bab69df..61524341ec 100644 --- a/src/render/vulkan/SDL_render_vulkan.c +++ b/src/render/vulkan/SDL_render_vulkan.c @@ -1574,12 +1574,12 @@ static VkResult VULKAN_CreateDeviceResources(SDL_Renderer *renderer, SDL_Propert instanceCreateInfo.pApplicationInfo = &appInfo; 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++) { - instanceExtensionsCopy[i] = SDL_strdup(instanceExtensions[i]); + instanceExtensionsCopy[i] = instanceExtensions[i]; } 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.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)); return result; } - - for (uint32_t i = 0; i < instanceCreateInfo.enabledExtensionCount; i++) { - SDL_free(instanceExtensionsCopy[i]); - } SDL_free(instanceExtensionsCopy); }