[Renderer] [Engine] material use count & display info in GUI

MauroDeryckere · MauroDeryckere · commit ffe215ee157f · 2025-07-02T06:01:01.000+02:00
diff --git a/Engine/MauEng/Private/GUI/ImGUILayer.cpp b/Engine/MauEng/Private/GUI/ImGUILayer.cpp
@@ -183,11 +183,13 @@ namespace MauEng
 
 	void ImGUILayer::RenderRendererInfo()
 	{
-		auto const& info{ RENDERER.GetRendererMeshInfo() };
 
-		ImGui::Begin("Renderer Mesh Info");
+		ImGui::Begin("Renderer Info");
+
 			if (ImGui::BeginTable("MeshTable", 1, ImGuiTableFlags_Borders | ImGuiTableFlags_RowBg))
 			{
+				auto const& info{ RENDERER.GetRendererMeshInfo() };
+
 				ImGui::TableSetupColumn("Meshes");
 				ImGui::TableHeadersRow();
 
@@ -221,6 +223,45 @@ namespace MauEng
 
 				ImGui::EndTable();
 			}
+
+			if (ImGui::BeginTable("MaterialTable", 1, ImGuiTableFlags_Borders | ImGuiTableFlags_RowBg))
+			{
+				auto const& info{ RENDERER.GetMaterialRendererInfo() };
+
+				ImGui::TableSetupColumn("Materials");
+				ImGui::TableHeadersRow();
+
+				for (auto const& mat : info.name_ID)
+				{
+					ImGui::TableNextRow();
+					ImGui::TableSetColumnIndex(0);
+
+					if (ImGui::TreeNode(mat.first.c_str()))
+					{
+						ImGui::Indent();
+
+						// Display mesh details as plain text or another table
+						auto const loadedID{ mat.second.materialID };
+						if (loadedID == UINT32_MAX)
+						{
+							ImGui::TextColored(ImVec4(1, 0, 0, 1), "Invalid Material ID");
+						}
+						else
+						{
+							ImGui::Text("Mat ID: %zu", info.matData[loadedID].materialID);
+							ImGui::Text("Use Count: %zu", mat.second.useCount);
+							ImGui::Text("Albedo texture ID: %zu", info.matData[loadedID].albedoTextureID);
+							ImGui::Text("Normal texture ID: %zu", info.matData[loadedID].normalTextureID);
+							ImGui::Text("Metalness texture ID: %zu", info.matData[loadedID].metallicTextureID);
+						}
+
+						ImGui::Unindent();
+						ImGui::TreePop();
+					}
+				}
+
+				ImGui::EndTable();
+			}
 		ImGui::End();
 	}
 }
diff --git a/Engine/Renderer/Private/NullRenderer.h b/Engine/Renderer/Private/NullRenderer.h
@@ -46,6 +46,16 @@ namespace MauRen
 			return temp;
 		}
 
+		virtual [[nodiscard]] struct MaterialRendererInfo GetMaterialRendererInfo() const noexcept override
+		{
+			static auto temp01{ std::unordered_map<std::string, LoadedMaterialInfo>{} };
+			static auto temp02{ std::vector<MaterialData>{} };
+
+			MaterialRendererInfo info{ temp01, temp02 };
+			return info;
+		}
+
+
 		NullRenderer(NullRenderer const&) = delete;
 		NullRenderer(NullRenderer&&) = delete;
 		NullRenderer& operator=(NullRenderer const&) = delete;
diff --git a/Engine/Renderer/Private/Vulkan/Assets/VulkanMaterialManager.cpp b/Engine/Renderer/Private/Vulkan/Assets/VulkanMaterialManager.cpp
@@ -48,22 +48,7 @@ namespace MauRen
 			return { false, INVALID_MATERIAL_ID };
 		}
 
-		return { true, it->second };
-	}
-
-	bool VulkanMaterialManager::Exists(uint32_t ID) const noexcept
-	{
-		if (ID == INVALID_MATERIAL_ID)
-		{
-			return false;
-		}
-
-		if (ID < m_Materials.size())
-		{
-			return true;
-		}
-
-		return false;
+		return { true, it->second.materialID };
 	}
 
 	uint32_t VulkanMaterialManager::LoadOrGetMaterial(VulkanCommandPoolManager& cmdPoolManager, VulkanDescriptorContext& descriptorContext, Material const& material)
@@ -80,7 +65,8 @@ namespace MauRen
 		auto const it{ m_MaterialIDMap.find(material.name) };
 		if (it != end(m_MaterialIDMap))
 		{
-			return it->second;
+			m_MaterialIDMap[material.name].useCount++;
+			return it->second.materialID;
 		}
 
 		MaterialData vkMat{};
