diff options
| author | Lioncash <mathew1800@gmail.com> | 2018-03-23 10:03:31 -0400 |
|---|---|---|
| committer | Lioncash <mathew1800@gmail.com> | 2018-03-23 10:06:27 -0400 |
| commit | a52cc8d52bd607280a825573a58d3f040af52b12 (patch) | |
| tree | 83b7c5caa900214bc63f5c95c0ee5126faf8f3ea /Source/Core/VideoCommon/PixelShaderGen.cpp | |
| parent | e88cc33a29c842b87211398a51b5a43af1adde2f (diff) | |
PixelShaderGen/UberShaderPixel: Silence -Wmissing-braces warnings
Diffstat (limited to 'Source/Core/VideoCommon/PixelShaderGen.cpp')
| -rw-r--r-- | Source/Core/VideoCommon/PixelShaderGen.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/Source/Core/VideoCommon/PixelShaderGen.cpp b/Source/Core/VideoCommon/PixelShaderGen.cpp index ddd3aa1015..97ebe88f37 100644 --- a/Source/Core/VideoCommon/PixelShaderGen.cpp +++ b/Source/Core/VideoCommon/PixelShaderGen.cpp @@ -1420,7 +1420,7 @@ static void WriteBlend(ShaderCode& out, const pixel_shader_uid_data* uid_data) { if (uid_data->blend_enable) { - static const std::array<const char*, 8> blendSrcFactor = { + static const std::array<const char*, 8> blendSrcFactor{{ "float3(0,0,0);", // ZERO "float3(1,1,1);", // ONE "initial_ocol0.rgb;", // DSTCLR @@ -1429,8 +1429,8 @@ static void WriteBlend(ShaderCode& out, const pixel_shader_uid_data* uid_data) "float3(1,1,1) - ocol1.aaa;", // INVSRCALPHA "initial_ocol0.aaa;", // DSTALPHA "float3(1,1,1) - initial_ocol0.aaa;", // INVDSTALPHA - }; - static const std::array<const char*, 8> blendSrcFactorAlpha = { + }}; + static const std::array<const char*, 8> blendSrcFactorAlpha{{ "0.0;", // ZERO "1.0;", // ONE "initial_ocol0.a;", // DSTCLR @@ -1439,8 +1439,8 @@ static void WriteBlend(ShaderCode& out, const pixel_shader_uid_data* uid_data) "1.0 - ocol1.a;", // INVSRCALPHA "initial_ocol0.a;", // DSTALPHA "1.0 - initial_ocol0.a;", // INVDSTALPHA - }; - static const std::array<const char*, 8> blendDstFactor = { + }}; + static const std::array<const char*, 8> blendDstFactor{{ "float3(0,0,0);", // ZERO "float3(1,1,1);", // ONE "ocol0.rgb;", // SRCCLR @@ -1449,8 +1449,8 @@ static void WriteBlend(ShaderCode& out, const pixel_shader_uid_data* uid_data) "float3(1,1,1) - ocol1.aaa;", // INVSRCALPHA "initial_ocol0.aaa;", // DSTALPHA "float3(1,1,1) - initial_ocol0.aaa;", // INVDSTALPHA - }; - static const std::array<const char*, 8> blendDstFactorAlpha = { + }}; + static const std::array<const char*, 8> blendDstFactorAlpha{{ "0.0;", // ZERO "1.0;", // ONE "ocol0.a;", // SRCCLR @@ -1459,7 +1459,7 @@ static void WriteBlend(ShaderCode& out, const pixel_shader_uid_data* uid_data) "1.0 - ocol1.a;", // INVSRCALPHA "initial_ocol0.a;", // DSTALPHA "1.0 - initial_ocol0.a;", // INVDSTALPHA - }; + }}; out.Write("\tfloat4 blend_src;\n"); out.Write("\tblend_src.rgb = %s\n", blendSrcFactor[uid_data->blend_src_factor]); out.Write("\tblend_src.a = %s\n", blendSrcFactorAlpha[uid_data->blend_src_factor_alpha]); |