From 23b401c3ac6ac1ab9e9cf9ffa9d9a03daa20dfb7 Mon Sep 17 00:00:00 2001 From: Subv Date: Thu, 12 Mar 2015 13:11:57 -0500 Subject: GPU/DisplayTransfer: Made the scaling bits a single 2bit value Rephrased some comments. --- src/core/hw/gpu.cpp | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) (limited to 'src/core/hw/gpu.cpp') diff --git a/src/core/hw/gpu.cpp b/src/core/hw/gpu.cpp index e529bb2e..ca33557a 100644 --- a/src/core/hw/gpu.cpp +++ b/src/core/hw/gpu.cpp @@ -116,9 +116,15 @@ 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_x != 0 || config.scale_xy != 0) ? 2 : 1; - unsigned vertical_scale = (config.scale_xy != 0) ? 2 : 1; - + if (config.scaling > config.ScaleXY) { + LOG_CRITICAL(HW_GPU, "Unimplemented display transfer scaling mode %u", config.scaling.Value()); + UNIMPLEMENTED(); + break; + } + + unsigned horizontal_scale = (config.scaling != config.NoScale) ? 2 : 1; + unsigned vertical_scale = (config.scaling == config.ScaleXY) ? 2 : 1; + u32 output_width = config.output_width / horizontal_scale; u32 output_height = config.output_height / vertical_scale; @@ -138,7 +144,7 @@ inline void Write(u32 addr, const T data) { break; } - // TODO(Subv): Blend the pixels when horizontal / vertical scaling is enabled, + // TODO(Subv): Implement the box filter when scaling is enabled // right now we're just skipping the extra pixels. for (u32 y = 0; y < output_height; ++y) { for (u32 x = 0; x < output_width; ++x) { -- cgit v1.2.3