@@ -112,7 +98,11 @@ namespace MauRen
 			vkMat.metallicTextureID = m_TextureManager->LoadOrGetTexture(cmdPoolManager, descriptorContext, material.metalnessRoughnessTexture, true);
 		}
 
+		vkMat.materialID = m_NextMaterialID;
+
 		m_Materials.emplace_back(vkMat);
+		m_MaterialIDMap[material.name] = { static_cast<uint32_t>(m_Materials.size() - 1), 1};
+		m_NextMaterialID++;
 
 		// Upload the material id if new
 		{
@@ -129,7 +119,6 @@ namespace MauRen
 				bufferInfo.buffer = m_MaterialDataBuffers[i].buffer.buffer;
 				bufferInfo.range = sizeof(MaterialData) * MAX_MATERIALS;
 
-				//TODO simply do this once per frame, if buffer has changed
 				descriptorContext.BindMaterialBuffer(bufferInfo, i);
 			}
 		}
@@ -138,11 +127,6 @@ namespace MauRen
 		return static_cast<uint32_t>(m_Materials.size() - 1);
 	}
 
-	MaterialData const& VulkanMaterialManager::GetMaterial(uint32_t ID) const noexcept
-	{
-		return m_Materials[ID];
-	}
-
 	void VulkanMaterialManager::InitMaterialBuffers()
 	{
 		auto deviceContext{ VulkanDeviceContextManager::GetInstance().GetDeviceContext() };
@@ -168,6 +152,6 @@ namespace MauRen
 		Material const defaultMat{};
 		auto const id{ LoadOrGetMaterial(cmdPoolManager, descContext, defaultMat) };
 
-		ME_ASSERT(id == INVALID_MATERIAL_ID);
+		ME_ASSERT(id == DEFAULT_MATERIAL_ID);
 	}
 }
diff --git a/Engine/Renderer/Private/Vulkan/Assets/VulkanMaterialManager.h b/Engine/Renderer/Private/Vulkan/Assets/VulkanMaterialManager.h
@@ -22,16 +22,16 @@ namespace MauRen
 
 		// Returns if it exists, and ID if it does
 		[[nodiscard]] std::pair<bool, uint32_t> GetMaterial(std::string const& materialName) const noexcept;
-		[[nodiscard]] bool Exists(uint32_t ID) const noexcept;
 
 		[[nodiscard]] uint32_t LoadOrGetMaterial(VulkanCommandPoolManager& cmdPoolManager, VulkanDescriptorContext& descriptorContext, Material const& material);
 
-		[[nodiscard]] MaterialData const& GetMaterial(uint32_t ID) const noexcept;
-
 		[[nodiscard]] VkSampler GetTextureSampler() const noexcept { return m_TextureManager->GetTextureSampler(); }
 		[[nodiscard]] VulkanTextureManager* GetTextureManager() const noexcept { return m_TextureManager.get(); }
 		[[nodiscard]] std::vector<MaterialData> const& GetMaterials() const noexcept { return m_Materials; }
 
+		[[nodiscard]] std::unordered_map<std::string, LoadedMaterialInfo> const& GetMaterialIDMap() const noexcept { return m_MaterialIDMap; }
+		[[nodiscard]] std::vector<MaterialData> const& GetMaterialData() const noexcept { return m_Materials; }
+
 		VulkanMaterialManager(VulkanMaterialManager const&) = delete;
 		VulkanMaterialManager(VulkanMaterialManager&&) = delete;
 		VulkanMaterialManager& operator=(VulkanMaterialManager const&) = delete;
@@ -41,16 +41,18 @@ namespace MauRen
 		friend class MauCor::Singleton<VulkanMaterialManager>;
 		VulkanMaterialManager() = default;
 		virtual ~VulkanMaterialManager() override = default;
-
+		
 		std::unique_ptr<VulkanTextureManager> m_TextureManager;
 
 		// Material name, ID in MaterialData[ ]
-		std::unordered_map<std::string, uint32_t> m_MaterialIDMap;
+		std::unordered_map<std::string, LoadedMaterialInfo> m_MaterialIDMap;
 
 		// All loaded materials - 1:1 copy of GPU buffer
 		std::vector<MaterialData> m_Materials;
 		std::vector<VulkanMappedBuffer> m_MaterialDataBuffers;
 
+		uint32_t m_NextMaterialID{ 0 };
+
 		void InitMaterialBuffers();
 
 		void CreateDefaultMaterial(VulkanCommandPoolManager& cmdPoolManager, VulkanDescriptorContext& descContext);
