mirror of
https://github.com/MihailRis/voxelcore.git
synced 2026-10-12 14:31:50 +00:00
fix shader info log is truncated
This commit is contained in:
parent
8ce3b6dc23
commit
bf98174e15
1 changed files with 12 additions and 6 deletions
|
|
@ -125,12 +125,14 @@ glshader compile_shader(GLenum type, const GLchar* source, const std::string& fi
|
||||||
glCompileShader(shader);
|
glCompileShader(shader);
|
||||||
glGetShaderiv(shader, GL_COMPILE_STATUS, &success);
|
glGetShaderiv(shader, GL_COMPILE_STATUS, &success);
|
||||||
if (!success) {
|
if (!success) {
|
||||||
GLchar infoLog[GL_LOG_LEN];
|
GLint infoLogLength;
|
||||||
glGetShaderInfoLog(shader, GL_LOG_LEN, nullptr, infoLog);
|
glGetShaderiv(shader, GL_INFO_LOG_LENGTH, &infoLogLength);
|
||||||
|
auto infoLog = std::make_unique<GLchar[]>(infoLogLength);
|
||||||
|
glGetShaderInfoLog(shader, infoLogLength, nullptr, infoLog.get());
|
||||||
glDeleteShader(shader);
|
glDeleteShader(shader);
|
||||||
throw std::runtime_error(
|
throw std::runtime_error(
|
||||||
"vertex shader compilation failed (" + file + "):\n" +
|
"vertex shader compilation failed (" + file + "):\n" +
|
||||||
std::string(infoLog)
|
std::string(infoLog.get(), infoLogLength)
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
return glshader(new GLuint(shader), shader_deleter); //-V508
|
return glshader(new GLuint(shader), shader_deleter); //-V508
|
||||||
|
|
@ -172,10 +174,14 @@ static GLuint compile_program(
|
||||||
glGetProgramiv(program, GL_LINK_STATUS, &success);
|
glGetProgramiv(program, GL_LINK_STATUS, &success);
|
||||||
|
|
||||||
if (!success) {
|
if (!success) {
|
||||||
GLchar infoLog[GL_LOG_LEN];
|
GLint infoLogLength;
|
||||||
glGetProgramInfoLog(program, GL_LOG_LEN, nullptr, infoLog);
|
glGetProgramiv(program, GL_INFO_LOG_LENGTH, &infoLogLength);
|
||||||
|
auto infoLog = std::make_unique<GLchar[]>(infoLogLength);
|
||||||
|
glGetProgramInfoLog(program, infoLogLength, nullptr, infoLog.get());
|
||||||
|
glDeleteProgram(program);
|
||||||
throw std::runtime_error(
|
throw std::runtime_error(
|
||||||
"shader program linking failed:\n" + std::string(infoLog)
|
"shader program linking failed:\n" +
|
||||||
|
std::string(infoLog.get(), infoLogLength)
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
return program;
|
return program;
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue