Fix sType Tooling Info tests

Tooling Info tests were not setting the sType correctly. This goes
against spec
where "sType must be
VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_TOOL_PROPERTIES_EXT". These
tests also check this sType to validate functionality.

Components: Vulkan

Affects:
dEQP-VK.api.tooling_info.*

VK-GL-CTS issue: 3444

Change-Id: Ic72104261a577d7d767742d4b2828296eba3922c

diff --git a/external/vulkancts/modules/vulkan/api/vktApiToolingInfoTests.cpp b/external/vulkancts/modules/vulkan/api/vktApiToolingInfoTests.cpp
index 96d906d..e3735ef 100644 (file)
--- a/external/vulkancts/modules/vulkan/api/vktApiToolingInfoTests.cpp
+++ b/external/vulkancts/modules/vulkan/api/vktApiToolingInfoTests.cpp
@@ -141,6 +141,11 @@ tcu::TestStatus validateGetter (Context& context)
 
                std::vector<VkPhysicalDeviceToolPropertiesEXT>  deviceToolPropertiesEXTArray(toolCountSecondCall);
 
+               for (size_t toolNdx = 0; toolNdx < deviceToolPropertiesEXTArray.size(); ++toolNdx)
+               {
+                       deviceToolPropertiesEXTArray[toolNdx].sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_TOOL_PROPERTIES_EXT;
+               }
+
                result = context.getInstanceInterface().getPhysicalDeviceToolPropertiesEXT(context.getPhysicalDevice(), &toolCountSecondCall, &deviceToolPropertiesEXTArray[0]);
 
                if (result != VK_SUCCESS)
@@ -196,6 +201,11 @@ tcu::TestStatus validateGetter (Context& context)
 
                std::vector<VkPhysicalDeviceToolPropertiesEXT>  deviceToolPropertiesEXTArray(toolCountSecondCall);
 
+               for (size_t toolNdx = 0; toolNdx < deviceToolPropertiesEXTArray.size(); ++toolNdx)
+               {
+                       deviceToolPropertiesEXTArray[toolNdx].sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_TOOL_PROPERTIES_EXT;
+               }
+
                result = context.getInstanceInterface().getPhysicalDeviceToolPropertiesEXT(context.getPhysicalDevice(), &toolCountSecondCall, &deviceToolPropertiesEXTArray[0]);
 
                if (result != VK_INCOMPLETE)
@@ -224,6 +234,11 @@ tcu::TestStatus validateToolsProperties (Context& context)
        {
                std::vector<VkPhysicalDeviceToolPropertiesEXT>  deviceToolPropertiesEXTArray(toolCount);
 
+               for (size_t toolNdx = 0; toolNdx < deviceToolPropertiesEXTArray.size(); ++toolNdx)
+               {
+                       deviceToolPropertiesEXTArray[toolNdx].sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_TOOL_PROPERTIES_EXT;
+               }
+
                VK_CHECK(context.getInstanceInterface().getPhysicalDeviceToolPropertiesEXT(context.getPhysicalDevice(), &toolCount, &deviceToolPropertiesEXTArray[0]));
 
                if (checkToolsProperties(context, deviceToolPropertiesEXTArray) == false)
@@ -252,6 +267,11 @@ tcu::TestStatus validateInstanceLayers (Context& context)
                {
                        std::vector<VkPhysicalDeviceToolPropertiesEXT>  deviceToolPropertiesEXTArray(toolCount);
 
+                       for (size_t toolNdx = 0; toolNdx < deviceToolPropertiesEXTArray.size(); ++toolNdx)
+                       {
+                               deviceToolPropertiesEXTArray[toolNdx].sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_TOOL_PROPERTIES_EXT;
+                       }
+
                        VK_CHECK(context.getInstanceInterface().getPhysicalDeviceToolPropertiesEXT(physicalDevice, &toolCount, &deviceToolPropertiesEXTArray[0]));
 
                        if (checkToolsProperties(context, deviceToolPropertiesEXTArray) == false)
@@ -287,6 +307,11 @@ tcu::TestStatus validateInstanceLayers (Context& context)
                {
                        std::vector<VkPhysicalDeviceToolPropertiesEXT>  deviceToolPropertiesEXTArray(toolCount);
 
+                       for (size_t toolNdx = 0; toolNdx < deviceToolPropertiesEXTArray.size(); ++toolNdx)
+                       {
+                               deviceToolPropertiesEXTArray[toolNdx].sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_TOOL_PROPERTIES_EXT;
+                       }
+
                        VK_CHECK(context.getInstanceInterface().getPhysicalDeviceToolPropertiesEXT(physicalDevice, &toolCount, &deviceToolPropertiesEXTArray[0]));
 
                        if (checkToolsProperties(context, deviceToolPropertiesEXTArray) == false)