Merge remote-tracking branch 'origin/master' into scriptablerenderloop-materialgraph

Assets/ScriptableRenderLoop/HDRenderLoop/Editor/HDRenderLoopInspector.cs

             public readonly int[] shadowsCascadeCountValues = new int[] { 1, 2, 3, 4 };
             public readonly GUIContent shadowsCascades = new GUIContent("Cascade values");
 
-            public readonly GUIContent tileLightLoopSettings = new GUIContent("Tile Light Loop settings");
+            public readonly GUIContent tileLightLoopSettings = new GUIContent("Tile Light Loop Settings");
             public readonly string[] tileLightLoopDebugTileFlagStrings = new string[] { "Punctual Light", "Area Light", "Env Light"};
             public readonly GUIContent splitLightEvaluation = new GUIContent("Split light and reflection evaluation", "Toggle");
             public readonly GUIContent bigTilePrepass = new GUIContent("Enable big tile prepass", "Toggle");
 
 
-            public readonly GUIContent textureSettings = new GUIContent("texture Settings");
+            public readonly GUIContent textureSettings = new GUIContent("Texture Settings");
-            public readonly GUIContent spotCookieSize = new GUIContent("spotCookie Size");
-            public readonly GUIContent pointCookieSize = new GUIContent("pointCookie Size");
-            public readonly GUIContent reflectionCubemapSize = new GUIContent("reflectionCubemap Size");              
+            public readonly GUIContent spotCookieSize = new GUIContent("Spot cookie size");
+            public readonly GUIContent pointCookieSize = new GUIContent("Point cookie size");
+            public readonly GUIContent reflectionCubemapSize = new GUIContent("Reflection cubemap size");              
         }
 
         private static Styles s_Styles = null;
             }
         }
 
-        public override void OnInspectorGUI()
+        private void DebugParametersUI(HDRenderLoop renderLoop)
-            var renderLoop = target as HDRenderLoop;
-
-            if (!renderLoop)
-                return;
-
             var debugParameters = renderLoop.debugParameters;
 
             EditorGUILayout.LabelField(styles.debugParameters);
                 EditorUtility.SetDirty(renderLoop); // Repaint
             }
             EditorGUI.indentLevel--;
+        }
+        private void SkyParametersUI(HDRenderLoop renderLoop)
+        {
             EditorGUILayout.Space();
             var skyParameters = renderLoop.skyParameters;
 
                 EditorUtility.SetDirty(renderLoop); // Repaint
             }
             EditorGUI.indentLevel--;
+        }
+        private void ShadowParametersUI(HDRenderLoop renderLoop)
+        {
             EditorGUILayout.Space();
             var shadowParameters = renderLoop.shadowSettings;
 
                 EditorUtility.SetDirty(renderLoop); // Repaint
             }
             EditorGUI.indentLevel--;
+        }
+        private void TextureParametersUI(HDRenderLoop renderLoop)
+        {
             EditorGUILayout.Space();
             var textureParameters = renderLoop.textureSettings;
 
 
             if (EditorGUI.EndChangeCheck())
             {
+                renderLoop.textureSettings = textureParameters;
+        }
-
+        private void TilePassUI(HDRenderLoop renderLoop)
+        {
             EditorGUILayout.Space();
 
             // TODO: we should call a virtual method or something similar to setup the UI, inspector should not know about it
                 }
                 EditorGUI.indentLevel--;
             }
+        }
+
+        public override void OnInspectorGUI()
+        {
+            var renderLoop = target as HDRenderLoop;
+
+            if (!renderLoop)
+                return;
+
+            DebugParametersUI(renderLoop);
+            SkyParametersUI(renderLoop);
+            ShadowParametersUI(renderLoop);
+            TextureParametersUI(renderLoop);
+            TilePassUI(renderLoop);
         }
     }
 }

Assets/ScriptableRenderLoop/HDRenderLoop/HDRenderLoop.cs

         public TextureSettings textureSettings
         {
             get { return m_TextureSettings; }
+            set { m_TextureSettings = value; }
         }
 
         // Various set of material use in render loop

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

 #ifndef __SHADERBASE_H__
 #define __SHADERBASE_H__
 
