From 203e2468aecc8803e0fc3851ea732949aae9f961 Mon Sep 17 00:00:00 2001 From: Piotr Byszewski Date: Mon, 29 Jun 2020 17:54:00 +0200 Subject: [PATCH] Update VK_EXT_fragment_density_map2 names Extension was updated and some names were changed. Components: Vulkan VK-GL-CTS issue: 2436 Affects: dEQP-VK.renderpass2.fragment_density_map.* dEQP-VK.api.info.get_physical_device_properties2.features Change-Id: I266a78bd15196aa7800f40f276077e74ff94f6d6 --- .../vulkancts/framework/vulkan/vkBasicTypes.inl | 4 +- .../framework/vulkan/vkDeviceFeatures.inl | 6 +-- .../framework/vulkan/vkDeviceFeatures2.inl | 22 +++++----- .../vulkan/vkDeviceFeaturesForContextDecl.inl | 2 +- .../vulkan/vkDeviceFeaturesForContextDefs.inl | 2 +- .../vkDeviceFeaturesForDefaultDeviceDefs.inl | 2 +- .../framework/vulkan/vkDeviceProperties.inl | 4 +- .../vulkan/vkDevicePropertiesForContextDecl.inl | 2 +- .../vulkan/vkDevicePropertiesForContextDefs.inl | 2 +- .../vkDevicePropertiesForDefaultDeviceDefs.inl | 2 +- .../framework/vulkan/vkGetStructureTypeImpl.inl | 8 ++-- external/vulkancts/framework/vulkan/vkStrUtil.inl | 4 +- .../vulkancts/framework/vulkan/vkStrUtilImpl.inl | 12 ++--- .../vulkancts/framework/vulkan/vkStructTypes.inl | 4 +- external/vulkancts/framework/vulkan/vkVulkan_c.inl | 12 ++--- .../vktRenderPassFragmentDensityMapTests.cpp | 12 ++--- external/vulkancts/scripts/gen_framework.py | 51 +++++++++++----------- external/vulkancts/scripts/src/vulkan_core.h | 12 ++--- 18 files changed, 81 insertions(+), 82 deletions(-) diff --git a/external/vulkancts/framework/vulkan/vkBasicTypes.inl b/external/vulkancts/framework/vulkan/vkBasicTypes.inl index 3a1c7be..36920fe 100644 --- a/external/vulkancts/framework/vulkan/vkBasicTypes.inl +++ b/external/vulkancts/framework/vulkan/vkBasicTypes.inl @@ -563,8 +563,8 @@ enum VkStructureType VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PIPELINE_CREATION_CACHE_CONTROL_FEATURES_EXT = 1000297000, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DIAGNOSTICS_CONFIG_FEATURES_NV = 1000300000, VK_STRUCTURE_TYPE_DEVICE_DIAGNOSTICS_CONFIG_CREATE_INFO_NV = 1000300001, - VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FRAGMENT_DENSITY_MAP_FEATURES_2_EXT = 1000332000, - VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FRAGMENT_DENSITY_MAP_PROPERTIES_2_EXT = 1000332001, + VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FRAGMENT_DENSITY_MAP_2_FEATURES_EXT = 1000332000, + VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FRAGMENT_DENSITY_MAP_2_PROPERTIES_EXT = 1000332001, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VARIABLE_POINTER_FEATURES = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VARIABLE_POINTERS_FEATURES, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_DRAW_PARAMETER_FEATURES = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_DRAW_PARAMETERS_FEATURES, VK_STRUCTURE_TYPE_DEBUG_REPORT_CREATE_INFO_EXT = VK_STRUCTURE_TYPE_DEBUG_REPORT_CALLBACK_CREATE_INFO_EXT, diff --git a/external/vulkancts/framework/vulkan/vkDeviceFeatures.inl b/external/vulkancts/framework/vulkan/vkDeviceFeatures.inl index 3b5fb10..66fd52e 100644 --- a/external/vulkancts/framework/vulkan/vkDeviceFeatures.inl +++ b/external/vulkancts/framework/vulkan/vkDeviceFeatures.inl @@ -223,7 +223,7 @@ template<> void initFromBlob(VkPhy template<> void initFromBlob(VkPhysicalDevicePrivateDataFeaturesEXT&, const AllBlobs&) {} template<> void initFromBlob(VkPhysicalDevicePipelineCreationCacheControlFeaturesEXT&, const AllBlobs&) {} template<> void initFromBlob(VkPhysicalDeviceDiagnosticsConfigFeaturesNV&, const AllBlobs&) {} -template<> void initFromBlob(VkPhysicalDeviceFragmentDensityMapFeatures2EXT&, const AllBlobs&) {} +template<> void initFromBlob(VkPhysicalDeviceFragmentDensityMap2FeaturesEXT&, const AllBlobs&) {} template<> void initFromBlob(VkPhysicalDeviceRayTracingFeaturesKHR&, const AllBlobs&) {} @@ -248,7 +248,7 @@ template<> FeatureDesc makeFeatureDesc FeatureDesc makeFeatureDesc(void) { return FeatureDesc{VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_EXCLUSIVE_SCISSOR_FEATURES_NV, VK_NV_SCISSOR_EXCLUSIVE_EXTENSION_NAME, VK_NV_SCISSOR_EXCLUSIVE_SPEC_VERSION, 45}; } template<> FeatureDesc makeFeatureDesc(void) { return FeatureDesc{VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_EXTENDED_DYNAMIC_STATE_FEATURES_EXT, VK_EXT_EXTENDED_DYNAMIC_STATE_EXTENSION_NAME, VK_EXT_EXTENDED_DYNAMIC_STATE_SPEC_VERSION, 44}; } template<> FeatureDesc makeFeatureDesc(void) { return FeatureDesc{VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FRAGMENT_DENSITY_MAP_FEATURES_EXT, VK_EXT_FRAGMENT_DENSITY_MAP_EXTENSION_NAME, VK_EXT_FRAGMENT_DENSITY_MAP_SPEC_VERSION, 43}; } -template<> FeatureDesc makeFeatureDesc(void) { return FeatureDesc{VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FRAGMENT_DENSITY_MAP_FEATURES_2_EXT, VK_EXT_FRAGMENT_DENSITY_MAP_2_EXTENSION_NAME, VK_EXT_FRAGMENT_DENSITY_MAP_2_SPEC_VERSION, 42}; } +template<> FeatureDesc makeFeatureDesc(void) { return FeatureDesc{VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FRAGMENT_DENSITY_MAP_2_FEATURES_EXT, VK_EXT_FRAGMENT_DENSITY_MAP_2_EXTENSION_NAME, VK_EXT_FRAGMENT_DENSITY_MAP_2_SPEC_VERSION, 42}; } template<> FeatureDesc makeFeatureDesc(void) { return FeatureDesc{VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FRAGMENT_SHADER_BARYCENTRIC_FEATURES_NV, VK_NV_FRAGMENT_SHADER_BARYCENTRIC_EXTENSION_NAME, VK_NV_FRAGMENT_SHADER_BARYCENTRIC_SPEC_VERSION, 41}; } template<> FeatureDesc makeFeatureDesc(void) { return FeatureDesc{VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FRAGMENT_SHADER_INTERLOCK_FEATURES_EXT, VK_EXT_FRAGMENT_SHADER_INTERLOCK_EXTENSION_NAME, VK_EXT_FRAGMENT_SHADER_INTERLOCK_SPEC_VERSION, 40}; } template<> FeatureDesc makeFeatureDesc(void) { return FeatureDesc{VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_HOST_QUERY_RESET_FEATURES, VK_EXT_HOST_QUERY_RESET_EXTENSION_NAME, VK_EXT_HOST_QUERY_RESET_SPEC_VERSION, 39}; } @@ -315,7 +315,7 @@ static const FeatureStructCreationData featureStructCreationArray[] = { createFeatureStructWrapper, VK_NV_SCISSOR_EXCLUSIVE_EXTENSION_NAME, VK_NV_SCISSOR_EXCLUSIVE_SPEC_VERSION }, { createFeatureStructWrapper, VK_EXT_EXTENDED_DYNAMIC_STATE_EXTENSION_NAME, VK_EXT_EXTENDED_DYNAMIC_STATE_SPEC_VERSION }, { createFeatureStructWrapper, VK_EXT_FRAGMENT_DENSITY_MAP_EXTENSION_NAME, VK_EXT_FRAGMENT_DENSITY_MAP_SPEC_VERSION }, - { createFeatureStructWrapper, VK_EXT_FRAGMENT_DENSITY_MAP_2_EXTENSION_NAME, VK_EXT_FRAGMENT_DENSITY_MAP_2_SPEC_VERSION }, + { createFeatureStructWrapper, VK_EXT_FRAGMENT_DENSITY_MAP_2_EXTENSION_NAME, VK_EXT_FRAGMENT_DENSITY_MAP_2_SPEC_VERSION }, { createFeatureStructWrapper, VK_NV_FRAGMENT_SHADER_BARYCENTRIC_EXTENSION_NAME, VK_NV_FRAGMENT_SHADER_BARYCENTRIC_SPEC_VERSION }, { createFeatureStructWrapper, VK_EXT_FRAGMENT_SHADER_INTERLOCK_EXTENSION_NAME, VK_EXT_FRAGMENT_SHADER_INTERLOCK_SPEC_VERSION }, { createFeatureStructWrapper, VK_EXT_HOST_QUERY_RESET_EXTENSION_NAME, VK_EXT_HOST_QUERY_RESET_SPEC_VERSION }, diff --git a/external/vulkancts/framework/vulkan/vkDeviceFeatures2.inl b/external/vulkancts/framework/vulkan/vkDeviceFeatures2.inl index c49dc44..504694e 100644 --- a/external/vulkancts/framework/vulkan/vkDeviceFeatures2.inl +++ b/external/vulkancts/framework/vulkan/vkDeviceFeatures2.inl @@ -17,7 +17,7 @@ VkPhysicalDeviceBufferDeviceAddressFeatures deviceBufferDeviceAddressFeatures[ VkPhysicalDeviceDescriptorIndexingFeatures deviceDescriptorIndexingFeatures[count]; VkPhysicalDeviceTimelineSemaphoreFeatures deviceTimelineSemaphoreFeatures[count]; VkPhysicalDeviceFragmentDensityMapFeaturesEXT deviceFragmentDensityMapFeaturesEXT[count]; -VkPhysicalDeviceFragmentDensityMapFeatures2EXT deviceFragmentDensityMapFeatures2EXT[count]; +VkPhysicalDeviceFragmentDensityMap2FeaturesEXT deviceFragmentDensityMap2FeaturesEXT[count]; const bool isConditionalRenderingFeaturesEXT = checkExtension(properties, "VK_EXT_conditional_rendering"); const bool isScalarBlockLayoutFeatures = checkExtension(properties, "VK_EXT_scalar_block_layout") || context.contextSupports(vk::ApiVersion(1, 2, 0)); @@ -35,7 +35,7 @@ const bool isBufferDeviceAddressFeatures = checkExtension(properties, "VK_KHR_b const bool isDescriptorIndexingFeatures = checkExtension(properties, "VK_EXT_descriptor_indexing") || context.contextSupports(vk::ApiVersion(1, 2, 0)); const bool isTimelineSemaphoreFeatures = checkExtension(properties, "VK_KHR_timeline_semaphore") || context.contextSupports(vk::ApiVersion(1, 2, 0)); const bool isFragmentDensityMapFeaturesEXT = checkExtension(properties, "VK_EXT_fragment_density_map"); -const bool isFragmentDensityMapFeatures2EXT = checkExtension(properties, "VK_EXT_fragment_density_map2"); +const bool isFragmentDensityMap2FeaturesEXT = checkExtension(properties, "VK_EXT_fragment_density_map2"); for (int ndx = 0; ndx < count; ++ndx) { @@ -55,7 +55,7 @@ for (int ndx = 0; ndx < count; ++ndx) deMemset(&deviceDescriptorIndexingFeatures[ndx], 0xFF * ndx, sizeof(VkPhysicalDeviceDescriptorIndexingFeatures)); deMemset(&deviceTimelineSemaphoreFeatures[ndx], 0xFF * ndx, sizeof(VkPhysicalDeviceTimelineSemaphoreFeatures)); deMemset(&deviceFragmentDensityMapFeaturesEXT[ndx], 0xFF * ndx, sizeof(VkPhysicalDeviceFragmentDensityMapFeaturesEXT)); - deMemset(&deviceFragmentDensityMapFeatures2EXT[ndx], 0xFF * ndx, sizeof(VkPhysicalDeviceFragmentDensityMapFeatures2EXT)); + deMemset(&deviceFragmentDensityMap2FeaturesEXT[ndx], 0xFF * ndx, sizeof(VkPhysicalDeviceFragmentDensityMap2FeaturesEXT)); deviceConditionalRenderingFeaturesEXT[ndx].sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_CONDITIONAL_RENDERING_FEATURES_EXT; deviceConditionalRenderingFeaturesEXT[ndx].pNext = &deviceScalarBlockLayoutFeatures[ndx]; @@ -103,10 +103,10 @@ for (int ndx = 0; ndx < count; ++ndx) deviceTimelineSemaphoreFeatures[ndx].pNext = &deviceFragmentDensityMapFeaturesEXT[ndx]; deviceFragmentDensityMapFeaturesEXT[ndx].sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FRAGMENT_DENSITY_MAP_FEATURES_EXT; - deviceFragmentDensityMapFeaturesEXT[ndx].pNext = &deviceFragmentDensityMapFeatures2EXT[ndx]; + deviceFragmentDensityMapFeaturesEXT[ndx].pNext = &deviceFragmentDensityMap2FeaturesEXT[ndx]; - deviceFragmentDensityMapFeatures2EXT[ndx].sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FRAGMENT_DENSITY_MAP_FEATURES_2_EXT; - deviceFragmentDensityMapFeatures2EXT[ndx].pNext = DE_NULL; + deviceFragmentDensityMap2FeaturesEXT[ndx].sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FRAGMENT_DENSITY_MAP_2_FEATURES_EXT; + deviceFragmentDensityMap2FeaturesEXT[ndx].pNext = DE_NULL; deMemset(&extFeatures.features, 0xcd, sizeof(extFeatures.features)); extFeatures.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FEATURES_2; @@ -146,8 +146,8 @@ if (isTimelineSemaphoreFeatures) log << TestLog::Message << deviceTimelineSemaphoreFeatures[0] << TestLog::EndMessage; if (isFragmentDensityMapFeaturesEXT) log << TestLog::Message << deviceFragmentDensityMapFeaturesEXT[0] << TestLog::EndMessage; -if (isFragmentDensityMapFeatures2EXT) - log << TestLog::Message << deviceFragmentDensityMapFeatures2EXT[0] << TestLog::EndMessage; +if (isFragmentDensityMap2FeaturesEXT) + log << TestLog::Message << deviceFragmentDensityMap2FeaturesEXT[0] << TestLog::EndMessage; if (isConditionalRenderingFeaturesEXT && (deviceConditionalRenderingFeaturesEXT[0].conditionalRendering != deviceConditionalRenderingFeaturesEXT[1].conditionalRendering || @@ -266,8 +266,8 @@ if (isFragmentDensityMapFeaturesEXT && { TCU_FAIL("Mismatch between VkPhysicalDeviceFragmentDensityMapFeaturesEXT"); } -if (isFragmentDensityMapFeatures2EXT && - (deviceFragmentDensityMapFeatures2EXT[0].fragmentDensityMapDeferred != deviceFragmentDensityMapFeatures2EXT[1].fragmentDensityMapDeferred)) +if (isFragmentDensityMap2FeaturesEXT && + (deviceFragmentDensityMap2FeaturesEXT[0].fragmentDensityMapDeferred != deviceFragmentDensityMap2FeaturesEXT[1].fragmentDensityMapDeferred)) { - TCU_FAIL("Mismatch between VkPhysicalDeviceFragmentDensityMapFeatures2EXT"); + TCU_FAIL("Mismatch between VkPhysicalDeviceFragmentDensityMap2FeaturesEXT"); } diff --git a/external/vulkancts/framework/vulkan/vkDeviceFeaturesForContextDecl.inl b/external/vulkancts/framework/vulkan/vkDeviceFeaturesForContextDecl.inl index fa33803..ce18f46 100644 --- a/external/vulkancts/framework/vulkan/vkDeviceFeaturesForContextDecl.inl +++ b/external/vulkancts/framework/vulkan/vkDeviceFeaturesForContextDecl.inl @@ -22,7 +22,7 @@ const vk::VkPhysicalDeviceDiagnosticsConfigFeaturesNV& getDiagnosticsConfigF const vk::VkPhysicalDeviceExclusiveScissorFeaturesNV& getExclusiveScissorFeatures (void) const; const vk::VkPhysicalDeviceExtendedDynamicStateFeaturesEXT& getExtendedDynamicStateFeaturesEXT (void) const; const vk::VkPhysicalDeviceFragmentDensityMapFeaturesEXT& getFragmentDensityMapFeaturesEXT (void) const; -const vk::VkPhysicalDeviceFragmentDensityMapFeatures2EXT& getFragmentDensityMapFeatures2EXT (void) const; +const vk::VkPhysicalDeviceFragmentDensityMap2FeaturesEXT& getFragmentDensityMap2FeaturesEXT (void) const; const vk::VkPhysicalDeviceFragmentShaderBarycentricFeaturesNV& getFragmentShaderBarycentricFeatures (void) const; const vk::VkPhysicalDeviceFragmentShaderInterlockFeaturesEXT& getFragmentShaderInterlockFeaturesEXT (void) const; const vk::VkPhysicalDeviceHostQueryResetFeatures& getHostQueryResetFeatures (void) const; diff --git a/external/vulkancts/framework/vulkan/vkDeviceFeaturesForContextDefs.inl b/external/vulkancts/framework/vulkan/vkDeviceFeaturesForContextDefs.inl index b846193..52a678d 100644 --- a/external/vulkancts/framework/vulkan/vkDeviceFeaturesForContextDefs.inl +++ b/external/vulkancts/framework/vulkan/vkDeviceFeaturesForContextDefs.inl @@ -22,7 +22,7 @@ const vk::VkPhysicalDeviceDiagnosticsConfigFeaturesNV& Context::getDiagnosti const vk::VkPhysicalDeviceExclusiveScissorFeaturesNV& Context::getExclusiveScissorFeatures (void) const { return m_device->getExclusiveScissorFeatures(); } const vk::VkPhysicalDeviceExtendedDynamicStateFeaturesEXT& Context::getExtendedDynamicStateFeaturesEXT (void) const { return m_device->getExtendedDynamicStateFeaturesEXT(); } const vk::VkPhysicalDeviceFragmentDensityMapFeaturesEXT& Context::getFragmentDensityMapFeaturesEXT (void) const { return m_device->getFragmentDensityMapFeaturesEXT(); } -const vk::VkPhysicalDeviceFragmentDensityMapFeatures2EXT& Context::getFragmentDensityMapFeatures2EXT (void) const { return m_device->getFragmentDensityMapFeatures2EXT(); } +const vk::VkPhysicalDeviceFragmentDensityMap2FeaturesEXT& Context::getFragmentDensityMap2FeaturesEXT (void) const { return m_device->getFragmentDensityMap2FeaturesEXT(); } const vk::VkPhysicalDeviceFragmentShaderBarycentricFeaturesNV& Context::getFragmentShaderBarycentricFeatures (void) const { return m_device->getFragmentShaderBarycentricFeatures(); } const vk::VkPhysicalDeviceFragmentShaderInterlockFeaturesEXT& Context::getFragmentShaderInterlockFeaturesEXT (void) const { return m_device->getFragmentShaderInterlockFeaturesEXT(); } const vk::VkPhysicalDeviceHostQueryResetFeatures& Context::getHostQueryResetFeatures (void) const { return m_device->getHostQueryResetFeatures(); } diff --git a/external/vulkancts/framework/vulkan/vkDeviceFeaturesForDefaultDeviceDefs.inl b/external/vulkancts/framework/vulkan/vkDeviceFeaturesForDefaultDeviceDefs.inl index a180e88..01493ae 100644 --- a/external/vulkancts/framework/vulkan/vkDeviceFeaturesForDefaultDeviceDefs.inl +++ b/external/vulkancts/framework/vulkan/vkDeviceFeaturesForDefaultDeviceDefs.inl @@ -22,7 +22,7 @@ const VkPhysicalDeviceDiagnosticsConfigFeaturesNV& getDiagnosticsConfigFeatu const VkPhysicalDeviceExclusiveScissorFeaturesNV& getExclusiveScissorFeatures (void) const { return m_deviceFeatures.getFeatureType(); } const VkPhysicalDeviceExtendedDynamicStateFeaturesEXT& getExtendedDynamicStateFeaturesEXT (void) const { return m_deviceFeatures.getFeatureType(); } const VkPhysicalDeviceFragmentDensityMapFeaturesEXT& getFragmentDensityMapFeaturesEXT (void) const { return m_deviceFeatures.getFeatureType(); } -const VkPhysicalDeviceFragmentDensityMapFeatures2EXT& getFragmentDensityMapFeatures2EXT (void) const { return m_deviceFeatures.getFeatureType(); } +const VkPhysicalDeviceFragmentDensityMap2FeaturesEXT& getFragmentDensityMap2FeaturesEXT (void) const { return m_deviceFeatures.getFeatureType(); } const VkPhysicalDeviceFragmentShaderBarycentricFeaturesNV& getFragmentShaderBarycentricFeatures (void) const { return m_deviceFeatures.getFeatureType(); } const VkPhysicalDeviceFragmentShaderInterlockFeaturesEXT& getFragmentShaderInterlockFeaturesEXT (void) const { return m_deviceFeatures.getFeatureType(); } const VkPhysicalDeviceHostQueryResetFeatures& getHostQueryResetFeatures (void) const { return m_deviceFeatures.getFeatureType(); } diff --git a/external/vulkancts/framework/vulkan/vkDeviceProperties.inl b/external/vulkancts/framework/vulkan/vkDeviceProperties.inl index 13413e8..c638287 100644 --- a/external/vulkancts/framework/vulkan/vkDeviceProperties.inl +++ b/external/vulkancts/framework/vulkan/vkDeviceProperties.inl @@ -56,7 +56,7 @@ template<> PropertyDesc makePropertyDesc(void) template<> PropertyDesc makePropertyDesc(void) { return PropertyDesc(VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_EXTERNAL_MEMORY_HOST_PROPERTIES_EXT, VK_EXT_EXTERNAL_MEMORY_HOST_EXTENSION_NAME, VK_EXT_EXTERNAL_MEMORY_HOST_SPEC_VERSION, 28); } template<> PropertyDesc makePropertyDesc(void) { return PropertyDesc(VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FLOAT_CONTROLS_PROPERTIES, VK_KHR_SHADER_FLOAT_CONTROLS_EXTENSION_NAME, VK_KHR_SHADER_FLOAT_CONTROLS_SPEC_VERSION, 27); } template<> PropertyDesc makePropertyDesc(void) { return PropertyDesc(VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FRAGMENT_DENSITY_MAP_PROPERTIES_EXT, VK_EXT_FRAGMENT_DENSITY_MAP_EXTENSION_NAME, VK_EXT_FRAGMENT_DENSITY_MAP_SPEC_VERSION, 26); } -template<> PropertyDesc makePropertyDesc(void) { return PropertyDesc(VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FRAGMENT_DENSITY_MAP_PROPERTIES_2_EXT, VK_EXT_FRAGMENT_DENSITY_MAP_2_EXTENSION_NAME, VK_EXT_FRAGMENT_DENSITY_MAP_2_SPEC_VERSION, 25); } +template<> PropertyDesc makePropertyDesc(void) { return PropertyDesc(VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FRAGMENT_DENSITY_MAP_2_PROPERTIES_EXT, VK_EXT_FRAGMENT_DENSITY_MAP_2_EXTENSION_NAME, VK_EXT_FRAGMENT_DENSITY_MAP_2_SPEC_VERSION, 25); } template<> PropertyDesc makePropertyDesc(void) { return PropertyDesc(VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_INLINE_UNIFORM_BLOCK_PROPERTIES_EXT, VK_EXT_INLINE_UNIFORM_BLOCK_EXTENSION_NAME, VK_EXT_INLINE_UNIFORM_BLOCK_SPEC_VERSION, 24); } template<> PropertyDesc makePropertyDesc(void) { return PropertyDesc(VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_LINE_RASTERIZATION_PROPERTIES_EXT, VK_EXT_LINE_RASTERIZATION_EXTENSION_NAME, VK_EXT_LINE_RASTERIZATION_SPEC_VERSION, 23); } template<> PropertyDesc makePropertyDesc(void) { return PropertyDesc(VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MAINTENANCE_3_PROPERTIES, VK_KHR_MAINTENANCE3_EXTENSION_NAME, VK_KHR_MAINTENANCE3_SPEC_VERSION, 22); } @@ -97,7 +97,7 @@ static const PropertyStructMapItem propertyStructCreatorMap[] = { createPropertyStructWrapper, VK_EXT_EXTERNAL_MEMORY_HOST_EXTENSION_NAME, VK_EXT_EXTERNAL_MEMORY_HOST_SPEC_VERSION }, { createPropertyStructWrapper, VK_KHR_SHADER_FLOAT_CONTROLS_EXTENSION_NAME, VK_KHR_SHADER_FLOAT_CONTROLS_SPEC_VERSION }, { createPropertyStructWrapper, VK_EXT_FRAGMENT_DENSITY_MAP_EXTENSION_NAME, VK_EXT_FRAGMENT_DENSITY_MAP_SPEC_VERSION }, - { createPropertyStructWrapper, VK_EXT_FRAGMENT_DENSITY_MAP_2_EXTENSION_NAME, VK_EXT_FRAGMENT_DENSITY_MAP_2_SPEC_VERSION }, + { createPropertyStructWrapper, VK_EXT_FRAGMENT_DENSITY_MAP_2_EXTENSION_NAME, VK_EXT_FRAGMENT_DENSITY_MAP_2_SPEC_VERSION }, { createPropertyStructWrapper, VK_EXT_INLINE_UNIFORM_BLOCK_EXTENSION_NAME, VK_EXT_INLINE_UNIFORM_BLOCK_SPEC_VERSION }, { createPropertyStructWrapper, VK_EXT_LINE_RASTERIZATION_EXTENSION_NAME, VK_EXT_LINE_RASTERIZATION_SPEC_VERSION }, { createPropertyStructWrapper, VK_KHR_MAINTENANCE3_EXTENSION_NAME, VK_KHR_MAINTENANCE3_SPEC_VERSION }, diff --git a/external/vulkancts/framework/vulkan/vkDevicePropertiesForContextDecl.inl b/external/vulkancts/framework/vulkan/vkDevicePropertiesForContextDecl.inl index b5be6a7..47bdc26 100644 --- a/external/vulkancts/framework/vulkan/vkDevicePropertiesForContextDecl.inl +++ b/external/vulkancts/framework/vulkan/vkDevicePropertiesForContextDecl.inl @@ -13,7 +13,7 @@ const vk::VkPhysicalDeviceDriverProperties& getDriverProperties (voi const vk::VkPhysicalDeviceExternalMemoryHostPropertiesEXT& getExternalMemoryHostPropertiesEXT (void) const; const vk::VkPhysicalDeviceFloatControlsProperties& getFloatControlsProperties (void) const; const vk::VkPhysicalDeviceFragmentDensityMapPropertiesEXT& getFragmentDensityMapPropertiesEXT (void) const; -const vk::VkPhysicalDeviceFragmentDensityMapProperties2EXT& getFragmentDensityMapProperties2EXT (void) const; +const vk::VkPhysicalDeviceFragmentDensityMap2PropertiesEXT& getFragmentDensityMap2PropertiesEXT (void) const; const vk::VkPhysicalDeviceInlineUniformBlockPropertiesEXT& getInlineUniformBlockPropertiesEXT (void) const; const vk::VkPhysicalDeviceLineRasterizationPropertiesEXT& getLineRasterizationPropertiesEXT (void) const; const vk::VkPhysicalDeviceMaintenance3Properties& getMaintenance3Properties (void) const; diff --git a/external/vulkancts/framework/vulkan/vkDevicePropertiesForContextDefs.inl b/external/vulkancts/framework/vulkan/vkDevicePropertiesForContextDefs.inl index 8600ab1..2fdf2f8 100644 --- a/external/vulkancts/framework/vulkan/vkDevicePropertiesForContextDefs.inl +++ b/external/vulkancts/framework/vulkan/vkDevicePropertiesForContextDefs.inl @@ -13,7 +13,7 @@ const vk::VkPhysicalDeviceDriverProperties& Context::getDriverProperties const vk::VkPhysicalDeviceExternalMemoryHostPropertiesEXT& Context::getExternalMemoryHostPropertiesEXT (void) const { return m_device->getExternalMemoryHostPropertiesEXT(); } const vk::VkPhysicalDeviceFloatControlsProperties& Context::getFloatControlsProperties (void) const { return m_device->getFloatControlsProperties(); } const vk::VkPhysicalDeviceFragmentDensityMapPropertiesEXT& Context::getFragmentDensityMapPropertiesEXT (void) const { return m_device->getFragmentDensityMapPropertiesEXT(); } -const vk::VkPhysicalDeviceFragmentDensityMapProperties2EXT& Context::getFragmentDensityMapProperties2EXT (void) const { return m_device->getFragmentDensityMapProperties2EXT(); } +const vk::VkPhysicalDeviceFragmentDensityMap2PropertiesEXT& Context::getFragmentDensityMap2PropertiesEXT (void) const { return m_device->getFragmentDensityMap2PropertiesEXT(); } const vk::VkPhysicalDeviceInlineUniformBlockPropertiesEXT& Context::getInlineUniformBlockPropertiesEXT (void) const { return m_device->getInlineUniformBlockPropertiesEXT(); } const vk::VkPhysicalDeviceLineRasterizationPropertiesEXT& Context::getLineRasterizationPropertiesEXT (void) const { return m_device->getLineRasterizationPropertiesEXT(); } const vk::VkPhysicalDeviceMaintenance3Properties& Context::getMaintenance3Properties (void) const { return m_device->getMaintenance3Properties(); } diff --git a/external/vulkancts/framework/vulkan/vkDevicePropertiesForDefaultDeviceDefs.inl b/external/vulkancts/framework/vulkan/vkDevicePropertiesForDefaultDeviceDefs.inl index 6b202b7..85d932f 100644 --- a/external/vulkancts/framework/vulkan/vkDevicePropertiesForDefaultDeviceDefs.inl +++ b/external/vulkancts/framework/vulkan/vkDevicePropertiesForDefaultDeviceDefs.inl @@ -13,7 +13,7 @@ const VkPhysicalDeviceDriverProperties& getDriverProperties (void) c 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 VkPhysicalDeviceFragmentDensityMapProperties2EXT& getFragmentDensityMapProperties2EXT (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(); } diff --git a/external/vulkancts/framework/vulkan/vkGetStructureTypeImpl.inl b/external/vulkancts/framework/vulkan/vkGetStructureTypeImpl.inl index 906a296..9c6549b 100644 --- a/external/vulkancts/framework/vulkan/vkGetStructureTypeImpl.inl +++ b/external/vulkancts/framework/vulkan/vkGetStructureTypeImpl.inl @@ -1891,14 +1891,14 @@ template<> VkStructureType getStructureType VkStructureType getStructureType (void) +template<> VkStructureType getStructureType (void) { - return VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FRAGMENT_DENSITY_MAP_FEATURES_2_EXT; + return VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FRAGMENT_DENSITY_MAP_2_FEATURES_EXT; } -template<> VkStructureType getStructureType (void) +template<> VkStructureType getStructureType (void) { - return VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FRAGMENT_DENSITY_MAP_PROPERTIES_2_EXT; + return VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FRAGMENT_DENSITY_MAP_2_PROPERTIES_EXT; } template<> VkStructureType getStructureType (void) diff --git a/external/vulkancts/framework/vulkan/vkStrUtil.inl b/external/vulkancts/framework/vulkan/vkStrUtil.inl index 39eb554..621c3c2 100644 --- a/external/vulkancts/framework/vulkan/vkStrUtil.inl +++ b/external/vulkancts/framework/vulkan/vkStrUtil.inl @@ -885,8 +885,8 @@ std::ostream& operator<< (std::ostream& s, const VkPrivateDataSlotCreateInfoEXT& std::ostream& operator<< (std::ostream& s, const VkPhysicalDevicePipelineCreationCacheControlFeaturesEXT& value); std::ostream& operator<< (std::ostream& s, const VkPhysicalDeviceDiagnosticsConfigFeaturesNV& value); std::ostream& operator<< (std::ostream& s, const VkDeviceDiagnosticsConfigCreateInfoNV& value); -std::ostream& operator<< (std::ostream& s, const VkPhysicalDeviceFragmentDensityMapFeatures2EXT& value); -std::ostream& operator<< (std::ostream& s, const VkPhysicalDeviceFragmentDensityMapProperties2EXT& value); +std::ostream& operator<< (std::ostream& s, const VkPhysicalDeviceFragmentDensityMap2FeaturesEXT& value); +std::ostream& operator<< (std::ostream& s, const VkPhysicalDeviceFragmentDensityMap2PropertiesEXT& value); std::ostream& operator<< (std::ostream& s, const VkAndroidSurfaceCreateInfoKHR& value); std::ostream& operator<< (std::ostream& s, const VkAndroidHardwareBufferUsageANDROID& value); std::ostream& operator<< (std::ostream& s, const VkAndroidHardwareBufferPropertiesANDROID& value); diff --git a/external/vulkancts/framework/vulkan/vkStrUtilImpl.inl b/external/vulkancts/framework/vulkan/vkStrUtilImpl.inl index 5176817..b2fe1ff 100644 --- a/external/vulkancts/framework/vulkan/vkStrUtilImpl.inl +++ b/external/vulkancts/framework/vulkan/vkStrUtilImpl.inl @@ -568,8 +568,8 @@ const char* getStructureTypeName (VkStructureType value) case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PIPELINE_CREATION_CACHE_CONTROL_FEATURES_EXT: return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PIPELINE_CREATION_CACHE_CONTROL_FEATURES_EXT"; case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DIAGNOSTICS_CONFIG_FEATURES_NV: return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DIAGNOSTICS_CONFIG_FEATURES_NV"; case VK_STRUCTURE_TYPE_DEVICE_DIAGNOSTICS_CONFIG_CREATE_INFO_NV: return "VK_STRUCTURE_TYPE_DEVICE_DIAGNOSTICS_CONFIG_CREATE_INFO_NV"; - case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FRAGMENT_DENSITY_MAP_FEATURES_2_EXT: return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FRAGMENT_DENSITY_MAP_FEATURES_2_EXT"; - case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FRAGMENT_DENSITY_MAP_PROPERTIES_2_EXT: return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FRAGMENT_DENSITY_MAP_PROPERTIES_2_EXT"; + case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FRAGMENT_DENSITY_MAP_2_FEATURES_EXT: return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FRAGMENT_DENSITY_MAP_2_FEATURES_EXT"; + case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FRAGMENT_DENSITY_MAP_2_PROPERTIES_EXT: return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FRAGMENT_DENSITY_MAP_2_PROPERTIES_EXT"; case VK_STRUCTURE_TYPE_MAX_ENUM: return "VK_STRUCTURE_TYPE_MAX_ENUM"; default: return DE_NULL; } @@ -9593,9 +9593,9 @@ std::ostream& operator<< (std::ostream& s, const VkDeviceDiagnosticsConfigCreate return s; } -std::ostream& operator<< (std::ostream& s, const VkPhysicalDeviceFragmentDensityMapFeatures2EXT& value) +std::ostream& operator<< (std::ostream& s, const VkPhysicalDeviceFragmentDensityMap2FeaturesEXT& value) { - s << "VkPhysicalDeviceFragmentDensityMapFeatures2EXT = {\n"; + s << "VkPhysicalDeviceFragmentDensityMap2FeaturesEXT = {\n"; s << "\tsType = " << value.sType << '\n'; s << "\tpNext = " << value.pNext << '\n'; s << "\tfragmentDensityMapDeferred = " << value.fragmentDensityMapDeferred << '\n'; @@ -9603,9 +9603,9 @@ std::ostream& operator<< (std::ostream& s, const VkPhysicalDeviceFragmentDensity return s; } -std::ostream& operator<< (std::ostream& s, const VkPhysicalDeviceFragmentDensityMapProperties2EXT& value) +std::ostream& operator<< (std::ostream& s, const VkPhysicalDeviceFragmentDensityMap2PropertiesEXT& value) { - s << "VkPhysicalDeviceFragmentDensityMapProperties2EXT = {\n"; + s << "VkPhysicalDeviceFragmentDensityMap2PropertiesEXT = {\n"; s << "\tsType = " << value.sType << '\n'; s << "\tpNext = " << value.pNext << '\n'; s << "\tsubsampledLoads = " << value.subsampledLoads << '\n'; diff --git a/external/vulkancts/framework/vulkan/vkStructTypes.inl b/external/vulkancts/framework/vulkan/vkStructTypes.inl index a887840..391d13f 100644 --- a/external/vulkancts/framework/vulkan/vkStructTypes.inl +++ b/external/vulkancts/framework/vulkan/vkStructTypes.inl @@ -4552,14 +4552,14 @@ struct VkDeviceDiagnosticsConfigCreateInfoNV VkDeviceDiagnosticsConfigFlagsNV flags; }; -struct VkPhysicalDeviceFragmentDensityMapFeatures2EXT +struct VkPhysicalDeviceFragmentDensityMap2FeaturesEXT { VkStructureType sType; void* pNext; VkBool32 fragmentDensityMapDeferred; }; -struct VkPhysicalDeviceFragmentDensityMapProperties2EXT +struct VkPhysicalDeviceFragmentDensityMap2PropertiesEXT { VkStructureType sType; void* pNext; diff --git a/external/vulkancts/framework/vulkan/vkVulkan_c.inl b/external/vulkancts/framework/vulkan/vkVulkan_c.inl index 15793f8..779e05f 100644 --- a/external/vulkancts/framework/vulkan/vkVulkan_c.inl +++ b/external/vulkancts/framework/vulkan/vkVulkan_c.inl @@ -604,8 +604,8 @@ typedef enum VkStructureType { VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PIPELINE_CREATION_CACHE_CONTROL_FEATURES_EXT = 1000297000, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DIAGNOSTICS_CONFIG_FEATURES_NV = 1000300000, VK_STRUCTURE_TYPE_DEVICE_DIAGNOSTICS_CONFIG_CREATE_INFO_NV = 1000300001, - VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FRAGMENT_DENSITY_MAP_FEATURES_2_EXT = 1000332000, - VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FRAGMENT_DENSITY_MAP_PROPERTIES_2_EXT = 1000332001, + VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FRAGMENT_DENSITY_MAP_2_FEATURES_EXT = 1000332000, + VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FRAGMENT_DENSITY_MAP_2_PROPERTIES_EXT = 1000332001, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VARIABLE_POINTER_FEATURES = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VARIABLE_POINTERS_FEATURES, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_DRAW_PARAMETER_FEATURES = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_DRAW_PARAMETERS_FEATURES, VK_STRUCTURE_TYPE_DEBUG_REPORT_CREATE_INFO_EXT = VK_STRUCTURE_TYPE_DEBUG_REPORT_CALLBACK_CREATE_INFO_EXT, @@ -10923,20 +10923,20 @@ typedef struct VkDeviceDiagnosticsConfigCreateInfoNV { #define VK_EXT_fragment_density_map2 1 #define VK_EXT_FRAGMENT_DENSITY_MAP_2_SPEC_VERSION 1 #define VK_EXT_FRAGMENT_DENSITY_MAP_2_EXTENSION_NAME "VK_EXT_fragment_density_map2" -typedef struct VkPhysicalDeviceFragmentDensityMapFeatures2EXT { +typedef struct VkPhysicalDeviceFragmentDensityMap2FeaturesEXT { VkStructureType sType; void* pNext; VkBool32 fragmentDensityMapDeferred; -} VkPhysicalDeviceFragmentDensityMapFeatures2EXT; +} VkPhysicalDeviceFragmentDensityMap2FeaturesEXT; -typedef struct VkPhysicalDeviceFragmentDensityMapProperties2EXT { +typedef struct VkPhysicalDeviceFragmentDensityMap2PropertiesEXT { VkStructureType sType; void* pNext; VkBool32 subsampledLoads; VkBool32 subsampledCoarseReconstructionEarlyAccess; deUint32 maxSubsampledArrayLayers; deUint32 maxDescriptorSetSubsampledSamplers; -} VkPhysicalDeviceFragmentDensityMapProperties2EXT; +} VkPhysicalDeviceFragmentDensityMap2PropertiesEXT; #ifdef __cplusplus diff --git a/external/vulkancts/modules/vulkan/renderpass/vktRenderPassFragmentDensityMapTests.cpp b/external/vulkancts/modules/vulkan/renderpass/vktRenderPassFragmentDensityMapTests.cpp index b99ab7e..b25ee17 100644 --- a/external/vulkancts/modules/vulkan/renderpass/vktRenderPassFragmentDensityMapTests.cpp +++ b/external/vulkancts/modules/vulkan/renderpass/vktRenderPassFragmentDensityMapTests.cpp @@ -1074,7 +1074,7 @@ void FragmentDensityMapTest::checkSupport(Context& context) const context.requireDeviceFunctionality("VK_EXT_fragment_density_map"); const auto& fragmentDensityMapFeatures = context.getFragmentDensityMapFeaturesEXT(); - const auto& fragmentDensityMapProperties2 = context.getFragmentDensityMapProperties2EXT(); + const auto& fragmentDensityMap2Properties = context.getFragmentDensityMap2PropertiesEXT(); if (!fragmentDensityMapFeatures.fragmentDensityMap) TCU_THROW(NotSupportedError, "fragmentDensityMap feature is not supported"); @@ -1086,19 +1086,19 @@ void FragmentDensityMapTest::checkSupport(Context& context) const if (m_testParams.deferredDensityMap) { context.requireDeviceFunctionality("VK_EXT_fragment_density_map2"); - if (!context.getFragmentDensityMapFeatures2EXT().fragmentDensityMapDeferred) + if (!context.getFragmentDensityMap2FeaturesEXT().fragmentDensityMapDeferred) TCU_THROW(NotSupportedError, "fragmentDensityMapDeferred feature is not supported"); } if (m_testParams.subsampledLoads) { context.requireDeviceFunctionality("VK_EXT_fragment_density_map2"); - if (!fragmentDensityMapProperties2.subsampledLoads) + if (!fragmentDensityMap2Properties.subsampledLoads) TCU_THROW(NotSupportedError, "subsampledLoads property is not supported"); } if (m_testParams.coarseReconstruction) { context.requireDeviceFunctionality("VK_EXT_fragment_density_map2"); - if (!fragmentDensityMapProperties2.subsampledCoarseReconstructionEarlyAccess) + if (!fragmentDensityMap2Properties.subsampledCoarseReconstructionEarlyAccess) TCU_THROW(NotSupportedError, "subsampledCoarseReconstructionEarlyAccess property is not supported"); } @@ -1111,7 +1111,7 @@ void FragmentDensityMapTest::checkSupport(Context& context) const if (m_testParams.viewCount > 2) { context.requireDeviceFunctionality("VK_EXT_fragment_density_map2"); - if (m_testParams.viewCount > fragmentDensityMapProperties2.maxSubsampledArrayLayers) + if (m_testParams.viewCount > fragmentDensityMap2Properties.maxSubsampledArrayLayers) TCU_THROW(NotSupportedError, "Maximum number of VkImageView array layers for usages supporting subsampled samplers is to small"); } } @@ -1119,7 +1119,7 @@ void FragmentDensityMapTest::checkSupport(Context& context) const if (!m_testParams.nonSubsampledImages && (m_testParams.samplersCount > 1)) { context.requireDeviceFunctionality("VK_EXT_fragment_density_map2"); - if (m_testParams.samplersCount > fragmentDensityMapProperties2.maxDescriptorSetSubsampledSamplers) + if (m_testParams.samplersCount > fragmentDensityMap2Properties.maxDescriptorSetSubsampledSamplers) TCU_THROW(NotSupportedError, "Required number of subsampled samplers is not supported"); } #endif diff --git a/external/vulkancts/scripts/gen_framework.py b/external/vulkancts/scripts/gen_framework.py index 0d0df59..ece55fe 100644 --- a/external/vulkancts/scripts/gen_framework.py +++ b/external/vulkancts/scripts/gen_framework.py @@ -1660,23 +1660,27 @@ def writeDeviceFeatures2(api, filename): 'VkPhysicalDeviceDescriptorIndexingFeatures', 'VkPhysicalDeviceTimelineSemaphoreFeatures', 'VkPhysicalDeviceFragmentDensityMapFeaturesEXT', - 'VkPhysicalDeviceFragmentDensityMapFeatures2EXT' + 'VkPhysicalDeviceFragmentDensityMap2FeaturesEXT' ] # helper class used to encapsulate all data needed during generation class StructureDetail: def __init__ (self, name): - nameResult = re.search('(.*)Features(.*)', name[len('VkPhysicalDevice'):]) - nameSplit = re.findall(r'[1-9A-Z]+(?:[a-z1-9]+|[A-Z]*(?=[A-Z]|$))', nameResult.group(1)) - nameSplitUp = map(str.upper, nameSplit) - nameSplitUp = list(nameSplitUp) + ['FEATURES'] - # check if there is no extension suffix + nameResult = re.search('(.*)Features(.*)', name[len('VkPhysicalDevice'):]) + nameSplitUp = '' + # generate structure type name from structure name + # note that sometimes digits are separated with '_': + # VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FRAGMENT_DENSITY_MAP_2_FEATURES_EXT + # but mostly they are not: + # VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_FLOAT16_INT8_FEATURES + if (nameResult.group(1) == 'FragmentDensityMap2'): + nameSplitUp = ['FRAGMENT', 'DENSITY', 'MAP', '2', 'FEATURES'] + else: + nameSplit = re.findall(r'[1-9A-Z]+(?:[a-z1-9]+|[A-Z]*(?=[A-Z]|$))', nameResult.group(1)) + nameSplitUp = map(str.upper, nameSplit) + nameSplitUp = list(nameSplitUp) + ['FEATURES'] + # check if there is extension suffix if (len(nameResult.group(2)) != 0): - # handle cases like VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FRAGMENT_DENSITY_MAP_FEATURES_2_EXT - suffixWithDigit = re.match(r'(\d+)(\w+)', nameResult.group(2)) - if suffixWithDigit == None: - nameSplitUp.append(nameResult.group(2)) - else: - nameSplitUp.extend([suffixWithDigit.group(1), suffixWithDigit.group(2)]) + nameSplitUp.append(nameResult.group(2)) self.name = name self.sType = 'VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_' + '_'.join(nameSplitUp) self.instanceName = 'd' + name[11:] @@ -1794,14 +1798,6 @@ def generateDeviceFeaturesDefs(src): # construct final list defs = [] for sType, sSuffix in matches: - # there are cases like VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FRAGMENT_DENSITY_MAP_FEATURES_2_EXT - # where 2 is after FEATURES - to handle this we need to split suffix to two parts - sVerSuffix = '' - sExtSuffix = sSuffix - suffixStart = sSuffix.rfind('_') - if suffixStart > 0: - sVerSuffix = sSuffix[:suffixStart] - sExtSuffix = sSuffix[suffixStart:] structName = re.sub("[_0-9][a-z]", lambda match: match.group(0).upper(), sType.capitalize()).replace('_', '') ptrnStructName = r'\s*typedef\s+struct\s+(VkPhysicalDevice' + structName + 'Features' + sSuffix.replace('_', '') + ')' matchStructName = re.search(ptrnStructName, src, re.IGNORECASE) @@ -1814,11 +1810,11 @@ def generateDeviceFeaturesDefs(src): if sType in {'VULKAN_1_1', 'VULKAN_1_2'}: continue # end handling special cases - ptrnExtensionName = r'^\s*#define\s+(\w+' + sExtSuffix + '_' + sType + sVerSuffix + '_EXTENSION_NAME).+$' + ptrnExtensionName = r'^\s*#define\s+(\w+' + sSuffix + '_' + sType + '_EXTENSION_NAME).+$' matchExtensionName = re.search(ptrnExtensionName, src, re.M) - ptrnSpecVersion = r'^\s*#define\s+(\w+' + sExtSuffix + '_' + sType + sVerSuffix + '_SPEC_VERSION).+$' + ptrnSpecVersion = r'^\s*#define\s+(\w+' + sSuffix + '_' + sType + '_SPEC_VERSION).+$' matchSpecVersion = re.search(ptrnSpecVersion, src, re.M) - defs.append( (sType, sVerSuffix, sExtSuffix, matchStructName.group(1), \ + defs.append( (sType, '', sSuffix, matchStructName.group(1), \ matchExtensionName.group(0) if matchExtensionName else None, matchExtensionName.group(1) if matchExtensionName else None, matchSpecVersion.group(1) if matchSpecVersion else '0') ) @@ -1835,7 +1831,7 @@ def generateDevicePropertiesDefs(src): # handle special cases if sType in {'VULKAN_1_1', 'VULKAN_1_2', 'GROUP', 'MEMORY_BUDGET', 'MEMORY', 'TOOL'}: continue - # there are cases like VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FRAGMENT_DENSITY_MAP_PROPERTIES_2_EXT + # there are cases like VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_CORE_PROPERTIES_2_AMD # where 2 is after PROPERTIES - to handle this we need to split suffix to two parts sVerSuffix = '' sExtSuffix = sSuffix @@ -1859,7 +1855,7 @@ def generateDevicePropertiesDefs(src): elif extType == "SHADER_CORE": extType = "SHADER_CORE_PROPERTIES" # end handling special cases - ptrnExtensionName = r'^\s*#define\s+(\w+' + sExtSuffix + '_' + extType + sVerSuffix + '[_0-9]*_EXTENSION_NAME).+$' + ptrnExtensionName = r'^\s*#define\s+(\w+' + sExtSuffix + '_' + extType + sVerSuffix +'[_0-9]*_EXTENSION_NAME).+$' matchExtensionName = re.search(ptrnExtensionName, src, re.M) ptrnSpecVersion = r'^\s*#define\s+(\w+' + sExtSuffix + '_' + extType + sVerSuffix + '[_0-9]*_SPEC_VERSION).+$' matchSpecVersion = re.search(ptrnSpecVersion, src, re.M) @@ -2207,7 +2203,7 @@ if __name__ == "__main__": platformFuncs = [Function.TYPE_PLATFORM] instanceFuncs = [Function.TYPE_INSTANCE] deviceFuncs = [Function.TYPE_DEVICE] - + ''' dfd = generateDeviceFeaturesDefs(src) writeDeviceFeatures (api, dfd, os.path.join(VULKAN_DIR, "vkDeviceFeatures.inl")) writeDeviceFeaturesDefaultDeviceDefs (dfd, os.path.join(VULKAN_DIR, "vkDeviceFeaturesForDefaultDeviceDefs.inl")) @@ -2250,8 +2246,11 @@ if __name__ == "__main__": writeSupportedExtenions (api, os.path.join(VULKAN_DIR, "vkSupportedExtensions.inl")) writeCoreFunctionalities (api, os.path.join(VULKAN_DIR, "vkCoreFunctionalities.inl")) writeExtensionFunctions (api, os.path.join(VULKAN_DIR, "vkExtensionFunctions.inl")) + ''' writeDeviceFeatures2 (api, os.path.join(VULKAN_DIR, "vkDeviceFeatures2.inl")) + ''' writeMandatoryFeatures ( os.path.join(VULKAN_DIR, "vkMandatoryFeatures.inl")) writeExtensionList ( os.path.join(VULKAN_DIR, "vkInstanceExtensions.inl"), 'INSTANCE') writeExtensionList ( os.path.join(VULKAN_DIR, "vkDeviceExtensions.inl"), 'DEVICE') writeDriverIds ( os.path.join(VULKAN_DIR, "vkKnownDriverIds.inl")) + ''' \ No newline at end of file diff --git a/external/vulkancts/scripts/src/vulkan_core.h b/external/vulkancts/scripts/src/vulkan_core.h index 04a26c3..0e1fe5c 100644 --- a/external/vulkancts/scripts/src/vulkan_core.h +++ b/external/vulkancts/scripts/src/vulkan_core.h @@ -601,8 +601,8 @@ typedef enum VkStructureType { VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PIPELINE_CREATION_CACHE_CONTROL_FEATURES_EXT = 1000297000, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DIAGNOSTICS_CONFIG_FEATURES_NV = 1000300000, VK_STRUCTURE_TYPE_DEVICE_DIAGNOSTICS_CONFIG_CREATE_INFO_NV = 1000300001, - VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FRAGMENT_DENSITY_MAP_FEATURES_2_EXT = 1000332000, - VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FRAGMENT_DENSITY_MAP_PROPERTIES_2_EXT = 1000332001, + VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FRAGMENT_DENSITY_MAP_2_FEATURES_EXT = 1000332000, + VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FRAGMENT_DENSITY_MAP_2_PROPERTIES_EXT = 1000332001, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VARIABLE_POINTER_FEATURES = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VARIABLE_POINTERS_FEATURES, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_DRAW_PARAMETER_FEATURES = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_DRAW_PARAMETERS_FEATURES, VK_STRUCTURE_TYPE_DEBUG_REPORT_CREATE_INFO_EXT = VK_STRUCTURE_TYPE_DEBUG_REPORT_CALLBACK_CREATE_INFO_EXT, @@ -10920,20 +10920,20 @@ typedef struct VkDeviceDiagnosticsConfigCreateInfoNV { #define VK_EXT_fragment_density_map2 1 #define VK_EXT_FRAGMENT_DENSITY_MAP_2_SPEC_VERSION 1 #define VK_EXT_FRAGMENT_DENSITY_MAP_2_EXTENSION_NAME "VK_EXT_fragment_density_map2" -typedef struct VkPhysicalDeviceFragmentDensityMapFeatures2EXT { +typedef struct VkPhysicalDeviceFragmentDensityMap2FeaturesEXT { VkStructureType sType; void* pNext; VkBool32 fragmentDensityMapDeferred; -} VkPhysicalDeviceFragmentDensityMapFeatures2EXT; +} VkPhysicalDeviceFragmentDensityMap2FeaturesEXT; -typedef struct VkPhysicalDeviceFragmentDensityMapProperties2EXT { +typedef struct VkPhysicalDeviceFragmentDensityMap2PropertiesEXT { VkStructureType sType; void* pNext; VkBool32 subsampledLoads; VkBool32 subsampledCoarseReconstructionEarlyAccess; uint32_t maxSubsampledArrayLayers; uint32_t maxDescriptorSetSubsampledSamplers; -} VkPhysicalDeviceFragmentDensityMapProperties2EXT; +} VkPhysicalDeviceFragmentDensityMap2PropertiesEXT; #ifdef __cplusplus -- 2.7.4