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 #10866 from dvessel/OpenGLerror085 

Fix OpenGL error on M1 Mac.
This commit is contained in:
JosJuice 2022-07-17 19:34:47 +02:00 committed by GitHub
parent 70b0b03c3c 319288de8e
commit f0eb7b42e2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -182,7 +182,7 @@ static void WriteSampleFunction(ShaderCode& code, const EFBCopyParams& params, A
" dot(u_const, float4(texcol_raw.rgb, 256)),\n" " dot(u_const, float4(texcol_raw.rgb, 256)),\n"
" dot(v_const, float4(texcol_raw.rgb, 256)));\n" " dot(v_const, float4(texcol_raw.rgb, 256)));\n"
" // Divide by 256 and round .5 and higher up\n" " // Divide by 256 and round .5 and higher up\n"
" texcol_raw.rgb = (texcol_raw.rgb >> 8) + ((texcol_raw.rgb >> 7) & 1);\n"); " texcol_raw.rgb = (texcol_raw.rgb >> 8) + ((texcol_raw.rgb >> 7) & 1u);\n");
} }
code.Write(" return float4(texcol_raw) / 255.0;\n"); code.Write(" return float4(texcol_raw) / 255.0;\n");

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

@ -161,7 +161,7 @@ ShaderCode GeneratePixelShader(APIType api_type, const UidData* uid_data)
" dot(u_const, float4(texcol_raw.rgb, 256)),\n" " dot(u_const, float4(texcol_raw.rgb, 256)),\n"
" dot(v_const, float4(texcol_raw.rgb, 256)));\n" " dot(v_const, float4(texcol_raw.rgb, 256)));\n"
" // Divide by 256 and round .5 and higher up\n" " // Divide by 256 and round .5 and higher up\n"
" texcol_raw.rgb = (texcol_raw.rgb >> 8) + ((texcol_raw.rgb >> 7) & 1);\n"); " texcol_raw.rgb = (texcol_raw.rgb >> 8) + ((texcol_raw.rgb >> 7) & 1u);\n");
} }
switch (uid_data->dst_format) switch (uid_data->dst_format)