Merge vk-gl-cts/vulkan-cts-1.2.3 into vk-gl-cts/vulkan-cts-1.2.4

Change-Id: Id711f3ba5558c490c3629051677c7f41ec2da2d6

diff --cc external/amber/CMakeLists.txt
index f6d0899,2fb3b3d..5610303
--- 1/external/amber/CMakeLists.txt
--- 2/external/amber/CMakeLists.txt
+++ b/external/amber/CMakeLists.txt
@@@ -6,7 -6,14 +6,15 @@@ set(AMBER_SKIP_SPIRV_TOOLS TRUE
  set(AMBER_SKIP_SHADERC TRUE)
  set(AMBER_SKIP_SAMPLES TRUE)
  set(AMBER_ENABLE_SHARED_CRT TRUE)
 +set(AMBER_ENABLE_RTTI TRUE CACHE BOOL "Enable runtime type information" FORCE)
  set(Vulkan-Headers_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../vulkancts/framework/vulkan/)
  
+ if (DE_COMPILER_IS_CLANG)
+       # Fixed upstream in 4d0115cccfcb3b73d20b6513b1c40748e6403c50
+       add_compile_options(-Wno-suggest-destructor-override)
+ elseif (DE_COMPILER_IS_GCC)
+       # Fixed upstream in aa69a0ac23ea7f68dd32bbef210546a5d84c1734
+       add_compile_options(-Wno-uninitialized)
+ endif ()
+ 
  add_subdirectory(src)

diff --cc external/openglcts/modules/gl/gl4cDirectStateAccessFramebuffersAndRenderbuffersTests.cpp
Simple merge

diff --cc external/openglcts/modules/gl/gl4cGPUShaderFP64Tests.cpp
Simple merge

diff --cc external/openglcts/modules/gl/gl4cPipelineStatisticsQueryTests.cpp
Simple merge

diff --cc external/vulkancts/framework/vulkan/vkBasicTypes.inl
Simple merge

diff --cc external/vulkancts/framework/vulkan/vkDeviceFeatures.inl
Simple merge

diff --cc external/vulkancts/framework/vulkan/vkDeviceFeaturesForContextDecl.inl
index ed570f0,8747425..83eb77e
--- 1/external/vulkancts/framework/vulkan/vkDeviceFeaturesForContextDecl.inl
--- 2/external/vulkancts/framework/vulkan/vkDeviceFeaturesForContextDecl.inl
+++ b/external/vulkancts/framework/vulkan/vkDeviceFeaturesForContextDecl.inl
@@@ -1,8 -1,8 +1,9 @@@
  /* WARNING: This is auto-generated file. Do not modify, since changes will
   * be lost! Modify the generating script instead.
+  * This file was generated by /scripts/gen_framework.py
   */
  const vk::VkPhysicalDevice16BitStorageFeatures&                                                       get16BitStorageFeatures                                                 (void) const;
 +const vk::VkPhysicalDevice4444FormatsFeaturesEXT&                                             get4444FormatsFeaturesEXT                                               (void) const;
  const vk::VkPhysicalDevice8BitStorageFeatures&                                                        get8BitStorageFeatures                                                  (void) const;
  const vk::VkPhysicalDeviceASTCDecodeFeaturesEXT&                                              getASTCDecodeFeaturesEXT                                                (void) const;
  const vk::VkPhysicalDeviceBlendOperationAdvancedFeaturesEXT&                  getBlendOperationAdvancedFeaturesEXT                    (void) const;

diff --cc external/vulkancts/framework/vulkan/vkDeviceFeaturesForContextDefs.inl
index cff274c,4d85a53..c548681
--- 1/external/vulkancts/framework/vulkan/vkDeviceFeaturesForContextDefs.inl
--- 2/external/vulkancts/framework/vulkan/vkDeviceFeaturesForContextDefs.inl
+++ b/external/vulkancts/framework/vulkan/vkDeviceFeaturesForContextDefs.inl
@@@ -1,8 -1,8 +1,9 @@@
  /* WARNING: This is auto-generated file. Do not modify, since changes will
   * be lost! Modify the generating script instead.
+  * This file was generated by /scripts/gen_framework.py
   */
  const vk::VkPhysicalDevice16BitStorageFeatures&                                                       Context::get16BitStorageFeatures                                                (void) const { return m_device->get16BitStorageFeatures();                                              }
 +const vk::VkPhysicalDevice4444FormatsFeaturesEXT&                                             Context::get4444FormatsFeaturesEXT                                              (void) const { return m_device->get4444FormatsFeaturesEXT();                                    }
  const vk::VkPhysicalDevice8BitStorageFeatures&                                                        Context::get8BitStorageFeatures                                                 (void) const { return m_device->get8BitStorageFeatures();                                               }
  const vk::VkPhysicalDeviceASTCDecodeFeaturesEXT&                                              Context::getASTCDecodeFeaturesEXT                                               (void) const { return m_device->getASTCDecodeFeaturesEXT();                                             }
  const vk::VkPhysicalDeviceBlendOperationAdvancedFeaturesEXT&                  Context::getBlendOperationAdvancedFeaturesEXT                   (void) const { return m_device->getBlendOperationAdvancedFeaturesEXT();                 }

diff --cc external/vulkancts/framework/vulkan/vkDeviceFeaturesForDefaultDeviceDefs.inl
index 3c4e16b,4230dcc..77a7431
--- 1/external/vulkancts/framework/vulkan/vkDeviceFeaturesForDefaultDeviceDefs.inl
--- 2/external/vulkancts/framework/vulkan/vkDeviceFeaturesForDefaultDeviceDefs.inl
+++ b/external/vulkancts/framework/vulkan/vkDeviceFeaturesForDefaultDeviceDefs.inl
@@@ -1,8 -1,8 +1,9 @@@
  /* WARNING: This is auto-generated file. Do not modify, since changes will
   * be lost! Modify the generating script instead.
+  * This file was generated by /scripts/gen_framework.py
   */
  const VkPhysicalDevice16BitStorageFeatures&                                                   get16BitStorageFeatures                                                 (void) const { return m_deviceFeatures.getFeatureType<VkPhysicalDevice16BitStorageFeatures>();                                                  }
 +const VkPhysicalDevice4444FormatsFeaturesEXT&                                         get4444FormatsFeaturesEXT                                               (void) const { return m_deviceFeatures.getFeatureType<VkPhysicalDevice4444FormatsFeaturesEXT>();                                                }
  const VkPhysicalDevice8BitStorageFeatures&                                                    get8BitStorageFeatures                                                  (void) const { return m_deviceFeatures.getFeatureType<VkPhysicalDevice8BitStorageFeatures>();                                                   }
  const VkPhysicalDeviceASTCDecodeFeaturesEXT&                                          getASTCDecodeFeaturesEXT                                                (void) const { return m_deviceFeatures.getFeatureType<VkPhysicalDeviceASTCDecodeFeaturesEXT>();                                                 }
  const VkPhysicalDeviceBlendOperationAdvancedFeaturesEXT&                      getBlendOperationAdvancedFeaturesEXT                    (void) const { return m_deviceFeatures.getFeatureType<VkPhysicalDeviceBlendOperationAdvancedFeaturesEXT>();                             }

diff --cc external/vulkancts/framework/vulkan/vkDeviceProperties.inl
Simple merge

diff --cc external/vulkancts/framework/vulkan/vkDevicePropertiesForContextDecl.inl
Simple merge

diff --cc external/vulkancts/framework/vulkan/vkDevicePropertiesForContextDefs.inl
Simple merge

diff --cc external/vulkancts/framework/vulkan/vkDevicePropertiesForDefaultDeviceDefs.inl
index 8877cb4,6f0b4b0..9b0d043
--- 1/external/vulkancts/framework/vulkan/vkDevicePropertiesForDefaultDeviceDefs.inl
--- 2/external/vulkancts/framework/vulkan/vkDevicePropertiesForDefaultDeviceDefs.inl
+++ b/external/vulkancts/framework/vulkan/vkDevicePropertiesForDefaultDeviceDefs.inl
@@@ -1,41 -1,43 +1,42 @@@
  /* WARNING: This is auto-generated file. Do not modify, since changes will
   * be lost! Modify the generating script instead.
+  * This file was generated by /scripts/gen_framework.py
   */
 -const VkPhysicalDeviceBlendOperationAdvancedPropertiesEXT&            getBlendOperationAdvancedPropertiesEXT          (void) const { return m_devicePropertiesFull.getPropertyType<VkPhysicalDeviceBlendOperationAdvancedPropertiesEXT>();            }
 -const VkPhysicalDeviceConservativeRasterizationPropertiesEXT& getConservativeRasterizationPropertiesEXT       (void) const { return m_devicePropertiesFull.getPropertyType<VkPhysicalDeviceConservativeRasterizationPropertiesEXT>();         }
 -const VkPhysicalDeviceCooperativeMatrixPropertiesNV&                  getCooperativeMatrixProperties                          (void) const { return m_devicePropertiesFull.getPropertyType<VkPhysicalDeviceCooperativeMatrixPropertiesNV>();                          }
 -const VkPhysicalDeviceCustomBorderColorPropertiesEXT&                 getCustomBorderColorPropertiesEXT                       (void) const { return m_devicePropertiesFull.getPropertyType<VkPhysicalDeviceCustomBorderColorPropertiesEXT>();                         }
 -const VkPhysicalDeviceDepthStencilResolveProperties&                  getDepthStencilResolveProperties                        (void) const { return m_devicePropertiesFull.getPropertyType<VkPhysicalDeviceDepthStencilResolveProperties>();                          }
 -const VkPhysicalDeviceDescriptorIndexingProperties&                           getDescriptorIndexingProperties                         (void) const { return m_devicePropertiesFull.getPropertyType<VkPhysicalDeviceDescriptorIndexingProperties>();                           }
 -const VkPhysicalDeviceDeviceGeneratedCommandsPropertiesNV&            getDeviceGeneratedCommandsProperties            (void) const { return m_devicePropertiesFull.getPropertyType<VkPhysicalDeviceDeviceGeneratedCommandsPropertiesNV>();            }
 -const VkPhysicalDeviceDiscardRectanglePropertiesEXT&                  getDiscardRectanglePropertiesEXT                        (void) const { return m_devicePropertiesFull.getPropertyType<VkPhysicalDeviceDiscardRectanglePropertiesEXT>();                          }
 -const VkPhysicalDeviceDriverProperties&                                                       getDriverProperties                                                     (void) const { return m_devicePropertiesFull.getPropertyType<VkPhysicalDeviceDriverProperties>();                                                       }
 -const VkPhysicalDeviceExternalMemoryHostPropertiesEXT&                        getExternalMemoryHostPropertiesEXT                      (void) const { return m_devicePropertiesFull.getPropertyType<VkPhysicalDeviceExternalMemoryHostPropertiesEXT>();                        }
 -const VkPhysicalDeviceFloatControlsProperties&                                        getFloatControlsProperties                                      (void) const { return m_devicePropertiesFull.getPropertyType<VkPhysicalDeviceFloatControlsProperties>();                                        }
 -const VkPhysicalDeviceFragmentDensityMapPropertiesEXT&                        getFragmentDensityMapPropertiesEXT                      (void) const { return m_devicePropertiesFull.getPropertyType<VkPhysicalDeviceFragmentDensityMapPropertiesEXT>();                        }
 -const VkPhysicalDeviceFragmentDensityMap2PropertiesEXT&                       getFragmentDensityMap2PropertiesEXT                     (void) const { return m_devicePropertiesFull.getPropertyType<VkPhysicalDeviceFragmentDensityMap2PropertiesEXT>();                       }
 -const VkPhysicalDeviceInlineUniformBlockPropertiesEXT&                        getInlineUniformBlockPropertiesEXT                      (void) const { return m_devicePropertiesFull.getPropertyType<VkPhysicalDeviceInlineUniformBlockPropertiesEXT>();                        }
 -const VkPhysicalDeviceLineRasterizationPropertiesEXT&                 getLineRasterizationPropertiesEXT                       (void) const { return m_devicePropertiesFull.getPropertyType<VkPhysicalDeviceLineRasterizationPropertiesEXT>();                         }
 -const VkPhysicalDeviceMaintenance3Properties&                                 getMaintenance3Properties                                       (void) const { return m_devicePropertiesFull.getPropertyType<VkPhysicalDeviceMaintenance3Properties>();                                         }
 -const VkPhysicalDeviceMemoryProperties2&                                              getMemoryProperties2                                            (void) const { return m_devicePropertiesFull.getPropertyType<VkPhysicalDeviceMemoryProperties2>();                                                      }
 -const VkPhysicalDeviceMeshShaderPropertiesNV&                                 getMeshShaderProperties                                         (void) const { return m_devicePropertiesFull.getPropertyType<VkPhysicalDeviceMeshShaderPropertiesNV>();                                         }
 -const VkPhysicalDeviceMultiviewProperties&                                            getMultiviewProperties                                          (void) const { return m_devicePropertiesFull.getPropertyType<VkPhysicalDeviceMultiviewProperties>();                                            }
 -const VkPhysicalDeviceMultiviewPerViewAttributesPropertiesNVX&        getMultiviewPerViewAttributesPropertiesX        (void) const { return m_devicePropertiesFull.getPropertyType<VkPhysicalDeviceMultiviewPerViewAttributesPropertiesNVX>();        }
 -const VkPhysicalDevicePerformanceQueryPropertiesKHR&                  getPerformanceQueryProperties                           (void) const { return m_devicePropertiesFull.getPropertyType<VkPhysicalDevicePerformanceQueryPropertiesKHR>();                          }
 -const VkPhysicalDevicePointClippingProperties&                                        getPointClippingProperties                                      (void) const { return m_devicePropertiesFull.getPropertyType<VkPhysicalDevicePointClippingProperties>();                                        }
 -const VkPhysicalDeviceProtectedMemoryProperties&                              getProtectedMemoryProperties                            (void) const { return m_devicePropertiesFull.getPropertyType<VkPhysicalDeviceProtectedMemoryProperties>();                                      }
 -const VkPhysicalDevicePushDescriptorPropertiesKHR&                            getPushDescriptorProperties                                     (void) const { return m_devicePropertiesFull.getPropertyType<VkPhysicalDevicePushDescriptorPropertiesKHR>();                            }
 -const VkPhysicalDeviceRayTracingPropertiesKHR&                                        getRayTracingProperties                                         (void) const { return m_devicePropertiesFull.getPropertyType<VkPhysicalDeviceRayTracingPropertiesKHR>();                                        }
 -const VkPhysicalDeviceRayTracingPropertiesNV&                                 getRayTracingPropertiesNV                                       (void) const { return m_devicePropertiesFull.getPropertyType<VkPhysicalDeviceRayTracingPropertiesNV>();                                         }
 -const VkPhysicalDeviceRobustness2PropertiesEXT&                                       getRobustness2PropertiesEXT                                     (void) const { return m_devicePropertiesFull.getPropertyType<VkPhysicalDeviceRobustness2PropertiesEXT>();                                       }
 -const VkPhysicalDeviceSamplerFilterMinmaxProperties&                  getSamplerFilterMinmaxProperties                        (void) const { return m_devicePropertiesFull.getPropertyType<VkPhysicalDeviceSamplerFilterMinmaxProperties>();                          }
 -const VkPhysicalDeviceSampleLocationsPropertiesEXT&                           getSampleLocationsPropertiesEXT                         (void) const { return m_devicePropertiesFull.getPropertyType<VkPhysicalDeviceSampleLocationsPropertiesEXT>();                           }
 -const VkPhysicalDeviceShaderCorePropertiesAMD&                                        getShaderCorePropertiesAMD                                      (void) const { return m_devicePropertiesFull.getPropertyType<VkPhysicalDeviceShaderCorePropertiesAMD>();                                        }
 -const VkPhysicalDeviceShaderCoreProperties2AMD&                                       getShaderCoreProperties2AMD                                     (void) const { return m_devicePropertiesFull.getPropertyType<VkPhysicalDeviceShaderCoreProperties2AMD>();                                       }
 -const VkPhysicalDeviceShadingRateImagePropertiesNV&                           getShadingRateImageProperties                           (void) const { return m_devicePropertiesFull.getPropertyType<VkPhysicalDeviceShadingRateImagePropertiesNV>();                           }
 -const VkPhysicalDeviceSubgroupProperties&                                             getSubgroupProperties                                           (void) const { return m_devicePropertiesFull.getPropertyType<VkPhysicalDeviceSubgroupProperties>();                                                     }
 -const VkPhysicalDeviceSubgroupSizeControlPropertiesEXT&                       getSubgroupSizeControlPropertiesEXT                     (void) const { return m_devicePropertiesFull.getPropertyType<VkPhysicalDeviceSubgroupSizeControlPropertiesEXT>();                       }
 -const VkPhysicalDeviceTexelBufferAlignmentPropertiesEXT&              getTexelBufferAlignmentPropertiesEXT            (void) const { return m_devicePropertiesFull.getPropertyType<VkPhysicalDeviceTexelBufferAlignmentPropertiesEXT>();                      }
 -const VkPhysicalDeviceTimelineSemaphoreProperties&                            getTimelineSemaphoreProperties                          (void) const { return m_devicePropertiesFull.getPropertyType<VkPhysicalDeviceTimelineSemaphoreProperties>();                            }
 -const VkPhysicalDeviceToolPropertiesEXT&                                              getToolPropertiesEXT                                            (void) const { return m_devicePropertiesFull.getPropertyType<VkPhysicalDeviceToolPropertiesEXT>();                                                      }
 -const VkPhysicalDeviceTransformFeedbackPropertiesEXT&                 getTransformFeedbackPropertiesEXT                       (void) const { return m_devicePropertiesFull.getPropertyType<VkPhysicalDeviceTransformFeedbackPropertiesEXT>();                         }
 -const VkPhysicalDeviceVertexAttributeDivisorPropertiesEXT&            getVertexAttributeDivisorPropertiesEXT          (void) const { return m_devicePropertiesFull.getPropertyType<VkPhysicalDeviceVertexAttributeDivisorPropertiesEXT>();            }
 +const VkPhysicalDeviceBlendOperationAdvancedPropertiesEXT&            getBlendOperationAdvancedPropertiesEXT          (void) const { return m_deviceProperties.getPropertyType<VkPhysicalDeviceBlendOperationAdvancedPropertiesEXT>();                }
 +const VkPhysicalDeviceConservativeRasterizationPropertiesEXT& getConservativeRasterizationPropertiesEXT       (void) const { return m_deviceProperties.getPropertyType<VkPhysicalDeviceConservativeRasterizationPropertiesEXT>();             }
 +const VkPhysicalDeviceCooperativeMatrixPropertiesNV&                  getCooperativeMatrixProperties                          (void) const { return m_deviceProperties.getPropertyType<VkPhysicalDeviceCooperativeMatrixPropertiesNV>();                              }
 +const VkPhysicalDeviceCustomBorderColorPropertiesEXT&                 getCustomBorderColorPropertiesEXT                       (void) const { return m_deviceProperties.getPropertyType<VkPhysicalDeviceCustomBorderColorPropertiesEXT>();                             }
 +const VkPhysicalDeviceDepthStencilResolveProperties&                  getDepthStencilResolveProperties                        (void) const { return m_deviceProperties.getPropertyType<VkPhysicalDeviceDepthStencilResolveProperties>();                              }
 +const VkPhysicalDeviceDescriptorIndexingProperties&                           getDescriptorIndexingProperties                         (void) const { return m_deviceProperties.getPropertyType<VkPhysicalDeviceDescriptorIndexingProperties>();                               }
 +const VkPhysicalDeviceDeviceGeneratedCommandsPropertiesNV&            getDeviceGeneratedCommandsProperties            (void) const { return m_deviceProperties.getPropertyType<VkPhysicalDeviceDeviceGeneratedCommandsPropertiesNV>();                }
 +const VkPhysicalDeviceDiscardRectanglePropertiesEXT&                  getDiscardRectanglePropertiesEXT                        (void) const { return m_deviceProperties.getPropertyType<VkPhysicalDeviceDiscardRectanglePropertiesEXT>();                              }
 +const VkPhysicalDeviceDriverProperties&                                                       getDriverProperties                                                     (void) const { return m_deviceProperties.getPropertyType<VkPhysicalDeviceDriverProperties>();                                                   }
 +const VkPhysicalDeviceExternalMemoryHostPropertiesEXT&                        getExternalMemoryHostPropertiesEXT                      (void) const { return m_deviceProperties.getPropertyType<VkPhysicalDeviceExternalMemoryHostPropertiesEXT>();                    }
 +const VkPhysicalDeviceFloatControlsProperties&                                        getFloatControlsProperties                                      (void) const { return m_deviceProperties.getPropertyType<VkPhysicalDeviceFloatControlsProperties>();                                    }
 +const VkPhysicalDeviceFragmentDensityMapPropertiesEXT&                        getFragmentDensityMapPropertiesEXT                      (void) const { return m_deviceProperties.getPropertyType<VkPhysicalDeviceFragmentDensityMapPropertiesEXT>();                    }
 +const VkPhysicalDeviceFragmentDensityMap2PropertiesEXT&                       getFragmentDensityMap2PropertiesEXT                     (void) const { return m_deviceProperties.getPropertyType<VkPhysicalDeviceFragmentDensityMap2PropertiesEXT>();                   }
 +const VkPhysicalDeviceIDProperties&                                                           getIDProperties                                                         (void) const { return m_deviceProperties.getPropertyType<VkPhysicalDeviceIDProperties>();                                                               }
 +const VkPhysicalDeviceInlineUniformBlockPropertiesEXT&                        getInlineUniformBlockPropertiesEXT                      (void) const { return m_deviceProperties.getPropertyType<VkPhysicalDeviceInlineUniformBlockPropertiesEXT>();                    }
 +const VkPhysicalDeviceLineRasterizationPropertiesEXT&                 getLineRasterizationPropertiesEXT                       (void) const { return m_deviceProperties.getPropertyType<VkPhysicalDeviceLineRasterizationPropertiesEXT>();                             }
 +const VkPhysicalDeviceMaintenance3Properties&                                 getMaintenance3Properties                                       (void) const { return m_deviceProperties.getPropertyType<VkPhysicalDeviceMaintenance3Properties>();                                             }
 +const VkPhysicalDeviceMeshShaderPropertiesNV&                                 getMeshShaderProperties                                         (void) const { return m_deviceProperties.getPropertyType<VkPhysicalDeviceMeshShaderPropertiesNV>();                                             }
 +const VkPhysicalDeviceMultiviewProperties&                                            getMultiviewProperties                                          (void) const { return m_deviceProperties.getPropertyType<VkPhysicalDeviceMultiviewProperties>();                                                }
 +const VkPhysicalDeviceMultiviewPerViewAttributesPropertiesNVX&        getMultiviewPerViewAttributesPropertiesX        (void) const { return m_deviceProperties.getPropertyType<VkPhysicalDeviceMultiviewPerViewAttributesPropertiesNVX>();    }
 +const VkPhysicalDevicePerformanceQueryPropertiesKHR&                  getPerformanceQueryProperties                           (void) const { return m_deviceProperties.getPropertyType<VkPhysicalDevicePerformanceQueryPropertiesKHR>();                              }
 +const VkPhysicalDevicePointClippingProperties&                                        getPointClippingProperties                                      (void) const { return m_deviceProperties.getPropertyType<VkPhysicalDevicePointClippingProperties>();                                    }
 +const VkPhysicalDeviceProtectedMemoryProperties&                              getProtectedMemoryProperties                            (void) const { return m_deviceProperties.getPropertyType<VkPhysicalDeviceProtectedMemoryProperties>();                                  }
 +const VkPhysicalDevicePushDescriptorPropertiesKHR&                            getPushDescriptorProperties                                     (void) const { return m_deviceProperties.getPropertyType<VkPhysicalDevicePushDescriptorPropertiesKHR>();                                }
 +const VkPhysicalDeviceRayTracingPropertiesKHR&                                        getRayTracingProperties                                         (void) const { return m_deviceProperties.getPropertyType<VkPhysicalDeviceRayTracingPropertiesKHR>();                                    }
 +const VkPhysicalDeviceRayTracingPropertiesNV&                                 getRayTracingPropertiesNV                                       (void) const { return m_deviceProperties.getPropertyType<VkPhysicalDeviceRayTracingPropertiesNV>();                                             }
 +const VkPhysicalDeviceRobustness2PropertiesEXT&                                       getRobustness2PropertiesEXT                                     (void) const { return m_deviceProperties.getPropertyType<VkPhysicalDeviceRobustness2PropertiesEXT>();                                   }
 +const VkPhysicalDeviceSamplerFilterMinmaxProperties&                  getSamplerFilterMinmaxProperties                        (void) const { return m_deviceProperties.getPropertyType<VkPhysicalDeviceSamplerFilterMinmaxProperties>();                              }
 +const VkPhysicalDeviceSampleLocationsPropertiesEXT&                           getSampleLocationsPropertiesEXT                         (void) const { return m_deviceProperties.getPropertyType<VkPhysicalDeviceSampleLocationsPropertiesEXT>();                               }
 +const VkPhysicalDeviceShaderCorePropertiesAMD&                                        getShaderCorePropertiesAMD                                      (void) const { return m_deviceProperties.getPropertyType<VkPhysicalDeviceShaderCorePropertiesAMD>();                                    }
 +const VkPhysicalDeviceShaderCoreProperties2AMD&                                       getShaderCoreProperties2AMD                                     (void) const { return m_deviceProperties.getPropertyType<VkPhysicalDeviceShaderCoreProperties2AMD>();                                   }
 +const VkPhysicalDeviceShadingRateImagePropertiesNV&                           getShadingRateImageProperties                           (void) const { return m_deviceProperties.getPropertyType<VkPhysicalDeviceShadingRateImagePropertiesNV>();                               }
 +const VkPhysicalDeviceSubgroupProperties&                                             getSubgroupProperties                                           (void) const { return m_deviceProperties.getPropertyType<VkPhysicalDeviceSubgroupProperties>();                                                 }
 +const VkPhysicalDeviceSubgroupSizeControlPropertiesEXT&                       getSubgroupSizeControlPropertiesEXT                     (void) const { return m_deviceProperties.getPropertyType<VkPhysicalDeviceSubgroupSizeControlPropertiesEXT>();                   }
 +const VkPhysicalDeviceTexelBufferAlignmentPropertiesEXT&              getTexelBufferAlignmentPropertiesEXT            (void) const { return m_deviceProperties.getPropertyType<VkPhysicalDeviceTexelBufferAlignmentPropertiesEXT>();                  }
 +const VkPhysicalDeviceTimelineSemaphoreProperties&                            getTimelineSemaphoreProperties                          (void) const { return m_deviceProperties.getPropertyType<VkPhysicalDeviceTimelineSemaphoreProperties>();                                }
 +const VkPhysicalDeviceTransformFeedbackPropertiesEXT&                 getTransformFeedbackPropertiesEXT                       (void) const { return m_deviceProperties.getPropertyType<VkPhysicalDeviceTransformFeedbackPropertiesEXT>();                             }
 +const VkPhysicalDeviceVertexAttributeDivisorPropertiesEXT&            getVertexAttributeDivisorPropertiesEXT          (void) const { return m_deviceProperties.getPropertyType<VkPhysicalDeviceVertexAttributeDivisorPropertiesEXT>();                }

diff --cc external/vulkancts/framework/vulkan/vkExtensionFunctions.inl
Simple merge

diff --cc external/vulkancts/framework/vulkan/vkGetStructureTypeImpl.inl
Simple merge

diff --cc external/vulkancts/framework/vulkan/vkKnownDriverIds.inl
Simple merge

diff --cc external/vulkancts/framework/vulkan/vkMandatoryFeatures.inl
Simple merge

diff --cc external/vulkancts/framework/vulkan/vkStrUtil.inl
Simple merge

diff --cc external/vulkancts/framework/vulkan/vkStrUtilImpl.inl
Simple merge

diff --cc external/vulkancts/framework/vulkan/vkStructTypes.inl
Simple merge

diff --cc external/vulkancts/modules/vulkan/api/vktApiExternalMemoryTests.cpp
Simple merge

diff --cc external/vulkancts/modules/vulkan/binding_model/vktBindingDescriptorSetRandomTests.cpp
Simple merge

diff --cc external/vulkancts/modules/vulkan/shaderexecutor/vktShaderBuiltinPrecisionTests.cpp
Simple merge

diff --cc external/vulkancts/modules/vulkan/shaderexecutor/vktShaderExecutor.cpp
Simple merge

diff --cc external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmInstructionTests.cpp
Simple merge

diff --cc external/vulkancts/modules/vulkan/wsi/vktWsiSwapchainTests.cpp
index 837a200,9ea763c..110dc39
--- 1/external/vulkancts/modules/vulkan/wsi/vktWsiSwapchainTests.cpp
--- 2/external/vulkancts/modules/vulkan/wsi/vktWsiSwapchainTests.cpp
+++ b/external/vulkancts/modules/vulkan/wsi/vktWsiSwapchainTests.cpp
@@@ -2527,13 -2526,13 +2527,14 @@@ tcu::TestStatus acquireTooManyTest (Con
        if (numImages < minImageCount) return tcu::TestStatus::fail("Get swapchain images returned less than minImageCount images");
        const deUint32 numAcquirableImages = numImages - minImageCount + 1;
  
 -      const auto fences = createFences(devHelper.vkd, *devHelper.device, numAcquirableImages + 1);
 +      const auto fences = createFences(devHelper.vkd, *devHelper.device, numAcquirableImages + 1, false);
-       deUint32 dummy;
+       deUint32 unused;
++
        for (deUint32 i = 0; i < numAcquirableImages; ++i) {
-               VK_CHECK_WSI(devHelper.vkd.acquireNextImageKHR(*devHelper.device, *swapchain, std::numeric_limits<deUint64>::max(), (VkSemaphore)0, **fences[i], &dummy));
+               VK_CHECK_WSI(devHelper.vkd.acquireNextImageKHR(*devHelper.device, *swapchain, std::numeric_limits<deUint64>::max(), (VkSemaphore)0, **fences[i], &unused));
        }
  
-       const auto result = devHelper.vkd.acquireNextImageKHR(*devHelper.device, *swapchain, 0, (VkSemaphore)0, **fences[numAcquirableImages], &dummy);
+       const auto result = devHelper.vkd.acquireNextImageKHR(*devHelper.device, *swapchain, 0, (VkSemaphore)0, **fences[numAcquirableImages], &unused);
  
        if (result != VK_SUCCESS && result != VK_SUBOPTIMAL_KHR && result != VK_NOT_READY ){
                return tcu::TestStatus::fail("Implementation failed to respond well acquiring too many images with 0 timeout");
@@@ -2564,10 -2563,10 +2565,11 @@@ tcu::TestStatus acquireTooManyTimeoutTe
        if (numImages < minImageCount) return tcu::TestStatus::fail("Get swapchain images returned less than minImageCount images");
        const deUint32 numAcquirableImages = numImages - minImageCount + 1;
  
 -      const auto fences = createFences(devHelper.vkd, *devHelper.device, numAcquirableImages + 1);
 +      const auto fences = createFences(devHelper.vkd, *devHelper.device, numAcquirableImages + 1, false);
-       deUint32 dummy;
+       deUint32 unused;
++
        for (deUint32 i = 0; i < numAcquirableImages; ++i) {
-               VK_CHECK_WSI(devHelper.vkd.acquireNextImageKHR(*devHelper.device, *swapchain, std::numeric_limits<deUint64>::max(), (VkSemaphore)0, **fences[i], &dummy));
+               VK_CHECK_WSI(devHelper.vkd.acquireNextImageKHR(*devHelper.device, *swapchain, std::numeric_limits<deUint64>::max(), (VkSemaphore)0, **fences[i], &unused));
        }
  
        const deUint64 millisecond = 1000000;

diff --cc external/vulkancts/scripts/gen_framework.py
Simple merge