alex/ash
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Builder pattern: Bool32 -> bool. Edge cases added

Browse source
This commit is contained in:
Matus Talcik 2018-11-12 23:22:16 +01:00
parent 7bdd6a47f9
commit 8a82125788
2 changed files with 1864 additions and 1819 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3624
ash/src/vk.rs
View file

File diff suppressed because it is too large Load diff

37
generator/src/lib.rs
View file

@ -1283,26 +1283,34 @@ pub fn derive_debug(_struct: &vkxml::Struct, union_types: &HashSet<&str>) -> Opt
pub fn derive_setters(_struct: &vkxml::Struct) -> Option<Tokens> { pub fn derive_setters(_struct: &vkxml::Struct) -> Option<Tokens> {
let name = name_to_tokens(&_struct.name); let name = name_to_tokens(&_struct.name);
let name_builder = name_to_tokens(&(_struct.name.to_string() + "Builder")); let name_builder = name_to_tokens(&(_struct.name.clone() + "Builder"));
let members = _struct.elements.iter().filter_map(|elem| match *elem { let members = _struct.elements.iter().filter_map(|elem| match *elem {
vkxml::StructElement::Member(ref field) => Some(field), vkxml::StructElement::Member(ref field) => Some(field),
_ => None, _ => None,
}); });
let nofilter_count_members = [
"VkPipelineViewportStateCreateInfo.pViewports",
"VkPipelineViewportStateCreateInfo.pScissors",
"VkDescriptorSetLayoutBinding.pImmutableSamplers",
];
let filter_members: Vec<String> = members.clone().filter_map(|field| { let filter_members: Vec<String> = members.clone().filter_map(|field| {
let field_name = field.name.as_ref().unwrap();
// Associated _count members // Associated _count members
if field.array.is_some() { if field.array.is_some() {
if let Some(ref array_size) = field.size { if let Some(ref array_size) = field.size {
if !array_size.starts_with("latexmath") { if !array_size.starts_with("latexmath")
&& !nofilter_count_members.iter().any(|n| *n == &(_struct.name.clone() + "." + field_name)) {
return Some((*array_size).clone()); return Some((*array_size).clone());
} }
} }
} }
// VkShaderModuleCreateInfo requiers a custom setter // VkShaderModuleCreateInfo requiers a custom setter
if field.name.as_ref().unwrap() == "codeSize" { if field_name == "codeSize" {
return Some(field.name.clone().unwrap()); return Some(field_name.clone());
} }
None None
@ -1311,6 +1319,7 @@ pub fn derive_setters(_struct: &vkxml::Struct) -> Option<Tokens> {
let setters = members.clone().filter_map(|field| { let setters = members.clone().filter_map(|field| {
let param_ident = field.param_ident(); let param_ident = field.param_ident();
let param_ty_tokens = field.type_tokens(); let param_ty_tokens = field.type_tokens();
let param_ty_string = param_ty_tokens.to_string();
let param_ident_string = param_ident.to_string(); let param_ident_string = param_ident.to_string();
if param_ident_string == "s_type" || param_ident_string == "p_next" { if param_ident_string == "s_type" || param_ident_string == "p_next" {
@ -1342,12 +1351,19 @@ pub fn derive_setters(_struct: &vkxml::Struct) -> Option<Tokens> {
} }
}); });
} }
if name == "pSampleMask" {
return Some(quote!{
pub fn sample_mask(mut self, sample_mask: &'a [SampleMask]) -> #name_builder<'a> {
self.inner.p_sample_mask = sample_mask.as_ptr() as *const SampleMask;
self
}
});
}
} }
// TODO: Improve in future when https://github.com/rust-lang/rust/issues/53667 is merged // TODO: Improve in future when https://github.com/rust-lang/rust/issues/53667 is merged
if param_ident_string.starts_with("p_") || param_ident_string.starts_with("pp_") { if param_ident_string.starts_with("p_") || param_ident_string.starts_with("pp_") {
let param_ty_string = param_ty_tokens.to_string();
if param_ty_string == "*const c_char" { if param_ty_string == "*const c_char" {
return Some(quote!{ return Some(quote!{
pub fn #param_ident_short(mut self, #param_ident_short: &'a ::std::ffi::CStr) -> #name_builder<'a> { pub fn #param_ident_short(mut self, #param_ident_short: &'a ::std::ffi::CStr) -> #name_builder<'a> {
@ -1421,6 +1437,15 @@ pub fn derive_setters(_struct: &vkxml::Struct) -> Option<Tokens> {
} }
} }
if param_ty_string == "Bool32" {
return Some(quote!{
pub fn #param_ident_short(mut self, #param_ident_short: bool) -> #name_builder<'a> {
self.inner.#param_ident = #param_ident_short.into();
self
}
});
}
Some(quote!{ Some(quote!{
pub fn #param_ident_short(mut self, #param_ident_short: #param_ty_tokens) -> #name_builder<'a> { pub fn #param_ident_short(mut self, #param_ident_short: #param_ty_tokens) -> #name_builder<'a> {
self.inner.#param_ident = #param_ident_short; self.inner.#param_ident = #param_ident_short;