From 7c7e9df847d390ee22e7ef0d5e7f136cf61f0479 Mon Sep 17 00:00:00 2001 From: baldurk Date: Fri, 9 Jul 2021 17:11:51 +0100 Subject: [PATCH] Try to produce old action names for RGP * This may not work forever but remains compatible for now. --- qrenderdoc/Code/RGPInterop.cpp | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/qrenderdoc/Code/RGPInterop.cpp b/qrenderdoc/Code/RGPInterop.cpp index 68936855a..b70931fcb 100644 --- a/qrenderdoc/Code/RGPInterop.cpp +++ b/qrenderdoc/Code/RGPInterop.cpp @@ -267,7 +267,25 @@ void RGPInterop::CreateMapping(const rdcarray &actions) if(m_EventNames.contains(chunk->name, Qt::CaseSensitive)) { m_Event2RGP[ev.eventId].interoplinearid = (uint32_t)m_RGP2Event.size(); - m_Event2RGP[ev.eventId].eventname = chunk->name; + rdcstr n = chunk->name; + if(n.contains(':')) + n.erase(0, n.find_last_of(":") + 1); + n += "("; + bool first = true; + for(size_t i = 0; i < chunk->NumChildren(); i++) + { + const SDObject *o = chunk->GetChild(i); + if(o->type.flags & SDTypeFlags::Important) + { + if(first) + n += ", "; + first = false; + n += ToStr(o->AsUInt32()); + } + } + n += ")"; + + m_Event2RGP[ev.eventId].eventname = n; m_RGP2Event.push_back(ev.eventId); }