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

Fixup metal type exports

Browse Source
This commit is contained in:
Dzmitry Malyshau
2020-03-02 16:56:10 -05:00
parent 2f0540c6ab
commit aba9e8a0f2
3 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@@ -20,7 +20,7 @@ Back-end | Status | Notes |
--------------- | ------------------ | ----- |
SPIR-V (binary) | | |
WGSL | | |
MSL | :construction: | |
Metal | :construction: | |
HLSL | | |
GLSL | | |
AIR | | |

2
examples/convert.rs
View File

@@ -21,7 +21,7 @@ fn main() {
if args.len() <= 2 {
println!("{:?}", module);
return
} else if args[2].ends_with(".msl") {
} else if args[2].ends_with(".metal") {
use naga::back::msl;
let mut binding_map = msl::BindingMap::default();
binding_map.insert(

22
src/back/msl.rs
View File

@@ -448,20 +448,19 @@ impl<W: Write> Writer<W> {
// write down complex types
writeln!(self.out, "")?;
for (token, ty) in module.types.iter() {
write!(self.out, "typedef ")?;
let name = ty.name.or_index(token);
match ty.inner {
crate::TypeInner::Void => {
write!(self.out, "void {}", name)?;
write!(self.out, "typedef void {}", name)?;
},
crate::TypeInner::Scalar { kind, .. } => {
write!(self.out, "{} {}", scalar_kind_string(kind), name)?;
write!(self.out, "typedef {} {}", scalar_kind_string(kind), name)?;
},
crate::TypeInner::Vector { size, kind, .. } => {
write!(self.out, "{}{} {}", scalar_kind_string(kind), vector_size_string(size), name)?;
write!(self.out, "typedef {}{} {}", scalar_kind_string(kind), vector_size_string(size), name)?;
},
crate::TypeInner::Matrix { columns, rows, kind, .. } => {
write!(self.out, "{}{}x{} {}", scalar_kind_string(kind), vector_size_string(columns), vector_size_string(rows), name)?;
write!(self.out, "typedef {}{}x{} {}", scalar_kind_string(kind), vector_size_string(columns), vector_size_string(rows), name)?;
}
crate::TypeInner::Pointer { base, class } => {
let base_name = module.types[base].name.or_index(base);
@@ -474,11 +473,11 @@ impl<W: Write> Writer<W> {
""
}
};
write!(self.out, "{} {} *{}", class_name, base_name, name)?;
write!(self.out, "typedef {} {} *{}", class_name, base_name, name)?;
}
crate::TypeInner::Array { base, size } => {
let base_name = module.types[base].name.or_index(base);
write!(self.out, "{} {}[{}]", base_name, name, size)?;
write!(self.out, "typedef {} {}[{}]", base_name, name, size)?;
}
crate::TypeInner::Struct { ref members } => {
writeln!(self.out, "struct {} {{", name)?;
@@ -492,7 +491,7 @@ impl<W: Write> Writer<W> {
}
writeln!(self.out, ";")?;
}
writeln!(self.out, "}};")?;
write!(self.out, "}}")?;
}
crate::TypeInner::Image { base, dim, flags } => {
let base_name = module.types[base].name.or_index(base);
@@ -509,12 +508,13 @@ impl<W: Write> Writer<W> {
"write"
} else {
assert!(flags.contains(crate::ImageFlags::READABLE));
"read"
//TODO: figure out when to use `read`
"sample"
};
write!(self.out, "texture{}<{}, access::{}> {}", dim, base_name, access, name)?;
write!(self.out, "typedef texture{}<{}, access::{}> {}", dim, base_name, access, name)?;
}
crate::TypeInner::Sampler => {
write!(self.out, "sampler {}", name)?;
write!(self.out, "typedef sampler {}", name)?;
}
}
writeln!(self.out, ";")?;