Fix ShaderPreprocessor.consume_line_continuations() skipping characters
#112490
+19
−20
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This function increments the code index by 2 when a line continuation is
found, additional to the loop increment, so it skips over the next
character following a line continuation.
In shader code like
#define FUN_FUN(n)\
void fun1() { return;\
}\
void fun2() { return; }
FUN_FUN(1.0)
the first } will visibly get skipped, causing an error. The 'v' in
'void' will also get missed, but as the next 'o' is enough to decide to
end the loop, that is less obvious.
Simplify consume_line_continuations() to remove the unnecessary offset
parameter and the extra loop index variable, and increment index the
right amount.
AThousandShips
changed the title
ShaderPreprocessor.consume_line_continuations() skipping characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This function increments the code index by 2 when a line continuation is found, additional to the loop increment, so it skips over the next character following a line continuation.
In shader code like
the first } will visibly get skipped, causing an error. The 'v' in 'void' will also get missed, but as the next 'o' is enough to decide to end the loop, that is less obvious.
Simplify consume_line_continuations() to remove the unnecessary offset parameter and the extra loop index variable, and increment index the right amount.