From: Matthew Netsch Date: Thu, 6 Jan 2022 22:45:47 +0000 (-0500) Subject: Merge vk-gl-cts/vulkan-cts-1.2.3 into vk-gl-cts/vulkan-cts-1.2.4 X-Git-Tag: upstream/1.3.5~426^2~1^2~1^2~1^2~3^2 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=2429b3450e11a2c8b897bb7705f808e66a606e84;p=platform%2Fupstream%2FVK-GL-CTS.git Merge vk-gl-cts/vulkan-cts-1.2.3 into vk-gl-cts/vulkan-cts-1.2.4 Change-Id: Id711f3ba5558c490c3629051677c7f41ec2da2d6 --- 2429b3450e11a2c8b897bb7705f808e66a606e84 diff --cc external/amber/CMakeLists.txt index f6d0899,2fb3b3d..5610303 --- a/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/vulkancts/framework/vulkan/vkDeviceFeaturesForContextDecl.inl index ed570f0,8747425..83eb77e --- a/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 --- a/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 --- a/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(); } +const VkPhysicalDevice4444FormatsFeaturesEXT& get4444FormatsFeaturesEXT (void) const { return m_deviceFeatures.getFeatureType(); } const VkPhysicalDevice8BitStorageFeatures& get8BitStorageFeatures (void) const { return m_deviceFeatures.getFeatureType(); } const VkPhysicalDeviceASTCDecodeFeaturesEXT& getASTCDecodeFeaturesEXT (void) const { return m_deviceFeatures.getFeatureType(); } const VkPhysicalDeviceBlendOperationAdvancedFeaturesEXT& getBlendOperationAdvancedFeaturesEXT (void) const { return m_deviceFeatures.getFeatureType(); } diff --cc external/vulkancts/framework/vulkan/vkDevicePropertiesForDefaultDeviceDefs.inl index 8877cb4,6f0b4b0..9b0d043 --- a/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(); } -const VkPhysicalDeviceConservativeRasterizationPropertiesEXT& getConservativeRasterizationPropertiesEXT (void) const { return m_devicePropertiesFull.getPropertyType(); } -const VkPhysicalDeviceCooperativeMatrixPropertiesNV& getCooperativeMatrixProperties (void) const { return m_devicePropertiesFull.getPropertyType(); } -const VkPhysicalDeviceCustomBorderColorPropertiesEXT& getCustomBorderColorPropertiesEXT (void) const { return m_devicePropertiesFull.getPropertyType(); } -const VkPhysicalDeviceDepthStencilResolveProperties& getDepthStencilResolveProperties (void) const { return m_devicePropertiesFull.getPropertyType(); } -const VkPhysicalDeviceDescriptorIndexingProperties& getDescriptorIndexingProperties (void) const { return m_devicePropertiesFull.getPropertyType(); } -const VkPhysicalDeviceDeviceGeneratedCommandsPropertiesNV& getDeviceGeneratedCommandsProperties (void) const { return m_devicePropertiesFull.getPropertyType(); } -const VkPhysicalDeviceDiscardRectanglePropertiesEXT& getDiscardRectanglePropertiesEXT (void) const { return m_devicePropertiesFull.getPropertyType(); } -const VkPhysicalDeviceDriverProperties& getDriverProperties (void) const { return m_devicePropertiesFull.getPropertyType(); } -const VkPhysicalDeviceExternalMemoryHostPropertiesEXT& getExternalMemoryHostPropertiesEXT (void) const { return m_devicePropertiesFull.getPropertyType(); } -const VkPhysicalDeviceFloatControlsProperties& getFloatControlsProperties (void) const { return m_devicePropertiesFull.getPropertyType(); } -const VkPhysicalDeviceFragmentDensityMapPropertiesEXT& getFragmentDensityMapPropertiesEXT (void) const { return m_devicePropertiesFull.getPropertyType(); } -const VkPhysicalDeviceFragmentDensityMap2PropertiesEXT& getFragmentDensityMap2PropertiesEXT (void) const { return m_devicePropertiesFull.getPropertyType(); } -const VkPhysicalDeviceInlineUniformBlockPropertiesEXT& getInlineUniformBlockPropertiesEXT (void) const { return m_devicePropertiesFull.getPropertyType(); } -const VkPhysicalDeviceLineRasterizationPropertiesEXT& getLineRasterizationPropertiesEXT (void) const { return m_devicePropertiesFull.getPropertyType(); } -const VkPhysicalDeviceMaintenance3Properties& getMaintenance3Properties (void) const { return m_devicePropertiesFull.getPropertyType(); } -const VkPhysicalDeviceMemoryProperties2& getMemoryProperties2 (void) const { return m_devicePropertiesFull.getPropertyType(); } -const VkPhysicalDeviceMeshShaderPropertiesNV& getMeshShaderProperties (void) const { return m_devicePropertiesFull.getPropertyType(); } -const VkPhysicalDeviceMultiviewProperties& getMultiviewProperties (void) const { return m_devicePropertiesFull.getPropertyType(); } -const VkPhysicalDeviceMultiviewPerViewAttributesPropertiesNVX& getMultiviewPerViewAttributesPropertiesX (void) const { return m_devicePropertiesFull.getPropertyType(); } -const VkPhysicalDevicePerformanceQueryPropertiesKHR& getPerformanceQueryProperties (void) const { return m_devicePropertiesFull.getPropertyType(); } -const VkPhysicalDevicePointClippingProperties& getPointClippingProperties (void) const { return m_devicePropertiesFull.getPropertyType(); } -const VkPhysicalDeviceProtectedMemoryProperties& getProtectedMemoryProperties (void) const { return m_devicePropertiesFull.getPropertyType(); } -const VkPhysicalDevicePushDescriptorPropertiesKHR& getPushDescriptorProperties (void) const { return m_devicePropertiesFull.getPropertyType(); } -const VkPhysicalDeviceRayTracingPropertiesKHR& getRayTracingProperties (void) const { return m_devicePropertiesFull.getPropertyType(); } -const VkPhysicalDeviceRayTracingPropertiesNV& getRayTracingPropertiesNV (void) const { return m_devicePropertiesFull.getPropertyType(); } -const VkPhysicalDeviceRobustness2PropertiesEXT& getRobustness2PropertiesEXT (void) const { return m_devicePropertiesFull.getPropertyType(); } -const VkPhysicalDeviceSamplerFilterMinmaxProperties& getSamplerFilterMinmaxProperties (void) const { return m_devicePropertiesFull.getPropertyType(); } -const VkPhysicalDeviceSampleLocationsPropertiesEXT& getSampleLocationsPropertiesEXT (void) const { return m_devicePropertiesFull.getPropertyType(); } -const VkPhysicalDeviceShaderCorePropertiesAMD& getShaderCorePropertiesAMD (void) const { return m_devicePropertiesFull.getPropertyType(); } -const VkPhysicalDeviceShaderCoreProperties2AMD& getShaderCoreProperties2AMD (void) const { return m_devicePropertiesFull.getPropertyType(); } -const VkPhysicalDeviceShadingRateImagePropertiesNV& getShadingRateImageProperties (void) const { return m_devicePropertiesFull.getPropertyType(); } -const VkPhysicalDeviceSubgroupProperties& getSubgroupProperties (void) const { return m_devicePropertiesFull.getPropertyType(); } -const VkPhysicalDeviceSubgroupSizeControlPropertiesEXT& getSubgroupSizeControlPropertiesEXT (void) const { return m_devicePropertiesFull.getPropertyType(); } -const VkPhysicalDeviceTexelBufferAlignmentPropertiesEXT& getTexelBufferAlignmentPropertiesEXT (void) const { return m_devicePropertiesFull.getPropertyType(); } -const VkPhysicalDeviceTimelineSemaphoreProperties& getTimelineSemaphoreProperties (void) const { return m_devicePropertiesFull.getPropertyType(); } -const VkPhysicalDeviceToolPropertiesEXT& getToolPropertiesEXT (void) const { return m_devicePropertiesFull.getPropertyType(); } -const VkPhysicalDeviceTransformFeedbackPropertiesEXT& getTransformFeedbackPropertiesEXT (void) const { return m_devicePropertiesFull.getPropertyType(); } -const VkPhysicalDeviceVertexAttributeDivisorPropertiesEXT& getVertexAttributeDivisorPropertiesEXT (void) const { return m_devicePropertiesFull.getPropertyType(); } +const VkPhysicalDeviceBlendOperationAdvancedPropertiesEXT& getBlendOperationAdvancedPropertiesEXT (void) const { return m_deviceProperties.getPropertyType(); } +const VkPhysicalDeviceConservativeRasterizationPropertiesEXT& getConservativeRasterizationPropertiesEXT (void) const { return m_deviceProperties.getPropertyType(); } +const VkPhysicalDeviceCooperativeMatrixPropertiesNV& getCooperativeMatrixProperties (void) const { return m_deviceProperties.getPropertyType(); } +const VkPhysicalDeviceCustomBorderColorPropertiesEXT& getCustomBorderColorPropertiesEXT (void) const { return m_deviceProperties.getPropertyType(); } +const VkPhysicalDeviceDepthStencilResolveProperties& getDepthStencilResolveProperties (void) const { return m_deviceProperties.getPropertyType(); } +const VkPhysicalDeviceDescriptorIndexingProperties& getDescriptorIndexingProperties (void) const { return m_deviceProperties.getPropertyType(); } +const VkPhysicalDeviceDeviceGeneratedCommandsPropertiesNV& getDeviceGeneratedCommandsProperties (void) const { return m_deviceProperties.getPropertyType(); } +const VkPhysicalDeviceDiscardRectanglePropertiesEXT& getDiscardRectanglePropertiesEXT (void) const { return m_deviceProperties.getPropertyType(); } +const VkPhysicalDeviceDriverProperties& getDriverProperties (void) const { return m_deviceProperties.getPropertyType(); } +const VkPhysicalDeviceExternalMemoryHostPropertiesEXT& getExternalMemoryHostPropertiesEXT (void) const { return m_deviceProperties.getPropertyType(); } +const VkPhysicalDeviceFloatControlsProperties& getFloatControlsProperties (void) const { return m_deviceProperties.getPropertyType(); } +const VkPhysicalDeviceFragmentDensityMapPropertiesEXT& getFragmentDensityMapPropertiesEXT (void) const { return m_deviceProperties.getPropertyType(); } +const VkPhysicalDeviceFragmentDensityMap2PropertiesEXT& getFragmentDensityMap2PropertiesEXT (void) const { return m_deviceProperties.getPropertyType(); } +const VkPhysicalDeviceIDProperties& getIDProperties (void) const { return m_deviceProperties.getPropertyType(); } +const VkPhysicalDeviceInlineUniformBlockPropertiesEXT& getInlineUniformBlockPropertiesEXT (void) const { return m_deviceProperties.getPropertyType(); } +const VkPhysicalDeviceLineRasterizationPropertiesEXT& getLineRasterizationPropertiesEXT (void) const { return m_deviceProperties.getPropertyType(); } +const VkPhysicalDeviceMaintenance3Properties& getMaintenance3Properties (void) const { return m_deviceProperties.getPropertyType(); } +const VkPhysicalDeviceMeshShaderPropertiesNV& getMeshShaderProperties (void) const { return m_deviceProperties.getPropertyType(); } +const VkPhysicalDeviceMultiviewProperties& getMultiviewProperties (void) const { return m_deviceProperties.getPropertyType(); } +const VkPhysicalDeviceMultiviewPerViewAttributesPropertiesNVX& getMultiviewPerViewAttributesPropertiesX (void) const { return m_deviceProperties.getPropertyType(); } +const VkPhysicalDevicePerformanceQueryPropertiesKHR& getPerformanceQueryProperties (void) const { return m_deviceProperties.getPropertyType(); } +const VkPhysicalDevicePointClippingProperties& getPointClippingProperties (void) const { return m_deviceProperties.getPropertyType(); } +const VkPhysicalDeviceProtectedMemoryProperties& getProtectedMemoryProperties (void) const { return m_deviceProperties.getPropertyType(); } +const VkPhysicalDevicePushDescriptorPropertiesKHR& getPushDescriptorProperties (void) const { return m_deviceProperties.getPropertyType(); } +const VkPhysicalDeviceRayTracingPropertiesKHR& getRayTracingProperties (void) const { return m_deviceProperties.getPropertyType(); } +const VkPhysicalDeviceRayTracingPropertiesNV& getRayTracingPropertiesNV (void) const { return m_deviceProperties.getPropertyType(); } +const VkPhysicalDeviceRobustness2PropertiesEXT& getRobustness2PropertiesEXT (void) const { return m_deviceProperties.getPropertyType(); } +const VkPhysicalDeviceSamplerFilterMinmaxProperties& getSamplerFilterMinmaxProperties (void) const { return m_deviceProperties.getPropertyType(); } +const VkPhysicalDeviceSampleLocationsPropertiesEXT& getSampleLocationsPropertiesEXT (void) const { return m_deviceProperties.getPropertyType(); } +const VkPhysicalDeviceShaderCorePropertiesAMD& getShaderCorePropertiesAMD (void) const { return m_deviceProperties.getPropertyType(); } +const VkPhysicalDeviceShaderCoreProperties2AMD& getShaderCoreProperties2AMD (void) const { return m_deviceProperties.getPropertyType(); } +const VkPhysicalDeviceShadingRateImagePropertiesNV& getShadingRateImageProperties (void) const { return m_deviceProperties.getPropertyType(); } +const VkPhysicalDeviceSubgroupProperties& getSubgroupProperties (void) const { return m_deviceProperties.getPropertyType(); } +const VkPhysicalDeviceSubgroupSizeControlPropertiesEXT& getSubgroupSizeControlPropertiesEXT (void) const { return m_deviceProperties.getPropertyType(); } +const VkPhysicalDeviceTexelBufferAlignmentPropertiesEXT& getTexelBufferAlignmentPropertiesEXT (void) const { return m_deviceProperties.getPropertyType(); } +const VkPhysicalDeviceTimelineSemaphoreProperties& getTimelineSemaphoreProperties (void) const { return m_deviceProperties.getPropertyType(); } +const VkPhysicalDeviceTransformFeedbackPropertiesEXT& getTransformFeedbackPropertiesEXT (void) const { return m_deviceProperties.getPropertyType(); } +const VkPhysicalDeviceVertexAttributeDivisorPropertiesEXT& getVertexAttributeDivisorPropertiesEXT (void) const { return m_deviceProperties.getPropertyType(); } diff --cc external/vulkancts/modules/vulkan/wsi/vktWsiSwapchainTests.cpp index 837a200,9ea763c..110dc39 --- a/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::max(), (VkSemaphore)0, **fences[i], &dummy)); + VK_CHECK_WSI(devHelper.vkd.acquireNextImageKHR(*devHelper.device, *swapchain, std::numeric_limits::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::max(), (VkSemaphore)0, **fences[i], &dummy)); + VK_CHECK_WSI(devHelper.vkd.acquireNextImageKHR(*devHelper.device, *swapchain, std::numeric_limits::max(), (VkSemaphore)0, **fences[i], &unused)); } const deUint64 millisecond = 1000000;