Merge pull request #1704 from Unity-Technologies/HDRP/constant-buffer-refacto

Refactoring of HDRP constant buffers

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

 - PostProcess input buffers are not copied anymore on PC if the viewport size matches the final render target size
 - Fixed an issue when manipulating a lot of decals, it was displaying a lot of errors in the inspector
 - Fixed capture material with reflection probe
+- Refactored Constant Buffers to avoid hitting the maximum number of bound CBs in some cases.
 
 ### Changed
 - Movde Render Pipeline Debug "Windows from Windows->General-> Render Pipeline debug windows" to "Windows from Windows->Analysis-> Render Pipeline debug windows"

com.unity.render-pipelines.high-definition/HDRP/Lighting/LightLoop/LightLoopDef.hlsl

 #include "LightLoop.cs.hlsl"
-#include "../../Sky/SkyVariables.hlsl"
-
-StructuredBuffer<uint> g_vLightListGlobal;      // don't support Buffer yet in unity
-#define MAX_ENV2D_LIGHT 32
-
-CBUFFER_START(UnityTilePass)
-uint _NumTileFtplX;
-uint _NumTileFtplY;
-
-// these uniforms are only needed for when OPAQUES_ONLY is NOT defined
-// but there's a problem with our front-end compilation of compute shaders with multiple kernels causing it to error
-//#ifdef USE_CLUSTERED_LIGHTLIST
-float4x4 g_mInvScrProjection; // TODO: remove, unused in HDRP
-
-float g_fClustScale;
-float g_fClustBase;
-float g_fNearPlane;
-float g_fFarPlane;
-int g_iLog2NumClusters; // We need to always define these to keep constant buffer layouts compatible
-
-uint g_isLogBaseBufferEnabled;
-//#endif
-
-//#ifdef USE_CLUSTERED_LIGHTLIST
-uint _NumTileClusteredX;
-uint _NumTileClusteredY;
-CBUFFER_END
-
-StructuredBuffer<uint> g_vLayeredOffsetsBuffer;     // don't support Buffer yet in unity
-StructuredBuffer<float> g_logBaseBuffer;            // don't support Buffer yet in unity
-//#endif
-
-#ifdef USE_INDIRECT
-    StructuredBuffer<uint> g_TileFeatureFlags;
-#endif
-
-StructuredBuffer<DirectionalLightData> _DirectionalLightDatas;
-StructuredBuffer<LightData>            _LightDatas;
-StructuredBuffer<EnvLightData>         _EnvLightDatas;
-StructuredBuffer<ShadowData>           _ShadowDatas;
-
-// Used by directional and spot lights
-TEXTURE2D_ARRAY(_CookieTextures);
-
-// Used by point lights
-TEXTURECUBE_ARRAY_ABSTRACT(_CookieCubeTextures);
-
-// Use texture array for reflection (or LatLong 2D array for mobile)
-TEXTURECUBE_ARRAY_ABSTRACT(_EnvCubemapTextures);
-TEXTURE2D_ARRAY(_Env2DTextures);
-float4x4 _Env2DCaptureVP[MAX_ENV2D_LIGHT];
-
-// XRTODO: Need to stereo-ize access
-TEXTURE2D(_DeferredShadowTexture);
-
-CBUFFER_START(UnityPerLightLoop)
-uint _DirectionalLightCount;
-uint _PunctualLightCount;
-uint _AreaLightCount;
-uint _EnvLightCount;
-uint _EnvProxyCount;
-int  _EnvLightSkyEnabled;         // TODO: make it a bool
-CBUFFER_END
 
 // LightLoopContext is not visible from Material (user should not use these properties in Material file)
 // It allow the lightloop to have transmit sampling information (do we use atlas, or texture array etc...)

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

 
 #endif
 
-CBUFFER_START(UnityDecalParameters)
-    uint _EnableDBuffer;
-    float2 _DecalAtlasResolution;
-CBUFFER_END
-
 UNITY_INSTANCING_BUFFER_START(Decal)
     UNITY_DEFINE_INSTANCED_PROP(float4x4, _NormalToWorld)
 UNITY_INSTANCING_BUFFER_END(matrix)

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

 #include "CoreRP/ShaderLibrary/CommonMaterial.hlsl"
 #include "CoreRP/ShaderLibrary/EntityLighting.hlsl"
 #include "CoreRP/ShaderLibrary/ImageBasedLighting.hlsl"
-#include "../Sky/AtmosphericScattering/AtmosphericScattering.hlsl"
+#include "HDRP/Lighting/AtmosphericScattering/AtmosphericScattering.hlsl"
 
 // Guidelines for Material Keyword.
 // There is a set of Material Keyword that a HD shaders must define (or not define). We call them system KeyWord.

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

 #include "../DiffusionProfile/DiffusionProfile.hlsl"
 
 // ----------------------------------------------------------------------------
