|
|
|
@ -371,7 +371,6 @@ compileAndLinkShader(ShaderProgram* shader, |
|
|
|
glShaderSource(vs_id, 1, &vert_src, NULL); |
|
|
|
glShaderSource(vs_id, 1, &vert_src, NULL); |
|
|
|
glShaderSource(fs_id, 1, &frag_src, NULL); |
|
|
|
glShaderSource(fs_id, 1, &frag_src, NULL); |
|
|
|
|
|
|
|
|
|
|
|
// TODO: add a glError to string function in GLDebug.h
|
|
|
|
|
|
|
|
glCompileShader(vs_id); |
|
|
|
glCompileShader(vs_id); |
|
|
|
assert(glGetError() == GL_NO_ERROR); |
|
|
|
assert(glGetError() == GL_NO_ERROR); |
|
|
|
glCompileShader(fs_id); |
|
|
|
glCompileShader(fs_id); |
|
|
|
@ -385,6 +384,16 @@ compileAndLinkShader(ShaderProgram* shader, |
|
|
|
GLint is_linked = 0; |
|
|
|
GLint is_linked = 0; |
|
|
|
glGetProgramiv(shader->prog_id, GL_LINK_STATUS, &is_linked); |
|
|
|
glGetProgramiv(shader->prog_id, GL_LINK_STATUS, &is_linked); |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// NOTE: log shader linking errors
|
|
|
|
|
|
|
|
if (is_linked != GL_TRUE) { |
|
|
|
|
|
|
|
const u32 max_len = 512; |
|
|
|
|
|
|
|
char err_str[max_len]; |
|
|
|
|
|
|
|
i32 write_len; |
|
|
|
|
|
|
|
glGetProgramInfoLog( |
|
|
|
|
|
|
|
shader->prog_id, max_len, &write_len, &err_str[0]); |
|
|
|
|
|
|
|
LOGF(Error, "Info Log: %s\n", err_str); |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
return (is_linked == GL_TRUE); |
|
|
|
return (is_linked == GL_TRUE); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|