Merge pull request #123 from GPUOpen-LibrariesAndSDKs/update_wk45

Week 45 update

Author: DominikWitczakAMD

include/misc/extensions.h

@@ -51,6 +51,7 @@ namespace Anvil
             ValueType ext_debug_marker;
             ValueType ext_depth_range_unrestricted;
             ValueType ext_descriptor_indexing;
+            ValueType ext_pci_bus_info;
             ValueType ext_external_memory_host;
             ValueType ext_hdr_metadata;
             ValueType ext_sample_locations;
@@ -138,6 +139,7 @@ namespace Anvil
                     {ExtensionData(VK_EXT_DESCRIPTOR_INDEXING_EXTENSION_NAME,              &ext_descriptor_indexing)},
                     {ExtensionData(VK_EXT_EXTERNAL_MEMORY_HOST_EXTENSION_NAME,             &ext_external_memory_host)},
                     {ExtensionData(VK_EXT_HDR_METADATA_EXTENSION_NAME,                     &ext_hdr_metadata)},
+                    {ExtensionData(VK_EXT_PCI_BUS_INFO_EXTENSION_NAME,                     &ext_pci_bus_info)},
                     {ExtensionData(VK_EXT_SAMPLE_LOCATIONS_EXTENSION_NAME,                 &ext_sample_locations)},
                     {ExtensionData(VK_EXT_SAMPLER_FILTER_MINMAX_EXTENSION_NAME,            &ext_sampler_filter_minmax)},
                     {ExtensionData(VK_EXT_SHADER_STENCIL_EXPORT_EXTENSION_NAME,            &ext_shader_stencil_export)},
@@ -309,6 +311,7 @@ namespace Anvil
         virtual ValueType ext_descriptor_indexing             () const = 0;
         virtual ValueType ext_external_memory_host            () const = 0;
         virtual ValueType ext_hdr_metadata                    () const = 0;
+        virtual ValueType ext_pci_bus_info                    () const = 0;
         virtual ValueType ext_sample_locations                () const = 0;
         virtual ValueType ext_sampler_filter_minmax           () const = 0;
         virtual ValueType ext_shader_stencil_export           () const = 0;
@@ -615,6 +618,13 @@ namespace Anvil
             return m_device_extensions_ptr->ext_hdr_metadata;
         }
 
+        ValueType ext_pci_bus_info() const final
+        {
+            anvil_assert(m_expose_device_extensions);
+
+            return m_device_extensions_ptr->ext_pci_bus_info;
+        }
+
         ValueType ext_sampler_filter_minmax() const final
         {
             anvil_assert(m_expose_device_extensions);
@@ -918,7 +928,6 @@ namespace Anvil
             return m_instance_extensions_ptr->khr_surface;
         }
 
-
         #ifdef _WIN32
             #if defined(ANVIL_INCLUDE_WIN3264_WINDOW_SYSTEM_SUPPORT)
                 ValueType khr_win32_surface() const final

include/misc/formats.h

@@ -91,6 +91,7 @@ namespace Anvil
         /** Returns bit layout for the specified format.
          *
          *  NOTE: Only non-compressed formats are supported.
+         *  NOTE: YUV KHR formats are NOT supported for this function.
          *  NOTE: Components not used by the specified format have start and end bit indices set to UINT32_MAX.
          *
          *  @param in_format                                     Non-compressed format to use for the query.
@@ -125,15 +126,39 @@ namespace Anvil
                                           uint32_t*     out_opt_stencil_component_start_bit_index_ptr = nullptr,
                                           uint32_t*     out_opt_stencil_component_end_bit_index_ptr   = nullptr);
 
-        /** Tells what component layout is used by @param in_format. */
+        /** Tells what component layout is used by @param in_format.
+         *
+         *  NOTE: This function does NOT support YUV KHR format. Please check the overloaded function if
+         *        you would like to use for YUV KHR format.
+         */
         static ComponentLayout get_format_component_layout(Anvil::Format in_format);
 
