diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2023-12-05 15:15:48 +0100 |
|---|---|---|
| committer | Rémi Verschelde <rverschelde@gmail.com> | 2023-12-05 15:15:48 +0100 |
| commit | 7233bc6736e6a9e12758a52402660f9a3a892a78 (patch) | |
| tree | 4d66c20d09da2de4fa6c9ef8248b3e2c02dfbc90 | |
| parent | 1af8228ced0b2898bee3952d91f5b901b3952513 (diff) | |
| parent | d48524a3f4e7070cecc01de215ae4c3aa37ab504 (diff) | |
| download | redot-engine-7233bc6736e6a9e12758a52402660f9a3a892a78.tar.gz | |
Merge pull request #85785 from bruvzg/macos_no_angle
[macOS] Switch ANGLE backend to ANGLE over OpenGL, switch default compatibility renderer back to native.
| -rw-r--r-- | main/main.cpp | 3 | ||||
| -rw-r--r-- | platform/macos/gl_manager_macos_angle.mm | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/main/main.cpp b/main/main.cpp index f36526d433..3d703578a0 100644 --- a/main/main.cpp +++ b/main/main.cpp @@ -1758,7 +1758,6 @@ Error Main::setup(const char *execpath, int argc, char *argv[], bool p_second_ph #endif String default_driver = driver_hints.get_slice(",", 0); - String default_driver_macos = driver_hints_angle.get_slice(",", 1); GLOBAL_DEF_RST_NOVAL("rendering/gl_compatibility/driver", default_driver); GLOBAL_DEF_RST_NOVAL(PropertyInfo(Variant::STRING, "rendering/gl_compatibility/driver.windows", PROPERTY_HINT_ENUM, driver_hints_angle), default_driver); @@ -1766,7 +1765,7 @@ Error Main::setup(const char *execpath, int argc, char *argv[], bool p_second_ph GLOBAL_DEF_RST_NOVAL(PropertyInfo(Variant::STRING, "rendering/gl_compatibility/driver.web", PROPERTY_HINT_ENUM, driver_hints), default_driver); GLOBAL_DEF_RST_NOVAL(PropertyInfo(Variant::STRING, "rendering/gl_compatibility/driver.android", PROPERTY_HINT_ENUM, driver_hints), default_driver); GLOBAL_DEF_RST_NOVAL(PropertyInfo(Variant::STRING, "rendering/gl_compatibility/driver.ios", PROPERTY_HINT_ENUM, driver_hints), default_driver); - GLOBAL_DEF_RST_NOVAL(PropertyInfo(Variant::STRING, "rendering/gl_compatibility/driver.macos", PROPERTY_HINT_ENUM, driver_hints_angle), default_driver_macos); + GLOBAL_DEF_RST_NOVAL(PropertyInfo(Variant::STRING, "rendering/gl_compatibility/driver.macos", PROPERTY_HINT_ENUM, driver_hints_angle), default_driver); GLOBAL_DEF_RST("rendering/gl_compatibility/nvidia_disable_threaded_optimization", true); GLOBAL_DEF_RST("rendering/gl_compatibility/fallback_to_angle", true); diff --git a/platform/macos/gl_manager_macos_angle.mm b/platform/macos/gl_manager_macos_angle.mm index ec0ca3e1f3..ac2f20ee7e 100644 --- a/platform/macos/gl_manager_macos_angle.mm +++ b/platform/macos/gl_manager_macos_angle.mm @@ -48,7 +48,7 @@ EGLenum GLManagerANGLE_MacOS::_get_platform_extension_enum() const { Vector<EGLAttrib> GLManagerANGLE_MacOS::_get_platform_display_attributes() const { Vector<EGLAttrib> ret; ret.push_back(EGL_PLATFORM_ANGLE_TYPE_ANGLE); - ret.push_back(EGL_PLATFORM_ANGLE_TYPE_METAL_ANGLE); + ret.push_back(EGL_PLATFORM_ANGLE_TYPE_OPENGL_ANGLE); ret.push_back(EGL_NONE); return ret; |