Fix Generates Include command issue with Physically Based Sky

com.unity.render-pipelines.high-definition/Runtime/Sky/PhysicallyBasedSky/PhysicallyBasedSkyCommon.hlsl

@@ -6,7 +6,7 @@
 #include "Packages/com.unity.render-pipelines.core/ShaderLibrary/VolumeRendering.hlsl"
 #include "Packages/com.unity.render-pipelines.core/ShaderLibrary/Sampling/Sampling.hlsl"
 #include "Packages/com.unity.render-pipelines.high-definition/Runtime/ShaderLibrary/ShaderVariablesGlobal.hlsl"
-#include "Packages/com.unity.render-pipelines.high-definition/Runtime/Sky/PhysicallyBasedSky/PhysicallyBasedSkyRenderer.cs.hlsl"
+#include "Packages/com.unity.render-pipelines.high-definition/Runtime/Sky/PhysicallyBasedSky/ShaderVariablesPhysicallyBasedSky.cs.hlsl"
 
 TEXTURE2D(_GroundIrradianceTexture);
 

com.unity.render-pipelines.high-definition/Runtime/Sky/PhysicallyBasedSky/PhysicallyBasedSkyRenderer.cs

@@ -286,60 +286,6 @@ public bool Update(BuiltinSkyParameters builtinParams, PhysicallyBasedSky pbrSky
             }
         }
 
-        [GenerateHLSL]
-        public enum PbrSkyConfig
-        {
-            // Tiny
-            GroundIrradianceTableSize     = 256, // <N, L>
-
-            // 32 MiB
-            InScatteredRadianceTableSizeX = 128, // <N, V>
-            InScatteredRadianceTableSizeY = 32,  // height
-            InScatteredRadianceTableSizeZ = 16,  // AzimuthAngle(L) w.r.t. the view vector
-            InScatteredRadianceTableSizeW = 64,  // <N, L>,
-        }
-
-        [GenerateHLSL(needAccessors = false, generateCBuffer = true, constantRegister = (int)ConstantRegister.PBRSky)]
-        unsafe struct ShaderVariablesPhysicallyBasedSky
-        {
-            // All the distance-related entries use SI units (meter, 1/meter, etc).
-            public float _PlanetaryRadius;
-            public float _RcpPlanetaryRadius;
-            public float _AtmosphericDepth;
-            public float _RcpAtmosphericDepth;
-
-            public float _AtmosphericRadius;
-            public float _AerosolAnisotropy;
-            public float _AerosolPhasePartConstant;
-            public float _Unused;
-
-            public float _AirDensityFalloff;
-            public float _AirScaleHeight;
-            public float _AerosolDensityFalloff;
-            public float _AerosolScaleHeight;
-
-            public Vector3 _AirSeaLevelExtinction;
-            public float _AerosolSeaLevelExtinction;
-
-            public Vector3 _AirSeaLevelScattering;
-            public float _IntensityMultiplier;
-
-            public Vector3 _AerosolSeaLevelScattering;
-            public float _ColorSaturation;
-
-            public Vector3 _GroundAlbedo;
-            public float _AlphaSaturation;
-
-            public Vector3 _PlanetCenterPosition; // Not used during the precomputation, but needed to apply the atmospheric effect
-            public float _AlphaMultiplier;
-
-            public Vector3 _HorizonTint;
-            public float _HorizonZenithShiftPower;
-
-            public Vector3 _ZenithTint;
-            public float _HorizonZenithShiftScale;
-        }
-
         // Store the hash of the parameters each time precomputation is done.
         // If the hash does not match, we must recompute our data.
         int m_LastPrecomputationParamHash;

com.unity.render-pipelines.high-definition/Runtime/Sky/PhysicallyBasedSky/ShaderVariablesPhysicallyBasedSky.cs

