mirror of
https://github.com/yuzu-emu/yuzu.git
synced 2024-07-04 23:31:19 +01:00
GPU: Implemented the flip_data (bit 0) bit in display transfers.
This commit is contained in:
parent
ed5b275d21
commit
fb8f47060b
2 changed files with 15 additions and 6 deletions
|
@ -146,8 +146,17 @@ inline void Write(u32 addr, const T data) {
|
||||||
for (u32 x = 0; x < output_width; ++x) {
|
for (u32 x = 0; x < output_width; ++x) {
|
||||||
Math::Vec4<u8> src_color = { 0, 0, 0, 0 };
|
Math::Vec4<u8> src_color = { 0, 0, 0, 0 };
|
||||||
|
|
||||||
u32 scaled_x = x * horizontal_scale;
|
// Calculate the [x,y] position of the input image
|
||||||
u32 scaled_y = y * vertical_scale;
|
// 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 dst_bytes_per_pixel = GPU::Regs::BytesPerPixel(config.output_format);
|
||||||
u32 src_bytes_per_pixel = GPU::Regs::BytesPerPixel(config.input_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 coarse_y = y & ~7;
|
||||||
u32 stride = output_width * dst_bytes_per_pixel;
|
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;
|
dst_offset = VideoCore::GetMortonOffset(x, y, dst_bytes_per_pixel) + coarse_y * stride;
|
||||||
} else {
|
} else {
|
||||||
// Interpret the input as tiled and the output as linear
|
// 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;
|
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;
|
dst_offset = (x + y * output_width) * dst_bytes_per_pixel;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -191,7 +191,7 @@ struct Regs {
|
||||||
union {
|
union {
|
||||||
u32 flags;
|
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< 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< 3, 1, u32> raw_copy; // Copies the data without performing any processing
|
||||||
BitField< 8, 3, PixelFormat> input_format;
|
BitField< 8, 3, PixelFormat> input_format;
|
||||||
|
|
Loading…
Reference in a new issue