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 #6252 from JonnyH/WIP/gles-gpu-texture-conversion-fixes 

Fix GLES GPU texture conversion shader
This commit is contained in:
Markus Wick 2017-12-13 09:32:06 +01:00 committed by GitHub
parent a70c03a1c0 a38103afbf
commit 49a55e0a93
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -179,14 +179,13 @@ ShaderCode GenerateShader(APIType api_type, const UidData* uid_data)
color_mask[4] = color_mask[5] = color_mask[6] = color_mask[7] = 1.0f / 15.0f; color_mask[4] = color_mask[5] = color_mask[6] = color_mask[7] = 1.0f / 15.0f;
} }
} }
out.Write(" const float4 colmat[7] = {\n"); out.Write(" float4 colmat[7];\n");
for (size_t i = 0; i < colmat.size() / 4; i++) for (size_t i = 0; i < colmat.size() / 4; i++)
{ {
out.Write(" float4(%f, %f, %f, %f)%s\n", colmat[i * 4 + 0], colmat[i * 4 + 1], out.Write(" colmat[%zu] = float4(%f, %f, %f, %f);\n", i, colmat[i * 4 + 0],
colmat[i * 4 + 2], colmat[i * 4 + 3], i < 7 ? "," : ""); colmat[i * 4 + 1], colmat[i * 4 + 2], colmat[i * 4 + 3]);
} }
out.Write(" };\n" out.Write(" texcol = floor(texcol * colmat[5]) * colmat[6];\n"
" texcol = floor(texcol * colmat[5]) * colmat[6];\n"
" ocol0 = float4(dot(texcol, colmat[0]), dot(texcol, colmat[1]), dot(texcol, " " ocol0 = float4(dot(texcol, colmat[0]), dot(texcol, colmat[1]), dot(texcol, "
"colmat[2]), dot(texcol, colmat[3])) + colmat[4];\n"); "colmat[2]), dot(texcol, colmat[3])) + colmat[4];\n");
break; break;