Make sure to use original IDs when stringifying any IDs in draw names

This commit is contained in:
baldurk
2018-02-13 17:18:08 +00:00
parent 8368f9b8be
commit caaa392e85
2 changed files with 8 additions and 5 deletions
@@ -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;
@@ -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;