diff options
| author | bunnei <bunneidev@gmail.com> | 2015-09-21 21:29:55 -0400 |
|---|---|---|
| committer | bunnei <bunneidev@gmail.com> | 2015-09-21 21:29:55 -0400 |
| commit | 4a07e855cdcef8a78a0a08a35dd92720f1fd6eb0 (patch) | |
| tree | 4590343a003cedb3116fbc2ecf1da83354e90c56 /src/video_core/debug_utils/debug_utils.cpp | |
| parent | 8a434a954e9d6ad2dda79784d8ec5e87e5ee43ff (diff) | |
| parent | 2c2f1250d2015430430189c1b66a8cd9c9110409 (diff) | |
Merge pull request #1160 from lioncash/clang
Silence some clang warnings
Diffstat (limited to 'src/video_core/debug_utils/debug_utils.cpp')
| -rw-r--r-- | src/video_core/debug_utils/debug_utils.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/video_core/debug_utils/debug_utils.cpp b/src/video_core/debug_utils/debug_utils.cpp index 77a4fe2722..aa1f1484c7 100644 --- a/src/video_core/debug_utils/debug_utils.cpp +++ b/src/video_core/debug_utils/debug_utils.cpp @@ -92,7 +92,7 @@ void GeometryDumper::AddTriangle(Vertex& v0, Vertex& v1, Vertex& v2) { vertices.push_back(v2); int num_vertices = (int)vertices.size(); - faces.push_back({ num_vertices-3, num_vertices-2, num_vertices-1 }); + faces.push_back({{ num_vertices-3, num_vertices-2, num_vertices-1 }}); } void GeometryDumper::Dump() { @@ -576,8 +576,8 @@ const Math::Vec4<u8> LookupTexture(const u8* source, int x, int y, const Texture unsigned table_index = static_cast<int>((x < 2) ? table_index_1.Value() : table_index_2.Value()); static const 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 } + {{ 2, 8 }}, {{ 5, 17 }}, {{ 9, 29 }}, {{ 13, 42 }}, + {{ 18, 60 }}, {{ 24, 80 }}, {{ 33, 106 }}, {{ 47, 183 }} }}; int modifier = etc1_modifier_table.at(table_index).at(GetTableSubIndex(texel)); |
