Remove VkFuchsiaImageFormatFUCHSIA
This structure is not in use by clients.
Bug: 62173
Change-Id: I31fe7e59095d7a679ebcea89519ea903ef2ea234
Reviewed-on: https://fuchsia-review.googlesource.com/c/third_party/Vulkan-Headers/+/441955
Reviewed-by: John Rosasco <rosasco@google.com>
diff --git a/include/vulkan/vulkan.hpp b/include/vulkan/vulkan.hpp
index 286c171..6cbd2eb 100644
--- a/include/vulkan/vulkan.hpp
+++ b/include/vulkan/vulkan.hpp
@@ -9893,7 +9893,6 @@
ePhysicalDeviceDiagnosticsConfigFeaturesNV = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DIAGNOSTICS_CONFIG_FEATURES_NV,
eDeviceDiagnosticsConfigCreateInfoNV = VK_STRUCTURE_TYPE_DEVICE_DIAGNOSTICS_CONFIG_CREATE_INFO_NV,
eBufferCollectionCreateInfoFUCHSIA = VK_STRUCTURE_TYPE_BUFFER_COLLECTION_CREATE_INFO_FUCHSIA,
- eFuchsiaImageFormatFUCHSIA = VK_STRUCTURE_TYPE_FUCHSIA_IMAGE_FORMAT_FUCHSIA,
eImportMemoryBufferCollectionFUCHSIA = VK_STRUCTURE_TYPE_IMPORT_MEMORY_BUFFER_COLLECTION_FUCHSIA,
eBufferCollectionImageCreateInfoFUCHSIA = VK_STRUCTURE_TYPE_BUFFER_COLLECTION_IMAGE_CREATE_INFO_FUCHSIA,
eBufferCollectionPropertiesFUCHSIA = VK_STRUCTURE_TYPE_BUFFER_COLLECTION_PROPERTIES_FUCHSIA,
@@ -10596,7 +10595,6 @@
return "PhysicalDeviceDiagnosticsConfigFeaturesNV";
case StructureType::eDeviceDiagnosticsConfigCreateInfoNV: return "DeviceDiagnosticsConfigCreateInfoNV";
case StructureType::eBufferCollectionCreateInfoFUCHSIA: return "BufferCollectionCreateInfoFUCHSIA";
- case StructureType::eFuchsiaImageFormatFUCHSIA: return "FuchsiaImageFormatFUCHSIA";
case StructureType::eImportMemoryBufferCollectionFUCHSIA: return "ImportMemoryBufferCollectionFUCHSIA";
case StructureType::eBufferCollectionImageCreateInfoFUCHSIA: return "BufferCollectionImageCreateInfoFUCHSIA";
case StructureType::eBufferCollectionPropertiesFUCHSIA: return "BufferCollectionPropertiesFUCHSIA";
@@ -17005,9 +17003,6 @@
using FramebufferAttachmentsCreateInfoKHR = FramebufferAttachmentsCreateInfo;
struct FramebufferCreateInfo;
struct FramebufferMixedSamplesCombinationNV;
-#ifdef VK_USE_PLATFORM_FUCHSIA
- struct FuchsiaImageFormatFUCHSIA;
-#endif /*VK_USE_PLATFORM_FUCHSIA*/
struct GeneratedCommandsInfoNV;
struct GeneratedCommandsMemoryRequirementsInfoNV;
struct GeometryAABBNV;
@@ -48719,101 +48714,6 @@
using Type = FramebufferMixedSamplesCombinationNV;
};
-#ifdef VK_USE_PLATFORM_FUCHSIA
- struct FuchsiaImageFormatFUCHSIA
- {
- static const bool allowDuplicate = false;
- static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType = StructureType::eFuchsiaImageFormatFUCHSIA;
-
-# if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
- VULKAN_HPP_CONSTEXPR FuchsiaImageFormatFUCHSIA( const void * imageFormat_ = {},
- uint32_t imageFormatSize_ = {} ) VULKAN_HPP_NOEXCEPT
- : imageFormat( imageFormat_ )
- , imageFormatSize( imageFormatSize_ )
- {}
-
- FuchsiaImageFormatFUCHSIA( VkFuchsiaImageFormatFUCHSIA const & rhs ) VULKAN_HPP_NOEXCEPT
- {
- *this = rhs;
- }
-# endif // !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-
- FuchsiaImageFormatFUCHSIA & operator=( VkFuchsiaImageFormatFUCHSIA const & rhs ) VULKAN_HPP_NOEXCEPT
- {
- *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::FuchsiaImageFormatFUCHSIA const *>( &rhs );
- return *this;
- }
-
- FuchsiaImageFormatFUCHSIA & operator=( FuchsiaImageFormatFUCHSIA const & rhs ) VULKAN_HPP_NOEXCEPT
- {
- pNext = rhs.pNext;
- imageFormat = rhs.imageFormat;
- imageFormatSize = rhs.imageFormatSize;
-
- return *this;
- }
-
- FuchsiaImageFormatFUCHSIA & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
- {
- pNext = pNext_;
- return *this;
- }
-
- FuchsiaImageFormatFUCHSIA & setImageFormat( const void * imageFormat_ ) VULKAN_HPP_NOEXCEPT
- {
- imageFormat = imageFormat_;
- return *this;
- }
-
- FuchsiaImageFormatFUCHSIA & setImageFormatSize( uint32_t imageFormatSize_ ) VULKAN_HPP_NOEXCEPT
- {
- imageFormatSize = imageFormatSize_;
- return *this;
- }
-
- operator VkFuchsiaImageFormatFUCHSIA const &() const VULKAN_HPP_NOEXCEPT
- {
- return *reinterpret_cast<const VkFuchsiaImageFormatFUCHSIA *>( this );
- }
-
- operator VkFuchsiaImageFormatFUCHSIA &() VULKAN_HPP_NOEXCEPT
- {
- return *reinterpret_cast<VkFuchsiaImageFormatFUCHSIA *>( this );
- }
-
-# if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
- auto operator<=>( FuchsiaImageFormatFUCHSIA const & ) const = default;
-# else
- bool operator==( FuchsiaImageFormatFUCHSIA const & rhs ) const VULKAN_HPP_NOEXCEPT
- {
- return ( sType == rhs.sType ) && ( pNext == rhs.pNext ) && ( imageFormat == rhs.imageFormat ) &&
- ( imageFormatSize == rhs.imageFormatSize );
- }
-
- bool operator!=( FuchsiaImageFormatFUCHSIA const & rhs ) const VULKAN_HPP_NOEXCEPT
- {
- return !operator==( rhs );
- }
-# endif
-
- public:
- const VULKAN_HPP_NAMESPACE::StructureType sType = StructureType::eFuchsiaImageFormatFUCHSIA;
- const void * pNext = {};
- const void * imageFormat = {};
- uint32_t imageFormatSize = {};
- };
- static_assert( sizeof( FuchsiaImageFormatFUCHSIA ) == sizeof( VkFuchsiaImageFormatFUCHSIA ),
- "struct and wrapper have different size!" );
- static_assert( std::is_standard_layout<FuchsiaImageFormatFUCHSIA>::value,
- "struct wrapper is not a standard layout!" );
-
- template <>
- struct CppType<StructureType, StructureType::eFuchsiaImageFormatFUCHSIA>
- {
- using Type = FuchsiaImageFormatFUCHSIA;
- };
-#endif /*VK_USE_PLATFORM_FUCHSIA*/
-
struct IndirectCommandsStreamNV
{
#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
@@ -104744,16 +104644,6 @@
value = true
};
};
-#ifdef VK_USE_PLATFORM_FUCHSIA
- template <>
- struct StructExtends<FuchsiaImageFormatFUCHSIA, ImageCreateInfo>
- {
- enum
- {
- value = true
- };
- };
-#endif /*VK_USE_PLATFORM_FUCHSIA*/
template <>
struct StructExtends<GraphicsPipelineShaderGroupsCreateInfoNV, GraphicsPipelineCreateInfo>
{
diff --git a/include/vulkan/vulkan_core.h b/include/vulkan/vulkan_core.h
index d9815db..b7957b1 100644
--- a/include/vulkan/vulkan_core.h
+++ b/include/vulkan/vulkan_core.h
@@ -589,7 +589,6 @@
VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DIAGNOSTICS_CONFIG_FEATURES_NV = 1000300000,
VK_STRUCTURE_TYPE_DEVICE_DIAGNOSTICS_CONFIG_CREATE_INFO_NV = 1000300001,
VK_STRUCTURE_TYPE_BUFFER_COLLECTION_CREATE_INFO_FUCHSIA = 1001004000,
- VK_STRUCTURE_TYPE_FUCHSIA_IMAGE_FORMAT_FUCHSIA = 1001004001,
VK_STRUCTURE_TYPE_IMPORT_MEMORY_BUFFER_COLLECTION_FUCHSIA = 1001004004,
VK_STRUCTURE_TYPE_BUFFER_COLLECTION_IMAGE_CREATE_INFO_FUCHSIA = 1001004005,
VK_STRUCTURE_TYPE_BUFFER_COLLECTION_PROPERTIES_FUCHSIA = 1001004006,
diff --git a/include/vulkan/vulkan_fuchsia.h b/include/vulkan/vulkan_fuchsia.h
index f1e1be7..7c54386 100644
--- a/include/vulkan/vulkan_fuchsia.h
+++ b/include/vulkan/vulkan_fuchsia.h
@@ -61,13 +61,6 @@
zx_handle_t collectionToken;
} VkBufferCollectionCreateInfoFUCHSIA;
-typedef struct VkFuchsiaImageFormatFUCHSIA {
- VkStructureType sType;
- const void* pNext;
- const void* imageFormat;
- uint32_t imageFormatSize;
-} VkFuchsiaImageFormatFUCHSIA;
-
typedef struct VkImportMemoryBufferCollectionFUCHSIA {
VkStructureType sType;
const void* pNext;
diff --git a/registry/vk.xml b/registry/vk.xml
index 0a7c23c..bd5fafe 100644
--- a/registry/vk.xml
+++ b/registry/vk.xml
@@ -2211,12 +2211,6 @@
<member><type>VkDeviceMemory</type> <name>memory</name></member>
<member><type>VkExternalMemoryHandleTypeFlagBits</type> <name>handleType</name></member>
</type>
- <type category="struct" name="VkFuchsiaImageFormatFUCHSIA" structextends="VkImageCreateInfo">
- <member values="VK_STRUCTURE_TYPE_FUCHSIA_IMAGE_FORMAT_FUCHSIA"><type>VkStructureType</type> <name>sType</name></member>
- <member>const <type>void</type>* <name>pNext</name></member>
- <member>const <type>void</type>* <name>imageFormat</name></member>
- <member><type>uint32_t</type> <name>imageFormatSize</name></member>
- </type>
<type category="struct" name="VkImportMemoryBufferCollectionFUCHSIA" structextends="VkMemoryAllocateInfo">
<member values="VK_STRUCTURE_TYPE_IMPORT_MEMORY_BUFFER_COLLECTION_FUCHSIA"><type>VkStructureType</type> <name>sType</name></member>
<member>const <type>void</type>* <name>pNext</name></member>
@@ -13926,7 +13920,6 @@
<enum value="1" name="VK_FUCHSIA_BUFFER_COLLECTION_SPEC_VERSION"/>
<enum value=""VK_FUCHSIA_buffer_collection"" name="VK_FUCHSIA_BUFFER_COLLECTION_EXTENSION_NAME"/>
<enum offset="0" extends="VkStructureType" name="VK_STRUCTURE_TYPE_BUFFER_COLLECTION_CREATE_INFO_FUCHSIA"/>
- <enum offset="1" extends="VkStructureType" name="VK_STRUCTURE_TYPE_FUCHSIA_IMAGE_FORMAT_FUCHSIA"/>
<enum offset="2" extends="VkObjectType" name="VK_OBJECT_TYPE_BUFFER_COLLECTION_FUCHSIA" comment="VkBufferCollectionFUCHSIA"/>
<enum offset="3" extends="VkDebugReportObjectTypeEXT" name="VK_DEBUG_REPORT_OBJECT_TYPE_BUFFER_COLLECTION_FUCHSIA_EXT"/>
<enum offset="4" extends="VkStructureType" name="VK_STRUCTURE_TYPE_IMPORT_MEMORY_BUFFER_COLLECTION_FUCHSIA"/>
@@ -13940,7 +13933,6 @@
<enum offset="12" extends="VkStructureType" name="VK_STRUCTURE_TYPE_SYSMEM_COLOR_SPACE_FUCHSIA"/>
<type name="VkBufferCollectionFUCHSIA"/>
<type name="VkBufferCollectionCreateInfoFUCHSIA"/>
- <type name="VkFuchsiaImageFormatFUCHSIA"/>
<type name="VkImportMemoryBufferCollectionFUCHSIA"/>
<type name="VkBufferCollectionImageCreateInfoFUCHSIA"/>
<type name="VkBufferConstraintsInfoFUCHSIA"/>
