diff options
| author | JosJuice <josjuice@gmail.com> | 2018-03-23 15:29:39 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-03-23 15:29:39 +0100 |
| commit | 9c700361053e708b5733fd402fd1d76e475db2b1 (patch) | |
| tree | 5c44b9519a6b9cc6a96c6cb83ff7fb23a1569748 /Source/Core/VideoCommon/UberShaderPixel.cpp | |
| parent | dc098fdf085dac407a6b4c17da34cbc483dd933a (diff) | |
| parent | a52cc8d52bd607280a825573a58d3f040af52b12 (diff) | |
Merge pull request #6503 from lioncash/brace-warn
PixelShaderGen/UberShaderPixel: Silence -Wmissing-braces warnings
Diffstat (limited to 'Source/Core/VideoCommon/UberShaderPixel.cpp')
| -rw-r--r-- | Source/Core/VideoCommon/UberShaderPixel.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/Source/Core/VideoCommon/UberShaderPixel.cpp b/Source/Core/VideoCommon/UberShaderPixel.cpp index b87082b757..76aeab8dd7 100644 --- a/Source/Core/VideoCommon/UberShaderPixel.cpp +++ b/Source/Core/VideoCommon/UberShaderPixel.cpp @@ -1255,7 +1255,7 @@ ShaderCode GenPixelShader(APIType ApiType, const ShaderHostConfig& host_config, if (use_shader_blend) { - 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 @@ -1264,8 +1264,8 @@ ShaderCode GenPixelShader(APIType ApiType, const ShaderHostConfig& host_config, "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 @@ -1274,8 +1274,8 @@ ShaderCode GenPixelShader(APIType ApiType, const ShaderHostConfig& host_config, "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 @@ -1284,8 +1284,8 @@ ShaderCode GenPixelShader(APIType ApiType, const ShaderHostConfig& host_config, "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 @@ -1294,7 +1294,7 @@ ShaderCode GenPixelShader(APIType ApiType, const ShaderHostConfig& host_config, "1.0 - ocol1.a;", // INVSRCALPHA "initial_ocol0.a;", // DSTALPHA "1.0 - initial_ocol0.a;", // INVDSTALPHA - }; + }}; out.Write(" if (blend_enable) {\n" " float4 blend_src;\n" |