From ae0dfcae1dc9532b349e14d76ce35d1fc987d42c Mon Sep 17 00:00:00 2001
From: Subv <subv2112@gmail.com>
Date: Tue, 10 Mar 2015 14:18:25 -0500
Subject: [PATCH] GPU: Fixed the bit 25 in the display transfer flags.
It is used to downscale the input image horizontally and vertically, previously we were only downscaling it vertically so this caused a hard-to-debug memory corruption problem.
---
src/core/hw/gpu.cpp | 6 +++---
src/core/hw/gpu.h | 4 ++--
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/core/hw/gpu.cpp b/src/core/hw/gpu.cpp
index b7102b8741..e529bb2e8b 100644
--- a/src/core/hw/gpu.cpp
+++ b/src/core/hw/gpu.cpp
@@ -116,9 +116,9 @@ inline void Write(u32 addr, const T data) {
u8* src_pointer = Memory::GetPointer(Memory::PhysicalToVirtualAddress(config.GetPhysicalInputAddress()));
u8* dst_pointer = Memory::GetPointer(Memory::PhysicalToVirtualAddress(config.GetPhysicalOutputAddress()));
- unsigned horizontal_scale = (config.scale_horizontally != 0) ? 2 : 1;
- unsigned vertical_scale = (config.scale_vertically != 0) ? 2 : 1;
-
+ unsigned horizontal_scale = (config.scale_x != 0 || config.scale_xy != 0) ? 2 : 1;
+ unsigned vertical_scale = (config.scale_xy != 0) ? 2 : 1;
+
u32 output_width = config.output_width / horizontal_scale;
u32 output_height = config.output_height / vertical_scale;
diff --git a/src/core/hw/gpu.h b/src/core/hw/gpu.h
index 3e81f03ef4..3158738f03 100644
--- a/src/core/hw/gpu.h
+++ b/src/core/hw/gpu.h
@@ -197,8 +197,8 @@ struct Regs {
BitField< 8, 3, PixelFormat> input_format;
BitField<12, 3, PixelFormat> output_format;
- BitField<24, 1, u32> scale_horizontally;
- BitField<25, 1, u32> scale_vertically;
+ BitField<24, 1, u32> scale_x; // Shrinks the image in half horizontally, blending the extra pixels
+ BitField<25, 1, u32> scale_xy; // Shrinks the image horizontally and vertically, blending the extra pixels
};
INSERT_PADDING_WORDS(0x1);
--
GitLab