Refactor: shaders

matt77hias · Mar 23, 2018 · 136eae2 · 136eae2
1 parent 74eff77
commit 136eae2
Show file tree

Hide file tree

Showing 112 changed files with 777 additions and 662 deletions.
diff --git a/MAGE/Shaders.vcxproj b/MAGE/Shaders.vcxproj
@@ -1933,6 +1933,7 @@
     </FxCompile>
     <None Include="Shaders\shaders\hlsl_syntax.hlsli" />
     <None Include="Shaders\shaders\lighting.hlsli" />
+    <None Include="Shaders\shaders\material.hlsli" />
     <None Include="Shaders\shaders\math.hlsli" />
     <FxCompile Include="Shaders\shaders\falsecolor\constant_color_PS.hlsl">
       <EntryPointName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">PS</EntryPointName>

diff --git a/MAGE/Shaders.vcxproj.filters b/MAGE/Shaders.vcxproj.filters
@@ -537,6 +537,9 @@
     <None Include="Shaders\shaders\vct.hlsli">
       <Filter>Shader Files</Filter>
     </None>
+    <None Include="Shaders\shaders\material.hlsli">
+      <Filter>Shader Files</Filter>
+    </None>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="Shaders\src\hlsl.hpp">

diff --git a/MAGE/Shaders/shaders/aa/aa_preprocess_CS.hlsl b/MAGE/Shaders/shaders/aa/aa_preprocess_CS.hlsl
@@ -11,6 +11,13 @@
 #include "global.hlsli"
 #include "tone_mapping.hlsli"
 
+//-----------------------------------------------------------------------------
+// Engine Defines
+//-----------------------------------------------------------------------------
+#ifndef GROUP_SIZE
+	#define GROUP_SIZE GROUP_SIZE_2D_DEFAULT
+#endif
+
 //-----------------------------------------------------------------------------
 // SRVs
 //-----------------------------------------------------------------------------
@@ -24,11 +31,6 @@ RW_TEXTURE_2D(g_output_image_texture, float4, SLOT_UAV_IMAGE);
 //-----------------------------------------------------------------------------
 // Compute Shader
 //-----------------------------------------------------------------------------
