Merge pull request #27 from aka411/feature/improving-render-graph

feat(render-graph): implement dynamic window resize handling

Author: aka411

include/rendering-system/gpu-resource-system/data-structures/gpu_mesh_system_data_structures.h

@@ -60,7 +60,7 @@ A uint8_t would suffice
 		UV_1 = 1 << 4,
 		TANGENT = 1 << 5,
 		WEIGHTS = 1 << 6,//A vec4 most times
-		JOINTS = 1 << 7//  I have seen it be uint16 or uint32 i think
+		JOINTS = 1 << 7//  I have seen it be uint16 or uint32
 	};
 
 
@@ -89,7 +89,7 @@ A uint8_t would suffice
 		STANDARD_2_5D = static_cast<uint16_t>(VertexAttributeBits::POSITION | VertexAttributeBits::NORMAL | VertexAttributeBits::UV_0),
 		//POSITION_ONLY
 
-		//yeah color or colour
+	
 		STANDARD_2D_COLOUR = static_cast<uint16_t>(VertexAttributeBits::POSITION | VertexAttributeBits::COLOR)
 
 	};
@@ -103,14 +103,6 @@ A uint8_t would suffice
 
 
 
-
-
-
-
-
-
-
-
 	struct MeshUploadData
 	{
 		VertexFormat vertexFormat = VertexFormat::STANDARD;
@@ -157,9 +149,6 @@ A uint8_t would suffice
 
 
 
-
-	//How about a mesh Id
-
 	using MeshId = uint64_t;
 
 	struct MeshInfo
@@ -183,29 +172,4 @@ A uint8_t would suffice
 	};
 
 
-
-	/*
-	Buffer A(Position) : vec3 positions for all meshes in the game.
-
-	Buffer B(Attributes) : Normals, UVs, and Tangents for all meshes.
-
-	Buffer C(Indices) : All uint32_t or uint16_t index data.
-
-
-	struct DrawCall 
-	{
-	//For all vertex data , we will also have a verteformat 
-	uint32_t vertexOffset; // Offset in the Position Stream
-	uint32_t attributeOffset; // Offset in the UV/Normal Stream
-
-	uint32_t indexOffset;  // Offset in the Global Index Buffer
-	uint32_t indexCount;
-	// ... 
-};
-
-*/
-
-
-
-
 }

include/rendering-system/render-graph/gpu_resource_resolver.h

@@ -2,6 +2,8 @@
 #include <rendering-system/engine_handles.h>
 #include <rendering-system/gpu-resource-system/data-structures/gpu_mesh_system_data_structures.h>
 #include <rendering-system/gpu-resource-system/data-structures/gpu_material_system_data_structures.h>
+#include <rendering-system/render-graph/render_graph_types.h>
+
 
 namespace TheEngine::RenderingSystem
 {
@@ -14,10 +16,11 @@ namespace TheEngine::RenderingSystem
 	private:
 
 		GPUResourceSystem& m_gpuResourceSystem;
+		RenderGraphResources& m_renderGraphResources;
 
 	public:
 
-		GPUResourceResolver(GPUResourceSystem& gpuResourceSystem);
+		GPUResourceResolver(GPUResourceSystem& gpuResourceSystem, RenderGraphResources& renderGraphResources);
 
 		const BufferHandle getMeshBufferHandle(const VertexFormat& vertexFormat, const BufferResourceUsageHint& bufferResourceUsageHint) const;
 		const BufferHandle getIndexBufferhandle(const IndexFormat& indexFormat, const BufferResourceUsageHint& bufferResourceUsageHint) const;
@@ -26,6 +29,10 @@ namespace TheEngine::RenderingSystem
 
 		//const BufferHandle getAnimationBufferHandle() const;
 
+
+		//Texture
+		const TextureHandle getTextureHandle(const std::string& name) const;
+		const TextureHandle getTextureHandle(const VirtualTextureId virtualTextureId) const;
 	};
 
 

include/rendering-system/render-graph/i_render_graph_node.h

@@ -19,11 +19,6 @@ namespace TheEngine::RenderingSystem
 		virtual void setUp(RenderPassSetupContext& ctx, RenderGraphBuilder& builder) = 0;
 		virtual void execute(RenderPassExecuteContext& ctx, GPUResourceResolver& gpuResourceResolver) = 0;
 
-		//virtual void onResize(const WindowExtent& extent, RenderGraphBuilder& builder) = 0;
-
-		//virtual std::string getName() const = 0;
-
-	
 	};
 
 

include/rendering-system/render-graph/render_graph.h

