Cleanup and re-addition of GI tests

6 年前 · 5dd0ee6b
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Common/TestRunner/Editor/SetupProject.cs
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Common/TestRunner/Editor/SetupProject.cs
        }
    }

-    [MenuItem("Graphic Tests/Project Setup/RP: Deferred")]
+    [MenuItem("Graphic Tests/Project Setup/RP: Deferred", false, 100)]
-    [MenuItem("Graphic Tests/Project Setup/RP: Deferred Depth Prepass")]
+    [MenuItem("Graphic Tests/Project Setup/RP: Deferred Depth Prepass", false, 101)]
-    [MenuItem("Graphic Tests/Project Setup/RP: Deferred Depth Prepass Alpha Only")]
+    [MenuItem("Graphic Tests/Project Setup/RP: Deferred Depth Prepass Alpha Only", false, 102)]
-    [MenuItem("Graphic Tests/Project Setup/RP: Forward")]
+    [MenuItem("Graphic Tests/Project Setup/RP: Forward", false, 103)]
    public static void SetRP_Forward()
    {
        SetRPAsset("forward");
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Common/TestRunner/HDRP_GraphicTestRunner.cs
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Common/TestRunner/HDRP_GraphicTestRunner.cs
 using EditorSceneManagement = UnityEditor.SceneManagement;
 #endif

-public class HDRP_GraphicTestRunner
+public class HDRP_GraphicTestRunner : IPrebuildSetup
 {
    [UnityTest, Category("HDRP Graphic Tests")]
    [PrebuildSetup("SetupGraphicsTestCases")]
        ImageAssert.AreEqual(testCase.ReferenceImage, camera, (settings != null)?settings.ImageComparisonSettings:null);
    }

-// Old code to auto generate the lightmaps base on scene asset tag ... this should no be needed anymore apparently. The class need to herit from IPrebuildSetup
-/*
-
-        // Search for "InitTestSceneXXXXXXXX" generated by test runner and save the path in the EditorPrefs
-        for (int i=0 ; i<EditorSceneManagement.EditorSceneManager.sceneCount ; ++i)
-        {
-            Scene scene = EditorSceneManagement.EditorSceneManager.GetSceneAt(i);
-            if (scene.name.StartsWith("InitTestScene"))
-            {
-                EditorPrefs.SetString("InitTestScene", scene.path);
-                break;
-            }
-        }
+        // For each scene in the build settings, force build of the lightmaps if it has "DoLightmap" label.
+        // Note that in the PreBuildSetup stage, TestRunner has already created a new scene with its testing monobehaviours
-        string scenesWithAutoLightMap = "";
+        Scene trScene = EditorSceneManagement.EditorSceneManager.GetSceneAt(0);
-        // For each scene in the build settings, force build of the lightmaps if it has "DoLightmap" label.
-
-                EditorSceneManagement.EditorSceneManager.OpenScene(scene.path, EditorSceneManagement.OpenSceneMode.Single);
+
+                EditorSceneManagement.EditorSceneManager.OpenScene(scene.path, EditorSceneManagement.OpenSceneMode.Additive);
+
+                Scene currentScene = EditorSceneManagement.EditorSceneManager.GetSceneAt(1);
+
+                EditorSceneManagement.EditorSceneManager.SetActiveScene(currentScene);
-                EditorSceneManagement.EditorSceneManager.SaveOpenScenes();
-                Lightmapping.Clear();
+ 
+                EditorSceneManagement.EditorSceneManager.SaveScene( currentScene );
-                scenesWithAutoLightMap += scene.path + ";";
-
-                EditorSceneManagement.EditorSceneManager.SaveOpenScenes();
+                EditorSceneManagement.EditorSceneManager.SetActiveScene(trScene);
-                Lightmapping.giWorkflowMode = Lightmapping.GIWorkflowMode.Iterative;
-                EditorSceneManagement.EditorSceneManager.SaveOpenScenes();
-
-                EditorSceneManagement.EditorSceneManager.NewScene(EditorSceneManagement.NewSceneSetup.EmptyScene);
+                EditorSceneManagement.EditorSceneManager.CloseScene(currentScene, true);
-
-        EditorPrefs.SetString("ScenesWithAutoLightMap", scenesWithAutoLightMap);
-
-        // Re-open testrunner scene
-        string initTestSceneString = EditorPrefs.GetString("InitTestScene");
-        if (!string.IsNullOrEmpty(initTestSceneString))
-        {
-            EditorSceneManagement.EditorSceneManager.OpenScene(initTestSceneString, EditorSceneManagement.OpenSceneMode.Single);
-        }
-*/

 #if UNITY_EDITOR

--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2101_GI_Metapass.unity
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2101_GI_Metapass.unity
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2101_GI_Metapass.unity.meta
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2101_GI_Metapass.unity.meta
 fileFormatVersion: 2
 guid: 8747b43f8bcf2b44cbc3ece373da65a9
+labels:
+- DoLightmap
 DefaultImporter:
  externalObjects: {}
  userData: 
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2102_GI_Emission.unity
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2102_GI_Emission.unity
 LightmapSettings:
  m_ObjectHideFlags: 0
  serializedVersion: 11
-  m_GIWorkflowMode: 0
+  m_GIWorkflowMode: 1
  m_GISettings:
    serializedVersion: 2
    m_BounceScale: 1
    m_PVRFilteringAtrousPositionSigmaIndirect: 0.5
    m_PVRFilteringAtrousPositionSigmaAO: 1
    m_ShowResolutionOverlay: 1
-  m_LightingDataAsset: {fileID: 0}
+  m_LightingDataAsset: {fileID: 112000020, guid: 4f3851404fe69e04ab78f72daa216d41, type: 2}
  m_UseShadowmask: 0
 --- !u!196 &4
 NavMeshSettings:
  m_LightProbeUsage: 1
  m_ReflectionProbeUsage: 1
  m_RenderingLayerMask: 4294967295
+  m_RendererPriority: 0
  m_Materials:
  - {fileID: 2100000, guid: 306d620c715872046bf76568b7f382d4, type: 3}
  m_StaticBatchInfo:
  m_LightProbeUsage: 1
  m_ReflectionProbeUsage: 1
  m_RenderingLayerMask: 4294967295
+  m_RendererPriority: 0
  m_Materials:
  - {fileID: 2100000, guid: a056f0394a2c3a8479aa8bf777a5b865, type: 2}
  m_StaticBatchInfo:
  m_LightProbeUsage: 1
  m_ReflectionProbeUsage: 1
  m_RenderingLayerMask: 4294967295
+  m_RendererPriority: 0
  m_Materials:
  - {fileID: 2100000, guid: 306d620c715872046bf76568b7f382d4, type: 3}
  m_StaticBatchInfo:
  m_Modification:
    m_TransformParent: {fileID: 0}
    m_Modifications:
-    - target: {fileID: 20109210616973140, guid: c07ace9ab142ca9469fa377877c2f1e7,
-        type: 2}
+    - target: {fileID: 20109210616973140, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 2}
-    - target: {fileID: 20109210616973140, guid: c07ace9ab142ca9469fa377877c2f1e7,
-        type: 2}
+    - target: {fileID: 20109210616973140, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 2}
-    - target: {fileID: 20109210616973140, guid: c07ace9ab142ca9469fa377877c2f1e7,
-        type: 2}
+    - target: {fileID: 20109210616973140, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 2}
-    - target: {fileID: 20109210616973140, guid: c07ace9ab142ca9469fa377877c2f1e7,
-        type: 2}
+    - target: {fileID: 20109210616973140, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 2}
-    - target: {fileID: 20109210616973140, guid: c07ace9ab142ca9469fa377877c2f1e7,
-        type: 2}
+    - target: {fileID: 20109210616973140, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 2}
-    - target: {fileID: 114110876577682668, guid: c07ace9ab142ca9469fa377877c2f1e7,
-        type: 2}
+    - target: {fileID: 114110876577682668, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 2}
-      objectReference: {fileID: 11400000, guid: cc7b7e628a645144db38289e55e360a8,
-        type: 2}
-    - target: {fileID: 20109210616973140, guid: c07ace9ab142ca9469fa377877c2f1e7,
-        type: 2}
+      objectReference: {fileID: 11400000, guid: cc7b7e628a645144db38289e55e360a8, type: 2}
+    - target: {fileID: 20109210616973140, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 2}
-    - target: {fileID: 114110876577682668, guid: c07ace9ab142ca9469fa377877c2f1e7,
-        type: 2}
+    - target: {fileID: 114110876577682668, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 2}
-      objectReference: {fileID: 11400000, guid: 23b7439fe7a306c4889c52e465f40911,
-        type: 2}
+      objectReference: {fileID: 11400000, guid: 23b7439fe7a306c4889c52e465f40911, type: 2}
    - target: {fileID: 4209882255362944, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 2}
      propertyPath: m_LocalPosition.y
      value: 9.79
      propertyPath: m_LocalPosition.z
      value: -9.54
      objectReference: {fileID: 0}
-    - target: {fileID: 114482499083377642, guid: c07ace9ab142ca9469fa377877c2f1e7,
-        type: 2}
+    - target: {fileID: 114482499083377642, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 2}
-    - target: {fileID: 114482499083377642, guid: c07ace9ab142ca9469fa377877c2f1e7,
-        type: 2}
+    - target: {fileID: 114482499083377642, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 2}
-    - target: {fileID: 114482499083377642, guid: c07ace9ab142ca9469fa377877c2f1e7,
-        type: 2}
+    - target: {fileID: 114482499083377642, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 2}
-    - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7,
-        type: 2}
+    - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 2}
      propertyPath: ImageComparisonSettings.AverageCorrectnessThreshold
      value: 0.00025
      objectReference: {fileID: 0}
  m_LightProbeUsage: 1
  m_ReflectionProbeUsage: 1
  m_RenderingLayerMask: 4294967295