+// can't use UNITY_REVERSED_Z since it's not enabled in compute shaders
+#if !defined(SHADER_API_GLES3) && !defined(SHADER_API_GLCORE)
+	#define REVERSE_ZBUF
+#endif
+
 #ifdef SHADER_API_PSSL
 
 #ifndef Texture2DMS
 float FetchDepth(Texture2D depthTexture, uint2 pixCoord)
 {
 	float zdpth = LOAD_TEXTURE2D(depthTexture, pixCoord.xy).x;
-#if !defined(SHADER_API_GLES3) && !defined(SHADER_API_GLCORE)
+#ifdef REVERSE_ZBUF
 	zdpth = 1.0 - zdpth;
 #endif
 	return zdpth;
 {
 	float zdpth = LOAD_TEXTURE2D_MSAA(depthTexture, pixCoord.xy, sampleIdx).x;
-#if !defined(SHADER_API_GLES3) && !defined(SHADER_API_GLCORE)
+#ifdef REVERSE_ZBUF
     zdpth = 1.0 - zdpth;
 #endif
 	return zdpth;

Assets/ScriptableRenderLoop/HDRenderLoop/Lighting/TilePass/TilePass.cs

                                 if (areaLightCount >= k_MaxAreaLightsOnSCreen)
                                     continue;
                                 lightCategory = LightCategory.Area;
-                                gpuLightType = GPULightType.Rectangle;
+                                gpuLightType = GPULightType.Line;
                                 lightVolumeType = LightVolumeType.Box;
                                 ++areaLightCount;
                                 break;

Assets/ScriptableRenderLoop/HDRenderLoop/Material/Lit/LitData.hlsl

-
-
-// In unity we can have a mix of fully baked lightmap (static lightmap) + enlighten realtime lightmap (dynamic lightmap)
-// for each case we can have directional lightmap or not.
-// Else we have lightprobe for dynamic/moving entity. Either SH9 per object lightprobe or SH4 per pixel per object volume probe
-float3 SampleBakedGI(float3 positionWS, float3 normalWS, float2 uvStaticLightmap, float2 uvDynamicLightmap)
-{
-    // If there is no lightmap, it assume lightprobe
-#if !defined(LIGHTMAP_ON) && !defined(DYNAMICLIGHTMAP_ON)
-
-// TODO: Confirm with Ionut but it seems that UNITY_LIGHT_PROBE_PROXY_VOLUME is always define for high end and 
-// unity_ProbeVolumeParams always bind.
-    if (unity_ProbeVolumeParams.x == 0.0)
-    {
-        // TODO: pass a tab of coefficient instead!
-        float4 SHCoefficients[7];
-        SHCoefficients[0] = unity_SHAr;
-        SHCoefficients[1] = unity_SHAg;
-        SHCoefficients[2] = unity_SHAb;
-        SHCoefficients[3] = unity_SHBr;
-        SHCoefficients[4] = unity_SHBg;
-        SHCoefficients[5] = unity_SHBb;
-        SHCoefficients[6] = unity_SHC;
-
-        return SampleSH9(SHCoefficients, normalWS);
-    }
-    else
-    {
-        // TODO: Move all this to C++!
-        float4x4 identity = 0;
-        identity._m00_m11_m22_m33 = 1.0;
-        float4x4 WorldToTexture = (unity_ProbeVolumeParams.y == 1.0f) ? unity_ProbeVolumeWorldToObject : identity;
-
-        float4x4 translation = identity;
-        translation._m30_m31_m32 = -unity_ProbeVolumeMin.xyz;
-
-        float4x4 scale = 0;
-        scale._m00_m11_m22_m33 = float4(unity_ProbeVolumeSizeInv.xyz, 1.0);
-
-        WorldToTexture = mul(mul(scale, translation), WorldToTexture);
-    
-        return SampleProbeVolumeSH4(TEXTURE3D_PARAM(unity_ProbeVolumeSH, samplerunity_ProbeVolumeSH), positionWS, normalWS, WorldToTexture, unity_ProbeVolumeParams.z);
-    }
-
-#else
-
-    float3 bakeDiffuseLighting = float3(0.0, 0.0, 0.0);
-
-    #ifdef LIGHTMAP_ON
-        #ifdef DIRLIGHTMAP_COMBINED
-        bakeDiffuseLighting += SampleDirectionalLightmap(TEXTURE2D_PARAM(unity_Lightmap, samplerunity_Lightmap),
-                                                        TEXTURE2D_PARAM(unity_LightmapInd, samplerunity_Lightmap),
-                                                        uvStaticLightmap, unity_LightmapST, normalWS);
-        #else
-        bakeDiffuseLighting += SampleSingleLightmap(TEXTURE2D_PARAM(unity_Lightmap, samplerunity_Lightmap), uvStaticLightmap, unity_LightmapST);
-        #endif
-    #endif
-
-    #ifdef DYNAMICLIGHTMAP_ON
-        #ifdef DIRLIGHTMAP_COMBINED
-        bakeDiffuseLighting += SampleDirectionalLightmap(TEXTURE2D_PARAM(unity_DynamicLightmap, samplerunity_DynamicLightmap),
-                                                        TEXTURE2D_PARAM(unity_DynamicDirectionality, samplerunity_DynamicLightmap),
-                                                        uvDynamicLightmap, unity_DynamicLightmapST, normalWS);
-        #else
-        bakeDiffuseLighting += SampleSingleLightmap(TEXTURE2D_PARAM(unity_DynamicLightmap, samplerunity_DynamicLightmap), uvDynamicLightmap, unity_DynamicLightmapST);
-        #endif
-    #endif
-
-    return bakeDiffuseLighting;
-
-#endif
-}
-
-float2 CalculateVelocity(float4 positionCS, float4 previousPositionCS)
-{
-    // This test on define is required to remove warning of divide by 0 when initializing empty struct
-    // TODO: Add forward opaque MRT case...
-#if (SHADERPASS == SHADERPASS_VELOCITY) || (SHADERPASS == SHADERPASS_GBUFFER && SHADEROPTIONS_VELOCITY_IN_GBUFFER)
-    // Encode velocity
-    positionCS.xy = positionCS.xy / positionCS.w;
-    previousPositionCS.xy = previousPositionCS.xy / previousPositionCS.w;
-
-    return (positionCS.xy - previousPositionCS.xy) * _ForceNoMotion;
-#else
-    return float2(0.0, 0.0);
-#endif
-}
+#include "../MaterialUtilities.hlsl"
 
 void GetBuiltinData(FragInput input, SurfaceData surfaceData, float alpha, out BuiltinData builtinData)
 {

Assets/ScriptableRenderLoop/HDRenderLoop/Sky/Resources/SkyHDRI.shader

             #pragma vertex Vert
             #pragma fragment Frag
 
-            #pragma multi_compile _ ATMOSPHERICS_DEBUG
-            #pragma multi_compile _ ATMOSPHERICS_OCCLUSION_FULLSKY
-            #pragma multi_compile _ PERFORM_SKY_OCCLUSION_TEST
-
-            #ifndef PERFORM_SKY_OCCLUSION_TEST
-                #define IS_RENDERING_SKY
-            #endif
-
-            #include "Assets/ScriptableRenderLoop/HDRenderLoop/ShaderVariables.hlsl"
-            #include "AtmosphericScattering.hlsl"
 
             TEXTURECUBE(_Cubemap);
             SAMPLERCUBE(sampler_Cubemap);
                 float3 rotDirY = float3(sinPhi, 0, cosPhi);
                 dir = float3(dot(rotDirX, dir), dir.y, dot(rotDirY, dir));
 
-                /*
-                Coordinate coord = GetCoordinate(input.positionCS.xy, _ScreenSize.zw);
-
-                // If the sky box is too far away (depth set to 0), the resulting look is too foggy.
-                const float skyDepth = 0.01;
-
-                #ifdef PERFORM_SKY_OCCLUSION_TEST
-                    // Determine whether the sky is occluded by the scene geometry.
-                    // Do not perform blending with the environment map if the sky is occluded.
-                    float rawDepth     = max(skyDepth, LOAD_TEXTURE2D(_CameraDepthTexture, coord.unPositionSS).r);
-                    float skyTexWeight = (rawDepth > skyDepth) ? 0.0 : 1.0;
-                #else
-                    float rawDepth     = skyDepth;
-                    float skyTexWeight = 1.0;
-                #endif
-
-                float3 positionWS = UnprojectToWorld(rawDepth, coord.positionSS, _InvViewProjMatrix);
-
-                float4 c1, c2, c3;
-                VolundTransferScatter(positionWS, c1, c2, c3);
-
-                float4 coord1 = float4(c1.rgb + c3.rgb, max(0.f, 1.f - c1.a - c3.a));
-                float3 coord2 = c2.rgb;
-
-                float sunCos = dot(normalize(dir), _SunDirection);
-                float miePh  = MiePhase(sunCos, _MiePhaseAnisotropy);
-
-                float2 occlusion  = float2(1.0, 1.0); // TODO.
-                float  extinction = coord1.a;
-                float3 scatter    = coord1.rgb * occlusion.x + coord2 * miePh * occlusion.y;
-
-                #ifdef ATMOSPHERICS_DEBUG
-                    switch (_AtmosphericsDebugMode)
-                    {
-                        case ATMOSPHERICS_DBG_RAYLEIGH:           return c1;
-                        case ATMOSPHERICS_DBG_MIE:                return c2 * miePh;
-                        case ATMOSPHERICS_DBG_HEIGHT:             return c3;
-                        case ATMOSPHERICS_DBG_SCATTERING:         return float4(scatter, 0.0);
-                        case ATMOSPHERICS_DBG_OCCLUSION:          return float4(occlusion.xy, 0.0, 0.0);
-                        case ATMOSPHERICS_DBG_OCCLUDEDSCATTERING: return float4(scatter, 0.0);
-                    }
-                #endif
-
-                */
-
-
-                // Apply extinction to the scene color when performing alpha-blending.
-                //return float4(skyColor * (skyTexWeight * extinction) + scatter, extinction);
             }
 
             ENDHLSL

Assets/ScriptableRenderLoop/HDRenderLoop/Sky/SkyRenderer.cs

 
         MaterialPropertyBlock m_RenderSkyPropertyBlock = null;
 
-        GameObject[] m_CubemapFaceCamera = new GameObject[6];
+        Matrix4x4[] m_faceCameraInvViewProjectionMatrix = new Matrix4x4[6];
-        Mesh BuildSkyMesh(Camera camera, bool forceUVBottom)
+        Mesh BuildSkyMesh(Vector3 cameraPosition, Matrix4x4 cameraInvViewProjectionMatrix, bool forceUVBottom)
         {
             Vector4 vertData0 = new Vector4(-1.0f, -1.0f, 1.0f, 1.0f);
             Vector4 vertData1 = new Vector4(1.0f, -1.0f, 1.0f, 1.0f);
             // Get view vector based on the frustum, i.e (invert transform frustum get position etc...)
             Vector3[] eyeVectorData = new Vector3[4];
 
-            Matrix4x4 transformMatrix = camera.cameraToWorldMatrix * camera.projectionMatrix.inverse;
+            Matrix4x4 transformMatrix = cameraInvViewProjectionMatrix;
 
             Vector4 posWorldSpace0 = transformMatrix * vertData0;
             Vector4 posWorldSpace1 = transformMatrix * vertData1;
-            Vector3 temp = camera.GetComponent<Transform>().position;
-            Vector4 cameraPosition = new Vector4(temp.x, temp.y, temp.z, 0.0f);
+            Vector4 cameraPos = new Vector4(cameraPosition.x, cameraPosition.y, cameraPosition.z, 0.0f);
-            Vector4 direction0 = (posWorldSpace0 / posWorldSpace0.w - cameraPosition);
-            Vector4 direction1 = (posWorldSpace1 / posWorldSpace1.w - cameraPosition);
-            Vector4 direction2 = (posWorldSpace2 / posWorldSpace2.w - cameraPosition);
-            Vector4 direction3 = (posWorldSpace3 / posWorldSpace3.w - cameraPosition);
+            Vector4 direction0 = (posWorldSpace0 / posWorldSpace0.w - cameraPos);
+            Vector4 direction1 = (posWorldSpace1 / posWorldSpace1.w - cameraPos);
+            Vector4 direction2 = (posWorldSpace2 / posWorldSpace2.w - cameraPos);
+            Vector4 direction3 = (posWorldSpace3 / posWorldSpace3.w - cameraPos);
 
             if (SystemInfo.graphicsUVStartsAtTop && !forceUVBottom)
             {
 
             for (int i = 0; i < 6; ++i)
             {
-                m_CubemapFaceCamera[i] = new GameObject();
-                m_CubemapFaceCamera[i].hideFlags = HideFlags.HideAndDontSave;
-
-                Camera camera = m_CubemapFaceCamera[i].AddComponent<Camera>();
-                camera.projectionMatrix = cubeProj;
-                Transform transform = camera.GetComponent<Transform>();
-                transform.LookAt(lookAtList[i], UpVectorList[i]);
+                Matrix4x4 lookAt = Matrix4x4.LookAt(Vector3.zero, lookAtList[i], UpVectorList[i]);
+                m_faceCameraInvViewProjectionMatrix[i] = Utilities.GetViewProjectionMatrix(lookAt, cubeProj).inverse;
-                m_CubemapFaceMesh[i] = BuildSkyMesh(camera, true);
+                m_CubemapFaceMesh[i] = BuildSkyMesh(Vector3.zero, m_faceCameraInvViewProjectionMatrix[i], true);
             }
         }
 
             Utilities.Destroy(m_GGXConvolveMaterial);
             Utilities.Destroy(m_SkyboxCubemapRT);
             Utilities.Destroy(m_SkyboxGGXCubemapRT);
-
-            for(int i = 0 ; i < 6 ; ++i)
-            {
-                Utilities.Destroy(m_CubemapFaceCamera[i]);
-            }
-
         }
 
         public bool IsSkyValid(SkyParameters parameters)
         }
 
-        private void RenderSky(Camera camera, SkyParameters skyParameters, Mesh skyMesh, RenderLoop renderLoop)
+        private void RenderSky(Matrix4x4 invViewProjectionMatrix, SkyParameters skyParameters, Mesh skyMesh, RenderLoop renderLoop)
-            Shader.EnableKeyword("PERFORM_SKY_OCCLUSION_TEST");
-
-            m_RenderSkyPropertyBlock.SetMatrix("_InvViewProjMatrix", Utilities.GetViewProjectionMatrix(camera).inverse);
+            m_RenderSkyPropertyBlock.SetMatrix("_InvViewProjMatrix", invViewProjectionMatrix);
 
             var cmd = new CommandBuffer { name = "" };
             cmd.DrawMesh(skyMesh, Matrix4x4.identity, m_SkyHDRIMaterial, 0, 0, m_RenderSkyPropertyBlock);
 
         private void RenderSkyToCubemap(SkyParameters skyParameters, RenderTexture target, RenderLoop renderLoop)
         {
-            Shader.DisableKeyword("PERFORM_SKY_OCCLUSION_TEST");
-
-                Camera faceCamera = m_CubemapFaceCamera[i].GetComponent<Camera>();
-                RenderSky(faceCamera, skyParameters, m_CubemapFaceMesh[i], renderLoop);
+                RenderSky(m_faceCameraInvViewProjectionMatrix[i], skyParameters, m_CubemapFaceMesh[i], renderLoop);
             }
         }
 
                 RenderSkyToCubemap(skyParams, target, renderLoop);
                 // End temp
 