@@ -1,8 +1,4 @@
 #pragma once
-#include <vector>
-#include <string>
-#include <memory>
-
 
 
 #include <rendering-system/render-graph/render_graph_types.h>
@@ -11,19 +7,26 @@
 #include <rendering-system/render-graph/gpu_resource_resolver.h>
 
 
+
 namespace TheEngine::RenderingSystem
 {
 
 
     class IRenderDevice;
+    class ITextureManager;
 
     struct RenderPassSetupContext;
     struct RenderPassExecuteContext;
 
 
+
 	class RenderGraph
 	{
 
+    private:
+
+        ITextureManager& m_textureManager;
+        RenderGraphResources m_renderGraphResources;
 
 	private:
 
@@ -35,7 +38,6 @@ namespace TheEngine::RenderingSystem
         RenderGraphBuilder m_renderGraphBuilder;
 
         RenderPassSetupContext m_renderPassSetupContext;
-      
 
     private:
 

include/rendering-system/render-graph/render_graph_builder.h

@@ -1,9 +1,9 @@
 #pragma once
 #include <string>
-#include <unordered_map>
-#include <rendering-system/engine_handles.h>
+
+
 #include <rendering-system/rhi/data-structures/gpu_texture_data_structures.h>
-#include <map>
+#include <rendering-system/render-graph/render_graph_types.h>
 
 
 namespace TheEngine::RenderingSystem
@@ -20,26 +20,20 @@ namespace TheEngine::RenderingSystem
 
         IRenderDevice& m_renderDevice;
 
-        std::unordered_map<std::string, TextureHandle> m_textureResources;
-       // std::unordered_map<TextureHandle, std::string> m_textureResourcesMapping;
-        // std::map<uint64_t, TextureHandle> m_textureBufferResource;
-
-         //FRAME DATA
-
-
+        RenderGraphResources& m_renderGraphResources;
 
     public:
 
-        RenderGraphBuilder(IRenderDevice& renderDevice);
+        RenderGraphBuilder(IRenderDevice& renderDevice, RenderGraphResources& renderGraphResources);
 
 
 
-        TextureHandle createTexture(const std::string& name, TextureCreateInfo& textureCreateInfo);
+        void createTexture(const std::string& name, TextureCreateInfo& textureCreateInfo, const ResizeParameters& resizeParameters);
 
-        TextureHandle readTexture(const std::string& name);//string based look up
-        TextureHandle writeTexture(const std::string& name);
+        VirtualTextureId readTexture(const std::string& name);
+        VirtualTextureId writeTexture(const std::string& name);
 
-        TextureHandle writeSwapChainImage();
+       // VirtualTextureId writeSwapChainImage();
 
 
 

include/rendering-system/render-graph/render_graph_types.h

@@ -6,6 +6,11 @@
 #include <string>
 #include <rendering-system/rendering_system_data_types.h>
 
+
+#include <rendering-system/engine_handles.h>
+#include <unordered_map>
+#include <vector>
+
 namespace TheEngine::RenderingSystem
 {
 
@@ -49,14 +54,57 @@ namespace TheEngine::RenderingSystem
     enum class ResizingMode
     {
         ABSOLUTE,
-        RELATIVE
+        RELATIVE_FRAMEBUFFER,
+        MATCH_FRAMEBUFFER
     };
 
     struct ResizeParameters
     {
-        ResizingMode resizingMode{ ResizingMode::ABSOLUTE};
+        ResizingMode resizingMode{ ResizingMode::MATCH_FRAMEBUFFER };
         float relativeMultiplier{ 1.0f };
     };
 
+    struct RenderGraphTextureCreateInfo
+    {
+        ResizeParameters resizeParameters{};
+        TextureCreateInfo textureCreateInfo{};
+    };
+
+
+    template<typename Tag>
+    struct VirtualResourceHandle
+    {
+        size_t id{ 0 };
+    };
+
+    using VirtualTextureId = VirtualResourceHandle<struct VirtualTextureTag>;
+
+
+
+
+
+
+    struct RenderGraphResources
+    {
+        std::unordered_map<std::string, VirtualTextureId> textureResources;
+        //Index is virtual handle
+        std::vector<RenderGraphTextureCreateInfo> textureCreateInfos;
+        std::vector<TextureHandle> textureHandles;
+
+        TextureHandle getTextureHandle(const VirtualTextureId virtualTextureId) const
+        {
+            assert(virtualTextureId.id < textureHandles.size());
+            return textureHandles[virtualTextureId.id];
+        }
+
+        TextureHandle getTextureHandle(const std::string& name) const
+        {
+            const auto& vd = textureResources.at(name);
+            return getTextureHandle(vd);
+        }
+
+    };
+
+
 
 }

src/rendering-system/api-backend/vulkan/vulkan_texture_manager.cpp

@@ -61,7 +61,7 @@ namespace TheEngine::RenderingSystem::VulkanBackend
 
 
 		//TODO : IMPLEMENT THIS
-
+		assert(false && "Need to write code to destroy texture");
 
 	}
 

src/rendering-system/render-graph/gpu_resource_resolver.cpp

@@ -8,8 +8,9 @@ namespace TheEngine::RenderingSystem
 
 
 
-	GPUResourceResolver::GPUResourceResolver(GPUResourceSystem& gpuResourceSystem):
-		m_gpuResourceSystem(gpuResourceSystem)
+	GPUResourceResolver::GPUResourceResolver(GPUResourceSystem& gpuResourceSystem, RenderGraphResources& renderGraphResources):
+		m_gpuResourceSystem(gpuResourceSystem),
+		m_renderGraphResources(renderGraphResources)
 	{
 
 	}
@@ -36,4 +37,16 @@ namespace TheEngine::RenderingSystem
 	}
 */
 
