From e7dd968ac40ba10dc644ccc7269c6f77b8c734a9 Mon Sep 17 00:00:00 2001 From: Liam Date: Thu, 30 Nov 2023 12:33:26 -0500 Subject: [PATCH] renderer_vulkan: adjust window origin and swizzle independently --- src/video_core/renderer_vulkan/vk_rasterizer.cpp | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/src/video_core/renderer_vulkan/vk_rasterizer.cpp b/src/video_core/renderer_vulkan/vk_rasterizer.cpp index 07222e603b..b6f52e017f 100644 --- a/src/video_core/renderer_vulkan/vk_rasterizer.cpp +++ b/src/video_core/renderer_vulkan/vk_rasterizer.cpp @@ -75,14 +75,20 @@ VkViewport GetViewportState(const Device& device, const Maxwell& regs, size_t in const float width = conv(src.scale_x * 2.0f); float y = conv(src.translate_y - src.scale_y); float height = conv(src.scale_y * 2.0f); - bool y_negate = regs.window_origin.mode != Maxwell::WindowOrigin::Mode::UpperLeft; - if (!device.IsNvViewportSwizzleSupported()) { - y_negate = y_negate != (src.swizzle.y == Maxwell::ViewportSwizzle::NegativeY); + const bool lower_left = regs.window_origin.mode != Maxwell::WindowOrigin::Mode::UpperLeft; + const bool y_negate = !device.IsNvViewportSwizzleSupported() && + src.swizzle.y == Maxwell::ViewportSwizzle::NegativeY; + + if (lower_left) { + // Flip by surface clip height + y += conv(static_cast(regs.surface_clip.height)); + height = -height; } if (y_negate) { - y += conv(static_cast(regs.surface_clip.height)); + // Flip by viewport height + y += height; height = -height; }