Hydrogent: set array size to 1 in default atlas desc

DiligentGraphics · Oct 15, 2024 · 5f46655 · 5f46655
1 parent 2f35855
commit 5f46655
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/Hydrogent/src/HnMaterial.cpp b/Hydrogent/src/HnMaterial.cpp
@@ -952,7 +952,7 @@ bool HnMaterial::UpdateSRB(HnRenderDelegate& RendererDelegate)
                     {
                         TEXTURE_FORMAT AtlasFmt = AtlasFormats[AtlasId];
                         VERIFY_EXPR(AtlasFormatIds.find(AtlasFmt)->second == AtlasId);
-                        auto* pAtlasTexture = RendererDelegate.GetResourceManager().GetTexture(AtlasFmt);
+                        ITexture* pAtlasTexture = RendererDelegate.GetResourceManager().GetTexture(AtlasFmt);
                         VERIFY_EXPR(pAtlasTexture != nullptr);
                         TexArray[AtlasId] = pAtlasTexture;
                     }

diff --git a/Hydrogent/src/HnRenderDelegate.cpp b/Hydrogent/src/HnRenderDelegate.cpp
@@ -285,6 +285,11 @@ static RefCntAutoPtr<GLTF::ResourceManager> CreateResourceManager(const HnRender
         ResMgrCI.DefaultAtlasDesc.Desc.BindFlags = BIND_SHADER_RESOURCE;
         ResMgrCI.DefaultAtlasDesc.Desc.Width     = TextureAtlasDim;
         ResMgrCI.DefaultAtlasDesc.Desc.Height    = TextureAtlasDim;
+        // Ensure that the atlas will have at least one slice the first time it is updated.
+        // Since textures are loaded asynchronously, no texture may be loaded during the first update
+        // and RendererDelegate.GetResourceManager().GetTexture(AtlasFmt) in HnMaterial::UpdateSRB() will
+        // return null.
+        ResMgrCI.DefaultAtlasDesc.Desc.ArraySize = 1;
         ResMgrCI.DefaultAtlasDesc.Desc.MipLevels = 6;
         ResMgrCI.DefaultAtlasDesc.GrowthFactor   = 1.25f;
         ResMgrCI.DefaultAtlasDesc.MinAlignment   = 64;