Delay GL3 context creation until first pugl configure event

Signed-off-by: falkTX <[email protected]>

Author: falkTX

dgl/src/Cairo.cpp

@@ -858,7 +858,7 @@ void Window::PrivateData::renderToPicture(const char*, const GraphicsContext&, u
 
 // --------------------------------------------------------------------------------------------------------------------
 
-void Window::PrivateData::createContext()
+void Window::PrivateData::createContextIfNeeded()
 {
 }
 

dgl/src/OpenGL2.cpp

@@ -549,7 +549,7 @@ template class ImageBaseSwitch<OpenGLImage>;
 
 // --------------------------------------------------------------------------------------------------------------------
 
-void Window::PrivateData::createContext()
+void Window::PrivateData::createContextIfNeeded()
 {
 }
 

dgl/src/OpenGL3.cpp

@@ -789,8 +789,13 @@ static void contextCreationFail(const GLuint program, const GLuint shader1, cons
     glDeleteShader(shader2);
 }
 
-void Window::PrivateData::createContext()
+void Window::PrivateData::createContextIfNeeded()
 {
+    OpenGL3GraphicsContext& gl3context = reinterpret_cast<OpenGL3GraphicsContext&>(graphicsContext);
+
+    if (gl3context.program != 0)
+        return;
+
 #if defined(DISTRHO_OS_WINDOWS)
 # if defined(__GNUC__) && (__GNUC__ >= 9)
 #  pragma GCC diagnostic push
@@ -837,7 +842,6 @@ DGL_EXT(PFNGLVERTEXATTRIBPOINTERPROC,      glVertexAttribPointer)
 # endif
 #endif
 
-    OpenGL3GraphicsContext& gl3context = reinterpret_cast<OpenGL3GraphicsContext&>(graphicsContext);
     int status;
 
     const GLuint fragment = glCreateShader(GL_FRAGMENT_SHADER);

dgl/src/Vulkan.cpp

@@ -273,7 +273,7 @@ void Window::PrivateData::renderToPicture(const char*, const GraphicsContext&, u
 
 // -----------------------------------------------------------------------
 
-void Window::PrivateData::createContext()
+void Window::PrivateData::createContextIfNeeded()
 {
 }
 

dgl/src/WindowPrivateData.cpp

@@ -323,10 +323,6 @@ bool Window::PrivateData::initPost()
         return false;
     }
 
-   #ifndef DPF_TEST_WINDOW_CPP
-    createContext();
-   #endif
-
     if (isEmbed)
     {
         appData->oneWindowShown();
@@ -653,6 +649,10 @@ void Window::PrivateData::onPuglConfigure(const uint width, const uint height)
 
     DGL_DBGp("PUGL: onReshape : %d %d\n", width, height);
 
+   #ifndef DPF_TEST_WINDOW_CPP
+    createContextIfNeeded();
+   #endif
+
     if (autoScaling)
     {
         const double scaleHorizontal = width  / static_cast<double>(minWidth);

dgl/src/WindowPrivateData.hpp

@@ -46,7 +46,7 @@ struct Window::PrivateData : IdleCallback {
 
     /** Reserved space for graphics context. */
     mutable uint8_t graphicsContext[sizeof(int) * 9];
-    void createContext();
+    void createContextIfNeeded();
     void destroyContext();
     void startContext();
     void endContext();