From 2a65f583d0b31505cfbb20e10521f5030994a030 Mon Sep 17 00:00:00 2001 From: rdb Date: Wed, 7 Dec 2022 17:16:18 +0100 Subject: [PATCH] cocoadisplay: Small tweak to fullscreen fix --- panda/src/cocoadisplay/cocoaGraphicsWindow.mm | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/panda/src/cocoadisplay/cocoaGraphicsWindow.mm b/panda/src/cocoadisplay/cocoaGraphicsWindow.mm index 044329608c..3921f06a25 100644 --- a/panda/src/cocoadisplay/cocoaGraphicsWindow.mm +++ b/panda/src/cocoadisplay/cocoaGraphicsWindow.mm @@ -211,17 +211,15 @@ begin_frame(FrameMode mode, Thread *current_thread) { cocoagsg->lock_context(); // Set the drawable. - if (_properties.get_fullscreen()) { + if (_properties.get_fullscreen() && !is_arm64_mac()) { // Fullscreen. Note that this call doesn't work with the newer // Metal-based OpenGL drivers. - if (!is_arm64_mac()) { - CGLError err = CGLSetFullScreenOnDisplay((CGLContextObj) [cocoagsg->_context CGLContextObj], CGDisplayIDToOpenGLDisplayMask(_display)); - if (err != kCGLNoError) { - cocoadisplay_cat.error() - << "Failed call to CGLSetFullScreenOnDisplay with display mask " - << CGDisplayIDToOpenGLDisplayMask(_display) << ": " << CGLErrorString(err) << "\n"; - return false; - } + CGLError err = CGLSetFullScreenOnDisplay((CGLContextObj) [cocoagsg->_context CGLContextObj], CGDisplayIDToOpenGLDisplayMask(_display)); + if (err != kCGLNoError) { + cocoadisplay_cat.error() + << "Failed call to CGLSetFullScreenOnDisplay with display mask " + << CGDisplayIDToOpenGLDisplayMask(_display) << ": " << CGLErrorString(err) << "\n"; + return false; } } else { // Although not recommended, it is technically possible to use the same