diff options
author | Lioncash <mathew1800@gmail.com> | 2019-05-25 05:32:01 +0200 |
---|---|---|
committer | Lioncash <mathew1800@gmail.com> | 2019-05-25 05:50:10 +0200 |
commit | 5a4564bd8eae9c8fef6da70009536ce50b5752d5 (patch) | |
tree | e2c03d0a39175e2310d9a2289b7cf9274a8fa95a | |
parent | Merge pull request #2513 from lioncash/string (diff) | |
download | yuzu-5a4564bd8eae9c8fef6da70009536ce50b5752d5.tar yuzu-5a4564bd8eae9c8fef6da70009536ce50b5752d5.tar.gz yuzu-5a4564bd8eae9c8fef6da70009536ce50b5752d5.tar.bz2 yuzu-5a4564bd8eae9c8fef6da70009536ce50b5752d5.tar.lz yuzu-5a4564bd8eae9c8fef6da70009536ce50b5752d5.tar.xz yuzu-5a4564bd8eae9c8fef6da70009536ce50b5752d5.tar.zst yuzu-5a4564bd8eae9c8fef6da70009536ce50b5752d5.zip |
-rw-r--r-- | src/video_core/renderer_opengl/utils.cpp | 16 | ||||
-rw-r--r-- | src/video_core/renderer_opengl/utils.h | 4 |
2 files changed, 10 insertions, 10 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())); } diff --git a/src/video_core/renderer_opengl/utils.h b/src/video_core/renderer_opengl/utils.h index aef45c9dc..b3e9fc499 100644 --- a/src/video_core/renderer_opengl/utils.h +++ b/src/video_core/renderer_opengl/utils.h @@ -4,7 +4,7 @@ #pragma once -#include <string> +#include <string_view> #include <vector> #include <glad/glad.h> #include "common/common_types.h" @@ -30,6 +30,6 @@ private: std::vector<GLsizeiptr> sizes; }; -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 = {}); } // namespace OpenGL
\ No newline at end of file |