# Conflicts: # ScriptableRenderPipeline/Core/Editor/ShaderGenerator/CSharpToHLSL.cs # ScriptableRenderPipeline/Core/Resources/EncodeBC6H.compute # ScriptableRenderPipeline/HDRenderPipeline/HDRenderPipeline.cs # ScriptableRenderPipeline/HDRenderPipeline/Material/Decal/DecalData.hlsl # ScriptableRenderPipeline/HDRenderPipeline/Material/Decal/DecalProperties.hlsl