Hydrogent: keep all material data in a single buffer

Author: TheMostDiligent

Hydrogent/interface/HnMaterial.hpp

@@ -62,7 +62,7 @@ class HnMaterial final : public pxr::HdMaterial
 {
 public:
     static HnMaterial* Create(const pxr::SdfPath& id);
-    static HnMaterial* CreateFallback(HnTextureRegistry& TexRegistry, const USD_Renderer& UsdRenderer);
+    static HnMaterial* CreateFallback(HnRenderDelegate& RenderDelegate);
 
     ~HnMaterial();
 
@@ -78,8 +78,8 @@ class HnMaterial final : public pxr::HdMaterial
     /// Creates an SRB cache that should be passed to UpdateSRB().
     static RefCntAutoPtr<IObject> CreateSRBCache();
 
-    bool UpdateSRB(HnRenderDelegate& RendererDelegate);
-    void BindMaterialAttribsBuffer(HnRenderDelegate& RendererDelegate);
+    bool UpdateSRB(HnRenderDelegate& RenderDelegate);
+    void BindMaterialAttribsBuffer(HnRenderDelegate& RenderDelegate);
 
     IShaderResourceBinding* GetSRB() const { return m_SRB; }
     IShaderResourceBinding* GetSRB(Uint32 PrimitiveAttribsOffset) const
@@ -88,10 +88,11 @@ class HnMaterial final : public pxr::HdMaterial
         m_PrimitiveAttribsVar->SetBufferOffset(PrimitiveAttribsOffset);
         return m_SRB;
     }
-    void SetMaterialAttribsBufferOffset(Uint32 Offset) const
+    void ApplyMaterialAttribsBufferOffset() const
     {
         VERIFY_EXPR(m_MaterialAttribsVar != nullptr);
-        m_MaterialAttribsVar->SetBufferOffset(Offset);
+        VERIFY_EXPR(m_PBRMaterialAttribsBufferOffset != ~0u);
+        m_MaterialAttribsVar->SetBufferOffset(m_PBRMaterialAttribsBufferOffset);
     }
     void SetJointsBufferOffset(Uint32 Offset) const
     {
@@ -132,7 +133,12 @@ class HnMaterial final : public pxr::HdMaterial
     }
 
     Uint32 GetPBRPrimitiveAttribsBufferRange() const { return m_PBRPrimitiveAttribsBufferRange; }
-    Uint32 GetPBRMaterailAttribsBufferRange() const { return m_PBRMaterialAttribsBufferRange; }
+    Uint32 GetPBRMaterialAttribsSize() const { return m_PBRMaterialAttribsSize; }
+    Uint32 GetPBRMaterialAttribsBufferOffset() const
+    {
+        VERIFY_EXPR(m_PBRMaterialAttribsBufferOffset != ~0u);
+        return m_PBRMaterialAttribsBufferOffset;
+    }
 
 private:
     HnMaterial(pxr::SdfPath const& id);
@@ -142,15 +148,14 @@ class HnMaterial final : public pxr::HdMaterial
     // \remarks     Sync() is not called on fallback material,
     //  	        but we need to initialize default textures,
     //  	        so we have to use this special constructor.
