Add test for vkGetPhysicalDeviceToolProperties

Basic tests which just makes sure the trampoline + terminator pass the data
through correctly. Data only originates from TestICD, TestLayer has no
support for the extension.

diff --git a/tests/framework/icd/test_icd.cpp b/tests/framework/icd/test_icd.cpp
index d3fcd4a22128d4818b3ac0efa3f99c9346807863..d0f1ef48f2ffe45f5e24e94a3edcef4bab60c72f 100644 (file)
--- a/tests/framework/icd/test_icd.cpp
+++ b/tests/framework/icd/test_icd.cpp
@@ -267,7 +267,26 @@ VKAPI_ATTR void VKAPI_CALL test_vkDestroyDevice(VkDevice device, const VkAllocat
     if (found != icd.device_handles.end()) icd.device_handles.erase(found);
 }
 
-//// WSI
+VKAPI_ATTR VkResult VKAPI_CALL test_vkGetPhysicalDeviceToolPropertiesEXT(VkPhysicalDevice physicalDevice, uint32_t* pToolCount,
+                                                                         VkPhysicalDeviceToolPropertiesEXT* pToolProperties) {
+    if (icd.tooling_properties.size() == 0) {
+        return VK_SUCCESS;
+    }
+    if (pToolProperties == nullptr && pToolCount != nullptr) {
+        *pToolCount = static_cast<uint32_t>(icd.tooling_properties.size());
+    } else if (pToolCount != nullptr) {
+        for (size_t i = 0; i < *pToolCount; i++) {
+            if (i >= icd.tooling_properties.size()) {
+                return VK_INCOMPLETE;
+            }
+            pToolProperties[i] = icd.tooling_properties[i];
+        }
+    }
+    return VK_SUCCESS;
+}
+
+//// WSI ////
+
 #ifdef VK_USE_PLATFORM_ANDROID_KHR
 VKAPI_ATTR VkResult VKAPI_CALL test_vkCreateAndroidSurfaceKHR(VkInstance instance, const VkAndroidSurfaceCreateInfoKHR* pCreateInfo,
                                                               const VkAllocationCallbacks* pAllocator, VkSurfaceKHR* pSurface) {
@@ -502,6 +521,10 @@ PFN_vkVoidFunction get_physical_device_func(VkInstance instance, const char* pNa
             return TO_VOID_PFN(test_vkGetPhysicalDeviceImageFormatProperties2);
         }
     }
+    if (icd.supports_tooling_info_ext) {
+        if (string_eq(pName, "vkGetPhysicalDeviceToolPropertiesEXT")) return TO_VOID_PFN(test_vkGetPhysicalDeviceToolPropertiesEXT);
+    }
+
     for (auto& func : icd.custom_physical_device_functions) {
         if (func.name == pName) {
             return TO_VOID_PFN(func.function);

diff --git a/tests/framework/icd/test_icd.h b/tests/framework/icd/test_icd.h
index d8341533277fc037bbbd54087a054855184d0c20..3c9158263ec3697403e1472954bbc082c406f0cf 100644 (file)
--- a/tests/framework/icd/test_icd.h
+++ b/tests/framework/icd/test_icd.h
@@ -85,6 +85,12 @@ struct TestICD {
     std::vector<VulkanFunction> custom_instance_functions;
     std::vector<VulkanFunction> custom_physical_device_functions;
 
+    // Must explicitely state support for the tooling info extension, that way we can control if vkGetInstanceProcAddr returns a
+    // function pointer for vkGetPhysicalDeviceToolPropertiesEXT
+    bool supports_tooling_info_ext = false;
+    // List of tooling properties that this driver 'supports'
+    std::vector<VkPhysicalDeviceToolPropertiesEXT> tooling_properties;
+
     TestICD() {}
     ~TestICD() {}
 

diff --git a/tests/loader_regression_tests.cpp b/tests/loader_regression_tests.cpp
index 010c4245281fef099b8066901a88272e28cdabec..d1687a4f5714b2b35d3c07b4983f8429dc8f7305 100644 (file)
--- a/tests/loader_regression_tests.cpp
+++ b/tests/loader_regression_tests.cpp
@@ -840,3 +840,36 @@ TEST(EnvironmentVariables, VK_LAYER_PATH) {
     EXPECT_TRUE(env.debug_log.find((HOME / "/ with spaces/").str()));
 }
 #endif
+
+TEST(ExtensionManual, ToolingProperties) {
+    VkPhysicalDeviceToolPropertiesEXT icd_tool_props{VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_TOOL_PROPERTIES_EXT,
+                                                     nullptr,
+                                                     "FakeICDTool",
+                                                     "version_0_0_0_1.b",
+                                                     VK_TOOL_PURPOSE_VALIDATION_BIT_EXT,
+                                                     "This tool does not exist",
+                                                     "No-Layer"};
+    {  // extension
+        SingleICDShim env{TestICDDetails{TEST_ICD_PATH_VERSION_6}};
+        env.get_test_icd().physical_devices.push_back({});
+        env.get_test_icd().supports_tooling_info_ext = true;
+        env.get_test_icd().tooling_properties.push_back(icd_tool_props);
+        env.get_test_icd().physical_devices.back().extensions.push_back({VK_EXT_TOOLING_INFO_EXTENSION_NAME, 0});
+
+        InstWrapper inst{env.vulkan_functions};
+        inst.CheckCreate();
+
+        auto phys_dev = inst.GetPhysDev();
+
+        auto getToolProperties = reinterpret_cast<PFN_vkGetPhysicalDeviceToolPropertiesEXT>(
+            inst.functions->vkGetInstanceProcAddr(inst, "vkGetPhysicalDeviceToolPropertiesEXT"));
+        handle_assert_has_value(getToolProperties);
+        uint32_t tool_count = 1;
+        ASSERT_EQ(VK_SUCCESS, getToolProperties(phys_dev, &tool_count, nullptr));
+        ASSERT_EQ(tool_count, 1);
+        VkPhysicalDeviceToolPropertiesEXT props{};
+        ASSERT_EQ(VK_SUCCESS, getToolProperties(phys_dev, &tool_count, &props));
+        ASSERT_EQ(tool_count, 1);
+        string_eq(props.name, icd_tool_props.name);
+    }
+}
\ No newline at end of file