From 969999f9858043d2a2053f93209f878a3eb5a02a Mon Sep 17 00:00:00 2001 From: Dan Goodliffe Date: Sat, 3 Aug 2024 12:23:54 +0100 Subject: Split CheckShaderError into shader/program versions They're similar, but need splitting for better diagnostics --- gfx/gl/shader.cpp | 18 ++++-------------- 1 file changed, 4 insertions(+), 14 deletions(-) (limited to 'gfx/gl/shader.cpp') diff --git a/gfx/gl/shader.cpp b/gfx/gl/shader.cpp index 0bc127a..47d36d0 100644 --- a/gfx/gl/shader.cpp +++ b/gfx/gl/shader.cpp @@ -46,30 +46,20 @@ Shader::compile() const } glCompileShader(shader); - CheckShaderError(shader, GL_COMPILE_STATUS, false, "Error compiling shader!"); + checkShaderError(shader, GL_COMPILE_STATUS, "Error compiling shader!"); return shader; } void -Shader::CheckShaderError(GLuint shader, GLuint flag, bool isProgram, std::string_view errorMessage) +Shader::checkShaderError(GLuint shader, GLuint flag, std::string_view errorMessage) const { GLint success = 0; - if (isProgram) { - glGetProgramiv(shader, flag, &success); - } - else { - glGetShaderiv(shader, flag, &success); - } + glGetShaderiv(shader, flag, &success); if (success == GL_FALSE) { std::array error {}; - if (isProgram) { - glGetProgramInfoLog(shader, error.size(), nullptr, error.data()); - } - else { - glGetShaderInfoLog(shader, error.size(), nullptr, error.data()); - } + glGetShaderInfoLog(shader, error.size(), nullptr, error.data()); throw std::runtime_error {std::format("{}: '{}'", errorMessage, error.data())}; } -- cgit v1.2.3