Revert "Change stripping implementation so that no files of the PostProcessing package are modified"

This reverts commit 2c04d49.

Author: hkr

PostProcessing/Editor/PostProcessResourceStripper.cs

@@ -1,17 +1,15 @@
 using System;
 using UnityEditor.Build;
 using UnityEngine;
-using UnityEngine.SceneManagement;
 using UnityEngine.Rendering.PostProcessing;
 
 namespace UnityEditor.Rendering.PostProcessing
 {
     public sealed class PostProcessResourceStripper : ScriptableObject
     {
-        private PostProcessStrippingConfig stripping;
-        private PostProcessStrippingConfig defaultConfig;
-
+        [SerializeField] private PostProcessResources resources;
         [SerializeField] private PostProcessResources unstrippedResources;
+        [SerializeField] private PostProcessStrippingConfig stripping;
 
         static PostProcessResourceStripper s_Instance;
 
@@ -22,25 +20,19 @@ public static PostProcessResourceStripper instance
                 if (s_Instance == null)
                 {
                     s_Instance = CreateInstance<PostProcessResourceStripper>();
-                    s_Instance.defaultConfig = CreateInstance<PostProcessStrippingConfig>();
+                    s_Instance.unstrippedResources.changeHandler = Update;
                 }
 
                 return s_Instance;
             }
         }
 
-        void Awake()
-        {
-            SceneManager.sceneLoaded += OnSceneLoaded;
-
-        }
-
         void OnDestroy()
         {
-            SceneManager.sceneLoaded -= OnSceneLoaded;
+            unstrippedResources.changeHandler = null;
         }
 
-        static private void StripMultiScaleAO(PostProcessResources resources)
+        private void StripMultiScaleAO()
         {
             resources.computeShaders.multiScaleAODownsample1 = null;
             resources.computeShaders.multiScaleAODownsample2 = null;
@@ -49,13 +41,13 @@ static private void StripMultiScaleAO(PostProcessResources resources)
             resources.shaders.multiScaleAO = null;
         }
 
-        static private void StripScreenSpaceReflections(PostProcessResources resources)
+        private void StripScreenSpaceReflections()
         {
             resources.shaders.screenSpaceReflections = null;
             resources.computeShaders.gaussianDownsample = null;
         }
 
-        static private void StripDebugShaders(PostProcessResources resources)
+        private void StripDebugShaders()
         {
             resources.shaders.lightMeter = null;
             resources.shaders.gammaHistogram = null;
@@ -68,61 +60,15 @@ static private void StripDebugShaders(PostProcessResources resources)
             resources.computeShaders.vectorscope = null;
         }
 
-        private void LazyInitStrippingConfig()
-        {
-            if (stripping != null)
-                return;
-
-            var guids = AssetDatabase.FindAssets("t:PostProcessStrippingConfig", null);
-            if (guids.Length > 0)
-            {
-                stripping = (PostProcessStrippingConfig) AssetDatabase.LoadAssetAtPath(AssetDatabase.GUIDToAssetPath(guids[0]), typeof(PostProcessStrippingConfig));
-            }
-            else
-            {
-                // Create a new config asset
-                AssetDatabase.CreateAsset(defaultConfig, "Assets/PostProcessStrippingConfig.asset");
-                AssetDatabase.SaveAssets();
-                AssetDatabase.Refresh();
-            }
-
-            if (stripping == null)
-                stripping = defaultConfig;
-        }
-
-        private void SetConfig(PostProcessStrippingConfig config)
-        {
-            if (config == stripping)
-                return;
-
-            if (defaultConfig == null)
-                return;
-
-            if (config == defaultConfig)
-                return;
-
-            if (config == null)
-            {
-                stripping = defaultConfig;
-                return;
-            }
-
-            stripping = config;
-        }
-
-        private void Apply(BuildTarget target, PostProcessResources resources)
+        private void Apply(BuildTarget target)
         {
-            if (defaultConfig == null)
-                return;
-
-            LazyInitStrippingConfig();
-            if (stripping == null)
+            if (resources == null)
                 return;
 
             if (unstrippedResources == null)
                 return;
 
-            if (resources == null)
+            if (stripping == null)
                 return;
 
             resources.computeShaders = unstrippedResources.computeShaders.Clone();
@@ -132,26 +78,26 @@ private void Apply(BuildTarget target, PostProcessResources resources)
             if (stripping.stripUnsupportedShaders &&
                 (target == BuildTarget.Android || target == BuildTarget.iOS || target == BuildTarget.tvOS))
             {
-                StripMultiScaleAO(resources);
+                StripMultiScaleAO();
             }
 
             if (stripping.stripDebugShaders)
             {
-                StripDebugShaders(resources);
+                StripDebugShaders();
             }
 
             if (stripping.stripComputeShaders)
             {
                 resources.computeShaders = new PostProcessResources.ComputeShaders();
                 resources.shaders.autoExposure = null;
-                StripScreenSpaceReflections(resources);
-                StripMultiScaleAO(resources);
-                StripDebugShaders(resources);
+                StripScreenSpaceReflections();
+                StripMultiScaleAO();
+                StripDebugShaders();
             }
 
             if (stripping.stripUnsupportedShaders && !RuntimeUtilities.supportsDeferredShading)
             {
-                StripScreenSpaceReflections(resources);
+                StripScreenSpaceReflections();
                 resources.shaders.deferredFog = null;
                 if (!RuntimeUtilities.supportsDepthNormals)
                     resources.shaders.scalableAO = null;
@@ -166,35 +112,14 @@ private void Apply(BuildTarget target, PostProcessResources resources)
             }
         }
 
