From 19e60cf08ba8800b7214c0865ebb2fc6b880c7bd Mon Sep 17 00:00:00 2001 From: Dan Goodliffe Date: Fri, 3 Nov 2023 21:31:35 +0000 Subject: Don't request a specific OpenGL version, just check we get something sufficient from gladLoadGL --- ui/applicationBase.cpp | 3 --- ui/window.cpp | 8 +++----- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/ui/applicationBase.cpp b/ui/applicationBase.cpp index 32af3af..2be1f6c 100644 --- a/ui/applicationBase.cpp +++ b/ui/applicationBase.cpp @@ -21,9 +21,6 @@ ApplicationBase::ApplicationBase() setGlAttribute(SDL_GL_DEPTH_SIZE, 16); setGlAttribute(SDL_GL_DOUBLEBUFFER, 1); - setGlAttribute(SDL_GL_CONTEXT_PROFILE_MASK, SDL_GL_CONTEXT_PROFILE_CORE); - setGlAttribute(SDL_GL_CONTEXT_MAJOR_VERSION, 4); - setGlAttribute(SDL_GL_CONTEXT_MINOR_VERSION, 2); setGlAttribute(SDL_GL_SHARE_WITH_CURRENT_CONTEXT, 1); } diff --git a/ui/window.cpp b/ui/window.cpp index 93e85bd..6855aa0 100644 --- a/ui/window.cpp +++ b/ui/window.cpp @@ -1,17 +1,15 @@ #include "window.h" #include "uiComponent.h" -#include "worldOverlay.h" #include #include #include -#include -#include Window::GLInitHelper::GLInitHelper() { [[maybe_unused]] static auto init = []() { - if (const auto version = gladLoadGL(reinterpret_cast(SDL_GL_GetProcAddress)); version != 40006) { - throw std::runtime_error {std::to_string(version)}; + // NOLINTNEXTLINE(cppcoreguidelines-pro-type-reinterpret-cast) + if (const auto version = gladLoadGL(reinterpret_cast(SDL_GL_GetProcAddress)); version < 30003) { + throw std::runtime_error {"Insufficient OpenGL version: " + std::to_string(version)}; } else { return version; -- cgit v1.2.3