vsirvent · vsirvent · Nov 22, 2024 · Nov 23, 2024 · Nov 23, 2024 · Nov 23, 2024
diff --git a/Engine/Engine.vcxproj b/Engine/Engine.vcxproj
@@ -281,6 +281,8 @@
     <None Include="Engine\Core\Shaders\Common\Utils.hlsli" />
     <None Include="Engine\Core\Shaders\GUI\GUICommon.hlsli" />
     <None Include="Engine\Core\Shaders\MainRender\MainRenderPS.hlsli" />
+    <None Include="Engine\Core\Shaders\RayTrace\RayScreenSolver.hlsli" />
+    <None Include="Engine\Core\Shaders\RayTrace\RayWorldSolver.hlsli" />
     <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
@@ -304,6 +306,11 @@
       <ShaderType Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Compute</ShaderType>
       <ShaderModel Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">4.0</ShaderModel>
     </FxCompile>
+    <FxCompile Include="Engine\Core\Shaders\ComputeShaders\HiZDownSample.hlsl">
+      <ShaderType Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Compute</ShaderType>
+      <ShaderModel Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">5.0</ShaderModel>
+      <ShaderType Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Compute</ShaderType>
+    </FxCompile>
     <FxCompile Include="Engine\Core\Shaders\ComputeShaders\InitDustCS.hlsl">
       <ShaderType Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Compute</ShaderType>
       <ShaderModel Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">5.0</ShaderModel>
@@ -544,16 +551,6 @@
       <ShaderType Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Compute</ShaderType>
       <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">/O2 /Gpp %(AdditionalOptions)</AdditionalOptions>
     </FxCompile>
-    <FxCompile Include="Engine\Core\Shaders\RayTrace\DispersionCS.hlsl">
-      <ShaderType Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Compute</ShaderType>
-      <ShaderModel Condition="'$(Configuration)|$(Platform)'=='Release|x64'">5.0</ShaderModel>
-      <ShaderType Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Compute</ShaderType>
-      <ShaderModel Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">4.0</ShaderModel>
-      <ShaderType Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Compute</ShaderType>
-      <ShaderModel Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">5.0</ShaderModel>
-      <ShaderType Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Compute</ShaderType>
-      <ShaderModel Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">4.0</ShaderModel>
-    </FxCompile>
     <FxCompile Include="Engine\Core\Shaders\RayTrace\GIRayTraceCS.hlsl">
       <ShaderType Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Compute</ShaderType>
       <ShaderModel Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">5.0</ShaderModel>
@@ -583,6 +580,26 @@
       <ShaderType Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Compute</ShaderType>
       <ShaderModel Condition="'$(Configuration)|$(Platform)'=='Release|x64'">5.0</ShaderModel>
     </FxCompile>
+    <FxCompile Include="Engine\Core\Shaders\RayTrace\RayGIScreenSolverCS.hlsl">
+      <ShaderType Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Compute</ShaderType>
+      <ShaderType Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Compute</ShaderType>
+      <ShaderModel Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">5.0</ShaderModel>
+    </FxCompile>
+    <FxCompile Include="Engine\Core\Shaders\RayTrace\RayGIWorldSolverCS.hlsl">
+      <ShaderType Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Compute</ShaderType>
+      <ShaderModel Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">5.0</ShaderModel>
+      <ShaderType Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Compute</ShaderType>
+    </FxCompile>
+    <FxCompile Include="Engine\Core\Shaders\RayTrace\RayReflexScreenSolverCS.hlsl">
+      <ShaderType Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Compute</ShaderType>
+      <ShaderType Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Compute</ShaderType>
+      <ShaderModel Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">5.0</ShaderModel>
+    </FxCompile>
+    <FxCompile Include="Engine\Core\Shaders\RayTrace\RayReflexWorldSolverCS.hlsl">
+      <ShaderType Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Compute</ShaderType>
+      <ShaderType Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Compute</ShaderType>
+      <ShaderModel Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">5.0</ShaderModel>
+    </FxCompile>
     <FxCompile Include="Engine\Core\Shaders\RayTrace\RayTraceCS.hlsl">
       <ShaderType Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Compute</ShaderType>
       <ShaderModel Condition="'$(Configuration)|$(Platform)'=='Release|x64'">5.0</ShaderModel>

