Add reserved keywords and replace GLSLPreParser with regex #683
Conversation
This file contains 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Handles reserved keywords like
sampleandtexturein GLSL by renaming with a simple string match. This is done prior to AST transformation by glsl-transformation-lib.It also removes GLSLPreParser from glsl-transformation-lib, which was only used to parse out the version/profile from each shader. Instead it has been replaced with a regex based version. The GLSLPreParser has a bug which when it uses the same lexer as the rest of the parsing, causes the first node in the parsetree to be removed/missed.
This can probably be fixed in glsl-transformation-lib, but it's overkill probably for parsing out the version string anyways. Iris was using regex for this prior to switching to glsl-transformation-lib anyways.