Removing duplicated property in lit shader (#3564)

* Removing _GlossMapScale duplicated property in lit shader

* Extending test to check if shaders have duplicated properties

* Adding changelog entry

* Moving _GlossMapScale to obsolete properties as it is not used. Also removing it in complex lit as it is not using upgrade path

Co-authored-by: Felipe Lira <[email protected]>

Author: lukaschod

com.unity.render-pipelines.universal/CHANGELOG.md

@@ -44,6 +44,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 - Fixed shadow cascade blend culling factor.
 - Removed Custom.meta which was causing warnings. [case 1314288](https://issuetracker.unity3d.com/issues/urp-warnings-about-missing-metadata-appear-after-installing)
 - Fixed a case where shadow fade was clipped too early.
+- Fixed lit shader property duplication issue. [case 1315032](https://issuetracker.unity3d.com/issues/shader-dot-propertytoid-returns-the-same-id-when-shaders-properties-have-the-same-name-but-different-type)
 - Fixed undo issues for the additional light property on the UniversalRenderPipeline Asset. [case 1300367]
 
 ### Changed

com.unity.render-pipelines.universal/Shaders/ComplexLit.shader

@@ -14,7 +14,6 @@ Shader "Universal Render Pipeline/Complex Lit"
         _Cutoff("Alpha Cutoff", Range(0.0, 1.0)) = 0.5
 
         _Smoothness("Smoothness", Range(0.0, 1.0)) = 0.5
-        _GlossMapScale("Smoothness Scale", Range(0.0, 1.0)) = 1.0
         _SmoothnessTextureChannel("Smoothness texture channel", Float) = 0
 
         _Metallic("Metallic", Range(0.0, 1.0)) = 0.0

com.unity.render-pipelines.universal/Shaders/Lit.shader

@@ -11,7 +11,6 @@ Shader "Universal Render Pipeline/Lit"
         _Cutoff("Alpha Cutoff", Range(0.0, 1.0)) = 0.5
 
         _Smoothness("Smoothness", Range(0.0, 1.0)) = 0.5
-        _GlossMapScale("Smoothness Scale", Range(0.0, 1.0)) = 1.0
         _SmoothnessTextureChannel("Smoothness texture channel", Float) = 0
 
         _Metallic("Metallic", Range(0.0, 1.0)) = 0.0

com.unity.render-pipelines.universal/Tests/Editor/EditorTests.cs

@@ -110,6 +110,14 @@ public void ValidateShaderResources(ShaderPathID shaderPathID)
 
         var shader = AssetDatabase.LoadAssetAtPath<Shader>(path);
         Assert.AreEqual(shader.name, ShaderUtils.GetShaderPath(shaderPathID));
+
+        var propertyNames = new System.Collections.Generic.HashSet<string>();
+        for (int j = 0; j < shader.GetPropertyCount(); ++j)
+        {
+            string propertyName = shader.GetPropertyName(j);
+            Assert.IsFalse(propertyNames.Contains(propertyName), $"{shader.name} has duplicated property {propertyName}!");
+            propertyNames.Add(propertyName);
+        }
     }
 
     // When creating URP all required resources should be initialized.