github/wgpu
1
1
Fork 0
mirror of https://github.com/gfx-rs/wgpu.git synced 2026-04-22 03:02:01 -04:00
Code Issues Packages Projects Releases Wiki Activity

[spv-out] use image_fetch where appropriate (#522)

Browse Source
This commit is contained in:
Dzmitry Malyshau
2021-02-25 09:57:35 -05:00
committed by GitHub
parent 822be23f35
commit 1dc955551b
2 changed files with 26 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/back/spv/instructions.rs
View File

@@ -552,6 +552,20 @@ impl super::Instruction {
instruction
}
pub(super) fn image_fetch(
result_type_id: Word,
id: Word,
image: Word,
coordinates: Word,
) -> Self {
let mut instruction = Self::new(Op::ImageFetch);
instruction.set_type(result_type_id);
instruction.set_result(id);
instruction.add_operand(image);
instruction.add_operand(coordinates);
instruction
}
pub(super) fn image_read(
result_type_id: Word,
id: Word,

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

@@ -1601,19 +1601,26 @@ impl Writer {
)?;
let id = self.generate_id();
let mut instruction =
Instruction::image_read(result_type_id, id, image_id, coordinate_id);
let image_ty = self.typifier.get(image, &ir_module.types);
let mut instruction = match *image_ty {
crate::TypeInner::Image {
class: crate::ImageClass::Storage { .. },
..
} => Instruction::image_read(result_type_id, id, image_id, coordinate_id),
_ => Instruction::image_fetch(result_type_id, id, image_id, coordinate_id),
};
if let Some(index) = index {
let index_id =
self.write_expression(ir_module, ir_function, index, block, function)?;
let image_ops = match *self.typifier.get(image, &ir_module.types) {
let image_ops = match *image_ty {
crate::TypeInner::Image {
class: crate::ImageClass::Sampled { multi: true, .. },
..
} => spirv::ImageOperands::SAMPLE,
_ => spirv::ImageOperands::LOD,
};
let index_id =
self.write_expression(ir_module, ir_function, index, block, function)?;
instruction.add_operand(image_ops.bits());
instruction.add_operand(index_id);
}