Updated shader and materials to use same metallic/spec gloss map and keywords as standard. This will allow substance workflow to work in lightweight.

7 年前 · f4fc9498
--- a/ScriptableRenderPipeline/LightweightPipeline/Editor/ShaderGUI/LightweightStandardShaderGUI.cs
+++ b/ScriptableRenderPipeline/LightweightPipeline/Editor/ShaderGUI/LightweightStandardShaderGUI.cs

        private MaterialProperty metallic = null;
        private MaterialProperty specColor = null;
-        private MaterialProperty metallicSpecMap = null;
+        private MaterialProperty metallicGlossMap = null;
+        private MaterialProperty specGlossMap = null;
        private MaterialProperty highlights = null;
        private MaterialProperty reflections = null;


            metallic = FindProperty("_Metallic", props);
            specColor = FindProperty("_SpecColor", props);
-            metallicSpecMap = FindProperty("_MetallicSpecGlossMap", props);
+            metallicGlossMap = FindProperty("_MetallicGlossMap", props);
+            specGlossMap = FindProperty("_SpecGlossMap", props);
            highlights = FindProperty("_SpecularHighlights", props);
            reflections = FindProperty("_GlossyReflections", props);


        void DoMetallicSpecularArea()
        {
-            GUIContent metallicSpecMapName;
-            MaterialProperty metallicSpecColorProp;
+            bool hasGlossMap = false;
-                metallicSpecMapName = Styles.metallicMapText;
+                hasGlossMap = metallicGlossMap.textureValue != null;
-                metallicSpecColorProp = metallic;
+                m_MaterialEditor.TexturePropertySingleLine(Styles.metallicMapText, metallicGlossMap,
+                    hasGlossMap ? null : metallic);
-                metallicSpecMapName = Styles.specularMapText;
+                hasGlossMap = specGlossMap.textureValue != null;
-                metallicSpecColorProp = specColor;
+                m_MaterialEditor.TexturePropertySingleLine(Styles.specularMapText, specGlossMap,
+                    hasGlossMap ? null : specColor);
-
-            bool hasGlossMap = metallicSpecMap.textureValue != null;
-            m_MaterialEditor.TexturePropertySingleLine(metallicSpecMapName, metallicSpecMap, hasGlossMap ? null : metallicSpecColorProp);

            bool showSmoothnessScale = hasGlossMap;
            if (smoothnessMapChannel != null)
            // Note: keywords must be based on Material value not on MaterialProperty due to multi-edit & material animation
            // (MaterialProperty value might come from renderer material property block)
            bool isSpecularWorkFlow = (WorkflowMode)material.GetFloat("_WorkflowMode") == WorkflowMode.Specular;
+            bool hasGlossMap = false;
+            if (isSpecularWorkFlow)
+                hasGlossMap = material.GetTexture("_SpecGlossMap");
+            else
+                hasGlossMap = material.GetTexture("_MetallicGlossMap");
+
+            LightweightShaderHelper.SetKeyword(material, "_METALLICSPECGLOSSMAP", hasGlossMap);
+            LightweightShaderHelper.SetKeyword(material, "_SPECGLOSSMAP", hasGlossMap && isSpecularWorkFlow);
+            LightweightShaderHelper.SetKeyword(material, "_METALLICGLOSSMAP", hasGlossMap && !isSpecularWorkFlow);
+
-            LightweightShaderHelper.SetKeyword(material, "_SPECULARHIGHLIGHTS_ON", material.GetFloat("_SpecularHighlights") > 0.0f);
-            LightweightShaderHelper.SetKeyword(material, "_GLOSSYREFLECTIONS_ON", material.GetFloat("_GlossyReflections") > 0.0f);
-            LightweightShaderHelper.SetKeyword(material, "_METALLICSPECGLOSSMAP", material.GetTexture("_MetallicSpecGlossMap") != null);
+
+            LightweightShaderHelper.SetKeyword(material, "_SPECULARHIGHLIGHTS_OFF", material.GetFloat("_SpecularHighlights") == 0.0f);
+            LightweightShaderHelper.SetKeyword(material, "_GLOSSYREFLECTIONS_OFF", material.GetFloat("_GlossyReflections") == 0.0f);
+
            LightweightShaderHelper.SetKeyword(material, "_PARALLAXMAP", material.GetTexture("_ParallaxMap"));
            LightweightShaderHelper.SetKeyword(material, "_DETAIL_MULX2", material.GetTexture("_DetailAlbedoMap") || material.GetTexture("_DetailNormalMap"));

--- a/ScriptableRenderPipeline/LightweightPipeline/Shaders/LightweightBRDF.cginc
+++ b/ScriptableRenderPipeline/LightweightPipeline/Shaders/LightweightBRDF.cginc
 // * Fresnel approximated with 1/LdotH
 half3 LightweightBDRF(half3 diffColor, half3 specColor, half oneMinusReflectivity, half perceptualRoughness, half3 normal, half3 lightDirection, half3 viewDir)
 {
-#ifdef _SPECULARHIGHLIGHTS_ON
+#ifndef _SPECULARHIGHLIGHTS_OFF
    half3 halfDir = Unity_SafeNormalize(lightDirection + viewDir);

    half NoH = saturate(dot(normal, halfDir));
--- a/ScriptableRenderPipeline/LightweightPipeline/Shaders/LightweightInput.cginc
+++ b/ScriptableRenderPipeline/LightweightPipeline/Shaders/LightweightInput.cginc
 #define _MULTIPLE_LIGHTS
 #endif

+#ifdef _SPECULAR_SETUP
+#define SAMPLE_METALLICSPECULAR(uv) tex2D(_SpecGlossMap, uv)
+#else
+#define SAMPLE_METALLICSPECULAR(uv) tex2D(_MetallicGlossMap, uv)
+#endif
+
 #if defined(UNITY_COLORSPACE_GAMMA) && defined(_LIGHTWEIGHT_FORCE_LINEAR)
 // Ideally we want an approximation of gamma curve 2.0 to save ALU on GPU but as off now it won't match the GammaToLinear conversion of props in engine
 #define LIGHTWEIGHT_GAMMA_TO_LINEAR(gammaColor) gammaColor * gammaColor
    half4 specGloss;

 #ifdef _METALLICSPECGLOSSMAP
+    specGloss = SAMPLE_METALLICSPECULAR(uv);
-    specGloss.rgb = tex2D(_MetallicSpecGlossMap, uv).rgb;
-    specGloss.a = albedoAlpha;
+    specGloss.a = albedoAlpha * _GlossMapScale;
-    specGloss = tex2D(_MetallicSpecGlossMap, uv).rgba;
-#endif
+#endif
-
 #if _METALLIC_SETUP
    specGloss.r = _Metallic;
 #else
--- a/ScriptableRenderPipeline/LightweightPipeline/Shaders/LightweightLighting.cginc
+++ b/ScriptableRenderPipeline/LightweightPipeline/Shaders/LightweightLighting.cginc
 #endif
    o.diffuse *= occlusion;

-#ifdef _GLOSSYREFLECTIONS_ON
+#ifndef _GLOSSYREFLECTIONS_OFF
    // perceptualRoughness
    Unity_GlossyEnvironmentData g;
    g.roughness = roughness;
--- a/ScriptableRenderPipeline/LightweightPipeline/Shaders/LightweightStandardShaderPBS.shader
+++ b/ScriptableRenderPipeline/LightweightPipeline/Shaders/LightweightStandardShaderPBS.shader
        _SmoothnessTextureChannel("Smoothness texture channel", Float) = 0

        [Gamma] _Metallic("Metallic", Range(0.0, 1.0)) = 0.0
+        _MetallicGlossMap("Metallic", 2D) = "white" {}
+
-        _MetallicSpecGlossMap("MetallicSpecGlossMap", 2D) = "white" {} // SpecGloss map when _SPECULAR_SETUP, MetallicGloss otherwise
+        _SpecGlossMap("Specular", 2D) = "white" {}

        [Toggle] _SpecularHighlights("Specular Highlights", Float) = 1.0
        [Toggle] _GlossyReflections("Glossy Reflections", Float) = 1.0
            #pragma shader_feature _NORMALMAP
            #pragma shader_feature _ _ALPHATEST_ON _ALPHABLEND_ON _ALPHAPREMULTIPLY_ON
            #pragma shader_feature _EMISSION
-            #pragma shader_feature _METALLICSPECGLOSSMAP
+            #pragma shader_feature _ _METALLICSPECGLOSSMAP
-            #pragma shader_feature _ _SPECULARHIGHLIGHTS_ON
-            #pragma shader_feature _ _GLOSSYREFLECTIONS_ON
+            #pragma shader_feature _ _SPECULARHIGHLIGHTS_OFF
+            #pragma shader_feature _ _GLOSSYREFLECTIONS_OFF
            #pragma shader_feature _PARALLAXMAP

            #pragma multi_compile _ _SINGLE_DIRECTIONAL_LIGHT _SINGLE_SPOT_LIGHT _SINGLE_POINT_LIGHT
--- a/Tests/GraphicsTests/RenderPipeline/LightweightPipeline/Scenes/024_Shader_PBRvalidation_Specular/Adam/Materials/Crowd_LOD0_Mat_Limbs_spec.mat
+++ b/Tests/GraphicsTests/RenderPipeline/LightweightPipeline/Scenes/024_Shader_PBRvalidation_Specular/Adam/Materials/Crowd_LOD0_Mat_Limbs_spec.mat
  m_PrefabInternal: {fileID: 0}
  m_Name: Crowd_LOD0_Mat_Limbs_spec
  m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3}
-  m_ShaderKeywords: _GLOSSYREFLECTIONS_ON _METALLICSPECGLOSSMAP _NORMALMAP _SPECULARHIGHLIGHTS_ON
-    _SPECULAR_SETUP
+  m_ShaderKeywords: _METALLICSPECGLOSSMAP _NORMALMAP _SPECGLOSSMAP _SPECULAR_SETUP
  m_LightmapFlags: 4
  m_EnableInstancingVariants: 0
  m_DoubleSidedGI: 0
--- a/Tests/GraphicsTests/RenderPipeline/LightweightPipeline/Scenes/024_Shader_PBRvalidation_Specular/Adam/Materials/Crowd_LOD0_Mat_Torso_spec.mat
+++ b/Tests/GraphicsTests/RenderPipeline/LightweightPipeline/Scenes/024_Shader_PBRvalidation_Specular/Adam/Materials/Crowd_LOD0_Mat_Torso_spec.mat
  m_PrefabInternal: {fileID: 0}
  m_Name: Crowd_LOD0_Mat_Torso_spec
  m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3}