-// constant buffer declaration
-// ----------------------------------------------------------------------------
-
-CBUFFER_START(UnitySSSAndTransmissionParameters)
-// Warning: Unity is not able to losslessly transfer integers larger than 2^24 to the shader system.
-// Therefore, we bitcast uint to float in C#, and bitcast back to uint in the shader.
-uint   _EnableSubsurfaceScattering; // Globally toggles subsurface and transmission scattering on/off
-float  _TexturingModeFlags;       // 1 bit/profile; 0 = PreAndPostScatter, 1 = PostScatter
-float  _TransmissionFlags;        // 1 bit/profile; 0 = regular, 1 = thin
-// Old SSS Model >>>
-float4 _HalfRcpVariancesAndWeights[DIFFUSION_PROFILE_COUNT][2]; // 2x Gaussians in RGB, A is interpolation weights
-// <<< Old SSS Model
-// Use float4 to avoid any packing issue between compute and pixel shaders
-float4  _ThicknessRemaps[DIFFUSION_PROFILE_COUNT];   // R: start, G = end - start, BA unused
-float4 _ShapeParams[DIFFUSION_PROFILE_COUNT];        // RGB = S = 1 / D, A = filter radius
-float4 _TransmissionTintsAndFresnel0[DIFFUSION_PROFILE_COUNT];  // RGB = 1/4 * color, A = fresnel0
-float4 _WorldScales[DIFFUSION_PROFILE_COUNT];        // X = meters per world unit; Y = world units per meter
-CBUFFER_END
-
-// ----------------------------------------------------------------------------
 // helper functions
 // ----------------------------------------------------------------------------
 

com.unity.render-pipelines.high-definition/HDRP/RenderPipelineResources/HDRenderPipelineResources.asset

   m_Name: HDRenderPipelineResources
   m_EditorClassIdentifier: 
   version: 1
-  defaultDiffuseMaterial: {fileID: 2100000, guid: 73c176f402d2c2f4d929aa5da7585d17,
-    type: 2}
-  defaultMirrorMaterial: {fileID: 2100000, guid: 6b17274157b33bc45b6a40e7d4ff51fe,
-    type: 2}
-  defaultDecalMaterial: {fileID: 2100000, guid: 500e733574922d04ea961553b1b26a63,
-    type: 2}
+  defaultDiffuseMaterial: {fileID: 2100000, guid: 73c176f402d2c2f4d929aa5da7585d17, type: 2}
+  defaultMirrorMaterial: {fileID: 2100000, guid: 6b17274157b33bc45b6a40e7d4ff51fe, type: 2}
+  defaultDecalMaterial: {fileID: 2100000, guid: 500e733574922d04ea961553b1b26a63, type: 2}
-  debugDisplayLatlongShader: {fileID: 4800000, guid: c1d1d149a043a5349ba367da6c2051ba,
-    type: 3}
-  debugViewMaterialGBufferShader: {fileID: 4800000, guid: 439949ea1bfa91b4ba0d04269fcde33d,
-    type: 3}
-  debugViewTilesShader: {fileID: 4800000, guid: c7c2bd17b06ceb4468e14081aaf1b96f,
-    type: 3}
-  debugFullScreenShader: {fileID: 4800000, guid: e874aca2df8300a488258738c31f85cf,
-    type: 3}
-  debugColorPickerShader: {fileID: 4800000, guid: 8137b807709e178498f22ed710864bb0,
-    type: 3}
+  debugDisplayLatlongShader: {fileID: 4800000, guid: c1d1d149a043a5349ba367da6c2051ba, type: 3}
+  debugViewMaterialGBufferShader: {fileID: 4800000, guid: 439949ea1bfa91b4ba0d04269fcde33d, type: 3}
+  debugViewTilesShader: {fileID: 4800000, guid: c7c2bd17b06ceb4468e14081aaf1b96f, type: 3}
+  debugFullScreenShader: {fileID: 4800000, guid: e874aca2df8300a488258738c31f85cf, type: 3}
+  debugColorPickerShader: {fileID: 4800000, guid: 8137b807709e178498f22ed710864bb0, type: 3}
   deferredShader: {fileID: 4800000, guid: 00dd221e34a6ab349a1196b0f2fab693, type: 3}
   colorPyramidCS: {fileID: 7200000, guid: 4e3267a1135742441a14298d8dcac04a, type: 3}
   depthPyramidCS: {fileID: 7200000, guid: 64a553bb564274041906f78ffba955e4, type: 3}
