Merge pull request #23 from aka411/feature/render-system-redesign

Feature/render system redesign

Author: aka411

include/asset-system/texture_system.h

@@ -37,10 +37,10 @@ namespace TheEngine::AssetSystem
 
 		TextureSystem(RenderingSystem::ITextureManager&  textureManager, TheEngine::Platform::Platform& platform);
 
-		RenderingSystem::TextureHandle createNewTexture(RenderingSystem::TextureCreateInfo& textureCreateInfo);
+		RenderingSystem::TextureHandle createNewTexture(const RenderingSystem::TextureCreateInfo& textureCreateInfo);
 
 		//A helper method primarily created to help create default textures and materials
-		RenderingSystem::TextureCreateInfo createDefaultTexture(uint8_t r, uint8_t g, uint8_t b, uint8_t a);
+		RenderingSystem::TextureHandle  createDefaultTexture(uint8_t r, uint8_t g, uint8_t b, uint8_t a);
 		//Use Path
 		RenderingSystem::TextureHandle loadTexture(const TheEngine::Platform::Path& path);//allow sampler settings also?
 

include/engine/engine.h

@@ -15,7 +15,7 @@ namespace TheEngine
 
 	private:
 
-		//use pimpl?
+
 		TheEngine::Platform::Platform m_platform;
 		TheEngine::RenderingSystem::RenderingSystem m_renderingSystem;
 		TheEngine::AssetSystem::AssetSystem m_assetSystem;

include/engine/engine_core_data_types.h

@@ -13,26 +13,28 @@ namespace TheEngine
 	};
 
 
+
+	struct Extend2D
+	{
+		uint32_t width{ 0 };
+		uint32_t height{ 0 };
+	};
+
 	struct WindowExtent
 	{
-		// The size in screen coordinates (logical), similar to css pixels
-		uint32_t width = 0;
-		uint32_t height = 0;
-
-		// The size in actual pixels (physical) , the framebuffer size, the size considering Device Pixel Density(or is it dpi)
-		//Frame buffer Size
-		uint32_t physicalWidth = 0;
-		uint32_t physicalHeight = 0;
+		Extend2D logical{};
+		Extend2D framebuffer{};
 	};
 
