diff options
| -rw-r--r-- | src/window.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/window.cpp b/src/window.cpp index 6663fb0..5d71e98 100644 --- a/src/window.cpp +++ b/src/window.cpp @@ -47,7 +47,7 @@ VkImageView *renderImageViews = nullptr; VkDeviceMemory renderImagesMemory; VkBuffer renderImagesBuffer; VkSampler presentSampler; -VkRenderPass vkRenderPass; +VkRenderPass presentRenderPass; VkDescriptorSetLayout vkDescriptorSetLayout; VkDescriptorPool presentDescriptorPool; VkDescriptorSet presentDescriptorSets[MAX_FRAMES_IN_FLIGHT]; @@ -696,7 +696,7 @@ void CreateRenderPass() { renderPassInfo.dependencyCount = 2; renderPassInfo.pDependencies = subpassDependencies; - if (vkCreateRenderPass(vkDevice, &renderPassInfo, vkAllocator, &vkRenderPass) != VK_SUCCESS) { + if (vkCreateRenderPass(vkDevice, &renderPassInfo, vkAllocator, &presentRenderPass) != VK_SUCCESS) { throw "failed to create render pass!"; } } @@ -906,7 +906,7 @@ void CreateGraphicsPipeline() { pipelineInfo.pDynamicState = &dynamicState; pipelineInfo.layout = pipelineLayout; - pipelineInfo.renderPass = vkRenderPass; + pipelineInfo.renderPass = presentRenderPass; pipelineInfo.subpass = 0; pipelineInfo.basePipelineHandle = VK_NULL_HANDLE; pipelineInfo.basePipelineIndex = {}; @@ -953,7 +953,7 @@ void CreateFramebuffers() { framebufferInfo.sType = VK_STRUCTURE_TYPE_FRAMEBUFFER_CREATE_INFO; framebufferInfo.pNext = nullptr; framebufferInfo.flags = {}; - framebufferInfo.renderPass = vkRenderPass; + framebufferInfo.renderPass = presentRenderPass; framebufferInfo.attachmentCount = 1; framebufferInfo.pAttachments = nullptr; framebufferInfo.width = extent.width; @@ -1130,7 +1130,7 @@ void CreateImGui() { initInfo.Subpass = 0; initInfo.UseDynamicRendering = false; - ImGui_ImplVulkan_Init(&initInfo, vkRenderPass); + ImGui_ImplVulkan_Init(&initInfo, presentRenderPass); // font { @@ -1201,7 +1201,7 @@ void RecordCommandBuffer(VkCommandBuffer commandBuffer, uint32_t imageIndex) { VkRenderPassBeginInfo renderPassInfo; renderPassInfo.sType = VK_STRUCTURE_TYPE_RENDER_PASS_BEGIN_INFO; - renderPassInfo.renderPass = vkRenderPass; + renderPassInfo.renderPass = presentRenderPass; renderPassInfo.framebuffer = swapchainFramebuffers[imageIndex]; renderPassInfo.renderArea.offset = {0, 0}; renderPassInfo.renderArea.extent = extent; @@ -1354,7 +1354,7 @@ void DestroyWindow() { vkDestroyDescriptorPool(vkDevice, presentDescriptorPool, vkAllocator); vkDestroyDescriptorPool(vkDevice, imGuiDescriptorPool, vkAllocator); vkDestroyDescriptorSetLayout(vkDevice, vkDescriptorSetLayout, vkAllocator); - vkDestroyRenderPass(vkDevice, vkRenderPass, vkAllocator); + vkDestroyRenderPass(vkDevice, presentRenderPass, vkAllocator); vkDestroySurfaceKHR(vkInstance, vkSurfaceKHR, vkAllocator); vkDestroySampler(vkDevice, presentSampler, vkAllocator); vkDestroyDevice(vkDevice, vkAllocator); |