[Merged by Bors] - Fix panic when using globals uniform in wasm builds#6460
Closed
rparrett wants to merge 3 commits intobevyengine:mainfrom
Closed
[Merged by Bors] - Fix panic when using globals uniform in wasm builds#6460rparrett wants to merge 3 commits intobevyengine:mainfrom
rparrett wants to merge 3 commits intobevyengine:mainfrom
Conversation
alice-i-cecile
added
C-Bug
Member
|
If this is only needed on wasm, could you set a cfg/shaderdef that is only added in wasm? |
IceSentry
approved these changes
Nov 4, 2022
Contributor
IceSentry
left a comment
IceSentry
left a comment
There was a problem hiding this comment.
Oh yeah, I forgot about alignment when I made that PR, good catch
mockersf
approved these changes
Nov 6, 2022
mockersf
added
the
S-Ready-For-Final-Review
tim-blackbird
approved these changes
Nov 6, 2022
Member
|
bors r+ |
bors bot
pushed a commit
that referenced
this pull request
Nov 7, 2022
# Objective Fixes #5393 ## Solution - Add padding to `GlobalsUniform` / `Globals` to make it 16-byte aligned. Still not super clear on whether this is a `naga` thing or an `encase` thing or what. But now that we're offering `globals` up to users and #5393 is not just breaking an example, maybe we should do this sort of workaround?
Contributor
|
Pull request successfully merged into main. Build succeeded:
|
bors
bot
changed the title
bors bot
pushed a commit
that referenced
this pull request
Nov 18, 2022
# Objective - Fix a panic in wasm when using globals in a shader ## Solution - Similar to #6460
cart
pushed a commit
that referenced
this pull request
Nov 30, 2022
# Objective - Fix a panic in wasm when using globals in a shader ## Solution - Similar to #6460
ItsDoot
pushed a commit
to ItsDoot/bevy
that referenced
this pull request
Feb 1, 2023
# Objective Fixes bevyengine#5393 ## Solution - Add padding to `GlobalsUniform` / `Globals` to make it 16-byte aligned. Still not super clear on whether this is a `naga` thing or an `encase` thing or what. But now that we're offering `globals` up to users and bevyengine#5393 is not just breaking an example, maybe we should do this sort of workaround?
ItsDoot
pushed a commit
to ItsDoot/bevy
that referenced
this pull request
Feb 1, 2023
# Objective - Fix a panic in wasm when using globals in a shader ## Solution - Similar to bevyengine#6460
This was referenced Feb 17, 2023
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 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.
Objective
Fixes #5393
Solution
GlobalsUniform/Globalsto make it 16-byte aligned.Still not super clear on whether this is a
nagathing or anencasething or what. But now that we're offeringglobalsup to users and #5393 is not just breaking an example, maybe we should do this sort of workaround?