GPUUploadManager: add Format parameter to ScheduleTextureUpdateInfo

Author: TheMostDiligent

Graphics/GraphicsTools/interface/GPUUploadManager.h

@@ -379,6 +379,9 @@ struct ScheduleTextureUpdateInfo
     /// Otherwise, this texture will be used as the destination for the copy operation
     ITexture* pDstTexture DEFAULT_INITIALIZER(nullptr);
 
+    /// Destination texture format, used when pDstTexture is null.
+    TEXTURE_FORMAT Format DEFAULT_INITIALIZER(TEX_FORMAT_UNKNOWN);
+
     /// State transition mode for the destination texture. This parameter is ignored if CopyTexture/CopyD3D11Texture callback is provided,
     /// and the callback is expected to perform any necessary state transitions itself.
     RESOURCE_STATE_TRANSITION_MODE DstTextureTransitionMode DEFAULT_INITIALIZER(RESOURCE_STATE_TRANSITION_MODE_TRANSITION);

Graphics/GraphicsTools/src/GPUUploadManagerImpl.cpp

@@ -411,7 +411,12 @@ bool GPUUploadManagerImpl::Page::ScheduleTextureUpdate(const ScheduleTextureUpda
         }
         else if (m_pStagingAtlas)
         {
-            const TextureFormatAttribs& FmtAttribs = GetTextureFormatAttribs(UpdateInfo.pDstTexture->GetDesc().Format);
+            const TEXTURE_FORMAT Format = UpdateInfo.pDstTexture != nullptr ?
+                UpdateInfo.pDstTexture->GetDesc().Format :
+                UpdateInfo.Format;
+            VERIFY_EXPR(Format != TEX_FORMAT_UNKNOWN);
+
+            const TextureFormatAttribs& FmtAttribs = GetTextureFormatAttribs(Format);
 
             DynamicAtlasManager::Region Region = m_pStagingAtlas->Allocate(
                 AlignUp(UpdateInfo.DstBox.Width(), FmtAttribs.BlockWidth),
@@ -440,7 +445,12 @@ bool GPUUploadManagerImpl::Page::ScheduleTextureUpdate(const ScheduleTextureUpda
             }
             else if (UpdateInfo.pSrcData != nullptr)
             {
-                const TextureFormatAttribs& FmtAttribs = GetTextureFormatAttribs(UpdateInfo.pDstTexture->GetDesc().Format);
+                const TEXTURE_FORMAT Format = UpdateInfo.pDstTexture != nullptr ?
+                    UpdateInfo.pDstTexture->GetDesc().Format :
+                    UpdateInfo.Format;
+                VERIFY_EXPR(Format != TEX_FORMAT_UNKNOWN);
+
+                const TextureFormatAttribs& FmtAttribs = GetTextureFormatAttribs(Format);
                 const Uint32                NumRows    = AlignUp(UpdateInfo.DstBox.Height(), FmtAttribs.BlockHeight) / FmtAttribs.BlockHeight;
                 for (Uint32 DepthSlice = 0; DepthSlice < UpdateInfo.DstBox.Depth(); ++DepthSlice)
                 {
@@ -1100,14 +1110,15 @@ void GPUUploadManagerImpl::ScheduleBufferUpdate(const ScheduleBufferUpdateInfo&
 
 void GPUUploadManagerImpl::ScheduleTextureUpdate(const ScheduleTextureUpdateInfo& UpdateInfo)
 {
-    if (UpdateInfo.pDstTexture == nullptr)
+    const TEXTURE_FORMAT Format = UpdateInfo.pDstTexture != nullptr ?
+        UpdateInfo.pDstTexture->GetDesc().Format :
+        UpdateInfo.Format;
+    if (Format == TEX_FORMAT_UNKNOWN)
     {
-        DEV_ERROR("Dst texture must not be null");
+        DEV_ERROR("If pDstTexture is null, a valid format must be specified in ScheduleTextureUpdateInfo.Format");
         return;
     }
 
-    const TextureDesc& TexDesc = UpdateInfo.pDstTexture->GetDesc();
-
     struct ScheduleUpdateData
     {
         const ScheduleTextureUpdateInfo& UpdateInfo;
@@ -1117,15 +1128,15 @@ void GPUUploadManagerImpl::ScheduleTextureUpdate(const ScheduleTextureUpdateInfo
     ScheduleUpdateData UpdateData{
         UpdateInfo,
         !m_pTextureStreams ?
-            GetBufferToTextureCopyInfo(TexDesc.Format, UpdateInfo.DstBox, m_TextureUpdateStrideAlignment) :
+            GetBufferToTextureCopyInfo(Format, UpdateInfo.DstBox, m_TextureUpdateStrideAlignment) :
             BufferToTextureCopyInfo{},
         !m_pTextureStreams ?
             m_TextureUpdateOffsetAlignment :
             0,
     };
 
     UploadStream* pStream = m_pTextureStreams ?
-        m_pTextureStreams->GetStreamForFormat(UpdateData.UpdateInfo.pContext, TexDesc.Format) :
+        m_pTextureStreams->GetStreamForFormat(UpdateData.UpdateInfo.pContext, Format) :
         &GetStreamForUpdateSize(static_cast<Uint32>(UpdateData.CopyInfo.MemorySize));
     if (pStream == nullptr)
     {

Tests/DiligentCoreAPITest/src/GPUUploadManagerTest.cpp

@@ -816,8 +816,15 @@ void TestTextureUpdates(TEXTURE_FORMAT Format, RESOURCE_DIMENSION Type, Uint32 F
                     for (Uint32 x = 0; x < Mip.LogicalWidth; x += UpdateWidth)
                     {
                         ScheduleTextureUpdateInfo UpdateInfo;
-                        UpdateInfo.pContext    = pContext;
-                        UpdateInfo.pDstTexture = pTexture;
+                        UpdateInfo.pContext = pContext;
+                        if (Flags & TEST_TEXTURE_UPDATES_FLAGS_USE_COPY_CALLBACK)
+                        {
+                            UpdateInfo.Format = Format;
+                        }
+                        else
+                        {
+                            UpdateInfo.pDstTexture = pTexture;
+                        }
 
                         Box& DstBox{UpdateInfo.DstBox};
                         DstBox.MinX = x;