Fix second merge issue

sebastienlagarde · sebastienlagarde · commit 8c5319e40b7f · 2017-07-26T17:21:21.000+02:00
diff --git a/Assets/ScriptableRenderPipeline/HDRenderPipeline/HDShaderIDs.cs b/Assets/ScriptableRenderPipeline/HDRenderPipeline/HDShaderIDs.cs
@@ -123,6 +123,7 @@ static class HDShaderIDs
         internal static readonly int SrcBlend = Shader.PropertyToID("_SrcBlend");
         internal static readonly int DstBlend = Shader.PropertyToID("_DstBlend");
 
+        internal static readonly int HTile = Shader.PropertyToID("_HTile");
         internal static readonly int StencilTexture = Shader.PropertyToID("_StencilTexture");
     }
 }
diff --git a/Assets/ScriptableRenderPipeline/HDRenderPipeline/Lighting/TilePass/TilePass.cs b/Assets/ScriptableRenderPipeline/HDRenderPipeline/Lighting/TilePass/TilePass.cs
@@ -1640,7 +1640,7 @@ public void BuildGPULightLists(Camera camera, CommandBuffer cmd, RenderTargetIde
                         cmd.SetComputeIntParams(buildMaterialFlagsShader, HDShaderIDs.viDimensions, w, h);
                         cmd.SetComputeBufferParam(buildMaterialFlagsShader, buildMaterialFlagsKernel, HDShaderIDs.TileFeatureFlags, s_TileFeatureFlags);
 
-                        cmd.SetComputeTextureParam(buildMaterialFlagsShader, buildMaterialFlagsKernel, HDShaderIDs.StencilTexture, cameraDepthBufferRT);
+                        cmd.SetComputeTextureParam(buildMaterialFlagsShader, buildMaterialFlagsKernel, HDShaderIDs.StencilTexture, stencilTextureRT);
                         cmd.SetComputeTextureParam(buildMaterialFlagsShader, buildMaterialFlagsKernel, HDShaderIDs.GBufferTexture0, HDShaderIDs.GBufferTexture0);
                         cmd.SetComputeTextureParam(buildMaterialFlagsShader, buildMaterialFlagsKernel, HDShaderIDs.GBufferTexture1, HDShaderIDs.GBufferTexture1);
                         cmd.SetComputeTextureParam(buildMaterialFlagsShader, buildMaterialFlagsKernel, HDShaderIDs.GBufferTexture2, HDShaderIDs.GBufferTexture2);

Original file line number	Diff line number	Diff line change
`@@ -123,6 +123,7 @@ static class HDShaderIDs`
`123`	`123`	`internal static readonly int SrcBlend = Shader.PropertyToID("_SrcBlend");`
`124`	`124`	`internal static readonly int DstBlend = Shader.PropertyToID("_DstBlend");`
`125`	`125`
	`126`	`+ internal static readonly int HTile = Shader.PropertyToID("_HTile");`
`126`	`127`	`internal static readonly int StencilTexture = Shader.PropertyToID("_StencilTexture");`
`127`	`128`	`}`
`128`	`129`	`}`