VERY experimental Nintendo Switch 2 emulator
C++
video_core: support framebuffer crop rect top not zero
vonchenplus477cdc756624
diff --git a/src/video_core/renderer_opengl/renderer_opengl.cpp b/src/video_core/renderer_opengl/renderer_opengl.cppindex 01028cee01..34f3f7a679 100644--- a/src/video_core/renderer_opengl/renderer_opengl.cpp+++ b/src/video_core/renderer_opengl/renderer_opengl.cpp@@ -478,13 +478,16 @@ void RendererOpenGL::DrawScreen(const Layout::FramebufferLayout& layout) {}}- ASSERT_MSG(framebuffer_crop_rect.top == 0, "Unimplemented");ASSERT_MSG(framebuffer_crop_rect.left == 0, "Unimplemented");+ f32 left_start{};+ if (framebuffer_crop_rect.Top() > 0) {+ left_start = static_cast<f32>(framebuffer_crop_rect.Top()) /+ static_cast<f32>(framebuffer_crop_rect.Bottom());+ }f32 scale_u = static_cast<f32>(framebuffer_width) / static_cast<f32>(screen_info.texture.width);f32 scale_v =static_cast<f32>(framebuffer_height) / static_cast<f32>(screen_info.texture.height);-// Scale the output by the crop width/height. This is commonly used with 1280x720 rendering// (e.g. handheld mode) on a 1920x1080 framebuffer.if (framebuffer_crop_rect.GetWidth() > 0) {@@ -503,10 +506,14 @@ void RendererOpenGL::DrawScreen(const Layout::FramebufferLayout& layout) {const auto& screen = layout.screen;const std::array vertices = {- ScreenRectVertex(screen.left, screen.top, texcoords.top * scale_u, left * scale_v),- ScreenRectVertex(screen.right, screen.top, texcoords.bottom * scale_u, left * scale_v),- ScreenRectVertex(screen.left, screen.bottom, texcoords.top * scale_u, right * scale_v),- ScreenRectVertex(screen.right, screen.bottom, texcoords.bottom * scale_u, right * scale_v),+ ScreenRectVertex(screen.left, screen.top, texcoords.top * scale_u,+ left_start + left * scale_v),+ ScreenRectVertex(screen.right, screen.top, texcoords.bottom * scale_u,+ left_start + left * scale_v),+ ScreenRectVertex(screen.left, screen.bottom, texcoords.top * scale_u,+ left_start + right * scale_v),+ ScreenRectVertex(screen.right, screen.bottom, texcoords.bottom * scale_u,+ left_start + right * scale_v),};glNamedBufferSubData(vertex_buffer.handle, 0, sizeof(vertices), std::data(vertices));diff --git a/src/video_core/renderer_vulkan/vk_blit_screen.cpp b/src/video_core/renderer_vulkan/vk_blit_screen.cppindex 27e6ebf948..444c29f686 100644--- a/src/video_core/renderer_vulkan/vk_blit_screen.cpp+++ b/src/video_core/renderer_vulkan/vk_blit_screen.cpp@@ -1402,12 +1402,15 @@ void BlitScreen::SetVertexData(BufferData& data, const Tegra::FramebufferConfig&break;}- UNIMPLEMENTED_IF(framebuffer_crop_rect.top != 0);UNIMPLEMENTED_IF(framebuffer_crop_rect.left != 0);+ f32 left_start{};+ if (framebuffer_crop_rect.Top() > 0) {+ left_start = static_cast<f32>(framebuffer_crop_rect.Top()) /+ static_cast<f32>(framebuffer_crop_rect.Bottom());+ }f32 scale_u = static_cast<f32>(framebuffer.width) / static_cast<f32>(screen_info.width);f32 scale_v = static_cast<f32>(framebuffer.height) / static_cast<f32>(screen_info.height);-// Scale the output by the crop width/height. This is commonly used with 1280x720 rendering// (e.g. handheld mode) on a 1920x1080 framebuffer.if (!fsr) {@@ -1426,10 +1429,13 @@ void BlitScreen::SetVertexData(BufferData& data, const Tegra::FramebufferConfig&const auto y = static_cast<f32>(screen.top);const auto w = static_cast<f32>(screen.GetWidth());const auto h = static_cast<f32>(screen.GetHeight());- data.vertices[0] = ScreenRectVertex(x, y, texcoords.top * scale_u, left * scale_v);- data.vertices[1] = ScreenRectVertex(x + w, y, texcoords.bottom * scale_u, left * scale_v);- data.vertices[2] = ScreenRectVertex(x, y + h, texcoords.top * scale_u, right * scale_v);- data.vertices[3] = ScreenRectVertex(x + w, y + h, texcoords.bottom * scale_u, right * scale_v);+ data.vertices[0] = ScreenRectVertex(x, y, texcoords.top * scale_u, left_start + left * scale_v);+ data.vertices[1] =+ ScreenRectVertex(x + w, y, texcoords.bottom * scale_u, left_start + left * scale_v);+ data.vertices[2] =+ ScreenRectVertex(x, y + h, texcoords.top * scale_u, left_start + right * scale_v);+ data.vertices[3] =+ ScreenRectVertex(x + w, y + h, texcoords.bottom * scale_u, left_start + right * scale_v);}void BlitScreen::CreateFSR() {