From 29a6db8960ca1bc91a70a1243bc2c157460e0bc9 Mon Sep 17 00:00:00 2001
From: nastys <@a.a>
Date: Mon, 10 Jan 2022 14:37:26 +0100
Subject: [PATCH] Disable OpenGL on macOS

---
 rpcs3/Emu/system_config.h         | 4 ++++
 rpcs3/headless_application.cpp    | 2 ++
 rpcs3/rpcs3qt/gui_application.cpp | 2 ++
 rpcs3/rpcs3qt/render_creator.cpp  | 4 ++++
 4 files changed, 12 insertions(+)

diff --git a/rpcs3/Emu/system_config.h b/rpcs3/Emu/system_config.h
index bb8c5dd8b9..a456beaf36 100644
--- a/rpcs3/Emu/system_config.h
+++ b/rpcs3/Emu/system_config.h
@@ -96,7 +96,11 @@ struct cfg_root : cfg::node
 	{
 		node_video(cfg::node* _this) : cfg::node(_this, "Video") {}
 
+#ifdef __APPLE__
+		cfg::_enum<video_renderer> renderer{ this, "Renderer", video_renderer::vulkan };
+#else
 		cfg::_enum<video_renderer> renderer{ this, "Renderer", video_renderer::opengl };
+#endif
 
 		cfg::_enum<video_resolution> resolution{ this, "Resolution", video_resolution::_720 };
 		cfg::_enum<video_aspect> aspect_ratio{ this, "Aspect ratio", video_aspect::_16_9 };
diff --git a/rpcs3/headless_application.cpp b/rpcs3/headless_application.cpp
index 0c10f5a313..edb908529d 100644
--- a/rpcs3/headless_application.cpp
+++ b/rpcs3/headless_application.cpp
@@ -71,7 +71,9 @@ void headless_application::InitializeCallbacks()
 			g_fxo->init<rsx::thread, named_thread<NullGSRender>>();
 			break;
 		}
+#if not defined(__APPLE__)
 		case video_renderer::opengl:
+#endif
 #if defined(HAVE_VULKAN)
 		case video_renderer::vulkan:
 #endif
diff --git a/rpcs3/rpcs3qt/gui_application.cpp b/rpcs3/rpcs3qt/gui_application.cpp
index 7c97c9f5f5..fc12231951 100644
--- a/rpcs3/rpcs3qt/gui_application.cpp
+++ b/rpcs3/rpcs3qt/gui_application.cpp
@@ -332,11 +332,13 @@ void gui_application::InitializeCallbacks()
 			g_fxo->init<rsx::thread, named_thread<NullGSRender>>();
 			break;
 		}
+#if not defined(__APPLE__)
 		case video_renderer::opengl:
 		{
 			g_fxo->init<rsx::thread, named_thread<GLGSRender>>();
 			break;
 		}
+#endif
 #if defined(HAVE_VULKAN)
 		case video_renderer::vulkan:
 		{
diff --git a/rpcs3/rpcs3qt/render_creator.cpp b/rpcs3/rpcs3qt/render_creator.cpp
index 1b9135dc57..1fae5ac7b4 100644
--- a/rpcs3/rpcs3qt/render_creator.cpp
+++ b/rpcs3/rpcs3qt/render_creator.cpp
@@ -104,6 +104,10 @@ render_creator::render_creator(QObject *parent) : QObject(parent)
 	OpenGL = render_info();
 	NullRender = render_info();
 
+#ifdef __APPLE__
+	OpenGL.supported = false;
+#endif
+
 	renderers = { &Vulkan, &OpenGL, &NullRender };
 }