diff options
| author |  Lioncash | 2015-09-16 08:38:12 -0400 |
|---|---|---|
| committer | Lioncash | 2015-09-16 08:51:53 -0400 |
| commit | 751fbfdcc33420cb39aee30158706984efb4da40 (patch) | |
| tree | 570330019bba030c78af7d7715b89a5b3de7ccc6 /src/video_core/debug_utils | |
| parent | Merge pull request #1097 from yuriks/cfg-blocks (diff) | |
| download | yuzu-751fbfdcc33420cb39aee30158706984efb4da40.tar.gz yuzu-751fbfdcc33420cb39aee30158706984efb4da40.tar.xz yuzu-751fbfdcc33420cb39aee30158706984efb4da40.zip | |
general: Silence some warnings when using clang
Diffstat (limited to 'src/video_core/debug_utils')
| -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 77a4fe272..aa1f1484c 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) { | |||
| 92 | vertices.push_back(v2); | 92 | vertices.push_back(v2); |
| 93 | 93 | ||
| 94 | int num_vertices = (int)vertices.size(); | 94 | int num_vertices = (int)vertices.size(); |
| 95 | faces.push_back({ num_vertices-3, num_vertices-2, num_vertices-1 }); | 95 | faces.push_back({{ num_vertices-3, num_vertices-2, num_vertices-1 }}); |
| 96 | } | 96 | } |
| 97 | 97 | ||
| 98 | void GeometryDumper::Dump() { | 98 | void GeometryDumper::Dump() { |
| @@ -576,8 +576,8 @@ const Math::Vec4<u8> LookupTexture(const u8* source, int x, int y, const Texture | |||
| 576 | unsigned table_index = static_cast<int>((x < 2) ? table_index_1.Value() : table_index_2.Value()); | 576 | unsigned table_index = static_cast<int>((x < 2) ? table_index_1.Value() : table_index_2.Value()); |
| 577 | 577 | ||
| 578 | static const std::array<std::array<u8, 2>, 8> etc1_modifier_table = {{ | 578 | static const std::array<std::array<u8, 2>, 8> etc1_modifier_table = {{ |
| 579 | { 2, 8 }, { 5, 17 }, { 9, 29 }, { 13, 42 }, | 579 | {{ 2, 8 }}, {{ 5, 17 }}, {{ 9, 29 }}, {{ 13, 42 }}, |
| 580 | { 18, 60 }, { 24, 80 }, { 33, 106 }, { 47, 183 } | 580 | {{ 18, 60 }}, {{ 24, 80 }}, {{ 33, 106 }}, {{ 47, 183 }} |
| 581 | }}; | 581 | }}; |
| 582 | 582 | ||
| 583 | int modifier = etc1_modifier_table.at(table_index).at(GetTableSubIndex(texel)); | 583 | int modifier = etc1_modifier_table.at(table_index).at(GetTableSubIndex(texel)); |