From 6ed7ee7b72dab1561406c2e9ee0905daf6bbb148 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Sun, 21 Jun 2026 14:40:01 +0200 Subject: [PATCH] GL: don't need to include StaticArray in Context.h. Have just a C array, the only hurdle is C++ being shitty when copying those. --- src/Magnum/GL/Context.cpp | 3 ++- src/Magnum/GL/Context.h | 3 +-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Magnum/GL/Context.cpp b/src/Magnum/GL/Context.cpp index a54e880e8..960b9cade 100644 --- a/src/Magnum/GL/Context.cpp +++ b/src/Magnum/GL/Context.cpp @@ -31,6 +31,7 @@ #include #include #include +#include #include #include #include /* CORRADE_THREAD_LOCAL */ @@ -832,7 +833,6 @@ Context::Context(Context&& other) noexcept: _flags{other._flags}, #endif _extensionStatus{other._extensionStatus}, - _extensionRequiredVersion{other._extensionRequiredVersion}, #ifdef MAGNUM_BUILD_DEPRECATED _supportedExtensions{Utility::move(other._supportedExtensions)}, #endif @@ -842,6 +842,7 @@ Context::Context(Context&& other) noexcept: _disabledExtensions{Utility::move(other._disabledExtensions)}, _configurationFlags{other._configurationFlags} { + Utility::copy(other._extensionRequiredVersion, _extensionRequiredVersion); if(currentContext == &other) currentContext = this; } diff --git a/src/Magnum/GL/Context.h b/src/Magnum/GL/Context.h index 1a542eed7..6372f4e96 100644 --- a/src/Magnum/GL/Context.h +++ b/src/Magnum/GL/Context.h @@ -35,7 +35,6 @@ #include #include #include -#include #include "Magnum/Magnum.h" #include "Magnum/Math/BitVector.h" @@ -921,7 +920,7 @@ class MAGNUM_GL_EXPORT Context { /* For all extensions that are marked as supported in _extensionStatus, this field contains the minimal required GL version the extension needs. Extensions that are disabled have None here. */ - Containers::StaticArray _extensionRequiredVersion; + Version _extensionRequiredVersion[Implementation::ExtensionCount]; #ifdef MAGNUM_BUILD_DEPRECATED Containers::Array _supportedExtensions; #endif