diff options
| author | JosJuice <josjuice@gmail.com> | 2022-07-17 19:34:47 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-07-17 19:34:47 +0200 |
| commit | f0eb7b42e2808cfabaa5f165fc022062fb934ca7 (patch) | |
| tree | fea77302d20eb933e2ca2e174c596195f7c146fd /Source/Core | |
| parent | 70b0b03c3cd65d90a74f16a5ddd38801da4dce9f (diff) | |
| parent | 319288de8ef70cd965badab53836eaf334cd54e2 (diff) | |
Merge pull request #10866 from dvessel/OpenGLerror085
Fix OpenGL error on M1 Mac.
Diffstat (limited to 'Source/Core')
| -rw-r--r-- | Source/Core/VideoCommon/TextureConversionShader.cpp | 2 | ||||
| -rw-r--r-- | Source/Core/VideoCommon/TextureConverterShaderGen.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/Source/Core/VideoCommon/TextureConversionShader.cpp b/Source/Core/VideoCommon/TextureConversionShader.cpp index 6cabb4ce88..b9c74d1209 100644 --- a/Source/Core/VideoCommon/TextureConversionShader.cpp +++ b/Source/Core/VideoCommon/TextureConversionShader.cpp @@ -182,7 +182,7 @@ static void WriteSampleFunction(ShaderCode& code, const EFBCopyParams& params, A " dot(u_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" - " 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"); diff --git a/Source/Core/VideoCommon/TextureConverterShaderGen.cpp b/Source/Core/VideoCommon/TextureConverterShaderGen.cpp index 3bee37060a..92d30895fb 100644 --- a/Source/Core/VideoCommon/TextureConverterShaderGen.cpp +++ b/Source/Core/VideoCommon/TextureConverterShaderGen.cpp @@ -161,7 +161,7 @@ ShaderCode GeneratePixelShader(APIType api_type, const UidData* uid_data) " dot(u_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" - " 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) |
