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

wgsl-in: require storage class to be given

Browse Source
This commit is contained in:
Dzmitry Malyshau 2021-09-13 15:34:33 -04:00 committed by Dzmitry Malyshau
parent 0e66930aff
commit 807accd7de
3 changed files with 11 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/back/wgsl/writer.rs
View File

@ -1035,9 +1035,15 @@ impl<W: Write> Writer<W> {
// operator necessary to correct that.
let plain = plain_form_indirection(expr, module, func_ctx);
let opened_paren = match (requested, plain) {
(Indirection::Ordinary, Indirection::Reference) => { write!(self.out, "&")?; false },
(Indirection::Reference, Indirection::Ordinary) => { write!(self.out, "(*")?; true },
(_, _) => { false },
(Indirection::Ordinary, Indirection::Reference) => {
write!(self.out, "&")?;
false
}
(Indirection::Reference, Indirection::Ordinary) => {
write!(self.out, "(*")?;
true
}
(_, _) => false,
};
let expression = &func_ctx.expressions[expr];

19
src/front/wgsl/mod.rs
View File

@ -3850,27 +3850,10 @@ impl Parser {
(Token::Word("var"), _) => {
let pvar =
self.parse_variable_decl(lexer, &mut module.types, &mut module.constants)?;
let class = match pvar.class {
Some(c) => c,
None => match module.types[pvar.ty].inner {
crate::TypeInner::Struct { .. } if binding.is_some() => {
crate::StorageClass::Uniform
}
crate::TypeInner::Array { .. } if binding.is_some() => {
crate::StorageClass::Storage {
access: crate::StorageAccess::LOAD,
}
}
crate::TypeInner::Image { .. } | crate::TypeInner::Sampler { .. } => {
crate::StorageClass::Handle
}
_ => crate::StorageClass::Private,
},
};
let var_handle = module.global_variables.append(
crate::GlobalVariable {
name: Some(pvar.name.to_owned()),
class,
class: pvar.class.unwrap_or(crate::StorageClass::Handle),
binding: binding.take(),
ty: pvar.ty,
init: pvar.init,

2
tests/in/skybox.wgsl
View File

@ -9,7 +9,7 @@ struct Data {
view: mat4x4<f32>;
};
[[group(0), binding(0)]]
var r_data: Data;
var<uniform> r_data: Data;
[[stage(vertex)]]
fn vs_main([[builtin(vertex_index)]] vertex_index: u32) -> VertexOutput {