Implement Constant Buffers for HDRP (part 2)

com.unity.render-pipelines.high-definition/Runtime/Debug/DebugDisplay.cs

@@ -5,6 +5,45 @@
 
 namespace UnityEngine.Rendering.HighDefinition
 {
+    [GenerateHLSL(needAccessors = false, generateCBuffer = true)]
+    unsafe struct ShaderVariablesDebugDisplay
+    {
+        [HLSLArray(32, typeof(Vector4))]
+        public fixed float _DebugRenderingLayersColors[32 * 4];
+        [HLSLArray(11, typeof(ShaderGenUInt4))]
+        public fixed uint _DebugViewMaterialArray[11 * 4]; // Contain the id (define in various materialXXX.cs.hlsl) of the property to display
+
+        public int _DebugLightingMode; // Match enum DebugLightingMode
+        public int _DebugLightLayersMask;
+        public int _DebugShadowMapMode;
+        public int _DebugMipMapMode; // Match enum DebugMipMapMode
+
+        public int _DebugFullScreenMode;
+        public float _DebugTransparencyOverdrawWeight;
+        public int _DebugMipMapModeTerrainTexture; // Match enum DebugMipMapModeTerrainTexture
+        public int _ColorPickerMode; // Match enum ColorPickerDebugMode
+
+        public Vector4 _DebugLightingAlbedo; // x == bool override, yzw = albedo for diffuse
+        public Vector4 _DebugLightingSmoothness; // x == bool override, y == override value
+        public Vector4 _DebugLightingNormal; // x == bool override
+        public Vector4 _DebugLightingAmbientOcclusion; // x == bool override, y == override value
+        public Vector4 _DebugLightingSpecularColor; // x == bool override, yzw = specular color
+        public Vector4 _DebugLightingEmissiveColor; // x == bool override, yzw = emissive color
+        public Vector4 _DebugLightingMaterialValidateHighColor; // user can specific the colors for the validator error conditions
+        public Vector4 _DebugLightingMaterialValidateLowColor;
+        public Vector4 _DebugLightingMaterialValidatePureMetalColor;
+        public Vector4 _MousePixelCoord;  // xy unorm, zw norm
+        public Vector4 _MouseClickPixelCoord;  // xy unorm, zw norm
+
+        public float _DebugExposure;
+        public int _MatcapMixAlbedo;
+        public float _MatcapViewScale;
+        public int _DebugSingleShadowIndex;
+
+        public int _DebugProbeVolumeMode;
+        public Vector3 _DebugDisplayPad0;
+    }
+
     /// <summary>
     /// Full Screen Debug Mode.
     /// </summary>

com.unity.render-pipelines.high-definition/Runtime/Debug/DebugDisplay.cs.hlsl

@@ -35,5 +35,37 @@
 #define FULLSCREENDEBUGMODE_VALIDATE_SPECULAR_COLOR (25)
 #define FULLSCREENDEBUGMODE_MAX_MATERIAL_FULL_SCREEN_DEBUG (26)
 
+// Generated from UnityEngine.Rendering.HighDefinition.ShaderVariablesDebugDisplay
+// PackingRules = Exact
+CBUFFER_START(ShaderVariablesDebugDisplay)
+    float4 _DebugRenderingLayersColors[32];
+    uint4 _DebugViewMaterialArray[11];
+    int _DebugLightingMode;
+    int _DebugLightLayersMask;
+    int _DebugShadowMapMode;
+    int _DebugMipMapMode;
+    int _DebugFullScreenMode;
+    float _DebugTransparencyOverdrawWeight;
+    int _DebugMipMapModeTerrainTexture;
+    int _ColorPickerMode;
+    float4 _DebugLightingAlbedo;
+    float4 _DebugLightingSmoothness;
+    float4 _DebugLightingNormal;
+    float4 _DebugLightingAmbientOcclusion;
+    float4 _DebugLightingSpecularColor;
+    float4 _DebugLightingEmissiveColor;
+    float4 _DebugLightingMaterialValidateHighColor;
+    float4 _DebugLightingMaterialValidateLowColor;
+    float4 _DebugLightingMaterialValidatePureMetalColor;
+    float4 _MousePixelCoord;
+    float4 _MouseClickPixelCoord;
+    float _DebugExposure;
+    int _MatcapMixAlbedo;
+    float _MatcapViewScale;
+    int _DebugSingleShadowIndex;
+    int _DebugProbeVolumeMode;
+    float3 _DebugDisplayPad0;
+CBUFFER_END
+
 
 #endif

com.unity.render-pipelines.high-definition/Runtime/Debug/DebugDisplay.hlsl

@@ -11,39 +11,6 @@
 #include "Packages/com.unity.render-pipelines.high-definition/Runtime/Debug/MipMapDebug.cs.hlsl"
 #include "Packages/com.unity.render-pipelines.high-definition/Runtime/Debug/ColorPickerDebug.cs.hlsl"
 
-CBUFFER_START(UnityDebugDisplay)
-// Set of parameters available when switching to debug shader mode
-int _DebugLightingMode; // Match enum DebugLightingMode
-int _DebugLightLayersMask;
-float4 _DebugRenderingLayersColors[32];
-int _DebugShadowMapMode;
-float _DebugViewMaterialArray[11]; // Contain the id (define in various materialXXX.cs.hlsl) of the property to display
-int _DebugMipMapMode; // Match enum DebugMipMapMode
-int _DebugMipMapModeTerrainTexture; // Match enum DebugMipMapModeTerrainTexture
-int _ColorPickerMode; // Match enum ColorPickerDebugMode
-int _DebugProbeVolumeMode; // Match enum ProbeVolumeDebugMode
-int _DebugStep;
-int _DebugDepthPyramidMip;
-int _DebugFullScreenMode;
-float _DebugTransparencyOverdrawWeight;
-float4 _DebugLightingAlbedo; // x == bool override, yzw = albedo for diffuse
-float4 _DebugLightingSmoothness; // x == bool override, y == override value
-float4 _DebugLightingNormal; // x == bool override
-float4 _DebugLightingAmbientOcclusion; // x == bool override, y == override value
-float4 _DebugLightingSpecularColor; // x == bool override, yzw = specular color
-float4 _DebugLightingEmissiveColor; // x == bool override, yzw = emissive color
-float4 _DebugLightingMaterialValidateHighColor; // user can specific the colors for the validator error conditions
-float4 _DebugLightingMaterialValidateLowColor;
-float4 _DebugLightingMaterialValidatePureMetalColor;
-float4 _MousePixelCoord;  // xy unorm, zw norm
-float4 _MouseClickPixelCoord;  // xy unorm, zw norm
-float _DebugExposure;
-int _MatcapMixAlbedo;
-int _MatcapViewScale;
-uint _DebugContactShadowLightIndex;
-int _DebugSingleShadowIndex;
-CBUFFER_END
-
 // Local shader variables
 static DirectionalShadowType g_DebugShadowAttenuation = 0;
 

com.unity.render-pipelines.high-definition/Runtime/Debug/DebugFullScreen.shader

@@ -29,6 +29,8 @@ Shader "Hidden/HDRP/DebugFullScreen"
             CBUFFER_START (UnityDebug)
             float _FullScreenDebugMode;
             float _TransparencyOverdrawMaxPixelCost;
+            uint _DebugContactShadowLightIndex;
+            int _DebugDepthPyramidMip;
             CBUFFER_END
 
             TEXTURE2D_X(_DebugFullScreenTexture);
@@ -304,14 +306,14 @@ Shader "Hidden/HDRP/DebugFullScreen"
                     float linearDepth = frac(posInput.linearDepth * 0.1);
                     return float4(linearDepth.xxx, 1.0);
                 }
