Merge pull request #141 from kbiElude/bugfixes

Bugfixes

Author: DominikWitczakAMD

include/misc/memalloc_backends/backend_oneshot.h

@@ -64,6 +64,7 @@ namespace Anvil
             bool     bake                            (Anvil::MemoryAllocator::Items&              in_items) final;
             VkResult map                             (void*                                       in_memory_object,
                                                       VkDeviceSize                                in_start_offset,
+                                                      VkDeviceSize                                in_memory_block_start_offset,
                                                       VkDeviceSize                                in_size,
                                                       void**                                      out_result_ptr) final;
             bool     supports_baking                 () const final;

include/misc/memalloc_backends/backend_vma.h

@@ -127,6 +127,7 @@ namespace Anvil
             bool     bake                            (Anvil::MemoryAllocator::Items&              in_items) final;
             VkResult map                             (void*                                       in_memory_object,
                                                       VkDeviceSize                                in_start_offset,
+                                                      VkDeviceSize                                in_memory_block_start_offset,
                                                       VkDeviceSize                                in_size,
                                                       void**                                      out_result_ptr);
             bool     supports_baking                 () const final;

include/misc/types_classes.h

@@ -36,6 +36,7 @@ namespace Anvil
 
         virtual VkResult map            (void*        in_memory_object,
                                          VkDeviceSize in_start_offset,
+                                         VkDeviceSize in_memory_block_start_offset,
                                          VkDeviceSize in_size,
                                          void**       out_result_ptr)   = 0;
         virtual bool     supports_baking() const                        = 0;

src/misc/memalloc_backends/backend_oneshot.cpp

@@ -418,9 +418,12 @@ bool Anvil::MemoryAllocatorBackends::OneShot::bake(Anvil::MemoryAllocator::Items
 
 VkResult Anvil::MemoryAllocatorBackends::OneShot::map(void*        in_memory_object,
                                                       VkDeviceSize in_start_offset,
+                                                      VkDeviceSize in_memory_block_start_offset,
                                                       VkDeviceSize in_size,
                                                       void**       out_result_ptr)
 {
+    ANVIL_REDUNDANT_VARIABLE(in_memory_block_start_offset);
+
     return Anvil::Vulkan::vkMapMemory(m_device_ptr->get_device_vk(),
                                       reinterpret_cast<VkDeviceMemory>(in_memory_object),
                                       in_start_offset,

src/misc/memalloc_backends/backend_vma.cpp

@@ -361,17 +361,26 @@ bool Anvil::MemoryAllocatorBackends::VMA::init()
 
 VkResult Anvil::MemoryAllocatorBackends::VMA::map(void*        in_memory_object,
                                                   VkDeviceSize in_start_offset,
+                                                  VkDeviceSize in_memory_block_start_offset,
                                                   VkDeviceSize in_size,
                                                   void**       out_result_ptr)
 {
+    VkResult result;
+    void*    result_ptr = nullptr;
+
     ANVIL_REDUNDANT_ARGUMENT(in_size);
     ANVIL_REDUNDANT_ARGUMENT(in_start_offset);
 
     anvil_assert(in_start_offset == 0);
 
-    return vmaMapMemory(m_vma_allocator_ptr->get_handle(),
-                        static_cast<VmaAllocation>(in_memory_object),
-                        out_result_ptr);
+    result = vmaMapMemory(m_vma_allocator_ptr->get_handle(),
+                          static_cast<VmaAllocation>(in_memory_object),
+                         &result_ptr);
+
+    result_ptr = reinterpret_cast<uint8_t*>(result_ptr) - in_memory_block_start_offset;
+
+    *out_result_ptr = result_ptr;
+    return result;
 }
 
 /** Please see header for specification */

src/misc/types_struct.cpp

@@ -4121,6 +4121,7 @@ Anvil::SubmitInfo::SubmitInfo(uint32_t                         in_n_command_buff
 #endif
      dst_stage_wait_masks                          (in_n_semaphores_to_wait_on),
      fence_ptr                                     (in_opt_fence_ptr),
+     is_protected                                  (false),
 #if defined(_WIN32)
     keyed_mutex_n_acquire_keys                     (0),
     keyed_mutex_acquire_d3d11_memory_block_ptrs_ptr(nullptr),
@@ -4185,6 +4186,7 @@ Anvil::SubmitInfo::SubmitInfo(uint32_t                           in_n_command_bu
 #endif
      dst_stage_wait_masks                          (in_n_wait_semaphore_submissions),
      fence_ptr                                     (in_opt_fence_ptr),
+     is_protected                                  (false),
 #if defined(_WIN32)
     keyed_mutex_n_acquire_keys                     (0),
     keyed_mutex_acquire_d3d11_memory_block_ptrs_ptr(nullptr),

src/wrappers/device.cpp

@@ -98,6 +98,7 @@ void Anvil::BaseDevice::create_device(const std::vector<const char*>& in_extensi
                                       const std::vector<const char*>& in_layers,
                                       DeviceQueueFamilyInfo*          out_queue_families_ptr)
 {
+    std::vector<float>                       device_queue_priorities;
     const auto&                              physical_device_ptrs             (m_create_info_ptr->get_physical_device_ptrs() );
     std::vector<VkPhysicalDevice>            physical_devices                 (physical_device_ptrs.size                  () );
     VkResult                                 result                           (VK_ERROR_INITIALIZATION_FAILED);
@@ -138,7 +139,6 @@ void Anvil::BaseDevice::create_device(const std::vector<const char*>& in_extensi
         /* Queue create info items */
         {
             std::vector<VkDeviceQueueCreateInfo> device_queue_create_info_items;
-            std::vector<float>                   device_queue_priorities;
             const auto                           n_queue_fams                   = static_cast<uint32_t>(zeroth_physical_device_queue_fams.size() );
 
             /* For any queue that uses non-medium global priority, we're going to need a dedicated device queue create info struct. This is

src/wrappers/instance.cpp

@@ -19,7 +19,6 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 //
-
 #include "misc/debug.h"
 #include "misc/debug_messenger_create_info.h"
 #include "misc/object_tracker.h"

src/wrappers/memory_block.cpp

@@ -682,8 +682,11 @@ bool Anvil::MemoryBlock::open_gpu_memory_access()
             {
                 result_vk = m_parent_memory_allocator_backend_ptr->map(m_backend_object,
                                                                        0, /* in_start_offset */
-                                                                       m_create_info_ptr->get_size(),
+                                                                       m_create_info_ptr->get_start_offset(),
+                                                                       m_create_info_ptr->get_size        (),
                                                                        static_cast<void**>(&m_gpu_data_ptr) );
+
+                m_gpu_data_ptr = reinterpret_cast<uint8_t*>(m_gpu_data_ptr);
             }
             else
             {