From a5dff5afc4378f487dc0eba1ad2f39603ccd1d1e Mon Sep 17 00:00:00 2001 From: Sebastien Lagarde Date: Wed, 29 Sep 2021 12:50:09 +0200 Subject: [PATCH 1/2] add tag on all shader --- .../Runtime/ProceduralSky/Resources/ProceduralSky.shader | 1 + .../Editor/Core/TextureCombiner/TextureCombiner.shader | 4 ++-- .../Editor/PostProcessing/Shaders/CurveBackground.shader | 2 ++ .../PostProcessing/Shaders/CustomTonemapperCurve.shader | 1 + .../Shaders/ShadowsMidtonesHighlightsCurves.shader | 1 + .../Editor/PostProcessing/Shaders/TrackballEditor.shader | 1 + .../Templates/CustomPostProcessingShader.template | 1 + .../CustomPass/CustomPassFullScreenShader.template | 1 + .../CustomPass/CustomPassRenderersShader.template | 1 + .../Shaders/GUITextureBlit2SRGB.shader | 1 + .../VFXGraph/Shaders/Templates/VFXParticleBasicCube.template | 3 ++- .../VFXGraph/Shaders/Templates/VFXParticleCube.template | 3 ++- .../VFXGraph/Shaders/Templates/VFXParticleDecal.template | 3 ++- .../Shaders/Templates/VFXParticleDistortionMesh.template | 3 ++- .../Templates/VFXParticleDistortionPlanarPrimitive.template | 3 ++- .../VFXGraph/Shaders/Templates/VFXParticleLinesHW.template | 3 ++- .../VFXGraph/Shaders/Templates/VFXParticleLinesSW.template | 3 ++- .../VFXGraph/Shaders/Templates/VFXParticleLitCube.template | 3 ++- .../VFXGraph/Shaders/Templates/VFXParticleLitMesh.template | 3 ++- .../Shaders/Templates/VFXParticleLitPlanarPrimitive.template | 3 ++- .../VFXGraph/Shaders/Templates/VFXParticleMeshes.template | 1 + .../Shaders/Templates/VFXParticlePlanarPrimitive.template | 3 ++- .../VFXGraph/Shaders/Templates/VFXParticlePoints.template | 3 ++- .../VFXGraph/Shaders/Templates/VFXParticleSphere.template | 3 ++- .../Runtime/Compositor/Shaders/AlphaInjection.shader | 1 + .../Runtime/Compositor/Shaders/ChromaKeying.shader | 1 + .../Runtime/Core/CoreResources/BlitCubeTextureFace.shader | 1 + .../Runtime/Core/CoreResources/CubeToPano.shader | 2 +- .../Runtime/Debug/DebugLightVolumes.shader | 1 + .../Runtime/Debug/DebugVTBlit.shader | 1 + .../Runtime/Debug/MaterialError.shader | 1 + .../AtmosphericScattering/OpaqueAtmosphericScattering.shader | 1 + .../Runtime/Lighting/Shadow/DebugDisplayHDShadowMap.shader | 1 + .../Runtime/Lighting/Shadow/ShadowBlit.shader | 1 + .../Runtime/Lighting/Shadow/ShadowClear.shader | 1 + .../Material/LTCAreaLight/FilterAreaLightCookies.shader | 1 + .../Runtime/Material/LayeredLit/LayeredLit.shader | 1 + .../Runtime/Material/LayeredLit/LayeredLitTessellation.shader | 3 ++- .../Runtime/Material/TerrainLit/TerrainLit_BasemapGen.shader | 2 +- .../Runtime/PostProcessing/Shaders/LensFlareDataDriven.shader | 2 ++ .../Shaders/SubpixelMorphologicalAntialiasing.shader | 4 +++- .../Raytracing/Shaders/DebugLightCluster.shader | 4 ++-- .../RenderPass/CustomPass/CustomPassRenderersUtils.shader | 2 ++ .../RenderPass/CustomPass/CustomPassUtils.shader | 2 ++ .../Runtime/Sky/BlitCubemap.shader | 2 ++ .../Runtime/Sky/CloudSystem/CloudLayer/CloudLayer.shader | 1 + .../Runtime/Sky/GradientSky/GradientSky.shader | 1 + .../Runtime/Sky/HDRISky/HDRISky.shader | 1 + .../Runtime/Sky/PhysicallyBasedSky/PhysicallyBasedSky.shader | 1 + 49 files changed, 72 insertions(+), 21 deletions(-) diff --git a/TestProjects/HDRP_Tests/Assets/Samples/High Definition RP/Procedural Sky/Runtime/ProceduralSky/Resources/ProceduralSky.shader b/TestProjects/HDRP_Tests/Assets/Samples/High Definition RP/Procedural Sky/Runtime/ProceduralSky/Resources/ProceduralSky.shader index c3716367065..d7c207dce2e 100644 --- a/TestProjects/HDRP_Tests/Assets/Samples/High Definition RP/Procedural Sky/Runtime/ProceduralSky/Resources/ProceduralSky.shader +++ b/TestProjects/HDRP_Tests/Assets/Samples/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/com.unity.render-pipelines.high-definition/Editor/Core/TextureCombiner/TextureCombiner.shader b/com.unity.render-pipelines.high-definition/Editor/Core/TextureCombiner/TextureCombiner.shader index 4081d897859..7d678a609d3 100644 --- a/com.unity.render-pipelines.high-definition/Editor/Core/TextureCombiner/TextureCombiner.shader +++ b/com.unity.render-pipelines.high-definition/Editor/Core/TextureCombiner/TextureCombiner.shader @@ -22,8 +22,8 @@ Shader "Hidden/SRP_Core/TextureCombiner" _ARemap ("A Remap", Vector) = (0, 1, 0, 0) } SubShader - { - Tags { "RenderType"="Opaque" } + { + Tags { "RenderType"="Opaque", "RenderPipeline" = "HDRenderPipeline" } LOD 100 Pass diff --git a/com.unity.render-pipelines.high-definition/Editor/PostProcessing/Shaders/CurveBackground.shader b/com.unity.render-pipelines.high-definition/Editor/PostProcessing/Shaders/CurveBackground.shader index 0718325ed9e..3b3788a1030 100644 --- a/com.unity.render-pipelines.high-definition/Editor/PostProcessing/Shaders/CurveBackground.shader +++ b/com.unity.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/com.unity.render-pipelines.high-definition/Editor/PostProcessing/Shaders/CustomTonemapperCurve.shader b/com.unity.render-pipelines.high-definition/Editor/PostProcessing/Shaders/CustomTonemapperCurve.shader index f7776c77b8e..6335143c267 100644 --- a/com.unity.render-pipelines.high-definition/Editor/PostProcessing/Shaders/CustomTonemapperCurve.shader +++ b/com.unity.render-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/com.unity.render-pipelines.high-definition/Editor/PostProcessing/Shaders/ShadowsMidtonesHighlightsCurves.shader b/com.unity.render-pipelines.high-definition/Editor/PostProcessing/Shaders/ShadowsMidtonesHighlightsCurves.shader index fb2b1d810a9..6b0e253418e 100644 --- a/com.unity.render-pipelines.high-definition/Editor/PostProcessing/Shaders/ShadowsMidtonesHighlightsCurves.shader +++ b/com.unity.render-pipelines.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/com.unity.render-pipelines.high-definition/Editor/PostProcessing/Shaders/TrackballEditor.shader b/com.unity.render-pipelines.high-definition/Editor/PostProcessing/Shaders/TrackballEditor.shader index 0dcf0b9f67a..8ed9bbba305 100644 --- a/com.unity.render-pipelines.high-definition/Editor/PostProcessing/Shaders/TrackballEditor.shader +++ b/com.unity.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/com.unity.render-pipelines.high-definition/Editor/PostProcessing/Templates/CustomPostProcessingShader.template b/com.unity.render-pipelines.high-definition/Editor/PostProcessing/Templates/CustomPostProcessingShader.template index 1a9cc772cf5..787c9ac103e 100644 --- a/com.unity.render-pipelines.high-definition/Editor/PostProcessing/Templates/CustomPostProcessingShader.template +++ b/com.unity.render-pipelines.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/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/CustomPass/CustomPassFullScreenShader.template b/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/CustomPass/CustomPassFullScreenShader.template index dc59b5667cb..d7f697b7a07 100644 --- a/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/CustomPass/CustomPassFullScreenShader.template +++ b/com.unity.render-pipelines.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/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/CustomPass/CustomPassRenderersShader.template b/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/CustomPass/CustomPassRenderersShader.template index 7ff0c6af787..8ffef89ca5f 100644 --- a/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/CustomPass/CustomPassRenderersShader.template +++ b/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/CustomPass/CustomPassRenderersShader.template @@ -24,6 +24,7 @@ Shader "Renderers/#SCRIPTNAME#" SubShader { + Tags{ "RenderPipeline" = "HDRenderPipeline" } Pass { Name "FirstPass" diff --git a/com.unity.render-pipelines.high-definition/Editor/RenderPipelineResources/Shaders/GUITextureBlit2SRGB.shader b/com.unity.render-pipelines.high-definition/Editor/RenderPipelineResources/Shaders/GUITextureBlit2SRGB.shader index 006d1c8c5dd..c24f33878d5 100644 --- a/com.unity.render-pipelines.high-definition/Editor/RenderPipelineResources/Shaders/GUITextureBlit2SRGB.shader +++ b/com.unity.render-pipelines.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/com.unity.render-pipelines.high-definition/Editor/VFXGraph/Shaders/Templates/VFXParticleBasicCube.template b/com.unity.render-pipelines.high-definition/Editor/VFXGraph/Shaders/Templates/VFXParticleBasicCube.template index 3fb868c45ad..620f1e6dea9 100644 --- a/com.unity.render-pipelines.high-definition/Editor/VFXGraph/Shaders/Templates/VFXParticleBasicCube.template +++ b/com.unity.render-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/com.unity.render-pipelines.high-definition/Editor/VFXGraph/Shaders/Templates/VFXParticleCube.template b/com.unity.render-pipelines.high-definition/Editor/VFXGraph/Shaders/Templates/VFXParticleCube.template index 120204c26b2..19cd6c260eb 100644 --- a/com.unity.render-pipelines.high-definition/Editor/VFXGraph/Shaders/Templates/VFXParticleCube.template +++ b/com.unity.render-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/com.unity.render-pipelines.high-definition/Editor/VFXGraph/Shaders/Templates/VFXParticleDecal.template b/com.unity.render-pipelines.high-definition/Editor/VFXGraph/Shaders/Templates/VFXParticleDecal.template index eb950c750a3..f7191bb8ee1 100644 --- a/com.unity.render-pipelines.high-definition/Editor/VFXGraph/Shaders/Templates/VFXParticleDecal.template +++ b/com.unity.render-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/com.unity.render-pipelines.high-definition/Editor/VFXGraph/Shaders/Templates/VFXParticleDistortionMesh.template b/com.unity.render-pipelines.high-definition/Editor/VFXGraph/Shaders/Templates/VFXParticleDistortionMesh.template index 72a2431c770..830c0690ed1 100644 --- a/com.unity.render-pipelines.high-definition/Editor/VFXGraph/Shaders/Templates/VFXParticleDistortionMesh.template +++ b/com.unity.render-pipelines.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/com.unity.render-pipelines.high-definition/Editor/VFXGraph/Shaders/Templates/VFXParticleDistortionPlanarPrimitive.template b/com.unity.render-pipelines.high-definition/Editor/VFXGraph/Shaders/Templates/VFXParticleDistortionPlanarPrimitive.template index dd620e1306b..4dfc3b7d05d 100644 --- a/com.unity.render-pipelines.high-definition/Editor/VFXGraph/Shaders/Templates/VFXParticleDistortionPlanarPrimitive.template +++ b/com.unity.render-pipelines.high-definition/Editor/VFXGraph/Shaders/Templates/VFXParticleDistortionPlanarPrimitive.template @@ -1,6 +1,7 @@ { SubShader - { + { + Tags{ "RenderPipeline" = "HDRenderPipeline" } Cull Off ${VFXInclude("Shaders/VFXParticleHeader.template")} diff --git a/com.unity.render-pipelines.high-definition/Editor/VFXGraph/Shaders/Templates/VFXParticleLinesHW.template b/com.unity.render-pipelines.high-definition/Editor/VFXGraph/Shaders/Templates/VFXParticleLinesHW.template index b5b9d2e8ca9..7d065cb96a9 100644 --- a/com.unity.render-pipelines.high-definition/Editor/VFXGraph/Shaders/Templates/VFXParticleLinesHW.template +++ b/com.unity.render-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/com.unity.render-pipelines.high-definition/Editor/VFXGraph/Shaders/Templates/VFXParticleLinesSW.template b/com.unity.render-pipelines.high-definition/Editor/VFXGraph/Shaders/Templates/VFXParticleLinesSW.template index a88603e574e..900b487a24d 100644 --- a/com.unity.render-pipelines.high-definition/Editor/VFXGraph/Shaders/Templates/VFXParticleLinesSW.template +++ b/com.unity.render-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/com.unity.render-pipelines.high-definition/Editor/VFXGraph/Shaders/Templates/VFXParticleLitCube.template b/com.unity.render-pipelines.high-definition/Editor/VFXGraph/Shaders/Templates/VFXParticleLitCube.template index 529ccb44843..aa3a5071c29 100644 --- a/com.unity.render-pipelines.high-definition/Editor/VFXGraph/Shaders/Templates/VFXParticleLitCube.template +++ b/com.unity.render-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/com.unity.render-pipelines.high-definition/Editor/VFXGraph/Shaders/Templates/VFXParticleLitMesh.template b/com.unity.render-pipelines.high-definition/Editor/VFXGraph/Shaders/Templates/VFXParticleLitMesh.template index e349667d96a..3cc4082b655 100644 --- a/com.unity.render-pipelines.high-definition/Editor/VFXGraph/Shaders/Templates/VFXParticleLitMesh.template +++ b/com.unity.render-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/com.unity.render-pipelines.high-definition/Editor/VFXGraph/Shaders/Templates/VFXParticleLitPlanarPrimitive.template b/com.unity.render-pipelines.high-definition/Editor/VFXGraph/Shaders/Templates/VFXParticleLitPlanarPrimitive.template index e47312fc6e0..c1ec8d659e0 100644 --- a/com.unity.render-pipelines.high-definition/Editor/VFXGraph/Shaders/Templates/VFXParticleLitPlanarPrimitive.template +++ b/com.unity.render-pipelines.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/com.unity.render-pipelines.high-definition/Editor/VFXGraph/Shaders/Templates/VFXParticleMeshes.template b/com.unity.render-pipelines.high-definition/Editor/VFXGraph/Shaders/Templates/VFXParticleMeshes.template index 883285e4546..1344fa28cb3 100644 --- a/com.unity.render-pipelines.high-definition/Editor/VFXGraph/Shaders/Templates/VFXParticleMeshes.template +++ b/com.unity.render-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/com.unity.render-pipelines.high-definition/Editor/VFXGraph/Shaders/Templates/VFXParticlePlanarPrimitive.template b/com.unity.render-pipelines.high-definition/Editor/VFXGraph/Shaders/Templates/VFXParticlePlanarPrimitive.template index 572b53750b5..1d1d3c12e54 100644 --- a/com.unity.render-pipelines.high-definition/Editor/VFXGraph/Shaders/Templates/VFXParticlePlanarPrimitive.template +++ b/com.unity.render-pipelines.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/com.unity.render-pipelines.high-definition/Editor/VFXGraph/Shaders/Templates/VFXParticlePoints.template b/com.unity.render-pipelines.high-definition/Editor/VFXGraph/Shaders/Templates/VFXParticlePoints.template index ddccfede52a..f2f435c4f64 100644 --- a/com.unity.render-pipelines.high-definition/Editor/VFXGraph/Shaders/Templates/VFXParticlePoints.template +++ b/com.unity.render-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/com.unity.render-pipelines.high-definition/Editor/VFXGraph/Shaders/Templates/VFXParticleSphere.template b/com.unity.render-pipelines.high-definition/Editor/VFXGraph/Shaders/Templates/VFXParticleSphere.template index 7900a942f77..8501ad07166 100644 --- a/com.unity.render-pipelines.high-definition/Editor/VFXGraph/Shaders/Templates/VFXParticleSphere.template +++ b/com.unity.render-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 index 6991c6dde61..eeaeff94773 100644 --- 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 index 24109c4f160..f6b6204f0d5 100644 --- 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/com.unity.render-pipelines.high-definition/Runtime/Core/CoreResources/BlitCubeTextureFace.shader b/com.unity.render-pipelines.high-definition/Runtime/Core/CoreResources/BlitCubeTextureFace.shader index 86b4347cec7..f98dd74f784 100644 --- a/com.unity.render-pipelines.high-definition/Runtime/Core/CoreResources/BlitCubeTextureFace.shader +++ b/com.unity.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 index 8aca68776cf..fbd96fdaadc 100644 --- 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 index 3ece9b92992..32f2a913a98 100644 --- 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 index 9c338d69bf0..f673b6e6c2a 100644 --- 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 index 60c312caa59..708c3a0d459 100644 --- 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/com.unity.render-pipelines.high-definition/Runtime/Lighting/AtmosphericScattering/OpaqueAtmosphericScattering.shader b/com.unity.render-pipelines.high-definition/Runtime/Lighting/AtmosphericScattering/OpaqueAtmosphericScattering.shader index 90773d81a55..07074ecd2cc 100644 --- a/com.unity.render-pipelines.high-definition/Runtime/Lighting/AtmosphericScattering/OpaqueAtmosphericScattering.shader +++ b/com.unity.render-pipelines.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/com.unity.render-pipelines.high-definition/Runtime/Lighting/Shadow/DebugDisplayHDShadowMap.shader b/com.unity.render-pipelines.high-definition/Runtime/Lighting/Shadow/DebugDisplayHDShadowMap.shader index 0fe4d87ac4f..fbdef7797e9 100644 --- a/com.unity.render-pipelines.high-definition/Runtime/Lighting/Shadow/DebugDisplayHDShadowMap.shader +++ b/com.unity.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 index 9b199590678..6a99abf4274 100644 --- 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 index 95929797ab5..4bde629c733 100644 --- 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/com.unity.render-pipelines.high-definition/Runtime/Material/LTCAreaLight/FilterAreaLightCookies.shader b/com.unity.render-pipelines.high-definition/Runtime/Material/LTCAreaLight/FilterAreaLightCookies.shader index ec3ec4c9597..6dd280039d3 100644 --- a/com.unity.render-pipelines.high-definition/Runtime/Material/LTCAreaLight/FilterAreaLightCookies.shader +++ b/com.unity.render-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 index bee8f7ccb4c..492e72d7ebf 100644 --- 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/com.unity.render-pipelines.high-definition/Runtime/Material/LayeredLit/LayeredLitTessellation.shader b/com.unity.render-pipelines.high-definition/Runtime/Material/LayeredLit/LayeredLitTessellation.shader index a27215af24e..573c977faba 100644 --- a/com.unity.render-pipelines.high-definition/Runtime/Material/LayeredLit/LayeredLitTessellation.shader +++ b/com.unity.render-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/com.unity.render-pipelines.high-definition/Runtime/Material/TerrainLit/TerrainLit_BasemapGen.shader b/com.unity.render-pipelines.high-definition/Runtime/Material/TerrainLit/TerrainLit_BasemapGen.shader index b458b0d58af..8f86aded9dd 100644 --- a/com.unity.render-pipelines.high-definition/Runtime/Material/TerrainLit/TerrainLit_BasemapGen.shader +++ b/com.unity.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/com.unity.render-pipelines.high-definition/Runtime/PostProcessing/Shaders/LensFlareDataDriven.shader b/com.unity.render-pipelines.high-definition/Runtime/PostProcessing/Shaders/LensFlareDataDriven.shader index c442f937489..e118ceddba6 100644 --- a/com.unity.render-pipelines.high-definition/Runtime/PostProcessing/Shaders/LensFlareDataDriven.shader +++ b/com.unity.render-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/com.unity.render-pipelines.high-definition/Runtime/PostProcessing/Shaders/SubpixelMorphologicalAntialiasing.shader b/com.unity.render-pipelines.high-definition/Runtime/PostProcessing/Shaders/SubpixelMorphologicalAntialiasing.shader index 153a3242cd1..0f16a04832b 100644 --- a/com.unity.render-pipelines.high-definition/Runtime/PostProcessing/Shaders/SubpixelMorphologicalAntialiasing.shader +++ b/com.unity.render-pipelines.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/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/Raytracing/Shaders/DebugLightCluster.shader b/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/Raytracing/Shaders/DebugLightCluster.shader index 29bbb6c5d8a..b94cc8aa9db 100644 --- a/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/Raytracing/Shaders/DebugLightCluster.shader +++ b/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/Raytracing/Shaders/DebugLightCluster.shader @@ -1,8 +1,8 @@ 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/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/RenderPass/CustomPass/CustomPassRenderersUtils.shader b/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/RenderPass/CustomPass/CustomPassRenderersUtils.shader index 65ddb2e4ad3..3eff83ed5dc 100644 --- a/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/RenderPass/CustomPass/CustomPassRenderersUtils.shader +++ b/com.unity.render-pipelines.high-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/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/RenderPass/CustomPass/CustomPassUtils.shader b/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/RenderPass/CustomPass/CustomPassUtils.shader index 503797798c1..a90061d7cfc 100644 --- a/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/RenderPass/CustomPass/CustomPassUtils.shader +++ b/com.unity.render-pipelines.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 index 5d529364f32..ece8cef5ca1 100644 --- 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/com.unity.render-pipelines.high-definition/Runtime/Sky/CloudSystem/CloudLayer/CloudLayer.shader b/com.unity.render-pipelines.high-definition/Runtime/Sky/CloudSystem/CloudLayer/CloudLayer.shader index e05bbe361bb..f706c432f91 100644 --- a/com.unity.render-pipelines.high-definition/Runtime/Sky/CloudSystem/CloudLayer/CloudLayer.shader +++ b/com.unity.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 diff --git a/com.unity.render-pipelines.high-definition/Runtime/Sky/GradientSky/GradientSky.shader b/com.unity.render-pipelines.high-definition/Runtime/Sky/GradientSky/GradientSky.shader index 6f10a12e0a6..ffa0d53747d 100644 --- a/com.unity.render-pipelines.high-definition/Runtime/Sky/GradientSky/GradientSky.shader +++ b/com.unity.render-pipelines.high-definition/Runtime/Sky/GradientSky/GradientSky.shader @@ -69,6 +69,7 @@ Shader "Hidden/HDRP/Sky/GradientSky" SubShader { + Tags{ "RenderPipeline" = "HDRenderPipeline" } Pass { ZWrite Off diff --git a/com.unity.render-pipelines.high-definition/Runtime/Sky/HDRISky/HDRISky.shader b/com.unity.render-pipelines.high-definition/Runtime/Sky/HDRISky/HDRISky.shader index abf0ef9d39a..cde9fdc022e 100644 --- a/com.unity.render-pipelines.high-definition/Runtime/Sky/HDRISky/HDRISky.shader +++ b/com.unity.render-pipelines.high-definition/Runtime/Sky/HDRISky/HDRISky.shader @@ -353,6 +353,7 @@ Shader "Hidden/HDRP/Sky/HDRISky" SubShader { + Tags{ "RenderPipeline" = "HDRenderPipeline" } // Regular HDRI Sky // For cubemap Pass diff --git a/com.unity.render-pipelines.high-definition/Runtime/Sky/PhysicallyBasedSky/PhysicallyBasedSky.shader b/com.unity.render-pipelines.high-definition/Runtime/Sky/PhysicallyBasedSky/PhysicallyBasedSky.shader index 1728bc8a85f..07e674683e1 100644 --- a/com.unity.render-pipelines.high-definition/Runtime/Sky/PhysicallyBasedSky/PhysicallyBasedSky.shader +++ b/com.unity.render-pipelines.high-definition/Runtime/Sky/PhysicallyBasedSky/PhysicallyBasedSky.shader @@ -247,6 +247,7 @@ Shader "Hidden/HDRP/Sky/PbrSky" SubShader { + Tags{ "RenderPipeline" = "HDRenderPipeline" } Pass { ZWrite Off From 3b14d57148f61cd2d3bbdb409910fda36180543d Mon Sep 17 00:00:00 2001 From: Sebastien Lagarde Date: Wed, 29 Sep 2021 13:01:48 +0200 Subject: [PATCH 2/2] fix compilation --- .../Editor/Core/TextureCombiner/TextureCombiner.shader | 4 ++-- .../Runtime/Material/TerrainLit/TerrainLit_BasemapGen.shader | 2 +- .../Raytracing/Shaders/DebugLightCluster.shader | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/com.unity.render-pipelines.high-definition/Editor/Core/TextureCombiner/TextureCombiner.shader b/com.unity.render-pipelines.high-definition/Editor/Core/TextureCombiner/TextureCombiner.shader index 7d678a609d3..721e1b87853 100644 --- a/com.unity.render-pipelines.high-definition/Editor/Core/TextureCombiner/TextureCombiner.shader +++ b/com.unity.render-pipelines.high-definition/Editor/Core/TextureCombiner/TextureCombiner.shader @@ -22,8 +22,8 @@ Shader "Hidden/SRP_Core/TextureCombiner" _ARemap ("A Remap", Vector) = (0, 1, 0, 0) } SubShader - { - Tags { "RenderType"="Opaque", "RenderPipeline" = "HDRenderPipeline" } + { + Tags { "RenderType"="Opaque" "RenderPipeline" = "HDRenderPipeline" } LOD 100 Pass diff --git a/com.unity.render-pipelines.high-definition/Runtime/Material/TerrainLit/TerrainLit_BasemapGen.shader b/com.unity.render-pipelines.high-definition/Runtime/Material/TerrainLit/TerrainLit_BasemapGen.shader index 8f86aded9dd..48102d305ac 100644 --- a/com.unity.render-pipelines.high-definition/Runtime/Material/TerrainLit/TerrainLit_BasemapGen.shader +++ b/com.unity.render-pipelines.high-definition/Runtime/Material/TerrainLit/TerrainLit_BasemapGen.shader @@ -7,7 +7,7 @@ Shader "Hidden/HDRP/TerrainLit_BasemapGen" SubShader { - Tags { "RenderPipeline" = "HDRenderPipeline", "SplatCount" = "8" } + Tags { "RenderPipeline" = "HDRenderPipeline" "SplatCount" = "8" } HLSLINCLUDE diff --git a/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/Raytracing/Shaders/DebugLightCluster.shader b/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/Raytracing/Shaders/DebugLightCluster.shader index b94cc8aa9db..0c8d3635c05 100644 --- a/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/Raytracing/Shaders/DebugLightCluster.shader +++ b/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/Raytracing/Shaders/DebugLightCluster.shader @@ -1,7 +1,7 @@ Shader "Hidden/HDRP/DebugLightCluster" { SubShader - { + { Tags { "RenderPipeline" = "HDRenderPipeline" "Queue"="Transparent+0" "IgnoreProjector"="True" "RenderType"="Transparent" } HLSLINCLUDE