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.

Sign up for GitHub

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

Jump to bottom

[Merged by Bors] - shader preprocessor - do not import if scope is not valid #4012

Closed
wants to merge 1 commit into from
Closed

[Merged by Bors] - shader preprocessor - do not import if scope is not valid #4012

wants to merge 1 commit into from

Conversation

mockersf
Copy link
Member

@mockersf mockersf commented Feb 22, 2022 •
edited
Loading

Objective

Solution

  • process imports only if the current scope is enabled

@github-actions github-actions bot added the S-Needs-Triage This issue needs to be labelled label Feb 22, 2022
@mockersf mockersf added A-Rendering Drawing game state to the screen C-Bug An unexpected or incorrect behavior and removed S-Needs-Triage This issue needs to be labelled labels Feb 22, 2022
@cart
Copy link
Member

cart commented Feb 22, 2022

Makes sense to me. Thanks for the quick fix!

@cart
Copy link
Member

cart commented Feb 22, 2022

bors r+

bors bot pushed a commit that referenced this pull request Feb 22, 2022
@mockersf
shader preprocessor - do not import if scope is not valid (#4012)
e4203c3 
# Objective

- fix #4011 
- imports are not limited by the current `ifdef` they are in

## Solution

- process imports only if the current scope is enabled
@bors
Copy link
Contributor

bors bot commented Feb 22, 2022

Pull request successfully merged into main.

Build succeeded:

@bors bors bot changed the title shader preprocessor - do not import if scope is not valid [Merged by Bors] - shader preprocessor - do not import if scope is not valid Feb 22, 2022
@bors bors bot closed this Feb 22, 2022
kurtkuehnert pushed a commit to kurtkuehnert/bevy that referenced this pull request Mar 6, 2022
@mockersf
shader preprocessor - do not import if scope is not valid (bevyengine…
bc0a796 
…#4012)

# Objective

- fix bevyengine#4011 
- imports are not limited by the current `ifdef` they are in

## Solution

- process imports only if the current scope is enabled
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
A-Rendering Drawing game state to the screen C-Bug An unexpected or incorrect behavior
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

#imports seem to ignore #ifdef blocks (WGSL)
2 participants
@mockersf @cart