From 56fb33de97c9b4c38e44af589e6ed3a39bfd8dc4 Mon Sep 17 00:00:00 2001 From: Dzmitry Malyshau Date: Sat, 8 May 2021 10:14:25 -0400 Subject: [PATCH] [spv-in] respect per-member access decorations --- src/front/spv/mod.rs | 40 +++++++++++++++++++++++++++------------- 1 file changed, 27 insertions(+), 13 deletions(-) diff --git a/src/front/spv/mod.rs b/src/front/spv/mod.rs index bef0b416b..bbb57e041 100644 --- a/src/front/spv/mod.rs +++ b/src/front/spv/mod.rs @@ -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 { handle_sampling: FastHashMap, image::SamplingFlags>, lookup_type: FastHashMap, lookup_void_type: Option, - lookup_storage_buffer_types: FastHashSet>, + lookup_storage_buffer_types: FastHashMap, crate::StorageAccess>, // Lookup for samplers and sampled images, storing flags on how they are used. lookup_constant: FastHashMap, lookup_variable: FastHashMap, @@ -439,7 +439,7 @@ impl> Parser { 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> Parser { | 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> Parser { let mut struct_alignment = crate::Alignment::new(1).unwrap(); let mut members = Vec::::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> Parser { .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> Parser { }); 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> Parser { } => (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 {