Define GetDiffuseOrDefaultColor() for the Unlit BSDF to fix compilati… (

#39) * Define GetDiffuseOrDefaultColor() for the Unlit BSDF to fix compilation errors in Unlit shaders in the DynamicGIDataSample pass. * Define DynamicGIDataSample pass for AxF and Unlit shaders. Remove now unnecessary #if UNLIT define in ShaderPassDynamicGIDataSample. Co-authored-by: pastasfuture <nickb@bonfirestudios.com>
Unity-Technologies · Oct 6, 2021 · 84a6aa6 · 84a6aa6
1 parent ff9abbb
commit 84a6aa6
Show file tree

Hide file tree

Showing 4 changed files with 57 additions and 4 deletions.
diff --git a/com.unity.render-pipelines.high-definition/Runtime/Material/AxF/AxF.shader b/com.unity.render-pipelines.high-definition/Runtime/Material/AxF/AxF.shader
@@ -318,6 +318,32 @@ Shader "HDRP/AxF"
             ENDHLSL
         }
 
+        Pass
+        {
+            Name "DynamicGIDataSample"
+            Tags{ "LightMode" = "DynamicGIDataSample" }
+
+            Cull Off
+
+            HLSLPROGRAM
+
+            #pragma only_renderers d3d11 playstation xboxone xboxseries vulkan metal switch
+
+            #pragma multi_compile _ HIGH_DEFINITION_EXTENSIONS_ENABLED
+
+            #define SHADERPASS SHADERPASS_DYNAMIC_GIDATA_SAMPLE
+            #include "Packages/com.unity.render-pipelines.high-definition/Runtime/Material/Material.hlsl"
+            #include "Packages/com.unity.render-pipelines.high-definition/Runtime/Material/AxF/AxF.hlsl"
+            #include "Packages/com.unity.render-pipelines.high-definition/Runtime/Material/AxF/ShaderPass/AxFSharePass.hlsl"
+            #include "Packages/com.unity.render-pipelines.high-definition/Runtime/Material/AxF/AxFData.hlsl"
+            #include "Packages/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/ShaderPass/ShaderPassDynamicGIDataSample.hlsl"
+
+            #pragma vertex Vert
+            #pragma fragment Frag
+
+            ENDHLSL
+        }
+
         Pass
         {
             Name "ShadowCaster"

diff --git a/com.unity.render-pipelines.high-definition/Runtime/Material/Unlit/Unlit.hlsl b/com.unity.render-pipelines.high-definition/Runtime/Material/Unlit/Unlit.hlsl
@@ -60,3 +60,8 @@ LightTransportData GetLightTransportData(SurfaceData surfaceData, BuiltinData bu
 
     return lightTransportData;
 }
+
+float4 GetDiffuseOrDefaultColor(BSDFData bsdfData, float replace)
+{
+    return float4(bsdfData.color, 0.0);
+}
diff --git a/com.unity.render-pipelines.high-definition/Runtime/Material/Unlit/Unlit.shader b/com.unity.render-pipelines.high-definition/Runtime/Material/Unlit/Unlit.shader
@@ -367,6 +367,32 @@ Shader "HDRP/Unlit"
             ENDHLSL
         }
 
+        Pass
+        {
+            Name "DynamicGIDataSample"
+            Tags{ "LightMode" = "DynamicGIDataSample" }
+
+            Cull Off
+
+            HLSLPROGRAM
+
+            #pragma only_renderers d3d11 playstation xboxone xboxseries vulkan metal switch
+
+            #pragma multi_compile _ HIGH_DEFINITION_EXTENSIONS_ENABLED
+
+            #define SHADERPASS SHADERPASS_DYNAMIC_GIDATA_SAMPLE
+            #include "Packages/com.unity.render-pipelines.high-definition/Runtime/Material/Material.hlsl"
+            #include "Packages/com.unity.render-pipelines.high-definition/Runtime/Material/Unlit/Unlit.hlsl"
+            #include "Packages/com.unity.render-pipelines.high-definition/Runtime/Material/Unlit/ShaderPass/UnlitSharePass.hlsl"
+            #include "Packages/com.unity.render-pipelines.high-definition/Runtime/Material/Unlit/UnlitData.hlsl"
+            #include "Packages/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/ShaderPass/ShaderPassDynamicGIDataSample.hlsl"
+
+            #pragma vertex Vert
+            #pragma fragment Frag
+
+            ENDHLSL
+        }
+
         Pass
         {
             Name "ShadowCaster"

diff --git a/...ines.high-definition/Runtime/RenderPipeline/ShaderPass/ShaderPassDynamicGIDataSample.hlsl b/...ines.high-definition/Runtime/RenderPipeline/ShaderPass/ShaderPassDynamicGIDataSample.hlsl
@@ -98,12 +98,8 @@ void Frag(  Varyings varInput,
         GetSurfaceAndBuiltinData(input, V, posInput, surfaceData, builtinData);
 
         float3 outAlbedo = float3(0,1,0);
-#ifdef UNLIT
-        outAlbedo.xyz = surfaceData.color;
-#else
         BSDFData bsdfData = ConvertSurfaceDataToBSDFData(input.positionSS.xy, surfaceData);
         outAlbedo.xyz = GetDiffuseOrDefaultColor(bsdfData, 1.0).xyz;
-#endif
 
         // Output
         ExtraDataRequestOutput output;