Merge branch 'master' into LW-Bugfix

ScriptableRenderPipeline/Core/CoreRP/Shadow/Shadow.cs

 
                     int sa, sv, sp;
                     asd.GetShadowAlgorithm( out sa, out sv, out sp );
-                    sreq.shadowAlgorithm = ShadowUtils.Pack( (ShadowAlgorithm) sa, (ShadowVariant) sv, (ShadowPrecision) sp );
+                    GPUShadowAlgorithm packed_algo = ShadowUtils.Pack( (ShadowAlgorithm) sa, (ShadowVariant) sv, (ShadowPrecision) sp );
+                    GetGlobalShadowOverride( shadowType, ref packed_algo );
+                    sreq.shadowAlgorithm = packed_algo;
                     totalRequestCount += (uint) facecount;
                     requestsGranted.AddUnchecked( sreq );
                     totalSlots--;

ScriptableRenderPipeline/Core/CoreRP/Shadow/ShadowBase.cs

         {
             m_GlobalOverrides[(int)shadowType].enabled = enabled;
         }
+
+        public bool GetGlobalShadowOverride( GPUShadowType shadowType, ref GPUShadowAlgorithm algo )
+        {
+            if( m_GlobalOverrides[(int)shadowType].enabled )
+                algo = ShadowUtils.Pack( m_GlobalOverrides[(int)shadowType].algorithm, m_GlobalOverrides[(int)shadowType].variant, m_GlobalOverrides[(int)shadowType].precision );
+            
+            return m_GlobalOverrides[(int)shadowType].enabled;
+        }
     }
 
     // This is the struct passed into shaders

ScriptableRenderPipeline/Core/package.json

     "version": "0.1.33",
     "unity": "2018.1",
     "dependencies": {
-        "com.unity.postprocessing": "0.2.0"
+        "com.unity.postprocessing": "2.0.2-preview"
     }
 }

ScriptableRenderPipeline/HDRenderPipeline/HDRP/Debug/DebugDisplay.hlsl

     }
 
     // 4. Display leading 0
-#pragma warning(disable : 3557) // loop only executes for 0 iteration(s)
-    for (int i = 0; i < leading0; ++i)
+    if (leading0 > 0)
-        DrawCharacter('0', fontColor, currentUnormCoord, fixedUnormCoord, flipY, color, -1);
+        for (int i = 0; i < leading0; ++i)
+        {
+            DrawCharacter('0', fontColor, currentUnormCoord, fixedUnormCoord, flipY, color, -1);
+        }
-#pragma warning(default : 3557)
 
     // 5. Display sign
     if (intValue < 0 || forceNegativeSign)

ScriptableRenderPipeline/HDRenderPipeline/HDRP/Editor/Lighting/HDLightEditor.cs

                 case LightShape.Rectangle:
                     // TODO: Currently if we use Area type as it is offline light in legacy, the light will not exist at runtime
                     //m_BaseData.type.enumValueIndex = (int)LightType.Area;
+                    // In case of change, think to update InitDefaultHDAdditionalLightData()
                     settings.lightType.enumValueIndex = (int)LightType.Point;
                     m_AdditionalLightData.lightTypeExtent.enumValueIndex = (int)LightTypeExtent.Rectangle;
                     EditorGUILayout.PropertyField(m_AdditionalLightData.shapeWidth, s_Styles.shapeWidthRect);

