diff options
| author | 2018-11-26 23:22:59 -0500 | |
|---|---|---|
| committer | 2018-11-26 23:22:59 -0500 | |
| commit | 1cd40f107f2681bf3df84aa148feb20a179d6c23 (patch) | |
| tree | ccf9d2ff40734309cdb61ded841709216007b22d /src | |
| parent | Merge pull request #1804 from lioncash/cast (diff) | |
| parent | morton: Fixup compiler warning (diff) | |
| download | yuzu-1cd40f107f2681bf3df84aa148feb20a179d6c23.tar.gz yuzu-1cd40f107f2681bf3df84aa148feb20a179d6c23.tar.xz yuzu-1cd40f107f2681bf3df84aa148feb20a179d6c23.zip | |
Merge pull request #1806 from ReinUsesLisp/morton-fixup
morton: Fixup compiler warning
Diffstat (limited to 'src')
| -rw-r--r-- | src/video_core/morton.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/video_core/morton.cpp b/src/video_core/morton.cpp index f14abba7d..8c3b97463 100644 --- a/src/video_core/morton.cpp +++ b/src/video_core/morton.cpp | |||
| @@ -183,13 +183,14 @@ static constexpr ConversionArray linear_to_morton_fns = { | |||
| 183 | // clang-format on | 183 | // clang-format on |
| 184 | }; | 184 | }; |
| 185 | 185 | ||
| 186 | constexpr MortonCopyFn GetSwizzleFunction(MortonSwizzleMode mode, Surface::PixelFormat format) { | 186 | static MortonCopyFn GetSwizzleFunction(MortonSwizzleMode mode, Surface::PixelFormat format) { |
| 187 | switch (mode) { | 187 | switch (mode) { |
| 188 | case MortonSwizzleMode::MortonToLinear: | 188 | case MortonSwizzleMode::MortonToLinear: |
| 189 | return morton_to_linear_fns[static_cast<std::size_t>(format)]; | 189 | return morton_to_linear_fns[static_cast<std::size_t>(format)]; |
| 190 | case MortonSwizzleMode::LinearToMorton: | 190 | case MortonSwizzleMode::LinearToMorton: |
| 191 | return linear_to_morton_fns[static_cast<std::size_t>(format)]; | 191 | return linear_to_morton_fns[static_cast<std::size_t>(format)]; |
| 192 | } | 192 | } |
| 193 | UNREACHABLE(); | ||
| 193 | } | 194 | } |
| 194 | 195 | ||
| 195 | /// 8x8 Z-Order coordinate from 2D coordinates | 196 | /// 8x8 Z-Order coordinate from 2D coordinates |