Merge pull request #10866 from dvessel/OpenGLerror085

Fix OpenGL error on M1 Mac.
dolphin-emu · Jul 17, 2022 · f0eb7b4 · f0eb7b4
2 parents 70b0b03 + 319288d
commit f0eb7b4
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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)