mirror of
https://github.com/libsdl-org/SDL.git
synced 2026-03-20 15:51:07 +01:00
Fix compile error in MSVC 19.29
This Visual Studio 2019 compiler wrongly emits a warning. test\testvulkan.c(271): error C2220: the following warning is treated as an error test\testvulkan.c(271): warning C4090: 'function': different 'const' qualifiers test\testvulkan.c(286): warning C4090: 'function': different 'const' qualifiers
This commit is contained in:
committed by
Anonymous Maarten
parent
0a45525242
commit
48ed4faa47
@@ -268,7 +268,7 @@ static void createInstance(void)
|
|||||||
int count_extensions = count_instance_extensions + 1;
|
int count_extensions = count_instance_extensions + 1;
|
||||||
instanceExtensions = SDL_malloc(count_extensions * sizeof(const char *));
|
instanceExtensions = SDL_malloc(count_extensions * sizeof(const char *));
|
||||||
instanceExtensions[0] = VK_KHR_PORTABILITY_ENUMERATION_EXTENSION_NAME;
|
instanceExtensions[0] = VK_KHR_PORTABILITY_ENUMERATION_EXTENSION_NAME;
|
||||||
SDL_memcpy(&instanceExtensions[1], instance_extensions, count_instance_extensions * sizeof(const char*));
|
SDL_memcpy((char **) &instanceExtensions[1], instance_extensions, count_instance_extensions * sizeof(const char*));
|
||||||
|
|
||||||
instanceCreateInfo.enabledExtensionCount = count_extensions;
|
instanceCreateInfo.enabledExtensionCount = count_extensions;
|
||||||
instanceCreateInfo.ppEnabledExtensionNames = instanceExtensions;
|
instanceCreateInfo.ppEnabledExtensionNames = instanceExtensions;
|
||||||
@@ -283,7 +283,7 @@ static void createInstance(void)
|
|||||||
result = vkCreateInstance(&instanceCreateInfo, NULL, &vulkanContext->instance);
|
result = vkCreateInstance(&instanceCreateInfo, NULL, &vulkanContext->instance);
|
||||||
|
|
||||||
if (instanceExtensions != NULL) {
|
if (instanceExtensions != NULL) {
|
||||||
SDL_free(instanceExtensions);
|
SDL_free((char **) instanceExtensions);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (result != VK_SUCCESS) {
|
if (result != VK_SUCCESS) {
|
||||||
@@ -500,9 +500,9 @@ static void createDevice(void)
|
|||||||
VkDeviceCreateInfo deviceCreateInfo = { 0 };
|
VkDeviceCreateInfo deviceCreateInfo = { 0 };
|
||||||
static const char *const deviceExtensionNames[] = {
|
static const char *const deviceExtensionNames[] = {
|
||||||
VK_KHR_SWAPCHAIN_EXTENSION_NAME,
|
VK_KHR_SWAPCHAIN_EXTENSION_NAME,
|
||||||
#ifdef __APPLE__
|
#ifdef __APPLE__
|
||||||
"VK_KHR_portability_subset"
|
"VK_KHR_portability_subset"
|
||||||
#endif
|
#endif
|
||||||
};
|
};
|
||||||
VkResult result;
|
VkResult result;
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user