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] Generating constants is not, in fact, fallible.

Browse Source
This commit is contained in:
Jim Blandy
2021-08-18 11:13:11 -07:00
committed by Dzmitry Malyshau
parent 01250b85fe
commit cefaa396d4
4 changed files with 29 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/back/spv/block.rs
View File

@@ -54,7 +54,7 @@ impl Writer {
width: 4,
pointer_class: Some(spirv::StorageClass::Output),
}));
let index_y_id = self.get_index_constant(1)?;
let index_y_id = self.get_index_constant(1);
body.push(Instruction::access_chain(
float_ptr_type_id,
access_id,
@@ -687,8 +687,8 @@ impl<'w> BlockContext<'w> {
};
let instruction = if let Some(class) = atomic_class {
let (semantics, scope) = class.to_spirv_semantics_and_scope();
let scope_constant_id = self.get_scope_constant(scope as u32)?;
let semantics_id = self.get_index_constant(semantics.bits())?;
let scope_constant_id = self.get_scope_constant(scope as u32);
let semantics_id = self.get_index_constant(semantics.bits());
Instruction::atomic_load(
result_type_id,
id,
@@ -764,7 +764,7 @@ impl<'w> BlockContext<'w> {
}
Sk::Bool => unreachable!(),
};
let zero_id = self.writer.get_constant_scalar(value, 4)?;
let zero_id = self.writer.get_constant_scalar(value, 4);
Instruction::binary(op, result_type_id, id, expr_id, zero_id)
}
@@ -932,7 +932,7 @@ impl<'w> BlockContext<'w> {
let zero_id = self
.writer
.get_constant_scalar(crate::ScalarValue::Float(0.0), 4)?;
.get_constant_scalar(crate::ScalarValue::Float(0.0), 4);
mask |= spirv::ImageOperands::LOD;
inst.add_operand(mask.bits());
@@ -1138,7 +1138,7 @@ impl<'w> BlockContext<'w> {
_ => {
let level_id = match level {
Some(expr) => self.cached[expr],
None => self.get_index_constant(0)?,
None => self.get_index_constant(0),
};
(spirv::Op::ImageQuerySizeLod, Some(level_id))
}
@@ -1207,7 +1207,7 @@ impl<'w> BlockContext<'w> {
id_extended,
image_id,
);
inst.add_operand(self.get_index_constant(0)?);
inst.add_operand(self.get_index_constant(0));
block.body.push(inst);
let id = self.gen_id();
block.body.push(Instruction::composite_extract(
@@ -1291,7 +1291,7 @@ impl<'w> BlockContext<'w> {
// Even if the index is known, `OpAccessIndex`
// requires expression operands, not literals.
let scalar = crate::ScalarValue::Uint(known_index as u64);
self.writer.get_constant_scalar(scalar, 4)?
self.writer.get_constant_scalar(scalar, 4)
}
BoundsCheckResult::Computed(computed_index_id) => computed_index_id,
BoundsCheckResult::Conditional(comparison_id) => {
@@ -1322,7 +1322,7 @@ impl<'w> BlockContext<'w> {
base
}
crate::Expression::AccessIndex { base, index } => {
let const_id = self.get_index_constant(index)?;
let const_id = self.get_index_constant(index);
self.temp_list.push(const_id);
base
}
@@ -1601,9 +1601,9 @@ impl<'w> BlockContext<'w> {
spirv::MemorySemantics::WORKGROUP_MEMORY,
flags.contains(crate::Barrier::WORK_GROUP),
);
let exec_scope_id = self.get_index_constant(spirv::Scope::Workgroup as u32)?;
let mem_scope_id = self.get_index_constant(memory_scope as u32)?;
let semantics_id = self.get_index_constant(semantics.bits())?;
let exec_scope_id = self.get_index_constant(spirv::Scope::Workgroup as u32);
let mem_scope_id = self.get_index_constant(memory_scope as u32);
let semantics_id = self.get_index_constant(semantics.bits());
block.body.push(Instruction::control_barrier(
exec_scope_id,
mem_scope_id,
@@ -1628,8 +1628,8 @@ impl<'w> BlockContext<'w> {
};
let instruction = if let Some(class) = atomic_class {
let (semantics, scope) = class.to_spirv_semantics_and_scope();
let scope_constant_id = self.get_scope_constant(scope as u32)?;
let semantics_id = self.get_index_constant(semantics.bits())?;
let scope_constant_id = self.get_scope_constant(scope as u32);
let semantics_id = self.get_index_constant(semantics.bits());
Instruction::atomic_store(
pointer_id,
scope_constant_id,
@@ -1741,8 +1741,8 @@ impl<'w> BlockContext<'w> {
_ => unimplemented!(),
};
let (semantics, scope) = class.to_spirv_semantics_and_scope();
let scope_constant_id = self.get_scope_constant(scope as u32)?;
let semantics_id = self.get_index_constant(semantics.bits())?;
let scope_constant_id = self.get_scope_constant(scope as u32);
let semantics_id = self.get_index_constant(semantics.bits());
let value_id = self.cached[value];
let value_inner = self.fun_info[value].ty.inner_with(&self.ir_module.types);

6
src/back/spv/index.rs
View File

@@ -141,7 +141,7 @@ impl<'w> BlockContext<'w> {
}
MaybeKnown::Computed(length_id) => {
// Emit code to compute the max index from the length.
let const_one_id = self.get_index_constant(1)?;
let const_one_id = self.get_index_constant(1);
let max_index_id = self.gen_id();
block.body.push(Instruction::binary(
spirv::Op::ISub,
@@ -196,7 +196,7 @@ impl<'w> BlockContext<'w> {
}
}
self.get_index_constant(known_max_index)?
self.get_index_constant(known_max_index)
}
MaybeKnown::Computed(max_index_id) => max_index_id,
};
@@ -271,7 +271,7 @@ impl<'w> BlockContext<'w> {
}
}
self.get_index_constant(known_length)?
self.get_index_constant(known_length)
}
MaybeKnown::Computed(length_id) => length_id,
};

4
src/back/spv/mod.rs
View File

@@ -364,12 +364,12 @@ impl BlockContext<'_> {
self.writer.get_expression_type_id(tr)
}
fn get_index_constant(&mut self, index: Word) -> Result<Word, Error> {
fn get_index_constant(&mut self, index: Word) -> Word {
self.writer
.get_constant_scalar(crate::ScalarValue::Uint(index as _), 4)
}
fn get_scope_constant(&mut self, scope: Word) -> Result<Word, Error> {
fn get_scope_constant(&mut self, scope: Word) -> Word {
self.writer
.get_constant_scalar(crate::ScalarValue::Sint(scope as _), 4)
}

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

@@ -829,7 +829,7 @@ impl Writer {
Ok(id)
}
pub(super) fn get_index_constant(&mut self, index: Word) -> Result<Word, Error> {
pub(super) fn get_index_constant(&mut self, index: Word) -> Word {
self.get_constant_scalar(crate::ScalarValue::Uint(index as _), 4)
}
@@ -837,14 +837,14 @@ impl Writer {
&mut self,
value: crate::ScalarValue,
width: crate::Bytes,
) -> Result<Word, Error> {
) -> Word {
if let Some(&id) = self.cached_constants.get(&(value, width)) {
return Ok(id);
return id;
}
let id = self.id_gen.next();
self.write_constant_scalar(id, &value, width, None)?;
self.write_constant_scalar(id, &value, width, None);
self.cached_constants.insert((value, width), id);
Ok(id)
id
}
fn write_constant_scalar(
@@ -853,7 +853,7 @@ impl Writer {
value: &crate::ScalarValue,
width: crate::Bytes,
debug_name: Option<&String>,
) -> Result<(), Error> {
) {
if self.flags.contains(WriterFlags::DEBUG) {
if let Some(name) = debug_name {
self.debugs.push(Instruction::name(id, name));
@@ -915,7 +915,6 @@ impl Writer {
};
instruction.to_words(&mut self.logical_layout.declarations);
Ok(())
}
fn write_constant_composite(
@@ -1168,10 +1167,10 @@ impl Writer {
self.constant_ids[handle.index()] = match constant.name {
Some(ref name) => {
let id = self.id_gen.next();
self.write_constant_scalar(id, value, width, Some(name))?;
self.write_constant_scalar(id, value, width, Some(name));
id
}
None => self.get_constant_scalar(*value, width)?,
None => self.get_constant_scalar(*value, width),
};
}
}