+  m_RendererPriority: 0
  m_Materials:
  - {fileID: 2100000, guid: d8578dc525f3d814abfda01618dd2271, type: 2}
  m_StaticBatchInfo:
  m_LightProbeUsage: 1
  m_ReflectionProbeUsage: 1
  m_RenderingLayerMask: 4294967295
+  m_RendererPriority: 0
  m_Materials:
  - {fileID: 2100000, guid: 306d620c715872046bf76568b7f382d4, type: 3}
  m_StaticBatchInfo:
  m_LightProbeUsage: 1
  m_ReflectionProbeUsage: 1
  m_RenderingLayerMask: 4294967295
+  m_RendererPriority: 0
  m_Materials:
  - {fileID: 2100000, guid: c5473e8b737635345a306da9f38119e5, type: 2}
  m_StaticBatchInfo:
  m_LightProbeUsage: 1
  m_ReflectionProbeUsage: 1
  m_RenderingLayerMask: 4294967295
+  m_RendererPriority: 0
  m_Materials:
  - {fileID: 2100000, guid: 76b11840da66b3042ba92a2c8f8a6a22, type: 2}
  m_StaticBatchInfo:
  m_LightProbeUsage: 1
  m_ReflectionProbeUsage: 1
  m_RenderingLayerMask: 4294967295
