summaryrefslogtreecommitdiff
path: root/src/video_core/rasterizer.cpp
diff options
context:
space:
mode:
authorGravatar bunnei2015-09-21 21:29:55 -0400
committerGravatar bunnei2015-09-21 21:29:55 -0400
commit09f43c0975b303ca98072fbece37334b0d2b4e4b (patch)
tree4590343a003cedb3116fbc2ecf1da83354e90c56 /src/video_core/rasterizer.cpp
parentMerge pull request #1106 from Kloen/fix-connect (diff)
parenthash: Get rid of unused functions (diff)
downloadyuzu-09f43c0975b303ca98072fbece37334b0d2b4e4b.tar.gz
yuzu-09f43c0975b303ca98072fbece37334b0d2b4e4b.tar.xz
yuzu-09f43c0975b303ca98072fbece37334b0d2b4e4b.zip
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.cpp4
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,
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());