From c3dd456d513a989315d4e8a00ad8a1223bb8f9c4 Mon Sep 17 00:00:00 2001 From: bunnei Date: Tue, 17 Jul 2018 20:11:41 -0400 Subject: vi: Partially implement buffer crop parameters. --- src/video_core/gpu.h | 1 + src/video_core/renderer_opengl/renderer_opengl.cpp | 22 ++++++++++++++++++---- src/video_core/renderer_opengl/renderer_opengl.h | 1 + 3 files changed, 20 insertions(+), 4 deletions(-) (limited to 'src/video_core') diff --git a/src/video_core/gpu.h b/src/video_core/gpu.h index cc5ca656e..60930e997 100644 --- a/src/video_core/gpu.h +++ b/src/video_core/gpu.h @@ -67,6 +67,7 @@ struct FramebufferConfig { using TransformFlags = Service::NVFlinger::BufferQueue::BufferTransformFlags; TransformFlags transform_flags; + MathUtil::Rectangle crop_rect; }; namespace Engines { diff --git a/src/video_core/renderer_opengl/renderer_opengl.cpp b/src/video_core/renderer_opengl/renderer_opengl.cpp index 1930fa6ef..7810b9147 100644 --- a/src/video_core/renderer_opengl/renderer_opengl.cpp +++ b/src/video_core/renderer_opengl/renderer_opengl.cpp @@ -154,6 +154,7 @@ void RendererOpenGL::LoadFBToScreenInfo(const Tegra::FramebufferConfig& framebuf // Framebuffer orientation handling framebuffer_transform_flags = framebuffer.transform_flags; + framebuffer_crop_rect = framebuffer.crop_rect; // Ensure no bad interactions with GL_UNPACK_ALIGNMENT, which by default // only allows rows to have a memory alignement of 4. @@ -320,11 +321,24 @@ void RendererOpenGL::DrawScreenTriangles(const ScreenInfo& screen_info, float x, } } + ASSERT_MSG(framebuffer_crop_rect.top == 0, "Unimplemented"); + ASSERT_MSG(framebuffer_crop_rect.left == 0, "Unimplemented"); + + // Scale the output by the crop width/height. This is commonly used with 1280x720 rendering + // (e.g. handheld mode) on a 1920x1080 framebuffer. + f32 scale_u = 1.f, scale_v = 1.f; + if (framebuffer_crop_rect.GetWidth() > 0) { + scale_u = static_cast(framebuffer_crop_rect.GetWidth()) / screen_info.texture.width; + } + if (framebuffer_crop_rect.GetHeight() > 0) { + scale_v = static_cast(framebuffer_crop_rect.GetHeight()) / screen_info.texture.height; + } + std::array vertices = {{ - ScreenRectVertex(x, y, texcoords.top, left), - ScreenRectVertex(x + w, y, texcoords.bottom, left), - ScreenRectVertex(x, y + h, texcoords.top, right), - ScreenRectVertex(x + w, y + h, texcoords.bottom, right), + ScreenRectVertex(x, y, texcoords.top * scale_u, left * scale_v), + ScreenRectVertex(x + w, y, texcoords.bottom * scale_u, left * scale_v), + ScreenRectVertex(x, y + h, texcoords.top * scale_u, right * scale_v), + ScreenRectVertex(x + w, y + h, texcoords.bottom * scale_u, right * scale_v), }}; state.texture_units[0].texture_2d = screen_info.display_texture; diff --git a/src/video_core/renderer_opengl/renderer_opengl.h b/src/video_core/renderer_opengl/renderer_opengl.h index fd0267cf5..59d92a3dc 100644 --- a/src/video_core/renderer_opengl/renderer_opengl.h +++ b/src/video_core/renderer_opengl/renderer_opengl.h @@ -97,4 +97,5 @@ private: /// Used for transforming the framebuffer orientation Tegra::FramebufferConfig::TransformFlags framebuffer_transform_flags; + MathUtil::Rectangle framebuffer_crop_rect; }; -- cgit v1.2.3