+  m_RendererPriority: 0
  m_Materials:
  - {fileID: 2100000, guid: 306d620c715872046bf76568b7f382d4, type: 3}
  m_StaticBatchInfo:
  m_LightProbeUsage: 1
  m_ReflectionProbeUsage: 1
  m_RenderingLayerMask: 4294967295
+  m_RendererPriority: 0
  m_Materials:
  - {fileID: 2100000, guid: 306d620c715872046bf76568b7f382d4, type: 3}
  m_StaticBatchInfo:
  m_LightProbeUsage: 1
  m_ReflectionProbeUsage: 1
  m_RenderingLayerMask: 4294967295
+  m_RendererPriority: 0
  m_Materials:
  - {fileID: 2100000, guid: 306d620c715872046bf76568b7f382d4, type: 3}
  m_StaticBatchInfo:
  m_LightProbeUsage: 1
  m_ReflectionProbeUsage: 1
  m_RenderingLayerMask: 4294967295
+  m_RendererPriority: 0
  m_Materials:
  - {fileID: 2100000, guid: ddca6846a19ad9f4aa9cf2b0e2b0e22f, type: 2}
  m_StaticBatchInfo:
  m_LightProbeUsage: 1
  m_ReflectionProbeUsage: 1
  m_RenderingLayerMask: 4294967295
+  m_RendererPriority: 0
  m_Materials:
  - {fileID: 2100000, guid: e5ef88455a605eb4eb0feb7494d6e839, type: 2}
  m_StaticBatchInfo:
  m_LightProbeUsage: 1
  m_ReflectionProbeUsage: 1
  m_RenderingLayerMask: 4294967295
+  m_RendererPriority: 0
  m_Materials:
  - {fileID: 2100000, guid: 02db561e2335c7740aba5dffbc5ce630, type: 2}
  m_StaticBatchInfo:
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2102_GI_Emission.unity.meta
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2102_GI_Emission.unity.meta
 fileFormatVersion: 2
 guid: b8f49ca9a12abb4468116e9422139e63
+labels:
+- DoLightmap
 DefaultImporter:
  externalObjects: {}
  userData: 
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2103_BakeMixed.unity
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2103_BakeMixed.unity
 LightmapSettings:
  m_ObjectHideFlags: 0
  serializedVersion: 11
-  m_GIWorkflowMode: 0
+  m_GIWorkflowMode: 1
  m_GISettings:
    serializedVersion: 2
    m_BounceScale: 1
    m_CompAOExponent: 1
    m_CompAOExponentDirect: 0
    m_Padding: 2
-    m_LightmapParameters: {fileID: 15203, guid: 0000000000000000f000000000000000,
-      type: 0}
+    m_LightmapParameters: {fileID: 15203, guid: 0000000000000000f000000000000000, type: 0}
    m_LightmapsBakeMode: 1
    m_TextureCompression: 1
    m_FinalGather: 0
    m_PVRFilteringAtrousPositionSigmaIndirect: 2
    m_PVRFilteringAtrousPositionSigmaAO: 1
    m_ShowResolutionOverlay: 0
-  m_LightingDataAsset: {fileID: 0}
+  m_LightingDataAsset: {fileID: 112000028, guid: 21819c73fa40e594eb08f5ea313a28da, type: 2}
  m_UseShadowmask: 0
 --- !u!196 &4
 NavMeshSettings:
  m_LightProbeUsage: 1
  m_ReflectionProbeUsage: 1
  m_RenderingLayerMask: 4294967295
+  m_RendererPriority: 0
  m_Materials:
  - {fileID: 2100000, guid: 73c176f402d2c2f4d929aa5da7585d17, type: 2}
  m_StaticBatchInfo:
  m_LightProbeUsage: 0
  m_ReflectionProbeUsage: 1
  m_RenderingLayerMask: 4294967295
