Revert "Add toggle in 'Lit' shader to enable real-time main light per material (Unity-Technologies#11)"

AleMC · AleMC · commit 9d21b73bb7cb · 2023-06-13T15:42:05.000+02:00
This reverts commit a87a54c.
diff --git a/com.unity.render-pipelines.universal/Editor/ShaderGUI/Shaders/LitShader.cs b/com.unity.render-pipelines.universal/Editor/ShaderGUI/Shaders/LitShader.cs
@@ -78,13 +78,11 @@ public override void DrawSurfaceInputs(Material material)
         // material main advanced options
         public override void DrawAdvancedOptions(Material material)
         {
-            // (ASG) added 'realtimeMainLight' property.
-            if (litProperties.reflections != null && litProperties.highlights != null && litProperties.realtimeMainLight != null)
+            if (litProperties.reflections != null && litProperties.highlights != null)
             {
                 EditorGUI.BeginChangeCheck();
                 materialEditor.ShaderProperty(litProperties.highlights, LitGUI.Styles.highlightsText);
                 materialEditor.ShaderProperty(litProperties.reflections, LitGUI.Styles.reflectionsText);
-                materialEditor.ShaderProperty(litProperties.realtimeMainLight, LitGUI.Styles.realtimeMainLightText);
                 if(EditorGUI.EndChangeCheck())
                 {
                     MaterialChanged(material);
diff --git a/com.unity.render-pipelines.universal/Editor/ShaderGUI/ShadingModels/LitGUI.cs b/com.unity.render-pipelines.universal/Editor/ShaderGUI/ShadingModels/LitGUI.cs
@@ -44,11 +44,6 @@ public static class Styles
                 new GUIContent("Environment Reflections",
                     "When enabled, the Material samples reflections from the nearest Reflection Probes or Lighting Probe.");
 
-            // (ASG)
-            public static GUIContent realtimeMainLightText =
-                new GUIContent("Real-time Main Light",
-                    "When enabled, real-time main light will be blended with baked lighting.");
-
             public static GUIContent heightMapText = new GUIContent("Height Map",
                 "Specifies the Height Map (G) for this Material.");
 
@@ -94,8 +89,6 @@ public struct LitProperties
             // Advanced Props
             public MaterialProperty highlights;
             public MaterialProperty reflections;
-            // (ASG)
-            public MaterialProperty realtimeMainLight;
 
             public MaterialProperty clearCoat;  // Enable/Disable dummy property
             public MaterialProperty clearCoatMap;
@@ -122,8 +115,6 @@ public LitProperties(MaterialProperty[] properties)
                 // Advanced Props
                 highlights = BaseShaderGUI.FindProperty("_SpecularHighlights", properties, false);
                 reflections = BaseShaderGUI.FindProperty("_EnvironmentReflections", properties, false);
-                // (ASG)
-                realtimeMainLight = BaseShaderGUI.FindProperty("_RealtimeMainLight", properties, false);
 
                 clearCoat           = BaseShaderGUI.FindProperty("_ClearCoat", properties, false);
                 clearCoatMap        = BaseShaderGUI.FindProperty("_ClearCoatMap", properties, false);
@@ -303,10 +294,6 @@ public static void SetMaterialKeywords(Material material)
             if (material.HasProperty("_EnvironmentReflections"))
                 CoreUtils.SetKeyword(material, "_ENVIRONMENTREFLECTIONS_OFF",
                     material.GetFloat("_EnvironmentReflections") == 0.0f);
-            // (ASG)
-            if (material.HasProperty("_RealtimeMainLight"))
-                CoreUtils.SetKeyword(material, "_REALTIME_MAIN_LIGHT_ON",
-                    material.GetFloat("_RealtimeMainLight") != 0.0f);
             if (material.HasProperty("_OcclusionMap"))
                 CoreUtils.SetKeyword(material, "_OCCLUSIONMAP", material.GetTexture("_OcclusionMap"));
 
diff --git a/com.unity.render-pipelines.universal/ShaderLibrary/Lighting.hlsl b/com.unity.render-pipelines.universal/ShaderLibrary/Lighting.hlsl
@@ -867,33 +867,25 @@ half4 UniversalFragmentPBR(InputData inputData, SurfaceData surfaceData)
     half4 shadowMask = half4(1, 1, 1, 1);
 #endif
 
-    #if defined(_REALTIME_MAIN_LIGHT_ON) // (ASG)
-        Light mainLight = GetMainLight(inputData.shadowCoord, inputData.positionWS, shadowMask);
-    #endif
+    // Light mainLight = GetMainLight(inputData.shadowCoord, inputData.positionWS, shadowMask);
 
     #if defined(_SCREEN_SPACE_OCCLUSION)
         AmbientOcclusionFactor aoFactor = GetScreenSpaceAmbientOcclusion(inputData.normalizedScreenSpaceUV);
         mainLight.color *= aoFactor.directAmbientOcclusion;
         surfaceData.occlusion = min(surfaceData.occlusion, aoFactor.indirectAmbientOcclusion);
     #endif
 
-    #if defined(_REALTIME_MAIN_LIGHT_ON) // (ASG)
-        MixRealtimeAndBakedGI(mainLight, inputData.normalWS, inputData.bakedGI);
-    #endif
-
+    // MixRealtimeAndBakedGI(mainLight, inputData.normalWS, inputData.bakedGI);
     half3 giDirectionWS = SafeNormalize(inputData.bakedGI_directionWS);
     half3 gi = GlobalIllumination(brdfData, brdfLightmaps, brdfDataClearCoat, surfaceData.clearCoatMask,
                                      inputData.bakedGI, giDirectionWS, surfaceData.occlusion,
                                      inputData.normalWS, inputData.viewDirectionWS);
     half3 color = half3(0,0,0);
     color += gi;
-
-    #if defined(_REALTIME_MAIN_LIGHT_ON) // (ASG)
-        color += LightingPhysicallyBased(brdfData, brdfDataClearCoat,
-                                         mainLight,
-                                         inputData.normalWS, inputData.viewDirectionWS,
-                                         surfaceData.clearCoatMask, specularHighlightsOff);
-    #endif
+    // color += LightingPhysicallyBased(brdfData, brdfDataClearCoat,
+    //                                  mainLight,
+    //                                  inputData.normalWS, inputData.viewDirectionWS,
+    //                                  surfaceData.clearCoatMask, specularHighlightsOff);
 
 #ifdef _ADDITIONAL_LIGHTS
     uint pixelLightCount = GetAdditionalLightsCount();
diff --git a/com.unity.render-pipelines.universal/Shaders/Lit.shader b/com.unity.render-pipelines.universal/Shaders/Lit.shader
@@ -23,9 +23,6 @@ Shader "Universal Render Pipeline/Lit"
         [ToggleOff] _SpecularHighlights("Specular Highlights", Float) = 1.0
         [ToggleOff] _EnvironmentReflections("Environment Reflections", Float) = 1.0
 
-        // (ASG)
-        [Toggle] _RealtimeMainLight("Real-time Main Light", Float) = 0
-
         _BumpScale("Scale", Float) = 1.0
         _BumpMap("Normal Map", 2D) = "bump" {}
 
@@ -118,7 +115,6 @@ Shader "Universal Render Pipeline/Lit"
             #pragma multi_compile _ _COLOR_TRANSFORM_IN_FORWARD
             // If HDR_GRADING is on, then the tonemap algorithm is encoded in the HDR LUT
             #pragma multi_compile _ _HDR_GRADING _TONEMAP_ACES _TONEMAP_NEUTRAL
-            #pragma shader_feature_local_fragment _REALTIME_MAIN_LIGHT_ON
 
             // -------------------------------------
             // Universal Pipeline keywords
@@ -408,7 +404,6 @@ Shader "Universal Render Pipeline/Lit"
             #pragma multi_compile _ _COLOR_TRANSFORM_IN_FORWARD
             // If HDR_GRADING is on, then the tonemap algorithm is encoded in the HDR LUT
             #pragma multi_compile _ _HDR_GRADING _TONEMAP_ACES _TONEMAP_NEUTRAL
-            #pragma shader_feature_local_fragment _REALTIME_MAIN_LIGHT_ON
 
             // -------------------------------------
             // Universal Pipeline keywords

Original file line number	Diff line number	Diff line change
`@@ -78,13 +78,11 @@ public override void DrawSurfaceInputs(Material material)`
`78`	`78`	`// material main advanced options`
`79`	`79`	`public override void DrawAdvancedOptions(Material material)`
`80`	`80`	`{`
`81`		`- // (ASG) added 'realtimeMainLight' property.`
`82`		`- if (litProperties.reflections != null && litProperties.highlights != null && litProperties.realtimeMainLight != null)`
	`81`	`+ if (litProperties.reflections != null && litProperties.highlights != null)`
`83`	`82`	`{`
`84`	`83`	`EditorGUI.BeginChangeCheck();`
`85`	`84`	`materialEditor.ShaderProperty(litProperties.highlights, LitGUI.Styles.highlightsText);`
`86`	`85`	`materialEditor.ShaderProperty(litProperties.reflections, LitGUI.Styles.reflectionsText);`
`87`		`- materialEditor.ShaderProperty(litProperties.realtimeMainLight, LitGUI.Styles.realtimeMainLightText);`
`88`	`86`	`if(EditorGUI.EndChangeCheck())`
`89`	`87`	`{`
`90`	`88`	`MaterialChanged(material);`