From b481590268e79059039ecbb890b95f4dc5d1d7eb Mon Sep 17 00:00:00 2001 From: Robin Gareus Date: Wed, 1 Feb 2023 01:32:48 +0100 Subject: [PATCH] macOS: use openGL surface by default --- gtk2_ardour/rc_option_editor.cc | 6 +++--- gtk2_ardour/ui_config.cc | 3 +-- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/gtk2_ardour/rc_option_editor.cc b/gtk2_ardour/rc_option_editor.cc index e0a1d2c944..ffbfa05811 100644 --- a/gtk2_ardour/rc_option_editor.cc +++ b/gtk2_ardour/rc_option_editor.cc @@ -3026,7 +3026,7 @@ These settings will only take effect after %1 is restarted.\n\ sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::get_use_opengl_view), sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::set_use_opengl_view) ); - glmode->add (NSGLAuto, _("until (including) macOS 10.14")); + glmode->add (NSGLAuto, _("Automatic")); glmode->add (NSGLDisable, _("No")); glmode->add (NSGLEnable, _("Yes")); @@ -3038,7 +3038,7 @@ These settings will only take effect after %1 is restarted.\n\ #ifndef USE_CAIRO_IMAGE_SURFACE _cairo_image_surface = new BoolOption ( "cairo-image-surface", - _("Disable Graphics Hardware Acceleration (requires restart)"), + _("Use intermediate image-surface to render canvas (requires restart)"), sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::get_cairo_image_surface), sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::set_cairo_image_surface) ); @@ -4884,7 +4884,7 @@ RCOptionEditor::parameter_changed (string const & p) } else if (p == "use-opengl-view" && _cairo_image_surface) { #ifdef __APPLE__ AppleNSGLViewMode m = UIConfiguration::instance().get_use_opengl_view (); - if (m == NSGLEnable || (m == NSGLAuto && query_darwin_version () < 19)) { + if (m == NSGLEnable || (m == NSGLAuto && query_darwin_version () < 23)) { _cairo_image_surface->set_sensitive (false); } else { _cairo_image_surface->set_sensitive (true); diff --git a/gtk2_ardour/ui_config.cc b/gtk2_ardour/ui_config.cc index cb99892c4c..a6af0a558e 100644 --- a/gtk2_ardour/ui_config.cc +++ b/gtk2_ardour/ui_config.cc @@ -241,8 +241,7 @@ UIConfiguration::pre_gui_init () #ifdef __APPLE__ switch (get_use_opengl_view()) { case NSGLAuto: - if (query_darwin_version () >= 19) { - /* on Catalina, do not use NSGLView */ + if (query_darwin_version () >= 23) { g_setenv ("ARDOUR_NSGL", "0", 0); } else { g_setenv ("ARDOUR_NSGL", "1", 0);