diff options
| author | Lioncash <mathew1800@gmail.com> | 2014-08-17 15:17:04 -0400 |
|---|---|---|
| committer | Lioncash <mathew1800@gmail.com> | 2014-08-17 15:17:04 -0400 |
| commit | 15a3b30e27121ad89805b2e3ac8920d3a5e92960 (patch) | |
| tree | 1758da2240fd1f73bb5801f6f95e2b3a5c4a4bf4 /Source/Core/VideoBackends/OGL/GLUtil.cpp | |
| parent | e3e1869493d95ea88c68941642c785553b833fa1 (diff) | |
| parent | 7e3d1050f0f25f659dded00a9df787195b47e7b5 (diff) | |
Merge pull request #790 from lioncash/ogl-cleanup
Small OGL cleanup
Diffstat (limited to 'Source/Core/VideoBackends/OGL/GLUtil.cpp')
| -rw-r--r-- | Source/Core/VideoBackends/OGL/GLUtil.cpp | 34 |
1 files changed, 26 insertions, 8 deletions
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 |