+  m_RendererPriority: 0
  m_Materials:
  - {fileID: 0}
  m_StaticBatchInfo:
  m_LightProbeUsage: 1
  m_ReflectionProbeUsage: 1
  m_RenderingLayerMask: 4294967295
+  m_RendererPriority: 0
  m_Materials:
  - {fileID: 2100000, guid: 73c176f402d2c2f4d929aa5da7585d17, type: 2}
  m_StaticBatchInfo:
  m_LightProbeUsage: 1
  m_ReflectionProbeUsage: 1
  m_RenderingLayerMask: 4294967295
+  m_RendererPriority: 0
  m_Materials:
  - {fileID: 2100000, guid: 73c176f402d2c2f4d929aa5da7585d17, type: 2}
  m_StaticBatchInfo:
  m_LightProbeUsage: 0
  m_ReflectionProbeUsage: 1
  m_RenderingLayerMask: 4294967295
+  m_RendererPriority: 0
  m_Materials:
  - {fileID: 0}
  m_StaticBatchInfo:
  m_LightProbeUsage: 1
  m_ReflectionProbeUsage: 1
  m_RenderingLayerMask: 4294967295
+  m_RendererPriority: 0
  m_Materials:
  - {fileID: 2100000, guid: 73c176f402d2c2f4d929aa5da7585d17, type: 2}
  m_StaticBatchInfo:
  m_LightProbeUsage: 1
  m_ReflectionProbeUsage: 1
  m_RenderingLayerMask: 4294967295
+  m_RendererPriority: 0
  m_Materials:
  - {fileID: 2100000, guid: 73c176f402d2c2f4d929aa5da7585d17, type: 2}
  m_StaticBatchInfo:
  m_LightProbeUsage: 1
  m_ReflectionProbeUsage: 1
  m_RenderingLayerMask: 4294967295
+  m_RendererPriority: 0
  m_Materials:
  - {fileID: 2100000, guid: 73c176f402d2c2f4d929aa5da7585d17, type: 2}
  m_StaticBatchInfo:
  m_LightProbeUsage: 0
  m_ReflectionProbeUsage: 1
  m_RenderingLayerMask: 4294967295
+  m_RendererPriority: 0
  m_Materials:
  - {fileID: 0}
  m_StaticBatchInfo:
  m_LightProbeUsage: 0
  m_ReflectionProbeUsage: 1
  m_RenderingLayerMask: 4294967295
+  m_RendererPriority: 0
  m_Materials:
  - {fileID: 0}
  m_StaticBatchInfo:
  m_LightProbeUsage: 0
  m_ReflectionProbeUsage: 1
  m_RenderingLayerMask: 4294967295
+  m_RendererPriority: 0
  m_Materials:
  - {fileID: 0}
  m_StaticBatchInfo:
  m_LightProbeUsage: 0
  m_ReflectionProbeUsage: 1
  m_RenderingLayerMask: 4294967295
+  m_RendererPriority: 0
  m_Materials:
  - {fileID: 0}
  m_StaticBatchInfo:
  m_LightProbeUsage: 1
  m_ReflectionProbeUsage: 1
  m_RenderingLayerMask: 4294967295
+  m_RendererPriority: 0
  m_Materials:
  - {fileID: 2100000, guid: 73c176f402d2c2f4d929aa5da7585d17, type: 2}
  m_StaticBatchInfo:
  m_LightProbeUsage: 0
  m_ReflectionProbeUsage: 1
  m_RenderingLayerMask: 4294967295
+  m_RendererPriority: 0
  m_Materials:
  - {fileID: 0}
  m_StaticBatchInfo:
      propertyPath: m_RootOrder
      value: 0
      objectReference: {fileID: 0}
-    - target: {fileID: 114270329781043846, guid: c07ace9ab142ca9469fa377877c2f1e7,
-        type: 2}
+    - target: {fileID: 114270329781043846, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 2}
-    - target: {fileID: 114270329781043846, guid: c07ace9ab142ca9469fa377877c2f1e7,
-        type: 2}
+    - target: {fileID: 114270329781043846, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 2}
-    - target: {fileID: 20109210616973140, guid: c07ace9ab142ca9469fa377877c2f1e7,
-        type: 2}
+    - target: {fileID: 20109210616973140, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 2}
-    - target: {fileID: 114733060649624252, guid: c07ace9ab142ca9469fa377877c2f1e7,
-        type: 2}
+    - target: {fileID: 114733060649624252, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 2}
-    - target: {fileID: 114733060649624252, guid: c07ace9ab142ca9469fa377877c2f1e7,
-        type: 2}
+    - target: {fileID: 114733060649624252, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 2}
-    - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7,
-        type: 2}
+    - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 2}
      propertyPath: ImageComparisonSettings.AverageCorrectnessThreshold
      value: 0.00025
      objectReference: {fileID: 0}
  m_LightProbeUsage: 0
  m_ReflectionProbeUsage: 1
  m_RenderingLayerMask: 4294967295