-  clearDispatchIndirectShader: {fileID: 7200000, guid: fc1f553acb80a6446a32d33e403d0656,
-    type: 3}
-  buildDispatchIndirectShader: {fileID: 7200000, guid: 4eb1b418be7044c40bb5200496c50f14,
-    type: 3}
-  buildScreenAABBShader: {fileID: 7200000, guid: 728dce960f8a9c44bbc3abb3b851d8f6,
-    type: 3}
-  buildPerTileLightListShader: {fileID: 7200000, guid: 65af3444cbf4b3747a4dead7ee00cfee,
-    type: 3}
-  buildPerBigTileLightListShader: {fileID: 7200000, guid: 5ee1f9d6e09abe045b2f5e0b784b9072,
-    type: 3}
-  buildPerVoxelLightListShader: {fileID: 7200000, guid: 0bb1b7e0ddcd5c44baf3ddc7456eb196,
-    type: 3}
-  buildMaterialFlagsShader: {fileID: 7200000, guid: fb3eda953cd6e634e877fb777be2cd08,
-    type: 3}
-  deferredComputeShader: {fileID: 7200000, guid: 0b64f79746d2daf4198eaf6eab9af259,
-    type: 3}
-  screenSpaceShadowComputeShader: {fileID: 7200000, guid: 3e6900e06dc185a4380af4dacb4db0a4,
-    type: 3}
-  volumeVoxelizationCS: {fileID: 7200000, guid: c20b371db720da244b73830ec74a343a,
-    type: 3}
-  volumetricLightingCS: {fileID: 7200000, guid: b4901a10df2d1e24282725e9fbc77c97,
-    type: 3}
-  subsurfaceScatteringCS: {fileID: 7200000, guid: b06a7993621def248addd55d0fe931b1,
-    type: 3}
-  subsurfaceScattering: {fileID: 4800000, guid: 867b36db983aa0548889a66f8d685ff6,
-    type: 3}
+  clearDispatchIndirectShader: {fileID: 7200000, guid: fc1f553acb80a6446a32d33e403d0656, type: 3}
+  buildDispatchIndirectShader: {fileID: 7200000, guid: 4eb1b418be7044c40bb5200496c50f14, type: 3}
+  buildScreenAABBShader: {fileID: 7200000, guid: 728dce960f8a9c44bbc3abb3b851d8f6, type: 3}
+  buildPerTileLightListShader: {fileID: 7200000, guid: 65af3444cbf4b3747a4dead7ee00cfee, type: 3}
+  buildPerBigTileLightListShader: {fileID: 7200000, guid: 5ee1f9d6e09abe045b2f5e0b784b9072, type: 3}
+  buildPerVoxelLightListShader: {fileID: 7200000, guid: 0bb1b7e0ddcd5c44baf3ddc7456eb196, type: 3}
+  buildMaterialFlagsShader: {fileID: 7200000, guid: fb3eda953cd6e634e877fb777be2cd08, type: 3}
+  deferredComputeShader: {fileID: 7200000, guid: 0b64f79746d2daf4198eaf6eab9af259, type: 3}
+  screenSpaceShadowComputeShader: {fileID: 7200000, guid: 3e6900e06dc185a4380af4dacb4db0a4, type: 3}
+  volumeVoxelizationCS: {fileID: 7200000, guid: c20b371db720da244b73830ec74a343a, type: 3}
+  volumetricLightingCS: {fileID: 7200000, guid: b4901a10df2d1e24282725e9fbc77c97, type: 3}
+  subsurfaceScatteringCS: {fileID: 7200000, guid: b06a7993621def248addd55d0fe931b1, type: 3}
+  subsurfaceScattering: {fileID: 4800000, guid: 867b36db983aa0548889a66f8d685ff6, type: 3}
   combineLighting: {fileID: 4800000, guid: 2e37131331fbdca449b1a2bc47a639ca, type: 3}
   cameraMotionVectors: {fileID: 4800000, guid: 035941b63024d1943af48811c1db20d9, type: 3}
   copyStencilBuffer: {fileID: 4800000, guid: 3d1574f1cdfa0ce4995f9bc79ed7f8ec, type: 3}
-  buildProbabilityTables: {fileID: 7200000, guid: b9f26cf340afe9145a699753531b2a4c,
-    type: 3}
-  computeGgxIblSampleData: {fileID: 7200000, guid: 764a24bb47ef5ba4781d9ae82ca07445,
-    type: 3}
+  buildProbabilityTables: {fileID: 7200000, guid: b9f26cf340afe9145a699753531b2a4c, type: 3}
+  computeGgxIblSampleData: {fileID: 7200000, guid: 764a24bb47ef5ba4781d9ae82ca07445, type: 3}
-  opaqueAtmosphericScattering: {fileID: 4800000, guid: 326059e48e5735e46a98047eff4f0295,
-    type: 3}
+  opaqueAtmosphericScattering: {fileID: 4800000, guid: 32f724728cf19904291226f239ec16f0, type: 3}
-  preIntegratedFGD_GGXDisneyDiffuse: {fileID: 4800000, guid: 123f13d52852ef547b2962de4bd9eaad,
-    type: 3}
-  preIntegratedFGD_CharlieClothLambert: {fileID: 4800000, guid: 3b3bf235775cf8b4baae7f3306787ab0,
-    type: 3}
+  preIntegratedFGD_GGXDisneyDiffuse: {fileID: 4800000, guid: 123f13d52852ef547b2962de4bd9eaad, type: 3}
+  preIntegratedFGD_CharlieClothLambert: {fileID: 4800000, guid: 3b3bf235775cf8b4baae7f3306787ab0, type: 3}
-  debugShadowMapShader: {fileID: 4800000, guid: ee25e539f5594f44085e0a9000c15d9b,
-    type: 3}
+  debugShadowMapShader: {fileID: 4800000, guid: ee25e539f5594f44085e0a9000c15d9b, type: 3}

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

 
 // ----------------------------------------------------------------------------
 
