diff options
| author |  Mat M | 2017-02-05 09:09:42 -0500 |
|---|---|---|
| committer |  GitHub | 2017-02-05 09:09:42 -0500 |
| commit | 05a6f243f8c33891faac6e4ca57163e15dbde68b (patch) | |
| tree | 44729c5687b34f28f0118568d710141774d951ef /src | |
| parent | Merge pull request #2027 from Lectem/ipcrefactor (diff) | |
| parent | Use std::array<u8,2> instead of u8[2] to fix MSVC build (diff) | |
| download | yuzu-05a6f243f8c33891faac6e4ca57163e15dbde68b.tar.gz yuzu-05a6f243f8c33891faac6e4ca57163e15dbde68b.tar.xz yuzu-05a6f243f8c33891faac6e4ca57163e15dbde68b.zip | |
Merge pull request #2534 from Lectem/fix_etc1_msvc15
Use std::array<u8,2> instead of u8[2] to fix MSVC build
Diffstat (limited to 'src')
| -rw-r--r-- | src/video_core/texture/etc1.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/video_core/texture/etc1.cpp b/src/video_core/texture/etc1.cpp index af60cde1e..2b7d26f91 100644 --- a/src/video_core/texture/etc1.cpp +++ b/src/video_core/texture/etc1.cpp | |||
| @@ -17,7 +17,7 @@ namespace Texture { | |||
| 17 | 17 | ||
| 18 | namespace { | 18 | namespace { |
| 19 | 19 | ||
| 20 | constexpr std::array<u8[2], 8> etc1_modifier_table = {{ | 20 | constexpr std::array<std::array<u8, 2>, 8> etc1_modifier_table = {{ |
| 21 | {2, 8}, {5, 17}, {9, 29}, {13, 42}, {18, 60}, {24, 80}, {33, 106}, {47, 183}, | 21 | {2, 8}, {5, 17}, {9, 29}, {13, 42}, {18, 60}, {24, 80}, {33, 106}, {47, 183}, |
| 22 | }}; | 22 | }}; |
| 23 | 23 | ||