adjust sdl-test-ui to use GLAD and SDL2 to get gl functions

Author: mbaetgen-wup

src/sdl-test-ui/CMakeLists.txt

@@ -23,6 +23,7 @@ target_link_libraries(projectM-Test-UI
         SDL2::SDL2
         SDL2::SDL2main
         ${CMAKE_DL_LIBS}
+        glad
         )
 
 if(MSVC)
@@ -37,4 +38,11 @@ if(MSVC)
                 "The resulting projectMSDL executable will not be DPI-aware and possibly render at a "
                 "lower-than-expected resolution on high-DPI displays.")
     endif()
+
+    add_custom_command(TARGET projectM-Test-UI POST_BUILD
+            COMMAND ${CMAKE_COMMAND} -E copy_if_different
+            $<TARGET_FILE:libprojectM::projectM>
+            $<TARGET_FILE:libprojectM::playlist>
+            $<TARGET_FILE_DIR:projectM-Test-UI>
+            )
 endif()

src/sdl-test-ui/opengl.h

@@ -17,33 +17,11 @@
 // If a shader compilation failure occurs, it dumps shader source into /tmp instead of stderr
 #define DUMP_SHADERS_ON_ERROR       0
 
-#ifdef __APPLE__
-# include <OpenGL/gl3.h>
-# include <OpenGL/gl3ext.h>
-#elif defined(EYETUNE_WINRT)
-#define GL_GLEXT_PROTOTYPES
-#define GLM_FORCE_CXX03
-#include <GLES3/gl31.h>
-#include <GLES3/gl3.h>
-#include <GLES2/gl2.h>
-#include <GLES2/gl2ext.h>
-#include <EGL/egl.h>
-#include <EGL/eglext.h>
-#elif defined(_WIN32)
-#define GLM_FORCE_CXX03
-# include <windows.h>
-#include "GL/glew.h"
-#include "GL/wglew.h"
-#else /* linux/unix/other */
-# ifdef USE_GLES
-#  include <GLES3/gl3.h>
-# else
-#  if !defined(GL_GLEXT_PROTOTYPES)
-#     define GL_GLEXT_PROTOTYPES
-#  endif
-#  include <GL/gl.h>
-#  include <GL/glext.h>
-# endif
+
+#ifdef USE_GLES
+#  include <glad/gles2.h>
+#else
+#  include <glad/gl.h>
 #endif
 
 

src/sdl-test-ui/pmSDL.cpp

@@ -32,15 +32,25 @@
 
 #include <vector>
 
+namespace {
+auto dispatchLoadProc(const char* name, void* userData) -> void*
+{
+    // Dispatch load proc to SDL
+    return SDL_GL_GetProcAddress(name);
+}
+} // namespace
+
 projectMSDL::projectMSDL(SDL_GLContext glCtx, const std::string& presetPath)
     : _openGlContext(glCtx)
-    , _projectM(projectm_create())
+    , _projectM(projectm_create_with_opengl_load_proc(&dispatchLoadProc, nullptr))
     , _playlist(projectm_playlist_create(_projectM))
 {
     projectm_get_window_size(_projectM, &_width, &_height);
     projectm_playlist_set_preset_switched_event_callback(_playlist, &projectMSDL::presetSwitchedEvent, static_cast<void*>(this));
     projectm_playlist_add_path(_playlist, presetPath.c_str(), true, false);
     projectm_playlist_set_shuffle(_playlist, _shuffle);
+    dumpOpenGLInfo();
+    enableGLDebugOutput();
 }
 
 projectMSDL::~projectMSDL()

src/sdl-test-ui/pmSDL.hpp

@@ -27,6 +27,7 @@
 
 #pragma once
 
+#include "opengl.h"
 #include <SDL2/SDL.h>
 
 // Disable LOOPBACK and FAKE audio to enable microphone input
@@ -45,7 +46,6 @@
 // projectM SDL
 #include "audioCapture.hpp"
 #include "loopback.hpp"
-#include "opengl.h"
 #include "setup.hpp"
 
 
@@ -72,8 +72,8 @@
 #include <stdio.h>
 
 
-#define LOG(format, ...) wprintf(format L"\n", __VA_ARGS__)
-#define ERR(format, ...) LOG(L"Error: " format, __VA_ARGS__)
+#define LOG(format, ...) wprintf(format L"\n", ##__VA_ARGS__)
+#define ERR(format, ...) LOG(L"Error: " format, ##__VA_ARGS__)
 
 #endif /** WASAPI_LOOPBACK */
 

src/sdl-test-ui/setup.cpp

@@ -1,5 +1,6 @@
 #include "setup.hpp"
 
+#include <projectM-4/logging.h>
 #include "ConfigFile.h"
 
 #include <SDL2/SDL_hints.h>
