diff --git a/src/video/opengl.cpp b/src/video/opengl.cpp --- a/src/video/opengl.cpp +++ b/src/video/opengl.cpp @@ -428,7 +428,7 @@ void APIENTRY DebugOutputCallback(GLenum case GL_DEBUG_TYPE_PORTABILITY: type_str = "Portability"; break; } - DEBUG(driver, 6, "OpenGL: %s (%s) - %s", type_str, severity_str, message); + Debug(driver, 6, "OpenGL: {} ({}) - {}", type_str, severity_str, message); } /** Enable OpenGL debug messages if supported. */ @@ -536,7 +536,7 @@ const char *OpenGLBackend::Init(const Di if (ver == nullptr || vend == nullptr || renderer == nullptr) return "OpenGL not supported"; - DEBUG(driver, 1, "OpenGL driver: %s - %s (%s)", vend, renderer, ver); + Debug(driver, 1, "OpenGL driver: {} - {} ({})", vend, renderer, ver); #ifndef GL_ALLOW_SOFTWARE_RENDERER /* Don't use MESA software rendering backends as they are slower than @@ -584,10 +584,10 @@ const char *OpenGLBackend::Init(const Di #endif if (this->persistent_mapping_supported && !BindPersistentBufferExtensions()) { - DEBUG(driver, 1, "OpenGL claims to support persistent buffer mapping but doesn't export all functions, not using persistent mapping."); + Debug(driver, 1, "OpenGL claims to support persistent buffer mapping but doesn't export all functions, not using persistent mapping."); this->persistent_mapping_supported = false; } - if (this->persistent_mapping_supported) DEBUG(driver, 3, "OpenGL: Using persistent buffer mapping"); + if (this->persistent_mapping_supported) Debug(driver, 3, "OpenGL: Using persistent buffer mapping"); /* Check maximum texture size against screen resolution. */ GLint max_tex_size = 0; @@ -599,7 +599,7 @@ const char *OpenGLBackend::Init(const Di _glGetIntegerv(GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS, &max_tex_units); if (max_tex_units < 4) return "Not enough simultaneous textures supported"; - DEBUG(driver, 2, "OpenGL shading language version: %s, texture units = %d", (const char *)_glGetString(GL_SHADING_LANGUAGE_VERSION), (int)max_tex_units); + Debug(driver, 2, "OpenGL shading language version: {}, texture units = {}", (const char *)_glGetString(GL_SHADING_LANGUAGE_VERSION), (int)max_tex_units); if (!this->InitShaders()) return "Failed to initialize shaders"; @@ -761,7 +761,7 @@ static bool VerifyShader(GLuint shader) _glGetShaderiv(shader, GL_INFO_LOG_LENGTH, &log_len); if (log_len > 0) { _glGetShaderInfoLog(shader, log_len, nullptr, log_buf.Allocate(log_len)); - DEBUG(driver, result != GL_TRUE ? 0 : 2, "%s", log_buf.GetBuffer()); // Always print on failure. + Debug(driver, result != GL_TRUE ? 0 : 2, "{}", log_buf.GetBuffer()); // Always print on failure. } return result == GL_TRUE; @@ -784,7 +784,7 @@ static bool VerifyProgram(GLuint program _glGetProgramiv(program, GL_INFO_LOG_LENGTH, &log_len); if (log_len > 0) { _glGetProgramInfoLog(program, log_len, nullptr, log_buf.Allocate(log_len)); - DEBUG(driver, result != GL_TRUE ? 0 : 2, "%s", log_buf.GetBuffer()); // Always print on failure. + Debug(driver, result != GL_TRUE ? 0 : 2, "{}", log_buf.GetBuffer()); // Always print on failure. } return result == GL_TRUE;