-  m_ShaderKeywords: _EMISSION _GLOSSYREFLECTIONS_ON _METALLICSPECGLOSSMAP _NORMALMAP
-    _SPECULARHIGHLIGHTS_ON _SPECULAR_SETUP
+  m_ShaderKeywords: _EMISSION _METALLICSPECGLOSSMAP _NORMALMAP _SPECGLOSSMAP _SPECULAR_SETUP
  m_LightmapFlags: 2
  m_EnableInstancingVariants: 0
  m_DoubleSidedGI: 0
--- a/Tests/GraphicsTests/RenderPipeline/LightweightPipeline/Scenes/024_Shader_PBRvalidation_Specular/PBRtest_Spec.mat
+++ b/Tests/GraphicsTests/RenderPipeline/LightweightPipeline/Scenes/024_Shader_PBRvalidation_Specular/PBRtest_Spec.mat
  m_PrefabInternal: {fileID: 0}
  m_Name: PBRtest_Spec
  m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3}
-  m_ShaderKeywords: _GLOSSYREFLECTIONS_ON _METALLICSPECGLOSSMAP _SPECULARHIGHLIGHTS_ON
-    _SPECULAR_SETUP
+  m_ShaderKeywords: _METALLICSPECGLOSSMAP _SPECGLOSSMAP _SPECULAR_SETUP
  m_LightmapFlags: 4
  m_EnableInstancingVariants: 0
  m_DoubleSidedGI: 0