-
-#ifndef GROUP_SIZE
-	#define GROUP_SIZE GROUP_SIZE_2D_DEFAULT
-#endif
-
 [numthreads(GROUP_SIZE, GROUP_SIZE, 1)]
 void CS(uint3 thread_id : SV_DispatchThreadID) {
 

diff --git a/MAGE/Shaders/shaders/aa/msaa_resolve_CS.hlsl b/MAGE/Shaders/shaders/aa/msaa_resolve_CS.hlsl
@@ -11,6 +11,13 @@
 #include "global.hlsli"
 #include "tone_mapping.hlsli"
 
+//-----------------------------------------------------------------------------
+// Engine Defines
+//-----------------------------------------------------------------------------
+#ifndef GROUP_SIZE
+	#define GROUP_SIZE GROUP_SIZE_2D_DEFAULT
+#endif
+
 //-----------------------------------------------------------------------------
 // SRVs
 //-----------------------------------------------------------------------------
@@ -28,11 +35,6 @@ RW_TEXTURE_2D(g_output_depth_texture,  float,  SLOT_UAV_DEPTH);
 //-----------------------------------------------------------------------------
 // Compute Shader
 //-----------------------------------------------------------------------------
-
-#ifndef GROUP_SIZE
-	#define GROUP_SIZE GROUP_SIZE_2D_DEFAULT
-#endif
-
 [numthreads(GROUP_SIZE, GROUP_SIZE, 1)]
 void CS(uint3 thread_id : SV_DispatchThreadID) {
 

diff --git a/MAGE/Shaders/shaders/aa/ssaa_resolve_CS.hlsl b/MAGE/Shaders/shaders/aa/ssaa_resolve_CS.hlsl
@@ -11,6 +11,13 @@
 #include "global.hlsli"
 #include "tone_mapping.hlsli"
 
+//-----------------------------------------------------------------------------
+// Engine Defines
+//-----------------------------------------------------------------------------
+#ifndef GROUP_SIZE
+	#define GROUP_SIZE GROUP_SIZE_2D_DEFAULT
+#endif
+
 //-----------------------------------------------------------------------------
 // SRVs
 //-----------------------------------------------------------------------------
@@ -28,11 +35,6 @@ RW_TEXTURE_2D(g_output_depth_texture,  float,  SLOT_UAV_DEPTH);
 //-----------------------------------------------------------------------------
 // Compute Shader
 //-----------------------------------------------------------------------------
-
-#ifndef GROUP_SIZE
-	#define GROUP_SIZE GROUP_SIZE_2D_DEFAULT
-#endif
-
 [numthreads(GROUP_SIZE, GROUP_SIZE, 1)]
 void CS(uint3 thread_id : SV_DispatchThreadID) {
 

diff --git a/MAGE/Shaders/shaders/backbuffer/back_buffer.hlsli b/MAGE/Shaders/shaders/backbuffer/back_buffer.hlsli
@@ -3,15 +3,15 @@
 //-----------------------------------------------------------------------------
 // Defines			                        | Default
 //-----------------------------------------------------------------------------
-// TONE_MAP_COMPONENT                       | ToneMap_Uncharted
 // MSAA_AS_SSAA                             | not defined
+// TONE_MAP_FUNCTION                        | ToneMap_Uncharted
 
 //-----------------------------------------------------------------------------
 // Engine Includes
 //-----------------------------------------------------------------------------
 #include "global.hlsli"
-#include "tone_mapping.hlsli"
 #include "color.hlsli"
+#include "tone_mapping.hlsli"
 
 //-----------------------------------------------------------------------------
 // SRVs
@@ -29,7 +29,7 @@ float4 PS(float4 input : SV_Position) : SV_Target {
 #endif // MSAA_AS_SSAA
 
 	const float4 hdr = g_image_texture[input.xy];
-	const float4 ldr = saturate(TONE_MAP_COMPONENT(hdr));
+	const float4 ldr = saturate(TONE_MAP_FUNCTION(hdr));
 
 	return LinearToGamma(ldr, g_inv_gamma);
 }
diff --git a/MAGE/Shaders/shaders/backbuffer/back_buffer_aces_filmic_PS.hlsl b/MAGE/Shaders/shaders/backbuffer/back_buffer_aces_filmic_PS.hlsl
@@ -1,5 +1,5 @@
 //-----------------------------------------------------------------------------
 // Engine Includes
 //-----------------------------------------------------------------------------
-#define TONE_MAP_COMPONENT ToneMap_ACESFilmic
+#define TONE_MAP_FUNCTION ToneMap_ACESFilmic
 #include "backbuffer\back_buffer.hlsli"
diff --git a/MAGE/Shaders/shaders/backbuffer/back_buffer_reinhard_PS.hlsl b/MAGE/Shaders/shaders/backbuffer/back_buffer_reinhard_PS.hlsl
@@ -1,5 +1,5 @@
 //-----------------------------------------------------------------------------
 // Engine Includes
 //-----------------------------------------------------------------------------
-#define TONE_MAP_COMPONENT ToneMap_Reinhard
+#define TONE_MAP_FUNCTION ToneMap_Reinhard
 #include "backbuffer\back_buffer.hlsli"
diff --git a/MAGE/Shaders/shaders/backbuffer/back_buffer_uncharted_PS.hlsl b/MAGE/Shaders/shaders/backbuffer/back_buffer_uncharted_PS.hlsl
@@ -1,5 +1,5 @@
 //-----------------------------------------------------------------------------
 // Engine Includes
 //-----------------------------------------------------------------------------
-#define TONE_MAP_COMPONENT ToneMap_Uncharted
+#define TONE_MAP_FUNCTION ToneMap_Uncharted
 #include "backbuffer\back_buffer.hlsli"