GLTF loader: reworked initial texture data to be stored as user data in the texture/allocation to make sure that GPU data is always initialized before the first use

1 files changed, 19 insertions, 1 deletions

diff --git a/AssetLoader/interface/GLTFResourceManager.hpp b/AssetLoader/interface/GLTFResourceManager.hpp
index 0e47137..a65f9e1 100644
--- a/AssetLoader/interface/GLTFResourceManager.hpp
+++ b/AssetLoader/interface/GLTFResourceManager.hpp
@@ -78,7 +78,8 @@ public:
     RefCntAutoPtr<ITextureAtlasSuballocation> AllocateTextureSpace(TEXTURE_FORMAT Fmt,
                                                                    Uint32         Width,
                                                                    Uint32         Height,
-                                                                   const char*    CacheId = nullptr);
+                                                                   const char*    CacheId   = nullptr,
+                                                                   IObject*       pUserData = nullptr);
 
     RefCntAutoPtr<ITextureAtlasSuballocation> FindAllocation(const char* CacheId);
 
@@ -116,6 +117,23 @@ public:
         return cache_it->second->GetTexture(pDevice, pContext);
     }
 
+    // NB: can't return reference here!
+    TextureDesc GetAtlasDesc(TEXTURE_FORMAT Fmt)
+    {
+        {
+            std::lock_guard<std::mutex> Lock{m_AtlasesMtx};
+
+            auto cache_it = m_Atlases.find(Fmt);
+            if (cache_it != m_Atlases.end())
+                return cache_it->second->GetAtlasDesc();
+        }
+
+        // Atlas is not present in the map - use default description
+        TextureDesc Desc = m_DefaultAtlasDesc.Desc;
+        Desc.Format      = Fmt;
+        return Desc;
+    }
+
 private:
     template <typename AllocatorType, typename ObjectType>
     friend class Diligent::MakeNewRCObj;