X-Git-Url: http://git.mutantstargoat.com?a=blobdiff_plain;f=src%2Fopengl%2Fshader-gl.cc;h=374673ff6232d5c2b013c85809e239e30e97733a;hb=8d1aef17df1bf15491ce4fd35242adcd58a9c411;hp=2b917543816cbbf32c5f07be1625f250d9249239;hpb=fcd6773bc770425ede4b47a84eef7cc78342542c;p=demo diff --git a/src/opengl/shader-gl.cc b/src/opengl/shader-gl.cc index 2b91754..374673f 100644 --- a/src/opengl/shader-gl.cc +++ b/src/opengl/shader-gl.cc @@ -132,7 +132,7 @@ bool ShaderProgramGL::link() bool ShaderProgramGL::use() const { - if(!is_linked) { //&& !link()) { + if(!is_linked) { return false; } @@ -240,9 +240,8 @@ void ShaderProgramGL::set_uniformf(int location, float x, float y, float z, floa void ShaderProgramGL::set_uniform_matrix(int location, const Mat4 &mat) { if(!use() || location == -1) { - fprintf(stderr, "FOO\n"); return; } - glUniformMatrix4fv(location, 1, GL_TRUE, (float *)&mat.m[0][0]); -} \ No newline at end of file + glUniformMatrix4fv(location, 1, GL_FALSE, mat[0]); +}