@@ -0,0 +1,56 @@
+namespace UnityEngine.Rendering.HighDefinition
+{
+    [GenerateHLSL]
+    public enum PbrSkyConfig
+    {
+        // Tiny
+        GroundIrradianceTableSize = 256, // <N, L>
+
+        // 32 MiB
+        InScatteredRadianceTableSizeX = 128, // <N, V>
+        InScatteredRadianceTableSizeY = 32,  // height
+        InScatteredRadianceTableSizeZ = 16,  // AzimuthAngle(L) w.r.t. the view vector
+        InScatteredRadianceTableSizeW = 64,  // <N, L>,
+    }
+
+    [GenerateHLSL(needAccessors = false, generateCBuffer = true, constantRegister = (int)ConstantRegister.PBRSky)]
+    unsafe struct ShaderVariablesPhysicallyBasedSky
+    {
+        // All the distance-related entries use SI units (meter, 1/meter, etc).
+        public float _PlanetaryRadius;
+        public float _RcpPlanetaryRadius;
+        public float _AtmosphericDepth;
+        public float _RcpAtmosphericDepth;
+
+        public float _AtmosphericRadius;
+        public float _AerosolAnisotropy;
+        public float _AerosolPhasePartConstant;
+        public float _Unused;
+
+        public float _AirDensityFalloff;
+        public float _AirScaleHeight;
+        public float _AerosolDensityFalloff;
+        public float _AerosolScaleHeight;
+
+        public Vector3 _AirSeaLevelExtinction;
+        public float _AerosolSeaLevelExtinction;
+
+        public Vector3 _AirSeaLevelScattering;
+        public float _IntensityMultiplier;
+
+        public Vector3 _AerosolSeaLevelScattering;
+        public float _ColorSaturation;
+
+        public Vector3 _GroundAlbedo;
+        public float _AlphaSaturation;
+
+        public Vector3 _PlanetCenterPosition; // Not used during the precomputation, but needed to apply the atmospheric effect
+        public float _AlphaMultiplier;
+
+        public Vector3 _HorizonTint;
+        public float _HorizonZenithShiftPower;
+
+        public Vector3 _ZenithTint;
+        public float _HorizonZenithShiftScale;
+    }
+}

com.unity.render-pipelines.high-definition/Runtime/Sky/PhysicallyBasedSky/PhysicallyBasedSkyRenderer.cs.hlsl → com.unity.render-pipelines.high-definition/Runtime/Sky/PhysicallyBasedSky/ShaderVariablesPhysicallyBasedSky.cs.hlsl

@@ -2,18 +2,18 @@
 // This file was automatically generated. Please don't edit by hand.
 //
 
-#ifndef PHYSICALLYBASEDSKYRENDERER_CS_HLSL
-#define PHYSICALLYBASEDSKYRENDERER_CS_HLSL
+#ifndef SHADERVARIABLESPHYSICALLYBASEDSKY_CS_HLSL
+#define SHADERVARIABLESPHYSICALLYBASEDSKY_CS_HLSL
 //
-// UnityEngine.Rendering.HighDefinition.PhysicallyBasedSkyRenderer+PbrSkyConfig:  static fields
+// UnityEngine.Rendering.HighDefinition.PbrSkyConfig:  static fields
 //
 #define PBRSKYCONFIG_GROUND_IRRADIANCE_TABLE_SIZE (256)
 #define PBRSKYCONFIG_IN_SCATTERED_RADIANCE_TABLE_SIZE_X (128)
 #define PBRSKYCONFIG_IN_SCATTERED_RADIANCE_TABLE_SIZE_Y (32)
 #define PBRSKYCONFIG_IN_SCATTERED_RADIANCE_TABLE_SIZE_Z (16)
 #define PBRSKYCONFIG_IN_SCATTERED_RADIANCE_TABLE_SIZE_W (64)
 
-// Generated from UnityEngine.Rendering.HighDefinition.PhysicallyBasedSkyRenderer+ShaderVariablesPhysicallyBasedSky
+// Generated from UnityEngine.Rendering.HighDefinition.ShaderVariablesPhysicallyBasedSky
 // PackingRules = Exact
 GLOBAL_CBUFFER_START(ShaderVariablesPhysicallyBasedSky, b2)
     float _PlanetaryRadius;