From 64e35886b7e873a768496ad75c1229737d159e05 Mon Sep 17 00:00:00 2001 From: WerWolv Date: Wed, 21 Apr 2021 20:06:48 +0200 Subject: [PATCH] fix: Possibly fix crashes on macos --- source/init/splash_window.cpp | 6 +++++- source/window.cpp | 3 ++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/source/init/splash_window.cpp b/source/init/splash_window.cpp index 6d1efd5d4..24146ad9a 100644 --- a/source/init/splash_window.cpp +++ b/source/init/splash_window.cpp @@ -151,8 +151,12 @@ namespace hex::init { exit(EXIT_FAILURE); } + glfwWindowHint(GLFW_CONTEXT_VERSION_MAJOR, 3); - glfwWindowHint(GLFW_CONTEXT_VERSION_MINOR, 0); + glfwWindowHint(GLFW_CONTEXT_VERSION_MINOR, 2); + glfwWindowHint(GLFW_OPENGL_PROFILE, GLFW_OPENGL_CORE_PROFILE); + glfwWindowHint(GLFW_OPENGL_FORWARD_COMPAT, GL_TRUE); + glfwWindowHint(GLFW_RESIZABLE, GLFW_FALSE); glfwWindowHint(GLFW_TRANSPARENT_FRAMEBUFFER, GLFW_TRUE); glfwWindowHint(GLFW_DECORATED, GLFW_FALSE); diff --git a/source/window.cpp b/source/window.cpp index 7c4740206..7f5214476 100644 --- a/source/window.cpp +++ b/source/window.cpp @@ -584,7 +584,7 @@ namespace hex { glfwWindowHint(GLFW_CONTEXT_VERSION_MAJOR, 3); glfwWindowHint(GLFW_CONTEXT_VERSION_MINOR, 2); glfwWindowHint(GLFW_OPENGL_PROFILE, GLFW_OPENGL_CORE_PROFILE); - + glfwWindowHint(GLFW_OPENGL_FORWARD_COMPAT, GL_TRUE); this->m_window = glfwCreateWindow(1280 * this->m_globalScale, 720 * this->m_globalScale, "ImHex", nullptr, nullptr); @@ -762,6 +762,7 @@ namespace hex { io.IniFilename = iniFileName.c_str(); ImGui_ImplGlfw_InitForOpenGL(this->m_window, true); + ImGui_ImplOpenGL3_Init("#version 150"); }