Refactor struct part 2.

src/display/shader.c

@@ -7,12 +7,13 @@
 
 #include "shader.h"
 
-shader_t * shaderCompile(char *vertexShaderSource, char* fragmentShaderSource) {
+void shaderCompile(shader_t *shader,
+  char *vertexShaderSource, char* fragmentShaderSource
+) {
   int isSuccess, maxLength;
   char *error;
   GLuint shaderVertex, shaderFragment, shaderProgram;
   
-  
   // Load the vertex shader first
   shaderVertex = glCreateShader(GL_VERTEX_SHADER);
   glShaderSource(shaderVertex, 1, &vertexShaderSource, 0);
@@ -64,21 +65,14 @@ shader_t * shaderCompile(char *vertexShaderSource, char* fragmentShaderSource) {
   }
 
   // Everything is okay, let's create the encapsulated shader.
-  shader_t *shader = malloc(sizeof(shader_t));
-  if(shader == NULL) {
-    glDeleteProgram(shaderProgram);
-    glDeleteShader(shaderVertex);
-    glDeleteShader(shaderFragment);
-    return NULL;
-  }
   shader->shaderVertex = shaderVertex;
   shader->shaderFrag = shaderFragment;
   shader->shaderProgram = shaderProgram;
 
-  shader->uniProj = glGetUniformLocation(shader->shaderProgram, SHADER_UNI_PROJ);
-  shader->uniView = glGetUniformLocation(shader->shaderProgram, SHADER_UNI_VIEW);
-  shader->uniText = glGetUniformLocation(shader->shaderProgram, SHADER_UNI_TEXT);
-  shader->uniModl = glGetUniformLocation(shader->shaderProgram, SHADER_UNI_MODL);
+  shader->uniProj = glGetUniformLocation(shader->shaderProgram,SHADER_UNI_PROJ);
+  shader->uniView = glGetUniformLocation(shader->shaderProgram,SHADER_UNI_VIEW);
+  shader->uniText = glGetUniformLocation(shader->shaderProgram,SHADER_UNI_TEXT);
+  shader->uniModl = glGetUniformLocation(shader->shaderProgram,SHADER_UNI_MODL);
 
   // Bind the shader
   shaderUse(shader);
@@ -90,12 +84,10 @@ shader_t * shaderCompile(char *vertexShaderSource, char* fragmentShaderSource) {
   return shader;
 }
 
-bool shaderDispose(shader_t *shader) {
+void shaderDispose(shader_t *shader) {
   glDeleteProgram(shader->shaderProgram);
   glDeleteShader(shader->shaderVertex);
   glDeleteShader(shader->shaderFrag);
-  free(shader);
-  return true;
 }
 
 void shaderUse(shader_t *shader) {