Skip to content

Commit

Permalink
Per-stage shader keywords in HDRP -bis #2996
Browse files Browse the repository at this point in the history
  • Loading branch information
@sebastienlagarde
sebastienlagarde committed Jan 19, 2021
1 parent f315cf7 commit 4f1739c
Show file tree
Hide file tree
Showing 8 changed files with 22 additions and 23 deletions.
1 change: 0 additions & 1 deletion com.unity.render-pipelines.high-definition/Editor/Material/ShaderGraph/HDTarget.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1050,7 +1050,6 @@ static class CoreKeywordDescriptors
type = KeywordType.Boolean,
definition = KeywordDefinition.MultiCompile,
scope = KeywordScope.Global,
stages = KeywordShaderStage.Fragment,
};

public static KeywordDescriptor ScreenSpaceShadow = new KeywordDescriptor()
Expand Down
8 changes: 4 additions & 4 deletions com.unity.render-pipelines.high-definition/Runtime/Material/AxF/AxF.shader
View file
Original file line number Diff line number Diff line change
Expand Up @@ -492,7 +492,7 @@ Shader "HDRP/AxF"
#pragma multi_compile _ LIGHTMAP_ON
#pragma multi_compile _ DIRLIGHTMAP_COMBINED
#pragma multi_compile _ DYNAMICLIGHTMAP_ON
#pragma multi_compile_fragment _ SHADOWS_SHADOWMASK
#pragma multi_compile _ SHADOWS_SHADOWMASK
#pragma multi_compile_fragment PROBE_VOLUMES_OFF PROBE_VOLUMES_L1 PROBE_VOLUMES_L2
#pragma multi_compile_fragment SCREEN_SPACE_SHADOWS_OFF SCREEN_SPACE_SHADOWS_ON
// Setup DECALS_OFF so the shader stripper can remove variants
Expand Down Expand Up @@ -637,7 +637,7 @@ Shader "HDRP/AxF"
#include "Packages/com.unity.render-pipelines.high-definition/Runtime/Lighting/LightLoop/LightLoopDef.hlsl"
#define HAS_LIGHTLOOP
#include "Packages/com.unity.render-pipelines.high-definition/Runtime/Material/AxF/AxF.hlsl"
#include "Packages/com.unity.render-pipelines.high-definition/Runtime/Material/AxF/AxFRaytracing.hlsl"
#include "Packages/com.unity.render-pipelines.high-definition/Runtime/Material/AxF/AxFRayTracing.hlsl"
#include "Packages/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/Raytracing/Shaders/RaytracingLightLoop.hlsl"
#include "Packages/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/Raytracing/Shaders/RayTracingCommon.hlsl"
#include "Packages/com.unity.render-pipelines.high-definition/Runtime/Material/AxF/AxFData.hlsl"
Expand Down Expand Up @@ -679,7 +679,7 @@ Shader "HDRP/AxF"
#include "Packages/com.unity.render-pipelines.high-definition/Runtime/Lighting/LightLoop/LightLoopDef.hlsl"
#define HAS_LIGHTLOOP
#include "Packages/com.unity.render-pipelines.high-definition/Runtime/Material/AxF/AxF.hlsl"
#include "Packages/com.unity.render-pipelines.high-definition/Runtime/Material/AxF/AxFRaytracing.hlsl"
#include "Packages/com.unity.render-pipelines.high-definition/Runtime/Material/AxF/AxFRayTracing.hlsl"
#include "Packages/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/Raytracing/Shaders/RaytracingLightLoop.hlsl"
#include "Packages/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/Raytracing/Shaders/RayTracingCommon.hlsl"
#include "Packages/com.unity.render-pipelines.high-definition/Runtime/Material/AxF/AxFData.hlsl"
Expand Down Expand Up @@ -719,7 +719,7 @@ Shader "HDRP/AxF"
#include "Packages/com.unity.render-pipelines.high-definition/Runtime/Material/StandardLit/StandardLit.hlsl"
#include "Packages/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/Raytracing/Shaders/RayTracingCommon.hlsl"
#include "Packages/com.unity.render-pipelines.high-definition/Runtime/Material/AxF/AxFData.hlsl"
#include "Packages/com.unity.render-pipelines.high-definition/Runtime/Material/AxF/AxFRaytracing.hlsl"
#include "Packages/com.unity.render-pipelines.high-definition/Runtime/Material/AxF/AxFRayTracing.hlsl"
#include "Packages/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/ShaderPass/ShaderPassRaytracingGBuffer.hlsl"

