IGPUUploadManager: rename GPUUploadExecutedCallbackType to GPUUploadEnqueuedCallbackType

Author: TheMostDiligent

Graphics/GraphicsTools/include/GPUUploadManagerImpl.hpp

@@ -57,7 +57,7 @@ class GPUUploadManagerImpl final : public ObjectBase<IGPUUploadManager>
                                                          Uint32                        DstOffset,
                                                          Uint32                        NumBytes,
                                                          const void*                   pSrcData,
-                                                         GPUUploadExecutedCallbackType Callback,
+                                                         GPUUploadEnqueuedCallbackType Callback,
                                                          void*                         pCallbackData) override final;
 
     class Page
@@ -92,7 +92,7 @@ class GPUUploadManagerImpl final : public ObjectBase<IGPUUploadManager>
                                       Uint32                        DstOffset,
                                       Uint32                        NumBytes,
                                       const void*                   pSrcData,
-                                      GPUUploadExecutedCallbackType Callback,
+                                      GPUUploadEnqueuedCallbackType Callback,
                                       void*                         pCallbackData);
 
             WritingStatus EndWriting();
@@ -156,7 +156,7 @@ class GPUUploadManagerImpl final : public ObjectBase<IGPUUploadManager>
                                   Uint32                        DstOffset,
                                   Uint32                        NumBytes,
                                   const void*                   pSrcData,
-                                  GPUUploadExecutedCallbackType Callback,
+                                  GPUUploadEnqueuedCallbackType Callback,
                                   void*                         pCallbackData);
 
         WritingStatus EndWriting();
@@ -183,7 +183,7 @@ class GPUUploadManagerImpl final : public ObjectBase<IGPUUploadManager>
         {
             RefCntAutoPtr<IBuffer> pDstBuffer;
 
-            GPUUploadExecutedCallbackType Callback      = nullptr;
+            GPUUploadEnqueuedCallbackType Callback      = nullptr;
             void*                         pCallbackData = nullptr;
 
             Uint32 SrcOffset = 0;

Graphics/GraphicsTools/interface/GPUUploadManager.h

@@ -45,8 +45,10 @@ struct GPUUploadManagerCreateInfo
 };
 typedef struct GPUUploadManagerCreateInfo GPUUploadManagerCreateInfo;
 
-/// Callback function type for GPU upload completion notification.
-typedef void (*GPUUploadExecutedCallbackType)(void*);
+/// Callback function type for GPU upload enqueued callback.
+/// This callback is called when the GPU copy operation is scheduled for execution
+/// in the render thread.
+typedef void (*GPUUploadEnqueuedCallbackType)(void*);
 
 // clang-format off
 
@@ -77,7 +79,7 @@ DILIGENT_BEGIN_INTERFACE(IGPUUploadManager, IObject)
                                               Uint32                        DstOffset,
                                               Uint32                        NumBytes,
                                               const void*                   pSrcData,
-                                              GPUUploadExecutedCallbackType Callback      DEFAULT_VALUE(nullptr),
+                                              GPUUploadEnqueuedCallbackType Callback      DEFAULT_VALUE(nullptr),
                                               void*                         pCallbackData DEFAULT_VALUE(nullptr)) PURE;
 };
 DILIGENT_END_INTERFACE

Graphics/GraphicsTools/src/GPUUploadManagerImpl.cpp

@@ -56,7 +56,7 @@ bool GPUUploadManagerImpl::Page::Writer::ScheduleBufferUpdate(IBuffer*
                                                               Uint32                        DstOffset,
                                                               Uint32                        NumBytes,
                                                               const void*                   pSrcData,
-                                                              GPUUploadExecutedCallbackType Callback,
+                                                              GPUUploadEnqueuedCallbackType Callback,
                                                               void*                         pCallbackData)
 {
     if (m_pPage == nullptr)
@@ -184,7 +184,7 @@ bool GPUUploadManagerImpl::Page::ScheduleBufferUpdate(IBuffer*
                                                       Uint32                        DstOffset,
                                                       Uint32                        NumBytes,
                                                       const void*                   pSrcData,
-                                                      GPUUploadExecutedCallbackType Callback,
+                                                      GPUUploadEnqueuedCallbackType Callback,
                                                       void*                         pCallbackData)
 {
     VERIFY_EXPR(GetWriterCount() > 0);
@@ -256,6 +256,9 @@ void GPUUploadManagerImpl::Page::ExecutePendingOps(IDeviceContext* pContext, Uin
 
 void GPUUploadManagerImpl::Page::Reset(IDeviceContext* pContext)
 {
+    VERIFY(GetWriterCount() == 0, "All writers must finish before resetting the page");
+    VERIFY(m_PendingOps.IsEmpty(), "All pending operations must be executed before resetting the page");
+
     m_Offset.store(0);
     m_State.store(0);
     m_NumPendingOps.store(0);
@@ -305,7 +308,7 @@ void GPUUploadManagerImpl::ScheduleBufferUpdate(IBuffer*                      pD
                                                 Uint32                        DstOffset,
                                                 Uint32                        NumBytes,
                                                 const void*                   pSrcData,
-                                                GPUUploadExecutedCallbackType Callback,
+                                                GPUUploadEnqueuedCallbackType Callback,
                                                 void*                         pCallbackData)
 {
 }