_AssertOpenGlLoaderWorking(): log if OpenGl Loader not ready

pthom · Sep 17, 2024 · afe556c · afe556c
1 parent 50cab09
commit afe556c
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 8 deletions.
diff --git a/src/immvision/internal/gl/gl_provider.cpp b/src/immvision/internal/gl/gl_provider.cpp
@@ -24,6 +24,8 @@ namespace ImmVision_GlProvider
         if ((glGenTexturesAddress == 0) || (glDeleteTexturesAddress == 0))
         {
 #if defined(IMMVISION_USE_GLAD)
+            fprintf(stderr, "OpenGL Loader was not initialized yet! Trying to initialize it with current OpenGL settings...\n"
+                            "This may fail. If it does, please make sure to call OpenGL functions after the app is initialized.\n");
             gladLoadGL();
             glGenTexturesAddress = (size_t)glGenTextures;
             glDeleteTexturesAddress = (size_t)glDeleteTextures;
@@ -32,10 +34,7 @@ namespace ImmVision_GlProvider
 
         if ((glGenTexturesAddress == 0) || (glDeleteTexturesAddress == 0))
         {
-            const char* err_msg = "glGenTextures/glDeleteTexturesAddress address not initialized. Is your your OpenGL Loader initialized?";
-            std::cerr << err_msg;
-            assert(false);
-            throw std::runtime_error(err_msg);
+            IM_ASSERT(false && "OpenGL Loader was not initialized yet!");
         }
     }
 

diff --git a/src_all_in_one/immvision/immvision.cpp b/src_all_in_one/immvision/immvision.cpp
@@ -7143,6 +7143,8 @@ namespace ImmVision_GlProvider
         if ((glGenTexturesAddress == 0) || (glDeleteTexturesAddress == 0))
         {
 #if defined(IMMVISION_USE_GLAD)
+            fprintf(stderr, "OpenGL Loader was not initialized yet! Trying to initialize it with current OpenGL settings...\n"
+                            "This may fail. If it does, please make sure to call OpenGL functions after the app is initialized.\n");
             gladLoadGL();
             glGenTexturesAddress = (size_t)glGenTextures;
             glDeleteTexturesAddress = (size_t)glDeleteTextures;
@@ -7151,10 +7153,7 @@ namespace ImmVision_GlProvider
 
         if ((glGenTexturesAddress == 0) || (glDeleteTexturesAddress == 0))
         {
-            const char* err_msg = "glGenTextures/glDeleteTexturesAddress address not initialized. Is your your OpenGL Loader initialized?";
-            std::cerr << err_msg;
-            assert(false);
-            throw std::runtime_error(err_msg);
+            IM_ASSERT(false && "OpenGL Loader was not initialized yet!");
         }
     }