ScriptableRenderPipeline/HDRenderPipeline/HDRP/Editor/RenderLoopSettings/LightLoopSettingsUI.cs

 
         static void Drawer_SectionLightLoopSettings(LightLoopSettingsUI s, SerializedLightLoopSettings p, Editor owner)
         {
-            EditorGUILayout.PropertyField(p.enableTileAndCluster, _.GetContent("Enable Tile And Cluster"));
+            // Uncomment if you re-enable LIGHTLOOP_SINGLE_PASS multi_compile in lit*.shader
+            //EditorGUILayout.PropertyField(p.enableTileAndCluster, _.GetContent("Enable Tile And Cluster"));
+            //EditorGUI.indentLevel++;
+
-                EditorGUI.indentLevel++;
                 EditorGUILayout.PropertyField(p.enableFptlForForwardOpaque, _.GetContent("Enable FPTL For Forward Opaque"));
                 EditorGUILayout.PropertyField(p.enableBigTilePrepass, _.GetContent("Enable Big Tile Prepass"));
                 EditorGUILayout.PropertyField(p.enableComputeLightEvaluation, _.GetContent("Enable Compute Light Evaluation"));
                 }
                 EditorGUILayout.EndFadeGroup();
                 GUILayout.EndVertical();
-                EditorGUI.indentLevel--;
+
+            //EditorGUI.indentLevel--;
         }
     }
 }

ScriptableRenderPipeline/HDRenderPipeline/HDRP/HDRenderPipeline.cs

                 supportedLightmapsModes = LightmapsMode.NonDirectional | LightmapsMode.CombinedDirectional,
                 rendererSupportsLightProbeProxyVolumes = true,
                 rendererSupportsMotionVectors = true,
-                rendererSupportsReceiveShadows = true,
+                rendererSupportsReceiveShadows = false,
                 rendererSupportsReflectionProbes = true
             };
 

ScriptableRenderPipeline/HDRenderPipeline/HDRP/Lighting/Light/HDAdditionalLightData.cs

 
             var light = lightData.gameObject.GetComponent<Light>();
 
-            if (light.type == LightType.Area)
+            // Sanity check: lightData.lightTypeExtent is init to LightTypeExtent.Punctual (in case for unknow reasons we recreate additional data on an existing line)
+            if (light.type == LightType.Area && lightData.lightTypeExtent == LightTypeExtent.Punctual)
+                light.type = LightType.Point; // Same as in HDLightEditor
             }
         }
 

