reset soil2 gl when gl resolver is destroyed

Author: mbaetgen-wup

src/libprojectM/Renderer/PlatformGLResolver.cpp

@@ -25,6 +25,8 @@ namespace Platform {
 
 GLResolver::~GLResolver()
 {
+    SOIL_GL_Destroy();
+
     // make sure handles are released
     m_eglLib.Close();
     m_glLib.Close();
@@ -110,6 +112,8 @@ void GLResolver::Shutdown()
 {
     const std::lock_guard<std::mutex> lock(m_mutex);
 
+    SOIL_GL_Destroy();
+
     m_loaded = false;
     m_backend = Backend::None;
 
@@ -145,7 +149,7 @@ auto GLResolver::GetProcAddress(const char* name) const -> GLapiproc
 
 void GLResolver::OpenNativeLibraries()
 {
-    // Best-effort: macOS or minimal EGL setups may fail to open
+    // Best-effort: mac or minimal EGL setups may fail to open
 
 #ifdef _WIN32
     static constexpr std::array<const char*, 3> kEglNames = {"libEGL.dll", "EGL.dll", nullptr};

src/libprojectM/Renderer/PlatformGLResolver.hpp

@@ -39,9 +39,9 @@ enum class Backend : std::uint8_t
     WglGl = 3,
 
     /**
-     * WegGL proc resolver (Emscripten only).
+     * WegGl proc resolver (Emscripten only).
      */
-    WebGL = 4,
+    WebGl = 4,
 
     /**
      * User resolver is used, no backend detection.
@@ -61,6 +61,8 @@ using UserResolver = void* (*)(const char* name, void* userData);
  * @brief Cross-platform runtime GL/GLES resolver.
  *
  * This resolver:
+ *  - Supports: EGL, GLES, GLX, WGL, WebGL or a user supplied resolver.
+ *  - Platforms: Android, Emscripten, Linux, Mac, Windows.
  *  - Must be initialized after a GL/GLES context has been created and made current.
  *  - Probes for EGL/GLX/WGL by checking for a current context.
  *  - Uses GLAD2 non-MX entrypoints (gladLoadGL / gladLoadGLES2) via a universal resolver.

vendor/SOIL2/src/SOIL2/SOIL2.c

@@ -336,40 +336,54 @@ typedef void (APIENTRY * P_SOIL_GLGENERATEMIPMAPPROC)(GLenum target);
 static P_SOIL_GLGENERATEMIPMAPPROC soilGlGenerateMipmap = NULL;
 
 
-static int soil2_gl_inited = 0;
-
-
+static int soil2GlInitialized = 0;
 
 void SOIL_GL_Init()
 {
     /* Must be called after a GL context exists and AFTER SOIL_GL_SetResolver(). */
-    if (soil2_gl_inited)
+    if (soil2GlInitialized)
         return;
 
     /* Resolve compressed upload */
     soilGlCompressedTexImage2D =
         (P_SOIL_GLCOMPRESSEDTEXIMAGE2DPROC)SOIL_GL_GetProcAddress("glCompressedTexImage2D");
     if (!soilGlCompressedTexImage2D)
+    {
         soilGlCompressedTexImage2D =
             (P_SOIL_GLCOMPRESSEDTEXIMAGE2DPROC)SOIL_GL_GetProcAddress("glCompressedTexImage2DARB");
+    }
 
     /* Resolve mipmap generator (desktop + ES extensions) */
     soilGlGenerateMipmap =
         (P_SOIL_GLGENERATEMIPMAPPROC)SOIL_GL_GetProcAddress("glGenerateMipmap");
     if (!soilGlGenerateMipmap)
+    {
         soilGlGenerateMipmap =
             (P_SOIL_GLGENERATEMIPMAPPROC)SOIL_GL_GetProcAddress("glGenerateMipmapEXT");
+    }
     if (!soilGlGenerateMipmap)
+    {
         soilGlGenerateMipmap =
             (P_SOIL_GLGENERATEMIPMAPPROC)SOIL_GL_GetProcAddress("glGenerateMipmapOES");
+    }
+
+    soil2GlInitialized = 1;
+}
 
-    soil2_gl_inited = 1;
+void SOIL_GL_Destroy()
+{
+    soil2GlInitialized = 0;
+    soilGlCompressedTexImage2D = NULL;
+    soilGlGenerateMipmap = NULL;
+    soilGlGenerateMipmap = NULL;
+    soilGlGenerateMipmap = NULL;
 }
 
+
 /* Ensure OpenGL function pointers are initialized (safe to call repeatedly). */
-static void soil2_ensure_gl_inited(void)
+static void soil2_ensure_gl_initialized(void)
 {
-	if(!soil2_gl_inited)
+	if(!soil2GlInitialized)
 	{
 		SOIL_GL_Init();
 	}
@@ -3171,7 +3185,7 @@ static P_SOIL_GLCOMPRESSEDTEXIMAGE2DPROC get_glCompressedTexImage2D_addr()
 {
     /* Always go through the user-provided resolver to avoid link-time symbol collisions
        (e.g. when GLAD or other loaders are compiled into the binary). */
-    soil2_ensure_gl_inited();
+    soil2_ensure_gl_initialized();
     return soilGlCompressedTexImage2D;
 }
 
@@ -3368,7 +3382,7 @@ int query_gen_mipmap_capability( void )
         }
         else
         {
-            soil2_ensure_gl_inited();
+            soil2_ensure_gl_initialized();
 
             if (soilGlGenerateMipmap)
             {

vendor/SOIL2/src/SOIL2/SOIL2.h

@@ -63,6 +63,7 @@ extern "C" {
 
 	unsigned long SOIL_version();
 	void SOIL_GL_Init();
+	void SOIL_GL_Destroy();
 
 /**
 	The format of images that may be loaded (force_channels).