From c03a834b24ed3f4faa98377050d4b1eebb8fe3dd Mon Sep 17 00:00:00 2001 From: tildearrow Date: Wed, 10 Apr 2024 03:45:17 -0500 Subject: [PATCH] let's try to enable OpenGL by default on macOS --- CMakeLists.txt | 8 +++----- src/gui/render/renderGL.cpp | 10 +++++++--- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 17c68dcd6..50a6c1a2a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -67,11 +67,7 @@ else() endif() set(WITH_RENDER_SDL_DEFAULT ON) -if (APPLE) - set(WITH_RENDER_OPENGL_DEFAULT OFF) -else() - set(WITH_RENDER_OPENGL_DEFAULT ON) -endif() +set(WITH_RENDER_OPENGL_DEFAULT ON) if (WIN32) set(WITH_RENDER_DX11_DEFAULT ON) set(WITH_RENDER_DX9_DEFAULT ON) @@ -903,6 +899,8 @@ if (WITH_RENDER_OPENGL) endif() if (WIN32) list(APPEND DEPENDENCIES_LIBRARIES opengl32) + elseif(APPLE) + list(APPEND DEPENDENCIES_LIBRARIES "-framework OpenGL") elseif(USE_GLES) list(APPEND DEPENDENCIES_LIBRARIES GLESv2) else() diff --git a/src/gui/render/renderGL.cpp b/src/gui/render/renderGL.cpp index a2986aef7..f8ba1a0d4 100644 --- a/src/gui/render/renderGL.cpp +++ b/src/gui/render/renderGL.cpp @@ -587,11 +587,15 @@ void FurnaceGUIRenderGL::preInit() { SDL_GL_SetAttribute(SDL_GL_CONTEXT_MAJOR_VERSION,2); SDL_GL_SetAttribute(SDL_GL_CONTEXT_MINOR_VERSION,0); #elif defined(__APPLE__) - // not recommended... SDL_GL_SetAttribute(SDL_GL_CONTEXT_FLAGS,SDL_GL_CONTEXT_FORWARD_COMPATIBLE_FLAG); SDL_GL_SetAttribute(SDL_GL_CONTEXT_PROFILE_MASK,SDL_GL_CONTEXT_PROFILE_CORE); - SDL_GL_SetAttribute(SDL_GL_CONTEXT_MAJOR_VERSION,3); - SDL_GL_SetAttribute(SDL_GL_CONTEXT_MINOR_VERSION,2); + if (glVer==2) { + SDL_GL_SetAttribute(SDL_GL_CONTEXT_MAJOR_VERSION,2); + SDL_GL_SetAttribute(SDL_GL_CONTEXT_MINOR_VERSION,0); + } else { + SDL_GL_SetAttribute(SDL_GL_CONTEXT_MAJOR_VERSION,3); + SDL_GL_SetAttribute(SDL_GL_CONTEXT_MINOR_VERSION,2); + } #else SDL_GL_SetAttribute(SDL_GL_CONTEXT_FLAGS,0); SDL_GL_SetAttribute(SDL_GL_CONTEXT_PROFILE_MASK,SDL_GL_CONTEXT_PROFILE_CORE);