GLTF_PBR_Renderer: use texture atlas format array in ResourceCacheUseInfo

Author: TheMostDiligent

PBR/interface/GLTF_PBR_Renderer.hpp

@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019-2024 Diligent Graphics LLC
+ *  Copyright 2019-2025 Diligent Graphics LLC
  *  Copyright 2015-2019 Egor Yusov
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
@@ -169,53 +169,18 @@ class GLTF_PBR_Renderer : public PBR_Renderer
         /// Vertex layout key.
         GLTF::ResourceManager::VertexLayoutKey VtxLayoutKey;
 
-        /// Base color texture format.
-        TEXTURE_FORMAT BaseColorFormat = TEX_FORMAT_RGBA8_UNORM;
+        /// Texture atlas format for each texture attribute.
+        std::array<TEXTURE_FORMAT, TEXTURE_ATTRIB_ID_COUNT> AtlasFormats{};
 
-        /// Base color texture format for alpha-cut and alpha-blend materials.
-        TEXTURE_FORMAT BaseColorAlphaFormat = TEX_FORMAT_RGBA8_UNORM;
-
-        /// Physical descriptor texture format.
-        TEXTURE_FORMAT PhysicalDescFormat = TEX_FORMAT_RGBA8_UNORM;
-
-        /// Normal map format.
-        TEXTURE_FORMAT NormalFormat = TEX_FORMAT_RGBA8_UNORM;
-
-        /// Occlusion texture format.
-        TEXTURE_FORMAT OcclusionFormat = TEX_FORMAT_RGBA8_UNORM;
-
-        /// Emissive texture format.
-        TEXTURE_FORMAT EmissiveFormat = TEX_FORMAT_RGBA8_UNORM;
-
-        /// Clear coat texture format.
-        TEXTURE_FORMAT ClearCoatFormat = TEX_FORMAT_RGBA8_UNORM;
-
-        /// Clear coat roughness texture format.
-        TEXTURE_FORMAT ClearCoatRoughnessFormat = TEX_FORMAT_RGBA8_UNORM;
-
-        /// Clear coat normal texture format.
-        TEXTURE_FORMAT ClearCoatNormalFormat = TEX_FORMAT_RGBA8_UNORM;
-
-        /// Sheen color texture format.
-        TEXTURE_FORMAT SheenColorFormat = TEX_FORMAT_RGBA8_UNORM;
-
-        /// Sheen roughness texture format.
-        TEXTURE_FORMAT SheenRoughnessFormat = TEX_FORMAT_RGBA8_UNORM;
-
-        /// Anisotropy texture format.
-        TEXTURE_FORMAT AnisotropyFormat = TEX_FORMAT_RGBA8_UNORM;
-
-        /// Iridescence texture format.
-        TEXTURE_FORMAT IridescenceFormat = TEX_FORMAT_RGBA8_UNORM;
-
-        /// Iridescence thickness texture format.
-        TEXTURE_FORMAT IridescenceThicknessFormat = TEX_FORMAT_RGBA8_UNORM;
-
-        /// Transmission texture format.
-        TEXTURE_FORMAT TransmissionFormat = TEX_FORMAT_RGBA8_UNORM;
+        ResourceCacheUseInfo() noexcept
+        {
+            AtlasFormats.fill(TEX_FORMAT_RGBA8_UNORM);
+        }
 
-        /// Thickness texture format.
-        TEXTURE_FORMAT ThicknessFormat = TEX_FORMAT_RGBA8_UNORM;
+        void SetAtlasFormats(TEXTURE_FORMAT Format)
+        {
+            AtlasFormats.fill(Format);
+        }
     };
 
     /// Creates a shader resource binding for a GTLF resource cache.

PBR/src/GLTF_PBR_Renderer.cpp