-        /** Tells the number of components used by @param in_format */
+        /** Tells what component layout is used by @param in_format at specified subresource @param in_aspect.
+         *
+         *  NOTE: Only YUV KHR formats are supported.
+         */
+        static ComponentLayout get_format_component_layout(Anvil::Format              in_format,
+                                                           Anvil::ImageAspectFlagBits in_aspect);
+
+        /** Tells the number of components used by @param in_format
+         *
+         *  NOTE: This function does NOT support YUV KHR format. Please check the overloaded function if
+         *        you would like to use for YUV KHR format.
+         */
         static uint32_t get_format_n_components(Anvil::Format in_format);
 
+        /** Tells the number of components used by @param in_format under specified subresource @param in_aspect.
+         *
+         *  NOTE: Only YUV KHR formats are supported.
+         */
+        static uint32_t get_format_n_components(Anvil::Format              in_format,
+                                                Anvil::ImageAspectFlagBits in_aspect);
+
         /* Tells the number of bits used for each component in case of Vulkan format specified
          * under @param in_format.
          *
+         * NOTE: This function does NOT support YUV KHR format. Please check the overloaded function if
+         *       you would like to use for YUV KHR format.
          * NOTE: Number of bits reported for each component uses ordering as reported for the format
          *       via get_format_component_layout(). This is especially important in the context of packed formats.
          *
@@ -153,23 +178,87 @@ namespace Anvil
                                                 uint32_t*     out_channel2_bits_ptr,
                                                 uint32_t*     out_channel3_bits_ptr);
 
+        /* Tells the number of bits used for each component in case of Vulkan format specified
+         * under @param in_format at subresource @param in_aspect.
+         *
+         * NOTE: Only YUV KHR fromats are supported.
+         * NOTE: Number of bits reported for each component uses ordering as reported for the format
+         *       via get_format_component_layout(). This is especially important in the context of packed formats.
+         *
+         * @param in_format             Vulkan format to use for the query.
+         * @param out_channel0_bits_ptr Deref will be set to the number of bits used for channel 0. Must
+         *                              not be nullptr.
+         * @param out_channel1_bits_ptr Deref will be set to the number of bits used for channel 1. Must
+         *                              not be nullptr.
+         * @param out_channel2_bits_ptr Deref will be set to the number of bits used for channel 2. Must
+         *                              not be nullptr.
+         * @param out_channel3_bits_ptr Deref will be set to the number of bits used for channel 3. Must
+         *                              not be nullptr.
+         */
+        static void get_format_n_component_bits(Anvil::Format              in_format,
+                                                Anvil::ImageAspectFlagBits in_aspect,
+                                                uint32_t*                  out_channel0_bits_ptr,
+                                                uint32_t*                  out_channel1_bits_ptr,
+                                                uint32_t*                  out_channel2_bits_ptr,
+                                                uint32_t*                  out_channel3_bits_ptr);
+
         /* Returns a raw C string for specified format, or NULL if the format is unknown. */
         static const char* get_format_name(Anvil::Format in_format);
 
         /** Tells the format type used by @param in_format. */
         static FormatType get_format_type(Anvil::Format in_format);
 
-        /** Tells whether @param in_format includes a depth aspect */
+        /** Returns the extent of subresource @param in_aspect with specified format @param in_format.
+         *
+         *  NOTE: Only YUV KHR formats are supported.
+         *
+         * @param in_format            VUlkan format.
+         * @param in_aspect            Image aspect for specific subresource of the format.
+         * @param in_image_extent      Image extent specified when creating image.
+         * @param out_plane_extent_ptr Deref will be set to the extent of the specified subresource.
+         *                             Must not be nullptr.
+         */
+        static void get_yuv_format_plane_extent(Anvil::Format              in_format,
+                                                Anvil::ImageAspectFlagBits in_aspect,
+                                                VkExtent3D                 in_image_extent,
+                                                VkExtent3D*                out_plane_extent_ptr);
+        /** Tells whether @param in_format includes a depth aspect.
+         *
+         *  NOTE: YUV KHR formats are NOT supported.
+         */
         static bool has_depth_aspect(Anvil::Format in_format);
 
-        /** Tells whether @param in_format includes a stencil aspect */
+        /** Tells whether @param in_format includes a stencil aspect.
+         *
+         *  NOTE: YUV KHR formats are NOT supported.
+         */
         static bool has_stencil_aspect(Anvil::Format in_format);
 
         /** Tells whether @param in_format format is a block format. */
         static bool is_format_compressed(Anvil::Format in_format);
 
