aboutsummaryrefslogtreecommitdiff
path: root/src/video_core/rasterizer.cpp
diff options
context:
space:
mode:
authorbunnei <bunneidev@gmail.com>2015-09-21 21:29:55 -0400
committerbunnei <bunneidev@gmail.com>2015-09-21 21:29:55 -0400
commit4a07e855cdcef8a78a0a08a35dd92720f1fd6eb0 (patch)
tree4590343a003cedb3116fbc2ecf1da83354e90c56 /src/video_core/rasterizer.cpp
parent8a434a954e9d6ad2dda79784d8ec5e87e5ee43ff (diff)
parent2c2f1250d2015430430189c1b66a8cd9c9110409 (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.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/video_core/rasterizer.cpp b/src/video_core/rasterizer.cpp
index a90ff5fef4..6e2266b1c0 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());