thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

OPENGL: Improve error handling for GL compiler by using dynamic allocated buffers.

Browse source
This commit is contained in:
Paweł Kołodziejski 2022-03-06 09:03:36 +01:00
parent 8fcfb7e585
commit 710dac8029
No known key found for this signature in database
GPG key ID: 0BDADC9E74440FF7
1 changed files with 15 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

24
graphics/opengl/shader.cpp
View file

@ -110,9 +110,11 @@ static GLuint createDirectShader(const char *shaderSource, GLenum shaderType, co
GLint status;
glGetShaderiv(shader, GL_COMPILE_STATUS, &status);
if (status != GL_TRUE) {
char buffer[512];
glGetShaderInfoLog(shader, 512, NULL, buffer);
error("Could not compile shader %s: %s", name.c_str(), buffer);
GLint logSize;
glGetShaderiv(shader, GL_INFO_LOG_LENGTH, &logSize);
GLchar *log = new GLchar[logSize];
glGetShaderInfoLog(shader, logSize, nullptr, log);
error("Could not compile shader %s: %s", name.c_str(), log);
}
return shader;
@ -135,9 +137,11 @@ static GLuint createCompatShader(const char *shaderSource, GLenum shaderType, co
GLint status;
glGetShaderiv(shader, GL_COMPILE_STATUS, &status);
if (status != GL_TRUE) {
char buffer[512];
glGetShaderInfoLog(shader, 512, NULL, buffer);
error("Could not compile shader %s: %s", name.c_str(), buffer);
GLint logSize;
glGetShaderiv(shader, GL_INFO_LOG_LENGTH, &logSize);
GLchar *log = new GLchar[logSize];
glGetShaderInfoLog(shader, logSize, nullptr, log);
error("Could not compile shader %s: %s", name.c_str(), log);
}
return shader;
@ -184,9 +188,11 @@ ShaderGL::ShaderGL(const Common::String &name, GLuint vertexShader, GLuint fragm
GLint status;
glGetProgramiv(shaderProgram, GL_LINK_STATUS, &status);
if (status != GL_TRUE) {
char buffer[512];
glGetProgramInfoLog(shaderProgram, 512, NULL, buffer);
error("Could not link shader %s: %s", name.c_str(), buffer);
GLint logSize;
glGetShaderiv(shaderProgram, GL_INFO_LOG_LENGTH, &logSize);
GLchar *log = new GLchar[logSize];
glGetShaderInfoLog(shaderProgram, logSize, nullptr, log);
error("Could not link shader %s: %s", name.c_str(), log);
}
glDetachShader(shaderProgram, vertexShader);