Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

substitute after preprocessing #32

Merged
merged 8 commits into from
Jul 18, 2023
Merged

Conversation

robtfm
Copy link
Collaborator

@robtfm robtfm commented Jul 16, 2023

fixes #27

perform module and item substitution after preprocessing to make sure we use the right imports.

this is a breaking change as we need to add shader defs into the public ErrSource::Module variant, so that errors can be reported with the correct substitutions.

offset: 0,
},
})?;
let substituted_source = self.sanitize_and_set_auto_bindings(source);
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this being called twice (on the same source input) in the same function intentional?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nope, removed, thanks.

i had some trouble with CI failures that didn't occur locally, i believe due to github treatment of \rs, so i moved the sanitize call up to the start of the function and forgot to remove the original call.

@cart cart merged commit e68ce95 into bevyengine:master Jul 18, 2023
7 checks passed
@robtfm robtfm mentioned this pull request Jul 21, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Item substitution doesn’t respect shader defs
2 participants