diff options
Diffstat (limited to 'src/video_core')
| -rw-r--r-- | src/video_core/debug_utils/debug_utils.cpp | 6 | ||||
| -rw-r--r-- | src/video_core/rasterizer.cpp | 4 | ||||
| -rw-r--r-- | src/video_core/renderer_opengl/renderer_opengl.cpp | 4 |
3 files changed, 7 insertions, 7 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)); |
diff --git a/src/video_core/rasterizer.cpp b/src/video_core/rasterizer.cpp index a90ff5fef..6e2266b1c 100644 --- a/src/video_core/rasterizer.cpp +++ b/src/video_core/rasterizer.cpp | |||
| @@ -735,11 +735,11 @@ static void ProcessTriangleInternal(const Shader::OutputVertex& v0, | |||
| 735 | auto color_output = ColorCombine(tev_stage.color_op, color_result); | 735 | auto color_output = ColorCombine(tev_stage.color_op, color_result); |
| 736 | 736 | ||
| 737 | // alpha combiner | 737 | // alpha combiner |
| 738 | std::array<u8,3> alpha_result = { | 738 | std::array<u8,3> alpha_result = {{ |
| 739 | GetAlphaModifier(tev_stage.alpha_modifier1, GetSource(tev_stage.alpha_source1)), | 739 | GetAlphaModifier(tev_stage.alpha_modifier1, GetSource(tev_stage.alpha_source1)), |
| 740 | GetAlphaModifier(tev_stage.alpha_modifier2, GetSource(tev_stage.alpha_source2)), | 740 | GetAlphaModifier(tev_stage.alpha_modifier2, GetSource(tev_stage.alpha_source2)), |
| 741 | GetAlphaModifier(tev_stage.alpha_modifier3, GetSource(tev_stage.alpha_source3)) | 741 | GetAlphaModifier(tev_stage.alpha_modifier3, GetSource(tev_stage.alpha_source3)) |
| 742 | }; | 742 | }}; |
| 743 | auto alpha_output = AlphaCombine(tev_stage.alpha_op, alpha_result); | 743 | auto alpha_output = AlphaCombine(tev_stage.alpha_op, alpha_result); |
| 744 | 744 | ||
| 745 | combiner_output[0] = std::min((unsigned)255, color_output.r() * tev_stage.GetColorMultiplier()); | 745 | combiner_output[0] = std::min((unsigned)255, color_output.r() * tev_stage.GetColorMultiplier()); |
diff --git a/src/video_core/renderer_opengl/renderer_opengl.cpp b/src/video_core/renderer_opengl/renderer_opengl.cpp index 22f261c68..f1313b54f 100644 --- a/src/video_core/renderer_opengl/renderer_opengl.cpp +++ b/src/video_core/renderer_opengl/renderer_opengl.cpp | |||
| @@ -314,12 +314,12 @@ void RendererOpenGL::ConfigureFramebufferTexture(TextureInfo& texture, | |||
| 314 | * Draws a single texture to the emulator window, rotating the texture to correct for the 3DS's LCD rotation. | 314 | * Draws a single texture to the emulator window, rotating the texture to correct for the 3DS's LCD rotation. |
| 315 | */ | 315 | */ |
| 316 | void RendererOpenGL::DrawSingleScreenRotated(const TextureInfo& texture, float x, float y, float w, float h) { | 316 | void RendererOpenGL::DrawSingleScreenRotated(const TextureInfo& texture, float x, float y, float w, float h) { |
| 317 | std::array<ScreenRectVertex, 4> vertices = { | 317 | std::array<ScreenRectVertex, 4> vertices = {{ |
| 318 | ScreenRectVertex(x, y, 1.f, 0.f), | 318 | ScreenRectVertex(x, y, 1.f, 0.f), |
| 319 | ScreenRectVertex(x+w, y, 1.f, 1.f), | 319 | ScreenRectVertex(x+w, y, 1.f, 1.f), |
| 320 | ScreenRectVertex(x, y+h, 0.f, 0.f), | 320 | ScreenRectVertex(x, y+h, 0.f, 0.f), |
| 321 | ScreenRectVertex(x+w, y+h, 0.f, 1.f), | 321 | ScreenRectVertex(x+w, y+h, 0.f, 1.f), |
| 322 | }; | 322 | }}; |
| 323 | 323 | ||
| 324 | state.texture_units[0].texture_2d = texture.handle; | 324 | state.texture_units[0].texture_2d = texture.handle; |
| 325 | state.Apply(); | 325 | state.Apply(); |