ScriptableRenderPipeline/HDRenderPipeline/HDRP/Lighting/LightLoop/LightLoopSettings.cs

                     displayName = "Lighting Settings",
                     children =
                     {
+                        // Uncomment if you re-enable LIGHTLOOP_SINGLE_PASS multi_compile in lit*.shader
+                        //new DebugUI.BoolField { displayName = "Enable Tile/Cluster", getter = () => lightLoopSettings.enableTileAndCluster, setter = value => lightLoopSettings.enableTileAndCluster = value },
-                        new DebugUI.BoolField { displayName = "Enable Tile/Cluster", getter = () => lightLoopSettings.enableTileAndCluster, setter = value => lightLoopSettings.enableTileAndCluster = value },
                         new DebugUI.BoolField { displayName = "Enable Big Tile", getter = () => lightLoopSettings.enableBigTilePrepass, setter = value => lightLoopSettings.enableBigTilePrepass = value },
                         new DebugUI.BoolField { displayName = "Enable Compute Lighting", getter = () => lightLoopSettings.enableComputeLightEvaluation, setter = value => lightLoopSettings.enableComputeLightEvaluation = value },
                         new DebugUI.BoolField { displayName = "Enable Light Classification", getter = () => lightLoopSettings.enableComputeLightVariants, setter = value => lightLoopSettings.enableComputeLightVariants = value },

ScriptableRenderPipeline/HDRenderPipeline/HDRP/Lighting/LightLoop/Shadow.hlsl

 {
 	return GetDirectionalShadowAttenuation( shadowContext, positionWS, normalWS, shadowDataIndex, L );
 }
+
+float3 GetDirectionalShadowClosestSample( ShadowContext shadowContext, real3 positionWS, real3 normalWS, int index, real4 L )
+{
+	return EvalShadow_GetClosestSample_Cascade( shadowContext, shadowContext.tex2DArray[SHADOW_DISPATCH_DIR_TEX], positionWS, normalWS, index, L );
+}
+
 #endif
 
 
 float GetPunctualShadowAttenuation( ShadowContext shadowContext, float3 positionWS, float3 normalWS, int shadowDataIndex, float3 L, float L_dist, float2 positionSS )
 {
 	return GetPunctualShadowAttenuation( shadowContext, positionWS, normalWS, shadowDataIndex, L, L_dist );
+}
+
+float3 GetPunctualShadowClosestSample( ShadowContext shadowContext, real3 positionWS, int index, real3 L )
+{
+	return EvalShadow_GetClosestSample_Punctual( shadowContext, shadowContext.tex2DArray[SHADOW_DISPATCH_PUNC_TEX], positionWS, index, L );
 }
 #endif
 

ScriptableRenderPipeline/HDRenderPipeline/HDRP/Lighting/LightLoop/ShadowContext.hlsl

 #ifndef LIGHTLOOP_SHADOW_CONTEXT_HLSL
 #define LIGHTLOOP_SHADOW_CONTEXT_HLSL
 
-#define SHADOWCONTEXT_MAX_TEX2DARRAY   4
+#define SHADOWCONTEXT_MAX_TEX2DARRAY   1
-#define SHADOWCONTEXT_MAX_SAMPLER      3
+#define SHADOWCONTEXT_MAX_SAMPLER      0
+#if SHADOWCONTEXT_MAX_TEX2DARRAY == 4
 TEXTURE2D_ARRAY(_ShadowmapExp_VSM_0);
 SAMPLER(sampler_ShadowmapExp_VSM_0);
 
 TEXTURE2D_ARRAY(_ShadowmapExp_VSM_2);
 SAMPLER(sampler_ShadowmapExp_VSM_2);
+#endif
 
 TEXTURE2D_ARRAY(_ShadowmapExp_PCF);
 SAMPLER_CMP(sampler_ShadowmapExp_PCF);
 	ShadowContext sc;
 	sc.shadowDatas     = _ShadowDatasExp;
 	sc.payloads        = _ShadowPayloads;
-    sc.tex2DArray[0]   = _ShadowmapExp_PCF;
-    sc.tex2DArray[1]   = _ShadowmapExp_VSM_0;
+	sc.tex2DArray[0]   = _ShadowmapExp_PCF;
+	sc.compSamplers[0] = sampler_ShadowmapExp_PCF;
+#if SHADOWCONTEXT_MAX_TEX2DARRAY == 4
+	sc.tex2DArray[1]   = _ShadowmapExp_VSM_0;
-    sc.compSamplers[0] = sampler_ShadowmapExp_PCF;
-    sc.samplers[0]	   = sampler_ShadowmapExp_VSM_0;
+#endif
+#if SHADOWCONTEXT_MAX_SAMPLER == 3
+	sc.samplers[0]	   = sampler_ShadowmapExp_VSM_0;
+#endif
 	return sc;
 }
 

ScriptableRenderPipeline/HDRenderPipeline/HDRP/Material/LayeredLit/LayeredLit.shader

             #pragma multi_compile _ DYNAMICLIGHTMAP_ON
             #pragma multi_compile _ SHADOWS_SHADOWMASK
             // #include "../../Lighting/Forward.hlsl"
-            #pragma multi_compile LIGHTLOOP_SINGLE_PASS LIGHTLOOP_TILE_PASS
+            //#pragma multi_compile LIGHTLOOP_SINGLE_PASS LIGHTLOOP_TILE_PASS
+            #define LIGHTLOOP_TILE_PASS
             #pragma multi_compile USE_FPTL_LIGHTLIST USE_CLUSTERED_LIGHTLIST
 
             #define SHADERPASS SHADERPASS_FORWARD

ScriptableRenderPipeline/HDRenderPipeline/HDRP/Material/LayeredLit/LayeredLitTessellation.shader

             #pragma multi_compile _ DYNAMICLIGHTMAP_ON
             #pragma multi_compile _ SHADOWS_SHADOWMASK
             // #include "../../Lighting/Forward.hlsl"
