swapchain & friends

Author: Cheaterdev

sources/DirectXFramework/DX12/Device12.cpp

@@ -1,7 +1,8 @@
 #include "pch_dx.h"
 
 import Device;
-#include "Swapchain12.h"
+import SwapChain;
+
 #include "PipelineState.h"
 #include "GPUTimer.h"
 

sources/DirectXFramework/DX12/GPUTimer.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "DX12/Queue.h"
+import Queue;
 import Buffer;
 
 namespace DX12

sources/DirectXFramework/DX12/Queue.cpp

@@ -4,6 +4,7 @@ import Samplers;
 import Device;
 #include "GPUTimer.h"
 import Debug;
+import Queue;
 namespace DX12
 {
 

sources/DirectXFramework/DX12/Queue.h

@@ -0,0 +1,81 @@
+export module Queue;
+
+import Scheduler;
+import Executors;
+import Device;
+import CommandList;
+
+export
+{
+
+	namespace DX12
+	{
+
+		class TransitionCommandList;
+		class Queue
+		{
+			std::wstring name;
+			ComPtr<ID3D12CommandQueue> native;
+
+			Fence commandListCounter;
+			Event commandListEvent;
+
+			UINT64 m_fenceValue;
+
+			SingleThreadExecutor executor;
+			std::function<void(CommandList*)> del_func;
+			std::function<void(TransitionCommandList*)> del_transition;
+
+			std::queue<std::shared_ptr<TransitionCommandList>> transition_lists;
+
+			std::queue<std::shared_ptr<CommandList>> lists;
+			std::mutex list_mutex;
+
+			std::mutex queue_mutex;
+			std::mutex states_mutex;
+
+
+			bool stop = false;
+
+			CommandListType type;
+
+			FenceWaiter last_executed_fence;
+
+			FenceWaiter execute_internal(CommandList* list);
+			FenceWaiter signal_internal();
+			void gpu_wait_internal(FenceWaiter waiter);
+			void signal_and_wait_internal();
+			FenceWaiter run_transition_list(FenceWaiter after, std::shared_ptr<TransitionCommandList>& list);
+		public:
+			void update_tile_mappings(const update_tiling_info& infos);
+
+		public:
+			Queue(CommandListType type, Device* device);
+			~Queue();
+
+			std::shared_ptr<CommandList> get_free_list();
+			std::shared_ptr<TransitionCommandList> get_transition_list();
+			using ptr = std::shared_ptr<Queue>;
+
+			ComPtr<ID3D12CommandQueue> get_native();
+
+
+			FenceWaiter get_last_fence()
+			{
+				return last_executed_fence;
+			}
+			void stop_all();
+			FenceWaiter signal();
+			void signal_and_wait();
+			bool is_complete(UINT64 fence);
+
+			FenceWaiter execute(std::shared_ptr<CommandList> list);
+			FenceWaiter execute(CommandList* list);
+
+			FenceWaiter signal(Fence& fence, UINT64 value);
+
+			void gpu_wait(FenceWaiter waiter);
+		};
+
+	}
+}

sources/DirectXFramework/DX12/Queue.ixx

@@ -0,0 +1,50 @@
+export module RaytracingAS;
+
+import Buffer;
+import VirtualBuffer;
+class MaterialAsset;
+
+export
+{
+
+
+	namespace DX12
+	{
+
+
+		class RaytracingAccelerationStructure
+		{
+
+
+			virtual_gpu_buffer<std::byte>::ptr scratchInfo;
+
+
+			virtual_gpu_buffer<std::byte>::ptr prevResource;
+
+			int current = 0;
+
+			HandleTable handle_table;
+		public:
+			virtual_gpu_buffer<std::byte>::ptr currentResource;
+
+			//GPUBuffer::ptr resource;
+			using ptr = std::shared_ptr<RaytracingAccelerationStructure>;
+			HLSL::RaytracingAccelerationStructure raytracing_handle;
+
+			MaterialAsset* material;
+
+
+			RaytracingAccelerationStructure(std::vector<GeometryDesc>  desc, CommandList::ptr list);
+
+
+			RaytracingAccelerationStructure(std::vector<InstanceDesc> instances);
+
+
+			void update(CommandList::ptr list, UINT size, ResourceAddress address, bool need_rebuild);
+
+			ResourceAddress get_gpu_address() const;
+		};
+
+
+	}
+}

sources/DirectXFramework/DX12/RayTracingAS.h

@@ -1,6 +1,6 @@
 #include "pch_dx.h"
-#include "RayTracingAS.h"
-#include "Queue.h"
+import RaytracingAS;
+import Queue;
 
 DX12::RaytracingAccelerationStructure::RaytracingAccelerationStructure(std::vector<GeometryDesc> desc,
 	CommandList::ptr list)

sources/DirectXFramework/DX12/RayTracingAS.ixx

@@ -1,7 +1,7 @@
 #include "pch_dx.h"
-#include "Swapchain12.h"
 #include "Texture.h"
-#include "Queue.h"
+import SwapChain;
+import Queue;
 
 namespace DX12
 {

sources/DirectXFramework/DX12/RaytracingAS.cpp

@@ -1,7 +1,12 @@
-#pragma once
+export module SwapChain;
+
 import Fence;
 import Descriptors;
 import Vectors;
+import d3d12;
+
+export
+{
 
 namespace DX12
 {
@@ -52,4 +57,5 @@ namespace DX12
 		void resize(ivec2 size);
 
 	};
+}
 }

sources/DirectXFramework/DX12/Swapchain12.cpp

@@ -1,6 +1,6 @@
 #include "pch_dx.h"
 #include "Texture.h"
-#include "Queue.h"
+import Queue;
 
 namespace DX12
 {

sources/DirectXFramework/DX12/Swapchain12.h renamed to sources/DirectXFramework/DX12/Swapchain12.ixx

@@ -1,5 +1,5 @@
 #include "pch_dx.h"
-#include "Queue.h"
+import Queue;
 import Tiling;
 import Constants;
 

sources/DirectXFramework/DX12/Texture.cpp

@@ -7,7 +7,7 @@
 #include "AssetRenderer.h"
 #include "Helpers/MipMapGeneration.h"
 
-#include "DX12/Queue.h"
+import Queue;
 
 using namespace FrameGraph;
 

sources/DirectXFramework/DX12/Tiling.cpp

@@ -3,7 +3,7 @@
 #include "Assets/AssetRenderer.h"
 #include "Materials/universal_material.h"
 
-#include "DX12/Queue.h"
+import Queue;
 
 bool MeshData::init_default_loaders()
 {

sources/RenderSystem/Assets/AssetRenderer.cpp

@@ -6,7 +6,7 @@ import Tasks;
 
 #include "GUI/GUI.h"
 
-#include "DX12/RayTracingAS.h"
+import RaytracingAS;
 import Buffer;
 
 #include "DX12/PipelineState.h"

sources/RenderSystem/Assets/MeshAsset.cpp

@@ -2,7 +2,7 @@
 #include "pch_render.h"
 
 #include "FrameGraph.h"
-#include "DX12/Queue.h"
+import Queue;
 
 
 namespace FrameGraph

sources/RenderSystem/Assets/MeshAsset.h

@@ -1,7 +1,7 @@
 #include "pch_render.h"
 #include "GUI/Elements/Window.h"
 #include "GUI/Renderer/Renderer.h"
-#include "DX12/Queue.h"
+import Queue;
 
 using namespace FrameGraph;
 

sources/RenderSystem/FrameGraph/FrameGraph.cpp

@@ -2,7 +2,7 @@
 import Application;
 #include "GUI/GUI.h"
 
-#include "DX12/Swapchain12.h"
+import SwapChain;
 
 class Window : public DX12::hwnd_provider
 {