Compile fix after last merge

Assets/ScriptableRenderLoop/HDRenderLoop/HDRenderLoop.cs

 			set { m_GBufferDebugMode = value; }
 		}
 
-		HDRenderLoopDebugMenu m_DebugMenu = null;
+		//HDRenderLoopDebugMenu m_DebugMenu = null;
 
 		#if UNITY_EDITOR
 		[MenuItem("Renderloop/HDRenderLoop/CreateHDRenderLoop")]
             renderLoop.ExecuteCommandBuffer(cmd);
             cmd.Dispose();
 
-            DrawRendererSettings settings = new DrawRendererSettings(cullResults, camera, new ShaderPassName("Forward"));
-            settings.rendererConfiguration = RendererConfiguration.ConfigureOneLightProbePerRenderer | RendererConfiguration.ConfigureReflectionProbesProbePerRenderer;
-            settings.sorting.sortOptions = SortOptions.SortByMaterialThenMesh;
-            settings.inputCullingOptions.SetQueuesTransparent();
+			DrawRendererSettings settings = new DrawRendererSettings(cullResults, camera, new ShaderPassName("Forward"));
+			settings.rendererConfiguration = RendererConfiguration.ConfigureOneLightProbePerRenderer | RendererConfiguration.ConfigureReflectionProbesProbePerRenderer;
+			settings.sorting.sortOptions = SortOptions.SortByMaterialThenMesh;
+			settings.inputCullingOptions.SetQueuesTransparent();
-            renderLoop.DrawRenderers(ref settings);
+			renderLoop.DrawRenderers(ref settings);
         }
 
         void FinalPass(RenderLoop renderLoop)
 
 					RenderForward(cullResults, camera, renderLoop);
 
-					if(m_GBufferDebugMode != GBufferDebugMode.None)
+					if (m_GBufferDebugMode != GBufferDebugMode.None)
 					{
 						RenderGBufferDebug(camera, renderLoop);
 					}

Assets/ScriptableRenderLoop/HDRenderLoop/Shaders/Debug/GBufferDebug.shader

 			#pragma fragment FragDeferred
 
 			// CAUTION: In case deferred lighting need to support various lighting model statically, we will require to do multicompile with different define like UNITY_MATERIAL_DISNEYGXX
-			#define UNITY_MATERIAL_DISNEYGXX // Need to be define before including Material.hlsl
+			#define UNITY_MATERIAL_DISNEYGGX // Need to be define before including Material.hlsl
 			#include "Assets/ScriptableRenderLoop/HDRenderLoop/Shaders/Lighting/Lighting.hlsl" // This include Material.hlsl
 			#include "Assets/ScriptableRenderLoop/HDRenderLoop/Shaders/ShaderVariables.hlsl"
 			#include "Assets/ScriptableRenderLoop/HDRenderLoop/Shaders/Debug/DebugCommon.hlsl"
+			DECLARE_GBUFFER_BAKE_LIGHTING(_CameraGBufferTexture);
 			Texture2D	_CameraDepthTexture;
 			float4		_ScreenSize;
 			float		_DebugMode;
 				else if (_DebugMode == GBufferDebugNormal)
 				{
 					result = bsdfData.normalWS * 0.5 + 0.5;
-					bool outputIsLinear = true;
+					outputIsLinear = true;
-					result = bsdfData.diffuseColor;
+					float linearDepth = frac(LinearEyeDepth(depth, _ZBufferParams) * 0.1);
+					result = linearDepth.xxx;
+					outputIsLinear = true;
-					result = bsdfData.diffuseLightingAndEmissive;
+					FETCH_BAKE_LIGHTING_GBUFFER(gbuffer, _CameraGBufferTexture, coord.unPositionSS);
+					result = DECODE_BAKE_LIGHTING_FROM_GBUFFER(gbuffer);
 					outputIsLinear = true;
 				}
 				else if (_DebugMode == GBufferDebugSpecularColor)

Assets/ScriptableRenderLoop/HDRenderLoop/Shaders/DisneyGGX.shader

 			#include "Assets/ScriptableRenderLoop/HDRenderLoop/Shaders/Debug/DebugCommon.hlsl"
 			#include "TemplateDisneyGGX.hlsl"
 
+			#if SHADER_STAGE_FRAGMENT
+
-				SurfaceData surfaceData = GetSurfaceData(input);
+				SurfaceData surfaceData;
+				BuiltinData builtinData;
+				GetSurfaceAndBuiltinData(input, surfaceData, builtinData);
 
 				float3 result = float3(1.0, 1.0, 0.0);
 				bool outputIsLinear = false;
 
 				return float4(result, 0.0);
 			}
+
+			#endif
 
 			ENDHLSL
 		}

Assets/TestScenes/HDTest/EnlightenTest.unity

   m_ReflectionIntensity: 1
   m_CustomReflection: {fileID: 0}
   m_Sun: {fileID: 0}
-  m_IndirectSpecularColor: {r: 0.1837731, g: 0.22831294, b: 0.29965004, a: 1}
+  m_IndirectSpecularColor: {r: 0.18230104, g: 0.22800739, b: 0.3073312, a: 1}
 --- !u!157 &3
 LightmapSettings:
   m_ObjectHideFlags: 0
     cellSize: 0.16666667
     accuratePlacement: 0
   m_NavMeshData: {fileID: 0}