--- a/Tests/GraphicsTests/RenderPipeline/LightweightPipeline/Scenes/025_Shader_PBRvalidation_Metallic/Adam/Materials/Crowd_LOD0_Mat_Limbs_metallic.mat
+++ b/Tests/GraphicsTests/RenderPipeline/LightweightPipeline/Scenes/025_Shader_PBRvalidation_Metallic/Adam/Materials/Crowd_LOD0_Mat_Limbs_metallic.mat
  m_PrefabInternal: {fileID: 0}
  m_Name: Crowd_LOD0_Mat_Limbs_metallic
  m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3}
-  m_ShaderKeywords: _GLOSSYREFLECTIONS_ON _METALLICSPECGLOSSMAP _METALLIC_SETUP _NORMALMAP
-    _SPECULARHIGHLIGHTS_ON
+  m_ShaderKeywords: _METALLICGLOSSMAP _METALLICSPECGLOSSMAP _METALLIC_SETUP _NORMALMAP
  m_LightmapFlags: 4
  m_EnableInstancingVariants: 0
  m_DoubleSidedGI: 0
--- a/Tests/GraphicsTests/RenderPipeline/LightweightPipeline/Scenes/025_Shader_PBRvalidation_Metallic/Adam/Materials/Crowd_LOD0_Mat_Torso_metallic.mat
+++ b/Tests/GraphicsTests/RenderPipeline/LightweightPipeline/Scenes/025_Shader_PBRvalidation_Metallic/Adam/Materials/Crowd_LOD0_Mat_Torso_metallic.mat
  m_PrefabInternal: {fileID: 0}
  m_Name: Crowd_LOD0_Mat_Torso_metallic
  m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3}
-  m_ShaderKeywords: _EMISSION _GLOSSYREFLECTIONS_ON _METALLICSPECGLOSSMAP _METALLIC_SETUP
-    _NORMALMAP _SPECULARHIGHLIGHTS_ON
-  m_LightmapFlags: 1
+  m_ShaderKeywords: _EMISSION _METALLICGLOSSMAP _METALLICSPECGLOSSMAP _METALLIC_SETUP
+    _NORMALMAP
+  m_LightmapFlags: 2
  m_EnableInstancingVariants: 0
  m_DoubleSidedGI: 0
  m_CustomRenderQueue: -1
--- a/Tests/GraphicsTests/RenderPipeline/LightweightPipeline/Scenes/025_Shader_PBRvalidation_Metallic/PBRtest_met.mat
+++ b/Tests/GraphicsTests/RenderPipeline/LightweightPipeline/Scenes/025_Shader_PBRvalidation_Metallic/PBRtest_met.mat
  m_PrefabInternal: {fileID: 0}
  m_Name: PBRtest_met
  m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3}