-        void OnSceneLoaded(Scene scene, LoadSceneMode mode)
+        public static void Update()
         {
-            StripAll();
+            Update(EditorUserBuildSettings.activeBuildTarget);
         }
 
-        public static void Strip(PostProcessResources resources)
+        public static void Update(BuildTarget target)
         {
-            instance.Apply(EditorUserBuildSettings.activeBuildTarget, resources);
-        }
-
-        public static void StripAll(BuildTarget target)
-        {
-            var allResources = PostProcessResourcesFactory.AllResources();
-            if (allResources == null)
-                return;
-
-            foreach (var resources in allResources)
-                instance.Apply(EditorUserBuildSettings.activeBuildTarget, resources);
-        }
-
-        public static void StripAll()
-        {
-            StripAll(EditorUserBuildSettings.activeBuildTarget);
-        }
-
-        public static void StripAll(PostProcessStrippingConfig config)
-        {
-            instance.SetConfig(config);
-            StripAll(EditorUserBuildSettings.activeBuildTarget);
+            instance.Apply(EditorUserBuildSettings.activeBuildTarget);
         }
     }
 
@@ -204,7 +129,7 @@ sealed class UpdateStrippingOnBuildTargetChange : IActiveBuildTargetChanged
         public int callbackOrder { get { return 0; } }
         public void OnActiveBuildTargetChanged(BuildTarget previousTarget, BuildTarget newTarget)
         {
-            PostProcessResourceStripper.StripAll(newTarget);
+            PostProcessResourceStripper.Update(newTarget);
         }
     }
 
@@ -215,23 +140,15 @@ sealed class UpdateStrippingBeforeBuild : IPreprocessBuild
     #if UNITY_2018_1_OR_NEWER
         public void OnPreprocessBuild(Build.Reporting.BuildReport report)
         {
-            PostProcessResourceStripper.StripAll(report.summary.platform);
+            PostProcessResourceStripper.Update(report.summary.platform);
         }
     #else
         public void OnPreprocessBuild(BuildTarget target, string path)
         {
-            PostProcessResourceStripper.StripAll(target);
+            PostProcessResourceStripper.Update(target);
         }
     #endif
     }
 #endif
 
-[InitializeOnLoad]
-public class SetupStripping {
-    static SetupStripping()
-    {
-        PostProcessResourcesFactory.Init(PostProcessResourceStripper.Strip);
-    }
-}
-
 }

PostProcessing/Editor/PostProcessResourceStripper.cs.meta

@@ -1,7 +1,5 @@
-using System;
-using UnityEngine;
+using UnityEngine;
 using UnityEditor.Rendering.PostProcessing;
-using UnityEngine.Rendering.PostProcessing;
 
 namespace UnityEditor.Rendering.PostProcessing
 {
@@ -11,39 +9,14 @@ public sealed class PostProcessStrippingConfig : ScriptableObject
         public bool stripDebugShaders = false;
         public bool stripComputeShaders = false;
 
-        [Serializable]
-        public sealed class Result
-        {
-            public PostProcessResources.Shaders shaders;
-            public PostProcessResources.ComputeShaders computeShaders;
-        }
-
-        public Result result;
-
-        private PostProcessResources strippedResources;
-
         public void Awake()
         {
-            PostProcessResourceStripper.StripAll(this);
-            UpdateResult();
+            PostProcessResourceStripper.Update();
         }
 
         public void OnValidate()
         {
-            PostProcessResourceStripper.StripAll(this);
-            UpdateResult();
-        }
-
-        private void UpdateResult()
-        {
-            if (result == null)
-                result = new Result();
-
-            PostProcessResources resources = PostProcessResourcesFactory.StrippedDefaultResources();
-            result.shaders = resources.shaders;
-            result.computeShaders = resources.computeShaders;
-            DestroyImmediate(resources);
+            PostProcessResourceStripper.Update();
         }
     }
-
 }

PostProcessing/Editor/PostProcessStrippingConfig.cs

@@ -145,9 +145,6 @@ void InitLegacy()
 
         public void Init(PostProcessResources resources)
         {
-#if UNITY_EDITOR
-            m_Resources = PostProcessResourcesFactory.Stripped(m_Resources);
-#endif
             if (resources != null) m_Resources = resources;
 
             RuntimeUtilities.CreateIfNull(ref temporalAntialiasing);

PostProcessing/PostProcessResources.asset

@@ -77,16 +77,16 @@ public sealed class SMAALuts
         public Shaders shaders;
         public ComputeShaders computeShaders;
 
-        public PostProcessResources StrippableClone()
+#if UNITY_EDITOR
+        public delegate void ChangeHandler();
+        public ChangeHandler changeHandler;
+
+        void OnValidate()
         {
-            PostProcessResources clone = CreateInstance<PostProcessResources>();
-            clone.blueNoise64 = (Texture2D[]) blueNoise64.Clone();
-            clone.blueNoise256 = (Texture2D[]) blueNoise256.Clone();
-            clone.smaaLuts = smaaLuts;
-            clone.shaders = shaders.Clone();
-            clone.computeShaders = computeShaders.Clone();
-            return clone;
+            if (changeHandler != null)
+                changeHandler();
         }
+#endif
     }
 
 }