diff options
Diffstat (limited to 'src/window.cpp')
| -rw-r--r-- | src/window.cpp | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/src/window.cpp b/src/window.cpp index 2ab34c6..ef65c5d 100644 --- a/src/window.cpp +++ b/src/window.cpp @@ -334,7 +334,7 @@ void CreateSwapchain() { if (selectedSurfaceIndex == -1u) { unsigned int surfaceFormatCounts; vkGetPhysicalDeviceSurfaceFormatsKHR(vkPhysicalDevice, vkSurfaceKHR, &surfaceFormatCounts, nullptr); - VkSurfaceFormatKHR *surfaceFormats = new VkSurfaceFormatKHR[surfaceFormatCounts]; + VkSurfaceFormatKHR *surfaceFormats = pke::PkeNew<VkSurfaceFormatKHR>(sizeof(VkSurfaceFormatKHR) * surfaceFormatCounts); vkGetPhysicalDeviceSurfaceFormatsKHR(vkPhysicalDevice, vkSurfaceKHR, &surfaceFormatCounts, surfaceFormats); selectedSurfaceIndex = 0; for (long i = 0; i < surfaceFormatCounts; ++i) { @@ -346,7 +346,7 @@ void CreateSwapchain() { break; } - delete[] surfaceFormats; + pke::PkeDelete(surfaceFormats); } int width, height; @@ -362,8 +362,8 @@ void CreateSwapchain() { if (selectedPresentIndex == -1u) { unsigned int presentModeCount = 0; vkGetPhysicalDeviceSurfacePresentModesKHR(vkPhysicalDevice, vkSurfaceKHR, &presentModeCount, nullptr); - VkPresentModeKHR *presentModes = new VkPresentModeKHR[presentModeCount]; - vkGetPhysicalDeviceSurfacePresentModesKHR(vkPhysicalDevice, vkSurfaceKHR, &presentModeCount, nullptr); + VkPresentModeKHR *presentModes = pke::PkeNew<VkPresentModeKHR>(sizeof(VkPresentModeKHR) * presentModeCount); + vkGetPhysicalDeviceSurfacePresentModesKHR(vkPhysicalDevice, vkSurfaceKHR, &presentModeCount, presentModes); unsigned long mailboxIndex = -1; unsigned long fifoRelaxedIndex = -1; for (long i = 0; i < presentModeCount; ++i) { @@ -375,7 +375,7 @@ void CreateSwapchain() { } selectedPresentIndex = mailboxIndex != -1ul ? mailboxIndex : fifoRelaxedIndex; vkPresentModeKHR = presentModes[selectedPresentIndex]; - delete[] presentModes; + pke::PkeDelete(presentModes); } VkSwapchainCreateInfoKHR vkSwapchainCreateInfo{}; @@ -427,9 +427,9 @@ void CreateSwapchain() { vkImageViewCreateInfo.subresourceRange = vkImageSubresourceRange; vkGetSwapchainImagesKHR(vkDevice, vkSwapchainKHR, &swapchainLength, nullptr); - swapchainImages = new VkImage[swapchainLength]; + swapchainImages = pke::PkeNew<VkImage>(sizeof(VkImage) * swapchainLength); vkGetSwapchainImagesKHR(vkDevice, vkSwapchainKHR, &swapchainLength, swapchainImages); - swapchainImageViews = new VkImageView[swapchainLength]; + swapchainImageViews = pke::PkeNew<VkImageView>(sizeof(VkImageView) * swapchainLength); for (long i = 0; i < swapchainLength; ++i) { vkImageViewCreateInfo.image = swapchainImages[i]; vkCreateImageView(vkDevice, &vkImageViewCreateInfo, vkAllocator, &swapchainImageViews[i]); @@ -441,6 +441,8 @@ void DestroySwapchain() { for (long i = 0; i < swapchainLength; ++i) { vkDestroyImageView(vkDevice, swapchainImageViews[i], vkAllocator); } + pke::PkeDelete(swapchainImageViews); + pke::PkeDelete(swapchainImages); } vkDestroySwapchainKHR(vkDevice, vkSwapchainKHR, vkAllocator); swapchainImages = reinterpret_cast<VkImage *>(0xCAFEBABE); |