mirror of
https://github.com/libsdl-org/SDL.git
synced 2026-03-20 15:51:07 +01:00
error: SDL's allocators now call SDL_OutOfMemory on error.
This means the allocator's caller doesn't need to use SDL_OutOfMemory directly if the allocation fails. This applies to the usual allocators: SDL_malloc, SDL_calloc, SDL_realloc (all of these regardless of if the app supplied a custom allocator or we're using system malloc() or an internal copy of dlmalloc under the hood), SDL_aligned_alloc, SDL_small_alloc, SDL_strdup, SDL_asprintf, SDL_wcsdup... probably others. If it returns something you can pass to SDL_free, it should work. The caller might still need to use SDL_OutOfMemory if something that wasn't SDL allocated the memory: operator new in C++ code, Objective-C's alloc message, win32 GlobalAlloc, etc. Fixes #8642.
This commit is contained in:
@@ -294,7 +294,6 @@ static void findPhysicalDevice(void)
|
||||
}
|
||||
physicalDevices = (VkPhysicalDevice *)SDL_malloc(sizeof(VkPhysicalDevice) * physicalDeviceCount);
|
||||
if (!physicalDevices) {
|
||||
SDL_OutOfMemory();
|
||||
quit(2);
|
||||
}
|
||||
result = vkEnumeratePhysicalDevices(vulkanContext->instance, &physicalDeviceCount, physicalDevices);
|
||||
@@ -330,7 +329,6 @@ static void findPhysicalDevice(void)
|
||||
if (!queueFamiliesProperties) {
|
||||
SDL_free(physicalDevices);
|
||||
SDL_free(deviceExtensions);
|
||||
SDL_OutOfMemory();
|
||||
quit(2);
|
||||
}
|
||||
}
|
||||
@@ -392,7 +390,6 @@ static void findPhysicalDevice(void)
|
||||
if (!deviceExtensions) {
|
||||
SDL_free(physicalDevices);
|
||||
SDL_free(queueFamiliesProperties);
|
||||
SDL_OutOfMemory();
|
||||
quit(2);
|
||||
}
|
||||
}
|
||||
@@ -550,7 +547,6 @@ static void getSurfaceFormats(void)
|
||||
vulkanContext->surfaceFormats = (VkSurfaceFormatKHR *)SDL_malloc(sizeof(VkSurfaceFormatKHR) * vulkanContext->surfaceFormatsAllocatedCount);
|
||||
if (!vulkanContext->surfaceFormats) {
|
||||
vulkanContext->surfaceFormatsCount = 0;
|
||||
SDL_OutOfMemory();
|
||||
quit(2);
|
||||
}
|
||||
}
|
||||
@@ -583,7 +579,6 @@ static void getSwapchainImages(void)
|
||||
}
|
||||
vulkanContext->swapchainImages = SDL_malloc(sizeof(VkImage) * vulkanContext->swapchainImageCount);
|
||||
if (!vulkanContext->swapchainImages) {
|
||||
SDL_OutOfMemory();
|
||||
quit(2);
|
||||
}
|
||||
result = vkGetSwapchainImagesKHR(vulkanContext->device,
|
||||
@@ -763,7 +758,6 @@ static void createFences(void)
|
||||
|
||||
vulkanContext->fences = SDL_malloc(sizeof(VkFence) * vulkanContext->swapchainImageCount);
|
||||
if (!vulkanContext->fences) {
|
||||
SDL_OutOfMemory();
|
||||
quit(2);
|
||||
}
|
||||
for (i = 0; i < vulkanContext->swapchainImageCount; i++) {
|
||||
|
||||
Reference in New Issue
Block a user