Merge remote-tracking branch 'refs/remotes/origin/master' into Refactor-lightloop

Assets/ScriptableRenderLoop/HDRenderLoop/Lighting/TilePass/Resources/lightlistbuild-bigtile.compute

 	int offs = tileIDX.y*nrBigTilesX + tileIDX.x;
 
 	for(i=t; i<(iNrCoarseLights+1); i+=NR_THREADS)
-		g_vLightList[MAX_NR_BIGTILE_LIGHTS_PLUSONE*offs + i] = t==0 ? iNrCoarseLights : lightsListLDS[i-1];
+		g_vLightList[MAX_NR_BIGTILE_LIGHTS_PLUSONE*offs + i] = i==0 ? iNrCoarseLights : lightsListLDS[i-1];
 }
 
 

Assets/ScriptableRenderLoop/HDRenderLoop/Lighting/TilePass/Resources/lightlistbuild.compute

 	
 	for(l=threadID; l<iNrCoarseLights; l+=NR_THREADS)
 	{
-		SFiniteLightBound lightData = g_data[coarseList[l]];
+		SFiniteLightBound lightData = g_data[prunedList[l]];
 	
 		if( DoesSphereOverlapTile(V, halfTileSizeAtZDistOne, lightData.center.xyz, lightData.radius) )
 		{

Assets/ScriptableRenderLoop/HDRenderLoop/Lighting/TilePass/ShaderBase.hlsl

 
 float FetchDepth(Texture2D depthTexture, uint2 pixCoord)
 {
-    return 1.0 - LOAD_TEXTURE2D(depthTexture, pixCoord.xy).x;
+	float zdpth = LOAD_TEXTURE2D(depthTexture, pixCoord.xy).x;
+#if !defined(SHADER_API_GLES3) && !defined(SHADER_API_GLCORE)
+	zdpth = 1.0 - zdpth;
+#endif
+	return zdpth;
-    return 1.0 - LOAD_TEXTURE2D_MSAA(depthTexture, pixCoord.xy, sampleIdx).x;
+	float zdpth = LOAD_TEXTURE2D_MSAA(depthTexture, pixCoord.xy, sampleIdx).x;
+#if !defined(SHADER_API_GLES3) && !defined(SHADER_API_GLCORE)
+    zdpth = 1.0 - zdpth;
+#endif
+	return zdpth;
 }
 
 #endif

Assets/ScriptableRenderLoop/RenderPasses/ShadowRenderPass.cs

                 if (!cullResults.GetShadowCasterBounds(lightIndex, out bounds))
                 {
                     Profiler.EndSample();
-                    return;
+                    continue;
                 }
                 Profiler.EndSample();
 

Assets/ScriptableRenderLoop/common/ShaderBase.h

 
 float FetchDepth(Texture2D depthTexture, uint2 pixCoord)
 {
-    return 1 - depthTexture.Load(uint3(pixCoord.xy, 0)).x;
+	float zdpth = depthTexture.Load(uint3(pixCoord.xy, 0)).x;
+#if !defined(SHADER_API_GLES3) && !defined(SHADER_API_GLCORE)
+	zdpth = 1.0 - zdpth;
+#endif
+    return zdpth;
-    return 1 - depthTexture.Load(uint3(pixCoord.xy, 0), sampleIdx).x;
+	float zdpth = depthTexture.Load(uint3(pixCoord.xy, 0), sampleIdx).x;
+#if !defined(SHADER_API_GLES3) && !defined(SHADER_API_GLCORE)
+	zdpth = 1.0 - zdpth;
+#endif
+    return zdpth;
 }
 
 #endif

Assets/ScriptableRenderLoop/fptl/LightingTemplate.hlsl

 StructuredBuffer<DirectionalLight> g_dirLightData;
 
 
-#define VALVE_DECLARE_SHADOWMAP( tex ) Texture2D tex; SamplerComparisonState sampler##tex
-#define VALVE_SAMPLE_SHADOW( tex, coord ) tex.SampleCmpLevelZero( sampler##tex, (coord).xy, (coord).z )
+#define DECLARE_SHADOWMAP( tex ) Texture2D tex; SamplerComparisonState sampler##tex
+#define SAMPLE_SHADOW( tex, coord ) tex.SampleCmpLevelZero( sampler##tex, (coord).xy, (coord).z )
-VALVE_DECLARE_SHADOWMAP(g_tShadowBuffer);
+DECLARE_SHADOWMAP(g_tShadowBuffer);
 
 float ComputeShadow_PCF_3x3_Gaussian(float3 vPositionWs, float4x4 matWorldToShadow)
 {
     float objDepth = saturate(257.0 / 256.0 - vPositionTextureSpace.z);
 
     float4 v20Taps;
-    v20Taps.x = VALVE_SAMPLE_SHADOW(g_tShadowBuffer, float3(shadowMapCenter.xy + g_vShadow3x3PCFTerms1.xy, objDepth)).x; //  1  1
-    v20Taps.y = VALVE_SAMPLE_SHADOW(g_tShadowBuffer, float3(shadowMapCenter.xy + g_vShadow3x3PCFTerms1.zy, objDepth)).x; // -1  1
-    v20Taps.z = VALVE_SAMPLE_SHADOW(g_tShadowBuffer, float3(shadowMapCenter.xy + g_vShadow3x3PCFTerms1.xw, objDepth)).x; //  1 -1
-    v20Taps.w = VALVE_SAMPLE_SHADOW(g_tShadowBuffer, float3(shadowMapCenter.xy + g_vShadow3x3PCFTerms1.zw, objDepth)).x; // -1 -1
+    v20Taps.x = SAMPLE_SHADOW(g_tShadowBuffer, float3(shadowMapCenter.xy + g_vShadow3x3PCFTerms1.xy, objDepth)).x; //  1  1
+    v20Taps.y = SAMPLE_SHADOW(g_tShadowBuffer, float3(shadowMapCenter.xy + g_vShadow3x3PCFTerms1.zy, objDepth)).x; // -1  1
+    v20Taps.z = SAMPLE_SHADOW(g_tShadowBuffer, float3(shadowMapCenter.xy + g_vShadow3x3PCFTerms1.xw, objDepth)).x; //  1 -1
+    v20Taps.w = SAMPLE_SHADOW(g_tShadowBuffer, float3(shadowMapCenter.xy + g_vShadow3x3PCFTerms1.zw, objDepth)).x; // -1 -1
     float flSum = dot(v20Taps.xyzw, float4(0.25, 0.25, 0.25, 0.25));
     if ((flSum == 0.0) || (flSum == 1.0))
         return flSum;
-    v33Taps.x = VALVE_SAMPLE_SHADOW(g_tShadowBuffer, float3(shadowMapCenter.xy + g_vShadow3x3PCFTerms2.xz, objDepth)).x; //  1  0
-    v33Taps.y = VALVE_SAMPLE_SHADOW(g_tShadowBuffer, float3(shadowMapCenter.xy + g_vShadow3x3PCFTerms3.xz, objDepth)).x; // -1  0
-    v33Taps.z = VALVE_SAMPLE_SHADOW(g_tShadowBuffer, float3(shadowMapCenter.xy + g_vShadow3x3PCFTerms3.zy, objDepth)).x; //  0 -1
-    v33Taps.w = VALVE_SAMPLE_SHADOW(g_tShadowBuffer, float3(shadowMapCenter.xy + g_vShadow3x3PCFTerms2.zy, objDepth)).x; //  0  1
+    v33Taps.x = SAMPLE_SHADOW(g_tShadowBuffer, float3(shadowMapCenter.xy + g_vShadow3x3PCFTerms2.xz, objDepth)).x; //  1  0
+    v33Taps.y = SAMPLE_SHADOW(g_tShadowBuffer, float3(shadowMapCenter.xy + g_vShadow3x3PCFTerms3.xz, objDepth)).x; // -1  0
+    v33Taps.z = SAMPLE_SHADOW(g_tShadowBuffer, float3(shadowMapCenter.xy + g_vShadow3x3PCFTerms3.zy, objDepth)).x; //  0 -1
+    v33Taps.w = SAMPLE_SHADOW(g_tShadowBuffer, float3(shadowMapCenter.xy + g_vShadow3x3PCFTerms2.zy, objDepth)).x; //  0  1
-    flSum += VALVE_SAMPLE_SHADOW(g_tShadowBuffer, float3(shadowMapCenter.xy, objDepth)).x * g_vShadow3x3PCFTerms0.z;
+    flSum += SAMPLE_SHADOW(g_tShadowBuffer, float3(shadowMapCenter.xy, objDepth)).x * g_vShadow3x3PCFTerms0.z;
 
     return flSum;
 }

Assets/ScriptableRenderLoop/fptl/StandardTest.shader

             #pragma multi_compile DIRLIGHTMAP_OFF DIRLIGHTMAP_COMBINED DIRLIGHTMAP_SEPARATE
             #pragma multi_compile DYNAMICLIGHTMAP_OFF DYNAMICLIGHTMAP_ON
             #pragma multi_compile_fog
+			#pragma multi_compile TILED_FORWARD REGULAR_FORWARD
 
             #pragma vertex vertForward
             #pragma fragment fragForward
             #pragma multi_compile DIRLIGHTMAP_OFF DIRLIGHTMAP_COMBINED DIRLIGHTMAP_SEPARATE
             #pragma multi_compile DYNAMICLIGHTMAP_OFF DYNAMICLIGHTMAP_ON
             #pragma multi_compile_fog
-			#pragma multi_compile TILED_FORWARD REGULAR_FORWARD
 
             #pragma vertex vertForward
             #pragma fragment fragNoLight

Assets/ScriptableRenderLoop/fptl/lightlistbuild-bigtile.compute

 	int offs = tileIDX.y*nrBigTilesX + tileIDX.x;
 
 	for(int i=t; i<(iNrCoarseLights+1); i+=NR_THREADS)
-		g_vLightList[MAX_NR_BIGTILE_LIGHTS_PLUSONE*offs + i] = t==0 ? iNrCoarseLights : lightsListLDS[i-1];
+		g_vLightList[MAX_NR_BIGTILE_LIGHTS_PLUSONE*offs + i] = i==0 ? iNrCoarseLights : lightsListLDS[i-1];
 }
 
 

Assets/ScriptableRenderLoop/fptl/lightlistbuild.compute

 	
 	for(int l=threadID; l<iNrCoarseLights; l+=NR_THREADS)
 	{
-		SFiniteLightBound lightData = g_data[coarseList[l]];
+		SFiniteLightBound lightData = g_data[prunedList[l]];
 	
 		if( DoesSphereOverlapTile(V, halfTileSizeAtZDistOne, lightData.center.xyz, lightData.radius) )
 		{