diff --git a/Engine/Engine.vcxproj.filters b/Engine/Engine.vcxproj.filters
@@ -72,6 +72,12 @@
     <Filter Include="Engine\Core\Shaders\DoFBoke">
       <UniqueIdentifier>{bf606861-2003-454a-ab74-7da83189dc71}</UniqueIdentifier>
     </Filter>
+    <Filter Include="Engine\Core\Shaders\RayTrace\GI">
+      <UniqueIdentifier>{9096dc46-36a8-4493-a27e-62a0f4af9708}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Engine\Core\Shaders\RayTrace\Reflex">
+      <UniqueIdentifier>{2a4aab81-82e6-49c4-87e3-12d55f5bcc26}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="Engine\Core\DXCore.cpp">
@@ -436,6 +442,12 @@
     <None Include="Engine\Core\Shaders\Common\RayFunctions.hlsli">
       <Filter>Engine\Core\Shaders\Common</Filter>
     </None>
+    <None Include="Engine\Core\Shaders\RayTrace\RayScreenSolver.hlsli">
+      <Filter>Engine\Core\Shaders\RayTrace</Filter>
+    </None>
+    <None Include="Engine\Core\Shaders\RayTrace\RayWorldSolver.hlsli">
+      <Filter>Engine\Core\Shaders\RayTrace</Filter>
+    </None>
   </ItemGroup>
   <ItemGroup>
     <FxCompile Include="Engine\Core\Shaders\DepthRender\DepthPS.hlsl">
@@ -534,9 +546,6 @@
     <FxCompile Include="Engine\Core\Shaders\Particles\FireBall2ParticlePS.hlsl">
       <Filter>Engine\Core\Shaders\Particles</Filter>
     </FxCompile>
-    <FxCompile Include="Engine\Core\Shaders\RayTrace\GIRayTraceCS.hlsl">
-      <Filter>Engine\Core\Shaders\RayTrace</Filter>
-    </FxCompile>
     <FxCompile Include="Engine\Core\Shaders\ComputeShaders\BlurCS.hlsl">
       <Filter>Engine\Core\Shaders\ComputeShaders</Filter>
     </FxCompile>
@@ -576,23 +585,38 @@
     <FxCompile Include="Engine\Core\Shaders\ComputeShaders\MotionCS.hlsl">
       <Filter>Engine\Core\Shaders\ComputeShaders</Filter>
     </FxCompile>
-    <FxCompile Include="Engine\Core\Shaders\RayTrace\DenoiserCS.hlsl">
-      <Filter>Engine\Core\Shaders\RayTrace</Filter>
-    </FxCompile>
-    <FxCompile Include="Engine\Core\Shaders\RayTrace\DispersionCS.hlsl">
-      <Filter>Engine\Core\Shaders\RayTrace</Filter>
-    </FxCompile>
     <FxCompile Include="Engine\Core\Shaders\ComputeShaders\CopyTexturesCS.hlsl">
       <Filter>Engine\Core\Shaders\ComputeShaders</Filter>
     </FxCompile>
+    <FxCompile Include="Engine\Core\Shaders\ComputeShaders\HiZDownSample.hlsl">
+      <Filter>Engine\Core\Shaders\ComputeShaders</Filter>
+    </FxCompile>
     <FxCompile Include="Engine\Core\Shaders\Radiance\GIAverageCS.hlsl">
-      <Filter>Engine\Core\Shaders\RayTrace</Filter>
+      <Filter>Engine\Core\Shaders\RayTrace\GI</Filter>
     </FxCompile>
     <FxCompile Include="Engine\Core\Shaders\RayTrace\GICalcWeightsCS.hlsl">