-  m_ShaderKeywords: _GLOSSYREFLECTIONS_ON _METALLICSPECGLOSSMAP _METALLIC_SETUP _SPECULARHIGHLIGHTS_ON
+  m_ShaderKeywords: _METALLICGLOSSMAP _METALLICSPECGLOSSMAP _METALLIC_SETUP
  m_LightmapFlags: 4
  m_EnableInstancingVariants: 0
  m_DoubleSidedGI: 0
--- a/Tests/GraphicsTests/RenderPipeline/LightweightPipeline/Scenes/026_Shader_PBRscene.unity
+++ b/Tests/GraphicsTests/RenderPipeline/LightweightPipeline/Scenes/026_Shader_PBRscene.unity
    m_AlbedoBoost: 1
    m_TemporalCoherenceThreshold: 1
    m_EnvironmentLightingMode: 0
-    m_EnableBakedLightmaps: 0
+    m_EnableBakedLightmaps: 1
    m_EnableRealtimeLightmaps: 0
  m_LightmapEditorSettings:
    serializedVersion: 9
  renderPipeline: {fileID: 11400000, guid: e6987eea1dd29074597d54ed91a54a26, type: 2}
  cameraToUse: {fileID: 1751559077}
  hdr: 0
+  msaaSamples: 1
  width: 1280
  height: 720
 --- !u!20 &1751559077
  m_OcclusionCulling: 1
  m_StereoConvergence: 10
  m_StereoSeparation: 0.022
-  m_StereoMirrorMode: 0
 --- !u!4 &1751559078
 Transform:
  m_ObjectHideFlags: 0
  m_Component:
  - component: {fileID: 1971611382}
  - component: {fileID: 1971611381}
+  - component: {fileID: 1971611384}
+  - component: {fileID: 1971611383}
  m_Layer: 0
  m_Name: Directional Light
  m_TagString: Untagged
  m_Father: {fileID: 0}
  m_RootOrder: 1
  m_LocalEulerAnglesHint: {x: -214.549, y: -238.25, z: -0.02999878}
+--- !u!114 &1971611383
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 1971611380}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: c6c2871f720b2af4e9210febdac74517, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  shadowResolution: 512
+  shadowDimmer: 1
+  shadowFadeDistance: 10000
+  shadowCascadeCount: 4
+  shadowCascadeRatios:
+  - 0.05
+  - 0.2
+  - 0.3
+  shadowCascadeBorders:
+  - 0.2
+  - 0.2
+  - 0.2
+  - 0.2
+  shadowAlgorithm: 0
+  shadowVariant: 0
+  shadowPrecision: 0
+  shadowData:
+    format: 0
+    data: 
+  shadowDatas: []
+--- !u!114 &1971611384
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 1971611380}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_InnerSpotPercent: 0
+  lightDimmer: 1
+  fadeDistance: 10000
+  affectDiffuse: 1
+  affectSpecular: 1
+  lightTypeExtent: 0
+  spotLightShape: 0
+  shapeLength: 0.5
+  shapeWidth: 0.5
+  shapeRadius: 0
+  maxSmoothness: 1
+  applyRangeAttenuation: 1
+  useOldInspector: 0
+  showAdditionalSettings: 1
 --- !u!1 &2024053722
 GameObject:
  m_ObjectHideFlags: 0
--- a/Tests/GraphicsTests/RenderPipeline/LightweightPipeline/Scenes/026_Shader_PBRscene/BenchDrill/materials/kabel.mat
+++ b/Tests/GraphicsTests/RenderPipeline/LightweightPipeline/Scenes/026_Shader_PBRscene/BenchDrill/materials/kabel.mat
  m_PrefabInternal: {fileID: 0}
  m_Name: kabel
  m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3}
-  m_ShaderKeywords: _GLOSSYREFLECTIONS_ON _METALLICSPECGLOSSMAP _METALLIC_SETUP _NORMALMAP
-    _SPECULARHIGHLIGHTS_ON
+  m_ShaderKeywords: _METALLICGLOSSMAP _METALLICSPECGLOSSMAP _METALLIC_SETUP _NORMALMAP
  m_LightmapFlags: 4
  m_EnableInstancingVariants: 0
  m_DoubleSidedGI: 0
--- a/Tests/GraphicsTests/RenderPipeline/LightweightPipeline/Scenes/026_Shader_PBRscene/BenchDrill/materials/korpus.mat
+++ b/Tests/GraphicsTests/RenderPipeline/LightweightPipeline/Scenes/026_Shader_PBRscene/BenchDrill/materials/korpus.mat
  m_PrefabInternal: {fileID: 0}
  m_Name: korpus
  m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3}
-  m_ShaderKeywords: _EMISSION _GLOSSYREFLECTIONS_ON _METALLICSPECGLOSSMAP _METALLIC_SETUP
-    _NORMALMAP _SPECULARHIGHLIGHTS_ON
+  m_ShaderKeywords: _EMISSION _METALLICGLOSSMAP _METALLICSPECGLOSSMAP _METALLIC_SETUP
+    _NORMALMAP
  m_LightmapFlags: 2
  m_EnableInstancingVariants: 0
  m_DoubleSidedGI: 0
