Revert failed merge

Author: Chman

PostProcessing/Editor/Models/AntialiasingModelEditor.cs

@@ -18,8 +18,6 @@ public class AntialiasingModelEditor : PostProcessingModelEditor
         SerializedProperty m_TaaStationaryBlending;
         SerializedProperty m_TaaMotionBlending;
 
-        SerializedProperty m_TaaStableVariant;
-
         static string[] s_MethodNames =
         {
             "Fast Approximate Anti-aliasing",
@@ -36,8 +34,6 @@ public override void OnEnable()
             m_TaaSharpen = FindSetting((Settings x) => x.taaSettings.sharpen);
             m_TaaStationaryBlending = FindSetting((Settings x) => x.taaSettings.stationaryBlending);
             m_TaaMotionBlending = FindSetting((Settings x) => x.taaSettings.motionBlending);
-
-            m_TaaStableVariant = FindSetting((Settings x) => x.taaSettings.useStableVariant);
         }
 
         public override void OnInspectorGUI()
@@ -69,13 +65,6 @@ public override void OnInspectorGUI()
                 EditorGUILayout.Space();
 
                 EditorGUILayout.PropertyField(m_TaaSharpen);
-
-                EditorGUILayout.Space();
-
-                EditorGUILayout.LabelField("Debug", EditorStyles.boldLabel);
-                EditorGUI.indentLevel++;
-                EditorGUILayout.PropertyField(m_TaaStableVariant, EditorGUIHelper.GetContent("Use Stable Variant"));
-                EditorGUI.indentLevel--;
             }
         }
     }

PostProcessing/Runtime/Components/TaaComponent.cs

@@ -11,7 +11,6 @@ static class Uniforms
             internal static int _FinalBlendParameters = Shader.PropertyToID("_FinalBlendParameters");
             internal static int _HistoryTex           = Shader.PropertyToID("_HistoryTex");
             internal static int _MainTex              = Shader.PropertyToID("_MainTex");
-            internal static int _StableVariant        = Shader.PropertyToID("_StableVariant");
         }
 
         const string k_ShaderString = "Hidden/Post FX/Temporal Anti-aliasing";
@@ -88,11 +87,6 @@ public void Render(RenderTexture source, RenderTexture destination)
 
             var settings = model.settings.taaSettings;
 
-            //Debug
-            int i = settings.useStableVariant ? 1 : 0;
-            material.SetFloat(Uniforms._StableVariant, i);
-            //End debug
-
             if (m_ResetHistory || m_HistoryTexture == null || m_HistoryTexture.width != source.width || m_HistoryTexture.height != source.height)
             {
                 if (m_HistoryTexture)

PostProcessing/Runtime/Models/AntialiasingModel.cs

@@ -189,9 +189,6 @@ public struct TaaSettings
             [Range(0f, 0.99f)]
             public float motionBlending;
 
-            [Tooltip("DEBUG")]
-            public bool useStableVariant;
-
             public static TaaSettings defaultSettings
             {
                 get
@@ -201,8 +198,7 @@ public static TaaSettings defaultSettings
                         jitterSpread = 0.75f,
                         sharpen = 0.3f,
                         stationaryBlending = 0.95f,
-                        motionBlending = 0.85f,
-                        useStableVariant = false
+                        motionBlending = 0.85f
                     };
                 }
             }