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 #6729 from stenzek/gles-gamma 

TextureConversionShader: Fix compile errors in OpenGL ES
This commit is contained in:
Markus Wick 2018-05-02 21:50:30 +02:00 committed by GitHub
parent ed6709ac8f 2c6b20bb03
commit ef98a21735
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Source/Core/VideoCommon/TextureConversionShader.cpp
View File

@ -731,8 +731,8 @@ static void WriteXFBEncoder(char*& p, APIType ApiType, const EFBCopyParams& para
WriteSampleColor(p, "rgb", "color1", 1, ApiType, params); WriteSampleColor(p, "rgb", "color1", 1, ApiType, params);
// Gamma is only applied to XFB copies. // Gamma is only applied to XFB copies.
WRITE(p, " color0 = pow(color0, gamma_rcp.xxx);\n"); WRITE(p, " color0 = pow(color0, float3(gamma_rcp, gamma_rcp, gamma_rcp));\n");
WRITE(p, " color1 = pow(color1, gamma_rcp.xxx);\n"); WRITE(p, " color1 = pow(color1, float3(gamma_rcp, gamma_rcp, gamma_rcp));\n");
// Convert to YUV. // Convert to YUV.
WRITE(p, " const float3 y_const = float3(0.257, 0.504, 0.098);\n"); WRITE(p, " const float3 y_const = float3(0.257, 0.504, 0.098);\n");

3
Source/Core/VideoCommon/TextureConverterShaderGen.cpp
View File

@ -256,7 +256,8 @@ ShaderCode GenerateShader(APIType api_type, const UidData* uid_data)
break; break;
case EFBCopyFormat::XFB: case EFBCopyFormat::XFB:
out.Write(" ocol0 = float4(pow(texcol.rgb, gamma_rcp.xxx), texcol.a);\n"); out.Write(" ocol0 = float4(pow(texcol.rgb, float3(gamma_rcp, gamma_rcp, gamma_rcp)), "
"texcol.a);\n");
break; break;
default: default: