macOS: use openGL surface by default
This commit is contained in:
parent
902b98588e
commit
b481590268
|
@ -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::get_use_opengl_view),
|
||||||
sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::set_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 (NSGLDisable, _("No"));
|
||||||
glmode->add (NSGLEnable, _("Yes"));
|
glmode->add (NSGLEnable, _("Yes"));
|
||||||
|
|
||||||
|
@ -3038,7 +3038,7 @@ These settings will only take effect after %1 is restarted.\n\
|
||||||
#ifndef USE_CAIRO_IMAGE_SURFACE
|
#ifndef USE_CAIRO_IMAGE_SURFACE
|
||||||
_cairo_image_surface = new BoolOption (
|
_cairo_image_surface = new BoolOption (
|
||||||
"cairo-image-surface",
|
"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::get_cairo_image_surface),
|
||||||
sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::set_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) {
|
} else if (p == "use-opengl-view" && _cairo_image_surface) {
|
||||||
#ifdef __APPLE__
|
#ifdef __APPLE__
|
||||||
AppleNSGLViewMode m = UIConfiguration::instance().get_use_opengl_view ();
|
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);
|
_cairo_image_surface->set_sensitive (false);
|
||||||
} else {
|
} else {
|
||||||
_cairo_image_surface->set_sensitive (true);
|
_cairo_image_surface->set_sensitive (true);
|
||||||
|
|
|
@ -241,8 +241,7 @@ UIConfiguration::pre_gui_init ()
|
||||||
#ifdef __APPLE__
|
#ifdef __APPLE__
|
||||||
switch (get_use_opengl_view()) {
|
switch (get_use_opengl_view()) {
|
||||||
case NSGLAuto:
|
case NSGLAuto:
|
||||||
if (query_darwin_version () >= 19) {
|
if (query_darwin_version () >= 23) {
|
||||||
/* on Catalina, do not use NSGLView */
|
|
||||||
g_setenv ("ARDOUR_NSGL", "0", 0);
|
g_setenv ("ARDOUR_NSGL", "0", 0);
|
||||||
} else {
|
} else {
|
||||||
g_setenv ("ARDOUR_NSGL", "1", 0);
|
g_setenv ("ARDOUR_NSGL", "1", 0);
|
||||||
|
|
Loading…
Reference in New Issue
Block a user