Merge pull request #1134 from Unity-Technologies/lw/fix_shadergraph

Shadergraph fix for LW PBR template

ScriptableRenderPipeline/LightweightPipeline/LWRP/Editor/ShaderGraph/lightweightPBRExtraPasses.template

 	#pragma shader_feature _SPECGLOSSMAP
 
 	#include "LWRP/ShaderLibrary/InputSurfacePBR.hlsl"
-	#include "LWRP/ShaderLibrary/LightweightPassMeta.hlsl"
+	#include "LWRP/ShaderLibrary/LightweightPassMetaPBR.hlsl"
 	ENDHLSL
 }

ScriptableRenderPipeline/LightweightPipeline/LWRP/ShaderLibrary/InputSurfaceSimple.hlsl

 
 TEXTURE2D(_SpecGlossMap);       SAMPLER(sampler_SpecGlossMap);
 
-half4 SampleSpecularGloss(half2 uv, half alpha)
+half4 SampleSpecularGloss(half2 uv, half alpha, half4 specColor, TEXTURE2D_ARGS(specGlossMap, sampler_specGlossMap))
-    half4 specularGloss = half4(0, 0, 0, 1);
+    half4 specularGloss = half4(0.0h, 0.0h, 0.0h, 1.0h);
-    specularGloss = SAMPLE_TEXTURE2D(_SpecGlossMap, sampler_SpecGlossMap, uv);
+    specularGloss = SAMPLE_TEXTURE2D(TEXTURE2D_PARAM(specGlossMap, sampler_specGlossMap), uv);
-    specularGloss = _SpecColor;
+    specularGloss = specColor;
 #endif
 
 #ifdef _GLOSSINESS_FROM_BASE_ALPHA

ScriptableRenderPipeline/LightweightPipeline/LWRP/ShaderLibrary/LightweightPassLitSimple.hlsl

 
     half3 normalTS = SampleNormal(uv, TEXTURE2D_PARAM(_BumpMap, sampler_BumpMap));
     half3 emission = SampleEmission(uv, _EmissionColor.rgb, TEXTURE2D_PARAM(_EmissionMap, sampler_EmissionMap));
-    half4 specularGloss = SampleSpecularGloss(uv, diffuseAlpha.a);
+    half4 specularGloss = SampleSpecularGloss(uv, diffuseAlpha.a, _SpecColor, TEXTURE2D_PARAM(_SpecGlossMap, sampler_SpecGlossMap));
     half shininess = IN.posWSShininess.w;
 
     InputData inputData;

ScriptableRenderPipeline/LightweightPipeline/LWRP/Shaders/LightweightStandard.shader

             #pragma shader_feature _SPECGLOSSMAP
 
             #include "LWRP/ShaderLibrary/InputSurfacePBR.hlsl"
-            #include "LWRP/ShaderLibrary/LightweightPassMeta.hlsl"
-
-            half4 LightweightFragmentMeta(MetaVertexOuput i) : SV_Target
-            {
-                SurfaceData surfaceData;
-                InitializeStandardLitSurfaceData(i.uv, surfaceData);
-
-                BRDFData brdfData;
-                InitializeBRDFData(surfaceData.albedo, surfaceData.metallic, surfaceData.specular, surfaceData.smoothness, surfaceData.alpha, brdfData);
-
-                MetaInput o;
-                o.Albedo = brdfData.diffuse + brdfData.specular * brdfData.roughness * 0.5;
-                o.SpecularColor = surfaceData.specular;
-                o.Emission = surfaceData.emission;
-
-                return MetaFragment(o);
-            }
+            #include "LWRP/ShaderLibrary/LightweightPassMetaPBR.hlsl"
 
             ENDHLSL
         }

ScriptableRenderPipeline/LightweightPipeline/LWRP/Shaders/LightweightStandardSimpleLighting.shader

             #pragma shader_feature _SPECGLOSSMAP
 
             #include "LWRP/ShaderLibrary/InputSurfaceSimple.hlsl"
-            #include "LWRP/ShaderLibrary/LightweightPassMeta.hlsl"
-
-            half4 LightweightFragmentMetaSimple(MetaVertexOuput i) : SV_Target
-            {
-                float2 uv = i.uv;
-                MetaInput o;
-                o.Albedo = _Color.rgb * SampleAlbedoAlpha(uv, TEXTURE2D_PARAM(_MainTex, sampler_MainTex)).rgb;
-                o.SpecularColor = SampleSpecularGloss(uv, 1.0).xyz;
-                o.Emission = SampleEmission(uv, _EmissionColor.rgb, TEXTURE2D_PARAM(_EmissionMap, sampler_EmissionMap));
-
-                return MetaFragment(o);
-            }
+            #include "LWRP/ShaderLibrary/LightweightPassMetaSimple.hlsl"
 
             ENDHLSL
         }

ScriptableRenderPipeline/LightweightPipeline/LWRP/ShaderLibrary/LightweightPassMetaPBR.hlsl

+#ifndef LIGHTWEIGHT_PASS_META_PBR_INCLUDED
+#define LIGHTWEIGHT_PASS_META_PBR_INCLUDED
+
+#include "LightweightPassMetaCommon.hlsl"
+
+half4 LightweightFragmentMeta(MetaVertexOuput i) : SV_Target
+{
+    SurfaceData surfaceData;
+    InitializeStandardLitSurfaceData(i.uv, surfaceData);
+
+    BRDFData brdfData;
+    InitializeBRDFData(surfaceData.albedo, surfaceData.metallic, surfaceData.specular, surfaceData.smoothness, surfaceData.alpha, brdfData);
+
+    MetaInput o;
+    o.Albedo = brdfData.diffuse + brdfData.specular * brdfData.roughness * 0.5;
+    o.SpecularColor = surfaceData.specular;
+    o.Emission = surfaceData.emission;
+
+    return MetaFragment(o);
+}
+
+#endif // LIGHTWEIGHT_PASS_META_PBR_INCLUDED

ScriptableRenderPipeline/LightweightPipeline/LWRP/ShaderLibrary/LightweightPassMetaPBR.hlsl.meta

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

ScriptableRenderPipeline/LightweightPipeline/LWRP/ShaderLibrary/LightweightPassMetaSimple.hlsl

+#ifndef LIGHTWEIGHT_PASS_META_SIMPLE_INCLUDED
+#define LIGHTWEIGHT_PASS_META_SIMPLE_INCLUDED
+
+#include "LightweightPassMetaCommon.hlsl"
+
+half4 LightweightFragmentMetaSimple(MetaVertexOuput i) : SV_Target
+{
+    float2 uv = i.uv;
+    MetaInput o;
+    o.Albedo = _Color.rgb * SAMPLE_TEXTURE2D(_MainTex, sampler_MainTex, uv).rgb;
+    o.SpecularColor = SampleSpecularGloss(uv, 1.0h, _SpecColor, TEXTURE2D_PARAM(_SpecGlossMap, sampler_SpecGlossMap)).xyz;
+    o.Emission = SampleEmission(uv, _EmissionColor.rgb, TEXTURE2D_PARAM(_EmissionMap, sampler_EmissionMap));
+
+    return MetaFragment(o);
+}
+
+#endif // LIGHTWEIGHT_PASS_META_SIMPLE_INCLUDED

ScriptableRenderPipeline/LightweightPipeline/LWRP/ShaderLibrary/LightweightPassMetaSimple.hlsl.meta

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