nordic-dev.net/wgpu
nordic-dev.net/wgpu
2
0
Fork 0
mirror of https://github.com/gfx-rs/wgpu.git synced 2024-11-26 00:33:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

[spv] fix block decoration on nested structs

Browse Source
This commit is contained in:
Dzmitry Malyshau 2021-01-31 18:02:55 -05:00 committed by Dzmitry Malyshau
parent 4a3ecc774f
commit 6138e4ddd3
3 changed files with 22 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/back/spv/writer.rs
View File

@ -180,7 +180,9 @@ pub struct Writer {
lookup_constant: crate::FastHashMap<crate::Handle<crate::Constant>, Word>,
lookup_global_variable:
crate::FastHashMap<crate::Handle<crate::GlobalVariable>, (Word, spirv::StorageClass)>,
storage_type_handles: crate::FastHashMap<crate::Handle<crate::Type>, crate::StorageAccess>,
// TODO: this is a type property that depends on the global variable that uses it
// so it may require us to duplicate the type!
struct_type_handles: crate::FastHashMap<crate::Handle<crate::Type>, crate::StorageAccess>,
gl450_ext_inst_id: Word,
layouter: Layouter,
}
@ -209,7 +211,7 @@ impl Writer {
lookup_function_type: crate::FastHashMap::default(),
lookup_constant: crate::FastHashMap::default(),
lookup_global_variable: crate::FastHashMap::default(),
storage_type_handles: crate::FastHashMap::default(),
struct_type_handles: crate::FastHashMap::default(),
gl450_ext_inst_id: 0,
layouter: Layouter::default(),
}
@ -677,16 +679,23 @@ impl Writer {
ref members,
} => {
//TODO: put NonWritable/NonReadable on the global variable instead?
let (decoration, storage_access) = match self.storage_type_handles.get(&handle) {
Some(&access) => (spirv::Decoration::BufferBlock, access),
None => (spirv::Decoration::Block, crate::StorageAccess::empty()),
let storage_access = match self.struct_type_handles.get(&handle) {
Some(&access) => {
let decoration = if access.is_empty() {
spirv::Decoration::Block
} else {
spirv::Decoration::BufferBlock
};
self.annotations
.push(super::instructions::instruction_decorate(
id,
decoration,
&[],
));
access
}
None => crate::StorageAccess::empty(),
};
self.annotations
.push(super::instructions::instruction_decorate(
id,
decoration,
&[],
));
let mut current_offset = 0;
let mut member_ids = Vec::with_capacity(members.len());
@ -2323,8 +2332,8 @@ impl Writer {
}
for (_, var) in ir_module.global_variables.iter() {
if !var.storage_access.is_empty() {
self.storage_type_handles.insert(var.ty, var.storage_access);
if let crate::TypeInner::Struct { .. } = ir_module.types[var.ty].inner {
self.struct_type_handles.insert(var.ty, var.storage_access);
}
}

1
tests/snapshots/snapshots__boids.spvasm.snap
View File

@ -15,7 +15,6 @@ OpDecorate %34 BuiltIn GlobalInvocationId
OpDecorate %48 BufferBlock
OpMemberDecorate %48 0 Offset 0
OpDecorate %49 ArrayStride 16
OpDecorate %50 Block
OpMemberDecorate %50 0 Offset 0
OpMemberDecorate %50 1 Offset 8
OpDecorate %47 DescriptorSet 0

1
tests/snapshots/snapshots__shadow.spvasm.snap
View File

@ -23,7 +23,6 @@ OpDecorate %98 BufferBlock
OpMemberDecorate %98 0 Offset 0
OpMemberDecorate %98 0 NonWritable
OpDecorate %99 ArrayStride 96
OpDecorate %100 Block
OpMemberDecorate %100 0 Offset 0
OpMemberDecorate %100 0 ColMajor
OpMemberDecorate %100 0 MatrixStride 16