-                // 
-
 
                 // Do the convolution on remaining mipmaps
                 float invOmegaP = (6.0f * input.width * input.width) / (4.0f * Mathf.PI); // Solid angle associated to a pixel of the cubemap;
                     for (int face = 0; face < 6; ++face)
                     {
                         Utilities.SetRenderTarget(renderLoop, target, mip, (CubemapFace)face);
- 
+
                         var cmd = new CommandBuffer { name = "" };
                         cmd.DrawMesh(m_CubemapFaceMesh[face], Matrix4x4.identity, m_GGXConvolveMaterial, 0, 0, propertyBlock);
                         renderLoop.ExecuteCommandBuffer(cmd);
                 {
                     // Trigger a rebuild of cubemap / convolution
                     // TODO: can we have some kind of hash value here ? +> use or override GetHashCode() + include a refresh rate value in parameters
-                    // TODO: we could apply multiplier/exposure and rotation on the final result (i.e on the sky ibl and on lightprobe / lightmap, but can be tricky as Unity seems to merge sky information with 
+                    // TODO: we could apply multiplier/exposure and rotation on the final result (i.e on the sky ibl and on lightprobe / lightmap, but can be tricky as Unity seems to merge sky information with
-                        skyParameters.multiplier != m_bakedSkyParameters.multiplier)
+                        skyParameters.multiplier != m_bakedSkyParameters.multiplier ||
+                        skyParameters.skyHDRI != m_bakedSkyParameters.skyHDRI)
                     {
                         using (new Utilities.ProfilingSample("Sky Pass: Render Cubemap", renderLoop))
                         {
                         }
 
                         // Cleanup all this...
+                        m_bakedSkyParameters.skyHDRI = skyParameters.skyHDRI;
                         m_bakedSkyParameters.skyResolution = skyParameters.skyResolution;
                         m_bakedSkyParameters.exposure = skyParameters.exposure;
                         m_bakedSkyParameters.rotation = skyParameters.rotation;
                     // Render the sky itself
                     Utilities.SetRenderTarget(renderLoop, colorBuffer, depthBuffer);
-                    RenderSky(camera, skyParameters, BuildSkyMesh(camera, false), renderLoop);
+                    Matrix4x4 invViewProjectionMatrix = Utilities.GetViewProjectionMatrix(camera).inverse;
+                    RenderSky(invViewProjectionMatrix, skyParameters, BuildSkyMesh(camera.GetComponent<Transform>().position, invViewProjectionMatrix, false), renderLoop);
                 }
             }
         }

