diff options
| author | Subv <subv2112@gmail.com> | 2015-07-20 04:30:42 +0200 |
|---|---|---|
| committer | Subv <subv2112@gmail.com> | 2015-07-20 04:30:42 +0200 |
| commit | 63dbff9b1f2cd6f330c8b4aee8e35d1c61cec87e (patch) | |
| tree | 2843ccd7323844bf6d3c17417c6af4d426571df7 /src/core/hw/gpu.cpp | |
| parent | Merge pull request #949 from yuriks/fix-st (diff) | |
| download | yuzu-63dbff9b1f2cd6f330c8b4aee8e35d1c61cec87e.tar yuzu-63dbff9b1f2cd6f330c8b4aee8e35d1c61cec87e.tar.gz yuzu-63dbff9b1f2cd6f330c8b4aee8e35d1c61cec87e.tar.bz2 yuzu-63dbff9b1f2cd6f330c8b4aee8e35d1c61cec87e.tar.lz yuzu-63dbff9b1f2cd6f330c8b4aee8e35d1c61cec87e.tar.xz yuzu-63dbff9b1f2cd6f330c8b4aee8e35d1c61cec87e.tar.zst yuzu-63dbff9b1f2cd6f330c8b4aee8e35d1c61cec87e.zip | |
Diffstat (limited to 'src/core/hw/gpu.cpp')
| -rw-r--r-- | src/core/hw/gpu.cpp | 42 |
1 files changed, 30 insertions, 12 deletions
diff --git a/src/core/hw/gpu.cpp b/src/core/hw/gpu.cpp index a3a7d128f..2a338e8fc 100644 --- a/src/core/hw/gpu.cpp +++ b/src/core/hw/gpu.cpp @@ -217,19 +217,37 @@ inline void Write(u32 addr, const T data) { u32 dst_offset; if (config.output_tiled) { - // Interpret the input as linear and the output as tiled - u32 coarse_y = y & ~7; - u32 stride = output_width * dst_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; + if (!config.dont_swizzle) { + // Interpret the input as linear and the output as tiled + u32 coarse_y = y & ~7; + u32 stride = output_width * dst_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 { + // Both input and output are linear + src_offset = (input_x + input_y * config.input_width) * src_bytes_per_pixel; + dst_offset = (x + y * output_width) * dst_bytes_per_pixel; + } } else { - // Interpret the input as tiled and the output as linear - u32 coarse_y = input_y & ~7; - u32 stride = config.input_width * src_bytes_per_pixel; - - 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; + if (!config.dont_swizzle) { + // Interpret the input as tiled and the output as linear + u32 coarse_y = input_y & ~7; + u32 stride = config.input_width * src_bytes_per_pixel; + + 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; + } else { + // Both input and output are tiled + u32 out_coarse_y = y & ~7; + u32 out_stride = output_width * dst_bytes_per_pixel; + + u32 in_coarse_y = input_y & ~7; + u32 in_stride = config.input_width * src_bytes_per_pixel; + + src_offset = VideoCore::GetMortonOffset(input_x, input_y, src_bytes_per_pixel) + in_coarse_y * in_stride; + dst_offset = VideoCore::GetMortonOffset(x, y, dst_bytes_per_pixel) + out_coarse_y * out_stride; + } } const u8* src_pixel = src_pointer + src_offset; |