diff --git a/Engine/Renderer/Private/Vulkan/Assets/VulkanMeshManager.cpp b/Engine/Renderer/Private/Vulkan/Assets/VulkanMeshManager.cpp
@@ -61,7 +61,7 @@ namespace MauRen
 
 		std::string cleanPath{ path };
 		std::string const prefix{ "Resources/Models/" };
-		if (cleanPath.compare(0, prefix.size(), prefix) == 0)
+		if (cleanPath.starts_with(prefix))
 		{
 			cleanPath.erase(0, prefix.size());
 		}
@@ -115,6 +115,7 @@ namespace MauRen
 
 		m_LoadedMeshes[m_NextID] = static_cast<uint32_t>(m_MeshData.size());
 		m_LoadedMeshes_Path[cleanPath] = { static_cast<uint32_t>(m_MeshData.size()), 1 };
+		m_MeshID_path[m_NextID] = cleanPath;
 
 		m_MeshData.emplace_back(std::move(meshData));
 
diff --git a/Engine/Renderer/Private/Vulkan/Assets/VulkanMeshManager.h b/Engine/Renderer/Private/Vulkan/Assets/VulkanMeshManager.h
@@ -90,10 +90,12 @@ namespace MauRen
 
 		// maps mesh ID -> index into m_MeshData
 		std::unordered_map<uint32_t, uint32_t> m_LoadedMeshes;
-		// map model/mesh path into m_MeshData
 
+		// map model/mesh path into m_MeshData
 		std::unordered_map<std::string, LoadedMeshes_PathInfo> m_LoadedMeshes_Path;
 
+		std::unordered_map<uint32_t, std::string> m_MeshID_path;
+
 		uint32_t m_CurrentVertexOffset{ 0 }; // current vertex offset in the "global" vertex buffer
 		uint32_t m_CurrentIndexOffset{ 0 }; // current index offset in the "global" index buffer
 		uint32_t m_NextID{ 0 }; // next available mesh ID
diff --git a/Engine/Renderer/Private/Vulkan/Assets/VulkanTextureManager.cpp b/Engine/Renderer/Private/Vulkan/Assets/VulkanTextureManager.cpp
@@ -151,7 +151,7 @@ namespace MauRen
 		descriptorContext.BindTexture(static_cast<uint32_t>(std::size(m_Textures)), defaultGrayTexture.imageViews[0], VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL);
 		m_Textures.emplace_back(std::move(defaultGrayTexture));
 		m_TextureIDMap["__DefaultGray"] = static_cast<uint32_t>(std::size(m_Textures) - 1);
-
+		
 		// 2
 		auto defaultNormalTexture{ Create1x1Texture(cmdPoolManager, glm::vec4(0.5f, 0.5f, 1.0f, 1.0f), false) };
 		descriptorContext.BindTexture(static_cast<uint32_t>(std::size(m_Textures)), defaultNormalTexture.imageViews[0], VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL);
diff --git a/Engine/Renderer/Private/Vulkan/VulkanRenderer.cpp b/Engine/Renderer/Private/Vulkan/VulkanRenderer.cpp
@@ -307,6 +307,14 @@ namespace MauRen
 		return VulkanMeshManager::GetInstance().LoadMesh(path, m_CommandPoolManager, m_DescriptorContext);
 	}
 
+	MaterialRendererInfo VulkanRenderer::GetMaterialRendererInfo() const noexcept
+	{
+		return {
+				VulkanMaterialManager::GetInstance().GetMaterialIDMap(),
+				VulkanMaterialManager::GetInstance().GetMaterialData()
+		};
+	}
+
 	std::pair<std::unordered_map<std::string, struct LoadedMeshes_PathInfo> const&, std::vector<struct MeshData> const&>
 	VulkanRenderer::GetRendererMeshInfo()
 	{
diff --git a/Engine/Renderer/Private/Vulkan/VulkanRenderer.h b/Engine/Renderer/Private/Vulkan/VulkanRenderer.h
@@ -64,7 +64,8 @@ namespace MauRen
 		virtual [[nodiscard]] uint32_t LoadOrGetMeshID(char const* path) override;
 
 		virtual [[nodiscard]] std::pair<std::unordered_map<std::string, struct LoadedMeshes_PathInfo> const&, std::vector<struct MeshData>const&> GetRendererMeshInfo() override;
-
+		virtual [[nodiscard]] MaterialRendererInfo GetMaterialRendererInfo() const noexcept override;
+		
 		VulkanRenderer(VulkanRenderer const&) = delete;
 		VulkanRenderer(VulkanRenderer&&) = delete;
 		VulkanRenderer& operator=(VulkanRenderer const&) = delete;
diff --git a/Engine/Renderer/Public/RendererIdentifiers.h b/Engine/Renderer/Public/RendererIdentifiers.h
@@ -14,8 +14,8 @@ namespace MauRen
 	uint32_t constexpr INVALID_TEXTURE_ID{ 5 };
 
 
-	uint32_t constexpr INVALID_MATERIAL_ID{ 0 };
-
+	uint32_t constexpr DEFAULT_MATERIAL_ID{ 0 };
+	uint32_t constexpr INVALID_MATERIAL_ID{ UINT32_MAX };
 	uint32_t constexpr INVALID_DRAW_COMMAND{ UINT32_MAX };
 
 	uint32_t constexpr INVALID_SHADOW_MAP_ID{ 0 };
diff --git a/Engine/Renderer/Shared/BindlessData.h b/Engine/Renderer/Shared/BindlessData.h
@@ -32,7 +32,11 @@ namespace MauRen
         uint32_t loadedMeshesID{ INVALID_MESH_ID };
         uint32_t useCount{ 0 };
     };