+  m_RendererPriority: 0
  m_Materials:
  - {fileID: 0}
  m_StaticBatchInfo:
  - {x: 1.5, y: -1.5, z: -1.5}
  - {x: 1.5, y: -1.5, z: 2.5}
  - {x: 1.5, y: -1.5, z: -2.5}
+  m_Dering: 0
 --- !u!4 &779090466
 Transform:
  m_ObjectHideFlags: 0
  m_LightProbeUsage: 0
  m_ReflectionProbeUsage: 1
  m_RenderingLayerMask: 4294967295
+  m_RendererPriority: 0
  m_Materials:
  - {fileID: 0}
  m_StaticBatchInfo:
  m_LightProbeUsage: 0
  m_ReflectionProbeUsage: 1
  m_RenderingLayerMask: 4294967295
+  m_RendererPriority: 0
  m_Materials:
  - {fileID: 0}
  m_StaticBatchInfo:
  m_LightProbeUsage: 1
  m_ReflectionProbeUsage: 1
  m_RenderingLayerMask: 4294967295
+  m_RendererPriority: 0
  m_Materials:
  - {fileID: 2100000, guid: 73c176f402d2c2f4d929aa5da7585d17, type: 2}
  m_StaticBatchInfo:
  m_LightProbeUsage: 1
  m_ReflectionProbeUsage: 1
  m_RenderingLayerMask: 4294967295
+  m_RendererPriority: 0
  m_Materials:
  - {fileID: 2100000, guid: 73c176f402d2c2f4d929aa5da7585d17, type: 2}
  m_StaticBatchInfo:
  m_LightProbeUsage: 1
  m_ReflectionProbeUsage: 1
  m_RenderingLayerMask: 4294967295
+  m_RendererPriority: 0
  m_Materials:
  - {fileID: 2100000, guid: 6c9be79701956574888010a681a91064, type: 2}
  m_StaticBatchInfo:
  m_LightProbeUsage: 0
  m_ReflectionProbeUsage: 1
  m_RenderingLayerMask: 4294967295
+  m_RendererPriority: 0
  m_Materials:
  - {fileID: 0}
  m_StaticBatchInfo:
  m_LightProbeUsage: 0
  m_ReflectionProbeUsage: 1
  m_RenderingLayerMask: 4294967295
+  m_RendererPriority: 0
  m_Materials:
  - {fileID: 0}
  m_StaticBatchInfo:
  m_LightProbeUsage: 1
  m_ReflectionProbeUsage: 1
  m_RenderingLayerMask: 4294967295
+  m_RendererPriority: 0
  m_Materials:
  - {fileID: 2100000, guid: 73c176f402d2c2f4d929aa5da7585d17, type: 2}
  m_StaticBatchInfo:
  m_LightProbeUsage: 0
  m_ReflectionProbeUsage: 1
  m_RenderingLayerMask: 4294967295
+  m_RendererPriority: 0
  m_Materials:
  - {fileID: 0}
  m_StaticBatchInfo:
  m_LightProbeUsage: 1
  m_ReflectionProbeUsage: 1
  m_RenderingLayerMask: 4294967295
+  m_RendererPriority: 0
  m_Materials:
  - {fileID: 2100000, guid: 73c176f402d2c2f4d929aa5da7585d17, type: 2}
  m_StaticBatchInfo:
  m_IsActive: 1
 --- !u!114 &1331608284
 MonoBehaviour:
-  m_ObjectHideFlags: 2
+  m_ObjectHideFlags: 0
  m_CorrespondingSourceObject: {fileID: 0}
  m_PrefabInternal: {fileID: 0}
  m_GameObject: {fileID: 1331608283}
    data: 0bd7a33b0000803f
 --- !u!114 &1331608285
 MonoBehaviour:
-  m_ObjectHideFlags: 2
+  m_ObjectHideFlags: 0
  m_CorrespondingSourceObject: {fileID: 0}
  m_PrefabInternal: {fileID: 0}
  m_GameObject: {fileID: 1331608283}
  useOldInspector: 0
  featuresFoldout: 1
  showAdditionalSettings: 1
-  displayLightIntensity: 200
+  displayLightIntensity: 100
  displayAreaLightEmissiveMesh: 0
 --- !u!108 &1331608286
 Light:
  serializedVersion: 8
  m_Type: 2
  m_Color: {r: 1, g: 1, b: 1, a: 1}
-  m_Intensity: 7.0735526
+  m_Intensity: 3.5367763
  m_Range: 10
  m_SpotAngle: 30
  m_CookieSize: 10
  m_LightProbeUsage: 1
  m_ReflectionProbeUsage: 1
  m_RenderingLayerMask: 4294967295
+  m_RendererPriority: 0
  m_Materials:
  - {fileID: 2100000, guid: 73c176f402d2c2f4d929aa5da7585d17, type: 2}
  m_StaticBatchInfo:
  m_LightProbeUsage: 1
  m_ReflectionProbeUsage: 1
  m_RenderingLayerMask: 4294967295
