From c8f8d551189eefad0d67343fbe258cec87bb3c48 Mon Sep 17 00:00:00 2001 From: "Unknown W. Brackets" Date: Sun, 24 May 2020 21:36:23 -0700 Subject: [PATCH] Vulkan: Correct viewport flag reset on rebind. Can't break since we're checking two separate flags. --- ext/native/thin3d/VulkanRenderManager.cpp | 2 -- ext/native/thin3d/thin3d_gl.cpp | 2 +- ext/native/thin3d/thin3d_vulkan.cpp | 2 +- 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/ext/native/thin3d/VulkanRenderManager.cpp b/ext/native/thin3d/VulkanRenderManager.cpp index 0414e8ab33..d85af88469 100644 --- a/ext/native/thin3d/VulkanRenderManager.cpp +++ b/ext/native/thin3d/VulkanRenderManager.cpp @@ -481,10 +481,8 @@ void VulkanRenderManager::BindFramebufferAsRenderTarget(VKRFramebuffer *fb, VKRR for (const auto &c : steps_.back()->commands) { if (c.cmd == VKRRenderCommand::VIEWPORT) { curStepHasViewport_ = true; - break; } else if (c.cmd == VKRRenderCommand::SCISSOR) { curStepHasScissor_ = true; - break; } } if (clearMask != 0) { diff --git a/ext/native/thin3d/thin3d_gl.cpp b/ext/native/thin3d/thin3d_gl.cpp index 0bbe2466d5..dd3aa97fb3 100644 --- a/ext/native/thin3d/thin3d_gl.cpp +++ b/ext/native/thin3d/thin3d_gl.cpp @@ -478,7 +478,7 @@ public: void HandleEvent(Event ev, int width, int height, void *param1, void *param2) override {} - int GetCurrentStepId() const { + int GetCurrentStepId() const override { return renderManager_.GetCurrentStepId(); } diff --git a/ext/native/thin3d/thin3d_vulkan.cpp b/ext/native/thin3d/thin3d_vulkan.cpp index 43fe931f6c..e7f569d7ea 100644 --- a/ext/native/thin3d/thin3d_vulkan.cpp +++ b/ext/native/thin3d/thin3d_vulkan.cpp @@ -482,7 +482,7 @@ public: void HandleEvent(Event ev, int width, int height, void *param1, void *param2) override; - int GetCurrentStepId() const { + int GetCurrentStepId() const override { return renderManager_.GetCurrentStepId(); }