ENDHLSL
Expand Down
8 changes: 4 additions & 4 deletions com.unity.render-pipelines.high-definition/Runtime/Material/LayeredLit/LayeredLit.shader
View file
Original file line number Diff line number Diff line change
Expand Up @@ -665,10 +665,10 @@ Shader "HDRP/LayeredLit"
#pragma multi_compile_fragment _ LOD_FADE_CROSSFADE

#pragma multi_compile _ DEBUG_DISPLAY
#pragma multi_compile_fragment _ LIGHTMAP_ON
#pragma multi_compile_fragment _ DIRLIGHTMAP_COMBINED
#pragma multi_compile_ LIGHTMAP_ON
#pragma multi_compile _ DIRLIGHTMAP_COMBINED
#pragma multi_compile _ DYNAMICLIGHTMAP_ON
#pragma multi_compile_fragment _ SHADOWS_SHADOWMASK
#pragma multi_compile _ SHADOWS_SHADOWMASK
#pragma multi_compile_fragment PROBE_VOLUMES_OFF PROBE_VOLUMES_L1 PROBE_VOLUMES_L2
// Setup DECALS_OFF so the shader stripper can remove variants
#pragma multi_compile_fragment DECALS_OFF DECALS_3RT DECALS_4RT
Expand Down Expand Up @@ -901,7 +901,7 @@ Shader "HDRP/LayeredLit"
#pragma multi_compile _ LIGHTMAP_ON
#pragma multi_compile _ DIRLIGHTMAP_COMBINED
#pragma multi_compile _ DYNAMICLIGHTMAP_ON
#pragma multi_compile_fragment _ SHADOWS_SHADOWMASK
#pragma multi_compile _ SHADOWS_SHADOWMASK
#pragma multi_compile_fragment PROBE_VOLUMES_OFF PROBE_VOLUMES_L1 PROBE_VOLUMES_L2
#pragma multi_compile_fragment SCREEN_SPACE_SHADOWS_OFF SCREEN_SPACE_SHADOWS_ON
// Setup DECALS_OFF so the shader stripper can remove variants
Expand Down
8 changes: 4 additions & 4 deletions ...ender-pipelines.high-definition/Runtime/Material/LayeredLit/LayeredLitTessellation.shader
View file
Original file line number Diff line number Diff line change
Expand Up @@ -636,10 +636,10 @@ Shader "HDRP/LayeredLitTessellation"
HLSLPROGRAM