--- a/Tests/GraphicsTests/RenderPipeline/LightweightPipeline/Scenes/026_Shader_PBRscene/BenchDrill/materials/kozhuh.mat
+++ b/Tests/GraphicsTests/RenderPipeline/LightweightPipeline/Scenes/026_Shader_PBRscene/BenchDrill/materials/kozhuh.mat
  m_PrefabInternal: {fileID: 0}
  m_Name: kozhuh
  m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3}
-  m_ShaderKeywords: _GLOSSYREFLECTIONS_ON _METALLICGLOSSMAP _METALLICSPECGLOSSMAP
-    _METALLIC_SETUP _NORMALMAP _SPECULARHIGHLIGHTS_ON
+  m_ShaderKeywords: _METALLICGLOSSMAP _METALLICSPECGLOSSMAP _METALLIC_SETUP _NORMALMAP
  m_LightmapFlags: 4
  m_EnableInstancingVariants: 0
  m_DoubleSidedGI: 0
--- a/Tests/GraphicsTests/RenderPipeline/LightweightPipeline/Scenes/026_Shader_PBRscene/BenchDrill/materials/motor.mat
+++ b/Tests/GraphicsTests/RenderPipeline/LightweightPipeline/Scenes/026_Shader_PBRscene/BenchDrill/materials/motor.mat
  m_PrefabInternal: {fileID: 0}
  m_Name: motor
  m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3}
-  m_ShaderKeywords: _GLOSSYREFLECTIONS_ON _METALLICGLOSSMAP _METALLICSPECGLOSSMAP
-    _METALLIC_SETUP _NORMALMAP _SPECULARHIGHLIGHTS_ON
+  m_ShaderKeywords: _METALLICGLOSSMAP _METALLICSPECGLOSSMAP _METALLIC_SETUP _NORMALMAP
  m_LightmapFlags: 4
  m_EnableInstancingVariants: 0
  m_DoubleSidedGI: 0
--- a/Tests/GraphicsTests/RenderPipeline/LightweightPipeline/Scenes/026_Shader_PBRscene/BenchDrill/materials/spindle.mat
+++ b/Tests/GraphicsTests/RenderPipeline/LightweightPipeline/Scenes/026_Shader_PBRscene/BenchDrill/materials/spindle.mat
  m_PrefabInternal: {fileID: 0}
  m_Name: spindle
  m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3}
-  m_ShaderKeywords: _GLOSSYREFLECTIONS_ON _METALLICSPECGLOSSMAP _METALLIC_SETUP _NORMALMAP
-    _SPECULARHIGHLIGHTS_ON
+  m_ShaderKeywords: _METALLICGLOSSMAP _METALLICSPECGLOSSMAP _METALLIC_SETUP _NORMALMAP
  m_LightmapFlags: 4
  m_EnableInstancingVariants: 0
  m_DoubleSidedGI: 0
--- a/Tests/GraphicsTests/RenderPipeline/LightweightPipeline/Scenes/026_Shader_PBRscene/BenchDrill/materials/stanina.mat
+++ b/Tests/GraphicsTests/RenderPipeline/LightweightPipeline/Scenes/026_Shader_PBRscene/BenchDrill/materials/stanina.mat
  m_PrefabInternal: {fileID: 0}
  m_Name: stanina
  m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3}
-  m_ShaderKeywords: _GLOSSYREFLECTIONS_ON _METALLICSPECGLOSSMAP _METALLIC_SETUP _NORMALMAP
-    _SPECULARHIGHLIGHTS_ON
+  m_ShaderKeywords: _METALLICGLOSSMAP _METALLICSPECGLOSSMAP _METALLIC_SETUP _NORMALMAP
  m_LightmapFlags: 4
  m_EnableInstancingVariants: 0
  m_DoubleSidedGI: 0
--- a/Tests/GraphicsTests/RenderPipeline/LightweightPipeline/Scenes/026_Shader_PBRscene/BenchDrill/materials/stanina_vk.mat
+++ b/Tests/GraphicsTests/RenderPipeline/LightweightPipeline/Scenes/026_Shader_PBRscene/BenchDrill/materials/stanina_vk.mat
  m_PrefabInternal: {fileID: 0}
  m_Name: stanina_vk
  m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3}
-  m_ShaderKeywords: _GLOSSYREFLECTIONS_ON _METALLICSPECGLOSSMAP _METALLIC_SETUP _NORMALMAP
-    _SPECULARHIGHLIGHTS_ON
+  m_ShaderKeywords: _METALLICGLOSSMAP _METALLICSPECGLOSSMAP _METALLIC_SETUP _NORMALMAP
  m_LightmapFlags: 4
  m_EnableInstancingVariants: 0
  m_DoubleSidedGI: 0
--- a/Tests/GraphicsTests/RenderPipeline/LightweightPipeline/Scenes/026_Shader_PBRscene/BenchDrill/materials/top.mat
+++ b/Tests/GraphicsTests/RenderPipeline/LightweightPipeline/Scenes/026_Shader_PBRscene/BenchDrill/materials/top.mat
  m_PrefabInternal: {fileID: 0}
  m_Name: top
  m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3}
