add tag on all shader (#5839)

* add tag on all shader * fix compilation
Unity-Technologies · Sep 30, 2021 · 1731499 · 1731499
1 parent 9b21996
commit 1731499
Show file tree

Hide file tree

Showing 49 changed files with 70 additions and 19 deletions.
diff --git a/...es/High Definition RP/Procedural Sky/Runtime/ProceduralSky/Resources/ProceduralSky.shader b/...es/High Definition RP/Procedural Sky/Runtime/ProceduralSky/Resources/ProceduralSky.shader
@@ -291,6 +291,7 @@ Shader "Hidden/HDRP/Sky/ProceduralSky"
 
     SubShader
     {
+        Tags{ "RenderPipeline" = "HDRenderPipeline" }
         // For cubemap
         Pass
         {

diff --git a/...unity.render-pipelines.high-definition/Editor/Core/TextureCombiner/TextureCombiner.shader b/...unity.render-pipelines.high-definition/Editor/Core/TextureCombiner/TextureCombiner.shader
@@ -23,7 +23,7 @@ Shader "Hidden/SRP_Core/TextureCombiner"
     }
     SubShader
     {
-        Tags { "RenderType"="Opaque" }
+        Tags { "RenderType"="Opaque" "RenderPipeline" = "HDRenderPipeline" }
         LOD 100
 
         Pass

diff --git a/...ity.render-pipelines.high-definition/Editor/PostProcessing/Shaders/CurveBackground.shader b/...ity.render-pipelines.high-definition/Editor/PostProcessing/Shaders/CurveBackground.shader
@@ -36,6 +36,8 @@ Shader "Hidden/HD PostProcessing/Editor/CurveBackground"
 
     SubShader
     {
+        Tags{ "RenderPipeline" = "HDRenderPipeline" }
+
         Cull Off ZWrite Off ZTest Always
 
         // (0) Hue

diff --git a/...nder-pipelines.high-definition/Editor/PostProcessing/Shaders/CustomTonemapperCurve.shader b/...nder-pipelines.high-definition/Editor/PostProcessing/Shaders/CustomTonemapperCurve.shader
@@ -93,6 +93,7 @@ Shader "Hidden/HD PostProcessing/Editor/Custom Tonemapper Curve"
 
     SubShader
     {
+        Tags{ "RenderPipeline" = "HDRenderPipeline" }
         Cull Off ZWrite Off ZTest Always
 
         // (0) Dark skin

diff --git a/...ines.high-definition/Editor/PostProcessing/Shaders/ShadowsMidtonesHighlightsCurves.shader b/...ines.high-definition/Editor/PostProcessing/Shaders/ShadowsMidtonesHighlightsCurves.shader
@@ -63,6 +63,7 @@ Shader "Hidden/HD PostProcessing/Editor/Shadows Midtones Highlights Curve"
 
     SubShader
     {
+        Tags{ "RenderPipeline" = "HDRenderPipeline" }
         Cull Off ZWrite Off ZTest Always
 
         // (0) Dark skin

diff --git a/...ity.render-pipelines.high-definition/Editor/PostProcessing/Shaders/TrackballEditor.shader b/...ity.render-pipelines.high-definition/Editor/PostProcessing/Shaders/TrackballEditor.shader
@@ -93,6 +93,7 @@ Shader "Hidden/HD PostProcessing/Editor/Trackball"
 
     SubShader
     {
+        Tags{ "RenderPipeline" = "HDRenderPipeline" }
         Cull Off ZWrite Off ZTest Always
 
         // (0) Dark skin

diff --git a/...lines.high-definition/Editor/PostProcessing/Templates/CustomPostProcessingShader.template b/...lines.high-definition/Editor/PostProcessing/Templates/CustomPostProcessingShader.template
@@ -62,6 +62,7 @@ Shader "Hidden/Shader/#SCRIPTNAME#"
 
     SubShader
     {
+        Tags{ "RenderPipeline" = "HDRenderPipeline" }
         Pass
         {
             Name "#NAME#"

diff --git a/...ines.high-definition/Editor/RenderPipeline/CustomPass/CustomPassFullScreenShader.template b/...ines.high-definition/Editor/RenderPipeline/CustomPass/CustomPassFullScreenShader.template
@@ -54,6 +54,7 @@ Shader "FullScreen/#SCRIPTNAME#"
 
     SubShader
     {
+        Tags{ "RenderPipeline" = "HDRenderPipeline" }
         Pass
         {
             Name "Custom Pass 0"

diff --git a/...lines.high-definition/Editor/RenderPipeline/CustomPass/CustomPassRenderersShader.template b/...lines.high-definition/Editor/RenderPipeline/CustomPass/CustomPassRenderersShader.template
@@ -24,6 +24,7 @@ Shader "Renderers/#SCRIPTNAME#"
 
     SubShader
     {
+        Tags{ "RenderPipeline" = "HDRenderPipeline" }
         Pass
         {
             Name "FirstPass"

diff --git a/...pelines.high-definition/Editor/RenderPipelineResources/Shaders/GUITextureBlit2SRGB.shader b/...pelines.high-definition/Editor/RenderPipelineResources/Shaders/GUITextureBlit2SRGB.shader
@@ -5,6 +5,7 @@ Shader "Hidden/GUITextureBlit2SRGB" {
         _Color("Multiplicative color", Color) = (1.0, 1.0, 1.0, 1.0)
     }
     SubShader {
+        Tags{ "RenderPipeline" = "HDRenderPipeline" }
         Pass {
             ZTest Always Cull Off ZWrite Off
 

diff --git a/...pipelines.high-definition/Editor/VFXGraph/Shaders/Templates/VFXParticleBasicCube.template b/...pipelines.high-definition/Editor/VFXGraph/Shaders/Templates/VFXParticleBasicCube.template
@@ -1,6 +1,7 @@
 {
 	SubShader
-	{	
+	{
+	    Tags{ "RenderPipeline" = "HDRenderPipeline" }
 		Cull Back
 
 		${VFXInclude("Shaders/VFXParticleHeader.template")}

diff --git a/...nder-pipelines.high-definition/Editor/VFXGraph/Shaders/Templates/VFXParticleCube.template b/...nder-pipelines.high-definition/Editor/VFXGraph/Shaders/Templates/VFXParticleCube.template
@@ -1,6 +1,7 @@
 {
 	SubShader
-	{	
+	{
+	    Tags{ "RenderPipeline" = "HDRenderPipeline" }
 		Cull Back
 
 		${VFXInclude("Shaders/VFXParticleHeader.template")}

diff --git a/...der-pipelines.high-definition/Editor/VFXGraph/Shaders/Templates/VFXParticleDecal.template b/...der-pipelines.high-definition/Editor/VFXGraph/Shaders/Templates/VFXParticleDecal.template
@@ -1,6 +1,7 @@
 {
 	SubShader
-	{	
+	{
+	    Tags{ "RenderPipeline" = "HDRenderPipeline" }
 		Cull Back
 
 		${VFXInclude("Shaders/VFXParticleHeader.template")}

diff --git a/...ines.high-definition/Editor/VFXGraph/Shaders/Templates/VFXParticleDistortionMesh.template b/...ines.high-definition/Editor/VFXGraph/Shaders/Templates/VFXParticleDistortionMesh.template
@@ -1,6 +1,7 @@
 {
 	SubShader
-	{	
+	{
+	    Tags{ "RenderPipeline" = "HDRenderPipeline" }
 		Cull Off
 
 		${VFXInclude("Shaders/VFXParticleHeader.template")}

diff --git a/...efinition/Editor/VFXGraph/Shaders/Templates/VFXParticleDistortionPlanarPrimitive.template b/...efinition/Editor/VFXGraph/Shaders/Templates/VFXParticleDistortionPlanarPrimitive.template
@@ -1,6 +1,7 @@
 {
 	SubShader
-	{	
+	{
+	    Tags{ "RenderPipeline" = "HDRenderPipeline" }
 		Cull Off
 
 		${VFXInclude("Shaders/VFXParticleHeader.template")}

diff --git a/...r-pipelines.high-definition/Editor/VFXGraph/Shaders/Templates/VFXParticleLinesHW.template b/...r-pipelines.high-definition/Editor/VFXGraph/Shaders/Templates/VFXParticleLinesHW.template
@@ -1,6 +1,7 @@
 {
 	SubShader
-	{	
+	{
+	    Tags{ "RenderPipeline" = "HDRenderPipeline" }
 		${VFXInclude("Shaders/VFXParticleHeader.template")}
 		${VFXInclude("Shaders/ParticleLines/PassSelection.template")}
 		${VFXInclude("Shaders/ParticleLines/PassDepth.template"),IS_OPAQUE_PARTICLE}

diff --git a/...r-pipelines.high-definition/Editor/VFXGraph/Shaders/Templates/VFXParticleLinesSW.template b/...r-pipelines.high-definition/Editor/VFXGraph/Shaders/Templates/VFXParticleLinesSW.template
@@ -1,6 +1,7 @@
 {
 	SubShader
-	{	
+	{
+	    Tags{ "RenderPipeline" = "HDRenderPipeline" }
 		${VFXInclude("Shaders/VFXParticleHeader.template")}
 		${VFXInclude("Shaders/ParticleLinesSW/PassSelection.template")}
 		${VFXInclude("Shaders/ParticleLinesSW/PassDepth.template"),IS_OPAQUE_PARTICLE}

diff --git a/...r-pipelines.high-definition/Editor/VFXGraph/Shaders/Templates/VFXParticleLitCube.template b/...r-pipelines.high-definition/Editor/VFXGraph/Shaders/Templates/VFXParticleLitCube.template
@@ -1,6 +1,7 @@
 {
 	SubShader
-	{	
+	{
+	    Tags{ "RenderPipeline" = "HDRenderPipeline" }
 		Cull Back
 
 		${VFXInclude("Shaders/VFXParticleHeader.template")}

diff --git a/...r-pipelines.high-definition/Editor/VFXGraph/Shaders/Templates/VFXParticleLitMesh.template b/...r-pipelines.high-definition/Editor/VFXGraph/Shaders/Templates/VFXParticleLitMesh.template
@@ -1,6 +1,7 @@
 {
 	SubShader
-	{	
+	{
+	    Tags{ "RenderPipeline" = "HDRenderPipeline" }
 		${VFXInclude("Shaders/VFXParticleHeader.template")}
 		${VFXIncludeRP("Templates/Mesh/PassSelection.template")}
 		${VFXIncludeRP("Templates/Mesh/PassDepth.template"),IS_OPAQUE_PARTICLE}

diff --git a/....high-definition/Editor/VFXGraph/Shaders/Templates/VFXParticleLitPlanarPrimitive.template b/....high-definition/Editor/VFXGraph/Shaders/Templates/VFXParticleLitPlanarPrimitive.template
@@ -1,6 +1,7 @@
 {
 	SubShader
-	{	
+	{
+	    Tags{ "RenderPipeline" = "HDRenderPipeline" }
 		Cull Off
 
 		${VFXInclude("Shaders/VFXParticleHeader.template")}

diff --git a/...er-pipelines.high-definition/Editor/VFXGraph/Shaders/Templates/VFXParticleMeshes.template b/...er-pipelines.high-definition/Editor/VFXGraph/Shaders/Templates/VFXParticleMeshes.template
@@ -1,6 +1,7 @@
 {
 	SubShader
 	{
+	    Tags{ "RenderPipeline" = "HDRenderPipeline" }
 		${VFXInclude("Shaders/VFXParticleHeader.template")}
 		${VFXInclude("Shaders/ParticleMeshes/PassSelection.template")}
 		${VFXInclude("Shaders/ParticleMeshes/PassDepth.template"),IS_OPAQUE_PARTICLE}

diff --git a/...nes.high-definition/Editor/VFXGraph/Shaders/Templates/VFXParticlePlanarPrimitive.template b/...nes.high-definition/Editor/VFXGraph/Shaders/Templates/VFXParticlePlanarPrimitive.template
@@ -1,6 +1,7 @@
 {
 	SubShader
-	{	
+	{
+	    Tags{ "RenderPipeline" = "HDRenderPipeline" }
 		Cull Off
 
 		${VFXInclude("Shaders/VFXParticleHeader.template")}

diff --git a/...er-pipelines.high-definition/Editor/VFXGraph/Shaders/Templates/VFXParticlePoints.template b/...er-pipelines.high-definition/Editor/VFXGraph/Shaders/Templates/VFXParticlePoints.template
@@ -1,6 +1,7 @@
 {
 	SubShader
-	{	
+	{
+	    Tags{ "RenderPipeline" = "HDRenderPipeline" }
 		${VFXInclude("Shaders/VFXParticleHeader.template")}
 		${VFXInclude("Shaders/ParticlePoints/PassSelection.template")}
 		${VFXInclude("Shaders/ParticlePoints/PassDepth.template"),IS_OPAQUE_PARTICLE}

diff --git a/...er-pipelines.high-definition/Editor/VFXGraph/Shaders/Templates/VFXParticleSphere.template b/...er-pipelines.high-definition/Editor/VFXGraph/Shaders/Templates/VFXParticleSphere.template
@@ -1,6 +1,7 @@
 {
 	SubShader
-	{	
+	{
+	    Tags{ "RenderPipeline" = "HDRenderPipeline" }
 		Cull Off
 
 		${VFXInclude("Shaders/VFXParticleHeader.template")}

diff --git a/com.unity.render-pipelines.high-definition/Runtime/Compositor/Shaders/AlphaInjection.shader b/com.unity.render-pipelines.high-definition/Runtime/Compositor/Shaders/AlphaInjection.shader
@@ -51,6 +51,7 @@ Shader "Hidden/Shader/AlphaInjection"
 
     SubShader
     {
+        Tags{ "RenderPipeline" = "HDRenderPipeline" }
         Pass
         {
             Name "AlphaInjection"

diff --git a/com.unity.render-pipelines.high-definition/Runtime/Compositor/Shaders/ChromaKeying.shader b/com.unity.render-pipelines.high-definition/Runtime/Compositor/Shaders/ChromaKeying.shader
@@ -105,6 +105,7 @@ Shader "Hidden/Shader/ChromaKeying"
 
     SubShader
     {
+        Tags{ "RenderPipeline" = "HDRenderPipeline" }
         Pass
         {
             Name "ChromaKeying"

diff --git a/...ty.render-pipelines.high-definition/Runtime/Core/CoreResources/BlitCubeTextureFace.shader b/...ty.render-pipelines.high-definition/Runtime/Core/CoreResources/BlitCubeTextureFace.shader
@@ -2,6 +2,7 @@ Shader "Hidden/SRP/BlitCubeTextureFace"
 {
     SubShader
     {
+        Tags{ "RenderPipeline" = "HDRenderPipeline" }
         // Cubemap blit.  Takes a face index.
         Pass
         {

diff --git a/com.unity.render-pipelines.high-definition/Runtime/Core/CoreResources/CubeToPano.shader b/com.unity.render-pipelines.high-definition/Runtime/Core/CoreResources/CubeToPano.shader
@@ -7,7 +7,7 @@ SubShader {
 
 
 
-
+Tags{ "RenderPipeline" = "HDRenderPipeline" }
 Pass
 {
     ZWrite Off

diff --git a/com.unity.render-pipelines.high-definition/Runtime/Debug/DebugLightVolumes.shader b/com.unity.render-pipelines.high-definition/Runtime/Debug/DebugLightVolumes.shader
@@ -9,6 +9,7 @@ Shader "Hidden/HDRP/DebugLightVolumes"
 
     SubShader
     {
+        Tags{ "RenderPipeline" = "HDRenderPipeline" }
         Pass
         {
             Cull Back

diff --git a/com.unity.render-pipelines.high-definition/Runtime/Debug/DebugVTBlit.shader b/com.unity.render-pipelines.high-definition/Runtime/Debug/DebugVTBlit.shader
@@ -51,6 +51,7 @@ Shader "Hidden/DebugVTBlit"
 
     SubShader
     {
+        Tags{ "RenderPipeline" = "HDRenderPipeline" }
         // No culling or depth
         Cull Off
         ZWrite Off

diff --git a/com.unity.render-pipelines.high-definition/Runtime/Debug/MaterialError.shader b/com.unity.render-pipelines.high-definition/Runtime/Debug/MaterialError.shader
@@ -2,6 +2,7 @@ Shader "Hidden/HDRP/MaterialError"
 {
     SubShader
     {
+        Tags{ "RenderPipeline" = "HDRenderPipeline" }
         Pass
         {
             HLSLPROGRAM

diff --git a/...high-definition/Runtime/Lighting/AtmosphericScattering/OpaqueAtmosphericScattering.shader b/...high-definition/Runtime/Lighting/AtmosphericScattering/OpaqueAtmosphericScattering.shader
@@ -114,6 +114,7 @@ Shader "Hidden/HDRP/OpaqueAtmosphericScattering"
 
     SubShader
     {
+        Tags{ "RenderPipeline" = "HDRenderPipeline" }
         // 0: NOMSAA
         Pass
         {

diff --git a/...y.render-pipelines.high-definition/Runtime/Lighting/Shadow/DebugDisplayHDShadowMap.shader b/...y.render-pipelines.high-definition/Runtime/Lighting/Shadow/DebugDisplayHDShadowMap.shader
@@ -37,6 +37,7 @@ Shader "Hidden/ScriptableRenderPipeline/DebugDisplayHDShadowMap"
 
     SubShader
     {
+        Tags{ "RenderPipeline" = "HDRenderPipeline" }
         Pass
         {
             Name "RegularShadow"

diff --git a/com.unity.render-pipelines.high-definition/Runtime/Lighting/Shadow/ShadowBlit.shader b/com.unity.render-pipelines.high-definition/Runtime/Lighting/Shadow/ShadowBlit.shader
@@ -10,6 +10,7 @@ Shader "Hidden/ScriptableRenderPipeline/ShadowBlit"
 
     SubShader
     {
+        Tags{ "RenderPipeline" = "HDRenderPipeline" }
         Pass
         {
             Name "BlitShadows"

diff --git a/com.unity.render-pipelines.high-definition/Runtime/Lighting/Shadow/ShadowClear.shader b/com.unity.render-pipelines.high-definition/Runtime/Lighting/Shadow/ShadowClear.shader
@@ -9,6 +9,7 @@ Shader "Hidden/ScriptableRenderPipeline/ShadowClear"
 
     SubShader
     {
+        Tags{ "RenderPipeline" = "HDRenderPipeline" }
         Pass
         {
             Name "ClearShadow"

diff --git a/...der-pipelines.high-definition/Runtime/Material/LTCAreaLight/FilterAreaLightCookies.shader b/...der-pipelines.high-definition/Runtime/Material/LTCAreaLight/FilterAreaLightCookies.shader
@@ -54,6 +54,7 @@ Shader "Hidden/CoreResources/FilterAreaLightCookies"
 
     SubShader
     {
+        Tags{ "RenderPipeline" = "HDRenderPipeline" }
         // Simple copy to mip 0
         Pass
         {

diff --git a/com.unity.render-pipelines.high-definition/Runtime/Material/LayeredLit/LayeredLit.shader b/com.unity.render-pipelines.high-definition/Runtime/Material/LayeredLit/LayeredLit.shader
@@ -1034,6 +1034,7 @@ Shader "HDRP/LayeredLit"
 
     SubShader
     {
+        Tags{ "RenderPipeline" = "HDRenderPipeline" }
         Pass
         {
             Name "IndirectDXR"

diff --git a/...ender-pipelines.high-definition/Runtime/Material/LayeredLit/LayeredLitTessellation.shader b/...ender-pipelines.high-definition/Runtime/Material/LayeredLit/LayeredLitTessellation.shader
@@ -1075,8 +1075,9 @@ Shader "HDRP/LayeredLitTessellation"
         }
     }
 
-        SubShader
+    SubShader
     {
+        Tags{ "RenderPipeline" = "HDRenderPipeline" }
         Pass
         {
             Name "IndirectDXR"

diff --git a/...render-pipelines.high-definition/Runtime/Material/TerrainLit/TerrainLit_BasemapGen.shader b/...render-pipelines.high-definition/Runtime/Material/TerrainLit/TerrainLit_BasemapGen.shader
@@ -7,7 +7,7 @@ Shader "Hidden/HDRP/TerrainLit_BasemapGen"
 
     SubShader
     {
-        Tags { "SplatCount" = "8" }
+        Tags { "RenderPipeline" = "HDRenderPipeline" "SplatCount" = "8" }
 
         HLSLINCLUDE
 

diff --git a/...ender-pipelines.high-definition/Runtime/PostProcessing/Shaders/LensFlareDataDriven.shader b/...ender-pipelines.high-definition/Runtime/PostProcessing/Shaders/LensFlareDataDriven.shader
@@ -2,6 +2,8 @@ Shader "Hidden/HDRP/LensFlareDataDriven"
 {
     SubShader
     {
+        Tags{ "RenderPipeline" = "HDRenderPipeline" }
+
         // Additive
         Pass
         {

diff --git a/...s.high-definition/Runtime/PostProcessing/Shaders/SubpixelMorphologicalAntialiasing.shader b/...s.high-definition/Runtime/PostProcessing/Shaders/SubpixelMorphologicalAntialiasing.shader
@@ -13,8 +13,10 @@ Shader "Hidden/PostProcessing/SubpixelMorphologicalAntialiasing"
 
         ENDHLSL
 
-        SubShader
+    SubShader
     {
+        Tags{ "RenderPipeline" = "HDRenderPipeline" }
+
         Cull Off ZWrite Off ZTest Always
 
         // Edge detection

diff --git a/...elines.high-definition/Runtime/RenderPipeline/Raytracing/Shaders/DebugLightCluster.shader b/...elines.high-definition/Runtime/RenderPipeline/Raytracing/Shaders/DebugLightCluster.shader
@@ -2,7 +2,7 @@ Shader "Hidden/HDRP/DebugLightCluster"
 {
     SubShader
     {
-        Tags { "Queue"="Transparent+0" "IgnoreProjector"="True" "RenderType"="Transparent" }
+        Tags { "RenderPipeline" = "HDRenderPipeline"  "Queue"="Transparent+0" "IgnoreProjector"="True" "RenderType"="Transparent" }
 
         HLSLINCLUDE
         #pragma only_renderers d3d11 ps5

diff --git a/...h-definition/Runtime/RenderPipeline/RenderPass/CustomPass/CustomPassRenderersUtils.shader b/...h-definition/Runtime/RenderPipeline/RenderPass/CustomPass/CustomPassRenderersUtils.shader
@@ -34,6 +34,8 @@ Shader "Hidden/HDRP/CustomPassRenderersUtils"
 
     SubShader
     {
+        Tags{ "RenderPipeline" = "HDRenderPipeline" }
+
         Pass
         {
             Name "DepthToColorPass"

diff --git a/...lines.high-definition/Runtime/RenderPipeline/RenderPass/CustomPass/CustomPassUtils.shader b/...lines.high-definition/Runtime/RenderPipeline/RenderPass/CustomPass/CustomPassUtils.shader
@@ -101,6 +101,8 @@ Shader "Hidden/HDRP/CustomPassUtils"
 
     SubShader
     {
+        Tags{ "RenderPipeline" = "HDRenderPipeline" }
+
         Pass
         {
             Name "Copy"

diff --git a/com.unity.render-pipelines.high-definition/Runtime/Sky/BlitCubemap.shader b/com.unity.render-pipelines.high-definition/Runtime/Sky/BlitCubemap.shader
@@ -1,6 +1,8 @@
 // Note: This shader is supposed to be removed at some point when Graphics.ConvertTexture can take a RenderTexture as a destination (it's only used by sky manager for now).
 Shader "Hidden/BlitCubemap" {
     SubShader {
+
+        Tags{ "RenderPipeline" = "HDRenderPipeline" }
         // Cubemap blit.  Takes a face index.
         Pass {
             ZTest Always Cull Off ZWrite Off

diff --git a/...ity.render-pipelines.high-definition/Runtime/Sky/CloudSystem/CloudLayer/CloudLayer.shader b/...ity.render-pipelines.high-definition/Runtime/Sky/CloudSystem/CloudLayer/CloudLayer.shader
@@ -57,6 +57,7 @@ Shader "Hidden/HDRP/Sky/CloudLayer"
 
     SubShader
     {
+        Tags{ "RenderPipeline" = "HDRenderPipeline" }
         Pass
         {
             ZWrite Off