Assets/ScriptableRenderLoop/HDRenderLoop/Utilities.cs

                 disposed = true;
             }
         }
-
-        public static Matrix4x4 GetViewProjectionMatrix(Camera camera)
+        public static Matrix4x4 GetViewProjectionMatrix(Matrix4x4 worldToViewMatrix, Matrix4x4 projectionMatrix)
-            var gpuProj = GL.GetGPUProjectionMatrix(camera.projectionMatrix, false);
-            var gpuVP = gpuProj * camera.worldToCameraMatrix;
+            var gpuProj = GL.GetGPUProjectionMatrix(projectionMatrix, false);
+            var gpuVP = gpuProj * worldToViewMatrix;
+        }
+
+        public static Matrix4x4 GetViewProjectionMatrix(Camera camera)
+        {
+            return GetViewProjectionMatrix(camera.worldToCameraMatrix, camera.projectionMatrix);
         }
 
         public static Vector4 ComputeScreenSize(Camera camera)

Assets/ScriptableRenderLoop/ShaderLibrary/AreaLighting.hlsl

 
     sum *= INV_TWO_PI; // Normalization
 
-    return twoSided ? abs(sum) : max(sum, 0.0);
+    sum = twoSided ? abs(sum) : max(sum, 0.0);
+
+    return isfinite(sum) ? sum : 0.0;
 }
 
 // For polygonal lights.

