From d78752800f202c657c8892c59dacf8641c7fc7a9 Mon Sep 17 00:00:00 2001 From: Joey de Vries Date: Sun, 28 May 2017 08:56:30 +0200 Subject: [PATCH] Shader tab fix. --- includes/learnopengl/shader.h | 40 ++++++++++++++++----------------- includes/learnopengl/shader_m.h | 40 ++++++++++++++++----------------- includes/learnopengl/shader_s.h | 40 ++++++++++++++++----------------- 3 files changed, 60 insertions(+), 60 deletions(-) diff --git a/includes/learnopengl/shader.h b/includes/learnopengl/shader.h index 1fd6267..97b6420 100644 --- a/includes/learnopengl/shader.h +++ b/includes/learnopengl/shader.h @@ -167,28 +167,28 @@ private: // utility function for checking shader compilation/linking errors. // ------------------------------------------------------------------------ void checkCompileErrors(GLuint shader, std::string type) - { - GLint success; - GLchar infoLog[1024]; - if(type != "PROGRAM") - { - glGetShaderiv(shader, GL_COMPILE_STATUS, &success); - if(!success) - { - glGetShaderInfoLog(shader, 1024, NULL, infoLog); + { + GLint success; + GLchar infoLog[1024]; + if(type != "PROGRAM") + { + glGetShaderiv(shader, GL_COMPILE_STATUS, &success); + if(!success) + { + glGetShaderInfoLog(shader, 1024, NULL, infoLog); std::cout << "ERROR::SHADER_COMPILATION_ERROR of type: " << type << "\n" << infoLog << "\n -- --------------------------------------------------- -- " << std::endl; - } - } - else - { - glGetProgramiv(shader, GL_LINK_STATUS, &success); - if(!success) - { - glGetProgramInfoLog(shader, 1024, NULL, infoLog); + } + } + else + { + glGetProgramiv(shader, GL_LINK_STATUS, &success); + if(!success) + { + glGetProgramInfoLog(shader, 1024, NULL, infoLog); std::cout << "ERROR::PROGRAM_LINKING_ERROR of type: " << type << "\n" << infoLog << "\n -- --------------------------------------------------- -- " << std::endl; - } - } - } + } + } + } }; #endif \ No newline at end of file diff --git a/includes/learnopengl/shader_m.h b/includes/learnopengl/shader_m.h index f1ad126..88bdcba 100644 --- a/includes/learnopengl/shader_m.h +++ b/includes/learnopengl/shader_m.h @@ -141,28 +141,28 @@ private: // utility function for checking shader compilation/linking errors. // ------------------------------------------------------------------------ void checkCompileErrors(GLuint shader, std::string type) - { - GLint success; - GLchar infoLog[1024]; - if(type != "PROGRAM") - { - glGetShaderiv(shader, GL_COMPILE_STATUS, &success); - if(!success) - { - glGetShaderInfoLog(shader, 1024, NULL, infoLog); + { + GLint success; + GLchar infoLog[1024]; + if (type != "PROGRAM") + { + glGetShaderiv(shader, GL_COMPILE_STATUS, &success); + if (!success) + { + glGetShaderInfoLog(shader, 1024, NULL, infoLog); std::cout << "ERROR::SHADER_COMPILATION_ERROR of type: " << type << "\n" << infoLog << "\n -- --------------------------------------------------- -- " << std::endl; - } - } - else - { - glGetProgramiv(shader, GL_LINK_STATUS, &success); - if(!success) - { - glGetProgramInfoLog(shader, 1024, NULL, infoLog); + } + } + else + { + glGetProgramiv(shader, GL_LINK_STATUS, &success); + if (!success) + { + glGetProgramInfoLog(shader, 1024, NULL, infoLog); std::cout << "ERROR::PROGRAM_LINKING_ERROR of type: " << type << "\n" << infoLog << "\n -- --------------------------------------------------- -- " << std::endl; - } - } - } + } + } + } }; #endif \ No newline at end of file diff --git a/includes/learnopengl/shader_s.h b/includes/learnopengl/shader_s.h index 8c6cf32..44d6f68 100644 --- a/includes/learnopengl/shader_s.h +++ b/includes/learnopengl/shader_s.h @@ -97,28 +97,28 @@ private: // utility function for checking shader compilation/linking errors. // ------------------------------------------------------------------------ void checkCompileErrors(GLuint shader, std::string type) - { - GLint success; - GLchar infoLog[1024]; - if(type != "PROGRAM") - { - glGetShaderiv(shader, GL_COMPILE_STATUS, &success); - if(!success) - { - glGetShaderInfoLog(shader, 1024, NULL, infoLog); + { + GLint success; + GLchar infoLog[1024]; + if (type != "PROGRAM") + { + glGetShaderiv(shader, GL_COMPILE_STATUS, &success); + if (!success) + { + glGetShaderInfoLog(shader, 1024, NULL, infoLog); std::cout << "ERROR::SHADER_COMPILATION_ERROR of type: " << type << "\n" << infoLog << "\n -- --------------------------------------------------- -- " << std::endl; - } - } - else - { - glGetProgramiv(shader, GL_LINK_STATUS, &success); - if(!success) - { - glGetProgramInfoLog(shader, 1024, NULL, infoLog); + } + } + else + { + glGetProgramiv(shader, GL_LINK_STATUS, &success); + if (!success) + { + glGetProgramInfoLog(shader, 1024, NULL, infoLog); std::cout << "ERROR::PROGRAM_LINKING_ERROR of type: " << type << "\n" << infoLog << "\n -- --------------------------------------------------- -- " << std::endl; - } - } - } + } + } + } }; #endif