Merge pull request #381 from EvgeniiG/master

EvgeniiG · web-flow · commit 3458645986ab · 2017-08-25T15:44:01.000+02:00
Add additional shader passes + clean-up
diff --git a/Assets/ScriptableRenderPipeline/Core/ShaderLibrary/Common.hlsl b/Assets/ScriptableRenderPipeline/Core/ShaderLibrary/Common.hlsl
@@ -553,16 +553,21 @@ float3 ComputeViewSpacePosition(float2 positionSS, float depthRaw, float4x4 invP
     return positionVS.xyz / positionVS.w;
 }
 
+float3 ComputeWorldSpacePosition(float2 positionSS, float depthRaw, float4x4 invViewProjMatrix)
+{
+    float4 positionCS  = ComputeClipSpacePosition(positionSS, depthRaw);
+    float4 hpositionWS = mul(invViewProjMatrix, positionCS);
+    return hpositionWS.xyz / hpositionWS.w;
+}
+
 // From deferred or compute shader
 // depth must be the depth from the raw depth buffer. This allow to handle all kind of depth automatically with the inverse view projection matrix.
 // For information. In Unity Depth is always in range 0..1 (even on OpenGL) but can be reversed.
 void UpdatePositionInput(float depthRaw, float4x4 invViewProjMatrix, float4x4 viewProjMatrix, inout PositionInputs posInput)
 {
     posInput.depthRaw = depthRaw;
 
-    float4 positionCS   = ComputeClipSpacePosition(posInput.positionSS, depthRaw);
-    float4 hpositionWS  = mul(invViewProjMatrix, positionCS);
-    posInput.positionWS = hpositionWS.xyz / hpositionWS.w;
+    posInput.positionWS = ComputeWorldSpacePosition(posInput.positionSS, depthRaw, invViewProjMatrix);
 
     // The compiler should optimize this (less expensive than reconstruct depth VS from depth buffer)
     posInput.depthVS = mul(viewProjMatrix, float4(posInput.positionWS, 1.0)).w;
diff --git a/Assets/ScriptableRenderPipeline/HDRenderPipeline/Lighting/TilePass/Deferred.compute b/Assets/ScriptableRenderPipeline/HDRenderPipeline/Lighting/TilePass/Deferred.compute
@@ -84,7 +84,6 @@
 // deferred material must replace the old one here. If in the future we want to support multiple layout (cause a lot of consistency problem),
 // the deferred shader will require to use multicompile.
 #define UNITY_MATERIAL_LIT // Need to be define before including Material.hlsl
-#include "../../ShaderConfig.cs.hlsl"
 #include "../../ShaderVariables.hlsl"
 #include "../../Lighting/Lighting.hlsl" // This include Material.hlsl
 
diff --git a/Assets/ScriptableRenderPipeline/HDRenderPipeline/Material/Lit/Lit.hlsl b/Assets/ScriptableRenderPipeline/HDRenderPipeline/Material/Lit/Lit.hlsl
@@ -189,20 +189,20 @@ void FillMaterialIdSSSData(float3 baseColor, int subsurfaceProfile, float subsur
 
     bool performPostScatterTexturing = IsBitSet(_TexturingModeFlags, subsurfaceProfile);
 
-    bool enableSssAndTransmission = true;
-
 #if defined(SHADERPASS) && (SHADERPASS == SHADERPASS_LIGHT_TRANSPORT) // In case of GI pass don't modify the diffuseColor
-    enableSssAndTransmission = false;
-#elif (SSS_PASS == 0)
-    enableSssAndTransmission = _EnableSSSAndTransmission != 0;
+    bool enableSssAndTransmission = false;
+#elif defined(SHADERPASS) && (SHADERPASS == SHADERPASS_SUBSURFACE_SCATTERING)
+    bool enableSssAndTransmission = true;
+#else
+    bool enableSssAndTransmission = _EnableSSSAndTransmission != 0;
 #endif
 
     if (enableSssAndTransmission) // If we globally disable SSS effect, don't modify diffuseColor
     {
         // We modify the albedo here as this code is used by all lighting (including light maps and GI).
         if (performPostScatterTexturing)
         {
-        #ifndef SSS_PASS
+        #if !defined(SHADERPASS) || (SHADERPASS != SHADERPASS_SUBSURFACE_SCATTERING)
             bsdfData.diffuseColor = float3(1.0, 1.0, 1.0);
         #endif
         }
diff --git a/Assets/ScriptableRenderPipeline/HDRenderPipeline/Material/Lit/Resources/SubsurfaceScattering.compute b/Assets/ScriptableRenderPipeline/HDRenderPipeline/Material/Lit/Resources/SubsurfaceScattering.compute
@@ -17,7 +17,8 @@
 #define SSS_DEBUG_NORMAL_VS   0
 
 // Do not modify these.
-#define SSS_PASS              1
+#include "../../../ShaderPass/ShaderPass.cs.hlsl"
+#define SHADERPASS            SHADERPASS_SUBSURFACE_SCATTERING
 #define MILLIMETERS_PER_METER 1000
 #define CENTIMETERS_PER_METER 100
 #define GROUP_SIZE_1D         16
diff --git a/Assets/ScriptableRenderPipeline/HDRenderPipeline/Material/Lit/Resources/SubsurfaceScattering.shader b/Assets/ScriptableRenderPipeline/HDRenderPipeline/Material/Lit/Resources/SubsurfaceScattering.shader
@@ -32,7 +32,8 @@ Shader "Hidden/HDRenderPipeline/SubsurfaceScattering"
             #pragma multi_compile _ SSS_FILTER_HORIZONTAL_AND_COMBINE
 
             // Do not modify these.
-            #define SSS_PASS              1
+            #include "../../../ShaderPass/ShaderPass.cs.hlsl"
+            #define SHADERPASS            SHADERPASS_SUBSURFACE_SCATTERING
             #define MILLIMETERS_PER_METER 1000
             #define CENTIMETERS_PER_METER 100
 
diff --git a/Assets/ScriptableRenderPipeline/HDRenderPipeline/ShaderPass/ShaderPass.cs b/Assets/ScriptableRenderPipeline/HDRenderPipeline/ShaderPass/ShaderPass.cs
@@ -17,6 +17,8 @@ public enum ShaderPass
         Velocity,
         Distortion,
         LightTransport,
-        Shadows
+        Shadows,
+        SubsurfaceScattering,
+        VolumetricLighting
     }
 }
diff --git a/Assets/ScriptableRenderPipeline/HDRenderPipeline/ShaderPass/ShaderPass.cs.hlsl b/Assets/ScriptableRenderPipeline/HDRenderPipeline/ShaderPass/ShaderPass.cs.hlsl
@@ -15,6 +15,8 @@
 #define SHADERPASS_DISTORTION (5)
 #define SHADERPASS_LIGHT_TRANSPORT (6)
 #define SHADERPASS_SHADOWS (7)
+#define SHADERPASS_SUBSURFACE_SCATTERING (8)
+#define SHADERPASS_VOLUMETRIC_LIGHTING (9)
 
 
 #endif

Original file line number	Diff line number	Diff line change
`@@ -17,6 +17,8 @@ public enum ShaderPass`
`17`	`17`	`Velocity,`
`18`	`18`	`Distortion,`
`19`	`19`	`LightTransport,`
`20`		`- Shadows`
	`20`	`+ Shadows,`
	`21`	`+ SubsurfaceScattering,`
	`22`	`+ VolumetricLighting`
`21`	`23`	`}`
`22`	`24`	`}`