josh/jes-ruby
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

GLShader: fix return value of create_shader()

Browse Source
This commit is contained in:
Josh Holtrop 2014-08-05 20:07:43 -04:00
parent e600ec871f
commit 9824ef9373
1 changed files with 23 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
src/GLShader.cc
View File

@ -33,32 +33,30 @@ static GLuint create_shader(GLenum shader_type, const char *source, size_t size)
glCompileShader(id);
glGetShaderiv(id, GL_COMPILE_STATUS, &status);
if (status == GL_TRUE)
if (status != GL_TRUE)
{
return true;
}
GLint log_length;
glGetShaderiv(id, GL_INFO_LOG_LENGTH, &log_length);
if (log_length > 0)
{
char log[log_length + 1];
glGetShaderInfoLog(id, log_length, &log_length, log);
log[log_length] = '\0';
glDeleteShader(id);
rb_raise(rb_eRuntimeError,
"Error compiling %s shader:\n%s\n%s\n%s\n",
get_shader_type_name(shader_type),
"--------------------",
log,
"--------------------");
}
else
{
glDeleteShader(id);
rb_raise(rb_eRuntimeError,
"Error compiling %s shader",
get_shader_type_name(shader_type));
GLint log_length;
glGetShaderiv(id, GL_INFO_LOG_LENGTH, &log_length);
if (log_length > 0)
{
char log[log_length + 1];
glGetShaderInfoLog(id, log_length, &log_length, log);
log[log_length] = '\0';
glDeleteShader(id);
rb_raise(rb_eRuntimeError,
"Error compiling %s shader:\n%s\n%s\n%s\n",
get_shader_type_name(shader_type),
"--------------------",
log,
"--------------------");
}
else
{
glDeleteShader(id);
rb_raise(rb_eRuntimeError,
"Error compiling %s shader",
get_shader_type_name(shader_type));
}
}
}