Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop

Assets/ScriptableRenderPipeline/BasicRenderPipeline/BasicRenderPipeline.cs

 
 public static class BasicRendering
 {
-    // Main entry point for our scriptable render loop
-
     static void ConfigureAndBindIntermediateRenderTarget(ScriptableRenderContext context, Camera cam, bool stereoEnabled, out RenderTargetIdentifier intermediateRTID, out bool isRTTexArray)
     {
         var intermediateRT = Shader.PropertyToID("_IntermediateTarget");
 
         if (stereoEnabled)
         {
-            RenderTextureDescriptor vrDesc = XRSettings.eyeTextureDesc;
-            vrDesc.depthBufferBits = 24;
+            RenderTextureDescriptor xrDesc = XRSettings.eyeTextureDesc;
+            xrDesc.depthBufferBits = 24;
-            if (vrDesc.dimension == TextureDimension.Tex2DArray)
+            if (xrDesc.dimension == TextureDimension.Tex2DArray)
-            bindIntermediateRTCmd.GetTemporaryRT(intermediateRT, vrDesc, FilterMode.Point);
+            bindIntermediateRTCmd.GetTemporaryRT(intermediateRT, xrDesc, FilterMode.Point);
         }
         else
         {
         CommandBufferPool.Release(blitIntermediateRTCmd);
 
     }
+    
+    // Main entry point for our scriptable render loop
 
     public static void Render(ScriptableRenderContext context, IEnumerable<Camera> cameras, bool useIntermediateBlitPath)
     {

Assets/ScriptableRenderPipeline/HDRenderPipeline/Editor/HDRenderPipelineMenuItems.cs

             foreach (Object obj in materials)
             {
                 Material mat = obj as Material;
-                if (mat.shader.name == "HDRenderPipeline/LayeredLit" || mat.shader.name == "HDRenderPipeline/LayeredLitTessellation")
+                if (mat.shader.name == "HDRenderPipeline/InfluenceLayeredLit" || mat.shader.name == "HDRenderPipeline/InfluenceLayeredLitTessellation")
-                    LayeredLitGUI.SynchronizeAllLayers(mat);
+                    InfluenceLayeredLitGUI.SynchronizeAllLayers(mat);
                     EditorUtility.SetDirty(mat);
                 }
             }
                         string.Format("{0} / {1} materials cleaned.", i, length),
                         i / (float)(length - 1));
 
-                    if (mat.shader.name == "HDRenderPipeline/LayeredLit" || mat.shader.name == "HDRenderPipeline/LayeredLitTessellation")
+                    if (mat.shader.name == "HDRenderPipeline/InfluenceLayeredLit" || mat.shader.name == "HDRenderPipeline/InfluenceLayeredLitTessellation")
-                        LayeredLitGUI.SetupMaterialKeywordsAndPass(mat);
+                        InfluenceLayeredLitGUI.SetupMaterialKeywordsAndPass(mat);
                         EditorUtility.SetDirty(mat);
                     }
                     else if (mat.shader.name == "HDRenderPipeline/Lit" || mat.shader.name == "HDRenderPipeline/LitTessellation")
             Object[] materials = Resources.FindObjectsOfTypeAll<Material>();
 
             Shader litShader = Shader.Find("HDRenderPipeline/Lit");
-            Shader layeredLitShader = Shader.Find("HDRenderPipeline/LayeredLit");
+            Shader layeredLitShader = Shader.Find("HDRenderPipeline/InfluenceLayeredLit");
 
             foreach (Object obj in materials)
             {
                     LitGUI.SetupMaterialKeywordsAndPass(mat);
                     EditorUtility.SetDirty(mat);
                 }
-                else if (mat.shader.name == "HDRenderPipeline/LayeredLitTessellation")
+                else if (mat.shader.name == "HDRenderPipeline/InfluenceLayeredLitTessellation")
-                    LayeredLitGUI.SetupMaterialKeywordsAndPass(mat);
+                    InfluenceLayeredLitGUI.SetupMaterialKeywordsAndPass(mat);
                     EditorUtility.SetDirty(mat);
                 }
             }

Assets/ScriptableRenderPipeline/HDRenderPipeline/Material/Lit/Editor/BaseLitUI.cs

             depthOffsetEnable = FindProperty(kDepthOffsetEnable, props);
 
             // MaterialID
