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

Expose FramebufferCreateInfo::attachment_count builder for IMAGELESS (#747)

Browse source 
* Expose `FramebufferCreateInfo::attachment_count` builder for `IMAGELESS`

Don't omit the `attachment_count()` builder method, because it is valid
to set the number of attachments without providing attachments in the
`IMAGELESS` case.

Also change the generator array lookup to use the name of the count
field that is allowed to have a builder method, rather than the name of
the field that would use this as `len` field and hence cause it to be
skipped.

* Clean up clones
This commit is contained in:
Marijn Suijten 2023-05-02 10:44:15 +02:00 committed by GitHub
parent 23da5dbc8c
commit ae53f73bae
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 24 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ash/src/vk/definitions.rs
View file

@ -7276,6 +7276,11 @@ impl<'a> FramebufferCreateInfo<'a> {
self
}
#[inline]
pub fn attachment_count(mut self, attachment_count: u32) -> Self {
self.attachment_count = attachment_count;
self
}
#[inline]
pub fn attachments(mut self, attachments: &'a [ImageView]) -> Self {
self.attachment_count = attachments.len() as _;
self.p_attachments = attachments.as_ptr();

37
generator/src/lib.rs
View file

@ -1786,33 +1786,31 @@ pub fn derive_setters(
// Must either have both, or none:
assert_eq!(next_field.is_some(), structure_type_field.is_some());
let nofilter_count_members = [
("VkPipelineViewportStateCreateInfo", "pViewports"),
("VkPipelineViewportStateCreateInfo", "pScissors"),
("VkDescriptorSetLayoutBinding", "pImmutableSamplers"),
let allowed_count_members = [
// pViewports is allowed to be empty if the viewport state is empty
("VkPipelineViewportStateCreateInfo", "viewportCount"),
// Must match viewportCount
("VkPipelineViewportStateCreateInfo", "scissorCount"),
// descriptorCount is settable regardless of having pImmutableSamplers
("VkDescriptorSetLayoutBinding", "descriptorCount"),
// No ImageView attachments when VK_FRAMEBUFFER_CREATE_IMAGELESS_BIT is set
("VkFramebufferCreateInfo", "attachmentCount"),
];
let filter_members: Vec<String> = members
let filter_members = members
.iter()
.filter_map(|(field, _)| {
let field_name = field.name.as_ref().unwrap();
// Associated _count members
if field.array.is_some() {
if let Some(ref array_size) = field.size {
if !nofilter_count_members.contains(&(&struct_.name, field_name)) {
return Some((*array_size).clone());
if let Some(array_size) = &field.size {
if !allowed_count_members.contains(&(&struct_.name, array_size)) {
return Some(array_size);
}
}
}
// VkShaderModuleCreateInfo requires a custom setter
if field_name == "codeSize" {
return Some(field_name.clone());
}
None
})
.collect();
.collect::<Vec<_>>();
let setters = members.iter().filter_map(|(field, deprecated)| {
let deprecated = deprecated.as_ref().map(|d| quote!(#d #[allow(deprecated)]));
@ -1831,12 +1829,15 @@ pub fn derive_setters(
let mut param_ident_short = format_ident!("{}", param_ident_short);
if let Some(name) = field.name.as_ref() {
// Filter
if filter_members.iter().any(|n| *n == *name) {
if filter_members.contains(&name) {
return None;
}
// Unique cases
if struct_.name == "VkShaderModuleCreateInfo" && name == "codeSize" {
return None;
}
if struct_.name == "VkShaderModuleCreateInfo" && name == "pCode" {
return Some(quote!{
#[inline]