Assets/ScriptableRenderLoop/common/ShaderBase.h

 #ifndef __SHADERBASE_H__
 #define __SHADERBASE_H__
 
+// can't use UNITY_REVERSED_Z since it's not enabled in compute shaders
+#if !defined(SHADER_API_GLES3) && !defined(SHADER_API_GLCORE)
+	#define REVERSE_ZBUF
+#endif
+
 #ifdef SHADER_API_PSSL
 
 #ifndef Texture2DMS
 float FetchDepth(Texture2D depthTexture, uint2 pixCoord)
 {
 	float zdpth = depthTexture.Load(uint3(pixCoord.xy, 0)).x;
-#if !defined(SHADER_API_GLES3) && !defined(SHADER_API_GLCORE)
+#ifdef REVERSE_ZBUF
 	zdpth = 1.0 - zdpth;
 #endif
     return zdpth;
 {
 	float zdpth = depthTexture.Load(uint3(pixCoord.xy, 0), sampleIdx).x;
-#if !defined(SHADER_API_GLES3) && !defined(SHADER_API_GLCORE)
+#ifdef REVERSE_ZBUF
 	zdpth = 1.0 - zdpth;
 #endif
     return zdpth;

Assets/ScriptableRenderLoop/common/TextureSettings.cs

 namespace UnityEngine.Experimental.ScriptableRenderLoop
 {
     [System.Serializable]
-    public class TextureSettings
+    public struct TextureSettings
     {
         public int spotCookieSize;
         public int pointCookieSize;

Assets/ScriptableRenderLoop/fptl/LightingTemplate.hlsl

 
 
 #define DECLARE_SHADOWMAP( tex ) Texture2D tex; SamplerComparisonState sampler##tex
-#define SAMPLE_SHADOW( tex, coord ) tex.SampleCmpLevelZero( sampler##tex, (coord).xy, (coord).z )
+#ifdef REVERSE_ZBUF
+	#define SAMPLE_SHADOW( tex, coord ) tex.SampleCmpLevelZero( sampler##tex, (coord).xy, (coord).z )
+#else
+	#define SAMPLE_SHADOW( tex, coord ) tex.SampleCmpLevelZero( sampler##tex, (coord).xy, 1.0-(coord).z )
+#endif
 
 DECLARE_SHADOWMAP(g_tShadowBuffer);
 

Assets/TestScenes/HDTest/HDRenderLoopTest.unity

   - component: {fileID: 605581071}
   - component: {fileID: 605581070}
   - component: {fileID: 605581072}
-  - component: {fileID: 605581073}
   m_Layer: 0
   m_Name: Sun (directional light)
   m_TagString: Untagged
   isDoubleSided: 0
   areaLightLength: 0
   areaLightWidth: 0
---- !u!114 &605581073
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 0}
-  m_GameObject: {fileID: 605581069}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 97f65a78ace4fbf4187144e9fe724009, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  worldRayleighColorRamp:
-    serializedVersion: 2
-    key0: {r: 0.3019608, g: 0.4, b: 0.6, a: 1}
-    key1: {r: 0.5019608, g: 0.6, b: 0.8, a: 1}
-    key2: {r: 0, g: 0, b: 0, a: 0}
-    key3: {r: 0, g: 0, b: 0, a: 0}
-    key4: {r: 0, g: 0, b: 0, a: 0}
-    key5: {r: 0, g: 0, b: 0, a: 0}
-    key6: {r: 0, g: 0, b: 0, a: 0}
-    key7: {r: 0, g: 0, b: 0, a: 0}
-    ctime0: 0
-    ctime1: 65535
-    ctime2: 0
-    ctime3: 0
-    ctime4: 0
-    ctime5: 0
-    ctime6: 0
-    ctime7: 0
-    atime0: 0
-    atime1: 65535
-    atime2: 0
-    atime3: 0
-    atime4: 0
-    atime5: 0
-    atime6: 0
-    atime7: 0
-    m_Mode: 0
-    m_NumColorKeys: 2
-    m_NumAlphaKeys: 2
-  worldRayleighColorIntensity: 1
-  worldRayleighDensity: 10
-  worldRayleighExtinctionFactor: 1.1
-  worldRayleighIndirectScatter: 0.33
-  worldMieColorRamp:
-    serializedVersion: 2
-    key0: {r: 0.9490196, g: 0.7490196, b: 0.5019608, a: 1}
-    key1: {r: 1, g: 0.9019608, b: 1, a: 1}
-    key2: {r: 0, g: 0, b: 0, a: 0}
-    key3: {r: 0, g: 0, b: 0, a: 0}
-    key4: {r: 0, g: 0, b: 0, a: 0}
-    key5: {r: 0, g: 0, b: 0, a: 0}
-    key6: {r: 0, g: 0, b: 0, a: 0}
-    key7: {r: 0, g: 0, b: 0, a: 0}
-    ctime0: 0
-    ctime1: 65535
-    ctime2: 0
-    ctime3: 0
-    ctime4: 0
-    ctime5: 0
-    ctime6: 0
-    ctime7: 0
-    atime0: 0
-    atime1: 65535
-    atime2: 0
-    atime3: 0
-    atime4: 0
-    atime5: 0
-    atime6: 0
-    atime7: 0
-    m_Mode: 0
-    m_NumColorKeys: 2
-    m_NumAlphaKeys: 2
-  worldMieColorIntensity: 1
-  worldMieDensity: 15
-  worldMieExtinctionFactor: 0
-  worldMiePhaseAnisotropy: 0.9
-  worldNearScatterPush: 0
-  worldNormalDistance: 1000
-  heightRayleighColor: {r: 1, g: 1, b: 1, a: 1}
-  heightRayleighIntensity: 1
-  heightRayleighDensity: 10
-  heightMieDensity: 0
-  heightExtinctionFactor: 1.1
-  heightSeaLevel: 0
-  heightDistance: 50
-  heightPlaneShift: {x: 0, y: 0, z: 0}
-  heightNearScatterPush: 0
-  heightNormalDistance: 1000
-  atmosphericShaderOverride: {fileID: 0}
-  worldScaleExponent: 1
-  depthTexture: 0
-  debugMode: 0
 --- !u!1 &609148480
 GameObject:
   m_ObjectHideFlags: 0

ProjectSettings/ProjectVersion.txt

-m_EditorVersion: 5.6.0a6
+m_EditorVersion: 5.6.0b1

Assets/ScriptableRenderLoop/HDRenderLoop/Material/MaterialUtilities.hlsl

+// In unity we can have a mix of fully baked lightmap (static lightmap) + enlighten realtime lightmap (dynamic lightmap)
+// for each case we can have directional lightmap or not.
+// Else we have lightprobe for dynamic/moving entity. Either SH9 per object lightprobe or SH4 per pixel per object volume probe
+float3 SampleBakedGI(float3 positionWS, float3 normalWS, float2 uvStaticLightmap, float2 uvDynamicLightmap)
+{
+    // If there is no lightmap, it assume lightprobe
+#if !defined(LIGHTMAP_ON) && !defined(DYNAMICLIGHTMAP_ON)
+
+// TODO: Confirm with Ionut but it seems that UNITY_LIGHT_PROBE_PROXY_VOLUME is always define for high end and 
+// unity_ProbeVolumeParams always bind.
+    if (unity_ProbeVolumeParams.x == 0.0)
+    {
+        // TODO: pass a tab of coefficient instead!
+        float4 SHCoefficients[7];
+        SHCoefficients[0] = unity_SHAr;
+        SHCoefficients[1] = unity_SHAg;
+        SHCoefficients[2] = unity_SHAb;
+        SHCoefficients[3] = unity_SHBr;
+        SHCoefficients[4] = unity_SHBg;
+        SHCoefficients[5] = unity_SHBb;
+        SHCoefficients[6] = unity_SHC;
+
+        return SampleSH9(SHCoefficients, normalWS);
+    }
+    else
+    {
+        // TODO: Move all this to C++!
+        float4x4 identity = 0;
+        identity._m00_m11_m22_m33 = 1.0;
+        float4x4 WorldToTexture = (unity_ProbeVolumeParams.y == 1.0f) ? unity_ProbeVolumeWorldToObject : identity;
+
+        float4x4 translation = identity;
+        translation._m30_m31_m32 = -unity_ProbeVolumeMin.xyz;
+
+        float4x4 scale = 0;
+        scale._m00_m11_m22_m33 = float4(unity_ProbeVolumeSizeInv.xyz, 1.0);
+
+        WorldToTexture = mul(mul(scale, translation), WorldToTexture);
+    
+        return SampleProbeVolumeSH4(TEXTURE3D_PARAM(unity_ProbeVolumeSH, samplerunity_ProbeVolumeSH), positionWS, normalWS, WorldToTexture, unity_ProbeVolumeParams.z);
+    }
+
+#else
+
+    float3 bakeDiffuseLighting = float3(0.0, 0.0, 0.0);
+
+    #ifdef LIGHTMAP_ON
+        #ifdef DIRLIGHTMAP_COMBINED
+        bakeDiffuseLighting += SampleDirectionalLightmap(TEXTURE2D_PARAM(unity_Lightmap, samplerunity_Lightmap),
+                                                        TEXTURE2D_PARAM(unity_LightmapInd, samplerunity_Lightmap),
+                                                        uvStaticLightmap, unity_LightmapST, normalWS);
+        #else
+        bakeDiffuseLighting += SampleSingleLightmap(TEXTURE2D_PARAM(unity_Lightmap, samplerunity_Lightmap), uvStaticLightmap, unity_LightmapST);
+        #endif
+    #endif
+
+    #ifdef DYNAMICLIGHTMAP_ON
+        #ifdef DIRLIGHTMAP_COMBINED
+        bakeDiffuseLighting += SampleDirectionalLightmap(TEXTURE2D_PARAM(unity_DynamicLightmap, samplerunity_DynamicLightmap),
+                                                        TEXTURE2D_PARAM(unity_DynamicDirectionality, samplerunity_DynamicLightmap),
+                                                        uvDynamicLightmap, unity_DynamicLightmapST, normalWS);
+        #else
+        bakeDiffuseLighting += SampleSingleLightmap(TEXTURE2D_PARAM(unity_DynamicLightmap, samplerunity_DynamicLightmap), uvDynamicLightmap, unity_DynamicLightmapST);
+        #endif
+    #endif
+
+    return bakeDiffuseLighting;
+
+#endif
+}
+
+float2 CalculateVelocity(float4 positionCS, float4 previousPositionCS)
+{
+    // This test on define is required to remove warning of divide by 0 when initializing empty struct
+    // TODO: Add forward opaque MRT case...
+#if (SHADERPASS == SHADERPASS_VELOCITY) || (SHADERPASS == SHADERPASS_GBUFFER && SHADEROPTIONS_VELOCITY_IN_GBUFFER)
+    // Encode velocity
+    positionCS.xy = positionCS.xy / positionCS.w;
+    previousPositionCS.xy = previousPositionCS.xy / previousPositionCS.w;
+
+    return (positionCS.xy - previousPositionCS.xy) * _ForceNoMotion;
+#else
+    return float2(0.0, 0.0);
+#endif
+}

Assets/ScriptableRenderLoop/HDRenderLoop/Material/MaterialUtilities.hlsl.meta

+fileFormatVersion: 2
+guid: 79a3fb95997b9d54d98b5888a5082570
+timeCreated: 1481202371
+licenseType: Pro
+ShaderImporter:
+  defaultTextures: []
+  nonModifiableTextures: []
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/ScriptableRenderLoop/HDRenderLoop/Sky/Resources/SkyProcedural.shader

+Shader "Hidden/HDRenderLoop/SkyProcedural"
+{
+    SubShader
+    {
+        Pass
+        {
+            ZWrite Off
+            ZTest LEqual
+            Blend One Zero
+
+            HLSLPROGRAM
+            #pragma target 5.0
+            #pragma only_renderers d3d11 // TEMP: unitl we go futher in dev
+
+            #pragma vertex Vert
+            #pragma fragment Frag
+
+            #pragma multi_compile _ ATMOSPHERICS_DEBUG
+            #pragma multi_compile _ ATMOSPHERICS_OCCLUSION_FULLSKY
+            #pragma multi_compile _ PERFORM_SKY_OCCLUSION_TEST
+
+            #ifndef PERFORM_SKY_OCCLUSION_TEST
+                #define IS_RENDERING_SKY
+            #endif
+
+            #include "Color.hlsl"
+            #include "Common.hlsl"
+            #include "CommonLighting.hlsl"
+            #include "Assets/ScriptableRenderLoop/HDRenderLoop/ShaderVariables.hlsl"
+            #include "AtmosphericScattering.hlsl"
+
+            TEXTURECUBE(_Cubemap);
+            SAMPLERCUBE(sampler_Cubemap);
+
+            float4x4 _InvViewProjMatrix;
+            float4   _SkyParam; // x exposure, y multiplier, z rotation
+
+            struct Attributes
+            {
+                float3 positionCS : POSITION;
+                float3 eyeVector : NORMAL;
+            };
+
+            struct Varyings
+            {
+                float4 positionCS : SV_POSITION;
+                float3 eyeVector : TEXCOORD0;
+            };
+
+            Varyings Vert(Attributes input)
+            {
+                // TODO: implement SV_vertexID full screen quad
+                Varyings output;
+                output.positionCS = float4(input.positionCS.xy, UNITY_RAW_FAR_CLIP_VALUE, 1.0);
+                output.eyeVector  = input.eyeVector;
+
+                return output;
+            }
+
+            float4 Frag(Varyings input) : SV_Target
+            {
+                float3 dir = normalize(input.eyeVector);
+
+                // Rotate direction
+                float phi = DegToRad(_SkyParam.z);
+                float cosPhi, sinPhi;
+                sincos(phi, sinPhi, cosPhi);
+                float3 rotDirX = float3(cosPhi, 0, -sinPhi);
+                float3 rotDirY = float3(sinPhi, 0, cosPhi);
+                dir = float3(dot(rotDirX, dir), dir.y, dot(rotDirY, dir));
+
+                Coordinate coord = GetCoordinate(input.positionCS.xy, _ScreenSize.zw);
+
+                // If the sky box is too far away (depth set to 0), the resulting look is too foggy.
+                const float skyDepth = 0.01;
+
+                #ifdef PERFORM_SKY_OCCLUSION_TEST
+                    // Determine whether the sky is occluded by the scene geometry.
+                    // Do not perform blending with the environment map if the sky is occluded.
+                    float rawDepth     = max(skyDepth, LOAD_TEXTURE2D(_CameraDepthTexture, coord.unPositionSS).r);
+                    float skyTexWeight = (rawDepth > skyDepth) ? 0.0 : 1.0;
+                #else
+                    float rawDepth     = skyDepth;
+                    float skyTexWeight = 1.0;
+                #endif
+
+                float3 positionWS = UnprojectToWorld(rawDepth, coord.positionSS, _InvViewProjMatrix);
+
+                float4 c1, c2, c3;
+                VolundTransferScatter(positionWS, c1, c2, c3);
+
+                float4 coord1 = float4(c1.rgb + c3.rgb, max(0.f, 1.f - c1.a - c3.a));
+                float3 coord2 = c2.rgb;
+
+                float sunCos = dot(normalize(dir), _SunDirection);
+                float miePh  = MiePhase(sunCos, _MiePhaseAnisotropy);
+
+                float2 occlusion  = float2(1.0, 1.0); // TODO.
+                float  extinction = coord1.a;
+                float3 scatter    = coord1.rgb * occlusion.x + coord2 * miePh * occlusion.y;
+
+                #ifdef ATMOSPHERICS_DEBUG
+                    switch (_AtmosphericsDebugMode)
+                    {
+                        case ATMOSPHERICS_DBG_RAYLEIGH:           return c1;
+                        case ATMOSPHERICS_DBG_MIE:                return c2 * miePh;
+                        case ATMOSPHERICS_DBG_HEIGHT:             return c3;
+                        case ATMOSPHERICS_DBG_SCATTERING:         return float4(scatter, 0.0);
+                        case ATMOSPHERICS_DBG_OCCLUSION:          return float4(occlusion.xy, 0.0, 0.0);
+                        case ATMOSPHERICS_DBG_OCCLUDEDSCATTERING: return float4(scatter, 0.0);
+                    }
+                #endif
+
+                float3 skyColor = ClampToFloat16Max(SAMPLE_TEXTURECUBE_LOD(_Cubemap, sampler_Cubemap, dir, 0).rgb * exp2(_SkyParam.x) * _SkyParam.y);
+
+                // Apply extinction to the scene color when performing alpha-blending.
+                return float4(skyColor * (skyTexWeight * extinction) + scatter, extinction);
+            }
+
+            ENDHLSL
+        }
+
+    }
+    Fallback Off
+}

Assets/ScriptableRenderLoop/HDRenderLoop/Sky/Resources/SkyProcedural.shader.meta

+fileFormatVersion: 2
+guid: f96d105ca709d5c499b4886b48313d60
+timeCreated: 1481041226
+licenseType: Pro
+ShaderImporter:
+  defaultTextures: []
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: