Merge branch 'HDRP/staging' into Decal-compilation-test-new

com.unity.render-pipelines.high-definition/CHANGELOG.md

 ### Added
 - Decal now support per channel selection mask. There is now two mode. One with BaseColor, Normal and Smoothness and another one more expensive with BaseColor, Normal, Smoothness, Metal and AO. Control is on HDRP Asset. This may require to launch an update script for old scene: 'Edit/Render Pipeline/Single step upgrade script/Upgrade all DecalMaterial MaskBlendMode'.
 - Decal now supports depth bias for decal mesh, to prevent z-fighting
+- Decal material now supports draw order for decal projectors 
 
 ### Fixed
 - Fixed an issue with PreIntegratedFGD texture being sometimes destroyed and not regenerated causing rendering to break
 ### Changed
 - Movde Render Pipeline Debug "Windows from Windows->General-> Render Pipeline debug windows" to "Windows from Windows->Analysis-> Render Pipeline debug windows"
 - Update detail map formula for smoothness and albedo, goal it to bright and dark perceptually and scale factor is use to control gradient speed
+- Refactor the Upgrade material system. Now a material can be update from older version at any time. Call Edit/Render Pipeline/Upgrade all Materials to newer version
+- Change name EnableDBuffer to EnableDecals at several place (shader, hdrp asset...), this require a call to Edit/Render Pipeline/Upgrade all Materials to newer version to have up to date material.
 
 ### Added
 - Added support for RendererPriority on Renderer. This allow to control order of transparent rendering manually. HDRP have now two stage of sorting for transparent in addition to bact to front. Material have a priority then Renderer have a priority.

com.unity.render-pipelines.high-definition/HDRP/Editor/Material/Decal/DecalUI.cs

             public static GUIContent decalBlendText = new GUIContent("Global Opacity", "Whole decal Opacity");
             public static GUIContent AlbedoModeText = new GUIContent("Affect BaseColor", "Base color + Opacity, Opacity only");
  			public static GUIContent MeshDecalDepthBiasText = new GUIContent("Mesh decal depth bias", "prevents z-fighting");
+	 		public static GUIContent DrawOrderText = new GUIContent("Draw order", "Controls draw order of decal projectors");
 
             public static GUIContent[] maskMapText =
             {
         protected MaterialProperty decalMeshDepthBias = new MaterialProperty();
         protected const string kDecalMeshDepthBias = "_DecalMeshDepthBias";
 
+        protected MaterialProperty drawOrder = new MaterialProperty();
+        protected const string kDrawOrder = "_DrawOrder";
+
         protected MaterialEditor m_MaterialEditor;
 
         // This is call by the inspector
             maskBlendMode = FindProperty(kMaskBlendMode, props);
             maskmapMetal = FindProperty(kMaskmapMetal, props);
             maskmapAO = FindProperty(kMaskmapAO, props);
-            maskmapSmoothness = FindProperty(kMaskmapSmoothness, props);
-            decalMeshDepthBias = FindProperty(kDecalMeshDepthBias, props);
-            
+            maskmapSmoothness = FindProperty(kMaskmapSmoothness, props);            
+            decalMeshDepthBias = FindProperty(kDecalMeshDepthBias, props);            
+            drawOrder = FindProperty(kDrawOrder, props);
+
             // always instanced
             SerializedProperty instancing = m_MaterialEditor.serializedObject.FindProperty("m_EnableInstancingVariants");
             instancing.boolValue = true;
                     EditorGUI.indentLevel--;
                 }
 
