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-in] fix OpString and OpLine parsing

Browse Source
This commit is contained in:
Dzmitry Malyshau
2021-02-23 16:55:19 -05:00
committed by Dzmitry Malyshau
parent 9c47a5fe17
commit df14c4b7ca
1 changed files with 16 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/front/spv/mod.rs
View File

@@ -599,6 +599,12 @@ impl<I: Iterator<Item = u32>> Parser<I> {
log::debug!("\t\t{:?} [{}]", inst.op, inst.wc);
match inst.op {
Op::Line => {
inst.expect(4)?;
let _file_id = self.next()?;
let _row_id = self.next()?;
let _col_id = self.next()?;
}
Op::Undef => {
inst.expect(3)?;
let _result_type_id = self.next()?;
@@ -1646,9 +1652,16 @@ impl<I: Iterator<Item = u32>> Parser<I> {
self.index_constants.push(handle);
}
while let Ok(inst) = self.next_inst() {
loop {
use spirv::Op;
let inst = match self.next_inst() {
Ok(inst) => inst,
Err(Error::IncompleteData) => break,
Err(other) => return Err(other),
};
log::debug!("\t{:?} [{}]", inst.op, inst.wc);
match inst.op {
Op::Capability => self.parse_capability(inst),
Op::Extension => self.parse_extension(inst),
@@ -1846,7 +1859,8 @@ impl<I: Iterator<Item = u32>> Parser<I> {
fn parse_string(&mut self, inst: Instruction) -> Result<(), Error> {
self.switch(ModuleState::Source, inst.op)?;
inst.expect_at_least(3)?;
let (_name, _) = self.next_string(inst.wc - 1)?;
let _id = self.next()?;
let (_name, _) = self.next_string(inst.wc - 2)?;
Ok(())
}