+  m_RendererPriority: 0
  m_Materials:
  - {fileID: 2100000, guid: 73c176f402d2c2f4d929aa5da7585d17, type: 2}
  m_StaticBatchInfo:
  m_LightProbeUsage: 1
  m_ReflectionProbeUsage: 1
  m_RenderingLayerMask: 4294967295
+  m_RendererPriority: 0
  m_Materials:
  - {fileID: 2100000, guid: 73c176f402d2c2f4d929aa5da7585d17, type: 2}
  m_StaticBatchInfo:
  m_LightProbeUsage: 0
  m_ReflectionProbeUsage: 1
  m_RenderingLayerMask: 4294967295
+  m_RendererPriority: 0
  m_Materials:
  - {fileID: 0}
  m_StaticBatchInfo:
  m_LightProbeUsage: 0
  m_ReflectionProbeUsage: 1
  m_RenderingLayerMask: 4294967295
+  m_RendererPriority: 0
  m_Materials:
  - {fileID: 0}
  m_StaticBatchInfo:
  m_LightProbeUsage: 0
  m_ReflectionProbeUsage: 1
  m_RenderingLayerMask: 4294967295
+  m_RendererPriority: 0
  m_Materials:
  - {fileID: 0}
  m_StaticBatchInfo:
  m_LightProbeUsage: 1
  m_ReflectionProbeUsage: 1
  m_RenderingLayerMask: 4294967295
+  m_RendererPriority: 0
  m_Materials:
  - {fileID: 2100000, guid: 73c176f402d2c2f4d929aa5da7585d17, type: 2}
  m_StaticBatchInfo:
  m_LightProbeUsage: 1
  m_ReflectionProbeUsage: 1
  m_RenderingLayerMask: 4294967295
+  m_RendererPriority: 0
  m_Materials:
  - {fileID: 2100000, guid: f6086a92c29e7fe4cbe16f142620912c, type: 2}
  m_StaticBatchInfo:
  m_LightProbeUsage: 1
  m_ReflectionProbeUsage: 1
  m_RenderingLayerMask: 4294967295
+  m_RendererPriority: 0
  m_Materials:
  - {fileID: 2100000, guid: 73c176f402d2c2f4d929aa5da7585d17, type: 2}
  m_StaticBatchInfo:
  m_LightProbeUsage: 0
  m_ReflectionProbeUsage: 1
  m_RenderingLayerMask: 4294967295
+  m_RendererPriority: 0
  m_Materials:
  - {fileID: 0}
  m_StaticBatchInfo:
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2103_BakeMixed.unity.meta
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2103_BakeMixed.unity.meta
 fileFormatVersion: 2
 guid: d8cfa4fd9319d2444b3bf6dd836ffe31
+labels:
+- DoLightmap
 DefaultImporter:
  externalObjects: {}
  userData: 
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2601_ColorTemp.meta
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2601_ColorTemp.meta
 fileFormatVersion: 2
-guid: 2162076be91a8c545b268dbcb97c7658
+guid: 8aec84e69348c114d960ca7cc8dd595b
 folderAsset: yes
 DefaultImporter:
  externalObjects: {}
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2601_ColorTemp.unity
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2601_ColorTemp.unity
  m_ReflectionIntensity: 0
  m_CustomReflection: {fileID: 0}
  m_Sun: {fileID: 0}
-  m_IndirectSpecularColor: {r: 0, g: 0, b: 0, a: 0}
+  m_IndirectSpecularColor: {r: 0, g: 0, b: 0, a: 1}
-  m_GIWorkflowMode: 0
+  m_GIWorkflowMode: 1
  m_GISettings:
    serializedVersion: 2
    m_BounceScale: 1
    m_PVRFilteringAtrousPositionSigmaIndirect: 2
    m_PVRFilteringAtrousPositionSigmaAO: 1
    m_ShowResolutionOverlay: 1
-  m_LightingDataAsset: {fileID: 0}
+  m_LightingDataAsset: {fileID: 112000008, guid: 9b7aa6ae5c6da1548a211f040a7017b7, type: 2}
  m_UseShadowmask: 1
 --- !u!196 &4
 NavMeshSettings:
  serializedVersion: 3
  m_Convex: 0
  m_CookingOptions: 14
-  m_SkinWidth: 0.01
  m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0}
 --- !u!23 &1378617743
 MeshRenderer:
  m_LightProbeUsage: 1
  m_ReflectionProbeUsage: 1
  m_RenderingLayerMask: 4294967295
+  m_RendererPriority: 0
  m_Materials:
  - {fileID: 2100000, guid: 73c176f402d2c2f4d929aa5da7585d17, type: 2}
  m_StaticBatchInfo:
      propertyPath: m_RootOrder
      value: 2
      objectReference: {fileID: 0}