-            #pragma multi_compile LIGHTLOOP_SINGLE_PASS LIGHTLOOP_TILE_PASS
+            //#pragma multi_compile LIGHTLOOP_SINGLE_PASS LIGHTLOOP_TILE_PASS
+            #define LIGHTLOOP_TILE_PASS
             #pragma multi_compile USE_FPTL_LIGHTLIST USE_CLUSTERED_LIGHTLIST
 
             #define SHADERPASS SHADERPASS_FORWARD

ScriptableRenderPipeline/HDRenderPipeline/HDRP/Material/Lit/Lit.hlsl

     {
         // TODO: perform bilinear filtering of the shadow map.
         // Recompute transmittance using the thickness value computed from the shadow map.
-    #if 0
-        // Does not work, I get a compiler crash...
-        float3 occluderPosWS = EvalShadow_GetClosestSample_Cascade(lightLoopContext.shadowContext, posInput.positionWS, bsdfData.normalWS, lightData.shadowIndex, float4(L, 0));
-    #else
-        #define SHADOW_DISPATCH_DIR_TEX 3 // Manually keep it in sync with Shadow.hlsl...
-        float3 occluderPosWS = EvalShadow_GetClosestSample_Cascade(lightLoopContext.shadowContext, lightLoopContext.shadowContext.tex2DArray[SHADOW_DISPATCH_DIR_TEX], posInput.positionWS, bsdfData.normalWS, lightData.shadowIndex, float4(L, 0));
-    #endif
+        float3 occluderPosWS = GetDirectionalShadowClosestSample(lightLoopContext.shadowContext, posInput.positionWS, bsdfData.normalWS, lightData.shadowIndex, float4(L, 0));
 
         float thicknessInUnits       = distance(posInput.positionWS, occluderPosWS);
         float thicknessInMeters      = thicknessInUnits * _WorldScales[bsdfData.diffusionProfile].x;
     {
         // TODO: perform bilinear filtering of the shadow map.
         // Recompute transmittance using the thickness value computed from the shadow map.
-    #if 0
-        // Does not work, I get a compiler crash...
-        float3 occluderPosWS = EvalShadow_GetClosestSample_Punctual(lightLoopContext.shadowContext, posInput.positionWS, lightData.shadowIndex, L);
-    #else
-        #define SHADOW_DISPATCH_PUNC_TEX 3 // Manually keep it in sync with Shadow.hlsl...
-        float3 occluderPosWS = EvalShadow_GetClosestSample_Punctual(lightLoopContext.shadowContext, lightLoopContext.shadowContext.tex2DArray[SHADOW_DISPATCH_PUNC_TEX], posInput.positionWS, lightData.shadowIndex, L);
-    #endif
+        float3 occluderPosWS = GetPunctualShadowClosestSample(lightLoopContext.shadowContext, posInput.positionWS, lightData.shadowIndex, L);
 
         float thicknessInUnits       = distance(posInput.positionWS, occluderPosWS);
         float thicknessInMeters      = thicknessInUnits * _WorldScales[bsdfData.diffusionProfile].x;

ScriptableRenderPipeline/HDRenderPipeline/HDRP/Material/Lit/Lit.shader

             #pragma multi_compile _ DYNAMICLIGHTMAP_ON
             #pragma multi_compile _ SHADOWS_SHADOWMASK
             // #include "../../Lighting/Forward.hlsl"
-            #pragma multi_compile LIGHTLOOP_SINGLE_PASS LIGHTLOOP_TILE_PASS
+            //#pragma multi_compile LIGHTLOOP_SINGLE_PASS LIGHTLOOP_TILE_PASS
+            #define LIGHTLOOP_TILE_PASS
             #pragma multi_compile USE_FPTL_LIGHTLIST USE_CLUSTERED_LIGHTLIST
 
             #define SHADERPASS SHADERPASS_FORWARD
             #pragma multi_compile _ DYNAMICLIGHTMAP_ON
             #pragma multi_compile _ SHADOWS_SHADOWMASK
             // #include "../../Lighting/Forward.hlsl"
-            #pragma multi_compile LIGHTLOOP_SINGLE_PASS LIGHTLOOP_TILE_PASS
+            //#pragma multi_compile LIGHTLOOP_SINGLE_PASS LIGHTLOOP_TILE_PASS
+            #define LIGHTLOOP_TILE_PASS
             #pragma multi_compile USE_FPTL_LIGHTLIST USE_CLUSTERED_LIGHTLIST
 
             #define SHADERPASS SHADERPASS_FORWARD

ScriptableRenderPipeline/HDRenderPipeline/HDRP/Material/Lit/LitTessellation.shader

             #pragma multi_compile _ DYNAMICLIGHTMAP_ON
             #pragma multi_compile _ SHADOWS_SHADOWMASK
             // #include "../../Lighting/Forward.hlsl"
-            #pragma multi_compile LIGHTLOOP_SINGLE_PASS LIGHTLOOP_TILE_PASS
+            //#pragma multi_compile LIGHTLOOP_SINGLE_PASS LIGHTLOOP_TILE_PASS
+            #define LIGHTLOOP_TILE_PASS
             #pragma multi_compile USE_FPTL_LIGHTLIST USE_CLUSTERED_LIGHTLIST
 
             #define SHADERPASS SHADERPASS_FORWARD
             #pragma multi_compile _ DYNAMICLIGHTMAP_ON
             #pragma multi_compile _ SHADOWS_SHADOWMASK
             // #include "../../Lighting/Forward.hlsl"
-            #pragma multi_compile LIGHTLOOP_SINGLE_PASS LIGHTLOOP_TILE_PASS
+            //#pragma multi_compile LIGHTLOOP_SINGLE_PASS LIGHTLOOP_TILE_PASS
+            #define LIGHTLOOP_TILE_PASS
             #pragma multi_compile USE_FPTL_LIGHTLIST USE_CLUSTERED_LIGHTLIST
 
             #define SHADERPASS SHADERPASS_FORWARD

ScriptableRenderPipeline/HDRenderPipeline/HDRP/Sky/SkyManager.cs

         SkyResolution256 = 256,
         SkyResolution512 = 512,
         SkyResolution1024 = 1024,
-        // TODO: Anything above 1024 cause a crash in Unity...
-        //SkyResolution2048 = 2048,
-        //SkyResolution4096 = 4096
+        SkyResolution2048 = 2048,
+        SkyResolution4096 = 4096
     }
 
     public enum EnvironementUpdateMode

ScriptableRenderPipeline/HDRenderPipeline/package.json

     "version": "0.1.33",
     "unity": "2018.1",
     "dependencies": {
-        "com.unity.postprocessing": "0.2.0",
+        "com.unity.postprocessing": "2.0.2-preview",
         "com.unity.render-pipelines.core": "0.1.33"
     }
 }

