From 319288de8ef70cd965badab53836eaf334cd54e2 Mon Sep 17 00:00:00 2001 From: Joon Park Date: Sun, 17 Jul 2022 08:53:43 -0400 Subject: [PATCH] Fix OpenGL error on M1 Mac. Followup to #10466. Resolves the following error: ERROR: 0:85: '&' does not operate on 'uvec3' and 'int' --- Source/Core/VideoCommon/TextureConversionShader.cpp | 2 +- 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)