diff options
| author | Léo Lam <leo@leolam.fr> | 2020-10-26 19:01:26 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-10-26 19:01:26 +0100 |
| commit | 07e6d008bd6c34b8af07247935bc8aa6abc596df (patch) | |
| tree | e5084fc3c855e85bcff41046533ec765135e3656 /Source/Core/Common/GL/GLUtil.cpp | |
| parent | 7f66de062c3c0b7d0f1e49682f8663dc978e76fc (diff) | |
| parent | 4e8df93f4179a684b507d9c712b7e8121fc83119 (diff) | |
Merge pull request #9187 from lioncash/commonlog
Common: Migrate logging to fmt
Diffstat (limited to 'Source/Core/Common/GL/GLUtil.cpp')
| -rw-r--r-- | Source/Core/Common/GL/GLUtil.cpp | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/Source/Core/Common/GL/GLUtil.cpp b/Source/Core/Common/GL/GLUtil.cpp index ba0f76b9b0..06cb328001 100644 --- a/Source/Core/Common/GL/GLUtil.cpp +++ b/Source/Core/Common/GL/GLUtil.cpp @@ -31,15 +31,15 @@ GLuint CompileProgram(const std::string& vertexShader, const std::string& fragme if (Result && stringBufferUsage) { - ERROR_LOG(VIDEO, "GLSL vertex shader warnings:\n%s%s", stringBuffer, vertexShader.c_str()); + ERROR_LOG_FMT(VIDEO, "GLSL vertex shader warnings:\n{}{}", stringBuffer, vertexShader); } else if (!Result) { - ERROR_LOG(VIDEO, "GLSL vertex shader error:\n%s%s", stringBuffer, vertexShader.c_str()); + ERROR_LOG_FMT(VIDEO, "GLSL vertex shader error:\n{}{}", stringBuffer, vertexShader); } else { - INFO_LOG(VIDEO, "GLSL vertex shader compiled:\n%s", vertexShader.c_str()); + INFO_LOG_FMT(VIDEO, "GLSL vertex shader compiled:\n{}", vertexShader); } bool shader_errors = !Result; @@ -55,15 +55,15 @@ GLuint CompileProgram(const std::string& vertexShader, const std::string& fragme if (Result && stringBufferUsage) { - ERROR_LOG(VIDEO, "GLSL fragment shader warnings:\n%s%s", stringBuffer, fragmentShader.c_str()); + ERROR_LOG_FMT(VIDEO, "GLSL fragment shader warnings:\n{}{}", stringBuffer, fragmentShader); } else if (!Result) { - ERROR_LOG(VIDEO, "GLSL fragment shader error:\n%s%s", stringBuffer, fragmentShader.c_str()); + ERROR_LOG_FMT(VIDEO, "GLSL fragment shader error:\n{}{}", stringBuffer, fragmentShader); } else { - INFO_LOG(VIDEO, "GLSL fragment shader compiled:\n%s", fragmentShader.c_str()); + INFO_LOG_FMT(VIDEO, "GLSL fragment shader compiled:\n{}", fragmentShader); } shader_errors |= !Result; @@ -79,13 +79,12 @@ GLuint CompileProgram(const std::string& vertexShader, const std::string& fragme if (Result && stringBufferUsage) { - ERROR_LOG(VIDEO, "GLSL linker warnings:\n%s%s%s", stringBuffer, vertexShader.c_str(), - fragmentShader.c_str()); + ERROR_LOG_FMT(VIDEO, "GLSL linker warnings:\n{}{}{}", stringBuffer, vertexShader, + fragmentShader); } else if (!Result && !shader_errors) { - ERROR_LOG(VIDEO, "GLSL linker error:\n%s%s%s", stringBuffer, vertexShader.c_str(), - fragmentShader.c_str()); + ERROR_LOG_FMT(VIDEO, "GLSL linker error:\n{}{}{}", stringBuffer, vertexShader, fragmentShader); } #endif |