diff options
author | bunnei <bunneidev@gmail.com> | 2019-05-26 05:01:25 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-05-26 05:01:25 +0200 |
commit | 90c9d703baacddb6abdf464bfb9c9eb906bd78a8 (patch) | |
tree | 715dd83cf5a3dda1cf9ddbc960e00da1a9d6acc6 /src/video_core/renderer_opengl/utils.cpp | |
parent | Merge pull request #2509 from lioncash/aoc (diff) | |
parent | renderer_opengl/utils: Use a std::string_view with LabelGLObject() (diff) | |
download | yuzu-90c9d703baacddb6abdf464bfb9c9eb906bd78a8.tar yuzu-90c9d703baacddb6abdf464bfb9c9eb906bd78a8.tar.gz yuzu-90c9d703baacddb6abdf464bfb9c9eb906bd78a8.tar.bz2 yuzu-90c9d703baacddb6abdf464bfb9c9eb906bd78a8.tar.lz yuzu-90c9d703baacddb6abdf464bfb9c9eb906bd78a8.tar.xz yuzu-90c9d703baacddb6abdf464bfb9c9eb906bd78a8.tar.zst yuzu-90c9d703baacddb6abdf464bfb9c9eb906bd78a8.zip |
Diffstat (limited to '')
-rw-r--r-- | src/video_core/renderer_opengl/utils.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/video_core/renderer_opengl/utils.cpp b/src/video_core/renderer_opengl/utils.cpp index 84a987371..f23fc9f9d 100644 --- a/src/video_core/renderer_opengl/utils.cpp +++ b/src/video_core/renderer_opengl/utils.cpp @@ -38,27 +38,27 @@ void BindBuffersRangePushBuffer::Bind() const { sizes.data()); } -void LabelGLObject(GLenum identifier, GLuint handle, VAddr addr, std::string extra_info) { +void LabelGLObject(GLenum identifier, GLuint handle, VAddr addr, std::string_view extra_info) { if (!GLAD_GL_KHR_debug) { - return; // We don't need to throw an error as this is just for debugging + // We don't need to throw an error as this is just for debugging + return; } - const std::string nice_addr = fmt::format("0x{:016x}", addr); - std::string object_label; + std::string object_label; if (extra_info.empty()) { switch (identifier) { case GL_TEXTURE: - object_label = "Texture@" + nice_addr; + object_label = fmt::format("Texture@0x{:016X}", addr); break; case GL_PROGRAM: - object_label = "Shader@" + nice_addr; + object_label = fmt::format("Shader@0x{:016X}", addr); break; default: - object_label = fmt::format("Object(0x{:x})@{}", identifier, nice_addr); + object_label = fmt::format("Object(0x{:X})@0x{:016X}", identifier, addr); break; } } else { - object_label = extra_info + '@' + nice_addr; + object_label = fmt::format("{}@0x{:016X}", extra_info, addr); } glObjectLabel(identifier, handle, -1, static_cast<const GLchar*>(object_label.c_str())); } |