+        /** Tells whether @param in_format format is a multiplanar format. */
+        static bool is_format_multiplanar(Anvil::Format in_format);
+
+        /** Tells whether @param in_format is a KHR YUV format */
+        static bool is_format_yuv_khr(Anvil::Format in_format);
+
         /** Tells whether @param in_format is a packed format */
         static bool is_format_packed(Anvil::Format in_format);
+
+    private:
+        /** Returns the index of subresource info by given @param in_format and @param in_aspect.
+         *
+         *  NOTE: Only YUV KHR formats are supported.
+         */
+        static uint32_t get_yuv_format_plane_index(Anvil::Format              in_format,
+                                                   Anvil::ImageAspectFlagBits in_aspect);
+
+        /** Returns the number of subresources by given @param in_format.
+         *
+         *  NOTE: Only YUV KHR formats are supported.
+         */
+        static uint32_t get_yuv_format_n_planes(Anvil::Format in_format);
     };
 };
 

include/misc/semaphore_create_info.h

@@ -130,8 +130,8 @@ namespace Anvil
 
     private:
         /* Private functions */
-        SemaphoreCreateInfo(const Anvil::BaseDevice* in_device_ptr,
-                            MTSafety                 in_mt_safety);
+        SemaphoreCreateInfo(const Anvil::BaseDevice*    in_device_ptr,
+                            MTSafety                    in_mt_safety);
 
         /* Private variables */
         const Anvil::BaseDevice*                m_device_ptr;

include/misc/types_enums.h

@@ -628,11 +628,16 @@ namespace Anvil
         /* NOTE: If the ordering used below needs to be changed, make sure to also update formats.cpp::layout_to_n_components */
         ABGR,
         ARGB,
+        B,
         BGR,
         BGRA,
+        BGRG,
+        BR,
         D,
         DS,
         EBGR,
+        G,
+        GBGR,
         R,
         RG,
         RGB,
@@ -966,6 +971,42 @@ namespace Anvil
         ASTC_12x12_UNORM_BLOCK              = VK_FORMAT_ASTC_12x12_UNORM_BLOCK,
         ASTC_12x12_SRGB_BLOCK               = VK_FORMAT_ASTC_12x12_SRGB_BLOCK,
 