@@ -244,58 +244,59 @@ void GLTF_PBR_Renderer::CreateResourceCacheSRB(IRenderDevice*           pDevice,
 
     InitCommonSRBVars(pSRB, pFrameAttribs);
 
-    auto SetTexture = [&](TEXTURE_FORMAT Fmt, TEXTURE_ATTRIB_ID ID) //
+    auto SetTexture = [&](TEXTURE_ATTRIB_ID ID) //
     {
+        TEXTURE_FORMAT Fmt = CacheUseInfo.AtlasFormats[ID];
         if (ITexture* pTexture = CacheUseInfo.pResourceMgr->UpdateTexture(Fmt, pDevice, pCtx))
         {
             this->SetMaterialTexture(pSRB, pTexture->GetDefaultView(TEXTURE_VIEW_SHADER_RESOURCE), ID);
         }
     };
 
-    SetTexture(CacheUseInfo.BaseColorFormat, TEXTURE_ATTRIB_ID_BASE_COLOR);
-    SetTexture(CacheUseInfo.PhysicalDescFormat, TEXTURE_ATTRIB_ID_PHYS_DESC);
-    SetTexture(CacheUseInfo.NormalFormat, TEXTURE_ATTRIB_ID_NORMAL);
+    SetTexture(TEXTURE_ATTRIB_ID_BASE_COLOR);
+    SetTexture(TEXTURE_ATTRIB_ID_PHYS_DESC);
+    SetTexture(TEXTURE_ATTRIB_ID_NORMAL);
     if (m_Settings.EnableAO)
     {
-        SetTexture(CacheUseInfo.OcclusionFormat, TEXTURE_ATTRIB_ID_OCCLUSION);
+        SetTexture(TEXTURE_ATTRIB_ID_OCCLUSION);
     }
     if (m_Settings.EnableEmissive)
     {
-        SetTexture(CacheUseInfo.EmissiveFormat, TEXTURE_ATTRIB_ID_EMISSIVE);
+        SetTexture(TEXTURE_ATTRIB_ID_EMISSIVE);
     }
 
     if (m_Settings.EnableClearCoat)
     {
-        SetTexture(CacheUseInfo.ClearCoatFormat, TEXTURE_ATTRIB_ID_CLEAR_COAT);
-        SetTexture(CacheUseInfo.ClearCoatRoughnessFormat, TEXTURE_ATTRIB_ID_CLEAR_COAT_ROUGHNESS);
-        SetTexture(CacheUseInfo.ClearCoatNormalFormat, TEXTURE_ATTRIB_ID_CLEAR_COAT_NORMAL);
+        SetTexture(TEXTURE_ATTRIB_ID_CLEAR_COAT);
+        SetTexture(TEXTURE_ATTRIB_ID_CLEAR_COAT_ROUGHNESS);
+        SetTexture(TEXTURE_ATTRIB_ID_CLEAR_COAT_NORMAL);
     }
 
     if (m_Settings.EnableSheen)
     {
-        SetTexture(CacheUseInfo.SheenColorFormat, TEXTURE_ATTRIB_ID_SHEEN_COLOR);
-        SetTexture(CacheUseInfo.SheenRoughnessFormat, TEXTURE_ATTRIB_ID_SHEEN_ROUGHNESS);
+        SetTexture(TEXTURE_ATTRIB_ID_SHEEN_COLOR);
+        SetTexture(TEXTURE_ATTRIB_ID_SHEEN_ROUGHNESS);
     }
 
     if (m_Settings.EnableAnisotropy)
     {
-        SetTexture(CacheUseInfo.AnisotropyFormat, TEXTURE_ATTRIB_ID_ANISOTROPY);
+        SetTexture(TEXTURE_ATTRIB_ID_ANISOTROPY);
     }
 
     if (m_Settings.EnableIridescence)
     {
-        SetTexture(CacheUseInfo.IridescenceFormat, TEXTURE_ATTRIB_ID_IRIDESCENCE);
-        SetTexture(CacheUseInfo.IridescenceThicknessFormat, TEXTURE_ATTRIB_ID_IRIDESCENCE_THICKNESS);
+        SetTexture(TEXTURE_ATTRIB_ID_IRIDESCENCE);
+        SetTexture(TEXTURE_ATTRIB_ID_IRIDESCENCE_THICKNESS);
     }
 
     if (m_Settings.EnableTransmission)
     {
-        SetTexture(CacheUseInfo.TransmissionFormat, TEXTURE_ATTRIB_ID_TRANSMISSION);
+        SetTexture(TEXTURE_ATTRIB_ID_TRANSMISSION);
     }
 
     if (m_Settings.EnableVolume)
     {
-        SetTexture(CacheUseInfo.ThicknessFormat, TEXTURE_ATTRIB_ID_THICKNESS);
+        SetTexture(TEXTURE_ATTRIB_ID_THICKNESS);
     }
 }