-      <Filter>Engine\Core\Shaders\RayTrace</Filter>
+      <Filter>Engine\Core\Shaders\RayTrace\GI</Filter>
+    </FxCompile>
+    <FxCompile Include="Engine\Core\Shaders\RayTrace\GIRayTraceCS.hlsl">
+      <Filter>Engine\Core\Shaders\RayTrace\GI</Filter>
+    </FxCompile>
+    <FxCompile Include="Engine\Core\Shaders\RayTrace\RayGIScreenSolverCS.hlsl">
+      <Filter>Engine\Core\Shaders\RayTrace\GI</Filter>
+    </FxCompile>
+    <FxCompile Include="Engine\Core\Shaders\RayTrace\RayGIWorldSolverCS.hlsl">
+      <Filter>Engine\Core\Shaders\RayTrace\GI</Filter>
+    </FxCompile>
+    <FxCompile Include="Engine\Core\Shaders\RayTrace\DenoiserCS.hlsl">
+      <Filter>Engine\Core\Shaders\RayTrace\Reflex</Filter>
+    </FxCompile>
+    <FxCompile Include="Engine\Core\Shaders\RayTrace\RayReflexScreenSolverCS.hlsl">
+      <Filter>Engine\Core\Shaders\RayTrace\Reflex</Filter>
     </FxCompile>
     <FxCompile Include="Engine\Core\Shaders\RayTrace\RayTraceCS.hlsl">
-      <Filter>Engine\Core\Shaders\RayTrace</Filter>
+      <Filter>Engine\Core\Shaders\RayTrace\Reflex</Filter>
+    </FxCompile>
+    <FxCompile Include="Engine\Core\Shaders\RayTrace\RayReflexWorldSolverCS.hlsl">
+      <Filter>Engine\Core\Shaders\RayTrace\Reflex</Filter>
     </FxCompile>
   </ItemGroup>
 </Project>