+        /* VK_KHR_sampler_ycbcr_conversion */
+        G8B8G8R8_422_UNORM                          = VK_FORMAT_G8B8G8R8_422_UNORM_KHR,
+        B8G8R8G8_422_UNORM                          = VK_FORMAT_B8G8R8G8_422_UNORM_KHR,
+        G8_B8_R8_3PLANE_420_UNORM                   = VK_FORMAT_G8_B8_R8_3PLANE_420_UNORM_KHR,
+        G8_B8R8_2PLANE_420_UNORM                    = VK_FORMAT_G8_B8R8_2PLANE_420_UNORM_KHR,
+        G8_B8_R8_3PLANE_422_UNORM                   = VK_FORMAT_G8_B8_R8_3PLANE_422_UNORM_KHR,
+        G8_B8R8_2PLANE_422_UNORM                    = VK_FORMAT_G8_B8R8_2PLANE_422_UNORM_KHR,
+        G8_B8_R8_3PLANE_444_UNORM                   = VK_FORMAT_G8_B8_R8_3PLANE_444_UNORM_KHR,
+        R10X6_UNORM_PACK16                          = VK_FORMAT_R10X6_UNORM_PACK16_KHR,
+        R10X6G10X6_UNORM_2PACK16                    = VK_FORMAT_R10X6G10X6_UNORM_2PACK16_KHR,
+        R10X6G10X6B10X6A10X6_UNORM_4PACK16          = VK_FORMAT_R10X6G10X6B10X6A10X6_UNORM_4PACK16_KHR,
+        G10X6B10X6G10X6R10X6_422_UNORM_4PACK16      = VK_FORMAT_G10X6B10X6G10X6R10X6_422_UNORM_4PACK16_KHR,
+        B10X6G10X6R10X6G10X6_422_UNORM_4PACK16      = VK_FORMAT_B10X6G10X6R10X6G10X6_422_UNORM_4PACK16_KHR,
+        G10X6_B10X6_R10X6_3PLANE_420_UNORM_3PACK16  = VK_FORMAT_G10X6_B10X6_R10X6_3PLANE_420_UNORM_3PACK16_KHR,
+        G10X6_B10X6R10X6_2PLANE_420_UNORM_3PACK16   = VK_FORMAT_G10X6_B10X6R10X6_2PLANE_420_UNORM_3PACK16_KHR,
+        G10X6_B10X6_R10X6_3PLANE_422_UNORM_3PACK16  = VK_FORMAT_G10X6_B10X6_R10X6_3PLANE_422_UNORM_3PACK16_KHR,
+        G10X6_B10X6R10X6_2PLANE_422_UNORM_3PACK16   = VK_FORMAT_G10X6_B10X6R10X6_2PLANE_422_UNORM_3PACK16_KHR,
+        G10X6_B10X6_R10X6_3PLANE_444_UNORM_3PACK16  = VK_FORMAT_G10X6_B10X6_R10X6_3PLANE_444_UNORM_3PACK16_KHR,
+        R12X4_UNORM_PACK16                          = VK_FORMAT_R12X4_UNORM_PACK16_KHR,
+        R12X4G12X4_UNORM_2PACK16                    = VK_FORMAT_R12X4G12X4_UNORM_2PACK16_KHR,
+        R12X4G12X4B12X4A12X4_UNORM_4PACK16          = VK_FORMAT_R12X4G12X4B12X4A12X4_UNORM_4PACK16_KHR,
+        G12X4B12X4G12X4R12X4_422_UNORM_4PACK16      = VK_FORMAT_G12X4B12X4G12X4R12X4_422_UNORM_4PACK16_KHR,
+        B12X4G12X4R12X4G12X4_422_UNORM_4PACK16      = VK_FORMAT_B12X4G12X4R12X4G12X4_422_UNORM_4PACK16_KHR,
+        G12X4_B12X4_R12X4_3PLANE_420_UNORM_3PACK16  = VK_FORMAT_G12X4_B12X4_R12X4_3PLANE_420_UNORM_3PACK16_KHR,
+        G12X4_B12X4R12X4_2PLANE_420_UNORM_3PACK16   = VK_FORMAT_G12X4_B12X4R12X4_2PLANE_420_UNORM_3PACK16_KHR,
+        G12X4_B12X4_R12X4_3PLANE_422_UNORM_3PACK16  = VK_FORMAT_G12X4_B12X4_R12X4_3PLANE_422_UNORM_3PACK16_KHR,
+        G12X4_B12X4R12X4_2PLANE_422_UNORM_3PACK16   = VK_FORMAT_G12X4_B12X4R12X4_2PLANE_422_UNORM_3PACK16_KHR,
+        G12X4_B12X4_R12X4_3PLANE_444_UNORM_3PACK16  = VK_FORMAT_G12X4_B12X4_R12X4_3PLANE_444_UNORM_3PACK16_KHR,
+        G16B16G16R16_422_UNORM                      = VK_FORMAT_G16B16G16R16_422_UNORM_KHR,
+        B16G16R16G16_422_UNORM                      = VK_FORMAT_B16G16R16G16_422_UNORM_KHR,
+        G16_B16_R16_3PLANE_420_UNORM                = VK_FORMAT_G16_B16_R16_3PLANE_420_UNORM_KHR,
+        G16_B16R16_2PLANE_420_UNORM                 = VK_FORMAT_G16_B16R16_2PLANE_420_UNORM_KHR,
+        G16_B16_R16_3PLANE_422_UNORM                = VK_FORMAT_G16_B16_R16_3PLANE_422_UNORM_KHR,
+        G16_B16R16_2PLANE_422_UNORM                 = VK_FORMAT_G16_B16R16_2PLANE_422_UNORM_KHR,
+        G16_B16_R16_3PLANE_444_UNORM                = VK_FORMAT_G16_B16_R16_3PLANE_444_UNORM_KHR,
+
         /* Other .. */
         UNKNOWN = VK_FORMAT_UNDEFINED,
     };
