Merge pull request #1275 from rms7326/release-buffer-after-transfer

robertosfield · web-flow · commit 7ada1685a0da · 2024-09-05T19:17:57.000+01:00
Implemented release of static data after transfer to the GPU
diff --git a/src/vsg/app/TransferTask.cpp b/src/vsg/app/TransferTask.cpp
@@ -151,14 +151,14 @@ void TransferTask::_transferBufferInfos(VkCommandBuffer vk_commandBuffer, Frame&
                     offset = (/*alignment == 1 ||*/ (endOfEntry % alignment) == 0) ? endOfEntry : ((endOfEntry / alignment) + 1) * alignment;
                 }
 
-                if (bufferInfo->data->properties.dataVariance == STATIC_DATA)
+                if (bufferInfo->data->dynamic())
                 {
-                    log(level, "       removing copied static data: ", bufferInfo, ", ", bufferInfo->data);
-                    bufferInfo_itr = bufferInfos.erase(bufferInfo_itr);
+                    ++bufferInfo_itr;
                 }
                 else
                 {
-                    ++bufferInfo_itr;
+                    log(level, "       removing copied static data: ", bufferInfo, ", ", bufferInfo->data);
+                    bufferInfo_itr = bufferInfos.erase(bufferInfo_itr);
                 }
             }
         }
@@ -240,14 +240,14 @@ void TransferTask::_transferImageInfos(VkCommandBuffer vk_commandBuffer, Frame&
                 _transferImageInfo(vk_commandBuffer, frame, offset, *imageInfo);
             }
 
-            if (imageInfo->imageView->image->data->properties.dataVariance == STATIC_DATA)
+            if (imageInfo->imageView->image->data->dynamic())
             {
-                log(level, "       removing copied static image data: ", imageInfo, ", ", imageInfo->imageView->image->data);
-                imageInfo_itr = _dynamicImageInfoSet.erase(imageInfo_itr);
+                ++imageInfo_itr;
             }
             else
             {
-                ++imageInfo_itr;
+                log(level, "       removing copied static image data: ", imageInfo, ", ", imageInfo->imageView->image->data);
+                imageInfo_itr = _dynamicImageInfoSet.erase(imageInfo_itr);
             }
         }
     }
