From 4e8df93f4179a684b507d9c712b7e8121fc83119 Mon Sep 17 00:00:00 2001 From: Lioncash Date: Fri, 23 Oct 2020 14:41:30 -0400 Subject: Common: Migrate logging to fmt Continues the migration of our code over to the fmt logger. --- Source/Core/Common/GL/GLUtil.cpp | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) (limited to 'Source/Core/Common/GL/GLUtil.cpp') 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 -- cgit v1.2.3