From 6b5f0957cec6017ad5981e67f2eb5c424699fd72 Mon Sep 17 00:00:00 2001
From: nastys <@a.a>
Date: Tue, 18 Jan 2022 00:23:08 +0100
Subject: [PATCH] Disable macOS swizzling workaround

---
 rpcs3/Emu/RSX/Program/GLSLCommon.cpp | 17 -----------------
 rpcs3/Emu/RSX/RSXThread.cpp          |  3 ---
 rpcs3/Emu/RSX/VK/vkutils/image.h     |  4 ----
 3 files changed, 24 deletions(-)

diff --git a/rpcs3/Emu/RSX/Program/GLSLCommon.cpp b/rpcs3/Emu/RSX/Program/GLSLCommon.cpp
index 7544307da2..5404a9ac73 100644
--- a/rpcs3/Emu/RSX/Program/GLSLCommon.cpp
+++ b/rpcs3/Emu/RSX/Program/GLSLCommon.cpp
@@ -770,26 +770,9 @@ namespace glsl
 		{
 			OS <<
 
-#ifdef __APPLE__
-			"vec4 remap_vector_m(const in vec4 rgba, const in uint remap_bits)\n"
-			"{\n"
-			"	uvec4 selector = (uvec4(remap_bits) >> uvec4(3, 6, 9, 0)) & 0x7;\n"
-			"	bvec4 choice = greaterThan(selector, uvec4(1));\n"
-			"\n"
-			"	vec4 direct = vec4(selector);\n"
-			"	selector = min(selector - 2, selector);\n"
-			"	vec4 indexed = vec4(rgba[selector.r], rgba[selector.g], rgba[selector.b], rgba[selector.a]);\n"
-			"	return mix(direct, indexed, choice);\n"
-			"}\n\n"
-#endif
-
 			//TODO: Move all the texture read control operations here
 			"vec4 process_texel(in vec4 rgba, const in uint control_bits)\n"
 			"{\n"
-#ifdef __APPLE__
-			"	uint remap_bits = (control_bits >> 16) & 0xFFFF;\n"
-			"	if (remap_bits != 0x8D5) rgba = remap_vector_m(rgba, remap_bits);\n\n"
-#endif
 			"	if (control_bits == 0)\n"
 			"	{\n"
 			"		return rgba;\n"
diff --git a/rpcs3/Emu/RSX/RSXThread.cpp b/rpcs3/Emu/RSX/RSXThread.cpp
index e0a4a2de34..483d9af940 100644
--- a/rpcs3/Emu/RSX/RSXThread.cpp
+++ b/rpcs3/Emu/RSX/RSXThread.cpp
@@ -2086,9 +2086,6 @@ namespace rsx
 					}
 				}
 
-#ifdef __APPLE__
-				texture_control |= (sampler_descriptors[i]->encoded_component_map() << 16);
-#endif
 				current_fragment_program.texture_params[i].control = texture_control;
 			}
 		}
diff --git a/rpcs3/Emu/RSX/VK/vkutils/image.h b/rpcs3/Emu/RSX/VK/vkutils/image.h
index 3299b8f4c9..41957bb62b 100644
--- a/rpcs3/Emu/RSX/VK/vkutils/image.h
+++ b/rpcs3/Emu/RSX/VK/vkutils/image.h
@@ -12,11 +12,7 @@
 //using enum rsx::format_class;
 using namespace ::rsx::format_class_;
 
-#ifdef __APPLE__
-#define VK_DISABLE_COMPONENT_SWIZZLE 1
-#else
 #define VK_DISABLE_COMPONENT_SWIZZLE 0
-#endif
 
 namespace vk
 {