ScriptableRenderPipeline/LightweightPipeline/LWRP/Editor/ShaderGraph/lightweightPBRForwardPass.template

 		float3 lwWorldPos = TransformObjectToWorld(v.vertex.xyz);
 		float4 clipPos = TransformWorldToHClip(lwWorldPos);
 
- 		// We either sample GI from lightmap or SH. lightmap UV and vertex SH coefficients
-	    // are packed in lightmapUVOrVertexSH to save interpolator.
-	    // The following funcions initialize
+ 		// We either sample GI from lightmap or SH.
+	    // Lightmap UV and vertex SH coefficients use the same interpolator ("float2 lightmapUV" for lightmap or "half3 vertexSH" for SH)
+        // see DECLARE_LIGHTMAP_OR_SH macro.
+	    // The following funcions initialize the correct variable with correct data
 	    OUTPUT_LIGHTMAP_UV(v.texcoord1, unity_LightmapST, o.lightmapUV);
 	    OUTPUT_SH(lwWNormal, o.vertexSH);
 

ScriptableRenderPipeline/LightweightPipeline/LWRP/ShaderLibrary/Lighting.hlsl

 {
     half3 halfVec = SafeNormalize(lightDir + viewDir);
     half NdotH = saturate(dot(normal, halfVec));
-    half3 specularReflection = specularGloss.rgb * pow(NdotH, shininess) * specularGloss.a;
+    half modifier = pow(NdotH, shininess) * specularGloss.a;
+    half3 specularReflection = specularGloss.rgb * modifier;
     return lightColor * specularReflection;
 }
 
     }
 #endif
 
