Merge branch 'master' into DeleteInvestigation

Author: robertosfield

include/vsg/vk/MemoryBufferPools.h

@@ -42,6 +42,9 @@ namespace vsg
         /// throw vsg::Exception when reserveMemory() fails to allocated memory on device.
         bool throwOutOfDeviceMemoryException = true;
 
+        /// hint whether the compile traversal should call MemoryBufferPools::reserve(requirements);
+        bool compileTraversalUseReserve = true;
+
         VkDeviceSize computeMemoryTotalAvailable() const;
         VkDeviceSize computeMemoryTotalReserved() const;
         VkDeviceSize computeBufferTotalAvailable() const;

src/vsg/state/BufferInfo.cpp

@@ -106,7 +106,7 @@ void BufferInfo::copyDataToBuffer()
 
 void BufferInfo::copyDataToBuffer(uint32_t deviceID)
 {
-    if (!buffer) return;
+    if (!buffer || !data) return;
 
     DeviceMemory* dm = buffer->getDeviceMemory(deviceID);
     if (dm)
@@ -115,6 +115,12 @@ void BufferInfo::copyDataToBuffer(uint32_t deviceID)
         {
             if (auto transferTask = dm->getDevice()->transferTask.ref_ptr())
             {
+                // if data->dirty() hasn't been called since the last copy, assume it should have been done in call dirty on the data to ensure TransferTask copies the data.
+                if (!data->differentModifiedCount(copiedModifiedCounts[deviceID]))
+                {
+                    data->dirty();
+                }
+
                 transferTask->assign(BufferInfoList{ref_ptr<BufferInfo>(this)});
             }
             else
@@ -179,8 +185,6 @@ ref_ptr<BufferInfo> vsg::copyDataToStagingBuffer(Context& context, const Data* d
 //
 bool vsg::createBufferAndTransferData(Context& context, const BufferInfoList& bufferInfoList, VkBufferUsageFlags usage, VkSharingMode sharingMode)
 {
-    debug("vsg::createBufferAndTransferData(.., )");
-
     if (bufferInfoList.empty()) return false;
 
     Device* device = context.device;
@@ -192,6 +196,9 @@ bool vsg::createBufferAndTransferData(Context& context, const BufferInfoList& bu
     else if (usage == VK_BUFFER_USAGE_STORAGE_BUFFER_BIT)
         alignment = device->getPhysicalDevice()->getProperties().limits.minStorageBufferOffsetAlignment;
 
+
+    debug("vsg::createBufferAndTransferData(Context& context, const BufferInfoList& bufferInfoList, VkBufferUsageFlags usage, VkSharingMode sharingMode) usage = ", usage, ", alignment = ", alignment);
+
     //transferTask = nullptr;
 
     ref_ptr<BufferInfo> deviceBufferInfo;
@@ -371,6 +378,8 @@ BufferInfoList vsg::createHostVisibleBuffer(Device* device, const DataList& data
     else if (usage == VK_BUFFER_USAGE_STORAGE_BUFFER_BIT)
         alignment = device->getPhysicalDevice()->getProperties().limits.minStorageBufferOffsetAlignment;
 
+    debug("vsg::createHostVisibleBuffer(Device* device, const DataList& dataList, VkBufferUsageFlags usage, VkSharingMode sharingMode) usage = ", usage, ", alignment = ", alignment);
+
     VkDeviceSize totalSize = 0;
     VkDeviceSize offset = 0;
     bufferInfoList.reserve(dataList.size());

src/vsg/state/DescriptorBuffer.cpp

@@ -140,6 +140,8 @@ void DescriptorBuffer::compile(Context& context)
 
         VkDeviceSize totalSize = 0;
 
+        debug("DescriptorBuffer::compile() bufferUsageFlags = ",bufferUsageFlags, ", alignment = ", alignment);
+
         // compute the total size of BufferInfo that needs to be allocated.
         {
             VkDeviceSize offset = 0;

src/vsg/vk/Context.cpp

@@ -197,7 +197,9 @@ VkResult Context::reserve(ResourceRequirements& requirements)
 {
     CPU_INSTRUMENTATION_L2_NC(instrumentation, "Context reserve", COLOR_COMPILE)
 
-    VkResult result = deviceMemoryBufferPools->reserve(requirements);
+    VkResult result = VK_SUCCESS;
+
+    if (deviceMemoryBufferPools->compileTraversalUseReserve) result = deviceMemoryBufferPools->reserve(requirements);
 
     resourceRequirements.maxSlots.merge(requirements.maxSlots);
 

src/vsg/vk/MemoryBufferPools.cpp

@@ -265,6 +265,8 @@ VkResult MemoryBufferPools::reserve(ResourceRequirements& requirements)
                 else if ((properties.usageFlags & VK_BUFFER_USAGE_STORAGE_BUFFER_BIT) != 0)
                     alignment = limits.minStorageBufferOffsetAlignment;
 
+                debug("MemoryBufferPools::reserve(ResourceRequirements& requirements) properties.usageFlags = ", properties.usageFlags, ", alignment = ", alignment);
+
                 auto newBufferInfo = reserveBuffer(bufferInfo->data->dataSize(), alignment, properties.usageFlags, properties.sharingMode, memoryPropertiesFlags);
                 if (newBufferInfo)
                 {