-                m_MaterialEditor.ShaderProperty(decalBlend, Styles.decalBlendText);
+                m_MaterialEditor.ShaderProperty(drawOrder, Styles.DrawOrderText);
+                m_MaterialEditor.ShaderProperty(decalBlend, Styles.decalBlendText);                
+
                 EditorGUI.indentLevel--;
 
                 EditorGUILayout.HelpBox(

com.unity.render-pipelines.high-definition/HDRP/Material/Decal/Decal.cs

     public partial class Decal
     {
         // Main structure that store the user data (i.e user input of master node in material graph)
-        [GenerateHLSL(PackingRules.Exact, false, true, 200)]
+        [GenerateHLSL(PackingRules.Exact, false)]
         public struct DecalSurfaceData
         {
             [SurfaceDataAttributes("Base Color", false, true)]

com.unity.render-pipelines.high-definition/HDRP/Material/Decal/Decal.cs.hlsl

 #ifndef DECAL_CS_HLSL
 #define DECAL_CS_HLSL
 //
-// UnityEngine.Experimental.Rendering.HDPipeline.Decal+DecalSurfaceData:  static fields
-//
-#define DEBUGVIEW_DECAL_DECALSURFACEDATA_BASE_COLOR (200)
-#define DEBUGVIEW_DECAL_DECALSURFACEDATA_NORMAL (201)
-#define DEBUGVIEW_DECAL_DECALSURFACEDATA_MASK (202)
-#define DEBUGVIEW_DECAL_DECALSURFACEDATA_AOSBLEND (203)
-#define DEBUGVIEW_DECAL_DECALSURFACEDATA_HTILE_MASK (204)
-
-//
 // UnityEngine.Experimental.Rendering.HDPipeline.Decal+DBufferMaterial:  static fields
 //
 #define DBUFFERMATERIAL_COUNT (4)
     float4 baseColor;
     float3 blendParams;
 };
-
-//
-// Debug functions
-//
-void GetGeneratedDecalSurfaceDataDebug(uint paramId, DecalSurfaceData decalsurfacedata, inout float3 result, inout bool needLinearToSRGB)
-{
-    switch (paramId)
-    {
-        case DEBUGVIEW_DECAL_DECALSURFACEDATA_BASE_COLOR:
-            result = decalsurfacedata.baseColor.xyz;
-            needLinearToSRGB = true;
-            break;
-        case DEBUGVIEW_DECAL_DECALSURFACEDATA_NORMAL:
-            result = decalsurfacedata.normalWS.xyz;
-            break;
-        case DEBUGVIEW_DECAL_DECALSURFACEDATA_MASK:
-            result = decalsurfacedata.mask.xyz;
-            break;
-        case DEBUGVIEW_DECAL_DECALSURFACEDATA_AOSBLEND:
-            result = float3(decalsurfacedata.MAOSBlend, 0.0);
-            break;
-        case DEBUGVIEW_DECAL_DECALSURFACEDATA_HTILE_MASK:
-            result = GetIndexColor(decalsurfacedata.HTileMask);
-            break;
-    }
-}
 
 
 #endif

com.unity.render-pipelines.high-definition/HDRP/Material/Decal/Decal.hlsl

-#include "CoreRP/ShaderLibrary/Debug.hlsl"
-#include "Decal.cs.hlsl"
-
 #define DBufferType0 float4
 #define DBufferType1 float4
 #define DBufferType2 float4
 #define DECODE_FROM_DBUFFER(NAME, DECAL_SURFACE_DATA) DecodeFromDBuffer(MERGE_NAME(NAME,0), MERGE_NAME(NAME,1), MERGE_NAME(NAME,2), DECAL_SURFACE_DATA)
 
 #endif
-
-UNITY_INSTANCING_BUFFER_START(Decal)
-    UNITY_DEFINE_INSTANCED_PROP(float4x4, _NormalToWorld)
-UNITY_INSTANCING_BUFFER_END(matrix)
-
-RW_TEXTURE2D(float, _DecalHTile); // DXGI_FORMAT_R8_UINT is not supported by Unity
-TEXTURE2D(_DecalHTileTexture);
-
-uint _DecalCount;
-StructuredBuffer<DecalData> _DecalDatas;
-
-TEXTURE2D_ARRAY(_DecalAtlas);
-SAMPLER(sampler_DecalAtlas);
-
-TEXTURE2D(_DecalAtlas2D);
-SAMPLER(_trilinear_clamp_sampler_DecalAtlas2D);
 
 // Must be in sync with RT declared in HDRenderPipeline.cs ::Rebuild
 void EncodeIntoDBuffer( DecalSurfaceData surfaceData

com.unity.render-pipelines.high-definition/HDRP/Material/Decal/Decal.shader

 		[ToggleUI] _MaskmapAO("_MaskmapAO", Range(0.0, 1.0)) = 0.0
 		[ToggleUI] _MaskmapSmoothness("_MaskmapSmoothness", Range(0.0, 1.0)) = 1.0
 		[HideInInspector] _DecalMeshDepthBias("_DecalMeshDepthBias", Float) = 0.0 
+		[HideInInspector] _DrawOrder("_DrawOrder", Int) = 0
     }
 
     HLSLINCLUDE

com.unity.render-pipelines.high-definition/HDRP/Material/Decal/DecalSystem.cs

         static public float[] m_BoundingDistances = new float[1];
 
         private Dictionary<int, DecalSet> m_DecalSets = new Dictionary<int, DecalSet>();
+        private SortedList<int, List<DecalSet>> m_DecalSetsRenderList = new SortedList<int, List<DecalSet>>(); // list of decalset lists sorted by material draw order
 
         // current camera
         private Camera m_Camera;
                 }
             }
 
-            public void CreateDrawData()
+            public bool CreateDrawData()
-                    return;
+                    return false;
-                    return;
+                    return false;
 
                 int instanceCount = 0;
                 int batchCount = 0;
                 { 
                     AddToTextureList(ref instance.m_TextureList);
                 }
+                return true;
             }
 
             public void EndCull()
                 }
             }
 
+            public int DrawOrder
+            {
+                get
+                {
+                    return this.m_Material.GetInt("_DrawOrder");
+                }
+            }
+
             private List<Matrix4x4[]> m_DecalToWorld = new List<Matrix4x4[]>();
             private List<Matrix4x4[]> m_NormalToWorld = new List<Matrix4x4[]>();
 
             if (m_DecalMesh == null)
                 m_DecalMesh = CoreUtils.CreateCubeMesh(kMin, kMax);
 
-            foreach (var pair in m_DecalSets)
+            foreach (var pair in m_DecalSetsRenderList)
-                pair.Value.RenderIntoDBuffer(cmd);
+                foreach(var decalSet in pair.Value)
+                {
+                    decalSet.RenderIntoDBuffer(cmd);
+                }                
             }
         }
 
                 m_MaskTextureScaleBias = new TextureScaleBias[newDecalDatasSize];
                 m_BaseColor = new Vector4[newDecalDatasSize];
             }
+
+            m_DecalSetsRenderList.Clear();
-                pair.Value.CreateDrawData();
+                if (pair.Value.CreateDrawData())
+                {
+                    int key = pair.Value.DrawOrder;
+                    List<DecalSet> decalSetList;
+                    if (!m_DecalSetsRenderList.TryGetValue(key, out decalSetList))
+                    {
+                        decalSetList = new List<DecalSet>();
+                        m_DecalSetsRenderList.Add(key, decalSetList);
+                    }
+                    decalSetList.Add(pair.Value);
+                }
             }
         }
 

com.unity.render-pipelines.high-definition/HDRP/Material/Decal/ShaderVariablesDecal.hlsl

 #ifdef SHADER_VARIABLES_INCLUDE_CB
     uint    _EnableDecals;
     float2  _DecalAtlasResolution;
+    uint    _DecalCount;
+
+#include "HDRP/Material/Decal//Decal.cs.hlsl"
+
+StructuredBuffer<DecalData> _DecalDatas;
+
+TEXTURE2D_ARRAY(_DecalAtlas);
+SAMPLER(sampler_DecalAtlas);
+
+TEXTURE2D(_DecalAtlas2D);
+SAMPLER(_trilinear_clamp_sampler_DecalAtlas2D);
+
+RW_TEXTURE2D(float, _DecalHTile); // DXGI_FORMAT_R8_UINT is not supported by Unity
+TEXTURE2D(_DecalHTileTexture);
+
+UNITY_INSTANCING_BUFFER_START(Decal)
+    UNITY_DEFINE_INSTANCED_PROP(float4x4, _NormalToWorld)
+UNITY_INSTANCING_BUFFER_END(matrix)
+
 #endif

com.unity.render-pipelines.high-definition/HDRP/ShaderVariables.hlsl

 
 CBUFFER_END
 
-// Undef in order to include all textures and buffers declarations
-#undef SHADER_VARIABLES_INCLUDE_CB
-#include "Lighting/LightLoop/ShaderVariablesLightLoop.hlsl"
-#include "Lighting/AtmosphericScattering/ShaderVariablesAtmosphericScattering.hlsl"
-#include "Lighting/ScreenSpaceLighting/ShaderVariablesScreenSpaceLighting.hlsl"
-#include "Material/Decal/ShaderVariablesDecal.hlsl"
-#include "Material/SubsurfaceScattering/ShaderVariablesSubsurfaceScattering.hlsl"
-
 // Custom generated by HDRP, not from Unity Engine (passed in via HDCamera)
 #if defined(USING_STEREO_MATRICES)
 
 // This define allow to tell to unity instancing that we will use our camera relative functions (ApplyCameraTranslationToMatrix and  ApplyCameraTranslationToInverseMatrix) for the model view matrix
 #define MODIFY_MATRIX_FOR_CAMERA_RELATIVE_RENDERING
 #include "CoreRP/ShaderLibrary/UnityInstancing.hlsl"
+
+// This is located after the include of UnityInstancing.hlsl so it can be used for declaration
+// Undef in order to include all textures and buffers declarations
+#undef SHADER_VARIABLES_INCLUDE_CB
+#include "Lighting/LightLoop/ShaderVariablesLightLoop.hlsl"
+#include "Lighting/AtmosphericScattering/ShaderVariablesAtmosphericScattering.hlsl"
+#include "Lighting/ScreenSpaceLighting/ShaderVariablesScreenSpaceLighting.hlsl"
+#include "Material/Decal/ShaderVariablesDecal.hlsl"
+#include "Material/SubsurfaceScattering/ShaderVariablesSubsurfaceScattering.hlsl"
+
 #include "ShaderVariablesFunctions.hlsl"
 
 #endif // UNITY_SHADER_VARIABLES_INCLUDED