---- !u!1 &96510370
-GameObject:
-  m_ObjectHideFlags: 0
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 0}
-  serializedVersion: 5
-  m_Component:
-  - component: {fileID: 96510373}
-  - component: {fileID: 96510372}
-  - component: {fileID: 96510371}
-  m_Layer: 0
-  m_Name: EventSystem
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!114 &96510371
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 0}
-  m_GameObject: {fileID: 96510370}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 1077351063, guid: f70555f144d8491a825f0804e09c671c, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_HorizontalAxis: Horizontal
-  m_VerticalAxis: Vertical
-  m_SubmitButton: Submit
-  m_CancelButton: Cancel
-  m_InputActionsPerSecond: 10
-  m_RepeatDelay: 0.5
-  m_ForceModuleActive: 0
---- !u!114 &96510372
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 0}
-  m_GameObject: {fileID: 96510370}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: -619905303, guid: f70555f144d8491a825f0804e09c671c, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_FirstSelected: {fileID: 0}
-  m_sendNavigationEvents: 1
-  m_DragThreshold: 5
---- !u!4 &96510373
-Transform:
-  m_ObjectHideFlags: 0
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 0}
-  m_GameObject: {fileID: 96510370}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_Children: []
-  m_Father: {fileID: 0}
-  m_RootOrder: 4
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &124873432
 GameObject:
   m_ObjectHideFlags: 0
   m_PrefabInternal: {fileID: 0}
   m_GameObject: {fileID: 124873432}
   m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
---- !u!1 &655124104
-GameObject:
-  m_ObjectHideFlags: 0
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 0}
-  serializedVersion: 5
-  m_Component:
-  - component: {fileID: 655124106}
-  - component: {fileID: 655124105}
-  m_Layer: 0
-  m_Name: DebugMenu
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!223 &655124105
-Canvas:
-  m_ObjectHideFlags: 0
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 0}
-  m_GameObject: {fileID: 655124104}
-  m_Enabled: 1
-  serializedVersion: 2
-  m_RenderMode: 2
-  m_Camera: {fileID: 0}
-  m_PlaneDistance: 100
-  m_PixelPerfect: 0
-  m_ReceivesEvents: 1
-  m_OverrideSorting: 0
-  m_OverridePixelPerfect: 0
-  m_SortingBucketNormalizedSize: 0
-  m_SortingLayerID: 0
-  m_SortingOrder: 0
-  m_TargetDisplay: 0
---- !u!224 &655124106
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 0}
-  m_GameObject: {fileID: 655124104}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_Children: []
-  m_Father: {fileID: 0}
-  m_RootOrder: 5
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0.5, y: 0.5}
-  m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 100, y: 100}
-  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!1 &1027688890
 GameObject:
   m_ObjectHideFlags: 0
   m_PrefabParentObject: {fileID: 0}
   m_PrefabInternal: {fileID: 0}
   m_GameObject: {fileID: 1185747104}
-  m_LocalRotation: {x: 0, y: 0, z: -0.7071068, w: 0.7071068}
-  m_LocalPosition: {x: 11.384, y: 0, z: -6.65}
+  m_LocalRotation: {x: 0, y: 0, z: 0.7071068, w: 0.7071068}
+  m_LocalPosition: {x: 11.384, y: 0, z: -5.31}
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: -90}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 90}
 --- !u!23 &1185747106
 MeshRenderer:
   m_ObjectHideFlags: 0
   m_PrefabInternal: {fileID: 0}
   m_GameObject: {fileID: 1197900219}
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 0.093494415, y: -2.4372234, z: -4.1745696}
+  m_LocalPosition: {x: 0, y: -2.4372234, z: -4.1745696}
   m_LocalScale: {x: 4, y: 4, z: 4}
   m_Children: []
   m_Father: {fileID: 1027688891}
   m_PrefabParentObject: {fileID: 0}
   m_PrefabInternal: {fileID: 0}
   m_GameObject: {fileID: 1457550750}
-  m_LocalRotation: {x: 0.92876834, y: -0.23633997, z: -0.1055043, w: 0.26533297}
+  m_LocalRotation: {x: -0.2494351, y: -0.3202937, z: 0.3963061, w: -0.8234898}
-  m_LocalEulerAnglesHint: {x: 26.295002, y: -158.992, z: -146.487}
+  m_LocalEulerAnglesHint: {x: 41.658, y: 26.196001, z: -401.282}
 --- !u!1 &1879932837
 GameObject:
   m_ObjectHideFlags: 0

Assets/TestScenes/HDTest/Material/HDRenderLoopMaterials/Blue_Alpha.mat

   m_PrefabInternal: {fileID: 0}
   m_Name: Blue_Alpha
   m_Shader: {fileID: 4800000, guid: e1a84346ee54f9f4993c2f05c59805a0, type: 3}
-  m_ShaderKeywords: _EMISSION _NORMALMAP_TANGENT_SPACE
+  m_ShaderKeywords: _ALPHACUTOFFENABLE_OFF _DOUBLESIDED_LIGHTING_FLIP _EMISSION _NORMALMAP_TANGENT_SPACE
   m_LightmapFlags: 1
   m_CustomRenderQueue: 3000
   stringTagMap:
         name: _DetailNormalMapScale
       second: 1
     - first:
+        name: _DistortionDepthTest
+      second: 0
+    - first:
+        name: _DistortionOnly
+      second: 0
+    - first:
         name: _DoubleSided
       second: 1
     - first:
         name: _DoubleSidedMode
-      second: 1
+      second: 2
     - first:
         name: _DstBlend
       second: 10
     m_Colors:
     - first:
         name: _BaseColor
-      second: {r: 0.1557093, g: 0.33766845, b: 0.5882352, a: 0.672}
+      second: {r: 0.3118512, g: 0.49926913, b: 0.75735295, a: 0.672}
     - first:
         name: _Color
       second: {r: 0.5019608, g: 0.5019608, b: 0.5019608, a: 1}