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

Fix pipeline_layout! macro with more than one field and one set

Browse Source
This commit is contained in:
Pierre Krieger 2016-04-05 15:59:43 +02:00
parent 02ff479326
commit b9b1cb48eb
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
vulkano/src/descriptor/pipeline_layout/custom_pipeline_macro.rs
View File

@ -82,7 +82,7 @@ macro_rules! pipeline_layout {
}
}*/
pipeline_layout!{__inner__ (0) $($name: {$($field: $ty),*}),*}
pipeline_layout!{__inner__ (0) $($name: {$($field: $ty),*})*}
};
(__inner__ ($num:expr) $name:ident: { $($field:ident: $ty:ty),* } $($rest:tt)*) => {
@ -142,7 +142,7 @@ macro_rules! pipeline_layout {
#[allow(non_camel_case_types)]
pub fn new<$($field: ValidParameter<$ty>),*>
(pool: &Arc<DescriptorPool>, layout: &Arc<CustomPipeline>,
descriptors: &Descriptors<$($field)*>)
descriptors: &Descriptors<$($field),*>)
-> Result<Arc<Set>, OomError>
{
#![allow(unsafe_code)]
@ -252,7 +252,12 @@ mod tests {
mod layout {
pipeline_layout! {
set0: {
field1: UniformBuffer<[u8]>
field1: UniformBuffer<[u8]>,
field2: UniformBuffer<[u8]>
},
set1: {
field1: UniformBuffer<[u8]>,
field2: UniformBuffer<[u8]>
}
}
}