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

sebastienlagarde · sebastienlagarde · commit ac87de1e1c19 · 2016-12-07T04:13:13.000+01:00
diff --git a/Assets/ScriptableRenderLoop/HDRenderLoop/Lighting/TilePass/Resources/lightlistbuild-bigtile.compute b/Assets/ScriptableRenderLoop/HDRenderLoop/Lighting/TilePass/Resources/lightlistbuild-bigtile.compute
@@ -145,7 +145,7 @@ void BigTileLightListGen(uint threadID : SV_GroupIndex, uint3 u3GroupID : SV_Gro
 	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];
 }
 
 
diff --git a/Assets/ScriptableRenderLoop/HDRenderLoop/Lighting/TilePass/Resources/lightlistbuild.compute b/Assets/ScriptableRenderLoop/HDRenderLoop/Lighting/TilePass/Resources/lightlistbuild.compute
@@ -294,7 +294,7 @@ int SphericalIntersectionTests(uint threadID, int iNrCoarseLights, float2 screen
 	
 	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) )
 		{
diff --git a/Assets/ScriptableRenderLoop/HDRenderLoop/Lighting/TilePass/ShaderBase.hlsl b/Assets/ScriptableRenderLoop/HDRenderLoop/Lighting/TilePass/ShaderBase.hlsl
@@ -19,12 +19,20 @@
 
 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;
 }
 
 float FetchDepthMSAA(Texture2DMS<float> depthTexture, uint2 pixCoord, uint sampleIdx)
 {
-    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
diff --git a/Assets/ScriptableRenderLoop/RenderPasses/ShadowRenderPass.cs b/Assets/ScriptableRenderLoop/RenderPasses/ShadowRenderPass.cs
@@ -326,7 +326,7 @@ void RenderPackedShadows(RenderLoop loop, CullResults cullResults, ref ShadowOut
                 if (!cullResults.GetShadowCasterBounds(lightIndex, out bounds))
                 {
                     Profiler.EndSample();
-                    return;
+                    continue;
                 }
                 Profiler.EndSample();
 
diff --git a/Assets/ScriptableRenderLoop/common/ShaderBase.h b/Assets/ScriptableRenderLoop/common/ShaderBase.h
@@ -31,12 +31,20 @@
 
 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;
 }
 
 float FetchDepthMSAA(Texture2DMS<float> depthTexture, uint2 pixCoord, uint sampleIdx)
 {
-    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
diff --git a/Assets/ScriptableRenderLoop/fptl/LightingTemplate.hlsl b/Assets/ScriptableRenderLoop/fptl/LightingTemplate.hlsl
@@ -45,10 +45,10 @@ UNITY_DECLARE_TEXCUBEARRAY(_pointCookieTextures);
 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)
 {
@@ -63,23 +63,23 @@ float ComputeShadow_PCF_3x3_Gaussian(float3 vPositionWs, float4x4 matWorldToShad
     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;
     flSum *= g_vShadow3x3PCFTerms0.x * 4.0;
 
     float4 v33Taps;
-    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 += dot(v33Taps.xyzw, g_vShadow3x3PCFTerms0.yyyy);
 
-    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;
 }
diff --git a/Assets/ScriptableRenderLoop/fptl/StandardTest.shader b/Assets/ScriptableRenderLoop/fptl/StandardTest.shader
@@ -84,6 +84,7 @@ Shader "Experim/StdShader"
             #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
@@ -124,7 +125,6 @@ Shader "Experim/StdShader"
             #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
diff --git a/Assets/ScriptableRenderLoop/fptl/lightlistbuild-bigtile.compute b/Assets/ScriptableRenderLoop/fptl/lightlistbuild-bigtile.compute
@@ -143,7 +143,7 @@ void BigTileLightListGen(uint threadID : SV_GroupIndex, uint3 u3GroupID : SV_Gro
 	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];
 }
 
 
diff --git a/Assets/ScriptableRenderLoop/fptl/lightlistbuild.compute b/Assets/ScriptableRenderLoop/fptl/lightlistbuild.compute
@@ -294,7 +294,7 @@ int SphericalIntersectionTests(uint threadID, int iNrCoarseLights, float2 screen
 	
 	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) )
 		{

Original file line number	Diff line number	Diff line change
`@@ -145,7 +145,7 @@ void BigTileLightListGen(uint threadID : SV_GroupIndex, uint3 u3GroupID : SV_Gro`
`145`	`145`	`int offs = tileIDX.y*nrBigTilesX + tileIDX.x;`
`146`	`146`
`147`	`147`	`for(i=t; i<(iNrCoarseLights+1); i+=NR_THREADS)`
`148`		`- g_vLightList[MAX_NR_BIGTILE_LIGHTS_PLUSONE*offs + i] = t==0 ? iNrCoarseLights : lightsListLDS[i-1];`
	`148`	`+ g_vLightList[MAX_NR_BIGTILE_LIGHTS_PLUSONE*offs + i] = i==0 ? iNrCoarseLights : lightsListLDS[i-1];`
`149`	`149`	`}`
`150`	`150`
`151`	`151`
Original file line number	Diff line number	Diff line change
`@@ -294,7 +294,7 @@ int SphericalIntersectionTests(uint threadID, int iNrCoarseLights, float2 screen`
`294`	`294`
`295`	`295`	`for(l=threadID; l<iNrCoarseLights; l+=NR_THREADS)`
`296`	`296`	`{`
`297`		`- SFiniteLightBound lightData = g_data[coarseList[l]];`
	`297`	`+ SFiniteLightBound lightData = g_data[prunedList[l]];`
`298`	`298`
`299`	`299`	`if( DoesSphereOverlapTile(V, halfTileSizeAtZDistOne, lightData.center.xyz, lightData.radius) )`
`300`	`300`	`{`
Original file line number	Diff line number	Diff line change
`@@ -19,12 +19,20 @@`
`19`	`19`
`20`	`20`	`float FetchDepth(Texture2D depthTexture, uint2 pixCoord)`
`21`	`21`	`{`
`22`		`- return 1.0 - LOAD_TEXTURE2D(depthTexture, pixCoord.xy).x;`
	`22`	`+ float zdpth = LOAD_TEXTURE2D(depthTexture, pixCoord.xy).x;`
	`23`	`+#if !defined(SHADER_API_GLES3) && !defined(SHADER_API_GLCORE)`
	`24`	`+ zdpth = 1.0 - zdpth;`
	`25`	`+#endif`
	`26`	`+ return zdpth;`
`23`	`27`	`}`
`24`	`28`
`25`	`29`	`float FetchDepthMSAA(Texture2DMS<float> depthTexture, uint2 pixCoord, uint sampleIdx)`
`26`	`30`	`{`
`27`		`- return 1.0 - LOAD_TEXTURE2D_MSAA(depthTexture, pixCoord.xy, sampleIdx).x;`
	`31`	`+ float zdpth = LOAD_TEXTURE2D_MSAA(depthTexture, pixCoord.xy, sampleIdx).x;`
	`32`	`+#if !defined(SHADER_API_GLES3) && !defined(SHADER_API_GLCORE)`
	`33`	`+ zdpth = 1.0 - zdpth;`
	`34`	`+#endif`
	`35`	`+ return zdpth;`
`28`	`36`	`}`
`29`	`37`
`30`	`38`	`#endif`
Original file line number	Diff line number	Diff line change
`@@ -326,7 +326,7 @@ void RenderPackedShadows(RenderLoop loop, CullResults cullResults, ref ShadowOut`
`326`	`326`	`if (!cullResults.GetShadowCasterBounds(lightIndex, out bounds))`
`327`	`327`	`{`
`328`	`328`	`Profiler.EndSample();`
`329`		`- return;`
	`329`	`+ continue;`
`330`	`330`	`}`
`331`	`331`	`Profiler.EndSample();`
`332`	`332`
Original file line number	Diff line number	Diff line change
`@@ -31,12 +31,20 @@`
`31`	`31`
`32`	`32`	`float FetchDepth(Texture2D depthTexture, uint2 pixCoord)`
`33`	`33`	`{`
`34`		`- return 1 - depthTexture.Load(uint3(pixCoord.xy, 0)).x;`
	`34`	`+ float zdpth = depthTexture.Load(uint3(pixCoord.xy, 0)).x;`
	`35`	`+#if !defined(SHADER_API_GLES3) && !defined(SHADER_API_GLCORE)`
	`36`	`+ zdpth = 1.0 - zdpth;`
	`37`	`+#endif`
	`38`	`+ return zdpth;`
`35`	`39`	`}`
`36`	`40`
`37`	`41`	`float FetchDepthMSAA(Texture2DMS<float> depthTexture, uint2 pixCoord, uint sampleIdx)`
`38`	`42`	`{`
`39`		`- return 1 - depthTexture.Load(uint3(pixCoord.xy, 0), sampleIdx).x;`
	`43`	`+ float zdpth = depthTexture.Load(uint3(pixCoord.xy, 0), sampleIdx).x;`
	`44`	`+#if !defined(SHADER_API_GLES3) && !defined(SHADER_API_GLCORE)`
	`45`	`+ zdpth = 1.0 - zdpth;`
	`46`	`+#endif`
	`47`	`+ return zdpth;`
`40`	`48`	`}`
`41`	`49`
`42`	`50`	`#endif`
Original file line number	Diff line number	Diff line change
`@@ -143,7 +143,7 @@ void BigTileLightListGen(uint threadID : SV_GroupIndex, uint3 u3GroupID : SV_Gro`
`143`	`143`	`int offs = tileIDX.y*nrBigTilesX + tileIDX.x;`
`144`	`144`
`145`	`145`	`for(int i=t; i<(iNrCoarseLights+1); i+=NR_THREADS)`
`146`		`- g_vLightList[MAX_NR_BIGTILE_LIGHTS_PLUSONE*offs + i] = t==0 ? iNrCoarseLights : lightsListLDS[i-1];`
	`146`	`+ g_vLightList[MAX_NR_BIGTILE_LIGHTS_PLUSONE*offs + i] = i==0 ? iNrCoarseLights : lightsListLDS[i-1];`
`147`	`147`	`}`
`148`	`148`
`149`	`149`