Fixed ImGui viewport/scissor

nepp95 · Dec 28, 2024 · 9190c8c · 9190c8c
1 parent c788a5a
commit 9190c8c
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 24 deletions.
diff --git a/EppoEngine/Source/Platform/Vulkan/VulkanRenderer.cpp b/EppoEngine/Source/Platform/Vulkan/VulkanRenderer.cpp
@@ -73,7 +73,7 @@ namespace Eppo
 		m_CommandQueue.AddCommand(std::move(command));
 	}
 
-	void VulkanRenderer::BeginRenderPass(const Ref<CommandBuffer>& commandBuffer, const Ref<Pipeline>& pipeline)
+	void VulkanRenderer::BeginRenderPass(const Ref<CommandBuffer>& commandBuffer, const Ref<Pipeline>& pipeline, bool bindPipeline)
 	{
 		EPPO_PROFILE_FUNCTION("VulkanRenderer::BeginRenderPass");
 
@@ -149,26 +149,29 @@ namespace Eppo
 		const VkCommandBuffer cb = cmd->GetCurrentCommandBuffer();
 		vkCmdBeginRendering(cb, &renderingInfo);
 
-		// Bind pipeline
-		vkCmdBindPipeline(cb, VK_PIPELINE_BIND_POINT_GRAPHICS, vkPipeline->GetPipeline());
-
-		// Set viewport
-		VkViewport viewport;
-		viewport.x = 0.0f;
-		viewport.y = 0.0f;
-		viewport.width = static_cast<float>(spec.Width);
-		viewport.height = static_cast<float>(spec.Height);
-		viewport.minDepth = 0.0f;
-		viewport.maxDepth = 1.0f;
-
-		vkCmdSetViewport(cb, 0, 1, &viewport);
-
-		// Set scissor
-		VkRect2D scissor;
-		scissor.offset = { 0, 0 };
-		scissor.extent = { spec.Width, spec.Height };
-
-		vkCmdSetScissor(cb, 0, 1, &scissor);
+		if (bindPipeline)
+		{
+			// Bind pipeline
+			vkCmdBindPipeline(cb, VK_PIPELINE_BIND_POINT_GRAPHICS, vkPipeline->GetPipeline());
+
+			// Set viewport
+			VkViewport viewport;
+			viewport.x = 0.0f;
+			viewport.y = 0.0f;
+			viewport.width = static_cast<float>(spec.Width);
+			viewport.height = static_cast<float>(spec.Height);
+			viewport.minDepth = 0.0f;
+			viewport.maxDepth = 1.0f;
+
+			vkCmdSetViewport(cb, 0, 1, &viewport);
+
+			// Set scissor
+			VkRect2D scissor;
+			scissor.offset = { 0, 0 };
+			scissor.extent = { spec.Width, spec.Height };
+
+			vkCmdSetScissor(cb, 0, 1, &scissor);
+		}
 	}
 
 	void VulkanRenderer::EndRenderPass(const Ref<CommandBuffer>& commandBuffer)

diff --git a/EppoEngine/Source/Platform/Vulkan/VulkanRenderer.h b/EppoEngine/Source/Platform/Vulkan/VulkanRenderer.h
@@ -19,7 +19,7 @@ namespace Eppo
 		void SubmitCommand(RenderCommand command) override;
 
 		// Render passes
-		void BeginRenderPass(const Ref<CommandBuffer>& commandBuffer, const Ref<Pipeline>& pipeline) override;
+		void BeginRenderPass(const Ref<CommandBuffer>& commandBuffer, const Ref<Pipeline>& pipeline, bool bindPipeline = true) override;
 		void EndRenderPass(const Ref<CommandBuffer>& commandBuffer) override;
 
 		// Shaders

diff --git a/EppoEngine/Source/Platform/Vulkan/VulkanSceneRenderer.cpp b/EppoEngine/Source/Platform/Vulkan/VulkanSceneRenderer.cpp
@@ -929,7 +929,7 @@ namespace Eppo
 			VulkanImage::TransitionImage(commandBuffer, swapchain->GetCurrentImage(), VK_IMAGE_LAYOUT_PRESENT_SRC_KHR, VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL);
 
 			// Begin rendering
-			renderer->BeginRenderPass(cmd, pipeline);
+			renderer->BeginRenderPass(cmd, pipeline, false);
 
 			ImDrawData* data = ImGui::GetDrawData();
 			ImGui_ImplVulkan_RenderDrawData(data, commandBuffer);

diff --git a/EppoEngine/Source/Renderer/Renderer.h b/EppoEngine/Source/Renderer/Renderer.h
@@ -19,7 +19,7 @@ namespace Eppo
 		virtual void SubmitCommand(RenderCommand command) = 0;
 
 		// Render passes
-		virtual void BeginRenderPass(const Ref<CommandBuffer>& commandBuffer, const Ref<Pipeline>& pipeline) = 0;
+		virtual void BeginRenderPass(const Ref<CommandBuffer>& commandBuffer, const Ref<Pipeline>& pipeline, bool bindPipeline = true) = 0;
 		virtual void EndRenderPass(const Ref<CommandBuffer>& commandBuffer) = 0;
 
 		// Shaders