diff --git a/src/vsg/state/BufferInfo.cpp b/src/vsg/state/BufferInfo.cpp
@@ -62,7 +62,7 @@ int BufferInfo::compare(const Object& rhs_object) const
 
     if (data != rhs.data && data && rhs.data)
     {
-        if (data->properties.dataVariance != STATIC_DATA || rhs.data->properties.dataVariance != STATIC_DATA)
+        if (data->dynamic() || rhs.data->dynamic())
         {
             if (data < rhs.data) return -1;
             return 1; // from checks above it must be that data > rhs.data
@@ -300,6 +300,10 @@ bool vsg::createBufferAndTransferData(Context& context, const BufferInfoList& bu
         if (data)
         {
             std::memcpy(ptr + bufferInfo->offset - deviceBufferInfo->offset, data->dataPointer(), data->dataSize());
+            if (data->properties.dataVariance == STATIC_DATA_UNREF_AFTER_TRANSFER)
+            {
+                bufferInfo->data.reset();
+            }
         }
         bufferInfo->parent = deviceBufferInfo;
     }
diff --git a/src/vsg/utils/FindDynamicObjects.cpp b/src/vsg/utils/FindDynamicObjects.cpp
@@ -39,7 +39,7 @@ void FindDynamicObjects::apply(const Object& object)
 
 void FindDynamicObjects::apply(const Data& data)
 {
-    if (data.properties.dataVariance != STATIC_DATA) tag(&data);
+    if (data.dynamic()) tag(&data);
 }
 
 void FindDynamicObjects::apply(const AnimationGroup& ag)

Original file line number	Diff line number	Diff line change
`@@ -151,14 +151,14 @@ void TransferTask::_transferBufferInfos(VkCommandBuffer vk_commandBuffer, Frame&`
`151`	`151`	`offset = (/alignment == 1 \|\|/ (endOfEntry % alignment) == 0) ? endOfEntry : ((endOfEntry / alignment) + 1) * alignment;`
`152`	`152`	`}`
`153`	`153`
`154`		`- if (bufferInfo->data->properties.dataVariance == STATIC_DATA)`
	`154`	`+ if (bufferInfo->data->dynamic())`
`155`	`155`	`{`
`156`		`- log(level, " removing copied static data: ", bufferInfo, ", ", bufferInfo->data);`
`157`		`- bufferInfo_itr = bufferInfos.erase(bufferInfo_itr);`
	`156`	`+ ++bufferInfo_itr;`
`158`	`157`	`}`
`159`	`158`	`else`
`160`	`159`	`{`
`161`		`- ++bufferInfo_itr;`
	`160`	`+ log(level, " removing copied static data: ", bufferInfo, ", ", bufferInfo->data);`
	`161`	`+ bufferInfo_itr = bufferInfos.erase(bufferInfo_itr);`
`162`	`162`	`}`
`163`	`163`	`}`
`164`	`164`	`}`
`@@ -240,14 +240,14 @@ void TransferTask::_transferImageInfos(VkCommandBuffer vk_commandBuffer, Frame&`
`240`	`240`	`_transferImageInfo(vk_commandBuffer, frame, offset, *imageInfo);`
`241`	`241`	`}`
`242`	`242`
`243`		`- if (imageInfo->imageView->image->data->properties.dataVariance == STATIC_DATA)`
	`243`	`+ if (imageInfo->imageView->image->data->dynamic())`
`244`	`244`	`{`
`245`		`- log(level, " removing copied static image data: ", imageInfo, ", ", imageInfo->imageView->image->data);`
`246`		`- imageInfo_itr = _dynamicImageInfoSet.erase(imageInfo_itr);`
	`245`	`+ ++imageInfo_itr;`
`247`	`246`	`}`
`248`	`247`	`else`
`249`	`248`	`{`
`250`		`- ++imageInfo_itr;`
	`249`	`+ log(level, " removing copied static image data: ", imageInfo, ", ", imageInfo->imageView->image->data);`
	`250`	`+ imageInfo_itr = _dynamicImageInfoSet.erase(imageInfo_itr);`
`251`	`251`	`}`
`252`	`252`	`}`
`253`	`253`	`}`
Original file line number	Diff line number	Diff line change
`@@ -62,7 +62,7 @@ int BufferInfo::compare(const Object& rhs_object) const`
`62`	`62`
`63`	`63`	`if (data != rhs.data && data && rhs.data)`
`64`	`64`	`{`
`65`		`- if (data->properties.dataVariance != STATIC_DATA \|\| rhs.data->properties.dataVariance != STATIC_DATA)`
	`65`	`+ if (data->dynamic() \|\| rhs.data->dynamic())`
`66`	`66`	`{`
`67`	`67`	`if (data < rhs.data) return -1;`
`68`	`68`	`return 1; // from checks above it must be that data > rhs.data`
`@@ -300,6 +300,10 @@ bool vsg::createBufferAndTransferData(Context& context, const BufferInfoList& bu`
`300`	`300`	`if (data)`
`301`	`301`	`{`
`302`	`302`	`std::memcpy(ptr + bufferInfo->offset - deviceBufferInfo->offset, data->dataPointer(), data->dataSize());`
	`303`	`+ if (data->properties.dataVariance == STATIC_DATA_UNREF_AFTER_TRANSFER)`
	`304`	`+ {`
	`305`	`+ bufferInfo->data.reset();`
	`306`	`+ }`
`303`	`307`	`}`
`304`	`308`	`bufferInfo->parent = deviceBufferInfo;`
`305`	`309`	`}`
Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@ void FindDynamicObjects::apply(const Object& object)`
`39`	`39`
`40`	`40`	`void FindDynamicObjects::apply(const Data& data)`
`41`	`41`	`{`
`42`		`- if (data.properties.dataVariance != STATIC_DATA) tag(&data);`
	`42`	`+ if (data.dynamic()) tag(&data);`
`43`	`43`	`}`
`44`	`44`
`45`	`45`	`void FindDynamicObjects::apply(const AnimationGroup& ag)`