diff options
author | bunnei <bunneidev@gmail.com> | 2015-03-17 19:13:06 -0400 |
---|---|---|
committer | bunnei <bunneidev@gmail.com> | 2015-03-17 19:13:06 -0400 |
commit | 580b3178216656e31a505a5cd5d743befabfcde5 (patch) | |
tree | 92707c5b40cd1dab695d7920ba381abb61dadd23 /src/core/hw/gpu.h | |
parent | 0bb4b77b784dfb1e405c71033bfa9988ac024a2d (diff) | |
parent | 23b401c3ac6ac1ab9e9cf9ffa9d9a03daa20dfb7 (diff) |
Merge pull request #650 from Subv/scaling
GPU: Fixed the bit 25 in the display transfer flags.
Diffstat (limited to 'src/core/hw/gpu.h')
-rw-r--r-- | src/core/hw/gpu.h | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/src/core/hw/gpu.h b/src/core/hw/gpu.h index e8552d854..c8f884494 100644 --- a/src/core/hw/gpu.h +++ b/src/core/hw/gpu.h @@ -188,6 +188,12 @@ struct Regs { BitField<16, 16, u32> input_height; }; + enum ScalingMode : u32 { + NoScale = 0, // Doesn't scale the image + ScaleX = 1, // Downscales the image in half in the X axis and applies a box filter + ScaleXY = 2, // Downscales the image in half in both the X and Y axes and applies a box filter + }; + union { u32 flags; @@ -197,8 +203,7 @@ struct Regs { BitField< 8, 3, PixelFormat> input_format; BitField<12, 3, PixelFormat> output_format; - BitField<24, 1, u32> scale_horizontally; - BitField<25, 1, u32> scale_vertically; + BitField<24, 2, ScalingMode> scaling; // Determines the scaling mode of the transfer }; INSERT_PADDING_WORDS(0x1); |