@@ -1006,6 +1047,11 @@ namespace Anvil
         METADATA_BIT = VK_IMAGE_ASPECT_METADATA_BIT,
         STENCIL_BIT  = VK_IMAGE_ASPECT_STENCIL_BIT,
 
+        /* VK_KHR_sampler_ycbcr_conversion aspects */
+        PLANE_0_BIT = VK_IMAGE_ASPECT_PLANE_0_BIT_KHR,
+        PLANE_1_BIT = VK_IMAGE_ASPECT_PLANE_1_BIT_KHR,
+        PLANE_2_BIT = VK_IMAGE_ASPECT_PLANE_2_BIT_KHR,
+
         NONE = 0
     };
     typedef Anvil::Bitfield<Anvil::ImageAspectFlagBits, VkImageAspectFlags> ImageAspectFlags;

include/misc/types_struct.h

@@ -603,6 +603,19 @@ namespace Anvil
         bool operator==(const EXTExternalMemoryHostProperties& in_props) const;
     } EXTExternalMemoryHostProperties;
 
+    typedef struct EXTPCIBusInfoProperties
+    {
+        uint8_t  pci_bus;
+        uint8_t  pci_device;
+        uint16_t pci_domain;
+        uint8_t  pci_function;
+
+        EXTPCIBusInfoProperties();
+        EXTPCIBusInfoProperties(const VkPhysicalDevicePCIBusInfoPropertiesEXT& in_props);
+
+        bool operator==(const EXTPCIBusInfoProperties& in_props) const;
+    } EXTPCIBusInfoProperties;
+
     typedef struct EXTSampleLocationsProperties
     {
         VkExtent2D              max_sample_location_grid_size;
@@ -2104,6 +2117,7 @@ namespace Anvil
         const PhysicalDevicePropertiesCoreVK10*                        core_vk1_0_properties_ptr;
         const EXTDescriptorIndexingProperties*                         ext_descriptor_indexing_properties_ptr;
         const EXTExternalMemoryHostProperties*                         ext_external_memory_host_properties_ptr;
+        const EXTPCIBusInfoProperties*                                 ext_pci_bus_info_properties_ptr;
         const EXTSampleLocationsProperties*                            ext_sample_locations_properties_ptr;
         const EXTSamplerFilterMinmaxProperties*                        ext_sampler_filter_minmax_properties_ptr;
         const EXTVertexAttributeDivisorProperties*                     ext_vertex_attribute_divisor_properties_ptr;
@@ -2117,6 +2131,7 @@ namespace Anvil
                                  const PhysicalDevicePropertiesCoreVK10*                        in_core_vk1_0_properties_ptr,
                                  const EXTDescriptorIndexingProperties*                         in_ext_descriptor_indexing_properties_ptr,
                                  const EXTExternalMemoryHostProperties*                         in_ext_external_memory_host_properties_ptr,
+                                 const EXTPCIBusInfoProperties*                                 in_ext_pci_bus_info_properties_ptr,
                                  const EXTSampleLocationsProperties*                            in_ext_sample_locations_properties_ptr,
                                  const EXTSamplerFilterMinmaxProperties*                        in_ext_sampler_filter_minmax_properties_ptr,
                                  const EXTVertexAttributeDivisorProperties*                     in_ext_vertex_attribute_divisor_properties_ptr,

include/vulkan/vulkan.h

@@ -24,6 +24,10 @@
 #include "vulkan_android.h"
 #endif
 
+#ifdef VK_USE_PLATFORM_FUCHSIA
+#include <zircon/types.h>
+#include "vulkan_fuchsia.h"
+#endif
 
 #ifdef VK_USE_PLATFORM_IOS_MVK
 #include "vulkan_ios.h"
@@ -35,12 +39,6 @@
 #endif
 
 
-#ifdef VK_USE_PLATFORM_MIR_KHR
-#include <mir_toolkit/client_types.h>
-#include "vulkan_mir.h"
-#endif
-
-
 #ifdef VK_USE_PLATFORM_VI_NN
 #include "vulkan_vi.h"
 #endif