From c8edb6ec6cc1e5113db6b488531a9b188def5127 Mon Sep 17 00:00:00 2001 From: WerWolv Date: Tue, 2 Aug 2022 13:12:12 +0200 Subject: [PATCH] sys: Revert GLSL version back to 150 on macOS Fixes #632 --- main/source/init/splash_window.cpp | 7 ++++++- main/source/window/window.cpp | 6 +++++- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/main/source/init/splash_window.cpp b/main/source/init/splash_window.cpp index acc419d7a..0e9ef0f6b 100644 --- a/main/source/init/splash_window.cpp +++ b/main/source/init/splash_window.cpp @@ -206,7 +206,12 @@ namespace hex::init { ImGui::StyleColorsDark(); ImGui_ImplGlfw_InitForOpenGL(this->m_window, true); - ImGui_ImplOpenGL3_Init("#version 130"); + + #if defined(OS_MACOS) + ImGui_ImplOpenGL3_Init("#version 150"); + #else + ImGui_ImplOpenGL3_Init("#version 130"); + #endif auto &io = ImGui::GetIO(); diff --git a/main/source/window/window.cpp b/main/source/window/window.cpp index 49fe7938c..6041f1e47 100644 --- a/main/source/window/window.cpp +++ b/main/source/window/window.cpp @@ -744,7 +744,11 @@ namespace hex { ImGui_ImplGlfw_InitForOpenGL(this->m_window, true); - ImGui_ImplOpenGL3_Init("#version 130"); + #if defined(OS_MACOS) + ImGui_ImplOpenGL3_Init("#version 150"); + #else + ImGui_ImplOpenGL3_Init("#version 130"); + #endif for (const auto &plugin : PluginManager::getPlugins()) plugin.setImGuiContext(ImGui::GetCurrentContext());