summaryrefslogtreecommitdiff
path: root/src/window.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/window.cpp')
-rw-r--r--src/window.cpp52
1 files changed, 26 insertions, 26 deletions
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<VkQueueFamilyProperties>(queueFamilyPropertyCount);
+ auto *queueFamilyProperties = Pke_New<VkQueueFamilyProperties>(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<VkQueueFamilyProperties>(queueFamilyProperties, queueFamilyPropertyCount);
+ Pke_Delete<VkQueueFamilyProperties>(queueFamilyProperties, queueFamilyPropertyCount);
return 0xFFFFFFFF;
}
@@ -135,13 +135,13 @@ void InitVulkan() {
if (ENABLE_VALIDATION_LAYERS) {
unsigned int layerCount;
vkEnumerateInstanceLayerProperties(&layerCount, nullptr);
- VkLayerProperties *availableLayerProperties = pke::PkeNew<VkLayerProperties>(layerCount);
+ VkLayerProperties *availableLayerProperties = Pke_New<VkLayerProperties>(layerCount);
vkEnumerateInstanceLayerProperties(&layerCount, availableLayerProperties);
printf("Available Layers:\n");
for (long i = 0; i < layerCount; ++i) {
printf("\t%s\n", availableLayerProperties[i].layerName);
}
- pke::PkeDelete<VkLayerProperties>(availableLayerProperties, layerCount);
+ Pke_Delete<VkLayerProperties>(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<VkExtensionProperties>(extensionCount);
+ auto *extensions = Pke_New<VkExtensionProperties>(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<VkExtensionProperties>(extensions, extensionCount);
+ Pke_Delete<VkExtensionProperties>(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<VkPhysicalDevice>(physicalDeviceCount);
+ auto *physicalDevices = Pke_New<VkPhysicalDevice>(physicalDeviceCount);
vkEnumeratePhysicalDevices(vkInstance, &physicalDeviceCount, physicalDevices);
graphicsFamilyIndex = 0;
presentFamilyIndex = 0;
@@ -267,7 +267,7 @@ void InitVulkan() {
std::vector<const char *> requiredExtensions(REQUIRED_EXTENSIONS.begin(), REQUIRED_EXTENSIONS.end());
unsigned int extensionCount = 0;
vkEnumerateDeviceExtensionProperties(device, nullptr, &extensionCount, nullptr);
- auto *extensionProperties = pke::PkeNew<VkExtensionProperties>(extensionCount);
+ auto *extensionProperties = Pke_New<VkExtensionProperties>(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<VkExtensionProperties>(extensionProperties, extensionCount);
+ Pke_Delete<VkExtensionProperties>(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<VkPhysicalDevice>(physicalDevices, physicalDeviceCount);
+ Pke_Delete<VkPhysicalDevice>(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<VkSurfaceFormatKHR>(surfaceFormatCounts);
+ VkSurfaceFormatKHR *surfaceFormats = Pke_New<VkSurfaceFormatKHR>(surfaceFormatCounts);
vkGetPhysicalDeviceSurfaceFormatsKHR(vkPhysicalDevice, vkSurfaceKHR, &surfaceFormatCounts, surfaceFormats);
selectedSurfaceIndex = 0;
for (long i = 0; i < surfaceFormatCounts; ++i) {
@@ -418,7 +418,7 @@ void CreateSwapchain() {
break;
}
- pke::PkeDelete<VkSurfaceFormatKHR>(surfaceFormats, surfaceFormatCounts);
+ Pke_Delete<VkSurfaceFormatKHR>(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<VkPresentModeKHR>(presentModeCount);
+ VkPresentModeKHR *presentModes = Pke_New<VkPresentModeKHR>(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<VkPresentModeKHR>(presentModes, presentModeCount);
+ Pke_Delete<VkPresentModeKHR>(presentModes, presentModeCount);
}
VkSwapchainCreateInfoKHR vkSwapchainCreateInfo{};
@@ -500,9 +500,9 @@ void CreateSwapchain() {
vkImageViewCreateInfo.subresourceRange = vkImageSubresourceRange;
vkGetSwapchainImagesKHR(vkDevice, vkSwapchainKHR, &swapchainLength, nullptr);
- swapchainImages = pke::PkeNew<VkImage>(swapchainLength);
+ swapchainImages = Pke_New<VkImage>(swapchainLength);
vkGetSwapchainImagesKHR(vkDevice, vkSwapchainKHR, &swapchainLength, swapchainImages);
- swapchainImageViews = pke::PkeNew<VkImageView>(swapchainLength);
+ swapchainImageViews = Pke_New<VkImageView>(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<VkFramebuffer>(swapchainLength);
+ swapchainFramebuffers = Pke_New<VkFramebuffer>(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<VkFramebuffer>(swapchainFramebuffers, swapchainLength);
+ Pke_Delete<VkFramebuffer>(swapchainFramebuffers, swapchainLength);
}
if (swapchainImageViews!= nullptr && swapchainImageViews != CAFE_BABE(VkImageView)) {
for (long i = 0; i < swapchainLength; ++i) {
vkDestroyImageView(vkDevice, swapchainImageViews[i], vkAllocator);
}
- pke::PkeDelete<VkImageView>(swapchainImageViews, swapchainLength);
- pke::PkeDelete<VkImage>(swapchainImages, swapchainLength);
+ Pke_Delete<VkImageView>(swapchainImageViews, swapchainLength);
+ Pke_Delete<VkImage>(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;
generated by cgit v1.2.3 (git 2.39.1) at 2026-01-09 01:25:14 +0000