nordic-dev.net/vulkano
nordic-dev.net/vulkano
2
0
Fork 0
mirror of https://github.com/vulkano-rs/vulkano.git synced 2025-02-16 09:02:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

added shader! generate_structs arg duplication error (#2485)

Browse Source 
* shader struct name replacing

* added shader! `generate_structs` arg duplication error

* MacroInput.generate_structs is a bool rather than an Option<bool>

---------

Co-authored-by: Firestar99 <4696087-firestar99@users.noreply.gitlab.com>
This commit is contained in:
Firestar99 2024-03-03 16:04:25 +01:00 committed by GitHub
parent 1b7dfc9814
commit 16973acdab
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
vulkano-shaders/src/lib.rs
View File

@ -418,7 +418,7 @@ impl Parse for MacroInput {
let mut shaders = HashMap::default(); let mut shaders = HashMap::default();
let mut vulkan_version = None; let mut vulkan_version = None;
let mut spirv_version = None; let mut spirv_version = None;
let mut generate_structs = true; let mut generate_structs = None;
let mut custom_derives = None; let mut custom_derives = None;
let mut linalg_type = None; let mut linalg_type = None;
let mut dump = None; let mut dump = None;
@ -658,7 +658,10 @@ impl Parse for MacroInput {
} }
"generate_structs" => { "generate_structs" => {
let lit = input.parse::<LitBool>()?; let lit = input.parse::<LitBool>()?;
generate_structs = lit.value; if generate_structs.is_some() {
bail!(lit, "field `generate_structs` is already defined");
}
generate_structs = Some(lit.value);
} }
"custom_derives" => { "custom_derives" => {
let in_brackets; let in_brackets;
@ -756,7 +759,7 @@ impl Parse for MacroInput {
.collect(), .collect(),
vulkan_version, vulkan_version,
spirv_version, spirv_version,
generate_structs, generate_structs: generate_structs.unwrap_or(true),
custom_derives: custom_derives.unwrap_or_else(|| { custom_derives: custom_derives.unwrap_or_else(|| {
vec![ vec![
parse_quote! { ::std::clone::Clone }, parse_quote! { ::std::clone::Clone },