Binding arrays play nice with bounds checks #1855
Merged
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
cwfitzgerald
force-pushed
the
binding-array-bounds-check-politeness
branch
from
cc97ab4 to
1ac8dae
Compare
|
@jimblandy please review |
jimblandy
requested changes
Apr 23, 2022
jimblandy
approved these changes
Apr 24, 2022
Comment on lines
-3342
to
+3355
| Some(target) => match module.types[var.ty].inner { | ||
| crate::TypeInner::Image { .. } => target.texture.is_some(), | ||
| crate::TypeInner::Sampler { .. } => target.sampler.is_some(), | ||
| _ => target.buffer.is_some(), | ||
| }, | ||
| Some(target) => { | ||
| let binding_ty = match module.types[var.ty].inner { | ||
| crate::TypeInner::BindingArray { base, .. } => { | ||
| &module.types[base].inner | ||
| } | ||
| ref ty => ty, | ||
| }; | ||
| match *binding_ty { | ||
| crate::TypeInner::Image { .. } => target.texture.is_some(), | ||
| crate::TypeInner::Sampler { .. } => target.sampler.is_some(), | ||
| _ => target.buffer.is_some(), | ||
| } | ||
| } |
There was a problem hiding this comment.
This seems like an unrelated fix. It's fine to include it in this PR, but if it has something to do with bounds checks, let me know, because I'm not understanding the patch.
There was a problem hiding this comment.
Ah yeah, sorry this should have been titled "fixes needed to get the binding indexing wgpu PR working" :)
tl;dr: Because of the change above this, it is now possible to get the type of binding array, and we need to "punch through" the binding array to find the actual type of binding we're looking at.
It's only related to bounds checks as this is code that is only hit when bounds checks are on.
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.
Found an issue with binding indexing in the MSL backend when bounds checks were on.
This fixes the issue and adds a binding array bounds check policy that, for now, must be unchecked.