diff --git a/Engine/Engine/Components/Lights.h b/Engine/Engine/Components/Lights.h
@@ -122,11 +122,14 @@ namespace HotBite {
 				D3D11_VIEWPORT shadow_vp = {};
 
 			public:
+
 				DirectionalLight();
 				DirectionalLight(const DirectionalLight& other) :DirectionalLight() {
 					assert(!other.init && "Non copyable after init.");
 					*this = other;
 				}
+
+				void SetDirty() { dirty = true; }
 				void SetPosition(const float3& pos) { data.position = pos; }
 				const float3& GetPosition() const { return data.position; }
 				void SetFog(bool enable) {

diff --git a/Engine/Engine/Core/BVH.cpp b/Engine/Engine/Core/BVH.cpp
@@ -171,7 +171,14 @@ namespace HotBite {
 				int right_count = 0;
 				int left_offset = 0;
 				int right_offset = 0;
-				if (LENGHT_F3(extent) > FLT_EPSILON)
+
+				if (nidx.index_count == 2) {
+					left_count = 1;
+					right_count = 1;
+					left_offset = nidx.index_offset;
+					right_offset = left_offset + left_count;
+
+				} else if (LENGHT_F3(extent) > FLT_EPSILON)
 				{
 					// in-place partition
 					int i = nidx.index_offset;

diff --git a/Engine/Engine/Core/BVH.h b/Engine/Engine/Core/BVH.h
@@ -140,7 +140,8 @@ namespace HotBite {
 					return size;
 				}
 
-				HRESULT Prepare(int size, DXGI_FORMAT format) {
+				HRESULT Prepare(int size) {
+					Unprepare();
 					HRESULT hr = S_OK;
 					ID3D11Device* device = Core::DXCore::Get()->device;
 
@@ -155,53 +156,35 @@ namespace HotBite {
 					bd.ByteWidth = data_size;
 					bd.CPUAccessFlags = 0;
 					bd.BindFlags = D3D11_BIND_SHADER_RESOURCE | D3D11_BIND_UNORDERED_ACCESS;
-					bd.MiscFlags = D3D11_RESOURCE_MISC_BUFFER_ALLOW_RAW_VIEWS;
+					bd.MiscFlags = D3D11_RESOURCE_MISC_BUFFER_STRUCTURED;
 					bd.StructureByteStride = sizeof(T);
 
 					uint8_t* nullData = new uint8_t[data_size];
 					memset(nullData, 0, data_size);
 					initialData.pSysMem = nullData;
 					hr = device->CreateBuffer(&bd, &initialData, &buffer);
+					assert(SUCCEEDED(hr));
 					delete[] nullData;
-					if (FAILED(hr)) { goto end; }
-
-					srvDesc.Format = format;
+
+					srvDesc.Format = DXGI_FORMAT_UNKNOWN;
 					srvDesc.ViewDimension = D3D11_SRV_DIMENSION_BUFFER;
 					srvDesc.Buffer.FirstElement = 0;
 					srvDesc.Buffer.NumElements = size;
 					hr = device->CreateShaderResourceView(buffer, &srvDesc, &srv);
-
+					assert(SUCCEEDED(hr));
 					srv->GetResource(&resource);
 
 					uav_desc.ViewDimension = D3D11_UAV_DIMENSION_BUFFER;
-					uav_desc.Format = format;
+					uav_desc.Format = DXGI_FORMAT_UNKNOWN;
 					uav_desc.Buffer.FirstElement = 0;
 					uav_desc.Buffer.NumElements = size;
 					hr = device->CreateUnorderedAccessView(resource, &uav_desc, &uav);
+					assert(SUCCEEDED(hr));
+
 					this->size = size;
-
-				end:
 					return hr;
 				}
 
-				void Clear(T val, uint32_t start = 0, uint32_t len = 0) {
-					return;
-					if (len == 0) {
-						len = (uint32_t)size;
-					}
-					if (len > 0 && start < (uint32_t)size) {
-						ID3D11DeviceContext* context = Core::DXCore::Get()->context;
-						D3D11_MAPPED_SUBRESOURCE resource;
-						context->Map(buffer, 0, D3D11_MAP_WRITE, 0, &resource);
-						T* data = (T*)resource.pData;
-						for (uint32_t i = start; i < len; ++i) {
-							data[i] = val;
-						}
-						context->Unmap(buffer, 0);
-					}
-				}
-
-
 				HRESULT Unprepare() {
 					ID3D11DeviceContext* context = Core::DXCore::Get()->context;
 					HRESULT hr = S_OK;
@@ -221,8 +204,8 @@ namespace HotBite {
 					return hr;
 				}
 
-				ID3D11ShaderResourceView* SRV() const {
-					return srv;
+				ID3D11ShaderResourceView*const* SRV() const {
+					return &srv;
 				}
 
 				ID3D11UnorderedAccessView*const* UAV() const {

diff --git a/Engine/Engine/Core/DXCore.cpp b/Engine/Engine/Core/DXCore.cpp
@@ -38,6 +38,126 @@ using namespace HotBite::Engine::ECS;
 DXCore* DXCore::DXCoreInstance = nullptr;
 Direct2D* Direct2D::instance = nullptr;
 
+#include <d3d11.h>
+#include <d3d11on12.h>
+#include <d3d12.h>
+
+#include <iostream>
+
+
+HRESULT _D3D11CreateDevice(
+	IDXGIAdapter* pAdapter,
+	D3D_DRIVER_TYPE         DriverType,
+	HMODULE                 Software,
+	UINT                    Flags,
+	const D3D_FEATURE_LEVEL* pFeatureLevels,
+	UINT                    FeatureLevels,
+	UINT                    SDKVersion,
+	ID3D11Device** ppDevice,
+	D3D_FEATURE_LEVEL* pFeatureLevel,
+	ID3D11DeviceContext** ppImmediateContext,
+	ID3D12Device** ppd3d12device) {
+
+
+	HRESULT hr = D3D12CreateDevice(pAdapter,
+		D3D_FEATURE_LEVEL_12_0,
+		IID_PPV_ARGS(ppd3d12device));
+
+	if (FAILED(hr))
+		return hr;
+
+	D3D12_COMMAND_QUEUE_DESC desc;
+	desc.Type = D3D12_COMMAND_LIST_TYPE_DIRECT;
+	desc.Priority = D3D12_COMMAND_QUEUE_PRIORITY_NORMAL;
+	desc.Flags = D3D12_COMMAND_QUEUE_FLAG_NONE;
+	desc.NodeMask = 0;
+
+	ID3D12CommandQueue* d3d12queue;
+
+	hr = (*ppd3d12device)->CreateCommandQueue(&desc,
+		IID_PPV_ARGS(&d3d12queue));
+
+	if (FAILED(hr))
+		return hr;
+
+	hr = D3D11On12CreateDevice((*ppd3d12device),
+		Flags, pFeatureLevels, FeatureLevels,
+		reinterpret_cast<IUnknown**>(&d3d12queue),
+		1, 0, ppDevice, ppImmediateContext, pFeatureLevel);
+
+	return hr;
+}
+
+
+HRESULT _D3D11CreateDeviceAndSwapChain(
+	IDXGIAdapter* pAdapter,
+	D3D_DRIVER_TYPE       DriverType,
+	HMODULE               Software,
+	UINT                  Flags,
+	const D3D_FEATURE_LEVEL* pFeatureLevels,
+	UINT                  FeatureLevels,
+	UINT                  SDKVersion,
+	const DXGI_SWAP_CHAIN_DESC* pSwapChainDesc,
+	IDXGISwapChain** ppSwapChain,
+	ID3D11Device** ppDevice,
+	D3D_FEATURE_LEVEL* pFeatureLevel,
+	ID3D11DeviceContext** ppImmediateContext,
+	ID3D12Device** ppd3d12device) {
+	if (ppSwapChain && !pSwapChainDesc)
+		return E_INVALIDARG;
+
+	ID3D11Device* d3d11Device;
+	ID3D11DeviceContext* d3d11Context;
+
+	HRESULT status = _D3D11CreateDevice(pAdapter, DriverType,
+		Software, Flags, pFeatureLevels, FeatureLevels,
+		SDKVersion, &d3d11Device, pFeatureLevel, &d3d11Context, ppd3d12device);
+
+	if (FAILED(status))
+		return status;
+
+	if (ppSwapChain) {
+		IDXGIDevice* dxgiDevice = nullptr;
+		IDXGIAdapter* dxgiAdapter = nullptr;
+		IDXGIFactory* dxgiFactory = nullptr;
+
+		HRESULT hr = d3d11Device->QueryInterface(IID_PPV_ARGS(&dxgiDevice));
+
+		if (FAILED(hr))
+			return E_INVALIDARG;
+
+		hr = dxgiDevice->GetParent(IID_PPV_ARGS(&dxgiAdapter));
+		dxgiDevice->Release();
+
+		if (FAILED(hr))
+			return E_INVALIDARG;
+
+		hr = dxgiAdapter->GetParent(IID_PPV_ARGS(&dxgiFactory));
+		dxgiAdapter->Release();
+
+		if (FAILED(hr))
+			return E_INVALIDARG;
+
+		DXGI_SWAP_CHAIN_DESC desc = *pSwapChainDesc;
+		hr = dxgiFactory->CreateSwapChain(d3d11Device, &desc, ppSwapChain);
+		dxgiFactory->Release();
+
+		if (FAILED(hr))
+			return hr;
+	}
+
+	if (ppDevice != nullptr)
+		*ppDevice = d3d11Device;
+	else
+		d3d11Device->Release();
+
+	if (ppImmediateContext != nullptr)
+		*ppImmediateContext = d3d11Context;
+	else
+		d3d11Context->Release();
+
+	return S_OK;
+}
 
 LRESULT DXCore::WindowProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
 {
@@ -122,6 +242,7 @@ DXCore::~DXCore()
 	}
 #endif
 	if (device) { device->Release(); }
+	if (d12device) { d12device->Release(); }
 }
 
 HRESULT DXCore::InitWindow(HWND parent)