-  m_ShaderKeywords: _GLOSSYREFLECTIONS_ON _METALLICSPECGLOSSMAP _METALLIC_SETUP _NORMALMAP
-    _SPECULARHIGHLIGHTS_ON
+  m_ShaderKeywords: _METALLICGLOSSMAP _METALLICSPECGLOSSMAP _METALLIC_SETUP _NORMALMAP
  m_LightmapFlags: 4
  m_EnableInstancingVariants: 0
  m_DoubleSidedGI: 0
--- a/Tests/GraphicsTests/RenderPipeline/LightweightPipeline/Scenes/026_Shader_PBRscene/BenchDrill/materials/val.mat
+++ b/Tests/GraphicsTests/RenderPipeline/LightweightPipeline/Scenes/026_Shader_PBRscene/BenchDrill/materials/val.mat
  m_PrefabInternal: {fileID: 0}
  m_Name: val
  m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3}
-  m_ShaderKeywords: _GLOSSYREFLECTIONS_ON _METALLICSPECGLOSSMAP _METALLIC_SETUP _NORMALMAP
-    _SPECULARHIGHLIGHTS_ON
+  m_ShaderKeywords: _METALLICGLOSSMAP _METALLICSPECGLOSSMAP _METALLIC_SETUP _NORMALMAP
  m_LightmapFlags: 4
  m_EnableInstancingVariants: 0
  m_DoubleSidedGI: 0
--- a/Tests/GraphicsTests/RenderPipeline/LightweightPipeline/Scenes/026_Shader_PBRscene/Substances/CeramicTiles.mat
+++ b/Tests/GraphicsTests/RenderPipeline/LightweightPipeline/Scenes/026_Shader_PBRscene/Substances/CeramicTiles.mat
  m_PrefabInternal: {fileID: 0}
  m_Name: CeramicTiles
  m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3}
-  m_ShaderKeywords: _GLOSSYREFLECTIONS_ON _METALLICGLOSSMAP _METALLICSPECGLOSSMAP
-    _METALLIC_SETUP _NORMALMAP _SPECULARHIGHLIGHTS_ON
+  m_ShaderKeywords: _METALLICGLOSSMAP _METALLICSPECGLOSSMAP _METALLIC_SETUP _NORMALMAP
  m_LightmapFlags: 4
  m_EnableInstancingVariants: 0
  m_DoubleSidedGI: 0
--- a/Tests/GraphicsTests/RenderPipeline/LightweightPipeline/Scenes/026_Shader_PBRscene/Substances/Challenge-Brick.mat
+++ b/Tests/GraphicsTests/RenderPipeline/LightweightPipeline/Scenes/026_Shader_PBRscene/Substances/Challenge-Brick.mat
  m_PrefabInternal: {fileID: 0}
  m_Name: Challenge-Brick
  m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3}
-  m_ShaderKeywords: _GLOSSYREFLECTIONS_ON _METALLICSPECGLOSSMAP _METALLIC_SETUP _NORMALMAP
-    _SPECULARHIGHLIGHTS_ON
+  m_ShaderKeywords: _METALLICGLOSSMAP _METALLICSPECGLOSSMAP _METALLIC_SETUP _NORMALMAP
  m_LightmapFlags: 4
  m_EnableInstancingVariants: 0
  m_DoubleSidedGI: 0
--- a/Tests/GraphicsTests/RenderPipeline/LightweightPipeline/Scenes/026_Shader_PBRscene/Substances/Hole_mesh.mat
+++ b/Tests/GraphicsTests/RenderPipeline/LightweightPipeline/Scenes/026_Shader_PBRscene/Substances/Hole_mesh.mat
  m_PrefabInternal: {fileID: 0}
  m_Name: Hole_mesh
  m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3}
-  m_ShaderKeywords: _ALPHATEST_ON _GLOSSYREFLECTIONS_ON _METALLICSPECGLOSSMAP _METALLIC_SETUP
-    _NORMALMAP _SPECULARHIGHLIGHTS_ON
+  m_ShaderKeywords: _ALPHATEST_ON _METALLICGLOSSMAP _METALLICSPECGLOSSMAP _METALLIC_SETUP
+    _NORMALMAP
  m_LightmapFlags: 4
  m_EnableInstancingVariants: 0
  m_DoubleSidedGI: 0
--- a/Tests/GraphicsTests/RenderPipeline/LightweightPipeline/Scenes/026_Shader_PBRscene/Substances/IndustrialGlass.mat
+++ b/Tests/GraphicsTests/RenderPipeline/LightweightPipeline/Scenes/026_Shader_PBRscene/Substances/IndustrialGlass.mat
  m_PrefabInternal: {fileID: 0}
  m_Name: IndustrialGlass
  m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3}
