Sanitize vulkan API version

Author: robamler

wgpu-hal/src/vulkan/adapter.rs

@@ -3,7 +3,7 @@ use std::{borrow::ToOwned as _, collections::BTreeMap, ffi::CStr, sync::Arc, vec
 use ash::{amd, ext, google, khr, vk};
 use parking_lot::Mutex;
 
-use super::conv;
+use super::{conv, remove_variant};
 
 fn depth_stencil_required_flags() -> vk::FormatFeatureFlags {
     vk::FormatFeatureFlags::SAMPLED_IMAGE | vk::FormatFeatureFlags::DEPTH_STENCIL_ATTACHMENT
@@ -1021,7 +1021,7 @@ impl PhysicalDeviceProperties {
             //extensions.push(ext::sampler_filter_minmax::NAME);
         }
 
-        if self.device_api_version < vk::API_VERSION_1_3 {
+        if remove_variant(self.device_api_version) < vk::API_VERSION_1_3 {
             // Optional `VK_EXT_image_robustness`
             if self.supports_extension(ext::image_robustness::NAME) {
                 extensions.push(ext::image_robustness::NAME);
@@ -2016,7 +2016,7 @@ impl super::Adapter {
             if features.contains(wgt::Features::EXPERIMENTAL_RAY_HIT_VERTEX_RETURN) {
                 capabilities.push(spv::Capability::RayQueryPositionFetchKHR)
             }
-            if self.phd_capabilities.device_api_version >= vk::API_VERSION_1_3
+            if remove_variant(self.phd_capabilities.device_api_version) >= vk::API_VERSION_1_3
                 || enabled_extensions.contains(&khr::shader_integer_dot_product::NAME)
             {
                 // See <https://registry.khronos.org/vulkan/specs/latest/man/html/VK_KHR_shader_integer_dot_product.html#_new_spir_v_capabilities>.
@@ -2028,7 +2028,7 @@ impl super::Adapter {
                 ]);
             }
             spv::Options {
-                lang_version: match self.phd_capabilities.device_api_version {
+                lang_version: match remove_variant(self.phd_capabilities.device_api_version) {
                     // Use maximum supported SPIR-V version according to
                     // <https://github.com/KhronosGroup/Vulkan-Docs/blob/19b7651/appendices/spirvenv.adoc?plain=1#L21-L40>.
                     vk::API_VERSION_1_0..vk::API_VERSION_1_1 => (1, 0),

wgpu-hal/src/vulkan/mod.rs

@@ -1490,6 +1490,17 @@ fn get_lost_err() -> crate::DeviceError {
     crate::DeviceError::Lost
 }
 
+/// Removes the variant bits from the API version number.
+///
+/// Returns `api_version` with the variant bits set to zero. The return value can be compared against
+/// predefined constants like [`vk::API_VERSION_1_0`] (comparing to these constants without removing
+/// the variant bits would make any API versions with nonzero variant appear to be very high).
+///
+/// See <https://registry.khronos.org/vulkan/specs/latest/html/vkspec.html#extendingvulkan-coreversions>.
+fn remove_variant(api_version: u32) -> u32 {
+    api_version & 0x1fff_ffff // The variant bits are the top 3 bits of the version number.
+}
+
 #[derive(Clone, Copy, Pod, Zeroable)]
 #[repr(C)]
 struct RawTlasInstance {