+	const TextureHandle GPUResourceResolver::getTextureHandle(const std::string& name) const
+	{
+		return m_renderGraphResources.getTextureHandle(name);
+	}
+
+	const TextureHandle GPUResourceResolver::getTextureHandle(const VirtualTextureId virtualTextureId) const
+	{
+		return m_renderGraphResources.getTextureHandle(virtualTextureId);
+	}
+
+
+
 }

src/rendering-system/render-graph/render_graph.cpp

@@ -1,27 +1,65 @@
 #include <rendering-system/render-graph/render_graph.h>
 #include <rendering-system/rhi/i_command_buffer.h>
-
-
+#include <rendering-system/gpu-resource-system/gpu_resource_system.h>
+#include <rendering-system/rhi/i_texture_manager.h>
 namespace TheEngine::RenderingSystem
 {
 
 	void RenderGraph::onWindowResize(const WindowExtent& extent)
 	{
-		
+		//WARNING : This method assumes the caller has made sure all work submitted using all these resources here are completed
+
 		m_renderPassSetupContext.windowExtent = extent;
 
-		//assert(m_textureResources.size() == m_textureResourcesMapping.size());
+		for (const auto texturehandle : m_renderGraphResources.textureHandles)
+		{
+			m_textureManager.destroyTexture(texturehandle);
+		}
 
-		//delete old 
-		//create new based  on new sizes 
+		m_renderGraphResources.textureHandles.clear();
+
+		for (const auto& renderGraphTextureCreateInfo : m_renderGraphResources.textureCreateInfos)
+		{
+			
+			auto modifiedTextureCreateInfo = renderGraphTextureCreateInfo.textureCreateInfo;
+			auto& desc = modifiedTextureCreateInfo.desc;
+			switch (renderGraphTextureCreateInfo.resizeParameters.resizingMode)
+			{
+				case ResizingMode::ABSOLUTE:
+				{
+					//Do nothing
+					break;
+				}
+
+				case ResizingMode::RELATIVE_FRAMEBUFFER:
+				{
+					const float multiplier = renderGraphTextureCreateInfo.resizeParameters.relativeMultiplier;
+					desc.width = extent.framebuffer.width * multiplier;
+					desc.height = extent.framebuffer.height * multiplier;
+					break;
+				}
+				case ResizingMode::MATCH_FRAMEBUFFER:
+				{
+					desc.width = extent.framebuffer.width;
+					desc.height = extent.framebuffer.height;
+					break;
+				}
+
+			}
+
+			m_renderGraphResources.textureHandles.push_back(m_textureManager.createTexture(modifiedTextureCreateInfo));
+
+
+		}
 
 	}
 
 
 	RenderGraph::RenderGraph(IRenderDevice& renderDevice, const RenderPassSetupContext& renderPassSetupContext, GPUResourceSystem& gpuResourceSystem) :
-		m_renderGraphBuilder(renderDevice),
+		m_textureManager(gpuResourceSystem.getTextureManager()),
+		m_renderGraphBuilder(renderDevice,m_renderGraphResources),
 		m_renderPassSetupContext(renderPassSetupContext),
-		m_gpuResourceResolver(gpuResourceSystem)
+		m_gpuResourceResolver(gpuResourceSystem, m_renderGraphResources)
 	{