From cf56b881eb1a1daac40ac108c3dd3d35e8b14fdc Mon Sep 17 00:00:00 2001 From: bruvzg <7645683+bruvzg@users.noreply.github.com> Date: Tue, 14 Nov 2023 19:00:33 +0200 Subject: [PATCH] [macOS] Cleanup default GL driver setting. --- main/main.cpp | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/main/main.cpp b/main/main.cpp index 271791f36899..281ef9a0d69b 100644 --- a/main/main.cpp +++ b/main/main.cpp @@ -1753,15 +1753,12 @@ Error Main::setup(const char *execpath, int argc, char *argv[], bool p_second_ph String driver_hints_egl = ""; #ifdef GLES3_ENABLED driver_hints = "opengl3"; - driver_hints_angle = "opengl3,opengl3_angle"; - driver_hints_egl = "opengl3,opengl3_es"; + driver_hints_angle = "opengl3,opengl3_angle"; // macOS, Windows. + driver_hints_egl = "opengl3,opengl3_es"; // Linux. #endif String default_driver = driver_hints.get_slice(",", 0); - String default_driver_macos = default_driver; -#if defined(GLES3_ENABLED) && defined(EGL_STATIC) && defined(MACOS_ENABLED) - default_driver_macos = "opengl3_angle"; // Default to ANGLE if it's built-in. -#endif + 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);