-
+    struct LoadedMaterialInfo
+    {
+        uint32_t materialID{ INVALID_MATERIAL_ID };
+        uint32_t useCount{ 0 };
+    };
 
     // (GPU-side resource - CPU copy)
 	// Per instance data
@@ -76,6 +80,9 @@ namespace MauRen
         uint32_t albedoTextureID{ INVALID_DIFFUSE_TEXTURE_ID };
         uint32_t normalTextureID{ INVALID_NORMAL_TEXTURE_ID };
         uint32_t metallicTextureID{ INVALID_METALNESS_TEXTURE_ID };
+
+        uint32_t materialID{ INVALID_MATERIAL_ID };
+
         //...
 
        // uint32_t flags; // Flags for deletion or active status (0 = active, 1 = marked for deletion)
@@ -90,6 +97,13 @@ namespace MauRen
         int32_t  vertexOffset{ 0 };      // Offset to add to the vertex indices
         uint32_t firstInstance{ 0 };     // Starting instance index
     };
+
+    struct MaterialRendererInfo
+    {
+        std::unordered_map<std::string, LoadedMaterialInfo> const& name_ID;
+        std::vector<MaterialData> const& matData;
+    };
+
 }
 
 #endif
diff --git a/Engine/Renderer/Shared/Renderer.h b/Engine/Renderer/Shared/Renderer.h
@@ -40,6 +40,7 @@ namespace MauRen
 		virtual void QueueLight(MauEng::CLight const& light) = 0;
 
 		virtual [[nodiscard]] std::pair<std::unordered_map<std::string, struct LoadedMeshes_PathInfo> const&, std::vector<struct MeshData>const&> GetRendererMeshInfo() = 0;
+		virtual [[nodiscard]] struct MaterialRendererInfo GetMaterialRendererInfo() const noexcept = 0;
 
 		Renderer(Renderer const&) = delete;
 		Renderer(Renderer&&) = delete;

Original file line number	Diff line number	Diff line change
`@@ -48,22 +48,7 @@ namespace MauRen`
`48`	`48`	`return { false, INVALID_MATERIAL_ID };`
`49`	`49`	`}`
`50`	`50`
`51`		`- return { true, it->second };`
`52`		`- }`
`53`		`-`
`54`		`- bool VulkanMaterialManager::Exists(uint32_t ID) const noexcept`
`55`		`- {`
`56`		`- if (ID == INVALID_MATERIAL_ID)`
`57`		`- {`
`58`		`- return false;`
`59`		`- }`
`60`		`-`
`61`		`- if (ID < m_Materials.size())`
`62`		`- {`
`63`		`- return true;`
`64`		`- }`
`65`		`-`
`66`		`- return false;`
	`51`	`+ return { true, it->second.materialID };`
`67`	`52`	`}`
`68`	`53`
`69`	`54`	`uint32_t VulkanMaterialManager::LoadOrGetMaterial(VulkanCommandPoolManager& cmdPoolManager, VulkanDescriptorContext& descriptorContext, Material const& material)`
`@@ -80,7 +65,8 @@ namespace MauRen`
`80`	`65`	`auto const it{ m_MaterialIDMap.find(material.name) };`
`81`	`66`	`if (it != end(m_MaterialIDMap))`
`82`	`67`	`{`
`83`		`- return it->second;`
	`68`	`+ m_MaterialIDMap[material.name].useCount++;`
	`69`	`+ return it->second.materialID;`
