Properly clean program object in load shader function.

src/graphics/gl_headers.hpp

@@ -45,6 +45,7 @@ extern PFNGLCREATEPROGRAMPROC glCreateProgram;
 extern PFNGLATTACHSHADERPROC glAttachShader;
 extern PFNGLLINKPROGRAMPROC glLinkProgram;
 extern PFNGLUSEPROGRAMPROC glUseProgram;
+extern PFNGLDELETEPROGRAMPROC glDeleteProgram;
 extern PFNGLENABLEVERTEXATTRIBARRAYPROC glEnableVertexAttribArray;
 extern PFNGLDISABLEVERTEXATTRIBARRAYPROC glDisableVertexAttribArray;
 extern PFNGLGETUNIFORMLOCATIONPROC glGetUniformLocation;
@@ -104,6 +105,7 @@ extern PFNGLTEXSTORAGE3DPROC glTexStorage3D;
 extern PFNGLBINDIMAGETEXTUREPROC glBindImageTexture;
 extern PFNGLDISPATCHCOMPUTEPROC glDispatchCompute;
 extern PFNGLGENSAMPLERSPROC glGenSamplers;
+extern PFNGLDELETESAMPLERSPROC glDeleteSamplers;
 extern PFNGLBINDSAMPLERPROC glBindSampler;
 extern PFNGLSAMPLERPARAMETERFPROC glSamplerParameterf;
 extern PFNGLSAMPLERPARAMETERIPROC glSamplerParameteri;

src/graphics/glwrap.cpp

@@ -25,6 +25,7 @@ PFNGLCREATEPROGRAMPROC glCreateProgram;
 PFNGLATTACHSHADERPROC glAttachShader;
 PFNGLLINKPROGRAMPROC glLinkProgram;
 PFNGLUSEPROGRAMPROC glUseProgram;
+PFNGLDELETEPROGRAMPROC glDeleteProgram;
 PFNGLENABLEVERTEXATTRIBARRAYPROC glEnableVertexAttribArray;
 PFNGLDISABLEVERTEXATTRIBARRAYPROC glDisableVertexAttribArray;
 PFNGLGETUNIFORMLOCATIONPROC glGetUniformLocation;
@@ -85,6 +86,7 @@ PFNGLTEXSTORAGE3DPROC glTexStorage3D;
 PFNGLBINDIMAGETEXTUREPROC glBindImageTexture;
 PFNGLDISPATCHCOMPUTEPROC glDispatchCompute;
 PFNGLGENSAMPLERSPROC glGenSamplers;
+PFNGLDELETESAMPLERSPROC glDeleteSamplers;
 PFNGLBINDSAMPLERPROC glBindSampler;
 PFNGLSAMPLERPARAMETERFPROC glSamplerParameterf;
 PFNGLSAMPLERPARAMETERIPROC glSamplerParameteri;
@@ -200,6 +202,7 @@ void initGL()
     glAttachShader = (PFNGLATTACHSHADERPROC)IRR_OGL_LOAD_EXTENSION("glAttachShader");
     glLinkProgram = (PFNGLLINKPROGRAMPROC)IRR_OGL_LOAD_EXTENSION("glLinkProgram");
     glUseProgram = (PFNGLUSEPROGRAMPROC)IRR_OGL_LOAD_EXTENSION("glUseProgram");
+    glDeleteProgram = (PFNGLDELETEPROGRAMPROC)IRR_OGL_LOAD_EXTENSION("glDeleteProgram");
     glEnableVertexAttribArray = (PFNGLENABLEVERTEXATTRIBARRAYPROC)IRR_OGL_LOAD_EXTENSION("glEnableVertexAttribArray");
     glGetUniformLocation = (PFNGLGETUNIFORMLOCATIONPROC)IRR_OGL_LOAD_EXTENSION("glGetUniformLocation");
     glUniformMatrix4fv = (PFNGLUNIFORMMATRIX4FVPROC)IRR_OGL_LOAD_EXTENSION("glUniformMatrix4fv");
@@ -255,6 +258,7 @@ void initGL()
     glBindImageTexture = (PFNGLBINDIMAGETEXTUREPROC)IRR_OGL_LOAD_EXTENSION("glBindImageTexture");
     glDispatchCompute = (PFNGLDISPATCHCOMPUTEPROC)IRR_OGL_LOAD_EXTENSION("glDispatchCompute");
     glGenSamplers = (PFNGLGENSAMPLERSPROC)IRR_OGL_LOAD_EXTENSION("glGenSamplers");
+    glDeleteSamplers = (PFNGLDELETESAMPLERSPROC)IRR_OGL_LOAD_EXTENSION("glDeleteSamplers");
     glBindSampler = (PFNGLBINDSAMPLERPROC)IRR_OGL_LOAD_EXTENSION("glBindSampler");
     glSamplerParameterf = (PFNGLSAMPLERPARAMETERFPROC)IRR_OGL_LOAD_EXTENSION("glSamplerParameterf");
     glSamplerParameteri = (PFNGLSAMPLERPARAMETERIPROC)IRR_OGL_LOAD_EXTENSION("glSamplerParameteri");

src/graphics/shaders.cpp

@@ -103,6 +103,8 @@
 
 using namespace video;
 
+std::vector<void(*)()> CleanTable;
+
 Shaders::Shaders()
 {
     // Callbacks
@@ -397,6 +399,10 @@ void Shaders::loadShaders()
     }
 
     initGL();
+    // Clean alive shaders
+    for (unsigned i = 0; i < CleanTable.size(); i++)
+        CleanTable[i]();
+    CleanTable.clear();
     initQuadVBO();
     initQuadBuffer();
     initBillboardVBO();

src/graphics/shaders.hpp

@@ -124,6 +124,8 @@ struct UniformHelper
 
 void bypassUBO(GLuint Program);
 
+extern std::vector<void(*)()> CleanTable;
+
 template<typename T, typename... Args>
 class ShaderHelperSingleton : public Singleton<T>
 {
@@ -151,6 +153,16 @@ protected:
 public:
     GLuint Program;
 
+    ShaderHelperSingleton()
+    {
+        CleanTable.push_back(this->kill);
+    }
+
+    ~ShaderHelperSingleton()
+    {
+        glDeleteProgram(Program);
+    }
+
     void setUniforms(const Args & ... args) const
     {
         if (needsUBO())
@@ -409,6 +421,12 @@ public:
         else
             BindTexture<tp...>::exec(TextureUnits, args, 0);
     }
+
+    ~TextureRead()
+    {
+        for (unsigned i = 0; i < SamplersId.size(); i++)
+            glDeleteSamplers(1, &SamplersId[i]);
+    }
 };
 
 namespace MeshShader