Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

update OpenXR-SDK to 1.0.25 #125

Merged
merged 6 commits into from
Oct 8, 2022
Merged

update OpenXR-SDK to 1.0.25 #125

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
9436e8c
update OpenXR-SDK to 1.0.25
kcking Oct 4, 2022
a385cf4
handle nameless flag bitmasks
kcking Oct 5, 2022
93fbc1d
add missing vulkan types
kcking Oct 5, 2022
50504bd
add AsyncRequestIdFB atom wrapper
kcking Oct 5, 2022
d6c7e23
qualify sys::Result in events
kcking Oct 7, 2022
7827301
manually import UuidEXT
kcking Oct 7, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions generator/src/main.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1379,6 +1379,7 @@ impl Parser {
}
})
.collect::<IndexSet<&str>>();

let reexports = simple_structs
.iter()
.cloned()
Expand Down Expand Up @@ -1913,6 +1914,9 @@ impl Parser {
let ident = xr_var_name(&m.name);
let (ty, value) = if m.ty == "XrBool32" {
(quote! { bool }, quote! { (self.0).#ident.into() })
} else if m.ty == "XrResult" {
// prevent name collision with std Result
(quote! { sys::Result }, quote! { (self.0).#ident })
} else if self.handles.contains(&m.ty) {
let ty = xr_var_ty(self.api_aliases.as_ref(), m);
(quote! { sys::#ty }, quote! { (self.0).#ident })
Expand Down Expand Up @@ -2126,6 +2130,12 @@ fn xr_bitmask_value_name(ty: &str, name: &str) -> Ident {
let ty = &ty[0..ty.len() - "Flags".len()];
let prefix_len = ty.to_shouty_snake_case().len() + 1;
let end = name.rfind("_BIT").unwrap();

if prefix_len == end + 1 {
// some BITs have no name, i.e. XR_PASSTHROUGH_CAPABILITY_BIT_FB
// in this case, return PASSTHROUGH_CAPABILITY
return Ident::new(&name["XR_".len()..end], Span::call_site());
}
Ident::new(&name[prefix_len..end], Span::call_site())
}

Expand Down
Loading