From 274e735428d8ca0787c3939c88e5dc09687a5b39 Mon Sep 17 00:00:00 2001 From: baldurk Date: Fri, 19 Jun 2020 19:56:40 +0100 Subject: [PATCH] Don't pass rdcstr through varargs --- renderdoc/driver/shaders/dxil/dxil_debuginfo.cpp | 6 +++--- renderdoc/driver/shaders/dxil/dxil_disassemble.cpp | 2 +- renderdoc/driver/shaders/dxil/dxil_reflect.cpp | 14 ++++++++------ 3 files changed, 12 insertions(+), 10 deletions(-) diff --git a/renderdoc/driver/shaders/dxil/dxil_debuginfo.cpp b/renderdoc/driver/shaders/dxil/dxil_debuginfo.cpp index 51093669e..99b476227 100644 --- a/renderdoc/driver/shaders/dxil/dxil_debuginfo.cpp +++ b/renderdoc/driver/shaders/dxil/dxil_debuginfo.cpp @@ -296,14 +296,14 @@ rdcstr getOptMetaString(const Metadata *meta) rdcstr DIFile::toString() const { - return StringFormat::Fmt("!DIFile(filename: %s, directory: %s)", getOptMetaString(file), - getOptMetaString(dir)); + return StringFormat::Fmt("!DIFile(filename: %s, directory: %s)", getOptMetaString(file).c_str(), + getOptMetaString(dir).c_str()); } rdcstr DICompileUnit::toString() const { rdcstr ret = StringFormat::Fmt("!DICompileUnit(language: %s, file: %s", ToStr(lang).c_str(), - file ? file->refString() : "null"); + file ? file->refString().c_str() : "null"); if(producer) ret += ", producer: " + escapeString(*producer); diff --git a/renderdoc/driver/shaders/dxil/dxil_disassemble.cpp b/renderdoc/driver/shaders/dxil/dxil_disassemble.cpp index edaaaae83..e01f140a7 100644 --- a/renderdoc/driver/shaders/dxil/dxil_disassemble.cpp +++ b/renderdoc/driver/shaders/dxil/dxil_disassemble.cpp @@ -1558,7 +1558,7 @@ rdcstr DebugLocation::toString() const rdcstr ret = StringFormat::Fmt("!DILocation(line: %llu, column: %llu, scope: %s", line, col, scope ? scope->refString().c_str() : "null"); if(inlinedAt) - ret += StringFormat::Fmt(", inlinedAt: %s", inlinedAt->refString()); + ret += StringFormat::Fmt(", inlinedAt: %s", inlinedAt->refString().c_str()); ret += ")"; return ret; } diff --git a/renderdoc/driver/shaders/dxil/dxil_reflect.cpp b/renderdoc/driver/shaders/dxil/dxil_reflect.cpp index 479dadb96..f7fa68701 100644 --- a/renderdoc/driver/shaders/dxil/dxil_reflect.cpp +++ b/renderdoc/driver/shaders/dxil/dxil_reflect.cpp @@ -802,9 +802,10 @@ DXBC::Reflection *Program::GetReflection() if(dx.valver && dx.valver->children.size() == 1 && dx.valver->children[0]->children.size() == 2) { - m_CompilerSig += StringFormat::Fmt(" (Validation version %s.%s)", - dx.valver->children[0]->children[0]->constant->toString(), - dx.valver->children[0]->children[1]->constant->toString()); + m_CompilerSig += + StringFormat::Fmt(" (Validation version %s.%s)", + dx.valver->children[0]->children[0]->constant->toString().c_str(), + dx.valver->children[0]->children[1]->constant->toString().c_str()); } if(dx.entryPoints && dx.entryPoints->children.size() > 0 && @@ -821,9 +822,10 @@ DXBC::Reflection *Program::GetReflection() if(dx.shaderModel && dx.shaderModel->children.size() == 1 && dx.shaderModel->children[0]->children.size() == 3) { - m_Profile = StringFormat::Fmt("%s_%s_%s", dx.shaderModel->children[0]->children[0]->str, - dx.shaderModel->children[0]->children[1]->constant->toString(), - dx.shaderModel->children[0]->children[2]->constant->toString()); + m_Profile = + StringFormat::Fmt("%s_%s_%s", dx.shaderModel->children[0]->children[0]->str.c_str(), + dx.shaderModel->children[0]->children[1]->constant->toString().c_str(), + dx.shaderModel->children[0]->children[2]->constant->toString().c_str()); } else {