-                
+
                 if (_FullScreenDebugMode == FULLSCREENDEBUGMODE_TRANSPARENCY_OVERDRAW)
                 {
                     float4 color = (float4)0;
-    
+
                     float pixelCost = SAMPLE_TEXTURE2D_X(_DebugFullScreenTexture, s_point_clamp_sampler, input.texcoord).r;
                     if ((pixelCost > 0.001))
-                        color.rgb = HsvToRgb(float3(0.66 * saturate(1.0 - (1.0 / _TransparencyOverdrawMaxPixelCost) * pixelCost), 1.0, 1.0));// 
+                        color.rgb = HsvToRgb(float3(0.66 * saturate(1.0 - (1.0 / _TransparencyOverdrawMaxPixelCost) * pixelCost), 1.0, 1.0));//
                     return color;
                 }
 

com.unity.render-pipelines.high-definition/Runtime/Debug/DebugViewMaterialGBuffer.shader

@@ -74,7 +74,7 @@ Shader "Hidden/HDRP/DebugViewMaterialGBuffer"
                 //   - a gBufferIndex (always stored in _DebugViewMaterialArray[1] as only one supported)
                 //   - a property index which is different for each kind of material even if reflecting the same thing (see MaterialSharedProperty)
                 // So here if the buffer is of size zero, it is the same as if we give in a 0 buffer index.
