summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYuri Kunde Schlesner <yuriks@yuriks.net>2016-12-04 14:15:33 +0100
committerYuri Kunde Schlesner <yuriks@yuriks.net>2016-12-04 14:21:57 +0100
commitba7f21365517ce77dea49b12250629db88f720f3 (patch)
tree5c823f1447e7f931a647131f90faa1f9347e89ac
parentMerge pull request #2259 from JayFoxRox/fix-fallback (diff)
downloadyuzu-ba7f21365517ce77dea49b12250629db88f720f3.tar
yuzu-ba7f21365517ce77dea49b12250629db88f720f3.tar.gz
yuzu-ba7f21365517ce77dea49b12250629db88f720f3.tar.bz2
yuzu-ba7f21365517ce77dea49b12250629db88f720f3.tar.lz
yuzu-ba7f21365517ce77dea49b12250629db88f720f3.tar.xz
yuzu-ba7f21365517ce77dea49b12250629db88f720f3.tar.zst
yuzu-ba7f21365517ce77dea49b12250629db88f720f3.zip
-rw-r--r--src/video_core/renderer_opengl/gl_rasterizer.cpp11
1 files changed, 10 insertions, 1 deletions
diff --git a/src/video_core/renderer_opengl/gl_rasterizer.cpp b/src/video_core/renderer_opengl/gl_rasterizer.cpp
index 1b734aaa5..c2cd89e54 100644
--- a/src/video_core/renderer_opengl/gl_rasterizer.cpp
+++ b/src/video_core/renderer_opengl/gl_rasterizer.cpp
@@ -715,7 +715,11 @@ bool RasterizerOpenGL::AccelerateDisplayTransfer(const GPU::Regs::DisplayTransfe
CachedSurface src_params;
src_params.addr = config.GetPhysicalInputAddress();
- src_params.width = config.output_width;
+ // It's important to use the correct source input width to properly skip over parts of the input
+ // image which will be cropped from the output but still affect the stride of the input image.
+ src_params.width = config.input_width;
+ // Using the output's height is fine because we don't read or skip over the remaining part of
+ // the image, and it allows for smaller texture cache lookup rectangles.
src_params.height = config.output_height;
src_params.is_tiled = !config.input_linear;
src_params.pixel_format = CachedSurface::PixelFormatFromGPUPixelFormat(config.input_format);
@@ -736,6 +740,11 @@ bool RasterizerOpenGL::AccelerateDisplayTransfer(const GPU::Regs::DisplayTransfe
return false;
}
+ // Adjust the source rectangle to take into account parts of the input lines being cropped
+ if (config.input_width > config.output_width) {
+ src_rect.right -= (config.input_width - config.output_width) * src_surface->res_scale_width;
+ }
+
// Require destination surface to have same resolution scale as source to preserve scaling
dst_params.res_scale_width = src_surface->res_scale_width;
dst_params.res_scale_height = src_surface->res_scale_height;