tests: Skip ray tracing tests when unsupported

LunarG · Dec 16, 2024 · 5309ad7 · 5309ad7
1 parent 8d91989
commit 5309ad7
Show file tree

Hide file tree

Showing 3 changed files with 59 additions and 8 deletions.
diff --git a/tests/framework/test_fixtures.cpp b/tests/framework/test_fixtures.cpp
@@ -141,6 +141,26 @@ void CDLTestBase::InitInstance() {
     print_phys_devices_ = false;
 }
 
+bool CDLTestBase::ExtensionsSupported(const std::vector<const char*>& extensions) {
+    auto extension_props = physical_device_.enumerateDeviceExtensionProperties();
+    for (const auto* ext_chars : extensions) {
+        bool found = false;
+        std::string_view ext(ext_chars);
+        for (const auto& prop : extension_props) {
+            if (ext == prop.extensionName) {
+                found = true;
+                break;
+            }
+        }
+
+        if (!found) {
+            std::cout << "Device extension " << ext << " is not supported." << std::endl;
+            return false;
+        }
+    }
+    return true;
+}
+
 void CDLTestBase::InitDevice(std::vector<const char*> extensions, const vk::PhysicalDeviceFeatures2* features2) {
     if (!*instance_) {
         InitInstance();

diff --git a/tests/framework/test_fixtures.h b/tests/framework/test_fixtures.h
@@ -39,6 +39,7 @@ class CDLTestBase : public ::testing::Test {
     ~CDLTestBase() {}
     void InitInstance();
     void InitDevice(std::vector<const char*> extensions = {}, const vk::PhysicalDeviceFeatures2* features2 = nullptr);
+    bool ExtensionsSupported(const std::vector<const char*>& extensions);
 
     static void InitArgs(int argc, char* argv[]);
 

diff --git a/tests/unit/ray_tracing.cpp b/tests/unit/ray_tracing.cpp
@@ -46,7 +46,14 @@ TEST_F(RayTracing, BuildPositive) {
         physical_device_
             .getProperties2<vk::PhysicalDeviceProperties2, vk::PhysicalDeviceAccelerationStructurePropertiesKHR>();
 
-    InitDevice({"VK_KHR_acceleration_structure", "VK_KHR_deferred_host_operations"}, &features2);
+    std::vector<const char *> extensions{
+        VK_KHR_ACCELERATION_STRUCTURE_EXTENSION_NAME,
+        VK_KHR_DEFERRED_HOST_OPERATIONS_EXTENSION_NAME,
+    };
+    if (!ExtensionsSupported(extensions)) {
+        GTEST_SKIP() << "Required extensions unsupported.";
+    }
+    InitDevice(extensions, &features2);
 
     constexpr size_t kNumElems = 256;
     constexpr VkDeviceSize kBuffSize = kNumElems * sizeof(float);
@@ -141,7 +148,14 @@ TEST_F(RayTracing, BuildCrash) {
         physical_device_
             .getProperties2<vk::PhysicalDeviceProperties2, vk::PhysicalDeviceAccelerationStructurePropertiesKHR>();
 
-    InitDevice({"VK_KHR_acceleration_structure", "VK_KHR_deferred_host_operations"}, &features2);
+    std::vector<const char *> extensions{
+        VK_KHR_ACCELERATION_STRUCTURE_EXTENSION_NAME,
+        VK_KHR_DEFERRED_HOST_OPERATIONS_EXTENSION_NAME,
+    };
+    if (!ExtensionsSupported(extensions)) {
+        GTEST_SKIP() << "Required extensions unsupported.";
+    }
+    InitDevice(extensions, &features2);
 
     constexpr size_t kNumElems = 256;
     constexpr VkDeviceSize kBuffSize = kNumElems * sizeof(float);
@@ -261,9 +275,17 @@ TEST_F(RayTracing, TraceRaysPositive) {
 
     auto &rt_props = prop_chain.get<vk::PhysicalDeviceRayTracingPipelinePropertiesKHR>();
 
-    InitDevice({VK_KHR_ACCELERATION_STRUCTURE_EXTENSION_NAME, VK_KHR_DEFERRED_HOST_OPERATIONS_EXTENSION_NAME,
-                VK_KHR_RAY_QUERY_EXTENSION_NAME, VK_KHR_RAY_TRACING_PIPELINE_EXTENSION_NAME},
-               &features2);
+    std::vector<const char *> extensions{
+        VK_KHR_ACCELERATION_STRUCTURE_EXTENSION_NAME,
+        VK_KHR_DEFERRED_HOST_OPERATIONS_EXTENSION_NAME,
+        VK_KHR_RAY_QUERY_EXTENSION_NAME,
+        VK_KHR_RAY_TRACING_PIPELINE_EXTENSION_NAME,
+    };
+    if (!ExtensionsSupported(extensions)) {
+        GTEST_SKIP() << "Required extensions unsupported.";
+    }
+    InitDevice(extensions, &features2);
+
     static const char *minimal = R"glsl(
 #version 460
 #extension GL_EXT_ray_tracing : require  // Requires SPIR-V 1.5 (Vulkan 1.2)
@@ -335,9 +357,17 @@ TEST_F(RayTracing, TraceRaysCrash) {
 
     auto &rt_props = prop_chain.get<vk::PhysicalDeviceRayTracingPipelinePropertiesKHR>();
 
-    InitDevice({VK_KHR_ACCELERATION_STRUCTURE_EXTENSION_NAME, VK_KHR_DEFERRED_HOST_OPERATIONS_EXTENSION_NAME,
-                VK_KHR_RAY_QUERY_EXTENSION_NAME, VK_KHR_RAY_TRACING_PIPELINE_EXTENSION_NAME},
-               &features2);
+    std::vector<const char *> extensions{
+        VK_KHR_ACCELERATION_STRUCTURE_EXTENSION_NAME,
+        VK_KHR_DEFERRED_HOST_OPERATIONS_EXTENSION_NAME,
+        VK_KHR_RAY_QUERY_EXTENSION_NAME,
+        VK_KHR_RAY_TRACING_PIPELINE_EXTENSION_NAME,
+    };
+    if (!ExtensionsSupported(extensions)) {
+        GTEST_SKIP() << "Required extensions unsupported.";
+    }
+    InitDevice(extensions, &features2);
+
     static const char *minimal = R"glsl(
 #version 460
 #extension GL_EXT_ray_tracing : require  // Requires SPIR-V 1.5 (Vulkan 1.2)