@@ -47,7 +48,11 @@ std::string getConfigFilePath(std::string datadir_path) {
 #if defined _MSC_VER
     _mkdir(projectM_home.c_str());
 #else
-    mkdir(projectM_home.c_str(), 0755);
+    #ifdef _WIN32
+        mkdir(projectM_home.c_str());
+    #else
+        mkdir(projectM_home.c_str(), 0755);
+    #endif
 #endif
 
     projectM_home += "/config.inp";
@@ -88,14 +93,14 @@ void seedRand() {
 
 void initGL() {
 #ifdef USE_GLES
-    // use GLES 3.0
+    // use GLES 3.2
     SDL_GL_SetAttribute(SDL_GL_CONTEXT_MAJOR_VERSION, 3);
-    SDL_GL_SetAttribute(SDL_GL_CONTEXT_MINOR_VERSION, 0);
+    SDL_GL_SetAttribute(SDL_GL_CONTEXT_MINOR_VERSION, 2);
     SDL_GL_SetAttribute(SDL_GL_CONTEXT_PROFILE_MASK, SDL_GL_CONTEXT_PROFILE_ES);
 #else
     // Disabling compatibility profile
-    SDL_GL_SetAttribute(SDL_GL_CONTEXT_MAJOR_VERSION, 2);
-    SDL_GL_SetAttribute(SDL_GL_CONTEXT_MINOR_VERSION, 1);
+    SDL_GL_SetAttribute(SDL_GL_CONTEXT_MAJOR_VERSION, 3);
+    SDL_GL_SetAttribute(SDL_GL_CONTEXT_MINOR_VERSION, 3);
     SDL_GL_SetAttribute(SDL_GL_CONTEXT_PROFILE_MASK, SDL_GL_CONTEXT_PROFILE_CORE);
 #endif
 }
@@ -128,11 +133,39 @@ void enableGLDebugOutput() {
 #endif
 }
 
+namespace {
+void logMessage(const char* message, projectm_log_level severity, void* userData)
+{
+    switch (severity)
+    {
+        case PROJECTM_LOG_LEVEL_FATAL:
+        case PROJECTM_LOG_LEVEL_ERROR:
+            SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "%s\n", message);
+            break;
+        case PROJECTM_LOG_LEVEL_WARN:
+            SDL_LogWarn(SDL_LOG_CATEGORY_APPLICATION, "%s\n", message);
+            break;
+        case PROJECTM_LOG_LEVEL_TRACE:
+        case PROJECTM_LOG_LEVEL_DEBUG:
+            // redirect debug logs to info for now
+            //SDL_LogDebug(SDL_LOG_CATEGORY_APPLICATION, "%s\n", message);
+            //break;
+        case PROJECTM_LOG_LEVEL_NOTSET:
+        case PROJECTM_LOG_LEVEL_INFO:
+            SDL_LogInfo(SDL_LOG_CATEGORY_APPLICATION, "%s\n", message);
+            break;
+    }
+}
+}
+
 // initialize SDL, openGL, config
 projectMSDL *setupSDLApp() {
     projectMSDL *app;
     seedRand();
-        
+
+    projectm_set_log_callback(&logMessage, false, nullptr);
+    projectm_set_log_level(PROJECTM_LOG_LEVEL_DEBUG, false);
+
     if (!initLoopback())
 		{
 			SDL_Log("Failed to initialize audio loopback device.");
@@ -174,12 +207,6 @@ projectMSDL *setupSDLApp() {
 
     SDL_GLContext glCtx = SDL_GL_CreateContext(win);
 
-#if defined(_WIN32)
-	GLenum err = glewInit();
-#endif /** _WIN32 */
-
-    dumpOpenGLInfo();
-
     SDL_SetWindowTitle(win, "projectM");
 
     SDL_GL_MakeCurrent(win, glCtx);  // associate GL context with main window
@@ -188,6 +215,16 @@ projectMSDL *setupSDLApp() {
         SDL_GL_SetSwapInterval(1); // enable updates synchronized with vertical retrace
     }
 
+#ifdef USE_GLES
+    if (!gladLoadGLES2(reinterpret_cast<GLADloadfunc>(SDL_GL_GetProcAddress))) {
+        SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "Error loading GLAD for GLES2\n");
+    }
+#else
+    if (!gladLoadGL(reinterpret_cast<GLADloadfunc>(SDL_GL_GetProcAddress))) {
+        SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "Error loading GLAD for GL Core Profile\n");
+    }
+#endif
+
     std::string base_path = DATADIR_PATH;
     SDL_LogInfo(SDL_LOG_CATEGORY_APPLICATION, "Using data directory: %s\n", base_path.c_str());
 
@@ -248,7 +285,6 @@ projectMSDL *setupSDLApp() {
     app->fakeAudio  = true;
 #endif
 
-    enableGLDebugOutput();
     configureLoopback(app);
 
 #if !FAKE_AUDIO && !WASAPI_LOOPBACK