Initial dxc include functionality

README.md

@@ -7,8 +7,8 @@
 </div>
 
 <p align="center">
-    <img src="Docs/Images/Raster.png" style="width: 40%; height: 40%">
-    <img src="Docs/Images/Pathtracing.png" style="width: 40%; height: 40%">
+    <img src="Docs/Images/Raster.png" style="width: 49%; height: 49%">
+    <img src="Docs/Images/Pathtracing.png" style="width: 49%; height: 49%">
 </p>
 
 ## Current research goal idea

Shaders/RayGenRT.hlsl

@@ -1,4 +1,4 @@
-//#include "Common.hlsl"
+#include "Shared.hlsl"
 
 struct HitInfo
 {
@@ -41,60 +41,6 @@ cbuffer CameraParameters : register(b0)
   uint pad;
 }
 
-uint JenkinsHash(uint x)
-{
-	x += x << 10;
-	x ^= x >> 6;
-	x += x << 3;
-	x ^= x >> 11;
-	x += x << 15;
-	return x;
-}
-
-uint InitRNG(uint2 pixel , uint2 resolution , uint frame) 
-{
-	const uint rng_state = dot(pixel , uint2(1, resolution.x)) ^ JenkinsHash(frame);
-	return JenkinsHash(rng_state);
-}
-
-float UintToFloat(uint x) 
-{
-	return asfloat(0x3f800000 | (x >> 9)) - 1.f;
-}
-
-uint Xorshift(inout uint rng_state)
-{
-	rng_state ^= rng_state << 13;
-	rng_state ^= rng_state >> 17;
-	rng_state ^= rng_state << 5;
-	return rng_state;
-}
-
-float Rand(inout uint rng_state) 
-{
-	return UintToFloat(Xorshift(rng_state));
-}
-
-// input : pixel screen space coordinate, frame number, sample number
-// return : four random numbers
-uint4 Pcg4d(uint4 v)
-{
-	v = v * 1664525u + 1013904223u;
-
-	v.x += v.y * v.w;
-	v.y += v.z * v.x;
-	v.z += v.x * v.y;
-	v.w += v.y * v.z;
-
-	v = v ^ (v >> 16u);
-	v.x += v.y * v.w;
-	v.y += v.z * v.x;
-	v.z += v.x * v.y;
-	v.w += v.y * v.z;
-
-	return v;
-}
-
 // octahedron encoding of normals
 float2 octWrap(float2 v)
 {

Shaders/Shared.hlsl

@@ -0,0 +1,53 @@
+uint JenkinsHash(uint x)
+{
+	x += x << 10;
+	x ^= x >> 6;
+	x += x << 3;
+	x ^= x >> 11;
+	x += x << 15;
+	return x;
+}
+
+uint InitRNG(uint2 pixel , uint2 resolution , uint frame) 
+{
+	const uint rng_state = dot(pixel , uint2(1, resolution.x)) ^ JenkinsHash(frame);
+	return JenkinsHash(rng_state);
+}
+
+float UintToFloat(uint x) 
+{
+	return asfloat(0x3f800000 | (x >> 9)) - 1.f;
+}
+
+uint Xorshift(inout uint rng_state)
+{
+	rng_state ^= rng_state << 13;
+	rng_state ^= rng_state >> 17;
+	rng_state ^= rng_state << 5;
+	return rng_state;
+}
+
+float Rand(inout uint rng_state) 
+{
+	return UintToFloat(Xorshift(rng_state));
+}
+
+// input : pixel screen space coordinate, frame number, sample number
+// return : four random numbers
+uint4 Pcg4d(uint4 v)
+{
+	v = v * 1664525u + 1013904223u;
+
+	v.x += v.y * v.w;
+	v.y += v.z * v.x;
+	v.z += v.x * v.y;
+	v.w += v.y * v.z;
+
+	v = v ^ (v >> 16u);
+	v.x += v.y * v.w;
+	v.y += v.z * v.x;
+	v.z += v.x * v.y;
+	v.w += v.y * v.z;
+
+	return v;
+}

Yasno/Graphics/Material.hpp

@@ -1,8 +1,7 @@
 #pragma once
 
-#include <Renderer/PSO.hpp>
-#include <Renderer/GpuResource.hpp>
-#include <Graphics/SurfaceMaterial.hpp>
+#include <d3dx12.h>
+#include <string>
 
 namespace ysn
 {

Yasno/Graphics/RenderScene.hpp

@@ -7,12 +7,11 @@
 
 #include <Graphics/Material.hpp>
 #include <Graphics/Mesh.hpp>
-#include <Graphics/RenderObjectId.hpp>
 #include <Yasno/Lights.hpp>
 #include <Yasno/CameraController.hpp>
-#include <Renderer/GpuResource.hpp>
 #include <Renderer/GpuTexture.hpp>
 #include <Renderer/GpuBuffer.hpp>
+#include <Graphics/ShaderSharedStructs.h>
 
 namespace ysn
 {
@@ -47,16 +46,6 @@ namespace ysn
 		std::vector<D3D12_SAMPLER_DESC> sampler_descs;
 	};
 
-	// Per instance data for rendering, this can be split into smaller parts
-	YSN_SHADER_STRUCT RenderInstanceData
-	{
-		DirectX::XMMATRIX model_matrix;
-		int32_t material_id;
-		int32_t vertices_before;
-		int32_t indices_before; // offset
-		int32_t pad; 
-	};
-
 	struct RenderScene
 	{
 		std::shared_ptr<Camera> camera;