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 | 09f43c0975b303ca98072fbece37334b0d2b4e4b (patch) | |
tree | 4590343a003cedb3116fbc2ecf1da83354e90c56 /src/video_core/rasterizer.cpp | |
parent | ca5ea5142deec687e42f86add5026c1ade2c1093 (diff) | |
parent | 543192e045d1b0866c353f1f6af2f3a3d81319c7 (diff) |
Merge pull request #1160 from lioncash/clang
Silence some clang warnings
Diffstat (limited to 'src/video_core/rasterizer.cpp')
-rw-r--r-- | src/video_core/rasterizer.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
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, auto color_output = ColorCombine(tev_stage.color_op, color_result); // alpha combiner - std::array<u8,3> alpha_result = { + std::array<u8,3> alpha_result = {{ GetAlphaModifier(tev_stage.alpha_modifier1, GetSource(tev_stage.alpha_source1)), GetAlphaModifier(tev_stage.alpha_modifier2, GetSource(tev_stage.alpha_source2)), GetAlphaModifier(tev_stage.alpha_modifier3, GetSource(tev_stage.alpha_source3)) - }; + }}; auto alpha_output = AlphaCombine(tev_stage.alpha_op, alpha_result); combiner_output[0] = std::min((unsigned)255, color_output.r() * tev_stage.GetColorMultiplier()); |