spacecruft
/
CelestiaContent
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix error reporting when shader linking failed

pull/3/head
Hleb Valoshka 2019-11-09 23:42:21 +03:00
parent 02f8bff902
commit add171b6fa
1 changed files with 25 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/celengine/glshader.cpp
View File

@ -381,13 +381,36 @@ GetInfoLog(GLuint obj)
GLint logLength = 0;
GLsizei charsWritten = 0;
glGetShaderiv(obj, GL_INFO_LOG_LENGTH, &logLength);
enum { Unknown, Shader, Program } kind;
if (glIsShader(obj))
{
kind = Shader;
}
else if (glIsProgram(obj))
{
kind = Program;
}
else
{
cerr << "Unknown object passed to GetInfoLog()!\n";
return string();
}
if (kind == Shader)
glGetShaderiv(obj, GL_INFO_LOG_LENGTH, &logLength);
else
glGetProgramiv(obj, GL_INFO_LOG_LENGTH, &logLength);
if (logLength <= 0)
return string();
auto* log = new char[logLength];
glGetShaderInfoLog(obj, logLength, &charsWritten, log);
if (kind == Shader)
glGetShaderInfoLog(obj, logLength, &charsWritten, log);
else
glGetProgramInfoLog(obj, logLength, &charsWritten, log);
string s(log, charsWritten);
delete[] log;