backup

[demo] / src / shader.cc

diff --git a/src/shader.cc b/src/shader.cc
index f8f1c15..39fa0de 100644 (file)
--- a/src/shader.cc
+++ b/src/shader.cc
@@ -24,7 +24,7 @@ bool Shader::load(const char *fname, SType type)
        unsigned int fsz;
 
        if(!(fp = fopen(fname, "rb"))) {
-               fprintf(stderr, "Failed to open shader: %s.\n", fname);
+               fprintf(stderr, "Failed to open shader: %s\n", fname);
 
                return false;
        }
@@ -32,16 +32,10 @@ bool Shader::load(const char *fname, SType type)
        fsz = ftell(fp);
        rewind(fp);
 
-       char *buf;
-       if(!(buf = new char[fsz + 1])) {
-               fprintf(stderr, "Failed to allocate %u buffers.\n", fsz + 1);
-               fclose(fp);
-
-               return false;
-       }
+       char *buf = new char[fsz + 1];
 
        if(fread(buf, 1, fsz, fp) < fsz) {
-               fprintf(stderr, "Failed to read shader: %s.\n", fname);
+               fprintf(stderr, "Failed to read shader: %s\n", fname);
                delete buf;
                fclose(fp);
 
@@ -54,6 +48,11 @@ bool Shader::load(const char *fname, SType type)
        return true;
 }
 
+SType Shader::get_type()
+{
+       return type;
+}
+
 ShaderProgram::ShaderProgram()
 {
        int len = sizeof shaders / sizeof *shaders;
@@ -69,4 +68,4 @@ ShaderProgram::~ShaderProgram()
        for(int i=0; i<len; ++i) {
                delete shaders[i];
        }
-}
\ No newline at end of file
+}