From bb9d6b766da83fe20f4856bc0d42b34b74f1d03d Mon Sep 17 00:00:00 2001 From: shg8 Date: Tue, 9 Apr 2024 21:09:12 -0500 Subject: [PATCH] Fix regression for 2d viewer --- src/Renderer.cpp | 2 +- src/vulkan/VulkanContext.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Renderer.cpp b/src/Renderer.cpp index 74fe069..e33634e 100644 --- a/src/Renderer.cpp +++ b/src/Renderer.cpp @@ -667,7 +667,7 @@ bool Renderer::recordRenderCommandBuffer(uint32_t currentFrame) { vk::ImageMemoryBarrier imageMemoryBarrier{}; imageMemoryBarrier.oldLayout = vk::ImageLayout::eUndefined; imageMemoryBarrier.newLayout = vk::ImageLayout::eGeneral; - imageMemoryBarrier.image = renderTarget->swapchainImages[currentImageIndex]->image; + imageMemoryBarrier.image = renderTarget->swapchainImages[currentImageIndex].image->image; // TODO: stereo imageMemoryBarrier.subresourceRange = {vk::ImageAspectFlagBits::eColor, 0, 1, 0, 1}; imageMemoryBarrier.srcAccessMask = vk::AccessFlagBits::eNoneKHR; imageMemoryBarrier.dstAccessMask = vk::AccessFlagBits::eShaderWrite; diff --git a/src/vulkan/VulkanContext.h b/src/vulkan/VulkanContext.h index 7aac543..0988d81 100644 --- a/src/vulkan/VulkanContext.h +++ b/src/vulkan/VulkanContext.h @@ -21,7 +21,7 @@ struct ImageProxy { std::array, 2> stereoImages; std::shared_ptr operator[](const size_t index) { - if (index > 1 || !isStereo) { + if (index > 1 || (!isStereo && index > 0)) { throw std::runtime_error("Invalid index for stereo image"); } if (isStereo) {