From 960b54670ca3c2625eaaaee725e093b3f03251c5 Mon Sep 17 00:00:00 2001 From: Lioncash Date: Fri, 15 Aug 2014 14:09:53 -0400 Subject: OGL: Fix brace and body placements Also got rid of void argument specifiers. These are a carryover from C. --- Source/Core/VideoBackends/OGL/GLUtil.cpp | 34 ++++++++++++++++++++++++-------- 1 file changed, 26 insertions(+), 8 deletions(-) (limited to 'Source/Core/VideoBackends/OGL/GLUtil.cpp') diff --git a/Source/Core/VideoBackends/OGL/GLUtil.cpp b/Source/Core/VideoBackends/OGL/GLUtil.cpp index ac3894e42d..e0eb748019 100644 --- a/Source/Core/VideoBackends/OGL/GLUtil.cpp +++ b/Source/Core/VideoBackends/OGL/GLUtil.cpp @@ -54,13 +54,20 @@ GLuint OpenGL_CompileProgram(const char* vertexShader, const char* fragmentShade GLsizei stringBufferUsage = 0; glGetShaderiv(vertexShaderID, GL_COMPILE_STATUS, &Result); glGetShaderInfoLog(vertexShaderID, 1024, &stringBufferUsage, stringBuffer); - if (Result && stringBufferUsage) { + + if (Result && stringBufferUsage) + { ERROR_LOG(VIDEO, "GLSL vertex shader warnings:\n%s%s", stringBuffer, vertexShader); - } else if (!Result) { + } + else if (!Result) + { ERROR_LOG(VIDEO, "GLSL vertex shader error:\n%s%s", stringBuffer, vertexShader); - } else { + } + else + { DEBUG_LOG(VIDEO, "GLSL vertex shader compiled:\n%s", vertexShader); } + bool shader_errors = !Result; #endif @@ -70,13 +77,20 @@ GLuint OpenGL_CompileProgram(const char* vertexShader, const char* fragmentShade #if defined(_DEBUG) || defined(DEBUGFAST) || defined(DEBUG_GLSL) glGetShaderiv(fragmentShaderID, GL_COMPILE_STATUS, &Result); glGetShaderInfoLog(fragmentShaderID, 1024, &stringBufferUsage, stringBuffer); - if (Result && stringBufferUsage) { + + if (Result && stringBufferUsage) + { ERROR_LOG(VIDEO, "GLSL fragment shader warnings:\n%s%s", stringBuffer, fragmentShader); - } else if (!Result) { + } + else if (!Result) + { ERROR_LOG(VIDEO, "GLSL fragment shader error:\n%s%s", stringBuffer, fragmentShader); - } else { + } + else + { DEBUG_LOG(VIDEO, "GLSL fragment shader compiled:\n%s", fragmentShader); } + shader_errors |= !Result; #endif @@ -87,9 +101,13 @@ GLuint OpenGL_CompileProgram(const char* vertexShader, const char* fragmentShade #if defined(_DEBUG) || defined(DEBUGFAST) || defined(DEBUG_GLSL) glGetProgramiv(programID, GL_LINK_STATUS, &Result); glGetProgramInfoLog(programID, 1024, &stringBufferUsage, stringBuffer); - if (Result && stringBufferUsage) { + + if (Result && stringBufferUsage) + { ERROR_LOG(VIDEO, "GLSL linker warnings:\n%s%s%s", stringBuffer, vertexShader, fragmentShader); - } else if (!Result && !shader_errors) { + } + else if (!Result && !shader_errors) + { ERROR_LOG(VIDEO, "GLSL linker error:\n%s%s%s", stringBuffer, vertexShader, fragmentShader); } #endif -- cgit v1.2.3