Issue #53: Delete shader objects properly.

Author: alfonse

Tut 01 Hello Triangle/tut1.cpp

@@ -1,4 +1,5 @@
 
+#include <algorithm>
 #include <string>
 #include <vector>
 #include <stdio.h>
@@ -61,6 +62,9 @@ GLuint CreateProgram(const std::vector<GLuint> &shaderList)
 		delete[] strInfoLog;
 	}
 
+	for(size_t iLoop = 0; iLoop < shaderList.size(); iLoop++)
+		glDetachShader(program, shaderList[iLoop]);
+
 	return program;
 }
 
@@ -92,6 +96,8 @@ void InitializeProgram()
 	shaderList.push_back(CreateShader(GL_FRAGMENT_SHADER, strFragmentShader));
 
 	theProgram = CreateProgram(shaderList);
+
+	std::for_each(shaderList.begin(), shaderList.end(), glDeleteShader);
 }
 
 const float vertexPositions[] = {

framework/framework.cpp

@@ -1,4 +1,5 @@
 
+#include <algorithm>
 #include <string>
 #include <vector>
 #include <fstream>
@@ -49,6 +50,8 @@ namespace Framework
 			fprintf(stderr, e.what());
 			throw;
 		}
+
+		std::for_each(shaderList.begin(), shaderList.end(), glDeleteShader);
 	}
 
 	float DegToRad(float fAngDeg)

framework/framework.h

@@ -13,6 +13,8 @@ namespace Framework
 	GLuint CreateShader(GLenum eShaderType,
 		const std::string &strShaderFile, const std::string &strShaderName);
 	GLuint LoadShader(GLenum eShaderType, const std::string &strShaderFilename);
+
+	//Will *delete* the shaders given.
 	GLuint CreateProgram(const std::vector<GLuint> &shaderList);
 
 	//Will find a file with the given base filename, either in the local directory or the global one.