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

Fix macros #17

Closed
wants to merge 2 commits into from
Closed

Fix macros #17

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e1ba807
Add :: for defines
Feb 16, 2018
2a085b9
Fix `vk_version_major!` and `vk_version_minor!`
Mar 10, 2018
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
8 changes: 4 additions & 4 deletions vk_generator/src/generator/defines.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
#[macro_export]
macro_rules! vk_make_version {
($major: expr, $minor: expr, $patch: expr) => ((($major as uint32_t) << 22) | (($minor as uint32_t) << 12) | $patch as uint32_t)
($major: expr, $minor: expr, $patch: expr) => ((($major as $crate::uint32_t) << 22) | (($minor as $crate::uint32_t) << 12) | $patch as $crate::uint32_t)
}

#[macro_export]
macro_rules! vk_version_major {
($major: expr) => (($major as uint32_t) << 22)
($major: expr) => (($major as $crate::uint32_t) >> 22)
}

#[macro_export]
macro_rules! vk_version_minor {
($minor: expr) => ((($minor as uint32_t) << 12) & 0x3ff)
($minor: expr) => ((($minor as $crate::uint32_t) >> 12) & 0x3ff)
}

#[macro_export]
macro_rules! vk_version_patch {
($minor: expr) => (($minor as uint32_t) & 0xfff)
($minor: expr) => (($minor as $crate::uint32_t) & 0xfff)
}