BeeEngine/glslang-zig
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix line number handling in line directive callback.

Browse source 
The line argument passed into the lineCallback function is the
literal value of the first argument of the #line directive.
lastLine in DoPreprocessing() should be updated taking into
consideration the different definitions for #line between specs.

Add a test to reveal the bug.
This commit is contained in:
Lei Zhang 2015-07-03 01:25:47 -04:00
parent 3a194f7ba4
commit 5cbc990a0a
9 changed files with 40 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

13
glslang/MachineIndependent/ParseHelper.cpp
View file

@ -2654,6 +2654,19 @@ void TParseContext::updateImplicitArraySize(TSourceLoc loc, TIntermNode *node, i
symbol->getWritableType().setImplicitArraySize(index + 1);
}
// Returns true if the first argument to the #line directive is the line number for the next line.
//
// Desktop, pre-version 3.30: "After processing this directive
// (including its new-line), the implementation will behave as if it is compiling at line number line+1 and
// source string number source-string-number."
//
// Desktop, version 3.30 and later, and ES: "After processing this directive
// (including its new-line), the implementation will behave as if it is compiling at line number line and
// source string number source-string-number.
bool TParseContext::lineDirectiveShouldSetNextLine() const {
return profile == EEsProfile || version >= 330;
}
//
// Enforce non-initializer type/qualifier rules.
//

2
glslang/MachineIndependent/ParseHelper.h
View file

@ -212,6 +212,8 @@ public:
void setCurrentString(int string) { currentScanner->setString(string); }
void setScanner(TInputScanner* scanner) { currentScanner = scanner; }
bool lineDirectiveShouldSetNextLine() const;
void notifyVersion(int line, int version, const char* type_string);
void notifyErrorDirective(int line, const char* error_message);
void notifyLineDirective(int line, bool has_source, int source);

15
glslang/MachineIndependent/ShaderLang.cpp
View file

@ -639,18 +639,25 @@ struct DoPreprocessing {
adjustLine(line);
outputStream << "#extension " << extension << " : " << behavior;
});
parseContext.setLineCallback([&lastLine, &outputStream](
int line, bool hasSource, int sourceNum) {
parseContext.setLineCallback([&lastLine, &outputStream, &parseContext](
int newLineNo, bool hasSource, int sourceNum) {
// SourceNum is the number of the source-string that is being parsed.
if (lastLine != -1) {
outputStream << std::endl;
}
outputStream << "#line " << line;
outputStream << "#line " << newLineNo;
if (hasSource) {
outputStream << " " << sourceNum;
}
if (parseContext.lineDirectiveShouldSetNextLine()) {
// newLineNo is the new line number for the line following the #line
// directive. So the new line number for the current line is
newLineNo -= 1;
}
outputStream << std::endl;
lastLine = std::max(line - 1, 1);
// Line number starts from 1. And we are at the next line of the #line
// directive now. So lastLine (from 0) should be (newLineNo - 1) + 1.
lastLine = newLineNo;
});

9
glslang/MachineIndependent/preprocessor/Pp.cpp
View file

@ -641,14 +641,7 @@ int TPpContext::CPPline(TPpToken* ppToken)
if (token == '\n')
++lineRes;
// Desktop, pre-version 3.30: "After processing this directive
// (including its new-line), the implementation will behave as if it is compiling at line number line+1 and
// source string number source-string-number."
//
// Desktop, version 3.30 and later, and ES: "After processing this directive
// (including its new-line), the implementation will behave as if it is compiling at line number line and
// source string number source-string-number.
if (parseContext.profile == EEsProfile || parseContext.version >= 330)
if (parseContext.lineDirectiveShouldSetNextLine())
--lineRes;
parseContext.setCurrentLine(lineRes);