From abcb22c518f39ac5095e58294eab150cb8cd9afe Mon Sep 17 00:00:00 2001 From: Jonathan Bradley Date: Thu, 31 Aug 2023 16:25:16 -0400 Subject: cleanup naming conventions and header defs --- src/window.cpp | 52 ++++++++++++++++++++++++++-------------------------- 1 file changed, 26 insertions(+), 26 deletions(-) (limited to 'src/window.cpp') diff --git a/src/window.cpp b/src/window.cpp index a4fc5a2..eb2ecff 100644 --- a/src/window.cpp +++ b/src/window.cpp @@ -106,7 +106,7 @@ unsigned int FindQueueFamilyIndex(VkPhysicalDevice device, short hasPresentSuppo unsigned int queueFamilyPropertyCount = 0U; vkGetPhysicalDeviceQueueFamilyProperties(device, &queueFamilyPropertyCount, nullptr); - auto *queueFamilyProperties = pke::PkeNew(queueFamilyPropertyCount); + auto *queueFamilyProperties = Pke_New(queueFamilyPropertyCount); vkGetPhysicalDeviceQueueFamilyProperties(device, &queueFamilyPropertyCount, queueFamilyProperties); for (unsigned int i = 0; i < queueFamilyPropertyCount; i++) { @@ -126,7 +126,7 @@ unsigned int FindQueueFamilyIndex(VkPhysicalDevice device, short hasPresentSuppo return i; } - pke::PkeDelete(queueFamilyProperties, queueFamilyPropertyCount); + Pke_Delete(queueFamilyProperties, queueFamilyPropertyCount); return 0xFFFFFFFF; } @@ -135,13 +135,13 @@ void InitVulkan() { if (ENABLE_VALIDATION_LAYERS) { unsigned int layerCount; vkEnumerateInstanceLayerProperties(&layerCount, nullptr); - VkLayerProperties *availableLayerProperties = pke::PkeNew(layerCount); + VkLayerProperties *availableLayerProperties = Pke_New(layerCount); vkEnumerateInstanceLayerProperties(&layerCount, availableLayerProperties); printf("Available Layers:\n"); for (long i = 0; i < layerCount; ++i) { printf("\t%s\n", availableLayerProperties[i].layerName); } - pke::PkeDelete(availableLayerProperties, layerCount); + Pke_Delete(availableLayerProperties, layerCount); } VkApplicationInfo appInfo{}; @@ -205,13 +205,13 @@ void InitVulkan() { if (ENABLE_VALIDATION_LAYERS) { unsigned int extensionCount = 0; vkEnumerateInstanceExtensionProperties(nullptr, &extensionCount, nullptr); - auto *extensions = pke::PkeNew(extensionCount); + auto *extensions = Pke_New(extensionCount); vkEnumerateInstanceExtensionProperties(nullptr, &extensionCount, extensions); printf("Available Extensions:\n"); for (long i = 0; i < extensionCount; ++i) { printf("\t%s\n", extensions[i].extensionName); } - pke::PkeDelete(extensions, extensionCount); + Pke_Delete(extensions, extensionCount); } auto result = vkCreateInstance(&createInfo, nullptr, &vkInstance); @@ -249,7 +249,7 @@ void InitVulkan() { unsigned int physicalDeviceCount = 0; vkEnumeratePhysicalDevices(vkInstance, &physicalDeviceCount, nullptr); assert(physicalDeviceCount > 0); - auto *physicalDevices = pke::PkeNew(physicalDeviceCount); + auto *physicalDevices = Pke_New(physicalDeviceCount); vkEnumeratePhysicalDevices(vkInstance, &physicalDeviceCount, physicalDevices); graphicsFamilyIndex = 0; presentFamilyIndex = 0; @@ -267,7 +267,7 @@ void InitVulkan() { std::vector requiredExtensions(REQUIRED_EXTENSIONS.begin(), REQUIRED_EXTENSIONS.end()); unsigned int extensionCount = 0; vkEnumerateDeviceExtensionProperties(device, nullptr, &extensionCount, nullptr); - auto *extensionProperties = pke::PkeNew(extensionCount); + auto *extensionProperties = Pke_New(extensionCount); vkEnumerateDeviceExtensionProperties(device, nullptr, &extensionCount, extensionProperties); for (long k = 0; k < extensionCount; ++k) { const auto &property = extensionProperties[k]; @@ -280,7 +280,7 @@ void InitVulkan() { } } } - pke::PkeDelete(extensionProperties, extensionCount); + Pke_Delete(extensionProperties, extensionCount); if (requiredExtensions.empty() == false) { continue; } @@ -305,7 +305,7 @@ void InitVulkan() { break; } assert(vkPhysicalDevice != nullptr && "Failed to find suitable physical device"); - pke::PkeDelete(physicalDevices, physicalDeviceCount); + Pke_Delete(physicalDevices, physicalDeviceCount); // Create logical device { @@ -406,7 +406,7 @@ void CreateSwapchain() { if (selectedSurfaceIndex == -1u) { unsigned int surfaceFormatCounts; vkGetPhysicalDeviceSurfaceFormatsKHR(vkPhysicalDevice, vkSurfaceKHR, &surfaceFormatCounts, nullptr); - VkSurfaceFormatKHR *surfaceFormats = pke::PkeNew(surfaceFormatCounts); + VkSurfaceFormatKHR *surfaceFormats = Pke_New(surfaceFormatCounts); vkGetPhysicalDeviceSurfaceFormatsKHR(vkPhysicalDevice, vkSurfaceKHR, &surfaceFormatCounts, surfaceFormats); selectedSurfaceIndex = 0; for (long i = 0; i < surfaceFormatCounts; ++i) { @@ -418,7 +418,7 @@ void CreateSwapchain() { break; } - pke::PkeDelete(surfaceFormats, surfaceFormatCounts); + Pke_Delete(surfaceFormats, surfaceFormatCounts); } int width, height; @@ -434,7 +434,7 @@ void CreateSwapchain() { if (selectedPresentIndex == -1u) { unsigned int presentModeCount = 0; vkGetPhysicalDeviceSurfacePresentModesKHR(vkPhysicalDevice, vkSurfaceKHR, &presentModeCount, nullptr); - VkPresentModeKHR *presentModes = pke::PkeNew(presentModeCount); + VkPresentModeKHR *presentModes = Pke_New(presentModeCount); vkGetPhysicalDeviceSurfacePresentModesKHR(vkPhysicalDevice, vkSurfaceKHR, &presentModeCount, presentModes); unsigned long mailboxIndex = -1; unsigned long fifoRelaxedIndex = -1; @@ -447,7 +447,7 @@ void CreateSwapchain() { } selectedPresentIndex = mailboxIndex != -1ul ? mailboxIndex : fifoRelaxedIndex; vkPresentModeKHR = presentModes[selectedPresentIndex]; - pke::PkeDelete(presentModes, presentModeCount); + Pke_Delete(presentModes, presentModeCount); } VkSwapchainCreateInfoKHR vkSwapchainCreateInfo{}; @@ -500,9 +500,9 @@ void CreateSwapchain() { vkImageViewCreateInfo.subresourceRange = vkImageSubresourceRange; vkGetSwapchainImagesKHR(vkDevice, vkSwapchainKHR, &swapchainLength, nullptr); - swapchainImages = pke::PkeNew(swapchainLength); + swapchainImages = Pke_New(swapchainLength); vkGetSwapchainImagesKHR(vkDevice, vkSwapchainKHR, &swapchainLength, swapchainImages); - swapchainImageViews = pke::PkeNew(swapchainLength); + swapchainImageViews = Pke_New(swapchainLength); for (long i = 0; i < swapchainLength; ++i) { vkImageViewCreateInfo.image = swapchainImages[i]; vkCreateImageView(vkDevice, &vkImageViewCreateInfo, vkAllocator, &swapchainImageViews[i]); @@ -563,8 +563,8 @@ void CreateRenderPass() { } void CreateGraphicsPipeline() { - AssetHandle vertShaderAsset = RegisterAsset("assets/shaders/present.vert.spv"); - AssetHandle fragShaderAsset = RegisterAsset("assets/shaders/present.frag.spv"); + AssetHandle vertShaderAsset = AM_Register("assets/shaders/present.vert.spv"); + AssetHandle fragShaderAsset = AM_Register("assets/shaders/present.frag.spv"); auto vertShader = UploadShader(vertShaderAsset); auto fragShader = UploadShader(fragShaderAsset); @@ -788,13 +788,13 @@ void CreateGraphicsPipeline() { vkDestroyShaderModule(vkDevice, fragShader, vkAllocator); vkDestroyShaderModule(vkDevice, vertShader, vkAllocator); - DestroyAsset(fragShaderAsset); - DestroyAsset(vertShaderAsset); + AM_Destroy(fragShaderAsset); + AM_Destroy(vertShaderAsset); } void CreateFramebuffers() { assert(swapchainFramebuffers == nullptr || swapchainFramebuffers == CAFE_BABE(VkFramebuffer)); - swapchainFramebuffers = pke::PkeNew(swapchainLength); + swapchainFramebuffers = Pke_New(swapchainLength); VkFramebufferCreateInfo framebufferInfo{}; framebufferInfo.sType = VK_STRUCTURE_TYPE_FRAMEBUFFER_CREATE_INFO; @@ -1009,7 +1009,7 @@ void RecordCommandBuffer(VkCommandBuffer commandBuffer, uint32_t imageIndex) { ImGui::DockSpaceOverViewport(nullptr, ImGuiDockNodeFlags_PassthruCentralNode); ImGui::ShowDemoWindow(); - DispatchCabllack("RenderImGui"); + Event_Dispatch("RenderImGui"); ImGui::Render(); auto drawData = ImGui::GetDrawData(); @@ -1032,14 +1032,14 @@ void DestroySwapchain() { for (long i = 0; i < swapchainLength; ++i) { vkDestroyFramebuffer(vkDevice, swapchainFramebuffers[i], vkAllocator); } - pke::PkeDelete(swapchainFramebuffers, swapchainLength); + Pke_Delete(swapchainFramebuffers, swapchainLength); } if (swapchainImageViews!= nullptr && swapchainImageViews != CAFE_BABE(VkImageView)) { for (long i = 0; i < swapchainLength; ++i) { vkDestroyImageView(vkDevice, swapchainImageViews[i], vkAllocator); } - pke::PkeDelete(swapchainImageViews, swapchainLength); - pke::PkeDelete(swapchainImages, swapchainLength); + Pke_Delete(swapchainImageViews, swapchainLength); + Pke_Delete(swapchainImages, swapchainLength); } vkDestroySwapchainKHR(vkDevice, vkSwapchainKHR, vkAllocator); swapchainImages = CAFE_BABE(VkImage); @@ -1121,7 +1121,7 @@ void DestroyWindow() { } VkShaderModule UploadShader(AssetHandle handle) { - const Asset *asset = GetAsset(handle); + const Asset *asset = AM_Get(handle); VkShaderModuleCreateInfo createInfo{}; createInfo.sType = VK_STRUCTURE_TYPE_SHADER_MODULE_CREATE_INFO; -- cgit v1.2.3