Merge pull request #630 from Unity-Technologies/Branch_MoveGGXConvolution

Moved GGX Convolution related files to Material/GGXConvolution

ScriptableRenderPipeline/HDRenderPipeline/Debug/DebugDisplay.cs.hlsl

 #ifndef DEBUGDISPLAY_CS_HLSL
 #define DEBUGDISPLAY_CS_HLSL
 //
-// UnityEngine.Experimental.Rendering.HDPipeline.DebugLightingMode:  static fields
-//
-#define DEBUGLIGHTINGMODE_NONE (0)
-#define DEBUGLIGHTINGMODE_DIFFUSE_LIGHTING (1)
-#define DEBUGLIGHTINGMODE_SPECULAR_LIGHTING (2)
-#define DEBUGLIGHTINGMODE_VISUALIZE_CASCADE (3)
-#define DEBUGLIGHTINGMODE_INDIRECT_DIFFUSE_OCCLUSION_FROM_SSAO (4)
-#define DEBUGLIGHTINGMODE_INDIRECT_DIFFUSE_GTAO_FROM_SSAO (5)
-#define DEBUGLIGHTINGMODE_INDIRECT_SPECULAR_OCCLUSION_FROM_SSAO (6)
-#define DEBUGLIGHTINGMODE_INDIRECT_SPECULAR_GTAO_FROM_SSAO (7)
-
-//
-// UnityEngine.Experimental.Rendering.HDPipeline.Attributes.DebugViewVarying:  static fields
-//
-#define DEBUGVIEWVARYING_NONE (0)
-#define DEBUGVIEWVARYING_TEXCOORD0 (1)
-#define DEBUGVIEWVARYING_TEXCOORD1 (2)
-#define DEBUGVIEWVARYING_TEXCOORD2 (3)
-#define DEBUGVIEWVARYING_TEXCOORD3 (4)
-#define DEBUGVIEWVARYING_VERTEX_TANGENT_WS (5)
-#define DEBUGVIEWVARYING_VERTEX_BITANGENT_WS (6)
-#define DEBUGVIEWVARYING_VERTEX_NORMAL_WS (7)
-#define DEBUGVIEWVARYING_VERTEX_COLOR (8)
-#define DEBUGVIEWVARYING_VERTEX_COLOR_ALPHA (9)
-#define DEBUGVIEWVARYING_LAST (10)
-
-//
-// UnityEngine.Experimental.Rendering.HDPipeline.Attributes.DebugViewGbuffer:  static fields
-//
-#define DEBUGVIEWGBUFFER_NONE (0)
-#define DEBUGVIEWGBUFFER_DEPTH (10)
-#define DEBUGVIEWGBUFFER_BAKE_DIFFUSE_LIGHTING_WITH_ALBEDO_PLUS_EMISSIVE (11)
-#define DEBUGVIEWGBUFFER_BAKE_SHADOW_MASK0 (12)
-#define DEBUGVIEWGBUFFER_BAKE_SHADOW_MASK1 (13)
-#define DEBUGVIEWGBUFFER_BAKE_SHADOW_MASK2 (14)
-#define DEBUGVIEWGBUFFER_BAKE_SHADOW_MASK3 (15)
-#define DEBUGVIEWGBUFFER_LAST (16)
-
-//
-// UnityEngine.Experimental.Rendering.HDPipeline.Attributes.DebugViewProperties:  static fields
-//
-#define DEBUGVIEWPROPERTIES_NONE (0)
-#define DEBUGVIEWPROPERTIES_TESSELLATION (16)
-#define DEBUGVIEWPROPERTIES_PIXEL_DISPLACEMENT (17)
-#define DEBUGVIEWPROPERTIES_VERTEX_DISPLACEMENT (18)
-#define DEBUGVIEWPROPERTIES_TESSELLATION_DISPLACEMENT (19)
-#define DEBUGVIEWPROPERTIES_DEPTH_OFFSET (20)
-#define DEBUGVIEWPROPERTIES_LIGHTMAP (21)
-
-//
 // UnityEngine.Experimental.Rendering.HDPipeline.FullScreenDebugMode:  static fields
 //
 #define FULLSCREENDEBUGMODE_NONE (0)

ScriptableRenderPipeline/HDRenderPipeline/Debug/DebugDisplay.hlsl

 #define UNITY_DEBUG_DISPLAY_INCLUDED
 
 #include "DebugDisplay.cs.hlsl"
+#include "MaterialDebug.cs.hlsl"
+#include "LightingDebug.cs.hlsl"
 
 // Set of parameters available when switching to debug shader mode
 int _DebugLightingMode; // Match enum DebugLightingMode

