diff options
| -rw-r--r-- | src/window.cpp | 14 | ||||
| -rw-r--r-- | src/window.hpp | 1 |
2 files changed, 8 insertions, 7 deletions
diff --git a/src/window.cpp b/src/window.cpp index de391a2..2315da9 100644 --- a/src/window.cpp +++ b/src/window.cpp @@ -43,7 +43,7 @@ VkExtent2D extent; VkImage *swapchainImages = nullptr; VkImageView *swapchainImageViews = nullptr; VkSampler presentSampler; -VkRenderPass renderPass; +VkRenderPass vkRenderPass; VkDescriptorSetLayout vkDescriptorSetLayout; /* VkDescriptorPool presentDescriptorPool; @@ -628,7 +628,7 @@ void CreateRenderPass() { renderPassInfo.dependencyCount = 2; renderPassInfo.pDependencies = subpassDependencies; - if (vkCreateRenderPass(vkDevice, &renderPassInfo, vkAllocator, &renderPass) != VK_SUCCESS) { + if (vkCreateRenderPass(vkDevice, &renderPassInfo, vkAllocator, &vkRenderPass) != VK_SUCCESS) { throw "failed to create render pass!"; } } @@ -839,7 +839,7 @@ void CreateGraphicsPipeline() { pipelineInfo.pDynamicState = &dynamicState; pipelineInfo.layout = pipelineLayout; - pipelineInfo.renderPass = renderPass; + pipelineInfo.renderPass = vkRenderPass; pipelineInfo.subpass = 0; pipelineInfo.basePipelineHandle = VK_NULL_HANDLE; pipelineInfo.basePipelineIndex = {}; @@ -892,7 +892,7 @@ void CreateFramebuffers() { framebufferInfo.sType = VK_STRUCTURE_TYPE_FRAMEBUFFER_CREATE_INFO; framebufferInfo.pNext = nullptr; framebufferInfo.flags = {}; - framebufferInfo.renderPass = renderPass; + framebufferInfo.renderPass = vkRenderPass; framebufferInfo.attachmentCount = 1; framebufferInfo.pAttachments = nullptr; framebufferInfo.width = extent.width; @@ -1064,7 +1064,7 @@ void CreateImGui() { initInfo.Subpass = 0; initInfo.UseDynamicRendering = false; - ImGui_ImplVulkan_Init(&initInfo, renderPass); + ImGui_ImplVulkan_Init(&initInfo, vkRenderPass); // font { @@ -1135,7 +1135,7 @@ void RecordCommandBuffer(VkCommandBuffer commandBuffer, uint32_t imageIndex) { VkRenderPassBeginInfo renderPassInfo; renderPassInfo.sType = VK_STRUCTURE_TYPE_RENDER_PASS_BEGIN_INFO; - renderPassInfo.renderPass = renderPass; + renderPassInfo.renderPass = vkRenderPass; renderPassInfo.framebuffer = swapchainFramebuffers[imageIndex]; renderPassInfo.renderArea.offset = {0, 0}; renderPassInfo.renderArea.extent = extent; @@ -1270,7 +1270,7 @@ void DestroyWindow() { */ vkDestroyDescriptorPool(vkDevice, imGuiDescriptorPool, vkAllocator); vkDestroyDescriptorSetLayout(vkDevice, vkDescriptorSetLayout, vkAllocator); - vkDestroyRenderPass(vkDevice, renderPass, vkAllocator); + vkDestroyRenderPass(vkDevice, vkRenderPass, vkAllocator); vkDestroySurfaceKHR(vkInstance, vkSurfaceKHR, vkAllocator); vkDestroySampler(vkDevice, presentSampler, vkAllocator); vkDestroyDevice(vkDevice, vkAllocator); diff --git a/src/window.hpp b/src/window.hpp index 430151e..84e3d33 100644 --- a/src/window.hpp +++ b/src/window.hpp @@ -36,6 +36,7 @@ extern VkCommandBuffer transferCommandBuffer; extern unsigned int graphicsFamilyIndex; extern unsigned int presentFamilyIndex; extern unsigned int transferFamilyIndex; +extern VkRenderPass vkRenderPass; struct PKEWindowProperties { unsigned int width = 1280; |