Merge pull request #2534 from Lectem/fix_etc1_msvc15

Use std::array<u8,2> instead of u8[2] to fix MSVC build
2017-02-05 09:09:42 +07:00 · 2017-02-05 09:09:42 +07:00 · 05a6f243f8
parent a1393dc70c f146a6d45a
commit 05a6f243f8
1 changed files with 1 additions and 1 deletions
--- a/src/video_core/texture/etc1.cpp
+++ b/src/video_core/texture/etc1.cpp
@ -17,7 +17,7 @@ namespace Texture {

 namespace {

-constexpr std::array<u8[2], 8> etc1_modifier_table = {{
+constexpr std::array<std::array<u8, 2>, 8> etc1_modifier_table = {{
    {2, 8}, {5, 17}, {9, 29}, {13, 42}, {18, 60}, {24, 80}, {33, 106}, {47, 183},
 }};