-    - target: {fileID: 20109210616973140, guid: c07ace9ab142ca9469fa377877c2f1e7,
-        type: 2}
+    - target: {fileID: 20109210616973140, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 2}
-    - target: {fileID: 20109210616973140, guid: c07ace9ab142ca9469fa377877c2f1e7,
-        type: 2}
+    - target: {fileID: 20109210616973140, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 2}
      propertyPath: field of view
      value: 55.6
      objectReference: {fileID: 0}
+      objectReference: {fileID: 0}
+    - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 2}
+      propertyPath: waitForLightBake
+      value: 1
      objectReference: {fileID: 0}
    m_RemovedComponents: []
  m_SourcePrefab: {fileID: 100100000, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 2}
  serializedVersion: 3
  m_Convex: 0
  m_CookingOptions: 14
-  m_SkinWidth: 0.01
  m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0}
 --- !u!23 &2108040536
 MeshRenderer:
  m_LightProbeUsage: 1
  m_ReflectionProbeUsage: 1
  m_RenderingLayerMask: 4294967295
+  m_RendererPriority: 0
  m_Materials:
  - {fileID: 2100000, guid: 73c176f402d2c2f4d929aa5da7585d17, type: 2}
  m_StaticBatchInfo:
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2601_ColorTemp.unity.meta
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2601_ColorTemp.unity.meta
 fileFormatVersion: 2
 guid: 34a3a4a7a56d3014dad3114e6b523742
+labels:
+- DoLightmap
 DefaultImporter:
  externalObjects: {}
  userData: 
--- a/TestProjects/HDRP_Tests/ProjectSettings/EditorBuildSettings.asset
+++ b/TestProjects/HDRP_Tests/ProjectSettings/EditorBuildSettings.asset
    path: Assets/GraphicTests/Scenes/2x_Lighting/2005_Area_Light_Meshes.unity
    guid: 359ded33a047fd540b5e19a98547f5e2
  - enabled: 1
+    path: Assets/GraphicTests/Scenes/2x_Lighting/2101_GI_Metapass.unity
+    guid: 8747b43f8bcf2b44cbc3ece373da65a9
+  - enabled: 1
+  - enabled: 1
+    path: Assets/GraphicTests/Scenes/2x_Lighting/2103_BakeMixed.unity
+    guid: d8cfa4fd9319d2444b3bf6dd836ffe31
  - enabled: 1
    path: Assets/GraphicTests/Scenes/2x_Lighting/2201_ReflectionProbes_Priority.unity
    guid: d485acf0535eb4b42a9a3847f4a8274a
--- a/TestProjects/HDRP_Tests/ProjectSettings/ProjectSettings.asset
+++ b/TestProjects/HDRP_Tests/ProjectSettings/ProjectSettings.asset
  use32BitDisplayBuffer: 1
  preserveFramebufferAlpha: 0
  disableDepthAndStencilBuffers: 0
+  androidStartInFullscreen: 1
  androidBlitType: 0
  defaultIsNativeResolution: 1
  macRetinaSupport: 1
  xboxOneDisableEsram: 0
  xboxOnePresentImmediateThreshold: 0
  switchQueueCommandMemory: 0
-  videoMemoryForVertexBuffers: 0
-  psp2PowerMode: 0
-  psp2AcquireBGM: 1
-  vulkanUseSWCommandBuffers: 0
  m_SupportedAspectRatios:
    4:3: 1
    5:4: 1
      dashSupport: 0
    enable360StereoCapture: 0
  protectGraphicsMemory: 0
+  enableFrameTimingStats: 0
  useHDRDisplay: 0
  m_ColorGamuts: 00000000
  targetPixelDensity: 30
  appleEnableAutomaticSigning: 0
  iOSRequireARKit: 0
  appleEnableProMotion: 0
-  vulkanEditorSupport: 0
  clonedFromGUID: 00000000000000000000000000000000
  templatePackageId: 
  templateDefaultScene: 
  ps4pnGameCustomData: 1
  playerPrefsSupport: 0
  enableApplicationExit: 0
+  resetTempFolder: 1
  restrictedAudioUsageRights: 0
  ps4UseResolutionFallback: 0
  ps4ReprojectionSupport: 0
  ps4attribEyeToEyeDistanceSettingVR: 0
  ps4IncludedModules: []
  monoEnv: 
