voxelcoreprojects/voxelcore
1
0
Fork 0
mirror of https://github.com/MihailRis/voxelcore.git synced 2026-10-11 22:11:51 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

Merge pull request #1029 from MihailRis/fix-shaders-compile-log

Browse source 
fix shader info log is truncated
This commit is contained in:
MihailRis 2026-10-10 17:45:24 +03:00 • committed by GitHub
commit 365854fdeb
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 12 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

20
src/graphics/core/Shader.cpp
View file

@ -113,8 +113,6 @@ static inline auto shader_deleter = [](GLuint* shader) {
delete shader; delete shader;
}; };
inline const uint GL_LOG_LEN = 512;
// shader should be deleted after shader program linking // shader should be deleted after shader program linking
using glshader = std::unique_ptr<GLuint, decltype(shader_deleter)>; using glshader = std::unique_ptr<GLuint, decltype(shader_deleter)>;
@ -125,12 +123,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 +172,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;