X-Git-Url: http://git.mutantstargoat.com?a=blobdiff_plain;f=src%2Fshader.cc;h=2e530ecff9dd667b4420e4f759b388018fbeb378;hb=HEAD;hp=39fa0de9e6ce6484760d6f4894f1c655e8b1dfdf;hpb=855c42d8e50fff743fd7b1be5e91cb0db18def77;p=demo

diff --git a/src/shader.cc b/src/shader.cc
index 39fa0de..2e530ec 100644
--- a/src/shader.cc
+++ b/src/shader.cc
@@ -1,5 +1,6 @@
 #include <assert.h>
 #include <stdio.h>
+
 #include "shader.h"
 
 Shader::Shader() {}
@@ -8,7 +9,7 @@ Shader::~Shader()
 	type = SDR_UNKNOWN;
 }
 
-bool Shader::load(const char *fname, SType type)
+bool Shader::load(const char *fname, ShaderType type)
 {
 	switch(type) {
 	case SDR_VERTEX:
@@ -25,7 +26,6 @@ bool Shader::load(const char *fname, SType type)
 
 	if(!(fp = fopen(fname, "rb"))) {
 		fprintf(stderr, "Failed to open shader: %s\n", fname);
-
 		return false;
 	}
 	fseek(fp, 0, SEEK_END);
@@ -44,11 +44,10 @@ bool Shader::load(const char *fname, SType type)
 	buf[fsz] = '\0';
 	fclose(fp);
 
-	create(buf, fsz, fname);
-	return true;
+	return create(buf, fsz, fname);
 }
 
-SType Shader::get_type()
+ShaderType Shader::get_type()
 {
 	return type;
 }