-    HnMaterial(HnTextureRegistry& TexRegistry, const USD_Renderer& UsdRenderer);
+    HnMaterial(HnRenderDelegate& RenderDelegate);
 
     // A mapping from the texture name to the texture coordinate set index in m_TexCoords array (e.g. "diffuseColor" -> 0)
     // The same index is set in m_ShaderTextureAttribs[].UVSelector for the corresponding texture.
     // The name of the primvar that contains the texture coordinates is given by m_TexCoords[index].PrimVarName (e.g. "st0").
     using TexNameToCoordSetMapType = std::unordered_map<pxr::TfToken, size_t, pxr::TfToken::HashFunctor>;
     void AllocateTextures(const HnMaterialNetwork& Network,
-                          HnTextureRegistry&       TexRegistry,
-                          const USD_Renderer&      UsdRenderer);
+                          HnRenderDelegate&        RenderDelegate);
     void InitTextureAttribs(const HnMaterialNetwork&        Network,
                             HnTextureRegistry&              TexRegistry,
                             const USD_Renderer&             UsdRenderer,
@@ -161,6 +166,7 @@ class HnMaterial final : public pxr::HdMaterial
     HnTextureRegistry::TextureHandleSharedPtr GetDefaultTexture(HnTextureRegistry& TexRegistry, const pxr::TfToken& Name);
 
     void ProcessMaterialNetwork(const HnMaterialNetwork& Network);
+    void AllocateBufferSpace(HnRenderDelegate& RenderDelegate);
 
 private:
     pxr::TfToken m_Tag;
@@ -175,6 +181,7 @@ class HnMaterial final : public pxr::HdMaterial
     GLTF::Material m_MaterialData;
 
     std::atomic<bool> m_TextureAddressingAttribsDirty{false};
+    std::atomic<bool> m_GPUDataDirty{true};
 
     // The names of the primvars that contain unique texture coordinate sets for this material (e.g. "st0", "st1").
     // The index in this array for texture N is given by m_ShaderTextureAttribs[N].UVSelector.
@@ -184,11 +191,24 @@ class HnMaterial final : public pxr::HdMaterial
     Uint32 m_PBRPrimitiveAttribsBufferRange = 0;
 
     // The range that is used to bind the cbMaterialAttribs buffer.
+    // This is the maximum of all material attribs buffer sizes for
+    // all materials that use the same SRB.
     Uint32 m_PBRMaterialAttribsBufferRange = 0;
 
+    PBR_Renderer::PSO_FLAGS m_PSOFlags = PBR_Renderer::PSO_FLAG_NONE;
+
+    // Material attribs shader data size in bytes.
+    Uint32 m_PBRMaterialAttribsSize = 0;
+
+    // The offset in the cbMaterialAttribs buffer.
+    Uint32 m_PBRMaterialAttribsBufferOffset = ~0u;
+
     // Current texture storage version
     Uint32 m_TexRegistryStorageVersion = 0;
 
+    // Current material attribs buffer version
+    Uint32 m_MaterialAttribsBufferVersion = ~0u;
+
     ShaderTextureIndexingIdType m_ShaderTextureIndexingId = 0;
 };
 

Hydrogent/interface/HnRenderDelegate.hpp

@@ -404,7 +404,6 @@ class HnRenderDelegate final : public pxr::HdRenderDelegate
     IRenderStateCache* GetRenderStateCache() const { return m_pRenderStateCache; }
     IBuffer*           GetFrameAttribsCB() const { return m_FrameAttribsCB; }
     IBuffer*           GetPrimitiveAttribsCB() const { return m_PrimitiveAttribsCB; }
-    IBuffer*           GetMaterialAttribsCB() const { return m_MaterialAttribsCB; }
 
     IShaderResourceBinding* GetMainPassFrameAttribsSRB() const { return m_MainPassFrameAttribsSRB; }
     IShaderResourceBinding* GetShadowPassFrameAttribsSRB(Uint32 LightId) const;
@@ -436,7 +435,6 @@ class HnRenderDelegate final : public pxr::HdRenderDelegate
 
     RefCntAutoPtr<GLTF::ResourceManager> m_ResourceMgr;
     RefCntAutoPtr<IBuffer>               m_PrimitiveAttribsCB;
-    RefCntAutoPtr<IBuffer>               m_MaterialAttribsCB;
     RefCntAutoPtr<IObject>               m_MaterialSRBCache;
     std::shared_ptr<USD_Renderer>        m_USDRenderer;
 

Hydrogent/interface/HnRenderPass.hpp

@@ -177,9 +177,6 @@ class HnRenderPass final : public pxr::HdRenderPass
         // in the material's SRB.
         Uint32 PrimitiveAttribsBufferRange = 0;
 
-        /// Offset in the material attribs buffer.
-        Uint32 MaterialAttribsOffset = 0;
-
         IBuffer* IndexBuffer = nullptr;
 
         std::array<IBuffer*, VERTEX_BUFFER_SLOT_COUNT> VertexBuffers = {};
@@ -196,8 +193,7 @@ class HnRenderPass final : public pxr::HdRenderPass
     void UpdateDrawListGPUResources(RenderState& State);
     void UpdateDrawListItemGPUResources(DrawListItem& ListItem, RenderState& State, DRAW_LIST_ITEM_DIRTY_FLAGS DirtyFlags);
 
-    size_t UpdateMaterialAttribsBuffer(RenderState& State, size_t FirstItemIdx);
-    void   RenderPendingDrawItems(RenderState& State);
+    void RenderPendingDrawItems(RenderState& State);
 
     GraphicsPipelineDesc GetGraphicsDesc(const HnRenderPassState& RPState, bool UseStripTopology) const;
 
@@ -219,7 +215,6 @@ class HnRenderPass final : public pxr::HdRenderPass
     {
         const DrawListItem& ListItem;
         const Uint32        PrimitiveAttribsOffset;
-        const Uint32        MaterialAttribsOffset;
         Uint32              JointsBufferOffset = ~0u;
         Uint32              DrawCount          = 1;
     };