ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4378 from Armada651/fix-implicit-conv 

PixelShaderGen: Fix implicit type conversions.
This commit is contained in:
Jules Blok 2016-10-23 17:58:23 +00:00 committed by GitHub
parent ce5881220f 5c406b5ef0
commit 584bfec48d
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Source/Core/VideoCommon/PixelShaderGen.cpp
View File

@ -1288,26 +1288,26 @@ static void WriteFog(ShaderCode& out, const pixel_shader_uid_data* uid_data)
static void WriteColor(ShaderCode& out, const pixel_shader_uid_data* uid_data) static void WriteColor(ShaderCode& out, const pixel_shader_uid_data* uid_data)
{ {
if (uid_data->rgba6_format) if (uid_data->rgba6_format)
out.Write("\tocol0.rgb = (prev.rgb >> 2) / 63.0;\n"); out.Write("\tocol0.rgb = float3(prev.rgb >> 2) / 63.0;\n");
else else
out.Write("\tocol0.rgb = prev.rgb / 255.0;\n"); out.Write("\tocol0.rgb = float3(prev.rgb) / 255.0;\n");
// Colors will be blended against the 8-bit alpha from ocol1 and // Colors will be blended against the 8-bit alpha from ocol1 and
// the 6-bit alpha from ocol0 will be written to the framebuffer // the 6-bit alpha from ocol0 will be written to the framebuffer
if (uid_data->dstAlphaMode == DSTALPHA_NONE) if (uid_data->dstAlphaMode == DSTALPHA_NONE)
{ {
out.Write("\tocol0.a = (prev.a >> 2) / 63.0;\n"); out.Write("\tocol0.a = float(prev.a >> 2) / 63.0;\n");
out.Write("\tocol1.a = prev.a / 255.0;\n"); out.Write("\tocol1.a = float(prev.a) / 255.0;\n");
} }
else else
{ {
out.SetConstantsUsed(C_ALPHA, C_ALPHA); out.SetConstantsUsed(C_ALPHA, C_ALPHA);
out.Write("\tocol0.a = (" I_ALPHA ".a >> 2) / 63.0;\n"); out.Write("\tocol0.a = float(" I_ALPHA ".a >> 2) / 63.0;\n");
// Use dual-source color blending to perform dst alpha in a single pass // Use dual-source color blending to perform dst alpha in a single pass
if (uid_data->dstAlphaMode == DSTALPHA_DUAL_SOURCE_BLEND) if (uid_data->dstAlphaMode == DSTALPHA_DUAL_SOURCE_BLEND)
out.Write("\tocol1.a = prev.a / 255.0;\n"); out.Write("\tocol1.a = float(prev.a) / 255.0;\n");
else else
out.Write("\tocol1.a = " I_ALPHA ".a / 255.0;\n"); out.Write("\tocol1.a = float(" I_ALPHA ".a) / 255.0;\n");
} }
} }