diff options
| author | 2019-03-13 16:25:23 -0300 | |
|---|---|---|
| committer | 2019-03-13 16:35:10 -0300 | |
| commit | 6ed6129b4ffab796c144d587afd3a27d33667f8f (patch) | |
| tree | dab3508351d06041e6445299bb7e19c5f1783d92 /src/video_core/morton.cpp | |
| parent | video_core/morton: Remove clang-format off when it's not needed (diff) | |
| download | yuzu-6ed6129b4ffab796c144d587afd3a27d33667f8f.tar.gz yuzu-6ed6129b4ffab796c144d587afd3a27d33667f8f.tar.xz yuzu-6ed6129b4ffab796c144d587afd3a27d33667f8f.zip | |
video_core/morton: Remove unused parameter in MortonSwizzle
Diffstat (limited to 'src/video_core/morton.cpp')
| -rw-r--r-- | src/video_core/morton.cpp | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/video_core/morton.cpp b/src/video_core/morton.cpp index 96a3c99b3..e980bb8be 100644 --- a/src/video_core/morton.cpp +++ b/src/video_core/morton.cpp | |||
| @@ -16,12 +16,12 @@ namespace VideoCore { | |||
| 16 | using Surface::GetBytesPerPixel; | 16 | using Surface::GetBytesPerPixel; |
| 17 | using Surface::PixelFormat; | 17 | using Surface::PixelFormat; |
| 18 | 18 | ||
| 19 | using MortonCopyFn = void (*)(u32, u32, u32, u32, u32, u32, u8*, std::size_t, VAddr); | 19 | using MortonCopyFn = void (*)(u32, u32, u32, u32, u32, u32, u8*, VAddr); |
| 20 | using ConversionArray = std::array<MortonCopyFn, Surface::MaxPixelFormat>; | 20 | using ConversionArray = std::array<MortonCopyFn, Surface::MaxPixelFormat>; |
| 21 | 21 | ||
| 22 | template <bool morton_to_linear, PixelFormat format> | 22 | template <bool morton_to_linear, PixelFormat format> |
| 23 | static void MortonCopy(u32 stride, u32 block_height, u32 height, u32 block_depth, u32 depth, | 23 | static void MortonCopy(u32 stride, u32 block_height, u32 height, u32 block_depth, u32 depth, |
| 24 | u32 tile_width_spacing, u8* buffer, std::size_t buffer_size, VAddr addr) { | 24 | u32 tile_width_spacing, u8* buffer, VAddr addr) { |
| 25 | constexpr u32 bytes_per_pixel = GetBytesPerPixel(format); | 25 | constexpr u32 bytes_per_pixel = GetBytesPerPixel(format); |
| 26 | 26 | ||
| 27 | // With the BCn formats (DXT and DXN), each 4x4 tile is swizzled instead of just individual | 27 | // With the BCn formats (DXT and DXN), each 4x4 tile is swizzled instead of just individual |
| @@ -282,10 +282,9 @@ static u32 GetMortonOffset128(u32 x, u32 y, u32 bytes_per_pixel) { | |||
| 282 | 282 | ||
| 283 | void MortonSwizzle(MortonSwizzleMode mode, Surface::PixelFormat format, u32 stride, | 283 | void MortonSwizzle(MortonSwizzleMode mode, Surface::PixelFormat format, u32 stride, |
| 284 | u32 block_height, u32 height, u32 block_depth, u32 depth, u32 tile_width_spacing, | 284 | u32 block_height, u32 height, u32 block_depth, u32 depth, u32 tile_width_spacing, |
| 285 | u8* buffer, std::size_t buffer_size, VAddr addr) { | 285 | u8* buffer, VAddr addr) { |
| 286 | |||
| 287 | GetSwizzleFunction(mode, format)(stride, block_height, height, block_depth, depth, | 286 | GetSwizzleFunction(mode, format)(stride, block_height, height, block_depth, depth, |
| 288 | tile_width_spacing, buffer, buffer_size, addr); | 287 | tile_width_spacing, buffer, addr); |
| 289 | } | 288 | } |
| 290 | 289 | ||
| 291 | void MortonCopyPixels128(u32 width, u32 height, u32 bytes_per_pixel, u32 linear_bytes_per_pixel, | 290 | void MortonCopyPixels128(u32 width, u32 height, u32 bytes_per_pixel, u32 linear_bytes_per_pixel, |