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

Move ptr chain tests out of the generator

Browse source
This commit is contained in:
Maik Klein 2019-03-09 19:05:31 +01:00
parent c8c8f69a7c
commit 1744159dfd
2 changed files with 1880 additions and 1930 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3775
ash/src/vk.rs
View file

File diff suppressed because it is too large Load diff

35
generator/src/lib.rs
View file

@ -85,33 +85,6 @@ named!(cfloat<&str, f32>,
terminated!(nom::float_s, char!('f')) terminated!(nom::float_s, char!('f'))
); );
pub fn define_test() -> Tokens {
quote! {
#[cfg(test)]
mod tests {
use vk;
#[test]
fn test_ptr_chains() {
let mut variable_pointers = vk::PhysicalDeviceVariablePointerFeatures::builder();
let mut corner =
vk::PhysicalDeviceCornerSampledImageFeaturesNV::builder();
let chain = vec![
&variable_pointers as *const _ as usize,
&corner as *const _ as usize,
];
let mut device_create_info = vk::DeviceCreateInfo::builder()
.push_next(&mut corner)
.push_next(&mut variable_pointers);
let chain2: Vec<usize> = unsafe {
vk::ptr_chain_iter(&mut device_create_info).skip(1)
.map(|ptr| ptr as usize)
.collect()
};
assert_eq!(chain, chain2);
}
}
}
}
pub fn define_handle_macro() -> Tokens { pub fn define_handle_macro() -> Tokens {
quote! { quote! {
#[macro_export] #[macro_export]
@ -2222,13 +2195,12 @@ pub fn write_source_code(path: &Path) {
let define_handle_macro = define_handle_macro(); let define_handle_macro = define_handle_macro();
let version_macros = vk_version_macros(); let version_macros = vk_version_macros();
let platform_specific_types = platform_specific_types(); let platform_specific_types = platform_specific_types();
let define_test = define_test();
let source_code = quote! { let source_code = quote! {
use std::fmt; use std::fmt;
use std::os::raw::*; use std::os::raw::*;
// Iterates through the pointer chain. Includes the item that is passed into the function. /// Iterates through the pointer chain. Includes the item that is passed into the function.
// Stops at the last `BaseOutStructure` that has a null `p_next` field. /// Stops at the last `BaseOutStructure` that has a null `p_next` field.
pub(crate) unsafe fn ptr_chain_iter<T>( pub unsafe fn ptr_chain_iter<T>(
ptr: &mut T, ptr: &mut T,
) -> impl Iterator<Item = *mut BaseOutStructure> { ) -> impl Iterator<Item = *mut BaseOutStructure> {
use std::ptr::null_mut; use std::ptr::null_mut;
@ -2264,7 +2236,6 @@ pub fn write_source_code(path: &Path) {
#feature_extensions_code #feature_extensions_code
#const_displays #const_displays
#(#aliases)* #(#aliases)*
#define_test
}; };
write!(&mut file, "{}", source_code).expect("Unable to write to file"); write!(&mut file, "{}", source_code).expect("Unable to write to file");
} }