From 0993d57f8e026efd1aad3fb46682dd338ec5649c Mon Sep 17 00:00:00 2001 From: hodasemi Date: Wed, 22 Feb 2023 09:35:42 +0100 Subject: [PATCH] Make api version optional --- vulkan-rs/src/instance.rs | 4 ++-- vulkan-sys/src/lib.rs | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/vulkan-rs/src/instance.rs b/vulkan-rs/src/instance.rs index aeeaa35..188cb38 100644 --- a/vulkan-rs/src/instance.rs +++ b/vulkan-rs/src/instance.rs @@ -120,7 +120,7 @@ impl Instance { instance: VkInstance, proc_addr: PFN_vkGetInstanceProcAddr, extensions: &[VkString], - api_version: u32, + api_version: Option, ) -> Result> { log("Instance::preinitialized: start"); @@ -168,7 +168,7 @@ impl Instance { debug_report: None, - api_version, + api_version: api_version.unwrap_or(VK_MAKE_VERSION(1, 0, 0)), }); Ok(instance) diff --git a/vulkan-sys/src/lib.rs b/vulkan-sys/src/lib.rs index f9369f4..8ef4519 100644 --- a/vulkan-sys/src/lib.rs +++ b/vulkan-sys/src/lib.rs @@ -12,11 +12,11 @@ pub mod types; pub mod functions; -pub fn VK_MAKE_VERSION(major: u32, minor: u32, patch: u32) -> u32 { +pub const fn VK_MAKE_VERSION(major: u32, minor: u32, patch: u32) -> u32 { (major as u32) << 22 | (minor as u32) << 12 | (patch as u32) } -pub fn VK_GET_VERSION(version: u32) -> (u32, u32, u32) { +pub const fn VK_GET_VERSION(version: u32) -> (u32, u32, u32) { let major = version >> 22; let minor = (version >> 12) & 0x03FF; let patch = version & 0x00CF;