diff options
author | Subv <subv2112@gmail.com> | 2015-03-14 20:40:40 +0100 |
---|---|---|
committer | Subv <subv2112@gmail.com> | 2015-03-14 21:26:42 +0100 |
commit | fb8f47060bb9c7d6b77824a50782e05b37ad0281 (patch) | |
tree | a8aa4a3e4e59265b56ed550d8adcd48e420c2745 /src | |
parent | Merge pull request #642 from bunnei/touchpad (diff) | |
download | yuzu-fb8f47060bb9c7d6b77824a50782e05b37ad0281.tar yuzu-fb8f47060bb9c7d6b77824a50782e05b37ad0281.tar.gz yuzu-fb8f47060bb9c7d6b77824a50782e05b37ad0281.tar.bz2 yuzu-fb8f47060bb9c7d6b77824a50782e05b37ad0281.tar.lz yuzu-fb8f47060bb9c7d6b77824a50782e05b37ad0281.tar.xz yuzu-fb8f47060bb9c7d6b77824a50782e05b37ad0281.tar.zst yuzu-fb8f47060bb9c7d6b77824a50782e05b37ad0281.zip |
Diffstat (limited to '')
-rw-r--r-- | src/core/hw/gpu.cpp | 19 | ||||
-rw-r--r-- | src/core/hw/gpu.h | 2 |
2 files changed, 15 insertions, 6 deletions
diff --git a/src/core/hw/gpu.cpp b/src/core/hw/gpu.cpp index f933a5e8d..07443616e 100644 --- a/src/core/hw/gpu.cpp +++ b/src/core/hw/gpu.cpp @@ -146,8 +146,17 @@ inline void Write(u32 addr, const T data) { for (u32 x = 0; x < output_width; ++x) { Math::Vec4<u8> src_color = { 0, 0, 0, 0 }; - u32 scaled_x = x * horizontal_scale; - u32 scaled_y = y * vertical_scale; + // Calculate the [x,y] position of the input image + // based on the current output position and the scale + u32 input_x = x * horizontal_scale; + u32 input_y = y * vertical_scale; + + if (config.flip_vertically) { + // Flip the y value of the output data, + // we do this after calculating the [x,y] position of the input image + // to account for the scaling options. + y = output_height - y - 1; + } u32 dst_bytes_per_pixel = GPU::Regs::BytesPerPixel(config.output_format); u32 src_bytes_per_pixel = GPU::Regs::BytesPerPixel(config.input_format); @@ -159,14 +168,14 @@ inline void Write(u32 addr, const T data) { u32 coarse_y = y & ~7; u32 stride = output_width * dst_bytes_per_pixel; - src_offset = (scaled_x + scaled_y * config.input_width) * src_bytes_per_pixel; + src_offset = (input_x + input_y * config.input_width) * src_bytes_per_pixel; dst_offset = VideoCore::GetMortonOffset(x, y, dst_bytes_per_pixel) + coarse_y * stride; } else { // Interpret the input as tiled and the output as linear - u32 coarse_y = scaled_y & ~7; + u32 coarse_y = input_y & ~7; u32 stride = config.input_width * src_bytes_per_pixel; - src_offset = VideoCore::GetMortonOffset(scaled_x, scaled_y, src_bytes_per_pixel) + coarse_y * stride; + src_offset = VideoCore::GetMortonOffset(input_x, input_y, src_bytes_per_pixel) + coarse_y * stride; dst_offset = (x + y * output_width) * dst_bytes_per_pixel; } diff --git a/src/core/hw/gpu.h b/src/core/hw/gpu.h index 5b7f0a4e9..e8552d854 100644 --- a/src/core/hw/gpu.h +++ b/src/core/hw/gpu.h @@ -191,7 +191,7 @@ struct Regs { union { u32 flags; - BitField< 0, 1, u32> flip_data; // flips input data horizontally (TODO) if true + BitField< 0, 1, u32> flip_vertically; // flips input data vertically BitField< 1, 1, u32> output_tiled; // Converts from linear to tiled format BitField< 3, 1, u32> raw_copy; // Copies the data without performing any processing BitField< 8, 3, PixelFormat> input_format; |