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

Don't consider a destination file modified until we've seen a #line

Browse Source 
* If we have a merged file with #lines in it, then we want to split those #lines
  into separate files as expected. However the original merged file should be
  left alone. Previously this happened if the first thing we saw was a #line but
  that was only by coincidence. If there was some preamble before the first
  #line we'd start copying that and then stop once we started emitting lines
  into other files.
This commit is contained in:
baldurk
2020-04-06 17:35:22 +01:00
parent eb552d8172
commit 5ec480dffe
1 changed files with 21 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
renderdoc/driver/shaders/dxbc/dxbc_container.cpp
+21 -10
View File
@@ -1290,6 +1290,7 @@ DXBCContainer::DXBCContainer(const void *ByteCode, size_t ByteCodeLength)
srclines.push_back("");
// handle #line directives by inserting empty lines or erasing as necessary
bool seenLine = false;
for(size_t srcLine = 0; srcLine < srclines.size(); srcLine++)
{
@@ -1314,18 +1315,26 @@ DXBCContainer::DXBCContainer(const void *ByteCode, size_t ByteCodeLength)
if(c + 5 > end || strncmp(c, "#line", 5) != 0)
{
// resize up to account for the current line, if necessary
dstFile->lines.resize(RDCMAX(dstLine + 1, dstFile->lines.size()));
// only actually insert the line if we've seen a #line statement. Otherwise we're just
// doing an identity copy. This can lead to problems e.g. if there are a few statements in
// a file before the #line we then create a truncated list of lines with only those and
// then start spitting the #line directives into other files. We still want to have the
// original file as-is.
if(seenLine)
{
// resize up to account for the current line, if necessary
dstFile->lines.resize(RDCMAX(dstLine + 1, dstFile->lines.size()));
// if non-empty, append this line (to allow multiple lines on the same line
// number to be concatenated). To avoid screwing up line numbers we have to append with a
// comment and not a newline.
if(dstFile->lines[dstLine].empty())
dstFile->lines[dstLine] = srclines[srcLine];
else
dstFile->lines[dstLine] += " /* multiple #lines overlapping */ " + srclines[srcLine];
// if non-empty, append this line (to allow multiple lines on the same line
// number to be concatenated). To avoid screwing up line numbers we have to append with
// a comment and not a newline.
if(dstFile->lines[dstLine].empty())
dstFile->lines[dstLine] = srclines[srcLine];
else
dstFile->lines[dstLine] += " /* multiple #lines overlapping */ " + srclines[srcLine];
dstFile->modified = true;
dstFile->modified = true;
}
// advance line counter
dstLine++;
@@ -1333,6 +1342,8 @@ DXBCContainer::DXBCContainer(const void *ByteCode, size_t ByteCodeLength)
continue;
}
seenLine = true;
// we have a #line directive
c += 5;