# HG changeset patch
# User Matti Hamalainen <ccr@tnsp.org>
# Date 1576471606 -7200
# Node ID 701bef61dcf12f5d6457e51690976a9c1a5789e4
# Parent  1327ef5dc9fb4f311a3699b83ea37c03831c3cfc
Remove OpenGL fs/vs shader ids from DMModel, as they are not needed.

diff -r 1327ef5dc9fb -r 701bef61dcf1 dmglexts.h
--- a/dmglexts.h	Sun Dec 15 23:16:29 2019 +0200
+++ b/dmglexts.h	Mon Dec 16 06:46:46 2019 +0200
@@ -14,6 +14,7 @@
 DM_GLEXT_INIT(PFNGLCREATESHADERPROC, glCreateShader)
 DM_GLEXT_INIT(PFNGLATTACHSHADERPROC, glAttachShader)
 DM_GLEXT_INIT(PFNGLSHADERSOURCEPROC, glShaderSource)
+DM_GLEXT_INIT(PFNGLDELETESHADERPROC, glDeleteShader)
 
 DM_GLEXT_INIT(PFNGLUNIFORM1IPROC, glUniform1i)
 DM_GLEXT_INIT(PFNGLUNIFORM1FPROC, glUniform1f)
diff -r 1327ef5dc9fb -r 701bef61dcf1 dmglrender.cpp
--- a/dmglrender.cpp	Sun Dec 15 23:16:29 2019 +0200
+++ b/dmglrender.cpp	Mon Dec 16 06:46:46 2019 +0200
@@ -221,14 +221,18 @@
 {
     if (useShaders)
     {
-        if (!dmCompileShader(GL_FRAGMENT_SHADER, model.fragShaderStr, model.id_fs) ||
-            !dmCompileShader(GL_VERTEX_SHADER, model.vertShaderStr, model.id_vs))
+        GLuint id_fs, id_vs;
+
+        if (!dmCompileShader(GL_FRAGMENT_SHADER, model.fragShaderStr, id_fs) ||
+            !dmCompileShader(GL_VERTEX_SHADER, model.vertShaderStr, id_vs))
             return false;
 
         model.id_prog = glCreateProgram();
-        glAttachShader(model.id_prog, model.id_fs);
-        glAttachShader(model.id_prog, model.id_vs);
+        glAttachShader(model.id_prog, id_fs);
+        glAttachShader(model.id_prog, id_vs);
         glLinkProgram(model.id_prog);
+        glDeleteShader(id_fs);
+        glDeleteShader(id_vs);
     }
     return true;
 }
diff -r 1327ef5dc9fb -r 701bef61dcf1 dmscene.h
--- a/dmscene.h	Sun Dec 15 23:16:29 2019 +0200
+++ b/dmscene.h	Mon Dec 16 06:46:46 2019 +0200
@@ -152,7 +152,7 @@
     DMVector3 translate, scale, rotate;
     bool translateSet, scaleSet, rotateSet;
 
-    unsigned int id_prog, id_fs, id_vs;
+    unsigned int id_prog;
 
     std::string
         modelFile,