#pragma multi_compile _ DEBUG_DISPLAY
#pragma multi_compile_fragment _ LIGHTMAP_ON
#pragma multi_compile_fragment _ DIRLIGHTMAP_COMBINED
#pragma multi_compile _ LIGHTMAP_ON
#pragma multi_compile _ DIRLIGHTMAP_COMBINED
#pragma multi_compile _ DYNAMICLIGHTMAP_ON
#pragma multi_compile_fragment _ SHADOWS_SHADOWMASK
#pragma multi_compile _ SHADOWS_SHADOWMASK
#pragma multi_compile_fragment PROBE_VOLUMES_OFF PROBE_VOLUMES_L1 PROBE_VOLUMES_L2
// Setup DECALS_OFF so the shader stripper can remove variants
#pragma multi_compile_fragment DECALS_OFF DECALS_3RT DECALS_4RT
Expand Down Expand Up @@ -848,7 +848,7 @@ Shader "HDRP/LayeredLitTessellation"
#pragma multi_compile _ LIGHTMAP_ON
#pragma multi_compile _ DIRLIGHTMAP_COMBINED
#pragma multi_compile _ DYNAMICLIGHTMAP_ON
#pragma multi_compile_fragment _ SHADOWS_SHADOWMASK
#pragma multi_compile _ SHADOWS_SHADOWMASK
#pragma multi_compile_fragment PROBE_VOLUMES_OFF PROBE_VOLUMES_L1 PROBE_VOLUMES_L2
#pragma multi_compile_fragment SCREEN_SPACE_SHADOWS_OFF SCREEN_SPACE_SHADOWS_ON
// Setup DECALS_OFF so the shader stripper can remove variants
Expand Down
6 changes: 3 additions & 3 deletions com.unity.render-pipelines.high-definition/Runtime/Material/Lit/Lit.shader
View file
Original file line number Diff line number Diff line change
Expand Up @@ -489,7 +489,7 @@ Shader "HDRP/Lit"
#pragma multi_compile _ LIGHTMAP_ON
#pragma multi_compile _ DIRLIGHTMAP_COMBINED
#pragma multi_compile _ DYNAMICLIGHTMAP_ON
#pragma multi_compile_fragment _ SHADOWS_SHADOWMASK
#pragma multi_compile _ SHADOWS_SHADOWMASK
#pragma multi_compile_fragment PROBE_VOLUMES_OFF PROBE_VOLUMES_L1 PROBE_VOLUMES_L2
// Setup DECALS_OFF so the shader stripper can remove variants
#pragma multi_compile_fragment DECALS_OFF DECALS_3RT DECALS_4RT
Expand Down Expand Up @@ -812,7 +812,7 @@ Shader "HDRP/Lit"
#pragma multi_compile _ LIGHTMAP_ON
#pragma multi_compile _ DIRLIGHTMAP_COMBINED
#pragma multi_compile _ DYNAMICLIGHTMAP_ON
#pragma multi_compile_fragment _ SHADOWS_SHADOWMASK
#pragma multi_compile _ SHADOWS_SHADOWMASK
#pragma multi_compile_fragment PROBE_VOLUMES_OFF PROBE_VOLUMES_L1 PROBE_VOLUMES_L2
#pragma multi_compile_fragment SCREEN_SPACE_SHADOWS_OFF SCREEN_SPACE_SHADOWS_ON
// Setup DECALS_OFF so the shader stripper can remove variants
Expand Down Expand Up @@ -892,7 +892,7 @@ Shader "HDRP/Lit"
#pragma multi_compile _ LIGHTMAP_ON
#pragma multi_compile _ DIRLIGHTMAP_COMBINED
#pragma multi_compile _ DYNAMICLIGHTMAP_ON
#pragma multi_compile_fragment _ SHADOWS_SHADOWMASK
#pragma multi_compile _ SHADOWS_SHADOWMASK
#pragma multi_compile_fragment PROBE_VOLUMES_OFF PROBE_VOLUMES_L1 PROBE_VOLUMES_L2
#pragma multi_compile_fragment SCREEN_SPACE_SHADOWS_OFF SCREEN_SPACE_SHADOWS_ON
// Setup DECALS_OFF so the shader stripper can remove variants
Expand Down
6 changes: 3 additions & 3 deletions com.unity.render-pipelines.high-definition/Runtime/Material/Lit/LitTessellation.shader
View file
Original file line number Diff line number Diff line change
Expand Up @@ -478,7 +478,7 @@ Shader "HDRP/LitTessellation"
#pragma multi_compile _ LIGHTMAP_ON
#pragma multi_compile _ DIRLIGHTMAP_COMBINED
#pragma multi_compile _ DYNAMICLIGHTMAP_ON
#pragma multi_compile_fragment _ SHADOWS_SHADOWMASK
#pragma multi_compile _ SHADOWS_SHADOWMASK
#pragma multi_compile_fragment PROBE_VOLUMES_OFF PROBE_VOLUMES_L1 PROBE_VOLUMES_L2
// Setup DECALS_OFF so the shader stripper can remove variants
#pragma multi_compile_fragment DECALS_OFF DECALS_3RT DECALS_4RT
Expand Down Expand Up @@ -740,7 +740,7 @@ Shader "HDRP/LitTessellation"
#pragma multi_compile _ LIGHTMAP_ON
#pragma multi_compile _ DIRLIGHTMAP_COMBINED
#pragma multi_compile _ DYNAMICLIGHTMAP_ON
#pragma multi_compile_fragment _ SHADOWS_SHADOWMASK
#pragma multi_compile _ SHADOWS_SHADOWMASK
#pragma multi_compile_fragment PROBE_VOLUMES_OFF PROBE_VOLUMES_L1 PROBE_VOLUMES_L2
#pragma multi_compile_fragment SCREEN_SPACE_SHADOWS_OFF SCREEN_SPACE_SHADOWS_ON
// Setup DECALS_OFF so the shader stripper can remove variants
Expand Down Expand Up @@ -809,7 +809,7 @@ Shader "HDRP/LitTessellation"
#pragma multi_compile _ LIGHTMAP_ON
#pragma multi_compile _ DIRLIGHTMAP_COMBINED
#pragma multi_compile _ DYNAMICLIGHTMAP_ON
#pragma multi_compile_fragment _ SHADOWS_SHADOWMASK
#pragma multi_compile _ SHADOWS_SHADOWMASK
#pragma multi_compile_fragment PROBE_VOLUMES_OFF PROBE_VOLUMES_L1 PROBE_VOLUMES_L2
#pragma multi_compile_fragment SCREEN_SPACE_SHADOWS_OFF SCREEN_SPACE_SHADOWS_ON
// Setup DECALS_OFF so the shader stripper can remove variants
Expand Down
4 changes: 2 additions & 2 deletions com.unity.render-pipelines.high-definition/Runtime/Material/TerrainLit/TerrainLit.shader
View file
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ Shader "HDRP/TerrainLit"
#pragma multi_compile _ LIGHTMAP_ON
#pragma multi_compile _ DIRLIGHTMAP_COMBINED
#pragma multi_compile _ DYNAMICLIGHTMAP_ON
#pragma multi_compile_fragment _ SHADOWS_SHADOWMASK
#pragma multi_compile _ SHADOWS_SHADOWMASK
#pragma multi_compile_fragment PROBE_VOLUMES_OFF PROBE_VOLUMES_L1 PROBE_VOLUMES_L2
// Setup DECALS_OFF so the shader stripper can remove variants
#pragma multi_compile_fragment DECALS_OFF DECALS_3RT DECALS_4RT
Expand Down Expand Up @@ -251,7 +251,7 @@ Shader "HDRP/TerrainLit"
#pragma multi_compile _ LIGHTMAP_ON
#pragma multi_compile _ DIRLIGHTMAP_COMBINED
#pragma multi_compile _ DYNAMICLIGHTMAP_ON
#pragma multi_compile_fragment _ SHADOWS_SHADOWMASK
#pragma multi_compile _ SHADOWS_SHADOWMASK
#pragma multi_compile_fragment PROBE_VOLUMES_OFF PROBE_VOLUMES_L1 PROBE_VOLUMES_L2
#pragma multi_compile_fragment SCREEN_SPACE_SHADOWS_OFF SCREEN_SPACE_SHADOWS_ON
// Setup DECALS_OFF so the shader stripper can remove variants
Expand Down
4 changes: 2 additions & 2 deletions ...ty.render-pipelines.high-definition/Runtime/Material/TerrainLit/TerrainLit_Basemap.shader
View file
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ Shader "Hidden/HDRP/TerrainLit_Basemap"
#pragma multi_compile _ LIGHTMAP_ON
#pragma multi_compile _ DIRLIGHTMAP_COMBINED
#pragma multi_compile _ DYNAMICLIGHTMAP_ON
#pragma multi_compile_fragment _ SHADOWS_SHADOWMASK
#pragma multi_compile _ SHADOWS_SHADOWMASK
#pragma multi_compile_fragment PROBE_VOLUMES_OFF PROBE_VOLUMES_L1 PROBE_VOLUMES_L2
// Setup DECALS_OFF so the shader stripper can remove variants
#pragma multi_compile_fragment DECALS_OFF DECALS_3RT DECALS_4RT
Expand Down Expand Up @@ -202,7 +202,7 @@ Shader "Hidden/HDRP/TerrainLit_Basemap"
#pragma multi_compile _ LIGHTMAP_ON
#pragma multi_compile _ DIRLIGHTMAP_COMBINED
#pragma multi_compile _ DYNAMICLIGHTMAP_ON
#pragma multi_compile_fragment _ SHADOWS_SHADOWMASK
#pragma multi_compile _ SHADOWS_SHADOWMASK
#pragma multi_compile_fragment PROBE_VOLUMES_OFF PROBE_VOLUMES_L1 PROBE_VOLUMES_L2
#pragma multi_compile_fragment SCREEN_SPACE_SHADOWS_OFF SCREEN_SPACE_SHADOWS_ON
// Setup DECALS_OFF so the shader stripper can remove variants
Expand Down

0 comments on commit 4f1739c

Please sign in to comment.