+
+
 	struct EngineConfiguration
 	{
 
-		TheEngine::RenderingAPI renderingAPI;
+		TheEngine::RenderingAPI renderingAPI{ RenderingAPI::VULKAN_1_3};
 
-		//This is the ;ogical pixels not frame buffer size
-		int windowWidth;
-		int windowHeight;
+		
+		Extend2D logicalWindowExtend{};
 
 
 		std::string windowName;

include/memory-management/memory_block.h

@@ -8,8 +8,8 @@ namespace TheEngine::Memory
 	class MemoryBlock
 	{
 	private:
-		std::byte* m_data = nullptr;
-		size_t m_sizeInBytes = 0;
+		std::byte* m_data{ nullptr };
+		size_t m_size{ 0 };
 
 
 

include/rendering-system/api-backend/vulkan/vulkan-only/vulkan_texture_store.h

@@ -49,7 +49,7 @@ namespace TheEngine::RenderingSystem::VulkanBackend
 
 		VulkanTextureStore(VulkanContext& vulkanContext, VulkanSamplerManager& vulkanSamplerManager);
 
-		TextureHandle createNewTexture(TextureCreateInfo& textureCreateInfo, std::vector<TextureMetadata>& textureRegistry);
+		TextureHandle createNewTexture(const TextureCreateInfo& textureCreateInfo, std::vector<TextureMetadata>& textureRegistry);
 		void destroyTexture(const TextureHandle& textureHandle, std::vector<TextureMetadata>& textureRegistry);
 
 

include/rendering-system/api-backend/vulkan/vulkan_texture_manager.h

@@ -30,7 +30,9 @@ namespace TheEngine::RenderingSystem::VulkanBackend
 
 		virtual ~VulkanTextureManager() override;
 
-		virtual TextureHandle createNewTexture(TextureCreateInfo& textureCreateInfo) override;
+
+		virtual TextureHandle createTexture(const TextureCreateInfo& info) override;
+		virtual TextureHandle createTexture(const TextureCreateInfo& info, TheEngine::Memory::MemoryBlock&& initialData) override;
 
 		virtual void destroyTexture(const TextureHandle& textureHandle) override;
 

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

@@ -0,0 +1,33 @@
+#pragma once
+#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>
+
+namespace TheEngine::RenderingSystem
+{
+
+	class GPUResourceSystem;
+
+	class GPUResourceResolver
+	{
+
+	private:
+
+		GPUResourceSystem& m_gpuResourceSystem;
+
+	public:
+
+		GPUResourceResolver(GPUResourceSystem& gpuResourceSystem);
+
+		const BufferHandle getMeshBufferHandle(const VertexFormat& vertexFormat, const BufferResourceUsageHint& bufferResourceUsageHint) const;
+		const BufferHandle getIndexBufferhandle(const IndexFormat& indexFormat, const BufferResourceUsageHint& bufferResourceUsageHint) const;
+		const BufferHandle getMaterialBufferHandle(const ShadingModel& shadingModel) const;
+
+
+		//const BufferHandle getAnimationBufferHandle() const;
+
+	};
+
+
+
+}

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

@@ -3,7 +3,8 @@
 
 namespace TheEngine::RenderingSystem
 {
-	class  RenderGraphBuilder;
+	class RenderGraphBuilder;
+	class GPUResourceResolver;
 
 	class IRenderGraphNode
 	{
@@ -16,11 +17,11 @@ namespace TheEngine::RenderingSystem
 		virtual ~IRenderGraphNode() = default;
 
 		virtual void setUp(RenderPassSetupContext& ctx, RenderGraphBuilder& builder) = 0;
-		virtual void execute(RenderPassExecuteContext& ctx) = 0;
+		virtual void execute(RenderPassExecuteContext& ctx, GPUResourceResolver& gpuResourceResolver) = 0;
 
-		virtual void onResize(const WindowExtent& extent, RenderGraphBuilder& builder) = 0;
+		//virtual void onResize(const WindowExtent& extent, RenderGraphBuilder& builder) = 0;
 
-		virtual std::string getName() const = 0;
+		//virtual std::string getName() const = 0;
 
 
 	};

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

@@ -7,8 +7,8 @@
 
 #include <rendering-system/render-graph/render_graph_types.h>
 #include <rendering-system/render-graph/render_graph_builder.h>
-#include  <rendering-system/render-graph/i_render_graph_node.h>
-
+#include <rendering-system/render-graph/i_render_graph_node.h>
+#include <rendering-system/render-graph/gpu_resource_resolver.h>
 
 
 namespace TheEngine::RenderingSystem
@@ -30,24 +30,28 @@ namespace TheEngine::RenderingSystem
 
 		std::vector<std::unique_ptr<IRenderGraphNode>> m_renderGraphNodes;
 
+    private:
+
         RenderGraphBuilder m_renderGraphBuilder;
 
         RenderPassSetupContext m_renderPassSetupContext;
 
-        WindowExtent m_currenWindowExtend;
+        WindowExtent m_currenWindowExtend;//REMOVE
+
+    private:
 
+        GPUResourceResolver m_gpuResourceResolver;
 
 	public:
 
-		RenderGraph(IRenderDevice& renderDevice, const RenderPassSetupContext& renderPassSetupContext);
+		RenderGraph(IRenderDevice& renderDevice, const RenderPassSetupContext& renderPassSetupContext,GPUResourceSystem& gpuResourceSystem);
 
 
 
         void addPass(std::unique_ptr<IRenderGraphNode>&& renderGraphNode);
 
 
 
-        //These methods below should be hidden
         void compile();
 
         void execute(RenderPassExecuteContext& renderPassExecuteContext);

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

@@ -3,24 +3,28 @@
 #include <unordered_map>
 #include <rendering-system/engine_handles.h>
 #include <rendering-system/rhi/data-structures/gpu_texture_data_structures.h>
+#include <map>
 
 
 namespace TheEngine::RenderingSystem
 {
+
+
     class IRenderDevice;
 
+
     class RenderGraphBuilder
     {
 
     private:
 
         IRenderDevice& m_renderDevice;
 
-        //ResourceRegistry& m_resourceRegistry;
         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
+         //FRAME DATA
 
 
 
@@ -35,15 +39,11 @@ namespace TheEngine::RenderingSystem
         TextureHandle readTexture(const std::string& name);//string based look up
         TextureHandle writeTexture(const std::string& name);
 
-
-        void deleteTexture(const TextureHandle textureHandle);
-
-    };
-
-
+        TextureHandle writeSwapChainImage();
 
 
 
+    };
 
 
 }