Fix shader type detection #79287
Merged
Fix shader type detection #79287
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
YuriSizov
added
the
cherrypick:4.1
akien-mga
reviewed
Jul 10, 2023
bitsawer
force-pushed
the
fix_shader_type_detection
branch
from
3c6ff90
to
905c10b
Compare
YuriSizov
approved these changes
Jul 14, 2023
|
Thanks! |
|
Cherry-picked for 4.1.2. |
YuriSizov
removed
the
cherrypick:4.1
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.
The problem was that
get_shader_type()was called too early, before the preprocessing step. This PR moves the check after the preprocessing and uses the preprocessed shader code to figure out the shader_type. This makes sure the shader compiler only sees valid shader code that has all preprocessor statements removed, so thatget_shader_type()can correctly parse the code and figure out the type. Previously, any preprocessor statements before theshader_type xyz;would cause a silent parsing failure and the shader type would default tospatial.