-CBUFFER_START(UnityPerFrame)
-    float4 glstate_lightmodel_ambient;
-    float4 unity_AmbientSky;
-    float4 unity_AmbientEquator;
-    float4 unity_AmbientGround;
-    float4 unity_IndirectSpecColor;
-
-#if !defined(USING_STEREO_MATRICES)
-    float4x4 glstate_matrix_projection;
-    float4x4 unity_MatrixV;
-    float4x4 unity_MatrixInvV;
-    float4x4 unity_MatrixVP;
-    float4 unity_StereoScaleOffset;
-    int unity_StereoEyeIndex;
-#endif
-
-    float4 unity_ShadowColor;
-CBUFFER_END
-
-// ----------------------------------------------------------------------------
-
 // These are the samplers available in the HDRenderPipeline.
 // Avoid declaring extra samplers as they are 4x SGPR each on GCN.
 SAMPLER(s_point_clamp_sampler);
 
 // ----------------------------------------------------------------------------
 
+// Define that before including all the sub systems ShaderVariablesXXX.hlsl files in order to include constant buffer properties.
+#define SHADER_VARIABLES_INCLUDE_CB
+
-CBUFFER_START(UnityPerView)
+CBUFFER_START(UnityGlobal)
+    // ================================
+    //     PER FRAME CONSTANTS
+    // ================================
+    #if !defined(USING_STEREO_MATRICES)
+        float4x4 glstate_matrix_projection;
+        float4x4 unity_MatrixV;
+        float4x4 unity_MatrixInvV;
+        float4x4 unity_MatrixVP;
+        float4 unity_StereoScaleOffset;
+        int unity_StereoEyeIndex;
+    #endif
+
+    // ================================
+    //     PER VIEW CONSTANTS
+    // ================================
     // TODO: all affine matrices should be 3x4.
     float4x4 _ViewMatrix;
     float4x4 _InvViewMatrix;
     float4 _VBufferPrevUvScaleAndLimit;
     float4 _VBufferPrevDepthEncodingParams;
     float4 _VBufferPrevDepthDecodingParams;
-CBUFFER_END
-CBUFFER_START(UnityLightingParameters)
-// Buffer pyramid
-float4  _ColorPyramidSize;              // (x,y) = Actual Pixel Size, (z,w) = 1 / Actual Pixel Size
-float4  _DepthPyramidSize;              // (x,y) = Actual Pixel Size, (z,w) = 1 / Actual Pixel Size
-float4  _CameraMotionVectorsSize;       // (x,y) = Actual Pixel Size, (z,w) = 1 / Actual Pixel Size
-float4  _ColorPyramidScale;             // (x,y) = Screen Scale, z = lod count, w = unused
-float4  _DepthPyramidScale;             // (x,y) = Screen Scale, z = lod count, w = unused
-float4  _CameraMotionVectorsScale;      // (x,y) = Screen Scale, z = lod count, w = unused
+    #include "Lighting/LightLoop/ShaderVariablesLightLoop.hlsl"
+    #include "Lighting/ScreenSpaceLighting/ShaderVariablesScreenSpaceLighting.hlsl"
+    #include "Lighting/AtmosphericScattering/ShaderVariablesAtmosphericScattering.hlsl"
+    #include "Material/SubsurfaceScattering/ShaderVariablesSubsurfaceScattering.hlsl"
+    #include "Material/Decal/ShaderVariablesDecal.hlsl"
-                                // Screen space lighting
-float   _SSRefractionInvScreenWeightDistance;     // Distance for screen space smoothstep with fallback
-float   _SSReflectionInvScreenWeightDistance;     // Distance for screen space smoothstep with fallback
-int     _SSReflectionEnabled;
-int     _SSReflectionProjectionModel;
-int     _SSReflectionHiZRayMarchBehindObject;
-int     _SSRefractionHiZRayMarchBehindObject;
-
-                                                // Ambiant occlusion
-float4 _AmbientOcclusionParam; // xyz occlusion color, w directLightStrenght
-// Rough refraction texture
-// Color pyramid (width, height, lodcount, Unused)
-TEXTURE2D(_ColorPyramidTexture);
-// Depth pyramid (width, height, lodcount, Unused)
-TEXTURE2D(_DepthPyramidTexture);
-// Ambient occlusion texture
-TEXTURE2D(_AmbientOcclusionTexture);
-TEXTURE2D(_CameraMotionVectorsTexture);
+// 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)

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

     return _ScreenToTargetScale.zw;
 }
 
