Merge pull request #554 from EvgeniiG/Unity-2017.3

Move the volumetric lighting code to another branch

ScriptableRenderPipeline/HDRenderPipeline/HDRenderPipeline.cs

                 m_LightLoop.AllocResolutionDependentBuffers(camera.pixelWidth, camera.pixelHeight);
             }
 
-            if (resolutionChanged && m_VolumetricLightingEnabled)
-                CreateVolumetricLightingBuffers(camera.pixelWidth, camera.pixelHeight);
-
             // update recorded window resolution
             m_CurrentWidth = camera.pixelWidth;
             m_CurrentHeight = camera.pixelHeight;
                 cmd.SetGlobalVectorArray(HDShaderIDs._ShapeParams,                sssParameters.shapeParams);
                 cmd.SetGlobalVectorArray(HDShaderIDs._HalfRcpVariancesAndWeights, sssParameters.halfRcpVariancesAndWeights);
                 cmd.SetGlobalVectorArray(HDShaderIDs._TransmissionTints,          sssParameters.transmissionTints);
-
-                SetGlobalVolumeProperties(m_VolumetricLightingEnabled, cmd);
             }
         }
 
                 RenderForward(m_CullResults, camera, renderContext, cmd, ForwardPass.Transparent);
                 RenderForwardError(m_CullResults, camera, renderContext, cmd, ForwardPass.Transparent);
 
-                // Render volumetric lighting
-                VolumetricLightingPass(hdCamera, cmd);
-
                 PushFullScreenDebugTexture(cmd, m_CameraColorBuffer, camera, renderContext, FullScreenDebugMode.NanTracker);
 
                 // Planar and real time cubemap doesn't need post process and render in FP16
             var depthTexture = GetDepthTexture();
 
             var options = new LightLoop.LightingPassOptions();
-            options.volumetricLightingEnabled = m_VolumetricLightingEnabled;
 
             if (m_CurrentDebugDisplaySettings.renderingDebugSettings.enableSSSAndTransmission)
             {
                         CoreUtils.SetRenderTarget(cmd, m_HTileRT, ClearFlag.Color, Color.black);
                     }
                 }
-
-                if (m_VolumetricLightingEnabled)
-                    ClearVolumetricLightingBuffers(cmd, camera.isFirstFrame);
 
                 // TEMP: As we are in development and have not all the setup pass we still clear the color in emissive buffer and gbuffer, but this will be removed later.
 

ScriptableRenderPipeline/HDRenderPipeline/Lighting/TilePass/TilePass.cs

             public struct LightingPassOptions
             {
                 public bool outputSplitLighting;
-                public bool volumetricLightingEnabled;
             }
 
             public void RenderDeferredDirectionalShadow(HDCamera hdCamera, RenderTargetIdentifier deferredShadowRT, RenderTargetIdentifier depthTexture, CommandBuffer cmd)
 
                                 cmd.SetComputeTextureParam(deferredComputeShader, kernel, HDShaderIDs.specularLightingUAV, colorBuffers[0]);
                                 cmd.SetComputeTextureParam(deferredComputeShader, kernel, HDShaderIDs.diffuseLightingUAV,  colorBuffers[1]);
-
-                                HDRenderPipeline.SetGlobalVolumeProperties(options.volumetricLightingEnabled, cmd, deferredComputeShader);
 
                                 // always do deferred lighting in blocks of 16x16 (not same as tiled light size)
 

ScriptableRenderPipeline/HDRenderPipeline/Material/Lit/Lit.hlsl

 #include "Lit.cs.hlsl"
 #include "SubsurfaceScatteringSettings.cs.hlsl"
 
-// Enables attenuation of light source contributions by participating media (fog).
-#define VOLUMETRIC_SHADOWING_ENABLED
-
-#ifdef VOLUMETRIC_SHADOWING_ENABLED
-    // Apparently, not all shaders include "ShaderVariables.hlsl".
-    #include "../../ShaderVariables.hlsl"
-    #include "../../../Core/ShaderLibrary/VolumeRendering.hlsl"
-#endif
-
 // Define refraction keyword helpers
 #define HAS_REFRACTION (defined(_REFRACTION_PLANE) || defined(_REFRACTION_SPHERE))
 #if HAS_REFRACTION
     float3 transmissionPositionWS;          // start of the refracted ray after exiting the shape
     float3 transmissionTransmittance;       // transmittance due to absorption
     float transmissionSSMipLevel;           // mip level of the screen space gaussian pyramid for rough refraction
-
-#ifdef VOLUMETRIC_SHADOWING_ENABLED
-    float    globalFogExtinction;
-#endif
 };
 
 // This is a refract - TODO: do we call original refract or this one, original maybe slightly more expensive, to check
     {
         preLightData.ltcMagnitudeFresnel = bsdfData.fresnel0 * ltcGGXFresnelMagnitudeDiff + (float3)ltcGGXFresnelMagnitude;
     }
-
-#ifdef VOLUMETRIC_SHADOWING_ENABLED
-    preLightData.globalFogExtinction = _GlobalFog_Extinction;
-#endif
 
 #ifdef REFRACTION_MODEL
     RefractionModelResult refraction = REFRACTION_MODEL(V, posInput, bsdfData);
         shadow = lerp(1.0, shadow, lightData.shadowDimmer);
         illuminance *= shadow;
     }
-
-#ifdef VOLUMETRIC_SHADOWING_ENABLED
-    float volumetricShadow = Transmittance(OpticalDepthHomogeneous(preLightData.globalFogExtinction, dist));
-
-    // Premultiply.
-    lightData.diffuseScale  *= volumetricShadow;
-    lightData.specularScale *= volumetricShadow;
-#endif
 
     // Projector lights always have a cookies, so we can perform clipping inside the if().
     [branch] if (lightData.cookieIndex >= 0)

ScriptableRenderPipeline/HDRenderPipeline/ShaderVariables.hlsl

 float4   _InvProjParam;
 float4   _ScreenSize;       // (w, h, 1/w, 1/h)
 float4   _FrustumPlanes[6]; // (N, -dot(N, P))
-
-// Volumetric lighting. Should be a struct in 'UnityPerFrame'.
-// Unfortunately, we cannot modify the layout of 'UnityPerFrame',
-// and structures inside constant buffers are not supported by Unity.
-float3 _GlobalFog_Scattering;
-float  _GlobalFog_Extinction;
-float  _GlobalFog_Asymmetry;
-float  _GlobalFog_Align16_0;
-float  _GlobalFog_Align16_1;
-float  _GlobalFog_Align16_2;
 CBUFFER_END
 
 #ifdef USE_LEGACY_UNITY_MATRIX_VARIABLES

ScriptableRenderPipeline/HDRenderPipeline/Lighting/Volumetrics.meta

-fileFormatVersion: 2
-guid: 1fe4fc72895e4bb4f90ff44b47e76051
-folderAsset: yes
-timeCreated: 1503411233
-licenseType: Pro
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: