From d55a025ee2132a9f7078844a033908928180aa97 Mon Sep 17 00:00:00 2001
From: FunkyFr3sh <cc.red.alert.1@googlemail.com>
Date: Wed, 9 May 2018 05:41:58 +0200
Subject: [PATCH] detach shaders and delete program

---
 src/opengl.c |  7 ++++++-
 src/render.c | 13 +++++++------
 2 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/src/opengl.c b/src/opengl.c
index 401db73..0e2259d 100644
--- a/src/opengl.c
+++ b/src/opengl.c
@@ -130,7 +130,7 @@ BOOL OpenGL_ExtExists(char *ext)
 GLuint OpenGL_BuildProgram(const GLchar **vertSource, const GLchar **fragSource)
 {
     if (!glCreateShader || !glShaderSource || !glCompileShader || !glCreateProgram ||
-        !glAttachShader || !glLinkProgram || !glUseProgram)
+        !glAttachShader || !glLinkProgram || !glUseProgram || !glDetachShader)
         return 0;
 
     GLuint vertShader = glCreateShader(GL_VERTEX_SHADER);
@@ -178,6 +178,11 @@ GLuint OpenGL_BuildProgram(const GLchar **vertSource, const GLchar **fragSource)
 
         glLinkProgram(program);
 
+        glDetachShader(program, vertShader);
+        glDetachShader(program, fragShader);
+        glDeleteShader(vertShader);
+        glDeleteShader(fragShader);
+
         if (glGetProgramiv)
         {
             GLint isLinked = 0;
diff --git a/src/render.c b/src/render.c
index 81648d0..6aad191 100644
--- a/src/render.c
+++ b/src/render.c
@@ -46,10 +46,6 @@ const GLchar *PaletteFragShaderSrc =
     "}\n";
 
 
-GLuint SurfaceTexId, PaletteTexId;
-GLint SurfaceUniLoc, PaletteUniLoc;
-GLuint PaletteConvProgram;
-
 BOOL detect_cutscene();
 
 DWORD WINAPI render_main(void)
@@ -86,10 +82,10 @@ DWORD WINAPI render_main(void)
     int tex_size = tex_width * tex_height * sizeof(int);
     int *tex = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, tex_size);
 
-    if (!PaletteConvProgram)
-        PaletteConvProgram = OpenGL_BuildProgram(&PaletteVertShaderSrc, &PaletteFragShaderSrc);
+    GLuint PaletteConvProgram = OpenGL_BuildProgram(&PaletteVertShaderSrc, &PaletteFragShaderSrc);
 
     // primary surface texture
+    GLuint SurfaceTexId = 0;
     glGenTextures(1, &SurfaceTexId);
     glBindTexture(GL_TEXTURE_2D, SurfaceTexId);
     glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
@@ -101,6 +97,7 @@ DWORD WINAPI render_main(void)
         glTexImage2D(GL_TEXTURE_2D, 0, GL_RGB, tex_width, tex_height, 0, GL_RGBA, GL_UNSIGNED_BYTE, tex);
 
     // palette texture
+    GLuint PaletteTexId = 0;
     glGenTextures(1, &PaletteTexId);
     glBindTexture(GL_TEXTURE_2D, PaletteTexId);
     glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
@@ -115,6 +112,7 @@ DWORD WINAPI render_main(void)
 
     glBindTexture(GL_TEXTURE_2D, 0);
 
+    GLint SurfaceUniLoc = 0, PaletteUniLoc = 0;
     if (PaletteConvProgram)
     {
         glUseProgram(PaletteConvProgram);
@@ -237,6 +235,9 @@ DWORD WINAPI render_main(void)
     glDeleteTextures(1, &SurfaceTexId);
     glDeleteTextures(1, &PaletteTexId);
 
+    if (PaletteConvProgram && glDeleteProgram)
+        glDeleteProgram(PaletteConvProgram);
+
     wglMakeCurrent(NULL, NULL);
     wglDeleteContext(hRC);