Merge vk-gl-cts/dev/VK_EXT_mutable_descriptor_type into vk-gl-cts/main

Change-Id: I122066282bff61b7e0f9877f1dd49825f3fd7ad0

diff --cc AndroidGen.mk
Simple merge

diff --cc android/cts/main/vk-master-2022-03-01/api.txt
index 23dabbe,3919e37..3e2e70a
--- 1/android/cts/main/vk-master-2022-03-01/api.txt
--- 2/android/cts/main/vk-master-2022-03-01/api.txt
+++ b/android/cts/main/vk-master-2022-03-01/api.txt
@@@ -1698,8 -1694,6 +1697,7 @@@ dEQP-VK.api.device_init.create_device_u
  dEQP-VK.api.device_init.create_device_unsupported_features.legacy_dithering_features_ext
  dEQP-VK.api.device_init.create_device_unsupported_features.multisampled_render_to_single_sampled_features_ext
  dEQP-VK.api.device_init.create_device_unsupported_features.pipeline_protected_access_features_ext
- dEQP-VK.api.device_init.create_device_unsupported_features.rasterization_order_attachment_access_features_ext
 +dEQP-VK.api.device_init.create_device_unsupported_features.descriptor_buffer_features_ext
  dEQP-VK.api.device_init.create_device_unsupported_features.graphics_pipeline_library_features_ext
  dEQP-VK.api.device_init.create_device_unsupported_features.descriptor_set_host_mapping_features_valve
  dEQP-VK.api.device_init.create_device_unsupported_features.shader_module_identifier_features_ext

diff --cc external/vulkancts/framework/vulkan/generated/vulkan/vkMandatoryFeatures.inl
index 56d104c,19d8ab7..893ebf5
--- 1/external/vulkancts/framework/vulkan/generated/vulkan/vkMandatoryFeatures.inl
--- 2/external/vulkancts/framework/vulkan/generated/vulkan/vkMandatoryFeatures.inl
+++ b/external/vulkancts/framework/vulkan/generated/vulkan/vkMandatoryFeatures.inl
@@@ -378,6 -348,6 +378,16 @@@ bool checkMandatoryFeatures(const vkt::
                nextPtr  = &physicalDeviceMultiviewFeatures.pNext;
        }
  
++      vk::VkPhysicalDeviceMutableDescriptorTypeFeaturesEXT physicalDeviceMutableDescriptorTypeFeaturesEXT;
++      deMemset(&physicalDeviceMutableDescriptorTypeFeaturesEXT, 0, sizeof(physicalDeviceMutableDescriptorTypeFeaturesEXT));
++
++      if ( isExtensionStructSupported(deviceExtensions, RequiredExtension("VK_EXT_mutable_descriptor_type")) )
++      {
++              physicalDeviceMutableDescriptorTypeFeaturesEXT.sType = getStructureType<VkPhysicalDeviceMutableDescriptorTypeFeaturesEXT>();
++              *nextPtr = &physicalDeviceMutableDescriptorTypeFeaturesEXT;
++              nextPtr  = &physicalDeviceMutableDescriptorTypeFeaturesEXT.pNext;
++      }
++
        vk::VkPhysicalDeviceMutableDescriptorTypeFeaturesVALVE physicalDeviceMutableDescriptorTypeFeaturesVALVE;
        deMemset(&physicalDeviceMutableDescriptorTypeFeaturesVALVE, 0, sizeof(physicalDeviceMutableDescriptorTypeFeaturesVALVE));
  
@@@ -1424,6 -1367,6 +1434,15 @@@
                }
        }
  
++      if ( isExtensionStructSupported(deviceExtensions, RequiredExtension("VK_EXT_mutable_descriptor_type")) )
++      {
++              if ( physicalDeviceMutableDescriptorTypeFeaturesEXT.mutableDescriptorType == VK_FALSE )
++              {
++                      log << tcu::TestLog::Message << "Mandatory feature mutableDescriptorType not supported" << tcu::TestLog::EndMessage;
++                      result = false;
++              }
++      }
++
  #if defined(CTS_USES_VULKAN)
        if ( isExtensionStructSupported(deviceExtensions, RequiredExtension("VK_EXT_non_seamless_cube_map")) )
        {

diff --cc external/vulkancts/modules/vulkan/binding_model/CMakeLists.txt
index 53ff459,d685427..ab44bd6
--- 1/external/vulkancts/modules/vulkan/binding_model/CMakeLists.txt
--- 2/external/vulkancts/modules/vulkan/binding_model/CMakeLists.txt
+++ b/external/vulkancts/modules/vulkan/binding_model/CMakeLists.txt
@@@ -26,11 -26,8 +26,11 @@@ set(DEQP_VK_BINDING_MODEL_SRC
        vktBindingDescriptorUpdateASTests.hpp
        vktBindingDynamicOffsetTests.cpp
        vktBindingDynamicOffsetTests.hpp
-       vktBindingValveMutableTests.cpp
-       vktBindingValveMutableTests.hpp
+       vktBindingMutableTests.cpp
 -      vktBindingMutableTests.hpp      )
++      vktBindingMutableTests.hpp
 +      vktBindingDescriptorBufferTests.cpp
 +      vktBindingDescriptorBufferTests.hpp
 +      )
  
  PCH(DEQP_VK_BINDING_MODEL_SRCS ../pch.cpp)
  

diff --cc external/vulkancts/modules/vulkan/binding_model/vktBindingModelTests.cpp
index 7e4484c,e21b57e..301effe
--- 1/external/vulkancts/modules/vulkan/binding_model/vktBindingModelTests.cpp
--- 2/external/vulkancts/modules/vulkan/binding_model/vktBindingModelTests.cpp
+++ b/external/vulkancts/modules/vulkan/binding_model/vktBindingModelTests.cpp
@@@ -31,8 -31,7 +31,8 @@@
  #include "vktTestGroupUtil.hpp"
  #ifndef CTS_USES_VULKANSC
  #include "vktBindingDynamicOffsetTests.hpp"
- #include "vktBindingValveMutableTests.hpp"
+ #include "vktBindingMutableTests.hpp"
 +#include "vktBindingDescriptorBufferTests.hpp"
  #endif // CTS_USES_VULKANSC
  
  namespace vkt
@@@ -54,8 -53,7 +54,8 @@@ void createChildren (tcu::TestCaseGroup
        group->addChild(createBufferDeviceAddressTests(testCtx));
  #ifndef CTS_USES_VULKANSC
        group->addChild(createDynamicOffsetTests(testCtx));
-       group->addChild(createDescriptorValveMutableTests(testCtx));
+       group->addChild(createDescriptorMutableTests(testCtx));
 +      group->addChild(createDescriptorBufferTests(testCtx));
  #endif
  
        // \todo [2015-07-30 jarkko] .change_binding.{between_renderpasses, within_pass}

diff --cc external/vulkancts/scripts/src/extensions/VK_EXT_mutable_descriptor_type.json
index 0000000,0000000..0aeb54d
new file mode 100644 (file)
--- /dev/null
--- /dev/null
+++ b/external/vulkancts/scripts/src/extensions/VK_EXT_mutable_descriptor_type.json
@@@ -1,0 -1,0 +1,9 @@@
++{
++      "mandatory_features":
++      {
++              "VkPhysicalDeviceMutableDescriptorTypeFeaturesEXT":
++              [
++                      { "features": ["mutableDescriptorType"],        "requirements": ["VK_EXT_mutable_descriptor_type"] }
++              ]
++      }
++}