From ec66a9c9a693ef1dd9a5b7f7616734a65fbde5e8 Mon Sep 17 00:00:00 2001
From: i509VCB <git@i509.me>
Date: Wed, 22 Nov 2023 16:25:57 -0600
Subject: [PATCH] wgpu-hal(vk): Add WGPU_ALLOW_NONCOMPLIANT_ADAPTER

This allows a noncompliant adapter per VK_KHR_driver_properties to be used if the WGPU_ALLOW_NONCOMPLIANT_ADAPTER environment variable is added.
---
 CHANGELOG.md                   | 4 ++++
 README.md                      | 1 +
 wgpu-hal/src/vulkan/adapter.rs | 6 ++++++
 wgpu-types/src/lib.rs          | 8 ++++++++
 4 files changed, 19 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index cf4c4738ee..54bb9d1420 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -40,6 +40,10 @@ Bottom level categories:
 
 ## Unreleased
 
+### `WGPU_ALLOW_NONCOMPLIANT_ADAPTER` environment variable
+
+This adds a way to allow a Vulkan driver which is non-compliant per VK_KHR_driver_properties to be enumerated. This is intended for testing new Vulkan drivers which are not Vulkan compliant yet.
+
 ### New Features
 
 #### General
diff --git a/README.md b/README.md
index e8df5f5ec2..3a75ae864a 100644
--- a/README.md
+++ b/README.md
@@ -143,6 +143,7 @@ All testing and example infrastructure shares the same set of environment variab
 - `WGPU_POWER_PREF` with the power preference to choose when a specific adapter name isn't specified (`high`, `low` or `none`)
 - `WGPU_DX12_COMPILER` with the DX12 shader compiler you wish to use (`dxc` or `fxc`, note that `dxc` requires `dxil.dll` and `dxcompiler.dll` to be in the working directory otherwise it will fall back to `fxc`)
 - `WGPU_GLES_MINOR_VERSION` with the minor OpenGL ES 3 version number to request (`0`, `1`, `2` or `automatic`).
+- `WGPU_ALLOW_NONCOMPLIANT_ADAPTER` with a boolean whether non-compliant drivers are enumerated (`0` for false, `1` for true).
 
 When running the CTS, use the variables `DENO_WEBGPU_ADAPTER_NAME`, `DENO_WEBGPU_BACKEND`, `DENO_WEBGPU_POWER_PREFERENCE`.
 
diff --git a/wgpu-hal/src/vulkan/adapter.rs b/wgpu-hal/src/vulkan/adapter.rs
index 5e6c2db1c3..1990bb82bd 100644
--- a/wgpu-hal/src/vulkan/adapter.rs
+++ b/wgpu-hal/src/vulkan/adapter.rs
@@ -995,6 +995,12 @@ impl super::Instance {
             if driver.conformance_version.major == 0 {
                 if driver.driver_id == ash::vk::DriverId::MOLTENVK {
                     log::debug!("Adapter is not Vulkan compliant, but is MoltenVK, continuing");
+                } else if self
+                    .shared
+                    .flags
+                    .contains(wgt::InstanceFlags::ALLOW_NONCOMPLIANT_ADAPTER)
+                {
+                    log::warn!("Adapter is not Vulkan compliant: {}", info.name);
                 } else {
                     log::warn!(
                         "Adapter is not Vulkan compliant, hiding adapter: {}",
diff --git a/wgpu-types/src/lib.rs b/wgpu-types/src/lib.rs
index c9582fb93f..13447bdf05 100644
--- a/wgpu-types/src/lib.rs
+++ b/wgpu-types/src/lib.rs
@@ -858,6 +858,11 @@ bitflags::bitflags! {
         const VALIDATION = 1 << 1;
         /// Don't pass labels to wgpu-hal.
         const DISCARD_HAL_LABELS = 1 << 2;
+        /// Whether non-compliant adapters should be enumerated.
+        ///
+        /// This mainly applies to a Vulkan driver's compliance version. If the major compliance version
+        /// is `0`, then the driver is ignored. This flag allows that driver to be enabled for testing.
+        const ALLOW_NONCOMPLIANT_ADAPTER = 1 << 3;
     }
 }
 
@@ -910,6 +915,9 @@ impl InstanceFlags {
         if let Some(bit) = env("WGPU_DEBUG") {
             self.set(Self::DEBUG, bit);
         }
+        if let Some(bit) = env("WGPU_ALLOW_NONCOMPLIANT_ADAPTER") {
+            self.set(Self::ALLOW_NONCOMPLIANT_ADAPTER, bit);
+        }
 
         self
     }