-  m_ShaderKeywords: _ALPHAPREMULTIPLY_ON _GLOSSYREFLECTIONS_ON _METALLICSPECGLOSSMAP
-    _METALLIC_SETUP _NORMALMAP _SPECULARHIGHLIGHTS_ON
+  m_ShaderKeywords: _ALPHAPREMULTIPLY_ON _METALLICGLOSSMAP _METALLICSPECGLOSSMAP _METALLIC_SETUP
+    _NORMALMAP
  m_LightmapFlags: 4
  m_EnableInstancingVariants: 0
  m_DoubleSidedGI: 0
--- a/Tests/GraphicsTests/RenderPipeline/LightweightPipeline/Scenes/026_Shader_PBRscene/Substances/PW_WoodLog.mat
+++ b/Tests/GraphicsTests/RenderPipeline/LightweightPipeline/Scenes/026_Shader_PBRscene/Substances/PW_WoodLog.mat
  m_PrefabInternal: {fileID: 0}
  m_Name: PW_WoodLog
  m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3}
-  m_ShaderKeywords: _GLOSSYREFLECTIONS_ON _METALLICGLOSSMAP _METALLICSPECGLOSSMAP
-    _METALLIC_SETUP _NORMALMAP _SPECULARHIGHLIGHTS_ON
+  m_ShaderKeywords: _METALLICGLOSSMAP _METALLICSPECGLOSSMAP _METALLIC_SETUP _NORMALMAP
  m_LightmapFlags: 4
  m_EnableInstancingVariants: 0
  m_DoubleSidedGI: 0
--- a/Tests/GraphicsTests/RenderPipeline/LightweightPipeline/Scenes/026_Shader_PBRscene/Substances/Pyramids
+++ b/Tests/GraphicsTests/RenderPipeline/LightweightPipeline/Scenes/026_Shader_PBRscene/Substances/Pyramids
  m_PrefabInternal: {fileID: 0}
  m_Name: Pyramids Wall - v01
  m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3}
-  m_ShaderKeywords: _EMISSION _GLOSSYREFLECTIONS_ON _METALLICSPECGLOSSMAP _METALLIC_SETUP
-    _NORMALMAP _SPECULARHIGHLIGHTS_ON
-  m_LightmapFlags: 0
+  m_ShaderKeywords: _EMISSION _METALLICGLOSSMAP _METALLICSPECGLOSSMAP _METALLIC_SETUP
+    _NORMALMAP
+  m_LightmapFlags: 2
  m_EnableInstancingVariants: 0
  m_DoubleSidedGI: 0
  m_CustomRenderQueue: -1
--- a/Tests/GraphicsTests/RenderPipeline/LightweightPipeline/Scenes/026_Shader_PBRscene/Substances/Roofing.mat
+++ b/Tests/GraphicsTests/RenderPipeline/LightweightPipeline/Scenes/026_Shader_PBRscene/Substances/Roofing.mat
  m_PrefabInternal: {fileID: 0}
  m_Name: Roofing
  m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3}
-  m_ShaderKeywords: _GLOSSYREFLECTIONS_ON _METALLICSPECGLOSSMAP _METALLIC_SETUP _NORMALMAP
-    _SPECULARHIGHLIGHTS_ON
+  m_ShaderKeywords: _METALLICGLOSSMAP _METALLICSPECGLOSSMAP _METALLIC_SETUP _NORMALMAP
  m_LightmapFlags: 4
  m_EnableInstancingVariants: 0
  m_DoubleSidedGI: 0
--- a/Tests/GraphicsTests/RenderPipeline/LightweightPipeline/Scenes/026_Shader_PBRscene/Substances/ShoreRockSand.mat
+++ b/Tests/GraphicsTests/RenderPipeline/LightweightPipeline/Scenes/026_Shader_PBRscene/Substances/ShoreRockSand.mat
  m_PrefabInternal: {fileID: 0}
  m_Name: ShoreRockSand
  m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3}
-  m_ShaderKeywords: _GLOSSYREFLECTIONS_ON _METALLICGLOSSMAP _METALLICSPECGLOSSMAP
-    _METALLIC_SETUP _NORMALMAP _SPECULARHIGHLIGHTS_ON
+  m_ShaderKeywords: _METALLICGLOSSMAP _METALLICSPECGLOSSMAP _METALLIC_SETUP _NORMALMAP
  m_LightmapFlags: 4
  m_EnableInstancingVariants: 0
  m_DoubleSidedGI: 0
--- a/Tests/GraphicsTests/RenderPipeline/LightweightPipeline/Scenes/026_Shader_PBRscene/Substances/bark.mat
+++ b/Tests/GraphicsTests/RenderPipeline/LightweightPipeline/Scenes/026_Shader_PBRscene/Substances/bark.mat
  m_PrefabInternal: {fileID: 0}
  m_Name: bark
  m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3}
-  m_ShaderKeywords: _GLOSSYREFLECTIONS_ON _METALLICSPECGLOSSMAP _METALLIC_SETUP _NORMALMAP
-    _SPECULARHIGHLIGHTS_ON
+  m_ShaderKeywords: _METALLICGLOSSMAP _METALLICSPECGLOSSMAP _METALLIC_SETUP _NORMALMAP
  m_LightmapFlags: 4
  m_EnableInstancingVariants: 0
  m_DoubleSidedGI: 0
