From caaa392e85e2ba4bfe512ad8b35b741c91b8bc51 Mon Sep 17 00:00:00 2001 From: baldurk Date: Tue, 13 Feb 2018 17:18:08 +0000 Subject: [PATCH] Make sure to use original IDs when stringifying any IDs in draw names --- renderdoc/driver/gl/wrappers/gl_framebuffer_funcs.cpp | 5 +++-- renderdoc/driver/gl/wrappers/gl_texture_funcs.cpp | 8 +++++--- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/renderdoc/driver/gl/wrappers/gl_framebuffer_funcs.cpp b/renderdoc/driver/gl/wrappers/gl_framebuffer_funcs.cpp index 7f8357933..653c9caed 100644 --- a/renderdoc/driver/gl/wrappers/gl_framebuffer_funcs.cpp +++ b/renderdoc/driver/gl/wrappers/gl_framebuffer_funcs.cpp @@ -1818,8 +1818,9 @@ bool WrappedOpenGL::Serialise_glBlitNamedFramebuffer(SerialiserType &ser, ResourceId drawId = GetResourceManager()->GetID(drawFramebuffer); DrawcallDescription draw; - draw.name = StringFormat::Fmt("%s(%s, %s)", ToStr(gl_CurChunk).c_str(), ToStr(readId).c_str(), - ToStr(drawId).c_str()); + draw.name = StringFormat::Fmt("%s(%s, %s)", ToStr(gl_CurChunk).c_str(), + ToStr(GetResourceManager()->GetOriginalID(readId)).c_str(), + ToStr(GetResourceManager()->GetOriginalID(drawId)).c_str()); draw.flags |= DrawFlags::Resolve; GLint numCols = 8; diff --git a/renderdoc/driver/gl/wrappers/gl_texture_funcs.cpp b/renderdoc/driver/gl/wrappers/gl_texture_funcs.cpp index ffb3912a2..8e714db7e 100644 --- a/renderdoc/driver/gl/wrappers/gl_texture_funcs.cpp +++ b/renderdoc/driver/gl/wrappers/gl_texture_funcs.cpp @@ -736,8 +736,9 @@ bool WrappedOpenGL::Serialise_glGenerateTextureMipmapEXT(SerialiserType &ser, GL AddEvent(); DrawcallDescription draw; - draw.name = StringFormat::Fmt("%s(%llu)", ToStr(gl_CurChunk).c_str(), - ToStr(GetResourceManager()->GetID(texture)).c_str()); + draw.name = StringFormat::Fmt( + "%s(%llu)", ToStr(gl_CurChunk).c_str(), + ToStr(GetResourceManager()->GetOriginalID(GetResourceManager()->GetID(texture))).c_str()); draw.flags |= DrawFlags::GenMips; AddDrawcall(draw, true); @@ -880,7 +881,8 @@ bool WrappedOpenGL::Serialise_glCopyImageSubData(SerialiserType &ser, GLuint src DrawcallDescription draw; draw.name = StringFormat::Fmt("%s(%llu, %llu)", ToStr(gl_CurChunk).c_str(), - ToStr(srcid).c_str(), ToStr(dstid).c_str()); + ToStr(GetResourceManager()->GetOriginalID(srcid)).c_str(), + ToStr(GetResourceManager()->GetOriginalID(dstid)).c_str()); draw.flags |= DrawFlags::Copy; draw.copySource = srcid;