mctaylors/suyu
1
0
Fork 0
forked from suyu/suyu
Code Pull requests Activity

Merge pull request #2516 from lioncash/label

Browse source 
renderer_opengl/utils: Use a std::string_view with LabelGLObject()
This commit is contained in:
bunnei 2019-05-25 23:01:25 -04:00 committed by GitHub
commit 90c9d703ba
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/video_core/renderer_opengl/utils.cpp
View file

@ -38,27 +38,27 @@ void BindBuffersRangePushBuffer::Bind() const {
sizes.data()); 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) { 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()) { if (extra_info.empty()) {
switch (identifier) { switch (identifier) {
case GL_TEXTURE: case GL_TEXTURE:
object_label = "Texture@" + nice_addr; object_label = fmt::format("Texture@0x{:016X}", addr);
break; break;
case GL_PROGRAM: case GL_PROGRAM:
object_label = "Shader@" + nice_addr; object_label = fmt::format("Shader@0x{:016X}", addr);
break; break;
default: default:
object_label = fmt::format("Object(0x{:x})@{}", identifier, nice_addr); object_label = fmt::format("Object(0x{:X})@0x{:016X}", identifier, addr);
break; break;
} }
} else { } 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())); glObjectLabel(identifier, handle, -1, static_cast<const GLchar*>(object_label.c_str()));
} }

4
src/video_core/renderer_opengl/utils.h
View file

@ -4,7 +4,7 @@
#pragma once #pragma once
#include <string> #include <string_view>
#include <vector> #include <vector>
#include <glad/glad.h> #include <glad/glad.h>
#include "common/common_types.h" #include "common/common_types.h"
@ -30,6 +30,6 @@ private:
std::vector<GLsizeiptr> sizes; 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 } // namespace OpenGL