Skip to content

Improve error messages #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
swiftcoder merged 4 commits into from
Jul 31, 2020
Merged

Improve error messages #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
dbb71b9
Improve error messages
DasEtwas Jul 30, 2020
9baae01
oops
DasEtwas Jul 30, 2020
d67c9b2
oops^2
DasEtwas Jul 30, 2020
2af5c2e
update spirq
DasEtwas Jul 30, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion spirv_struct_layout/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,4 @@ readme = "../README.md"

[dependencies]
spirv-struct-layout-derive = { version = "0.1", path = "../spirv_struct_layout_derive" }
spirq = "0.2"
spirq = "0.4"
6 changes: 3 additions & 3 deletions spirv_struct_layout_derive/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,9 @@ pub fn spirv_layout_derive(input: proc_macro::TokenStream) -> proc_macro::TokenS
#repr_check

let spv: spirq::SpirvBinary = spirv.into();
let entries = spv.reflect().unwrap();
let entries = spv.reflect().expect("Failed to parse SPIR-V");

let buffer_desc = entries[0].resolve_desc(spirq::sym::Sym::new(name)).unwrap();
let buffer_desc = entries[0].resolve_desc(spirq::sym::Sym::new(name)).expect(format!("Failed to find symbol with name \"{}\"", name).as_str());

let mut _rust_offset = 0;

Expand Down Expand Up @@ -64,7 +64,7 @@ fn build_function_body(data: &Data) -> TokenStream {

if let Some(desc) = buffer_desc.desc_ty.resolve(spirq::sym::Sym::new(&symbol)) {
let spirv_offset = desc.offset;
let spirv_size = desc.ty.nbyte().unwrap();
let spirv_size = desc.ty.nbyte().expect(format!("Rust struct field named \"{}\" does not have a basic data type (float, vec, mat, array, struct) as a SPIR-V counterpart", &symbol).as_str());

assert_eq!(
spirv_size, rust_size,
Expand Down