-                int bufferIndex = int(_DebugViewMaterialArray[0]) >= 1 ? int(_DebugViewMaterialArray[1]) : 0;
+                int bufferIndex = _DebugViewMaterialArray[0].x >= 1 ? _DebugViewMaterialArray[1].x : 0;
                 if (bufferIndex == DEBUGVIEWGBUFFER_DEPTH)
                 {
                     float linearDepth = frac(posInput.linearDepth * 0.1);

com.unity.render-pipelines.high-definition/Runtime/Lighting/LightCookieManager.cs

@@ -26,7 +26,7 @@ class LightCookieManager
         internal const int k_MinCookieSize = 2;
 
         readonly Material m_MaterialFilterAreaLights;
-        MaterialPropertyBlock m_MPBFilterAreaLights;
+        MaterialPropertyBlock m_MPBFilterAreaLights = new MaterialPropertyBlock();
 
         readonly Material m_CubeToPanoMaterial;
 
@@ -159,11 +159,12 @@ Texture FilterAreaLightTexture(CommandBuffer cmd, Texture source)
 
                 // Start by copying the source texture to the array slice's mip 0
                 {
-                    cmd.SetGlobalTexture(s_texSource, source);
-                    cmd.SetGlobalInt(s_sourceMipLevel, 0);
+                    m_MPBFilterAreaLights.SetInt(s_sourceMipLevel, 0);
+                    m_MPBFilterAreaLights.SetTexture(s_texSource, source);
+
                     cmd.SetRenderTarget(m_TempRenderTexture0, 0);
                     cmd.SetViewport(new Rect(0, 0, viewportWidth, viewportHeight));
-                    cmd.DrawProcedural(Matrix4x4.identity, m_MaterialFilterAreaLights, 0, MeshTopology.Triangles, 3, 1);
+                    cmd.DrawProcedural(Matrix4x4.identity, m_MaterialFilterAreaLights, 0, MeshTopology.Triangles, 3, 1, m_MPBFilterAreaLights);
                 }
 
                 // Then operate on all the remaining mip levels
@@ -177,13 +178,14 @@ Texture FilterAreaLightTexture(CommandBuffer cmd, Texture source)
                         viewportWidth = Mathf.Max(1, viewportWidth >> 1);
                         targetWidth = Mathf.Max(1, targetWidth  >> 1);
 
+                        m_MPBFilterAreaLights.SetTexture(s_texSource, m_TempRenderTexture0);
+                        m_MPBFilterAreaLights.SetInt(s_sourceMipLevel, mipIndex - 1);
+                        m_MPBFilterAreaLights.SetVector(s_sourceSize, sourceSize);
+                        m_MPBFilterAreaLights.SetVector(s_uvLimits, uvLimits);
+
                         cmd.SetRenderTarget(m_TempRenderTexture1, mipIndex-1);    // Temp texture is already 1 mip lower than source
                         cmd.SetViewport(new Rect(0, 0, viewportWidth, viewportHeight));
-                        cmd.SetGlobalTexture(s_texSource, m_TempRenderTexture0);
-                        cmd.SetGlobalInt(s_sourceMipLevel, mipIndex-1);          // Use previous mip as source
-                        cmd.SetGlobalVector(s_sourceSize, sourceSize);
-                        cmd.SetGlobalVector(s_uvLimits, uvLimits);
-                        cmd.DrawProcedural(Matrix4x4.identity, m_MaterialFilterAreaLights, 1, MeshTopology.Triangles, 3, 1);
+                        cmd.DrawProcedural(Matrix4x4.identity, m_MaterialFilterAreaLights, 1, MeshTopology.Triangles, 3, 1, m_MPBFilterAreaLights);
                     }
 
                     sourceWidth = targetWidth;
@@ -195,13 +197,14 @@ Texture FilterAreaLightTexture(CommandBuffer cmd, Texture source)
                         viewportHeight = Mathf.Max(1, viewportHeight >> 1);
                         targetHeight = Mathf.Max(1, targetHeight >> 1);
 
+                        m_MPBFilterAreaLights.SetTexture(s_texSource, m_TempRenderTexture1);
+                        m_MPBFilterAreaLights.SetInt(s_sourceMipLevel, mipIndex - 1);
+                        m_MPBFilterAreaLights.SetVector(s_sourceSize, sourceSize);
+                        m_MPBFilterAreaLights.SetVector(s_uvLimits, uvLimits);
+
                         cmd.SetRenderTarget(m_TempRenderTexture0, mipIndex);
                         cmd.SetViewport(new Rect(0, 0, viewportWidth, viewportHeight));
-                        cmd.SetGlobalTexture(s_texSource, m_TempRenderTexture1);
-                        cmd.SetGlobalInt(s_sourceMipLevel, mipIndex-1);
-                        cmd.SetGlobalVector(s_sourceSize, sourceSize);
-                        cmd.SetGlobalVector(s_uvLimits, uvLimits);
-                        cmd.DrawProcedural(Matrix4x4.identity, m_MaterialFilterAreaLights, 2, MeshTopology.Triangles, 3, 1);
+                        cmd.DrawProcedural(Matrix4x4.identity, m_MaterialFilterAreaLights, 2, MeshTopology.Triangles, 3, 1, m_MPBFilterAreaLights);
                     }
 
                     sourceHeight = targetHeight;