-    half3 finalColor = diffuseColor * diffuse + emission;
-    finalColor += inputData.vertexLighting * diffuse;
+    half3 fullDiffuse = diffuseColor + inputData.vertexLighting;
+    half3 finalColor = fullDiffuse * diffuse + emission;
     
 #if defined(_SPECGLOSSMAP) || defined(_SPECULAR_COLOR)
     finalColor += specularColor;

ScriptableRenderPipeline/LightweightPipeline/LWRP/ShaderLibrary/LightweightPassLit.hlsl

 {
     float2 uv                       : TEXCOORD0;
     DECLARE_LIGHTMAP_OR_SH(lightmapUV, vertexSH, 1);
-    float3 posWS                    : TEXCOORD2;
+    float4 posWSShininess           : TEXCOORD2;    // xyz: posWS, w: Shininess * 128
 
 #ifdef _NORMALMAP
     half4 normal                    : TEXCOORD3;    // xyz: normal, w: viewDir.x
 
 void InitializeInputData(LightweightVertexOutput IN, half3 normalTS, out InputData inputData)
 {
-    inputData.positionWS = IN.posWS.xyz;
+    inputData.positionWS = IN.posWSShininess.xyz;
 
 #ifdef _NORMALMAP
     half3 viewDir = half3(IN.normal.w, IN.tangent.w, IN.binormal.w);
 
     o.uv = TRANSFORM_TEX(v.texcoord, _MainTex);
 
-    o.posWS = TransformObjectToWorld(v.vertex.xyz);
-    o.clipPos = TransformWorldToHClip(o.posWS);
+    o.posWSShininess.xyz = TransformObjectToWorld(v.vertex.xyz);
+    o.posWSShininess.w = _Shininess * 128.0;
+    o.clipPos = TransformWorldToHClip(o.posWSShininess.xyz);
-    half3 viewDir = GetCameraPositionWS() - o.posWS;
+    half3 viewDir = GetCameraPositionWS() - o.posWSShininess.xyz;
 #if !SHADER_HINT_NICE_QUALITY
     // Normalize in vertex and avoid renormalizing it in frag to save ALU.
     viewDir = SafeNormalize(viewDir);
     // initializes o.normal and if _NORMALMAP also o.tangent and o.binormal
     OUTPUT_NORMAL(v, o);
 
-    // We either sample GI from lightmap or SH. lightmap UV and vertex SH coefficients
-    // are packed in lightmapUVOrVertexSH to save interpolator.
-    // The following funcions initialize
+    // We either sample GI from lightmap or SH.
+    // Lightmap UV and vertex SH coefficients use the same interpolator ("float2 lightmapUV" for lightmap or "half3 vertexSH" for SH)
+    // see DECLARE_LIGHTMAP_OR_SH macro.
+    // The following funcions initialize the correct variable with correct data
-    half3 vertexLight = VertexLighting(o.posWS, o.normal.xyz);
+    half3 vertexLight = VertexLighting(o.posWSShininess.xyz, o.normal.xyz);
     half fogFactor = ComputeFogFactor(o.clipPos.z);
     o.fogFactorAndVertexLight = half4(fogFactor, vertexLight);
     o.shadowCoord = ComputeShadowCoord(o.clipPos);
 
     half3 emission = Emission(uv);
     half4 specularGloss = SpecularGloss(uv, diffuseAlpha.a);
-    half shininess = _Shininess * 128.0h;
+    half shininess = IN.posWSShininess.w;
 
     InputData inputData;
     InitializeInputData(IN, normalTS, inputData);

ScriptableRenderPipeline/LightweightPipeline/LWRP/ShaderLibrary/LightweightPassShadow.hlsl

     float scale = invNdotL * _ShadowBias.y;
 
     // normal bias is negative since we want to apply an inset normal offset
-    o.posWS = o.normal * scale.xxx + o.posWS;
-    float4 clipPos = TransformWorldToHClip(o.posWS);
+    o.posWSShininess.xyz = o.normal * scale.xxx + o.posWSShininess.xyz;
+    float4 clipPos = TransformWorldToHClip(o.posWSShininess.xyz);
 
     // _ShadowBias.x sign depens on if platform has reversed z buffer
     clipPos.z += _ShadowBias.x;

ScriptableRenderPipeline/LightweightPipeline/package.json

     "version": "0.1.33",
     "unity": "2018.1",
     "dependencies": {
-        "com.unity.postprocessing": "0.2.0",
+        "com.unity.postprocessing": "2.0.2-preview",
         "com.unity.render-pipelines.core": "0.1.33"
     }
 }

ScriptableRenderPipeline/master-package.json

     "version": "0.1.33",
     "unity": "2018.1",
     "dependencies": {
-        "com.unity.postprocessing": "0.2.0"
+        "com.unity.postprocessing": "2.0.2-preview"
     },
     "subPackages": [
         "Core",

Tests/GraphicsTests/RenderPipeline/HDRenderPipeline/CommonAssets/SkySettings/HDRP_Default_Sky.asset

     m_OverrideState: 1
     m_Value: 0
     min: 0
-  useForBaking: 1
-  skyHDRI:
+  hdriSky:
     m_OverrideState: 1
     m_Value: {fileID: 8900000, guid: fb0bf2eac2381484187ba8a68cdca165, type: 3}
 --- !u!114 &114827887035766406

Tests/GraphicsTests/RenderPipeline/HDRenderPipeline/CommonAssets/SkySettings/HDRP_Default_Sky_2.asset

     m_OverrideState: 1
     m_Value: 0
     min: 0
-  useForBaking: 1
-  skyHDRI:
+  hdriSky:
     m_OverrideState: 1
     m_Value: {fileID: 8900000, guid: fb0bf2eac2381484187ba8a68cdca165, type: 3}
 --- !u!114 &114827887035766406

Tests/GraphicsTests/RenderPipeline/HDRenderPipeline/CommonAssets/SkySettings/HDRP_Default_Sky_3.asset

     m_OverrideState: 1
     m_Value: 0
     min: 0
-  useForBaking: 1
-  skyHDRI:
+  hdriSky:
     m_OverrideState: 1
     m_Value: {fileID: 8900000, guid: fb0bf2eac2381484187ba8a68cdca165, type: 3}
 --- !u!114 &114827887035766406

Tests/GraphicsTests/RenderPipeline/HDRenderPipeline/CommonAssets/SkySettings/HDRP_Default_Sky_4.asset

     m_OverrideState: 1
     m_Value: 0
     min: 0
-  useForBaking: 1
-  skyHDRI:
+  hdriSky:
     m_OverrideState: 1
     m_Value: {fileID: 8900000, guid: fb0bf2eac2381484187ba8a68cdca165, type: 3}
 --- !u!114 &114827887035766406

Tests/GraphicsTests/RenderPipeline/HDRenderPipeline/CommonAssets/SkySettings/HDRP_Default_Sky_LinearFog.asset

     m_OverrideState: 1
     m_Value: 0
     min: 0
-  skyHDRI:
+  hdriSky:
     m_OverrideState: 1
     m_Value: {fileID: 8900000, guid: fb0bf2eac2381484187ba8a68cdca165, type: 3}
 --- !u!114 &114595935599516216

package.json

 	"unity": "2018.1",
 	"description": "Render pipelines using SRP",
 	"dependencies": {
-    	"com.unity.postprocessing": "0.1.2"
+    	"com.unity.postprocessing": "2.0.2-preview"
 	}
 }