+float4 SampleSkyTexture(float3 texCoord)
+{
+    return SAMPLE_TEXTURECUBE(_SkyTexture, s_trilinear_clamp_sampler, texCoord);
+}
+
+float4 SampleSkyTexture(float3 texCoord, float lod)
+{
+    return SAMPLE_TEXTURECUBE_LOD(_SkyTexture, s_trilinear_clamp_sampler, texCoord, lod);
+}
+
 #endif // UNITY_SHADER_VARIABLES_FUNCTIONS_INCLUDED

com.unity.render-pipelines.high-definition/HDRP/Lighting/AtmosphericScattering/OpaqueAtmosphericScattering.shader

 
             #pragma vertex Vert
             #pragma fragment Frag
-            
+
             #pragma multi_compile _ DEBUG_DISPLAY
 
             // #pragma enable_d3d11_debug_symbols
-            #include "../ShaderVariables.hlsl"
-            #include "AtmosphericScattering/AtmosphericScattering.hlsl"
+            #include "HDRP/ShaderVariables.hlsl"
+            #include "HDRP/Lighting/AtmosphericScattering/AtmosphericScattering.hlsl"
 
             struct Attributes
             {

com.unity.render-pipelines.high-definition/HDRP/Lighting/AtmosphericScattering/AtmosphericScattering.cs.meta

 fileFormatVersion: 2
 guid: 953beb541740ddc499d005ee80c9ff29
-timeCreated: 1507718592
-licenseType: Pro
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

com.unity.render-pipelines.high-definition/HDRP/Lighting/AtmosphericScattering.meta

+fileFormatVersion: 2
+guid: 41811d2641d454a48819f6e50a816af9
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

com.unity.render-pipelines.high-definition/HDRP/Lighting/LightLoop/ShaderVariablesLightLoop.hlsl

+#ifdef SHADER_VARIABLES_INCLUDE_CB
+
+    #define MAX_ENV2D_LIGHT 32
+
+    uint _DirectionalLightCount;
+    uint _PunctualLightCount;
+    uint _AreaLightCount;
+    uint _EnvLightCount;
+    uint _EnvProxyCount;
+    int  _EnvLightSkyEnabled;         // TODO: make it a bool
+
+    uint _NumTileFtplX;
+    uint _NumTileFtplY;
+
+    // these uniforms are only needed for when OPAQUES_ONLY is NOT defined
+    // but there's a problem with our front-end compilation of compute shaders with multiple kernels causing it to error
+    //#ifdef USE_CLUSTERED_LIGHTLIST
+    float4x4 g_mInvScrProjection; // TODO: remove, unused in HDRP
+
+    float g_fClustScale;
+    float g_fClustBase;
+    float g_fNearPlane;
+    float g_fFarPlane;
+    int g_iLog2NumClusters; // We need to always define these to keep constant buffer layouts compatible
+
+    uint g_isLogBaseBufferEnabled;
+    //#endif
+
+    //#ifdef USE_CLUSTERED_LIGHTLIST
+    uint _NumTileClusteredX;
+    uint _NumTileClusteredY;
+
+    float4x4 _Env2DCaptureVP[MAX_ENV2D_LIGHT];
+
+#else
+
+    #include "HDRP/Lighting/LightDefinition.cs.hlsl"
+    #include "CoreRP/Shadow/ShadowBase.cs.hlsl"
+
+    StructuredBuffer<uint>  g_vLightListGlobal;      // don't support Buffer yet in unity
+
+    StructuredBuffer<uint>  g_vLayeredOffsetsBuffer;     // don't support Buffer yet in unity
+    StructuredBuffer<float> g_logBaseBuffer;            // don't support Buffer yet in unity
+                                                        //#endif
+
+    #ifdef USE_INDIRECT
+        StructuredBuffer<uint> g_TileFeatureFlags;
+    #endif
+
+    StructuredBuffer<DirectionalLightData> _DirectionalLightDatas;
+    StructuredBuffer<LightData>            _LightDatas;
+    StructuredBuffer<EnvLightData>         _EnvLightDatas;
+    StructuredBuffer<ShadowData>           _ShadowDatas;
+
+    // Used by directional and spot lights
+    TEXTURE2D_ARRAY(_CookieTextures);
+
+    // Used by point lights
+    TEXTURECUBE_ARRAY_ABSTRACT(_CookieCubeTextures);
+
+    // Use texture array for reflection (or LatLong 2D array for mobile)
+    TEXTURECUBE_ARRAY_ABSTRACT(_EnvCubemapTextures);
+    TEXTURE2D_ARRAY(_Env2DTextures);
+
+    // XRTODO: Need to stereo-ize access
+    TEXTURE2D(_DeferredShadowTexture);
+
+#endif

com.unity.render-pipelines.high-definition/HDRP/Lighting/LightLoop/ShaderVariablesLightLoop.hlsl.meta

+fileFormatVersion: 2
+guid: 63d561c067f228044bff7c3922047bf2
+ShaderImporter:
+  externalObjects: {}
+  defaultTextures: []
+  nonModifiableTextures: []
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

com.unity.render-pipelines.high-definition/HDRP/Lighting/ScreenSpaceLighting.meta

+fileFormatVersion: 2
+guid: 8201940de2426934dbd592ff5cf182c9
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

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

+#ifdef SHADER_VARIABLES_INCLUDE_CB
+    uint    _EnableDBuffer;
+    float2  _DecalAtlasResolution;
+#else
+#endif

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

+fileFormatVersion: 2
+guid: 9f6cea0783427804084f429e8502ad33
+ShaderImporter:
+  externalObjects: {}
+  defaultTextures: []
+  nonModifiableTextures: []
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

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

+#ifdef SHADER_VARIABLES_INCLUDE_CB
+    #include "HDRP/Material/DiffusionProfile/DiffusionProfileSettings.cs.hlsl"
+
+    // Warning: Unity is not able to losslessly transfer integers larger than 2^24 to the shader system.
+    // Therefore, we bitcast uint to float in C#, and bitcast back to uint in the shader.
+    uint   _EnableSubsurfaceScattering; // Globally toggles subsurface and transmission scattering on/off
+    float  _TexturingModeFlags;         // 1 bit/profile; 0 = PreAndPostScatter, 1 = PostScatter
+    float  _TransmissionFlags;          // 1 bit/profile; 0 = regular, 1 = thin
+    // Old SSS Model >>>
+    float4 _HalfRcpVariancesAndWeights[DIFFUSION_PROFILE_COUNT][2]; // 2x Gaussians in RGB, A is interpolation weights
+    // <<< Old SSS Model
+    // Use float4 to avoid any packing issue between compute and pixel shaders
+    float4  _ThicknessRemaps[DIFFUSION_PROFILE_COUNT];   // R: start, G = end - start, BA unused
+    float4 _ShapeParams[DIFFUSION_PROFILE_COUNT];        // RGB = S = 1 / D, A = filter radius
+    float4 _TransmissionTintsAndFresnel0[DIFFUSION_PROFILE_COUNT];  // RGB = 1/4 * color, A = fresnel0
+    float4 _WorldScales[DIFFUSION_PROFILE_COUNT];        // X = meters per world unit; Y = world units per meter
+#else
+#endif

com.unity.render-pipelines.high-definition/HDRP/Material/SubsurfaceScattering/ShaderVariablesSubsurfaceScattering.hlsl.meta

+fileFormatVersion: 2
+guid: 63af6347132378d43b75aa5e4efeb029
+ShaderImporter:
+  externalObjects: {}
+  defaultTextures: []
+  nonModifiableTextures: []
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

com.unity.render-pipelines.high-definition/HDRP/Lighting/AtmosphericScattering/AtmosphericScattering.cs.hlsl.meta

+fileFormatVersion: 2
+guid: 22ede5ad2c67e3148bf5bd9fa48b2734
+ShaderImporter:
+  externalObjects: {}
+  defaultTextures: []
+  nonModifiableTextures: []
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

com.unity.render-pipelines.high-definition/HDRP/Lighting/AtmosphericScattering/AtmosphericScattering.hlsl

+#ifndef UNITY_ATMOSPHERIC_SCATTERING_INCLUDED
+#define UNITY_ATMOSPHERIC_SCATTERING_INCLUDED
+
+#include "CoreRP/ShaderLibrary/VolumeRendering.hlsl"
+#include "CoreRP/ShaderLibrary/Filtering.hlsl"
+
+#include "AtmosphericScattering.cs.hlsl"
+#include "HDRP/ShaderVariables.hlsl"
+#include "HDRP/Lighting/Volumetrics/VBuffer.hlsl"
+
+#ifdef DEBUG_DISPLAY
+#include "HDRP/Debug/DebugDisplay.hlsl"
+#endif
+
+float3 GetFogColor(PositionInputs posInput)
+{
+    if (_FogColorMode == FOGCOLORMODE_CONSTANT_COLOR)
+    {
+        return _FogColor.rgb;
+    }
+    else if (_FogColorMode == FOGCOLORMODE_SKY_COLOR)
+    {
+        // Based on Uncharted 4 "Mip Sky Fog" trick: http://advances.realtimerendering.com/other/2016/naughty_dog/NaughtyDog_TechArt_Final.pdf
+        float mipLevel = (1.0 - _MipFogMaxMip * saturate((posInput.linearDepth - _MipFogNear) / (_MipFogFar - _MipFogNear))) * _SkyTextureMipCount;
+        float3 dir = -GetWorldSpaceNormalizeViewDir(posInput.positionWS);
+        return SampleSkyTexture(dir, mipLevel).rgb;
+    }
+    else // Should not be possible.
+        return  float3(0.0, 0.0, 0.0);
+}
+
+// Returns fog color in rgb and fog factor in alpha.
+float4 EvaluateAtmosphericScattering(PositionInputs posInput)
+{
+    float3 fogColor = 0;
+    float  fogFactor = 0;
+
+#ifdef DEBUG_DISPLAY
+    // Don't sample atmospheric scattering when lighting debug more are enabled so fog is not visible
+    if (_DebugLightingMode == DEBUGLIGHTINGMODE_DIFFUSE_LIGHTING || _DebugLightingMode == DEBUGLIGHTINGMODE_SPECULAR_LIGHTING || _DebugLightingMode == DEBUGLIGHTINGMODE_LUX_METER)
+        return float4(0, 0, 0, 0);
+#endif
+
+    switch (_AtmosphericScatteringType)
+    {
+        case FOGTYPE_LINEAR:
+        {
+            fogColor = GetFogColor(posInput);
+            fogFactor = _FogDensity * saturate((posInput.linearDepth - _LinearFogStart) * _LinearFogOneOverRange) * saturate((_LinearFogHeightEnd - GetAbsolutePositionWS(posInput.positionWS).y) * _LinearFogHeightOneOverRange);
+            break;
+        }
+        case FOGTYPE_EXPONENTIAL:
+        {
+            fogColor = GetFogColor(posInput);
+            float distance = length(GetWorldSpaceViewDir(posInput.positionWS));
+            float fogHeight = max(0.0, GetAbsolutePositionWS(posInput.positionWS).y - _ExpFogBaseHeight);
+            fogFactor = _FogDensity * TransmittanceHomogeneousMedium(_ExpFogHeightAttenuation, fogHeight) * (1.0f - TransmittanceHomogeneousMedium(1.0f / _ExpFogDistance, distance));
+            break;
+        }
+        case FOGTYPE_VOLUMETRIC:
+        {
+            float4 volFog = SampleVolumetricLighting(TEXTURE3D_PARAM(_VBufferLighting, s_linear_clamp_sampler),
+                                                     posInput.positionNDC,
+                                                     posInput.linearDepth,
+                                                     _VBufferResolution,
+                                                     _VBufferSliceCount.xy,
+                                                     _VBufferUvScaleAndLimit.xy,
+                                                     _VBufferUvScaleAndLimit.zw,
+                                                     _VBufferDepthEncodingParams,
+                                                     _VBufferDepthDecodingParams,
+                                                     true, true);
+
+            fogFactor = 1 - volFog.a;                              // Opacity from transmittance
+            fogColor  = volFog.rgb * min(rcp(fogFactor), FLT_MAX); // Un-premultiply, clamp to avoid (0 * INF = NaN)
+            break;
+        }
+    }
+
+    return float4(fogColor, fogFactor);
+}
+
+#endif

com.unity.render-pipelines.high-definition/HDRP/Lighting/AtmosphericScattering/AtmosphericScattering.hlsl.meta

+fileFormatVersion: 2
+guid: 14cc5dd8542c537438a7b0282cbc2a6f
+ShaderImporter:
+  externalObjects: {}
+  defaultTextures: []
+  nonModifiableTextures: []
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

com.unity.render-pipelines.high-definition/HDRP/Lighting/AtmosphericScattering/OpaqueAtmosphericScattering.shader.meta

+fileFormatVersion: 2
+guid: 32f724728cf19904291226f239ec16f0
+ShaderImporter:
+  externalObjects: {}
+  defaultTextures: []
+  nonModifiableTextures: []
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

com.unity.render-pipelines.high-definition/HDRP/Lighting/AtmosphericScattering/ShaderVariablesAtmosphericScattering.hlsl

+#ifdef SHADER_VARIABLES_INCLUDE_CB
+    int     _AtmosphericScatteringType;
+    // Common
+    float   _FogColorMode;
+    float4  _FogColorDensity; // color in rgb, density in alpha
+    float4  _MipFogParameters;
+    // Linear fog
+    float4  _LinearFogParameters;
+    // Exp fog
+    float4  _ExpFogParameters;
+
+    float   _SkyTextureMipCount;
+#else
+    TEXTURE3D(_VBufferLighting);
+    TEXTURECUBE(_SkyTexture);
+
+    #define _MipFogNear                     _MipFogParameters.x
+    #define _MipFogFar                      _MipFogParameters.y
+    #define _MipFogMaxMip                   _MipFogParameters.z
+
+    #define _FogDensity                     _FogColorDensity.w
+    #define _FogColor                       _FogColorDensity
+
+    #define _LinearFogStart                 _LinearFogParameters.x
+    #define _LinearFogOneOverRange          _LinearFogParameters.y
+    #define _LinearFogHeightEnd             _LinearFogParameters.z
+    #define _LinearFogHeightOneOverRange    _LinearFogParameters.w
+
+    #define _ExpFogDistance                 _ExpFogParameters.x
+    #define _ExpFogBaseHeight               _ExpFogParameters.y
+    #define _ExpFogHeightAttenuation        _ExpFogParameters.z
+#endif
+

com.unity.render-pipelines.high-definition/HDRP/Lighting/AtmosphericScattering/ShaderVariablesAtmosphericScattering.hlsl.meta

+fileFormatVersion: 2
+guid: 08e9d756e08b10445b237c82ec588e47
+ShaderImporter:
+  externalObjects: {}
+  defaultTextures: []
+  nonModifiableTextures: []
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

com.unity.render-pipelines.high-definition/HDRP/Lighting/ScreenSpaceLighting/ShaderVariablesScreenSpaceLighting.hlsl.meta

+fileFormatVersion: 2
+guid: c78e4b79bf403f44f87fc4f81662898e
+ShaderImporter:
+  externalObjects: {}
+  defaultTextures: []
+  nonModifiableTextures: []
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

com.unity.render-pipelines.high-definition/HDRP/Lighting/ScreenSpaceLighting/ShaderVariablesScreenSpaceLighting.hlsl

+#ifdef SHADER_VARIABLES_INCLUDE_CB
+    // Buffer pyramid
+    float4  _ColorPyramidSize;              // (x,y) = Actual Pixel Size, (z,w) = 1 / Actual Pixel Size
+    float4  _DepthPyramidSize;              // (x,y) = Actual Pixel Size, (z,w) = 1 / Actual Pixel Size
+    float4  _CameraMotionVectorsSize;       // (x,y) = Actual Pixel Size, (z,w) = 1 / Actual Pixel Size
+    float4  _ColorPyramidScale;             // (x,y) = Screen Scale, z = lod count, w = unused
+    float4  _DepthPyramidScale;             // (x,y) = Screen Scale, z = lod count, w = unused
+    float4  _CameraMotionVectorsScale;      // (x,y) = Screen Scale, z = lod count, w = unused
+
+                                            // Screen space lighting
+    float   _SSRefractionInvScreenWeightDistance;     // Distance for screen space smoothstep with fallback
+    float   _SSReflectionInvScreenWeightDistance;     // Distance for screen space smoothstep with fallback
+    int     _SSReflectionEnabled;
+    int     _SSReflectionProjectionModel;
+    int     _SSReflectionHiZRayMarchBehindObject;
+    int     _SSRefractionHiZRayMarchBehindObject;
+
+    // Ambiant occlusion
+    float4 _AmbientOcclusionParam; // xyz occlusion color, w directLightStrenght
+#else
+    // Rough refraction texture
+    // Color pyramid (width, height, lodcount, Unused)
+    TEXTURE2D(_ColorPyramidTexture);
+    // Depth pyramid (width, height, lodcount, Unused)
+    TEXTURE2D(_DepthPyramidTexture);
+    // Ambient occlusion texture
+    TEXTURE2D(_AmbientOcclusionTexture);
+    TEXTURE2D(_CameraMotionVectorsTexture);
+#endif

com.unity.render-pipelines.high-definition/HDRP/Sky/AtmosphericScattering.meta

-fileFormatVersion: 2
-guid: d522828bc0314e14cb6faa4291bb64da
-folderAsset: yes
-timeCreated: 1507718579
-licenseType: Pro
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

com.unity.render-pipelines.high-definition/HDRP/Sky/OpaqueAtmosphericScattering.shader.meta

-fileFormatVersion: 2
-guid: 326059e48e5735e46a98047eff4f0295
-timeCreated: 1507736585
-licenseType: Pro
-ShaderImporter:
-  externalObjects: {}
-  defaultTextures: []
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

com.unity.render-pipelines.high-definition/HDRP/Sky/SkyVariables.hlsl.meta

-fileFormatVersion: 2
-guid: 7ed7d57e43fdd874ab5d047358e9fbe1
-timeCreated: 1508156067
-licenseType: Pro
-ShaderImporter:
-  externalObjects: {}
-  defaultTextures: []
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

com.unity.render-pipelines.high-definition/HDRP/Sky/SkyVariables.hlsl

-#ifndef UNITY_SKY_VARIABLES_INCLUDED
-#define UNITY_SKY_VARIABLES_INCLUDED
-
-TEXTURECUBE(_SkyTexture);
-
-CBUFFER_START(SkyParameters)
-float _SkyTextureMipCount;
-CBUFFER_END
-
-float4 SampleSkyTexture(float3 texCoord)
-{
-    return SAMPLE_TEXTURECUBE(_SkyTexture, s_trilinear_clamp_sampler, texCoord);
-}
-
-float4 SampleSkyTexture(float3 texCoord, float lod)
-{
-    return SAMPLE_TEXTURECUBE_LOD(_SkyTexture, s_trilinear_clamp_sampler, texCoord, lod);
-}
-
-#endif