--- a/Tests/GraphicsTests/RenderPipeline/LightweightPipeline/Scenes/026_Shader_PBRscene/Substances/herringbone_brick_floor.mat
+++ b/Tests/GraphicsTests/RenderPipeline/LightweightPipeline/Scenes/026_Shader_PBRscene/Substances/herringbone_brick_floor.mat
  m_PrefabInternal: {fileID: 0}
  m_Name: herringbone_brick_floor
  m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3}
-  m_ShaderKeywords: _GLOSSYREFLECTIONS_ON _METALLICSPECGLOSSMAP _METALLIC_SETUP _NORMALMAP
-    _SPECULARHIGHLIGHTS_ON
+  m_ShaderKeywords: _METALLICGLOSSMAP _METALLICSPECGLOSSMAP _METALLIC_SETUP _NORMALMAP
  m_LightmapFlags: 4
  m_EnableInstancingVariants: 0
  m_DoubleSidedGI: 0
--- a/Tests/GraphicsTests/RenderPipeline/LightweightPipeline/Scenes/026_Shader_PBRscene/Substances/metal_aluminium_directional.mat
+++ b/Tests/GraphicsTests/RenderPipeline/LightweightPipeline/Scenes/026_Shader_PBRscene/Substances/metal_aluminium_directional.mat
  m_PrefabInternal: {fileID: 0}
  m_Name: metal_aluminium_directional
  m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3}
-  m_ShaderKeywords: _GLOSSYREFLECTIONS_ON _METALLICGLOSSMAP _METALLICSPECGLOSSMAP
-    _METALLIC_SETUP _NORMALMAP _SPECULARHIGHLIGHTS_ON
+  m_ShaderKeywords: _METALLICGLOSSMAP _METALLICSPECGLOSSMAP _METALLIC_SETUP _NORMALMAP
  m_LightmapFlags: 4
  m_EnableInstancingVariants: 0
  m_DoubleSidedGI: 0
--- a/Tests/GraphicsTests/RenderPipeline/LightweightPipeline/Scenes/026_Shader_PBRscene/Substances/metal_brushed_copper.mat
+++ b/Tests/GraphicsTests/RenderPipeline/LightweightPipeline/Scenes/026_Shader_PBRscene/Substances/metal_brushed_copper.mat
  m_PrefabInternal: {fileID: 0}
  m_Name: metal_brushed_copper
  m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3}
-  m_ShaderKeywords: _GLOSSYREFLECTIONS_ON _METALLICGLOSSMAP _METALLICSPECGLOSSMAP
-    _METALLIC_SETUP _NORMALMAP _SPECULARHIGHLIGHTS_ON
+  m_ShaderKeywords: _METALLICGLOSSMAP _METALLICSPECGLOSSMAP _METALLIC_SETUP _NORMALMAP
  m_LightmapFlags: 4
  m_EnableInstancingVariants: 0
  m_DoubleSidedGI: 0
--- a/Tests/GraphicsTests/RenderPipeline/LightweightPipeline/Scenes/026_Shader_PBRscene/Substances/red_paint.mat
+++ b/Tests/GraphicsTests/RenderPipeline/LightweightPipeline/Scenes/026_Shader_PBRscene/Substances/red_paint.mat
  m_PrefabInternal: {fileID: 0}
  m_Name: red_paint
  m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3}
-  m_ShaderKeywords: _GLOSSYREFLECTIONS_ON _METALLICGLOSSMAP _METALLICSPECGLOSSMAP
-    _METALLIC_SETUP _NORMALMAP _SPECULARHIGHLIGHTS_ON
+  m_ShaderKeywords: _METALLICGLOSSMAP _METALLICSPECGLOSSMAP _METALLIC_SETUP _NORMALMAP
  m_LightmapFlags: 4
  m_EnableInstancingVariants: 0
  m_DoubleSidedGI: 0
--- a/Tests/GraphicsTests/RenderPipeline/LightweightPipeline/Scenes/026_Shader_PBRscene/Substances/rocks_dirt_ground.mat
+++ b/Tests/GraphicsTests/RenderPipeline/LightweightPipeline/Scenes/026_Shader_PBRscene/Substances/rocks_dirt_ground.mat
  m_PrefabInternal: {fileID: 0}
  m_Name: rocks_dirt_ground
  m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3}
-  m_ShaderKeywords: _GLOSSYREFLECTIONS_ON _METALLICSPECGLOSSMAP _METALLIC_SETUP _NORMALMAP
-    _SPECULARHIGHLIGHTS_ON
+  m_ShaderKeywords: _METALLICGLOSSMAP _METALLICSPECGLOSSMAP _METALLIC_SETUP _NORMALMAP
  m_LightmapFlags: 4
  m_EnableInstancingVariants: 0
  m_DoubleSidedGI: 0