-            materialID = FindProperty(kMaterialID, props, false); // LayeredLit is force to be standard for now, so materialID could not exist
+            materialID = FindProperty(kMaterialID, props, false); // InfluenceLayeredLit is force to be standard for now, so materialID could not exist
 
             // Per pixel displacement
             enablePerPixelDisplacement = FindProperty(kEnablePerPixelDisplacement, props);

Assets/ScriptableRenderPipeline/HDRenderPipeline/Material/Lit/LitTessellation.hlsl

 // w - inside tessellation factor
 float3 GetTessellationDisplacement(VaryingsMeshToDS input)
 {
-    // This call will work for both LayeredLit and Lit shader
+    // This call will work for both InfluenceLayeredLit and Lit shader
     LayerTexCoord layerTexCoord;
     ZERO_INITIALIZE(LayerTexCoord, layerTexCoord);
     GetLayerTexCoord(

Assets/ScriptableRenderPipeline/HDRenderPipeline/Material/InfluenceLayeredLit/InfluenceLayeredLitTessellation.shader

-Shader "HDRenderPipeline/LayeredLitTessellation"
+Shader "HDRenderPipeline/InfluenceLayeredLitTessellation"
 {
     Properties
     {
         // WARNING
         // All the following properties that concern the UV mapping are the same as in the Lit shader.
         // This means that they will get overridden when synchronizing the various layers.
-        // To avoid this, make sure that all properties here are in the exclusion list in LayeredLitUI.SynchronizeLayerProperties
+        // To avoid this, make sure that all properties here are in the exclusion list in InfluenceLayeredLitUI.SynchronizeLayerProperties
         _TexWorldScale0("Tiling", Float) = 1.0
         _TexWorldScale1("Tiling", Float) = 1.0
         _TexWorldScale2("Tiling", Float) = 1.0
         }
     }
 
-    CustomEditor "Experimental.Rendering.HDPipeline.LayeredLitGUI"
+    CustomEditor "Experimental.Rendering.HDPipeline.InfluenceLayeredLitGUI"
 }

Assets/ScriptableRenderPipeline/HDRenderPipeline/Material/InfluenceLayeredLit/InfluenceLayeredLit.shader

-Shader "HDRenderPipeline/LayeredLit"
+Shader "HDRenderPipeline/InfluenceLayeredLit"
 {
     Properties
     {
         // WARNING
         // All the following properties that concern the UV mapping are the same as in the Lit shader.
         // This means that they will get overridden when synchronizing the various layers.
-        // To avoid this, make sure that all properties here are in the exclusion list in LayeredLitUI.SynchronizeLayerProperties
+        // To avoid this, make sure that all properties here are in the exclusion list in InfluenceLayeredLitUI.SynchronizeLayerProperties
         _TexWorldScale0("Tiling", Float) = 1.0
         _TexWorldScale1("Tiling", Float) = 1.0
         _TexWorldScale2("Tiling", Float) = 1.0
         }
     }
 
-    CustomEditor "Experimental.Rendering.HDPipeline.LayeredLitGUI"
+    CustomEditor "Experimental.Rendering.HDPipeline.InfluenceLayeredLitGUI"
 }

Assets/ScriptableRenderPipeline/HDRenderPipeline/Material/InfluenceLayeredLit/Editor/InfluenceLayeredLitUI.cs

 
 namespace UnityEditor.Experimental.Rendering.HDPipeline
 {
-    internal class LayeredLitGUI : LitGUI
+    internal class InfluenceLayeredLitGUI : LitGUI
     {
         public enum LayerUVBaseMapping
         {

Assets/ScriptableRenderPipeline/HDRenderPipeline/Material/InfluenceLayeredLit.meta

+fileFormatVersion: 2
+guid: 5cdc30333a95a30468e571c7db2230c0
+folderAsset: yes
+timeCreated: 1501248892
+licenseType: Pro
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/ScriptableRenderPipeline/HDRenderPipeline/Material/LayeredLit.meta

-fileFormatVersion: 2
-guid: c526d3e6d7f3ce1408308bb431089d2d
-folderAsset: yes
-timeCreated: 1476653183
-licenseType: Pro
-DefaultImporter:
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: