lee/renderdoc
1
0
Fork 0
mirror of https://github.com/baldurk/renderdoc.git synced 2026-05-06 01:50:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Match LLVM's escaping behaviour

Browse Source
This commit is contained in:
baldurk
2020-06-10 13:55:25 +01:00
parent c1838c89fc
commit 6093690737
2 changed files with 15 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
renderdoc/driver/shaders/dxil/dxil_bytecode.h
+1 -1
View File
@@ -557,7 +557,7 @@ private:
};
bool needsEscaping(const rdcstr &name);
rdcstr escapeString(rdcstr str);
rdcstr escapeString(const rdcstr &str);
rdcstr escapeStringIfNeeded(const rdcstr &name);
}; // namespace DXIL
renderdoc/driver/shaders/dxil/dxil_disassemble.cpp
+14 -13
View File
@@ -32,29 +32,30 @@ namespace DXIL
bool needsEscaping(const rdcstr &name)
{
return name.find_first_not_of(
"-abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ$._0123456789") >= 0;
"-abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ._0123456789") >= 0;
}
rdcstr escapeString(rdcstr str)
rdcstr escapeString(const rdcstr &str)
{
rdcstr ret;
ret.push_back('"');
for(size_t i = 0; i < str.size(); i++)
{
if(str[i] == '\'' || str[i] == '\\')
if(str[i] == '\r' || str[i] == '\n' || str[i] == '\t' || str[i] == '"' || str[i] == '\\' ||
!isprint(str[i]))
{
str.insert(i, "\\", 1);
i++;
}
else if(str[i] == '\r' || str[i] == '\n' || str[i] == '\t' || !isprint(str[i]))
{
str.insert(i + 1, StringFormat::Fmt("%02X", str[i]));
str[i] = '\\';
ret.push_back('\\');
ret.append(StringFormat::Fmt("%02X", (unsigned char)str[i]));
continue;
}
ret.push_back(str[i]);
}
str.push_back('"');
str.insert(0, '"');
ret.push_back('"');
return str;
return ret;
}
rdcstr escapeStringIfNeeded(const rdcstr &name)