summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSubv <subv2112@gmail.com>2015-03-10 20:18:25 +0100
committerSubv <subv2112@gmail.com>2015-03-10 20:18:25 +0100
commitae0dfcae1dc9532b349e14d76ce35d1fc987d42c (patch)
treec04424b8f9764ba3e6d7659c423cdbdfe16de671
parentMerge pull request #643 from Subv/dem_feels (diff)
downloadyuzu-ae0dfcae1dc9532b349e14d76ce35d1fc987d42c.tar
yuzu-ae0dfcae1dc9532b349e14d76ce35d1fc987d42c.tar.gz
yuzu-ae0dfcae1dc9532b349e14d76ce35d1fc987d42c.tar.bz2
yuzu-ae0dfcae1dc9532b349e14d76ce35d1fc987d42c.tar.lz
yuzu-ae0dfcae1dc9532b349e14d76ce35d1fc987d42c.tar.xz
yuzu-ae0dfcae1dc9532b349e14d76ce35d1fc987d42c.tar.zst
yuzu-ae0dfcae1dc9532b349e14d76ce35d1fc987d42c.zip
-rw-r--r--src/core/hw/gpu.cpp6
-rw-r--r--src/core/hw/gpu.h4
2 files changed, 5 insertions, 5 deletions
diff --git a/src/core/hw/gpu.cpp b/src/core/hw/gpu.cpp
index b7102b874..e529bb2e8 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 3e81f03ef..3158738f0 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);