RPCS3/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2024-11-22 10:42:36 +01:00
Code Issues Releases Wiki Activity

Disable OpenGL on macOS

Browse Source
This commit is contained in:
nastys 2022-01-10 14:37:26 +01:00 committed by Ivan
parent 6d737e61fd
commit 29a6db8960
4 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
rpcs3/Emu/system_config.h
View File

@ -96,7 +96,11 @@ struct cfg_root : cfg::node
{ {
node_video(cfg::node* _this) : cfg::node(_this, "Video") {} 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 }; cfg::_enum<video_renderer> renderer{ this, "Renderer", video_renderer::opengl };
#endif
cfg::_enum<video_resolution> resolution{ this, "Resolution", video_resolution::_720 }; cfg::_enum<video_resolution> resolution{ this, "Resolution", video_resolution::_720 };
cfg::_enum<video_aspect> aspect_ratio{ this, "Aspect ratio", video_aspect::_16_9 }; cfg::_enum<video_aspect> aspect_ratio{ this, "Aspect ratio", video_aspect::_16_9 };

2
rpcs3/headless_application.cpp
View File

@ -71,7 +71,9 @@ void headless_application::InitializeCallbacks()
g_fxo->init<rsx::thread, named_thread<NullGSRender>>(); g_fxo->init<rsx::thread, named_thread<NullGSRender>>();
break; break;
} }
#if not defined(__APPLE__)
case video_renderer::opengl: case video_renderer::opengl:
#endif
#if defined(HAVE_VULKAN) #if defined(HAVE_VULKAN)
case video_renderer::vulkan: case video_renderer::vulkan:
#endif #endif

2
rpcs3/rpcs3qt/gui_application.cpp
View File

@ -332,11 +332,13 @@ void gui_application::InitializeCallbacks()
g_fxo->init<rsx::thread, named_thread<NullGSRender>>(); g_fxo->init<rsx::thread, named_thread<NullGSRender>>();
break; break;
} }
#if not defined(__APPLE__)
case video_renderer::opengl: case video_renderer::opengl:
{ {
g_fxo->init<rsx::thread, named_thread<GLGSRender>>(); g_fxo->init<rsx::thread, named_thread<GLGSRender>>();
break; break;
} }
#endif
#if defined(HAVE_VULKAN) #if defined(HAVE_VULKAN)
case video_renderer::vulkan: case video_renderer::vulkan:
{ {

4
rpcs3/rpcs3qt/render_creator.cpp
View File

@ -104,6 +104,10 @@ render_creator::render_creator(QObject *parent) : QObject(parent)
OpenGL = render_info(); OpenGL = render_info();
NullRender = render_info(); NullRender = render_info();
#ifdef __APPLE__
OpenGL.supported = false;
#endif
renderers = { &Vulkan, &OpenGL, &NullRender }; renderers = { &Vulkan, &OpenGL, &NullRender };
} }