diff options
| author |  ReinUsesLisp | 2018-10-06 23:13:46 -0300 |
|---|---|---|
| committer | ReinUsesLisp | 2018-10-07 17:27:49 -0300 |
| commit | 4d0c6824680570820101ec19f9fb8e44a8fd68e0 (patch) | |
| tree | 703f2fc47ab3ae12c3878d19dc6735ed69481780 | |
| parent | Merge pull request #1396 from DarkLordZach/packed-updates (diff) | |
| download | yuzu-4d0c6824680570820101ec19f9fb8e44a8fd68e0.tar.gz yuzu-4d0c6824680570820101ec19f9fb8e44a8fd68e0.tar.xz yuzu-4d0c6824680570820101ec19f9fb8e44a8fd68e0.zip | |
video_core: Allow LabelGLObject to use extra info on any object
Diffstat (limited to '')
| -rw-r--r-- | src/video_core/utils.h | 24 |
1 files changed, 14 insertions, 10 deletions
diff --git a/src/video_core/utils.h b/src/video_core/utils.h index 681919ae3..237cc1307 100644 --- a/src/video_core/utils.h +++ b/src/video_core/utils.h | |||
| @@ -169,16 +169,20 @@ static void LabelGLObject(GLenum identifier, GLuint handle, VAddr addr, | |||
| 169 | const std::string nice_addr = fmt::format("0x{:016x}", addr); | 169 | const std::string nice_addr = fmt::format("0x{:016x}", addr); |
| 170 | std::string object_label; | 170 | std::string object_label; |
| 171 | 171 | ||
| 172 | switch (identifier) { | 172 | if (extra_info.empty()) { |
| 173 | case GL_TEXTURE: | 173 | switch (identifier) { |
| 174 | object_label = extra_info + "@" + nice_addr; | 174 | case GL_TEXTURE: |
| 175 | break; | 175 | object_label = "Texture@" + nice_addr; |
| 176 | case GL_PROGRAM: | 176 | break; |
| 177 | object_label = "ShaderProgram@" + nice_addr; | 177 | case GL_PROGRAM: |
| 178 | break; | 178 | object_label = "Shader@" + nice_addr; |
| 179 | default: | 179 | break; |
| 180 | object_label = fmt::format("Object(0x{:x})@{}", identifier, nice_addr); | 180 | default: |
| 181 | break; | 181 | object_label = fmt::format("Object(0x{:x})@{}", identifier, nice_addr); |
| 182 | break; | ||
| 183 | } | ||
| 184 | } else { | ||
| 185 | object_label = extra_info + '@' + nice_addr; | ||
| 182 | } | 186 | } |
| 183 | glObjectLabel(identifier, handle, -1, static_cast<const GLchar*>(object_label.c_str())); | 187 | glObjectLabel(identifier, handle, -1, static_cast<const GLchar*>(object_label.c_str())); |
| 184 | } | 188 | } |