remove glad forward decl, naming fixes

Author: mbaetgen-wup

src/libprojectM/ProjectMCWrapper.cpp

@@ -7,7 +7,7 @@
 #include <Audio/AudioConstants.hpp>
 
 #include <Renderer/CrossGlLoader.hpp>
-#include <SOIL2/soil2_gl_bridge.h>
+#include <SOIL2/SOIL2_gl_bridge.h>
 #include <SOIL2/SOIL2.h>
 
 #include <projectM-4/parameters.h>
@@ -88,7 +88,7 @@ projectm_handle projectm_create_with_opengl_load_proc(void* (*load_proc)(const c
 
         // init SOIL2 gl functions
         SOIL_GL_SetResolver(&libprojectM::Renderer::CrossGlLoader::GladResolverThunk);
-        SOIL_init();
+        SOIL_GL_Init();
 
         // create projectM
         auto* projectMInstance = new libprojectM::projectMWrapper();

src/libprojectM/Renderer/CrossGlLoader.cpp

@@ -1,30 +1,15 @@
 // Cross-platform runtime GL/GLES loader using GLAD2 C API (non-MX).
 //
-// Only forward declares the GLAD loader entrypoints (gladLoadGL / gladLoadGLES2) and provides
-// a universal resolver.
+// Provides a universal resolver to find GL function pointers.
 
 #include "CrossGlLoader.hpp"
 
 #include <Logging.hpp>
+#include "OpenGL.h"
 
 #include <array>
 #include <cstdio>
 
-// forward declare glad interfaces to contain dependency to this cpp
-namespace {
-
-using GladLoadFunc = void* (*) (const char* name);
-
-extern "C" {
-#ifndef USE_GLES
-int gladLoadGL(GladLoadFunc load);
-#else
-int gladLoadGLES2(GladLoadFunc load);
-#endif
-}
-
-} // namespace
-
 namespace libprojectM {
 namespace Renderer {
 
@@ -100,7 +85,7 @@ auto CrossGlLoader::CurrentBackend() const -> Backend
     return m_backend;
 }
 
-auto CrossGlLoader::GetProcAddress(const char* name) const -> void*
+auto CrossGlLoader::GetProcAddress(const char* name) const -> GLapiproc
 {
     // NOTE: This method is used during GLAD loading. Avoid taking the mutex here to
     // prevent deadlocks if GLAD calls back into us while Initialize() is holding the lock
@@ -213,17 +198,25 @@ void CrossGlLoader::DetectBackend()
     m_backend = Backend::None;
 }
 
-auto CrossGlLoader::GladResolverThunk(const char* name) -> void*
+auto CrossGlLoader::GladResolverThunk(const char* name) -> GLapiproc
 {
     return Instance().Resolve(name);
 }
 
+namespace {
+// adapt external void* handle to GLAD type
+auto gladBridgeResolverThunk(const char* name) -> GLADapiproc
+{
+    return reinterpret_cast<GLADapiproc>(CrossGlLoader::GladResolverThunk(name));
+}
+}
+
 auto CrossGlLoader::LoadViaGlad() -> bool
 {
     int result = 0;
 
 #ifndef USE_GLES
-    result = gladLoadGL(&CrossGlLoader::GladResolverThunk);
+    result = gladLoadGL(&gladBridgeResolverThunk);
     if (result != 0)
     {
         LOG_DEBUG("CrossGlLoader: gladLoadGL() succeeded");
@@ -232,7 +225,7 @@ auto CrossGlLoader::LoadViaGlad() -> bool
     LOG_DEBUG("CrossGlLoader: gladLoadGL() failed");
     return false;
 #else
-    result = gladLoadGLES2(&CrossGlLoader::GladResolverThunk);
+    result = gladLoadGLES2(&gladBridgeResolverThunk);
     if (result != 0)
     {
         LOG_DEBUG("CrossGlLoader: gladLoadGLES2() succeeded");
@@ -243,7 +236,7 @@ auto CrossGlLoader::LoadViaGlad() -> bool
 #endif
 }
 
-auto CrossGlLoader::Resolve(const char* name) const -> void*
+auto CrossGlLoader::Resolve(const char* name) const -> GLapiproc
 {
     if (name == nullptr)
     {

src/libprojectM/Renderer/CrossGlLoader.hpp

@@ -45,6 +45,8 @@ using UserResolver = void* (*)(const char* name, void* userData);
 class CrossGlLoader
 {
 public:
+    using GLapiproc = void*;
+
     CrossGlLoader() = default;
     ~CrossGlLoader() = default;
 
@@ -88,23 +90,23 @@ class CrossGlLoader
      * @param name Function name.
      * @return Procedure address or nullptr.
      */
-    auto GetProcAddress(const char* name) const -> void*;
+    auto GetProcAddress(const char* name) const -> GLapiproc;
 
     /**
      * @brief Resolves a function pointer using the loader's universal resolver from a static context.
      *
      * @param name Function name.
      * @return Procedure address or nullptr.
      */
-    static auto GladResolverThunk(const char* name) -> void*;
+    static auto GladResolverThunk(const char* name) -> GLapiproc;
 private:
-    using GetProcFunc = void* (*)(const char* name);
+    using GetProcFunc = GLapiproc (*)(const char* name);
 
     void OpenNativeLibraries();
     void ResolveProviderFunctions();
     void DetectBackend();
     auto LoadViaGlad() -> bool;
-    auto Resolve(const char* name) const -> void*;
+    auto Resolve(const char* name) const -> GLapiproc;
 
     mutable std::mutex m_mutex;
 

vendor/SOIL2/CMakeLists.txt

@@ -6,7 +6,7 @@ add_library(SOIL2 OBJECT
         ${CMAKE_CURRENT_SOURCE_DIR}/src/SOIL2/pkm_helper.h
         ${CMAKE_CURRENT_SOURCE_DIR}/src/SOIL2/SOIL2.c
         ${CMAKE_CURRENT_SOURCE_DIR}/src/SOIL2/wfETC.c
-        ${CMAKE_CURRENT_SOURCE_DIR}/src/SOIL2/soil2_gl_bridge.c
+        ${CMAKE_CURRENT_SOURCE_DIR}/src/SOIL2/SOIL2_gl_bridge.c
         )
 
 target_include_directories(SOIL2

vendor/SOIL2/src/SOIL2/SOIL2.c

@@ -19,7 +19,7 @@
 #define SOIL_CHECK_FOR_GL_ERRORS 0
 
 // --- projectM patched GL discovery start ---
-#include "soil2_gl_bridge.h"
+#include "SOIL2_gl_bridge.h"
 
 #ifndef APIENTRY
 # if defined(_WIN32)
@@ -334,9 +334,9 @@ static int soil2_gl_inited = 0;
 
 
 
-void SOIL_init()
+void SOIL_GL_Init()
 {
-    /* Must be called after a GL context exists and AFTER soil2_set_gl_resolver(). */
+    /* Must be called after a GL context exists and AFTER SOIL_GL_SetResolver(). */
     if (soil2_gl_inited)
         return;
 
@@ -365,7 +365,7 @@ static void soil2_ensure_gl_inited(void)
 {
 	if(!soil2_gl_inited)
 	{
-		SOIL_init();
+		SOIL_GL_Init();
 	}
 }
 

vendor/SOIL2/src/SOIL2/SOIL2.h

@@ -62,7 +62,7 @@ extern "C" {
 #define SOIL_VERSION_ATLEAST( X, Y, Z ) ( SOIL_COMPILED_VERSION >= SOIL_VERSION_NUM( X, Y, Z ) )
 
 	unsigned long SOIL_version();
-	void SOIL_init();
+	void SOIL_GL_Init();
 
 /**
 	The format of images that may be loaded (force_channels).

vendor/SOIL2/src/SOIL2/soil2_gl_bridge.c vendor/SOIL2/src/SOIL2/SOIL2_gl_bridge.cvendor/SOIL2/src/SOIL2/soil2_gl_bridge.c renamed to vendor/SOIL2/src/SOIL2/SOIL2_gl_bridge.c

@@ -1,8 +1,8 @@
-#include "soil2_gl_bridge.h"
+#include "SOIL2_gl_bridge.h"
 
-static pm_soil_gl_resolver_t g_resolver = 0;
+static soil_gl_resolver_t g_resolver = 0;
 
-void SOIL_GL_SetResolver(pm_soil_gl_resolver_t resolver) {
+void SOIL_GL_SetResolver(soil_gl_resolver_t resolver) {
     g_resolver = resolver;
 }
 

vendor/SOIL2/src/SOIL2/SOIL2_gl_bridge.h

@@ -0,0 +1,38 @@
+#ifndef SOIL2_GL_BRIDGE_H
+#define SOIL2_GL_BRIDGE_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#if defined(SOIL_GLES2) || defined(__ANDROID__) || defined(__EMSCRIPTEN__)
+#include <glad/gles2.h>
+#else
+#include <glad/gl.h>
+#endif
+
+    /**
+     * Function used by SOIL2 to resolve GL function pointers.
+     */
+    typedef void* (*soil_gl_resolver_t)(const char* name);
+
+/**
+     * Sets the GL function resolver for SOIL2.
+     *
+     * @param resolver The resolver function to use.
+     */
+    void SOIL_GL_SetResolver(soil_gl_resolver_t resolver);
+
+    /**
+     * Resolver function to look up gl functions for SOIL2.
+     *
+     * @param proc GL Function name.
+     * @return Resolved function pointer for the given function name, or 0 if the function could not be resolved.
+     */
+void* SOIL_GL_GetProcAddress(const char* proc);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif