diff options
| author | 2015-03-12 13:11:57 -0500 | |
|---|---|---|
| committer | 2015-03-16 17:54:06 -0500 | |
| commit | 23b401c3ac6ac1ab9e9cf9ffa9d9a03daa20dfb7 (patch) | |
| tree | 4cda494f5705d6fb19216b11e4a95e5b99325d38 /src/core/hw/gpu.cpp | |
| parent | GPU: Fixed the bit 25 in the display transfer flags. (diff) | |
| download | yuzu-23b401c3ac6ac1ab9e9cf9ffa9d9a03daa20dfb7.tar.gz yuzu-23b401c3ac6ac1ab9e9cf9ffa9d9a03daa20dfb7.tar.xz yuzu-23b401c3ac6ac1ab9e9cf9ffa9d9a03daa20dfb7.zip | |
GPU/DisplayTransfer: Made the scaling bits a single 2bit value
Rephrased some comments.
Diffstat (limited to 'src/core/hw/gpu.cpp')
| -rw-r--r-- | src/core/hw/gpu.cpp | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/src/core/hw/gpu.cpp b/src/core/hw/gpu.cpp index e529bb2e8..ca33557ae 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) { | |||
| 116 | u8* src_pointer = Memory::GetPointer(Memory::PhysicalToVirtualAddress(config.GetPhysicalInputAddress())); | 116 | u8* src_pointer = Memory::GetPointer(Memory::PhysicalToVirtualAddress(config.GetPhysicalInputAddress())); |
| 117 | u8* dst_pointer = Memory::GetPointer(Memory::PhysicalToVirtualAddress(config.GetPhysicalOutputAddress())); | 117 | u8* dst_pointer = Memory::GetPointer(Memory::PhysicalToVirtualAddress(config.GetPhysicalOutputAddress())); |
| 118 | 118 | ||
| 119 | unsigned horizontal_scale = (config.scale_x != 0 || config.scale_xy != 0) ? 2 : 1; | 119 | if (config.scaling > config.ScaleXY) { |
| 120 | unsigned vertical_scale = (config.scale_xy != 0) ? 2 : 1; | 120 | LOG_CRITICAL(HW_GPU, "Unimplemented display transfer scaling mode %u", config.scaling.Value()); |
| 121 | 121 | UNIMPLEMENTED(); | |
| 122 | break; | ||
| 123 | } | ||
| 124 | |||
| 125 | unsigned horizontal_scale = (config.scaling != config.NoScale) ? 2 : 1; | ||
| 126 | unsigned vertical_scale = (config.scaling == config.ScaleXY) ? 2 : 1; | ||
| 127 | |||
| 122 | u32 output_width = config.output_width / horizontal_scale; | 128 | u32 output_width = config.output_width / horizontal_scale; |
| 123 | u32 output_height = config.output_height / vertical_scale; | 129 | u32 output_height = config.output_height / vertical_scale; |
| 124 | 130 | ||
| @@ -138,7 +144,7 @@ inline void Write(u32 addr, const T data) { | |||
| 138 | break; | 144 | break; |
| 139 | } | 145 | } |
| 140 | 146 | ||
| 141 | // TODO(Subv): Blend the pixels when horizontal / vertical scaling is enabled, | 147 | // TODO(Subv): Implement the box filter when scaling is enabled |
| 142 | // right now we're just skipping the extra pixels. | 148 | // right now we're just skipping the extra pixels. |
| 143 | for (u32 y = 0; y < output_height; ++y) { | 149 | for (u32 y = 0; y < output_height; ++y) { |
| 144 | for (u32 x = 0; x < output_width; ++x) { | 150 | for (u32 x = 0; x < output_width; ++x) { |