mirror of
https://github.com/storytold/wgpu.git
synced 2026-11-21 15:00:57 +01:00
[spv-in] respect per-member access decorations
This commit is contained in:
1 parent
9e89874584
commit
56fb33de97
1 file changed
+27
-13
+27
-13
@@ -40,7 +40,7 @@ use function::*;
|
||||
|
||||
use crate::{
|
||||
arena::{Arena, Handle},
|
||||
FastHashMap, FastHashSet,
|
||||
FastHashMap,
|
||||
};
|
||||
|
||||
use num_traits::cast::FromPrimitive;
|
||||
@@ -402,7 +402,7 @@ pub struct Parser<I> {
|
||||
handle_sampling: FastHashMap<Handle<crate::GlobalVariable>, image::SamplingFlags>,
|
||||
lookup_type: FastHashMap<spirv::Word, LookupType>,
|
||||
lookup_void_type: Option<spirv::Word>,
|
||||
lookup_storage_buffer_types: FastHashSet<Handle<crate::Type>>,
|
||||
lookup_storage_buffer_types: FastHashMap<Handle<crate::Type>, crate::StorageAccess>,
|
||||
// Lookup for samplers and sampled images, storing flags on how they are used.
|
||||
lookup_constant: FastHashMap<spirv::Word, LookupConstant>,
|
||||
lookup_variable: FastHashMap<spirv::Word, LookupVariable>,
|
||||
@@ -439,7 +439,7 @@ impl<I: Iterator<Item = u32>> Parser<I> {
|
||||
lookup_member: FastHashMap::default(),
|
||||
lookup_type: FastHashMap::default(),
|
||||
lookup_void_type: None,
|
||||
lookup_storage_buffer_types: FastHashSet::default(),
|
||||
lookup_storage_buffer_types: FastHashMap::default(),
|
||||
lookup_constant: FastHashMap::default(),
|
||||
lookup_variable: FastHashMap::default(),
|
||||
lookup_expression: FastHashMap::default(),
|
||||
@@ -2729,7 +2729,7 @@ impl<I: Iterator<Item = u32>> Parser<I> {
|
||||
| crate::TypeInner::ValuePointer { class, .. } => class,
|
||||
_ if self
|
||||
.lookup_storage_buffer_types
|
||||
.contains(&base_lookup_ty.handle) =>
|
||||
.contains_key(&base_lookup_ty.handle) =>
|
||||
{
|
||||
crate::StorageClass::Storage
|
||||
}
|
||||
@@ -2840,6 +2840,7 @@ impl<I: Iterator<Item = u32>> Parser<I> {
|
||||
let mut struct_alignment = crate::Alignment::new(1).unwrap();
|
||||
let mut members = Vec::<crate::StructMember>::with_capacity(inst.wc as usize - 2);
|
||||
let mut member_lookups = Vec::with_capacity(members.capacity());
|
||||
let mut storage_access = crate::StorageAccess::empty();
|
||||
for i in 0..u32::from(inst.wc) - 2 {
|
||||
let type_id = self.next()?;
|
||||
let ty = self.lookup_type.lookup(type_id)?.handle;
|
||||
@@ -2848,6 +2849,15 @@ impl<I: Iterator<Item = u32>> Parser<I> {
|
||||
.remove(&(id, i))
|
||||
.unwrap_or_default();
|
||||
|
||||
let mut member_access = crate::StorageAccess::all();
|
||||
if decor.flags.contains(DecorationFlags::NON_READABLE) {
|
||||
member_access &= !crate::StorageAccess::LOAD;
|
||||
}
|
||||
if decor.flags.contains(DecorationFlags::NON_WRITABLE) {
|
||||
member_access &= !crate::StorageAccess::STORE;
|
||||
}
|
||||
storage_access |= member_access;
|
||||
|
||||
member_lookups.push(LookupMember {
|
||||
type_id,
|
||||
row_major: decor.matrix_major == Some(Majority::Row),
|
||||
@@ -2903,7 +2913,8 @@ impl<I: Iterator<Item = u32>> Parser<I> {
|
||||
});
|
||||
|
||||
if block_decor == Some(Block { buffer: true }) {
|
||||
self.lookup_storage_buffer_types.insert(ty_handle);
|
||||
self.lookup_storage_buffer_types
|
||||
.insert(ty_handle, storage_access);
|
||||
}
|
||||
for (i, member_lookup) in member_lookups.into_iter().enumerate() {
|
||||
self.lookup_member
|
||||
@@ -3226,21 +3237,24 @@ impl<I: Iterator<Item = u32>> Parser<I> {
|
||||
} => (original_ty, true),
|
||||
_ => (original_ty, false),
|
||||
};
|
||||
let ext_class = if self.lookup_storage_buffer_types.contains(&effective_ty) {
|
||||
ExtendedClass::Global(crate::StorageClass::Storage)
|
||||
} else {
|
||||
map_storage_class(storage_class)?
|
||||
};
|
||||
let (ext_class, type_storage_access) =
|
||||
match self.lookup_storage_buffer_types.get(&effective_ty) {
|
||||
Some(&access) => (ExtendedClass::Global(crate::StorageClass::Storage), access),
|
||||
None => (
|
||||
map_storage_class(storage_class)?,
|
||||
crate::StorageAccess::all(),
|
||||
),
|
||||
};
|
||||
|
||||
let (inner, var) = match ext_class {
|
||||
ExtendedClass::Global(class) => {
|
||||
let storage_access = if is_storage {
|
||||
let mut access = crate::StorageAccess::all();
|
||||
let mut access = type_storage_access;
|
||||
if dec.flags.contains(DecorationFlags::NON_READABLE) {
|
||||
access ^= crate::StorageAccess::LOAD;
|
||||
access &= !crate::StorageAccess::LOAD;
|
||||
}
|
||||
if dec.flags.contains(DecorationFlags::NON_WRITABLE) {
|
||||
access ^= crate::StorageAccess::STORE;
|
||||
access &= !crate::StorageAccess::STORE;
|
||||
}
|
||||
access
|
||||
} else {
|
||||
|
||||
Reference in new issue
Block a user