`84`	`70`	`}`
`85`	`71`
`86`	`72`	`MaterialData vkMat{};`
`@@ -112,7 +98,11 @@ namespace MauRen`
`112`	`98`	`vkMat.metallicTextureID = m_TextureManager->LoadOrGetTexture(cmdPoolManager, descriptorContext, material.metalnessRoughnessTexture, true);`
`113`	`99`	`}`
`114`	`100`
	`101`	`+ vkMat.materialID = m_NextMaterialID;`
	`102`	`+`
`115`	`103`	`m_Materials.emplace_back(vkMat);`
	`104`	`+ m_MaterialIDMap[material.name] = { static_cast<uint32_t>(m_Materials.size() - 1), 1};`
	`105`	`+ m_NextMaterialID++;`
`116`	`106`
`117`	`107`	`// Upload the material id if new`
`118`	`108`	`{`
`@@ -129,7 +119,6 @@ namespace MauRen`
`129`	`119`	`bufferInfo.buffer = m_MaterialDataBuffers[i].buffer.buffer;`
`130`	`120`	`bufferInfo.range = sizeof(MaterialData) * MAX_MATERIALS;`
`131`	`121`
`132`		`- //TODO simply do this once per frame, if buffer has changed`
`133`	`122`	`descriptorContext.BindMaterialBuffer(bufferInfo, i);`
`134`	`123`	`}`
`135`	`124`	`}`
`@@ -138,11 +127,6 @@ namespace MauRen`
`138`	`127`	`return static_cast<uint32_t>(m_Materials.size() - 1);`
`139`	`128`	`}`
`140`	`129`
`141`		`- MaterialData const& VulkanMaterialManager::GetMaterial(uint32_t ID) const noexcept`
`142`		`- {`
`143`		`- return m_Materials[ID];`
`144`		`- }`
`145`		`-`
`146`	`130`	`void VulkanMaterialManager::InitMaterialBuffers()`
`147`	`131`	`{`
`148`	`132`	`auto deviceContext{ VulkanDeviceContextManager::GetInstance().GetDeviceContext() };`
`@@ -168,6 +152,6 @@ namespace MauRen`
`168`	`152`	`Material const defaultMat{};`
`169`	`153`	`auto const id{ LoadOrGetMaterial(cmdPoolManager, descContext, defaultMat) };`
`170`	`154`
`171`		`- ME_ASSERT(id == INVALID_MATERIAL_ID);`
	`155`	`+ ME_ASSERT(id == DEFAULT_MATERIAL_ID);`
`172`	`156`	`}`
`173`	`157`	`}`
Original file line number	Diff line number	Diff line change
`@@ -61,7 +61,7 @@ namespace MauRen`
`61`	`61`
`62`	`62`	`std::string cleanPath{ path };`
`63`	`63`	`std::string const prefix{ "Resources/Models/" };`
`64`		`- if (cleanPath.compare(0, prefix.size(), prefix) == 0)`
	`64`	`+ if (cleanPath.starts_with(prefix))`
`65`	`65`	`{`
`66`	`66`	`cleanPath.erase(0, prefix.size());`
`67`	`67`	`}`
`@@ -115,6 +115,7 @@ namespace MauRen`
`115`	`115`
`116`	`116`	`m_LoadedMeshes[m_NextID] = static_cast<uint32_t>(m_MeshData.size());`
`117`	`117`	`m_LoadedMeshes_Path[cleanPath] = { static_cast<uint32_t>(m_MeshData.size()), 1 };`
	`118`	`+ m_MeshID_path[m_NextID] = cleanPath;`
`118`	`119`
`119`	`120`	`m_MeshData.emplace_back(std::move(meshData));`
`120`	`121`
Original file line number	Diff line number	Diff line change
`@@ -307,6 +307,14 @@ namespace MauRen`
`307`	`307`	`return VulkanMeshManager::GetInstance().LoadMesh(path, m_CommandPoolManager, m_DescriptorContext);`
`308`	`308`	`}`
`309`	`309`
	`310`	`+ MaterialRendererInfo VulkanRenderer::GetMaterialRendererInfo() const noexcept`
	`311`	`+ {`
	`312`	`+ return {`
	`313`	`+ VulkanMaterialManager::GetInstance().GetMaterialIDMap(),`
	`314`	`+ VulkanMaterialManager::GetInstance().GetMaterialData()`
	`315`	`+ };`
	`316`	`+ }`
	`317`	`+`
`310`	`318`	`std::pair<std::unordered_map<std::string, struct LoadedMeshes_PathInfo> const&, std::vector<struct MeshData> const&>`
`311`	`319`	`VulkanRenderer::GetRendererMeshInfo()`
`312`	`320`	`{`