ScriptableRenderPipeline/HDRenderPipeline/ShaderPass/FragInputs.hlsl

 // This structure gather all possible varying/interpolator for this shader.
 //-------------------------------------------------------------------------------------
 
-#include "../Debug/DebugDisplay.cs.hlsl"
+#include "../Debug/MaterialDebug.cs.hlsl"
 
 struct FragInputs
 {

ScriptableRenderPipeline/HDRenderPipeline/Sky/SkyManager.cs

         //SkyResolution4096 = 4096
     }
 
-    [GenerateHLSL(PackingRules.Exact)]
-    public enum LightSamplingParameters
-    {
-        TextureHeight = 256,
-        TextureWidth  = 512
-    }
-
     public enum EnvironementUpdateMode
     {
         OnChanged = 0,

ScriptableRenderPipeline/HDRenderPipeline/Lighting/DeferredDirectionalShadow.compute

 #pragma kernel DeferredDirectionalShadow
 
 #include "ShaderLibrary/Common.hlsl"
-#include "../../ShaderVariables.hlsl"
-#include "../../Lighting/Lighting.hlsl" 
+#include "../ShaderVariables.hlsl"
+#include "Lighting.hlsl" 
 
 RWTexture2D<float4> _DeferredShadowTextureUAV;
 float               _DirectionalShadowIndex;

ScriptableRenderPipeline/HDRenderPipeline/Material/GGXConvolution/GGXConvolve.shader

 
             #include "ShaderLibrary/Common.hlsl"
             #include "ShaderLibrary/ImageBasedLighting.hlsl"
-            #include "SkyManager.cs.hlsl"
+            #include "GGXConvolution.cs.hlsl"
 
             TEXTURECUBE(_MainTex);
             SAMPLERCUBE(sampler_MainTex);

ScriptableRenderPipeline/HDRenderPipeline/Debug/LightingDebug.cs.hlsl

+//
+// This file was automatically generated. Please don't edit by hand.
+//
+
+#ifndef LIGHTINGDEBUG_CS_HLSL
+#define LIGHTINGDEBUG_CS_HLSL
+//
+// UnityEngine.Experimental.Rendering.HDPipeline.DebugLightingMode:  static fields
+//
+#define DEBUGLIGHTINGMODE_NONE (0)
+#define DEBUGLIGHTINGMODE_DIFFUSE_LIGHTING (1)
+#define DEBUGLIGHTINGMODE_SPECULAR_LIGHTING (2)
+#define DEBUGLIGHTINGMODE_VISUALIZE_CASCADE (3)
+#define DEBUGLIGHTINGMODE_INDIRECT_DIFFUSE_OCCLUSION_FROM_SSAO (4)
+#define DEBUGLIGHTINGMODE_INDIRECT_DIFFUSE_GTAO_FROM_SSAO (5)
+#define DEBUGLIGHTINGMODE_INDIRECT_SPECULAR_OCCLUSION_FROM_SSAO (6)
+#define DEBUGLIGHTINGMODE_INDIRECT_SPECULAR_GTAO_FROM_SSAO (7)
+
+
+#endif

ScriptableRenderPipeline/HDRenderPipeline/Debug/LightingDebug.cs.hlsl.meta

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

ScriptableRenderPipeline/HDRenderPipeline/Debug/MaterialDebug.cs.hlsl

+//
+// This file was automatically generated. Please don't edit by hand.
+//
+
+#ifndef MATERIALDEBUG_CS_HLSL
+#define MATERIALDEBUG_CS_HLSL
+//
+// UnityEngine.Experimental.Rendering.HDPipeline.Attributes.DebugViewVarying:  static fields
+//
+#define DEBUGVIEWVARYING_NONE (0)
+#define DEBUGVIEWVARYING_TEXCOORD0 (1)
+#define DEBUGVIEWVARYING_TEXCOORD1 (2)
+#define DEBUGVIEWVARYING_TEXCOORD2 (3)
+#define DEBUGVIEWVARYING_TEXCOORD3 (4)
+#define DEBUGVIEWVARYING_VERTEX_TANGENT_WS (5)
+#define DEBUGVIEWVARYING_VERTEX_BITANGENT_WS (6)
+#define DEBUGVIEWVARYING_VERTEX_NORMAL_WS (7)
+#define DEBUGVIEWVARYING_VERTEX_COLOR (8)
+#define DEBUGVIEWVARYING_VERTEX_COLOR_ALPHA (9)
+#define DEBUGVIEWVARYING_LAST (10)
+
+//
+// UnityEngine.Experimental.Rendering.HDPipeline.Attributes.DebugViewGbuffer:  static fields
+//
+#define DEBUGVIEWGBUFFER_NONE (0)
+#define DEBUGVIEWGBUFFER_DEPTH (10)
+#define DEBUGVIEWGBUFFER_BAKE_DIFFUSE_LIGHTING_WITH_ALBEDO_PLUS_EMISSIVE (11)
+#define DEBUGVIEWGBUFFER_BAKE_SHADOW_MASK0 (12)
+#define DEBUGVIEWGBUFFER_BAKE_SHADOW_MASK1 (13)
+#define DEBUGVIEWGBUFFER_BAKE_SHADOW_MASK2 (14)
+#define DEBUGVIEWGBUFFER_BAKE_SHADOW_MASK3 (15)
+#define DEBUGVIEWGBUFFER_LAST (16)
+
+//
+// UnityEngine.Experimental.Rendering.HDPipeline.Attributes.DebugViewProperties:  static fields
+//
+#define DEBUGVIEWPROPERTIES_NONE (0)
+#define DEBUGVIEWPROPERTIES_TESSELLATION (16)
+#define DEBUGVIEWPROPERTIES_PIXEL_DISPLACEMENT (17)
+#define DEBUGVIEWPROPERTIES_VERTEX_DISPLACEMENT (18)
+#define DEBUGVIEWPROPERTIES_TESSELLATION_DISPLACEMENT (19)
+#define DEBUGVIEWPROPERTIES_DEPTH_OFFSET (20)
+#define DEBUGVIEWPROPERTIES_LIGHTMAP (21)
+
+
+#endif

ScriptableRenderPipeline/HDRenderPipeline/Debug/MaterialDebug.cs.hlsl.meta

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

ScriptableRenderPipeline/HDRenderPipeline/Material/GGXConvolution.meta

+fileFormatVersion: 2
+guid: 58f7be3dd9cacc14ab4933c864014bae
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

ScriptableRenderPipeline/HDRenderPipeline/Material/GGXConvolution/GGXConvolution.cs

+using UnityEngine.Rendering;
+using System;
+
+namespace UnityEngine.Experimental.Rendering.HDPipeline
+{
+    // For multiple importance sampling
+    // TODO: not working currently, will be updated later
+    [GenerateHLSL(PackingRules.Exact)]
+    public enum LightSamplingParameters
+    {
+        TextureHeight = 256,
+        TextureWidth = 512
+    }
+}

ScriptableRenderPipeline/HDRenderPipeline/Material/GGXConvolution/GGXConvolution.cs.hlsl

+//
+// This file was automatically generated. Please don't edit by hand.
+//
+
+#ifndef GGXCONVOLUTION_CS_HLSL
+#define GGXCONVOLUTION_CS_HLSL
+//
+// UnityEngine.Experimental.Rendering.HDPipeline.LightSamplingParameters:  static fields
+//
+#define LIGHTSAMPLINGPARAMETERS_TEXTURE_HEIGHT (256)
+#define LIGHTSAMPLINGPARAMETERS_TEXTURE_WIDTH (512)
+
+
+#endif

ScriptableRenderPipeline/HDRenderPipeline/Material/GGXConvolution/GGXConvolution.cs.hlsl.meta

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

ScriptableRenderPipeline/HDRenderPipeline/Material/GGXConvolution/GGXConvolution.cs.meta

+fileFormatVersion: 2
+guid: f96a85514b0168541b31f8f052d55f1d
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

ScriptableRenderPipeline/HDRenderPipeline/Sky/SkyManager.cs.hlsl.meta

-fileFormatVersion: 2
-guid: 839dd86bae5fa4d46bf4facd02608862
-timeCreated: 1483546512
-licenseType: Pro
-ShaderImporter:
-  defaultTextures: []
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

ScriptableRenderPipeline/HDRenderPipeline/Sky/SkyManager.cs.hlsl

-//
-// This file was automatically generated. Please don't edit by hand.
-//
-
-#ifndef SKYMANAGER_CS_HLSL
-#define SKYMANAGER_CS_HLSL
-//
-// UnityEngine.Experimental.Rendering.HDPipeline.LightSamplingParameters:  static fields
-//
-#define LIGHTSAMPLINGPARAMETERS_TEXTURE_HEIGHT (256)
-#define LIGHTSAMPLINGPARAMETERS_TEXTURE_WIDTH (512)
-
-
-#endif