-  psp2Splashimage: {fileID: 0}
-  psp2NPTrophyPackPath: 
-  psp2NPSupportGBMorGJP: 0
-  psp2NPAgeRating: 12
-  psp2NPTitleDatPath: 
-  psp2NPCommsID: 
-  psp2NPCommunicationsID: 
-  psp2NPCommsPassphrase: 
-  psp2NPCommsSig: 
-  psp2ParamSfxPath: 
-  psp2ManualPath: 
-  psp2LiveAreaGatePath: 
-  psp2LiveAreaBackroundPath: 
-  psp2LiveAreaPath: 
-  psp2LiveAreaTrialPath: 
-  psp2PatchChangeInfoPath: 
-  psp2PatchOriginalPackage: 
-  psp2PackagePassword: F69AzBlax3CF3EDNhm3soLBPh71Yexui
-  psp2KeystoneFile: 
-  psp2MemoryExpansionMode: 0
-  psp2DRMType: 0
-  psp2StorageType: 0
-  psp2MediaCapacity: 0
-  psp2DLCConfigPath: 
-  psp2ThumbnailPath: 
-  psp2BackgroundPath: 
-  psp2SoundPath: 
-  psp2TrophyCommId: 
-  psp2TrophyPackagePath: 
-  psp2PackagedResourcesPath: 
-  psp2SaveDataQuota: 10240
-  psp2ParentalLevel: 1
-  psp2ShortTitle: Not Set
-  psp2ContentID: IV0000-ABCD12345_00-0123456789ABCDEF
-  psp2Category: 0
-  psp2MasterVersion: 01.00
-  psp2AppVersion: 01.00
-  psp2TVBootMode: 0
-  psp2EnterButtonAssignment: 2
-  psp2TVDisableEmu: 0
-  psp2AllowTwitterDialog: 1
-  psp2Upgradable: 0
-  psp2HealthWarning: 0
-  psp2UseLibLocation: 0
-  psp2InfoBarOnStartup: 0
-  psp2InfoBarColor: 0
-  psp2ScriptOptimizationLevel: 2
  splashScreenBackgroundSourceLandscape: {fileID: 0}
  splashScreenBackgroundSourcePortrait: {fileID: 0}
  spritePackerPolicy: 
  webGLUseEmbeddedResources: 0
  webGLCompressionFormat: 1
  webGLLinkerTarget: 0
+  webGLThreadsSupport: 0
+    14: UNITY_POST_PROCESSING_STACK_V2
    17: UNITY_POST_PROCESSING_STACK_V2
    18: UNITY_POST_PROCESSING_STACK_V2
    19: UNITY_POST_PROCESSING_STACK_V2
    26: UNITY_POST_PROCESSING_STACK_V2
    27: UNITY_POST_PROCESSING_STACK_V2
+    28: UNITY_POST_PROCESSING_STACK_V2
+  managedStrippingLevel: {}
  incrementalIl2cppBuild: {}
  allowUnsafeCode: 0
  additionalIl2CppArgs: 
  metroMediumTileShowName: 0
  metroLargeTileShowName: 0
  metroWideTileShowName: 0
+  metroSupportStreamingInstall: 0
+  metroLastRequiredScene: 0
-  metroSplashScreenBackgroundColor: {r: 0.12941177, g: 0.17254902, b: 0.21568628,
-    a: 1}
+  metroSplashScreenBackgroundColor: {r: 0.12941177, g: 0.17254902, b: 0.21568628, a: 1}
  metroSplashScreenUseBackgroundColor: 0
  platformCapabilities: {}
  metroFTAName: 
      daydreamIconForeground: {fileID: 0}
      daydreamIconBackground: {fileID: 0}
  cloudServicesEnabled: {}
+  luminIcon:
+    m_Name: 
+    m_ModelFolderPath: 
+    m_PortalFolderPath: 
+  luminCert:
+    m_CertPath: 
+    m_PrivateKeyPath: 
+  luminIsChannelApp: 0
+  luminVersion:
+    m_VersionCode: 1
+    m_VersionName: 
+  facebookAppId: 
+  facebookCookies: 1
+  facebookLogging: 1
+  facebookStatus: 1
+  facebookXfbml: 0
+  facebookFrictionlessRequests: 1
+  framebufferDepthMemorylessMode: 0
+  legacyClampBlendShapeWeights: 1
--- a/com.unity.shadergraph/.data/sphereMask.PNG
+++ b/com.unity.shadergraph/.data/sphereMask.PNG
--- a/com.unity.shadergraph/.data/texture_2d_lod_node.PNG
+++ b/com.unity.shadergraph/.data/texture_2d_lod_node.PNG
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2101_GI_Metapass/.gitignore
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2101_GI_Metapass/.gitignore
+Lightmap-*_comp*
+LightingData.*
+ReflectionProbe-*
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2102_GI_Emission/.gitignore
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2102_GI_Emission/.gitignore
+Lightmap-*_comp*
+LightingData.*
+ReflectionProbe-*
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2103_BakeMixed/.gitignore
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2103_BakeMixed/.gitignore
+Lightmap-*_comp*
+LightingData.*
+ReflectionProbe-*
--- a/TestProjects/HDRP_Tests/Packages/.gitignore
+++ b/TestProjects/HDRP_Tests/Packages/.gitignore
+manifest.json
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2601_ColorTemp/.gitignore
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2601_ColorTemp/.gitignore
+Lightmap-*_comp*
+LightingData.*
+ReflectionProbe-*
--- a/TestProjects/HDRP_Tests/ProjectSettings/ProjectVersion.txt
+++ b/TestProjects/HDRP_Tests/ProjectSettings/ProjectVersion.txt
-m_EditorVersion: 2018.2.0f1