Merge pull request #127 from GPUOpen-LibrariesAndSDKs/update_wk47

Week #47 update: Bug-fixes and improvements

Author: DominikWitczakAMD

examples/OutOfOrderRasterization/include/app.h

@@ -89,7 +89,7 @@ class App
 
     uint32_t               m_n_indices;
     uint32_t               m_n_last_semaphore_used;
-    const uint32_t         m_n_swapchain_images;
+    uint32_t               m_n_swapchain_images;
     bool                   m_ooo_enabled;
     bool                   m_should_rotate;
     std::unique_ptr<float> m_teapot_props_data_ptr;

examples/OutOfOrderRasterization/src/app.cpp

@@ -517,7 +517,7 @@ void App::init_command_buffers()
     VkClearValue                   clear_values[2];
     const Anvil::DeviceType        device_type                  = m_device_ptr->get_type();
     auto                           gfx_manager_ptr              = m_device_ptr->get_graphics_pipeline_manager();
-    const uint32_t                 n_swapchain_images           = m_swapchain_ptr->get_create_info_ptr()->get_n_images();
+    const uint32_t                 n_swapchain_images           = m_swapchain_ptr->get_n_images();
     const uint32_t                 universal_queue_family_index = m_device_ptr->get_universal_queue(0)->get_queue_family_index();
     Anvil::Buffer*                 vertex_buffers[]             =
     {

include/misc/formats.h

@@ -186,6 +186,7 @@ namespace Anvil
          *       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 in_aspect             Image aspect 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
@@ -202,6 +203,31 @@ namespace Anvil
                                                 uint32_t*                  out_channel2_bits_ptr,
                                                 uint32_t*                  out_channel3_bits_ptr);
 
+        /** Tells the number of bits unused 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 in_aspect                    Image aspect to use for the query.
+         * @param out_channel0_unused_bits_ptr Deref will be set to the number of bits unused for channel 0. Must
+         *                                     not be nullptr.
+         * @param out_channel1_unused_bits_ptr Deref will be set to the number of bits unused for channel 1. Must
+         *                                     not be nullptr.
+         * @param out_channel2_unused_bits_ptr Deref will be set to the number of bits unused for channel 2. Must
+         *                                     not be nullptr.
+         * @param out_channel3_unused_bits_ptr Deref will be set to the number of bits unused for channel 3. Must
+         *                                     not be nullptr.
+         */
+        static void get_format_n_unused_component_bits(Anvil::Format              in_format,
+                                                       Anvil::ImageAspectFlagBits in_aspect,
+                                                       uint32_t*                  out_channel0_unused_bits_ptr,
+                                                       uint32_t*                  out_channel1_unused_bits_ptr,
+                                                       uint32_t*                  out_channel2_unused_bits_ptr,
+                                                       uint32_t*                  out_channel3_unused_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);
 

include/misc/types_enums.h

@@ -633,15 +633,23 @@ namespace Anvil
         BGRA,
         BGRG,
         BR,
+        BX,
+        BXGXRXGX,
+        BXRX,
         D,
         DS,
         EBGR,
         G,
         GBGR,
+        GX,
+        GXBXGXRX,
         R,
         RG,
         RGB,
         RGBA,
+        RX,
+        RXGX,
+        RXGXBXAX,
         S,
         XD,
 

include/wrappers/swapchain.h

@@ -89,6 +89,12 @@ namespace Anvil
             return m_size.height;
         }
 
+        /** Return the actual number of swapchain images created. */
+        uint32_t get_n_images() const
+        {
+            return m_n_images;
+        }
+
         /** Retrieves an Image instance associated with a swapchain image at index
          *  @param in_n_swapchain_image.
          *
@@ -197,6 +203,7 @@ namespace Anvil
         /* Private variables */
         Anvil::SwapchainCreateInfoUniquePtr m_create_info_ptr;
         Anvil::FenceUniquePtr               m_image_available_fence_ptr;
+        uint32_t                            m_n_images;  /* number of images created in the swapchain. */
         std::vector<ImageUniquePtr>         m_image_ptrs;
         std::vector<ImageViewUniquePtr>     m_image_view_ptrs;
         uint32_t                            m_last_acquired_image_index;

src/misc/debug_marker.cpp

@@ -102,7 +102,7 @@ void Anvil::DebugMarkerSupportProviderWorker::set_tag_internal(const uint64_t in
         m_object_tag_name = in_tag_name;
         m_object_tag_data.resize(in_tag_size);
 
-        memcpy(&m_object_tag_data,
+        memcpy(&m_object_tag_data.at(0),
                in_tag_ptr,
                in_tag_size);