Reduced Unity version requirement to 2019.x

- Removed multi_compile pragmas for a single, statically compiled variant of each shader, using the most common permutation.
- Use old API to directly set data on a compute buffer and bind compute buffers globally.
- Removed auto T&C pass to avoid clashes with auto-reactive pass in their compute buffer usage.
- Explicitly bind temporary RTs to compute shaders, even if they are using globally bound name IDs.
- Removed texture array support.

Runtime/FSR2/Fsr2.cs

@@ -130,7 +130,7 @@ namespace FidelityFX.FSR2
 #if !UNITY_2021_1_OR_NEWER
         internal static void SetBufferData(this CommandBuffer commandBuffer, ComputeBuffer computeBuffer, Array data)
         {
-            commandBuffer.SetComputeBufferData(computeBuffer, data);
+            computeBuffer.SetData(data);
         }
 #endif
         
@@ -194,15 +194,6 @@ namespace FidelityFX.FSR2
             public float CameraFar;
             public float CameraFovAngleVertical;
             public float ViewSpaceToMetersFactor;
-            public bool UseTextureArrays;   // Enable texture array bindings, primarily used for HDRP and XR
-            
-            // EXPERIMENTAL reactive mask generation parameters
-            public bool EnableAutoReactive;
-            public ResourceView ColorOpaqueOnly;
-            public float AutoTcThreshold = 0.05f;
-            public float AutoTcScale = 1.0f;
-            public float AutoReactiveScale = 5.0f;
-            public float AutoReactiveMax = 0.9f;
         }
 
         /// <summary>

Runtime/FSR2/Fsr2Context.cs

@@ -45,7 +45,6 @@ namespace FidelityFX.FSR2
         private Fsr2Pass _accumulatePass;
         private Fsr2Pass _sharpenPass;
         private Fsr2Pass _generateReactivePass;
-        private Fsr2Pass _tcrAutogeneratePass;
 
         private readonly Fsr2Resources _resources = new Fsr2Resources();
 
@@ -65,10 +64,6 @@ namespace FidelityFX.FSR2
         private readonly Fsr2.GenerateReactiveConstants[] _generateReactiveConstantsArray = { new Fsr2.GenerateReactiveConstants() };
         private ref Fsr2.GenerateReactiveConstants GenReactiveConsts => ref _generateReactiveConstantsArray[0];
 
-        private ComputeBuffer _tcrAutogenerateConstantsBuffer;
-        private readonly Fsr2.GenerateReactiveConstants2[] _tcrAutogenerateConstantsArray = { new Fsr2.GenerateReactiveConstants2() };
-        private ref Fsr2.GenerateReactiveConstants2 TcrAutoGenConsts => ref _tcrAutogenerateConstantsArray[0];
-
         private bool _firstExecution;
         private Vector2 _previousJitterOffset;
         private int _resourceFrameIndex;
@@ -82,7 +77,6 @@ namespace FidelityFX.FSR2
             _spdConstantsBuffer = CreateConstantBuffer<Fsr2.SpdConstants>();
             _rcasConstantsBuffer = CreateConstantBuffer<Fsr2.RcasConstants>();
             _generateReactiveConstantsBuffer = CreateConstantBuffer<Fsr2.GenerateReactiveConstants>();
-            _tcrAutogenerateConstantsBuffer = CreateConstantBuffer<Fsr2.GenerateReactiveConstants2>();
 
             // Set defaults
             _firstExecution = true;
@@ -103,12 +97,10 @@ namespace FidelityFX.FSR2
             _accumulatePass = new Fsr2AccumulatePass(_contextDescription, _resources, _upscalerConstantsBuffer);
             _sharpenPass = new Fsr2SharpenPass(_contextDescription, _resources, _upscalerConstantsBuffer, _rcasConstantsBuffer);
             _generateReactivePass = new Fsr2GenerateReactivePass(_contextDescription, _resources, _generateReactiveConstantsBuffer);
-            _tcrAutogeneratePass = new Fsr2TcrAutogeneratePass(_contextDescription, _resources, _upscalerConstantsBuffer, _tcrAutogenerateConstantsBuffer);
         }
         
         public void Destroy()
         {
-            DestroyPass(ref _tcrAutogeneratePass);
             DestroyPass(ref _generateReactivePass);
             DestroyPass(ref _sharpenPass);
             DestroyPass(ref _accumulatePass);
@@ -119,7 +111,6 @@ namespace FidelityFX.FSR2
             
             _resources.Destroy();
             
-            DestroyConstantBuffer(ref _tcrAutogenerateConstantsBuffer);
             DestroyConstantBuffer(ref _generateReactiveConstantsBuffer);
             DestroyConstantBuffer(ref _rcasConstantsBuffer);
             DestroyConstantBuffer(ref _spdConstantsBuffer);
@@ -146,9 +137,6 @@ namespace FidelityFX.FSR2
                 DebugCheckDispatch(dispatchParams);
             }
             
-            if (dispatchParams.UseTextureArrays)
-                commandBuffer.EnableShaderKeyword("UNITY_FSR_TEXTURE2D_X_ARRAY");
-            
             if (_firstExecution)
             {
                 commandBuffer.SetRenderTarget(_resources.LockStatus[0]);
@@ -166,24 +154,6 @@ namespace FidelityFX.FSR2
                 dispatchParams.Exposure = new ResourceView(_resources.AutoExposure);
             else if (!dispatchParams.Exposure.IsValid) 
                 dispatchParams.Exposure = new ResourceView(_resources.DefaultExposure);
-
-            if (dispatchParams.EnableAutoReactive)
-            {
-                // Create the auto-TCR resources only when we need them
-                if (_resources.AutoReactive == null)
-                    _resources.CreateTcrAutogenResources(_contextDescription);
-
-                if (resetAccumulation)
-                {
-                    RenderTargetIdentifier opaqueOnly = dispatchParams.ColorOpaqueOnly.IsValid ? dispatchParams.ColorOpaqueOnly.RenderTarget : Fsr2ShaderIDs.SrvOpaqueOnly;
-                    commandBuffer.Blit(_resources.PrevPreAlpha[frameIndex ^ 1], opaqueOnly);
-                }
-            }
-            else if (_resources.AutoReactive != null)
-            {
-                // Destroy the auto-TCR resources if we don't use the feature 
-                _resources.DestroyTcrAutogenResources();
-            }
             
             if (!dispatchParams.Reactive.IsValid) dispatchParams.Reactive = new ResourceView(_resources.DefaultReactive);
             if (!dispatchParams.TransparencyAndComposition.IsValid) dispatchParams.TransparencyAndComposition = new ResourceView(_resources.DefaultReactive);
@@ -230,14 +200,9 @@ namespace FidelityFX.FSR2
             // Initialize constant buffers data
             commandBuffer.SetBufferData(_upscalerConstantsBuffer, _upscalerConstantsArray);
             commandBuffer.SetBufferData(_spdConstantsBuffer, _spdConstantsArray);
-
-            // Auto reactive
-            if (dispatchParams.EnableAutoReactive)
-            {
-                GenerateTransparencyCompositionReactive(dispatchParams, commandBuffer, frameIndex);
-                dispatchParams.Reactive = new ResourceView(_resources.AutoReactive);
-                dispatchParams.TransparencyAndComposition = new ResourceView(_resources.AutoComposition);
-            }
+            
+            commandBuffer.SetGlobalConstantBuffer(_upscalerConstantsBuffer, Fsr2ShaderIDs.CbFsr2, 0, Marshal.SizeOf<Fsr2.UpscalerConstants>());
+            commandBuffer.SetGlobalConstantBuffer(_spdConstantsBuffer, Fsr2ShaderIDs.CbSpd, 0, Marshal.SizeOf<Fsr2.SpdConstants>());
             
             // Compute luminance pyramid
             _computeLuminancePyramidPass.ScheduleDispatch(commandBuffer, dispatchParams, frameIndex, dispatchThreadGroupCount.x, dispatchThreadGroupCount.y);
@@ -260,6 +225,8 @@ namespace FidelityFX.FSR2
                 SetupRcasConstants(dispatchParams);
                 commandBuffer.SetBufferData(_rcasConstantsBuffer, _rcasConstantsArray);
                 
+                commandBuffer.SetGlobalConstantBuffer(_rcasConstantsBuffer, Fsr2ShaderIDs.CbRcas, 0, Marshal.SizeOf<Fsr2.RcasConstants>());
+                
                 // Dispatch RCAS
                 const int threadGroupWorkRegionDimRcas = 16;
                 int threadGroupsX = (Screen.width + threadGroupWorkRegionDimRcas - 1) / threadGroupWorkRegionDimRcas;
@@ -270,8 +237,6 @@ namespace FidelityFX.FSR2
             _resourceFrameIndex = (_resourceFrameIndex + 1) % MaxQueuedFrames;
 
             Fsr2Resources.DestroyAliasableResources(commandBuffer);
-            
-            commandBuffer.DisableShaderKeyword("UNITY_FSR_TEXTURE2D_X_ARRAY");
         }
 
         public void GenerateReactiveMask(Fsr2.GenerateReactiveDescription dispatchParams)
@@ -293,22 +258,9 @@ namespace FidelityFX.FSR2
             GenReactiveConsts.flags = (uint)dispatchParams.Flags;
             commandBuffer.SetBufferData(_generateReactiveConstantsBuffer, _generateReactiveConstantsArray);
             
-            ((Fsr2GenerateReactivePass)_generateReactivePass).ScheduleDispatch(commandBuffer, dispatchParams, dispatchSrcX, dispatchSrcY);
-        }
-
-        private void GenerateTransparencyCompositionReactive(Fsr2.DispatchDescription dispatchParams, CommandBuffer commandBuffer, int frameIndex)
-        {
-            const int threadGroupWorkRegionDim = 8;
-            int dispatchSrcX = (dispatchParams.RenderSize.x + (threadGroupWorkRegionDim - 1)) / threadGroupWorkRegionDim;
-            int dispatchSrcY = (dispatchParams.RenderSize.y + (threadGroupWorkRegionDim - 1)) / threadGroupWorkRegionDim;
-
-            TcrAutoGenConsts.autoTcThreshold = dispatchParams.AutoTcThreshold;
-            TcrAutoGenConsts.autoTcScale = dispatchParams.AutoTcScale;
-            TcrAutoGenConsts.autoReactiveScale = dispatchParams.AutoReactiveScale;
-            TcrAutoGenConsts.autoReactiveMax = dispatchParams.AutoReactiveMax;
-            commandBuffer.SetBufferData(_tcrAutogenerateConstantsBuffer, _tcrAutogenerateConstantsArray);
+            commandBuffer.SetGlobalConstantBuffer(_generateReactiveConstantsBuffer, Fsr2ShaderIDs.CbGenReactive, 0, Marshal.SizeOf<Fsr2.GenerateReactiveConstants>());
             
-            _tcrAutogeneratePass.ScheduleDispatch(commandBuffer, dispatchParams, frameIndex, dispatchSrcX, dispatchSrcY);
+            ((Fsr2GenerateReactivePass)_generateReactivePass).ScheduleDispatch(commandBuffer, dispatchParams, dispatchSrcX, dispatchSrcY);
         }
 
         private void SetupConstants(Fsr2.DispatchDescription dispatchParams, bool resetAccumulation)

Runtime/FSR2/Fsr2Pass.cs

@@ -42,8 +42,6 @@ namespace FidelityFX.FSR2
         protected ComputeShader ComputeShader;
         protected int KernelIndex;
         
-        protected CustomSampler Sampler;
-        
         protected Fsr2Pass(Fsr2.ContextDescription contextDescription, Fsr2Resources resources, ComputeBuffer constants)
         {
             ContextDescription = contextDescription;
@@ -57,9 +55,7 @@ namespace FidelityFX.FSR2
         
         public void ScheduleDispatch(CommandBuffer commandBuffer, Fsr2.DispatchDescription dispatchParams, int frameIndex, int dispatchX, int dispatchY)
         {
-            commandBuffer.BeginSample(Sampler);
             DoScheduleDispatch(commandBuffer, dispatchParams, frameIndex, dispatchX, dispatchY);
-            commandBuffer.EndSample(Sampler);
         }
 
         protected abstract void DoScheduleDispatch(CommandBuffer commandBuffer, Fsr2.DispatchDescription dispatchParams, int frameIndex, int dispatchX, int dispatchY);
@@ -78,23 +74,6 @@ namespace FidelityFX.FSR2
 
             ComputeShader = shader;
             KernelIndex = ComputeShader.FindKernel("CS");
-            Sampler = CustomSampler.Create(passName);
-
-            bool useLut = false;
-#if UNITY_2022_1_OR_NEWER   // This will also work in 2020.3.43+ and 2021.3.14+ 
-            if (SystemInfo.computeSubGroupSize == 64)
-            {
-                useLut = true;
-            }
-#endif
-            
-            // This matches the permutation rules from the CreatePipeline* functions
-            if ((flags & Fsr2.InitializationFlags.EnableHighDynamicRange) != 0) ComputeShader.EnableKeyword("FFX_FSR2_OPTION_HDR_COLOR_INPUT");
-            if ((flags & Fsr2.InitializationFlags.EnableDisplayResolutionMotionVectors) == 0) ComputeShader.EnableKeyword("FFX_FSR2_OPTION_LOW_RESOLUTION_MOTION_VECTORS");
-            if ((flags & Fsr2.InitializationFlags.EnableMotionVectorsJitterCancellation) != 0) ComputeShader.EnableKeyword("FFX_FSR2_OPTION_JITTERED_MOTION_VECTORS");
-            if ((flags & Fsr2.InitializationFlags.EnableDepthInverted) != 0) ComputeShader.EnableKeyword("FFX_FSR2_OPTION_INVERTED_DEPTH");
-            if (useLut) ComputeShader.EnableKeyword("FFX_FSR2_OPTION_REPROJECT_USE_LANCZOS_TYPE");
-            if ((flags & Fsr2.InitializationFlags.EnableFP16Usage) != 0) ComputeShader.EnableKeyword("FFX_HALF");
         }
     }
 
@@ -120,9 +99,6 @@ namespace FidelityFX.FSR2
             commandBuffer.SetComputeTextureParam(ComputeShader, KernelIndex, Fsr2ShaderIDs.UavExposureMip5, Resources.SceneLuminance, 5);
             commandBuffer.SetComputeTextureParam(ComputeShader, KernelIndex, Fsr2ShaderIDs.UavAutoExposure, Resources.AutoExposure);
 
-            commandBuffer.SetComputeConstantBufferParam(ComputeShader, Fsr2ShaderIDs.CbFsr2, Constants, 0, Marshal.SizeOf<Fsr2.UpscalerConstants>());
-            commandBuffer.SetComputeConstantBufferParam(ComputeShader, Fsr2ShaderIDs.CbSpd, _spdConstants, 0, Marshal.SizeOf<Fsr2.SpdConstants>());
-            
             commandBuffer.DispatchCompute(ComputeShader, KernelIndex, dispatchX, dispatchY, 1);
         }
     }
@@ -147,9 +123,10 @@ namespace FidelityFX.FSR2
             commandBuffer.SetComputeTextureParam(ComputeShader, KernelIndex, Fsr2ShaderIDs.SrvInputMotionVectors, motionVectors.RenderTarget, motionVectors.MipLevel, motionVectors.SubElement);
             commandBuffer.SetComputeTextureParam(ComputeShader, KernelIndex, Fsr2ShaderIDs.SrvInputExposure, exposure.RenderTarget, exposure.MipLevel, exposure.SubElement);
 
+            commandBuffer.SetComputeTextureParam(ComputeShader, KernelIndex, Fsr2ShaderIDs.UavReconstructedPrevNearestDepth, Fsr2ShaderIDs.UavReconstructedPrevNearestDepth);
             commandBuffer.SetComputeTextureParam(ComputeShader, KernelIndex, Fsr2ShaderIDs.UavDilatedMotionVectors, Resources.DilatedMotionVectors[frameIndex]);
-            
-            commandBuffer.SetComputeConstantBufferParam(ComputeShader, Fsr2ShaderIDs.CbFsr2, Constants, 0, Marshal.SizeOf<Fsr2.UpscalerConstants>());
+            commandBuffer.SetComputeTextureParam(ComputeShader, KernelIndex, Fsr2ShaderIDs.UavDilatedDepth, Fsr2ShaderIDs.UavDilatedDepth);
+            commandBuffer.SetComputeTextureParam(ComputeShader, KernelIndex, Fsr2ShaderIDs.UavLockInputLuma, Fsr2ShaderIDs.UavLockInputLuma);
             
             commandBuffer.DispatchCompute(ComputeShader, KernelIndex, dispatchX, dispatchY, 1);
         }
@@ -184,7 +161,8 @@ namespace FidelityFX.FSR2
             commandBuffer.SetComputeTextureParam(ComputeShader, KernelIndex, Fsr2ShaderIDs.SrvDilatedDepth, Fsr2ShaderIDs.UavDilatedDepth);
             commandBuffer.SetComputeTextureParam(ComputeShader, KernelIndex, Fsr2ShaderIDs.SrvPrevDilatedMotionVectors, Resources.DilatedMotionVectors[frameIndex ^ 1]);
 
-            commandBuffer.SetComputeConstantBufferParam(ComputeShader, Fsr2ShaderIDs.CbFsr2, Constants, 0, Marshal.SizeOf<Fsr2.UpscalerConstants>());
+            commandBuffer.SetComputeTextureParam(ComputeShader, KernelIndex, Fsr2ShaderIDs.UavDilatedReactiveMasks, Fsr2ShaderIDs.UavDilatedReactiveMasks);
+            commandBuffer.SetComputeTextureParam(ComputeShader, KernelIndex, Fsr2ShaderIDs.UavPreparedInputColor, Fsr2ShaderIDs.UavPreparedInputColor);
             
             commandBuffer.DispatchCompute(ComputeShader, KernelIndex, dispatchX, dispatchY, 1);
         }
@@ -201,7 +179,9 @@ namespace FidelityFX.FSR2
         protected override void DoScheduleDispatch(CommandBuffer commandBuffer, Fsr2.DispatchDescription dispatchParams, int frameIndex, int dispatchX, int dispatchY)
         {
             commandBuffer.SetComputeTextureParam(ComputeShader, KernelIndex, Fsr2ShaderIDs.SrvLockInputLuma, Fsr2ShaderIDs.UavLockInputLuma);
-            commandBuffer.SetComputeConstantBufferParam(ComputeShader, Fsr2ShaderIDs.CbFsr2, Constants, 0, Marshal.SizeOf<Fsr2.UpscalerConstants>());
+
+            commandBuffer.SetComputeTextureParam(ComputeShader, KernelIndex, Fsr2ShaderIDs.UavNewLocks, Fsr2ShaderIDs.UavNewLocks);
+            commandBuffer.SetComputeTextureParam(ComputeShader, KernelIndex, Fsr2ShaderIDs.UavReconstructedPrevNearestDepth, Fsr2ShaderIDs.UavReconstructedPrevNearestDepth);
             
             commandBuffer.DispatchCompute(ComputeShader, KernelIndex, dispatchX, dispatchY, 1);
         }
@@ -264,12 +244,11 @@ namespace FidelityFX.FSR2
             commandBuffer.SetComputeTextureParam(ComputeShader, KernelIndex, Fsr2ShaderIDs.UavInternalUpscaled, Resources.InternalUpscaled[frameIndex]);
             commandBuffer.SetComputeTextureParam(ComputeShader, KernelIndex, Fsr2ShaderIDs.UavLockStatus, Resources.LockStatus[frameIndex]);
             commandBuffer.SetComputeTextureParam(ComputeShader, KernelIndex, Fsr2ShaderIDs.UavLumaHistory, Resources.LumaHistory[frameIndex]);
+            commandBuffer.SetComputeTextureParam(ComputeShader, KernelIndex, Fsr2ShaderIDs.UavNewLocks, Fsr2ShaderIDs.UavNewLocks);
             
             ref var output = ref dispatchParams.Output;
             commandBuffer.SetComputeTextureParam(ComputeShader, KernelIndex, Fsr2ShaderIDs.UavUpscaledOutput, output.RenderTarget, output.MipLevel, output.SubElement);
 
-            commandBuffer.SetComputeConstantBufferParam(ComputeShader, Fsr2ShaderIDs.CbFsr2, Constants, 0, Marshal.SizeOf<Fsr2.UpscalerConstants>());
-            
             commandBuffer.DispatchCompute(ComputeShader, KernelIndex, dispatchX, dispatchY, 1);
         }
     }
@@ -295,9 +274,6 @@ namespace FidelityFX.FSR2
             ref var output = ref dispatchParams.Output;
             commandBuffer.SetComputeTextureParam(ComputeShader, KernelIndex, Fsr2ShaderIDs.UavUpscaledOutput, output.RenderTarget, output.MipLevel, output.SubElement);
 
-            commandBuffer.SetComputeConstantBufferParam(ComputeShader, Fsr2ShaderIDs.CbFsr2, Constants, 0, Marshal.SizeOf<Fsr2.UpscalerConstants>());
-            commandBuffer.SetComputeConstantBufferParam(ComputeShader, Fsr2ShaderIDs.CbRcas, _rcasConstants, 0, Marshal.SizeOf<Fsr2.RcasConstants>());
-
             commandBuffer.DispatchCompute(ComputeShader, KernelIndex, dispatchX, dispatchY, 1);
         }
     }
@@ -320,8 +296,6 @@ namespace FidelityFX.FSR2
 
         public void ScheduleDispatch(CommandBuffer commandBuffer, Fsr2.GenerateReactiveDescription dispatchParams, int dispatchX, int dispatchY)
         {
-            commandBuffer.BeginSample(Sampler);
-            
             ref var opaqueOnly = ref dispatchParams.ColorOpaqueOnly;
             ref var color = ref dispatchParams.ColorPreUpscale;
             ref var reactive = ref dispatchParams.OutReactive;
@@ -329,51 +303,7 @@ namespace FidelityFX.FSR2
             commandBuffer.SetComputeTextureParam(ComputeShader, KernelIndex, Fsr2ShaderIDs.SrvOpaqueOnly, opaqueOnly.RenderTarget, opaqueOnly.MipLevel, opaqueOnly.SubElement);
             commandBuffer.SetComputeTextureParam(ComputeShader, KernelIndex, Fsr2ShaderIDs.SrvInputColor, color.RenderTarget, color.MipLevel, color.SubElement);
             commandBuffer.SetComputeTextureParam(ComputeShader, KernelIndex, Fsr2ShaderIDs.UavAutoReactive, reactive.RenderTarget, reactive.MipLevel, reactive.SubElement);
-            
-            commandBuffer.SetComputeConstantBufferParam(ComputeShader, Fsr2ShaderIDs.CbGenReactive, _generateReactiveConstants, 0, Marshal.SizeOf<Fsr2.GenerateReactiveConstants>());
-            
-            commandBuffer.DispatchCompute(ComputeShader, KernelIndex, dispatchX, dispatchY, 1);
-            
-            commandBuffer.EndSample(Sampler);
-        }
-    }
 
-    internal class Fsr2TcrAutogeneratePass : Fsr2Pass
-    {
-        private readonly ComputeBuffer _tcrAutogenerateConstants;
-
-        public Fsr2TcrAutogeneratePass(Fsr2.ContextDescription contextDescription, Fsr2Resources resources, ComputeBuffer constants, ComputeBuffer tcrAutogenerateConstants)
-            : base(contextDescription, resources, constants)
-        {
-            _tcrAutogenerateConstants = tcrAutogenerateConstants;
-            
-            InitComputeShader("Auto-Generate Transparency & Composition Mask", contextDescription.Shaders.tcrAutoGenPass);
-        }
-
-        protected override void DoScheduleDispatch(CommandBuffer commandBuffer, Fsr2.DispatchDescription dispatchParams, int frameIndex, int dispatchX, int dispatchY)
-        {
-            ref var color = ref dispatchParams.Color;
-            ref var motionVectors = ref dispatchParams.MotionVectors;
-            ref var opaqueOnly = ref dispatchParams.ColorOpaqueOnly;
-            ref var reactive = ref dispatchParams.Reactive;
-            ref var tac = ref dispatchParams.TransparencyAndComposition;
-            
-            commandBuffer.SetComputeTextureParam(ComputeShader, KernelIndex, Fsr2ShaderIDs.SrvOpaqueOnly, opaqueOnly.RenderTarget, opaqueOnly.MipLevel, opaqueOnly.SubElement);
-            commandBuffer.SetComputeTextureParam(ComputeShader, KernelIndex, Fsr2ShaderIDs.SrvInputColor, color.RenderTarget, color.MipLevel, color.SubElement);
-            commandBuffer.SetComputeTextureParam(ComputeShader, KernelIndex, Fsr2ShaderIDs.SrvInputMotionVectors, motionVectors.RenderTarget, motionVectors.MipLevel, motionVectors.SubElement);
-            commandBuffer.SetComputeTextureParam(ComputeShader, KernelIndex, Fsr2ShaderIDs.SrvPrevColorPreAlpha, Resources.PrevPreAlpha[frameIndex ^ 1]);
-            commandBuffer.SetComputeTextureParam(ComputeShader, KernelIndex, Fsr2ShaderIDs.SrvPrevColorPostAlpha, Resources.PrevPostAlpha[frameIndex ^ 1]);
-            commandBuffer.SetComputeTextureParam(ComputeShader, KernelIndex, Fsr2ShaderIDs.SrvReactiveMask, reactive.RenderTarget, reactive.MipLevel, reactive.SubElement);
-            commandBuffer.SetComputeTextureParam(ComputeShader, KernelIndex, Fsr2ShaderIDs.SrvTransparencyAndCompositionMask, tac.RenderTarget, tac.MipLevel, tac.SubElement);
-
-            commandBuffer.SetComputeTextureParam(ComputeShader, KernelIndex, Fsr2ShaderIDs.UavAutoReactive, Resources.AutoReactive);
-            commandBuffer.SetComputeTextureParam(ComputeShader, KernelIndex, Fsr2ShaderIDs.UavAutoComposition, Resources.AutoComposition);
-            commandBuffer.SetComputeTextureParam(ComputeShader, KernelIndex, Fsr2ShaderIDs.UavPrevColorPreAlpha, Resources.PrevPreAlpha[frameIndex]);
-            commandBuffer.SetComputeTextureParam(ComputeShader, KernelIndex, Fsr2ShaderIDs.UavPrevColorPostAlpha, Resources.PrevPostAlpha[frameIndex]);
-            
-            commandBuffer.SetComputeConstantBufferParam(ComputeShader, Fsr2ShaderIDs.CbFsr2, Constants, 0, Marshal.SizeOf<Fsr2.UpscalerConstants>());
-            commandBuffer.SetComputeConstantBufferParam(ComputeShader, Fsr2ShaderIDs.CbGenReactive, _tcrAutogenerateConstants, 0, Marshal.SizeOf<Fsr2.GenerateReactiveConstants2>());
-            
             commandBuffer.DispatchCompute(ComputeShader, KernelIndex, dispatchX, dispatchY, 1);
         }
     }

Runtime/FSR2/Fsr2Resources.cs

@@ -38,14 +38,10 @@ namespace FidelityFX.FSR2
         public RenderTexture SpdAtomicCounter;
         public RenderTexture AutoExposure;
         public RenderTexture SceneLuminance;
-        public RenderTexture AutoReactive;
-        public RenderTexture AutoComposition;
         public readonly RenderTexture[] DilatedMotionVectors = new RenderTexture[2];
         public readonly RenderTexture[] LockStatus = new RenderTexture[2];
         public readonly RenderTexture[] InternalUpscaled = new RenderTexture[2];
         public readonly RenderTexture[] LumaHistory = new RenderTexture[2];
-        public readonly RenderTexture[] PrevPreAlpha = new RenderTexture[2];
-        public readonly RenderTexture[] PrevPostAlpha = new RenderTexture[2];
 
         public void Create(Fsr2.ContextDescription contextDescription)
         {
@@ -114,23 +110,6 @@ namespace FidelityFX.FSR2
             // Resources FSR2_LumaHistory1/2: FFX_RESOURCE_USAGE_RENDERTARGET | FFX_RESOURCE_USAGE_UAV, FFX_SURFACE_FORMAT_R8G8B8A8_UNORM, FFX_RESOURCE_FLAGS_NONE
             CreateDoubleBufferedResource(LumaHistory, "FSR2_LumaHistory", contextDescription.DisplaySize, GraphicsFormat.R8G8B8A8_UNorm);
         }
-
-        public void CreateTcrAutogenResources(Fsr2.ContextDescription contextDescription)
-        {
-            // Resource FSR2_AutoReactive: FFX_RESOURCE_USAGE_UAV, FFX_SURFACE_FORMAT_R8_UNORM, FFX_RESOURCE_FLAGS_NONE
-            AutoReactive = new RenderTexture(contextDescription.MaxRenderSize.x, contextDescription.MaxRenderSize.y, 0, GraphicsFormat.R8_UNorm) { name = "FSR2_AutoReactive", enableRandomWrite = true };
-            AutoReactive.Create();
-
-            // Resource FSR2_AutoComposition: FFX_RESOURCE_USAGE_UAV, FFX_SURFACE_FORMAT_R8_UNORM, FFX_RESOURCE_FLAGS_NONE
-            AutoComposition = new RenderTexture(contextDescription.MaxRenderSize.x, contextDescription.MaxRenderSize.y, 0, GraphicsFormat.R8_UNorm) { name = "FSR2_AutoComposition", enableRandomWrite = true };
-            AutoComposition.Create();
-
-            // Resources FSR2_PrevPreAlpha0/1: FFX_RESOURCE_USAGE_UAV, FFX_SURFACE_FORMAT_R11G11B10_FLOAT, FFX_RESOURCE_FLAGS_NONE
-            CreateDoubleBufferedResource(PrevPreAlpha, "FSR2_PrevPreAlpha", contextDescription.MaxRenderSize, GraphicsFormat.B10G11R11_UFloatPack32);
-
-            // Resources FSR2_PrevPostAlpha0/1: FFX_RESOURCE_USAGE_UAV, FFX_SURFACE_FORMAT_R11G11B10_FLOAT, FFX_RESOURCE_FLAGS_NONE
-            CreateDoubleBufferedResource(PrevPostAlpha, "FSR2_PrevPostAlpha", contextDescription.MaxRenderSize, GraphicsFormat.B10G11R11_UFloatPack32);
-        }
         
         // Set up shared aliasable resources, i.e. temporary render textures
         // These do not need to persist between frames, but they do need to be available between passes
@@ -180,8 +159,6 @@ namespace FidelityFX.FSR2
 
         public void Destroy()
         {
-            DestroyTcrAutogenResources();
-            
             DestroyResource(LumaHistory);
             DestroyResource(InternalUpscaled);
             DestroyResource(LockStatus);
@@ -193,14 +170,6 @@ namespace FidelityFX.FSR2
             DestroyResource(ref MaximumBiasLut);
             DestroyResource(ref LanczosLut);
         }
-
-        public void DestroyTcrAutogenResources()
-        {
-            DestroyResource(PrevPostAlpha);
-            DestroyResource(PrevPreAlpha);
-            DestroyResource(ref AutoComposition);
-            DestroyResource(ref AutoReactive);
-        }
         
         private static void DestroyResource(ref Texture2D resource)
         {

Runtime/FSR2/Fsr2ShaderIDs.cs

@@ -47,8 +47,6 @@ namespace FidelityFX.FSR2
         public static readonly int SrvSceneLuminanceMips = Shader.PropertyToID("r_imgMips");
         public static readonly int SrvUpscaleMaximumBiasLut = Shader.PropertyToID("r_upsample_maximum_bias_lut");
         public static readonly int SrvDilatedReactiveMasks = Shader.PropertyToID("r_dilated_reactive_masks");
-        public static readonly int SrvPrevColorPreAlpha = Shader.PropertyToID("r_input_prev_color_pre_alpha");
-        public static readonly int SrvPrevColorPostAlpha = Shader.PropertyToID("r_input_prev_color_post_alpha");
 
         // Unordered access views, i.e. random read/write bindings
         public static readonly int UavReconstructedPrevNearestDepth = Shader.PropertyToID("rw_reconstructed_previous_nearest_depth");
@@ -67,9 +65,6 @@ namespace FidelityFX.FSR2
         public static readonly int UavAutoExposure = Shader.PropertyToID("rw_auto_exposure");
         public static readonly int UavSpdAtomicCount = Shader.PropertyToID("rw_spd_global_atomic");
         public static readonly int UavAutoReactive = Shader.PropertyToID("rw_output_autoreactive");
-        public static readonly int UavAutoComposition = Shader.PropertyToID("rw_output_autocomposition");
-        public static readonly int UavPrevColorPreAlpha = Shader.PropertyToID("rw_output_prev_color_pre_alpha");
-        public static readonly int UavPrevColorPostAlpha = Shader.PropertyToID("rw_output_prev_color_post_alpha");
 
         // Constant buffer bindings
         public static readonly int CbFsr2 = Shader.PropertyToID("cbFSR2");

Runtime/FSR3/Fsr3ShaderIDs.cs

@@ -50,8 +50,6 @@ namespace FidelityFX.FSR3
         public static readonly int SrvCurrentLuma = Shader.PropertyToID("r_current_luma");
         public static readonly int SrvPreviousLuma = Shader.PropertyToID("r_previous_luma");
         public static readonly int SrvLumaInstability = Shader.PropertyToID("r_luma_instability");
-        public static readonly int SrvPrevColorPreAlpha = Shader.PropertyToID("r_input_prev_color_pre_alpha");
-        public static readonly int SrvPrevColorPostAlpha = Shader.PropertyToID("r_input_prev_color_post_alpha");
 
         // Unordered access views, i.e. random read/write bindings
         public static readonly int UavReconstructedPrevNearestDepth = Shader.PropertyToID("rw_reconstructed_previous_nearest_depth");
@@ -78,9 +76,6 @@ namespace FidelityFX.FSR3
         public static readonly int UavSpdMip3 = Shader.PropertyToID("rw_spd_mip3");
         public static readonly int UavSpdMip4 = Shader.PropertyToID("rw_spd_mip4");
         public static readonly int UavSpdMip5 = Shader.PropertyToID("rw_spd_mip5");
-        public static readonly int UavAutoComposition = Shader.PropertyToID("rw_output_autocomposition");
-        public static readonly int UavPrevColorPreAlpha = Shader.PropertyToID("rw_output_prev_color_pre_alpha");
-        public static readonly int UavPrevColorPostAlpha = Shader.PropertyToID("rw_output_prev_color_post_alpha");
 
         // Constant buffer bindings
         public static readonly int CbFsr3Upscaler = Shader.PropertyToID("cbFSR3Upscaler");

Runtime/FSR3/Fsr3Upscaler.cs

@@ -130,7 +130,7 @@ namespace FidelityFX.FSR3
 #if !UNITY_2021_1_OR_NEWER
         internal static void SetBufferData(this CommandBuffer commandBuffer, ComputeBuffer computeBuffer, Array data)
         {
-            commandBuffer.SetComputeBufferData(computeBuffer, data);
+            computeBuffer.SetData(data);
         }
 #endif
         
@@ -201,15 +201,6 @@ namespace FidelityFX.FSR3
             public float CameraFovAngleVertical;
             public float ViewSpaceToMetersFactor;
             public DispatchFlags Flags;
-            public bool UseTextureArrays;   // Enable texture array bindings, primarily used for HDRP and XR
-            
-            // EXPERIMENTAL reactive mask generation parameters
-            public bool EnableAutoReactive;
-            public ResourceView ColorOpaqueOnly;
-            public float AutoTcThreshold = 0.05f;
-            public float AutoTcScale = 1.0f;
-            public float AutoReactiveScale = 5.0f;
-            public float AutoReactiveMax = 0.9f;
         }
 
         /// <summary>
@@ -284,15 +275,6 @@ namespace FidelityFX.FSR3
             public float binaryValue;
             public uint flags;
         }
-
-        [Serializable, StructLayout(LayoutKind.Sequential)]
-        internal struct GenerateReactiveConstants2
-        {
-            public float autoTcThreshold;
-            public float autoTcScale;
-            public float autoReactiveScale;
-            public float autoReactiveMax;
-        }
         
         [Serializable, StructLayout(LayoutKind.Sequential)]
         internal struct RcasConstants

Runtime/FSR3/Fsr3UpscalerContext.cs

@@ -47,7 +47,6 @@ namespace FidelityFX.FSR3
         private Fsr3UpscalerPass _accumulatePass;
         private Fsr3UpscalerPass _sharpenPass;
         private Fsr3UpscalerPass _generateReactivePass;
-        private Fsr3UpscalerPass _tcrAutogeneratePass;
 #if UNITY_EDITOR || DEVELOPMENT_BUILD
         private Fsr3UpscalerPass _debugViewPass;
 #endif
@@ -70,10 +69,6 @@ namespace FidelityFX.FSR3
         private readonly Fsr3Upscaler.GenerateReactiveConstants[] _generateReactiveConstantsArray = { new Fsr3Upscaler.GenerateReactiveConstants() };
         private ref Fsr3Upscaler.GenerateReactiveConstants GenReactiveConsts => ref _generateReactiveConstantsArray[0];
 
-        private ComputeBuffer _tcrAutogenerateConstantsBuffer;
-        private readonly Fsr3Upscaler.GenerateReactiveConstants2[] _tcrAutogenerateConstantsArray = { new Fsr3Upscaler.GenerateReactiveConstants2() };
-        private ref Fsr3Upscaler.GenerateReactiveConstants2 TcrAutoGenConsts => ref _tcrAutogenerateConstantsArray[0];
-
         private bool _firstExecution;
         private int _resourceFrameIndex;
         private Vector2 _previousJitterOffset;
@@ -89,7 +84,6 @@ namespace FidelityFX.FSR3
             _spdConstantsBuffer = CreateConstantBuffer<Fsr3Upscaler.SpdConstants>();
             _rcasConstantsBuffer = CreateConstantBuffer<Fsr3Upscaler.RcasConstants>();
             _generateReactiveConstantsBuffer = CreateConstantBuffer<Fsr3Upscaler.GenerateReactiveConstants>();
-            _tcrAutogenerateConstantsBuffer = CreateConstantBuffer<Fsr3Upscaler.GenerateReactiveConstants2>();
 
             // Set defaults
             _firstExecution = true;
@@ -112,7 +106,6 @@ namespace FidelityFX.FSR3
             _accumulatePass = new Fsr3UpscalerAccumulatePass(_contextDescription, _resources, _upscalerConstantsBuffer);
             _sharpenPass = new Fsr3UpscalerSharpenPass(_contextDescription, _resources, _upscalerConstantsBuffer, _rcasConstantsBuffer);
             _generateReactivePass = new Fsr3UpscalerGenerateReactivePass(_contextDescription, _resources, _generateReactiveConstantsBuffer);
-            _tcrAutogeneratePass = new Fsr3UpscalerTcrAutogeneratePass(_contextDescription, _resources, _upscalerConstantsBuffer, _tcrAutogenerateConstantsBuffer);
 #if UNITY_EDITOR || DEVELOPMENT_BUILD
             _debugViewPass = new Fsr3UpscalerDebugViewPass(_contextDescription, _resources, _upscalerConstantsBuffer);
 #endif
@@ -123,7 +116,6 @@ namespace FidelityFX.FSR3
 #if UNITY_EDITOR || DEVELOPMENT_BUILD
             DestroyPass(ref _debugViewPass);
 #endif
-            DestroyPass(ref _tcrAutogeneratePass);
             DestroyPass(ref _generateReactivePass);
             DestroyPass(ref _lumaPyramidPass);
             DestroyPass(ref _sharpenPass);
@@ -136,7 +128,6 @@ namespace FidelityFX.FSR3
             
             _resources.Destroy();
             
-            DestroyConstantBuffer(ref _tcrAutogenerateConstantsBuffer);
             DestroyConstantBuffer(ref _generateReactiveConstantsBuffer);
             DestroyConstantBuffer(ref _rcasConstantsBuffer);
             DestroyConstantBuffer(ref _spdConstantsBuffer);
@@ -163,9 +154,6 @@ namespace FidelityFX.FSR3
                 DebugCheckDispatch(dispatchParams);
             }
 
-            if (dispatchParams.UseTextureArrays)
-                commandBuffer.EnableShaderKeyword("UNITY_FSR_TEXTURE2D_X_ARRAY");
-            
             if (_firstExecution)
             {
                 commandBuffer.SetRenderTarget(_resources.Accumulation[0]);
@@ -187,24 +175,6 @@ namespace FidelityFX.FSR3
                 dispatchParams.Exposure = new ResourceView(_resources.FrameInfo);
             else if (!dispatchParams.Exposure.IsValid) 
                 dispatchParams.Exposure = new ResourceView(_resources.DefaultExposure);
-
-            if (dispatchParams.EnableAutoReactive)
-            {
-                // Create the auto-TCR resources only when we need them
-                if (_resources.AutoReactive == null)
-                    _resources.CreateTcrAutogenResources(_contextDescription);
-
-                if (resetAccumulation)
-                {
-                    RenderTargetIdentifier opaqueOnly = dispatchParams.ColorOpaqueOnly.IsValid ? dispatchParams.ColorOpaqueOnly.RenderTarget : Fsr3ShaderIDs.SrvOpaqueOnly;
-                    commandBuffer.Blit(_resources.PrevPreAlpha[frameIndex ^ 1], opaqueOnly);
-                }
-            }
-            else if (_resources.AutoReactive != null)
-            {
-                // Destroy the auto-TCR resources if we don't use the feature 
-                _resources.DestroyTcrAutogenResources();
-            }
             
             if (!dispatchParams.Reactive.IsValid) dispatchParams.Reactive = new ResourceView(_resources.DefaultReactive);
             if (!dispatchParams.TransparencyAndComposition.IsValid) dispatchParams.TransparencyAndComposition = new ResourceView(_resources.DefaultReactive);
@@ -251,13 +221,8 @@ namespace FidelityFX.FSR3
             commandBuffer.SetBufferData(_upscalerConstantsBuffer, _upscalerConstantsArray);
             commandBuffer.SetBufferData(_spdConstantsBuffer, _spdConstantsArray);
 
-            // Auto reactive
-            if (dispatchParams.EnableAutoReactive)
-            {
-                GenerateTransparencyCompositionReactive(dispatchParams, commandBuffer, frameIndex);
-                dispatchParams.Reactive = new ResourceView(_resources.AutoReactive);
-                dispatchParams.TransparencyAndComposition = new ResourceView(_resources.AutoComposition);
-            }
+            commandBuffer.SetGlobalConstantBuffer(_upscalerConstantsBuffer, Fsr3ShaderIDs.CbFsr3Upscaler, 0, Marshal.SizeOf<Fsr3Upscaler.UpscalerConstants>());
+            commandBuffer.SetGlobalConstantBuffer(_spdConstantsBuffer, Fsr3ShaderIDs.CbSpd, 0, Marshal.SizeOf<Fsr3Upscaler.SpdConstants>());
             
             _prepareInputsPass.ScheduleDispatch(commandBuffer, dispatchParams, frameIndex, dispatchSrcX, dispatchSrcY);
             _lumaPyramidPass.ScheduleDispatch(commandBuffer, dispatchParams, frameIndex, dispatchThreadGroupCount.x, dispatchThreadGroupCount.y);
@@ -274,6 +239,8 @@ namespace FidelityFX.FSR3
                 SetupRcasConstants(dispatchParams);
                 commandBuffer.SetBufferData(_rcasConstantsBuffer, _rcasConstantsArray);
                 
+                commandBuffer.SetGlobalConstantBuffer(_rcasConstantsBuffer, Fsr3ShaderIDs.CbRcas, 0, Marshal.SizeOf<Fsr3Upscaler.RcasConstants>());
+                
                 // Dispatch RCAS
                 const int threadGroupWorkRegionDimRcas = 16;
                 int threadGroupsX = (UpscalerConsts.upscaleSize.x + threadGroupWorkRegionDimRcas - 1) / threadGroupWorkRegionDimRcas;
@@ -291,8 +258,6 @@ namespace FidelityFX.FSR3
             _resourceFrameIndex = (_resourceFrameIndex + 1) % MaxQueuedFrames;
 
             Fsr3UpscalerResources.DestroyAliasableResources(commandBuffer);
-            
-            commandBuffer.DisableShaderKeyword("UNITY_FSR_TEXTURE2D_X_ARRAY");
         }
 
         public void GenerateReactiveMask(Fsr3Upscaler.GenerateReactiveDescription dispatchParams)
@@ -314,22 +279,9 @@ namespace FidelityFX.FSR3
             GenReactiveConsts.flags = (uint)dispatchParams.Flags;
             commandBuffer.SetBufferData(_generateReactiveConstantsBuffer, _generateReactiveConstantsArray);
             
-            ((Fsr3UpscalerGenerateReactivePass)_generateReactivePass).ScheduleDispatch(commandBuffer, dispatchParams, dispatchSrcX, dispatchSrcY);
-        }
-
-        private void GenerateTransparencyCompositionReactive(Fsr3Upscaler.DispatchDescription dispatchParams, CommandBuffer commandBuffer, int frameIndex)
-        {
-            const int threadGroupWorkRegionDim = 8;
-            int dispatchSrcX = (dispatchParams.RenderSize.x + (threadGroupWorkRegionDim - 1)) / threadGroupWorkRegionDim;
-            int dispatchSrcY = (dispatchParams.RenderSize.y + (threadGroupWorkRegionDim - 1)) / threadGroupWorkRegionDim;
-
-            TcrAutoGenConsts.autoTcThreshold = dispatchParams.AutoTcThreshold;
-            TcrAutoGenConsts.autoTcScale = dispatchParams.AutoTcScale;
-            TcrAutoGenConsts.autoReactiveScale = dispatchParams.AutoReactiveScale;
-            TcrAutoGenConsts.autoReactiveMax = dispatchParams.AutoReactiveMax;
-            commandBuffer.SetBufferData(_tcrAutogenerateConstantsBuffer, _tcrAutogenerateConstantsArray);
+            commandBuffer.SetGlobalConstantBuffer(_generateReactiveConstantsBuffer, Fsr3ShaderIDs.CbGenReactive, 0, Marshal.SizeOf<Fsr3Upscaler.GenerateReactiveConstants>());
             
-            _tcrAutogeneratePass.ScheduleDispatch(commandBuffer, dispatchParams, frameIndex, dispatchSrcX, dispatchSrcY);
+            ((Fsr3UpscalerGenerateReactivePass)_generateReactivePass).ScheduleDispatch(commandBuffer, dispatchParams, dispatchSrcX, dispatchSrcY);
         }
 
         private void SetupConstants(Fsr3Upscaler.DispatchDescription dispatchParams, bool resetAccumulation)

Runtime/FSR3/Fsr3UpscalerPass.cs

@@ -39,8 +39,6 @@ namespace FidelityFX.FSR3
         
         protected ComputeShader ComputeShader;
         protected int KernelIndex;
-
-        protected CustomSampler Sampler;
         
         protected Fsr3UpscalerPass(Fsr3Upscaler.ContextDescription contextDescription, Fsr3UpscalerResources resources, ComputeBuffer constants)
         {
@@ -55,9 +53,7 @@ namespace FidelityFX.FSR3
 
         public void ScheduleDispatch(CommandBuffer commandBuffer, Fsr3Upscaler.DispatchDescription dispatchParams, int frameIndex, int dispatchX, int dispatchY)
         {
-            commandBuffer.BeginSample(Sampler);
             DoScheduleDispatch(commandBuffer, dispatchParams, frameIndex, dispatchX, dispatchY);
-            commandBuffer.EndSample(Sampler);
         }
 
         protected abstract void DoScheduleDispatch(CommandBuffer commandBuffer, Fsr3Upscaler.DispatchDescription dispatchParams, int frameIndex, int dispatchX, int dispatchY);
@@ -76,23 +72,6 @@ namespace FidelityFX.FSR3
 
             ComputeShader = shader;
             KernelIndex = ComputeShader.FindKernel("CS");
-            Sampler = CustomSampler.Create(passName);
-
-            bool useLut = false;
-#if UNITY_2022_1_OR_NEWER   // This will also work in 2020.3.43+ and 2021.3.14+ 
-            if (SystemInfo.computeSubGroupSize == 64)
-            {
-                useLut = true;
-            }
-#endif
-            
-            // This matches the permutation rules from the CreatePipeline* functions
-            if ((flags & Fsr3Upscaler.InitializationFlags.EnableHighDynamicRange) != 0) ComputeShader.EnableKeyword("FFX_FSR3UPSCALER_OPTION_HDR_COLOR_INPUT");
-            if ((flags & Fsr3Upscaler.InitializationFlags.EnableDisplayResolutionMotionVectors) == 0) ComputeShader.EnableKeyword("FFX_FSR3UPSCALER_OPTION_LOW_RESOLUTION_MOTION_VECTORS");
-            if ((flags & Fsr3Upscaler.InitializationFlags.EnableMotionVectorsJitterCancellation) != 0) ComputeShader.EnableKeyword("FFX_FSR3UPSCALER_OPTION_JITTERED_MOTION_VECTORS");
-            if ((flags & Fsr3Upscaler.InitializationFlags.EnableDepthInverted) != 0) ComputeShader.EnableKeyword("FFX_FSR3UPSCALER_OPTION_INVERTED_DEPTH");
-            if (useLut) ComputeShader.EnableKeyword("FFX_FSR3UPSCALER_OPTION_REPROJECT_USE_LANCZOS_TYPE");
-            if ((flags & Fsr3Upscaler.InitializationFlags.EnableFP16Usage) != 0) ComputeShader.EnableKeyword("FFX_HALF");
         }
     }
     
@@ -120,8 +99,6 @@ namespace FidelityFX.FSR3
             commandBuffer.SetComputeTextureParam(ComputeShader, KernelIndex, Fsr3ShaderIDs.UavFarthestDepth, Fsr3ShaderIDs.UavIntermediate);
             commandBuffer.SetComputeTextureParam(ComputeShader, KernelIndex, Fsr3ShaderIDs.UavCurrentLuma, Resources.Luma[frameIndex]);
             
-            commandBuffer.SetComputeConstantBufferParam(ComputeShader, Fsr3ShaderIDs.CbFsr3Upscaler, Constants, 0, Marshal.SizeOf<Fsr3Upscaler.UpscalerConstants>());
-            
             commandBuffer.DispatchCompute(ComputeShader, KernelIndex, dispatchX, dispatchY, 1);
         }
     }
@@ -151,10 +128,8 @@ namespace FidelityFX.FSR3
             commandBuffer.SetComputeTextureParam(ComputeShader, KernelIndex, Fsr3ShaderIDs.UavSpdMip3, Resources.SpdMips, 3);
             commandBuffer.SetComputeTextureParam(ComputeShader, KernelIndex, Fsr3ShaderIDs.UavSpdMip4, Resources.SpdMips, 4);
             commandBuffer.SetComputeTextureParam(ComputeShader, KernelIndex, Fsr3ShaderIDs.UavSpdMip5, Resources.SpdMips, 5);
+            commandBuffer.SetComputeTextureParam(ComputeShader, KernelIndex, Fsr3ShaderIDs.UavFarthestDepthMip1, Fsr3ShaderIDs.UavFarthestDepthMip1);
 
-            commandBuffer.SetComputeConstantBufferParam(ComputeShader, Fsr3ShaderIDs.CbFsr3Upscaler, Constants, 0, Marshal.SizeOf<Fsr3Upscaler.UpscalerConstants>());
-            commandBuffer.SetComputeConstantBufferParam(ComputeShader, Fsr3ShaderIDs.CbSpd, _spdConstants, 0, Marshal.SizeOf<Fsr3Upscaler.SpdConstants>());
-            
             commandBuffer.DispatchCompute(ComputeShader, KernelIndex, dispatchX, dispatchY, 1);
         }
     }
@@ -187,9 +162,7 @@ namespace FidelityFX.FSR3
             commandBuffer.SetComputeTextureParam(ComputeShader, KernelIndex, Fsr3ShaderIDs.UavSpdMip3, Resources.SpdMips, 3);
             commandBuffer.SetComputeTextureParam(ComputeShader, KernelIndex, Fsr3ShaderIDs.UavSpdMip4, Resources.SpdMips, 4);
             commandBuffer.SetComputeTextureParam(ComputeShader, KernelIndex, Fsr3ShaderIDs.UavSpdMip5, Resources.SpdMips, 5);
-            
-            commandBuffer.SetComputeConstantBufferParam(ComputeShader, Fsr3ShaderIDs.CbFsr3Upscaler, Constants, 0, Marshal.SizeOf<Fsr3Upscaler.UpscalerConstants>());
-            commandBuffer.SetComputeConstantBufferParam(ComputeShader, Fsr3ShaderIDs.CbSpd, _spdConstants, 0, Marshal.SizeOf<Fsr3Upscaler.SpdConstants>());
+            commandBuffer.SetComputeTextureParam(ComputeShader, KernelIndex, Fsr3ShaderIDs.UavShadingChange, Fsr3ShaderIDs.UavShadingChange);
             
             commandBuffer.DispatchCompute(ComputeShader, KernelIndex, dispatchX, dispatchY, 1);
         }
@@ -206,8 +179,8 @@ namespace FidelityFX.FSR3
         protected override void DoScheduleDispatch(CommandBuffer commandBuffer, Fsr3Upscaler.DispatchDescription dispatchParams, int frameIndex, int dispatchX, int dispatchY)
         {
             commandBuffer.SetComputeTextureParam(ComputeShader, KernelIndex, Fsr3ShaderIDs.SrvSpdMips, Resources.SpdMips);
-            
-            commandBuffer.SetComputeConstantBufferParam(ComputeShader, Fsr3ShaderIDs.CbFsr3Upscaler, Constants, 0, Marshal.SizeOf<Fsr3Upscaler.UpscalerConstants>());
+
+            commandBuffer.SetComputeTextureParam(ComputeShader, KernelIndex, Fsr3ShaderIDs.UavShadingChange, Fsr3ShaderIDs.UavShadingChange);
             
             commandBuffer.DispatchCompute(ComputeShader, KernelIndex, dispatchX, dispatchY, 1);
         }
@@ -237,10 +210,10 @@ namespace FidelityFX.FSR3
             commandBuffer.SetComputeTextureParam(ComputeShader, KernelIndex, Fsr3ShaderIDs.SrvCurrentLuma, Resources.Luma[frameIndex]);
             commandBuffer.SetComputeTextureParam(ComputeShader, KernelIndex, Fsr3ShaderIDs.SrvInputExposure, exposure.RenderTarget, exposure.MipLevel, exposure.SubElement);
 
+            commandBuffer.SetComputeTextureParam(ComputeShader, KernelIndex, Fsr3ShaderIDs.UavDilatedReactiveMasks, Fsr3ShaderIDs.UavDilatedReactiveMasks);
+            commandBuffer.SetComputeTextureParam(ComputeShader, KernelIndex, Fsr3ShaderIDs.UavNewLocks, Fsr3ShaderIDs.UavNewLocks);
             commandBuffer.SetComputeTextureParam(ComputeShader, KernelIndex, Fsr3ShaderIDs.UavAccumulation, Resources.Accumulation[frameIndex]); 
 
-            commandBuffer.SetComputeConstantBufferParam(ComputeShader, Fsr3ShaderIDs.CbFsr3Upscaler, Constants, 0, Marshal.SizeOf<Fsr3Upscaler.UpscalerConstants>());
-            
             commandBuffer.DispatchCompute(ComputeShader, KernelIndex, dispatchX, dispatchY, 1);
         }
     }
@@ -268,8 +241,6 @@ namespace FidelityFX.FSR3
             commandBuffer.SetComputeTextureParam(ComputeShader, KernelIndex, Fsr3ShaderIDs.UavLumaHistory, Resources.LumaHistory[frameIndex]);
             commandBuffer.SetComputeTextureParam(ComputeShader, KernelIndex, Fsr3ShaderIDs.UavLumaInstability, Fsr3ShaderIDs.UavIntermediate);
             
-            commandBuffer.SetComputeConstantBufferParam(ComputeShader, Fsr3ShaderIDs.CbFsr3Upscaler, Constants, 0, Marshal.SizeOf<Fsr3Upscaler.UpscalerConstants>());
-            
             commandBuffer.DispatchCompute(ComputeShader, KernelIndex, dispatchX, dispatchY, 1);
         }
     }
@@ -328,12 +299,11 @@ namespace FidelityFX.FSR3
             commandBuffer.SetComputeTextureParam(ComputeShader, KernelIndex, Fsr3ShaderIDs.SrvCurrentLuma, Resources.Luma[frameIndex]);
             commandBuffer.SetComputeTextureParam(ComputeShader, KernelIndex, Fsr3ShaderIDs.SrvLumaInstability, Fsr3ShaderIDs.UavIntermediate);
             commandBuffer.SetComputeTextureParam(ComputeShader, KernelIndex, Fsr3ShaderIDs.SrvInputColor, color.RenderTarget, color.MipLevel, color.SubElement);
-            
+
+            commandBuffer.SetComputeTextureParam(ComputeShader, KernelIndex, Fsr3ShaderIDs.UavNewLocks, Fsr3ShaderIDs.UavNewLocks);
             commandBuffer.SetComputeTextureParam(ComputeShader, KernelIndex, Fsr3ShaderIDs.UavInternalUpscaled, Resources.InternalUpscaled[frameIndex]);
             commandBuffer.SetComputeTextureParam(ComputeShader, KernelIndex, Fsr3ShaderIDs.UavUpscaledOutput, output.RenderTarget, output.MipLevel, output.SubElement);
 
-            commandBuffer.SetComputeConstantBufferParam(ComputeShader, Fsr3ShaderIDs.CbFsr3Upscaler, Constants, 0, Marshal.SizeOf<Fsr3Upscaler.UpscalerConstants>());
-            
             commandBuffer.DispatchCompute(ComputeShader, KernelIndex, dispatchX, dispatchY, 1);
         }
     }
@@ -359,9 +329,6 @@ namespace FidelityFX.FSR3
             ref var output = ref dispatchParams.Output;
             commandBuffer.SetComputeTextureParam(ComputeShader, KernelIndex, Fsr3ShaderIDs.UavUpscaledOutput, output.RenderTarget, output.MipLevel, output.SubElement);
 
-            commandBuffer.SetComputeConstantBufferParam(ComputeShader, Fsr3ShaderIDs.CbFsr3Upscaler, Constants, 0, Marshal.SizeOf<Fsr3Upscaler.UpscalerConstants>());
-            commandBuffer.SetComputeConstantBufferParam(ComputeShader, Fsr3ShaderIDs.CbRcas, _rcasConstants, 0, Marshal.SizeOf<Fsr3Upscaler.RcasConstants>());
-
             commandBuffer.DispatchCompute(ComputeShader, KernelIndex, dispatchX, dispatchY, 1);
         }
     }
@@ -384,8 +351,6 @@ namespace FidelityFX.FSR3
 
         public void ScheduleDispatch(CommandBuffer commandBuffer, Fsr3Upscaler.GenerateReactiveDescription dispatchParams, int dispatchX, int dispatchY)
         {
-            commandBuffer.BeginSample(Sampler);
-            
             ref var opaqueOnly = ref dispatchParams.ColorOpaqueOnly;
             ref var color = ref dispatchParams.ColorPreUpscale;
             ref var reactive = ref dispatchParams.OutReactive;
@@ -394,50 +359,6 @@ namespace FidelityFX.FSR3
             commandBuffer.SetComputeTextureParam(ComputeShader, KernelIndex, Fsr3ShaderIDs.SrvInputColor, color.RenderTarget, color.MipLevel, color.SubElement);
             commandBuffer.SetComputeTextureParam(ComputeShader, KernelIndex, Fsr3ShaderIDs.UavAutoReactive, reactive.RenderTarget, reactive.MipLevel, reactive.SubElement);
             
-            commandBuffer.SetComputeConstantBufferParam(ComputeShader, Fsr3ShaderIDs.CbGenReactive, _generateReactiveConstants, 0, Marshal.SizeOf<Fsr3Upscaler.GenerateReactiveConstants>());
-            
-            commandBuffer.DispatchCompute(ComputeShader, KernelIndex, dispatchX, dispatchY, 1);
-            
-            commandBuffer.EndSample(Sampler);
-        }
-    }
-
-    internal class Fsr3UpscalerTcrAutogeneratePass : Fsr3UpscalerPass
-    {
-        private readonly ComputeBuffer _tcrAutogenerateConstants;
-
-        public Fsr3UpscalerTcrAutogeneratePass(Fsr3Upscaler.ContextDescription contextDescription, Fsr3UpscalerResources resources, ComputeBuffer constants, ComputeBuffer tcrAutogenerateConstants)
-            : base(contextDescription, resources, constants)
-        {
-            _tcrAutogenerateConstants = tcrAutogenerateConstants;
-            
-            InitComputeShader("Auto-Generate Transparency & Composition Mask", contextDescription.Shaders.tcrAutoGenPass);
-        }
-
-        protected override void DoScheduleDispatch(CommandBuffer commandBuffer, Fsr3Upscaler.DispatchDescription dispatchParams, int frameIndex, int dispatchX, int dispatchY)
-        {
-            ref var color = ref dispatchParams.Color;
-            ref var motionVectors = ref dispatchParams.MotionVectors;
-            ref var opaqueOnly = ref dispatchParams.ColorOpaqueOnly;
-            ref var reactive = ref dispatchParams.Reactive;
-            ref var tac = ref dispatchParams.TransparencyAndComposition;
-            
-            commandBuffer.SetComputeTextureParam(ComputeShader, KernelIndex, Fsr3ShaderIDs.SrvOpaqueOnly, opaqueOnly.RenderTarget, opaqueOnly.MipLevel, opaqueOnly.SubElement);
-            commandBuffer.SetComputeTextureParam(ComputeShader, KernelIndex, Fsr3ShaderIDs.SrvInputColor, color.RenderTarget, color.MipLevel, color.SubElement);
-            commandBuffer.SetComputeTextureParam(ComputeShader, KernelIndex, Fsr3ShaderIDs.SrvInputMotionVectors, motionVectors.RenderTarget, motionVectors.MipLevel, motionVectors.SubElement);
-            commandBuffer.SetComputeTextureParam(ComputeShader, KernelIndex, Fsr3ShaderIDs.SrvPrevColorPreAlpha, Resources.PrevPreAlpha[frameIndex ^ 1]);
-            commandBuffer.SetComputeTextureParam(ComputeShader, KernelIndex, Fsr3ShaderIDs.SrvPrevColorPostAlpha, Resources.PrevPostAlpha[frameIndex ^ 1]);
-            commandBuffer.SetComputeTextureParam(ComputeShader, KernelIndex, Fsr3ShaderIDs.SrvReactiveMask, reactive.RenderTarget, reactive.MipLevel, reactive.SubElement);
-            commandBuffer.SetComputeTextureParam(ComputeShader, KernelIndex, Fsr3ShaderIDs.SrvTransparencyAndCompositionMask, tac.RenderTarget, tac.MipLevel, tac.SubElement);
-
-            commandBuffer.SetComputeTextureParam(ComputeShader, KernelIndex, Fsr3ShaderIDs.UavAutoReactive, Resources.AutoReactive);
-            commandBuffer.SetComputeTextureParam(ComputeShader, KernelIndex, Fsr3ShaderIDs.UavAutoComposition, Resources.AutoComposition);
-            commandBuffer.SetComputeTextureParam(ComputeShader, KernelIndex, Fsr3ShaderIDs.UavPrevColorPreAlpha, Resources.PrevPreAlpha[frameIndex]);
-            commandBuffer.SetComputeTextureParam(ComputeShader, KernelIndex, Fsr3ShaderIDs.UavPrevColorPostAlpha, Resources.PrevPostAlpha[frameIndex]);
-            
-            commandBuffer.SetComputeConstantBufferParam(ComputeShader, Fsr3ShaderIDs.CbFsr3Upscaler, Constants, 0, Marshal.SizeOf<Fsr3Upscaler.UpscalerConstants>());
-            commandBuffer.SetComputeConstantBufferParam(ComputeShader, Fsr3ShaderIDs.CbGenReactive, _tcrAutogenerateConstants, 0, Marshal.SizeOf<Fsr3Upscaler.GenerateReactiveConstants2>());
-            
             commandBuffer.DispatchCompute(ComputeShader, KernelIndex, dispatchX, dispatchY, 1);
         }
     }
@@ -463,8 +384,6 @@ namespace FidelityFX.FSR3
             ref var output = ref dispatchParams.Output;
             commandBuffer.SetComputeTextureParam(ComputeShader, KernelIndex, Fsr3ShaderIDs.UavUpscaledOutput, output.RenderTarget, output.MipLevel, output.SubElement);
             
-            commandBuffer.SetComputeConstantBufferParam(ComputeShader, Fsr3ShaderIDs.CbFsr3Upscaler, Constants, 0, Marshal.SizeOf<Fsr3Upscaler.UpscalerConstants>());
-            
             commandBuffer.DispatchCompute(ComputeShader, KernelIndex, dispatchX, dispatchY, 1);
         }
     }

Runtime/FSR3/Fsr3UpscalerResources.cs

@@ -41,15 +41,11 @@ namespace FidelityFX.FSR3
         public RenderTexture DilatedDepth;
         public RenderTexture ReconstructedPrevNearestDepth;
         public RenderTexture FrameInfo;
-        public RenderTexture AutoReactive;
-        public RenderTexture AutoComposition;
         
         public readonly RenderTexture[] Accumulation = new RenderTexture[2];
         public readonly RenderTexture[] Luma = new RenderTexture[2];
         public readonly RenderTexture[] InternalUpscaled = new RenderTexture[2];
         public readonly RenderTexture[] LumaHistory = new RenderTexture[2];
-        public readonly RenderTexture[] PrevPreAlpha = new RenderTexture[2];
-        public readonly RenderTexture[] PrevPostAlpha = new RenderTexture[2];
 
         public void Create(Fsr3Upscaler.ContextDescription contextDescription)
         {
@@ -121,23 +117,6 @@ namespace FidelityFX.FSR3
             // Resources FSR3UPSCALER_LumaHistory1/2: FFX_RESOURCE_USAGE_RENDERTARGET | FFX_RESOURCE_USAGE_UAV, FFX_SURFACE_FORMAT_R16G16B16A16_FLOAT, FFX_RESOURCE_FLAGS_NONE
             CreateDoubleBufferedResource(LumaHistory, "FSR3UPSCALER_LumaHistory", maxRenderSize, GraphicsFormat.R16G16B16A16_SFloat);
         }
-
-        public void CreateTcrAutogenResources(Fsr3Upscaler.ContextDescription contextDescription)
-        {
-            // Resource FSR3UPSCALER_AutoReactive: FFX_RESOURCE_USAGE_UAV, FFX_SURFACE_FORMAT_R8_UNORM, FFX_RESOURCE_FLAGS_NONE
-            AutoReactive = new RenderTexture(contextDescription.MaxRenderSize.x, contextDescription.MaxRenderSize.y, 0, GraphicsFormat.R8_UNorm) { name = "FSR3UPSCALER_AutoReactive", enableRandomWrite = true };
-            AutoReactive.Create();
-
-            // Resource FSR3UPSCALER_AutoComposition: FFX_RESOURCE_USAGE_UAV, FFX_SURFACE_FORMAT_R8_UNORM, FFX_RESOURCE_FLAGS_NONE
-            AutoComposition = new RenderTexture(contextDescription.MaxRenderSize.x, contextDescription.MaxRenderSize.y, 0, GraphicsFormat.R8_UNorm) { name = "FSR3UPSCALER_AutoComposition", enableRandomWrite = true };
-            AutoComposition.Create();
-
-            // Resources FSR3UPSCALER_PrevPreAlpha0/1: FFX_RESOURCE_USAGE_UAV, FFX_SURFACE_FORMAT_R11G11B10_FLOAT, FFX_RESOURCE_FLAGS_NONE
-            CreateDoubleBufferedResource(PrevPreAlpha, "FSR3UPSCALER_PrevPreAlpha", contextDescription.MaxRenderSize, GraphicsFormat.B10G11R11_UFloatPack32);
-
-            // Resources FSR3UPSCALER_PrevPostAlpha0/1: FFX_RESOURCE_USAGE_UAV, FFX_SURFACE_FORMAT_R11G11B10_FLOAT, FFX_RESOURCE_FLAGS_NONE
-            CreateDoubleBufferedResource(PrevPostAlpha, "FSR3UPSCALER_PrevPostAlpha", contextDescription.MaxRenderSize, GraphicsFormat.B10G11R11_UFloatPack32);
-        }
         
         // Set up shared aliasable resources, i.e. temporary render textures
         // These do not need to persist between frames, but they do need to be available between passes
@@ -184,8 +163,6 @@ namespace FidelityFX.FSR3
 
         public void Destroy()
         {
-            DestroyTcrAutogenResources();
-            
             DestroyResource(LumaHistory);
             DestroyResource(InternalUpscaled);
             DestroyResource(Luma);
@@ -202,14 +179,6 @@ namespace FidelityFX.FSR3
             DestroyResource(ref DefaultExposure);
             DestroyResource(ref LanczosLut);
         }
-
-        public void DestroyTcrAutogenResources()
-        {
-            DestroyResource(PrevPostAlpha);
-            DestroyResource(PrevPreAlpha);
-            DestroyResource(ref AutoComposition);
-            DestroyResource(ref AutoReactive);
-        }
         
         private static void DestroyResource(ref Texture2D resource)
         {

Shaders/ffx_fsr2_accumulate_pass.compute

@@ -20,15 +20,10 @@
 
 #pragma kernel CS
 
-#pragma multi_compile_local __ FFX_HALF
-#pragma multi_compile_local __ FFX_FSR2_OPTION_REPROJECT_USE_LANCZOS_TYPE
-#pragma multi_compile_local __ FFX_FSR2_OPTION_HDR_COLOR_INPUT
-#pragma multi_compile_local __ FFX_FSR2_OPTION_LOW_RESOLUTION_MOTION_VECTORS
-#pragma multi_compile_local __ FFX_FSR2_OPTION_JITTERED_MOTION_VECTORS
-#pragma multi_compile_local __ FFX_FSR2_OPTION_INVERTED_DEPTH
-#pragma multi_compile_local __ FFX_FSR2_OPTION_APPLY_SHARPENING
-
-#pragma multi_compile __ UNITY_FSR_TEXTURE2D_X_ARRAY
+#define FFX_FSR2_OPTION_HDR_COLOR_INPUT                 1
+#define FFX_FSR2_OPTION_LOW_RESOLUTION_MOTION_VECTORS   1
+#define FFX_FSR2_OPTION_INVERTED_DEPTH                  1
+#define FFX_FSR2_OPTION_APPLY_SHARPENING                1
 
 #include "ffx_fsr_unity_common.cginc"
 

Shaders/ffx_fsr2_autogen_reactive_pass.compute

@@ -20,12 +20,9 @@
 
 #pragma kernel CS
 
-#pragma multi_compile_local __ FFX_HALF
-#pragma multi_compile_local __ FFX_FSR2_OPTION_LOW_RESOLUTION_MOTION_VECTORS
-#pragma multi_compile_local __ FFX_FSR2_OPTION_JITTERED_MOTION_VECTORS
-#pragma multi_compile_local __ FFX_FSR2_OPTION_INVERTED_DEPTH
-
-#pragma multi_compile __ UNITY_FSR_TEXTURE2D_X_ARRAY
+#define FFX_FSR2_OPTION_HDR_COLOR_INPUT                 1
+#define FFX_FSR2_OPTION_LOW_RESOLUTION_MOTION_VECTORS   1
+#define FFX_FSR2_OPTION_INVERTED_DEPTH                  1
 
 #include "ffx_fsr_unity_common.cginc"
 

Shaders/ffx_fsr2_compute_luminance_pyramid_pass.compute

@@ -20,12 +20,9 @@
 
 #pragma kernel CS
 
-#pragma multi_compile_local __ FFX_HALF
-#pragma multi_compile_local __ FFX_FSR2_OPTION_LOW_RESOLUTION_MOTION_VECTORS
-#pragma multi_compile_local __ FFX_FSR2_OPTION_JITTERED_MOTION_VECTORS
-#pragma multi_compile_local __ FFX_FSR2_OPTION_INVERTED_DEPTH
-
-#pragma multi_compile __ UNITY_FSR_TEXTURE2D_X_ARRAY
+#define FFX_FSR2_OPTION_HDR_COLOR_INPUT                 1
+#define FFX_FSR2_OPTION_LOW_RESOLUTION_MOTION_VECTORS   1
+#define FFX_FSR2_OPTION_INVERTED_DEPTH                  1
 
 #include "ffx_fsr_unity_common.cginc"
 

Shaders/ffx_fsr2_depth_clip_pass.compute

@@ -20,12 +20,9 @@
 
 #pragma kernel CS
 
-#pragma multi_compile_local __ FFX_HALF
-#pragma multi_compile_local __ FFX_FSR2_OPTION_LOW_RESOLUTION_MOTION_VECTORS
-#pragma multi_compile_local __ FFX_FSR2_OPTION_JITTERED_MOTION_VECTORS
-#pragma multi_compile_local __ FFX_FSR2_OPTION_INVERTED_DEPTH
-
-#pragma multi_compile __ UNITY_FSR_TEXTURE2D_X_ARRAY
+#define FFX_FSR2_OPTION_HDR_COLOR_INPUT                 1
+#define FFX_FSR2_OPTION_LOW_RESOLUTION_MOTION_VECTORS   1
+#define FFX_FSR2_OPTION_INVERTED_DEPTH                  1
 
 #include "ffx_fsr_unity_common.cginc"
 

Shaders/ffx_fsr2_lock_pass.compute

@@ -20,12 +20,9 @@
 
 #pragma kernel CS
 
-#pragma multi_compile_local __ FFX_HALF
-#pragma multi_compile_local __ FFX_FSR2_OPTION_LOW_RESOLUTION_MOTION_VECTORS
-#pragma multi_compile_local __ FFX_FSR2_OPTION_JITTERED_MOTION_VECTORS
-#pragma multi_compile_local __ FFX_FSR2_OPTION_INVERTED_DEPTH
-
-#pragma multi_compile __ UNITY_FSR_TEXTURE2D_X_ARRAY
+#define FFX_FSR2_OPTION_HDR_COLOR_INPUT                 1
+#define FFX_FSR2_OPTION_LOW_RESOLUTION_MOTION_VECTORS   1
+#define FFX_FSR2_OPTION_INVERTED_DEPTH                  1
 
 #include "ffx_fsr_unity_common.cginc"
 

Shaders/ffx_fsr2_rcas_pass.compute

@@ -20,11 +20,9 @@
 
 #pragma kernel CS
 
-#pragma multi_compile_local __ FFX_FSR2_OPTION_LOW_RESOLUTION_MOTION_VECTORS
-#pragma multi_compile_local __ FFX_FSR2_OPTION_JITTERED_MOTION_VECTORS
-#pragma multi_compile_local __ FFX_FSR2_OPTION_INVERTED_DEPTH
-
-#pragma multi_compile __ UNITY_FSR_TEXTURE2D_X_ARRAY
+#define FFX_FSR2_OPTION_HDR_COLOR_INPUT                 1
+#define FFX_FSR2_OPTION_LOW_RESOLUTION_MOTION_VECTORS   1
+#define FFX_FSR2_OPTION_INVERTED_DEPTH                  1
 
 #include "ffx_fsr_unity_common.cginc"
 

Shaders/ffx_fsr2_reconstruct_previous_depth_pass.compute

@@ -20,13 +20,9 @@
 
 #pragma kernel CS
 
-#pragma multi_compile_local __ FFX_HALF
-#pragma multi_compile_local __ FFX_FSR2_OPTION_HDR_COLOR_INPUT
-#pragma multi_compile_local __ FFX_FSR2_OPTION_LOW_RESOLUTION_MOTION_VECTORS
-#pragma multi_compile_local __ FFX_FSR2_OPTION_JITTERED_MOTION_VECTORS
-#pragma multi_compile_local __ FFX_FSR2_OPTION_INVERTED_DEPTH
-
-#pragma multi_compile __ UNITY_FSR_TEXTURE2D_X_ARRAY
+#define FFX_FSR2_OPTION_HDR_COLOR_INPUT                 1
+#define FFX_FSR2_OPTION_LOW_RESOLUTION_MOTION_VECTORS   1
+#define FFX_FSR2_OPTION_INVERTED_DEPTH                  1
 
 #include "ffx_fsr_unity_common.cginc"
 

Shaders/ffx_fsr2_tcr_autogen_pass.compute

@@ -20,12 +20,9 @@
 
 #pragma kernel CS
 
-#pragma multi_compile_local __ FFX_HALF
-#pragma multi_compile_local __ FFX_FSR2_OPTION_LOW_RESOLUTION_MOTION_VECTORS
-#pragma multi_compile_local __ FFX_FSR2_OPTION_JITTERED_MOTION_VECTORS
-#pragma multi_compile_local __ FFX_FSR2_OPTION_INVERTED_DEPTH
-
-#pragma multi_compile __ UNITY_FSR_TEXTURE2D_X_ARRAY
+#define FFX_FSR2_OPTION_HDR_COLOR_INPUT                 1
+#define FFX_FSR2_OPTION_LOW_RESOLUTION_MOTION_VECTORS   1
+#define FFX_FSR2_OPTION_INVERTED_DEPTH                  1
 
 #include "ffx_fsr_unity_common.cginc"
 

Shaders/ffx_fsr3upscaler_accumulate_pass.compute

@@ -20,13 +20,10 @@
 
 #pragma kernel CS
 
-#pragma multi_compile_local __ FFX_HALF
-#pragma multi_compile_local __ FFX_FSR3UPSCALER_OPTION_REPROJECT_USE_LANCZOS_TYPE
-#pragma multi_compile_local __ FFX_FSR3UPSCALER_OPTION_HDR_COLOR_INPUT
-#pragma multi_compile_local __ FFX_FSR3UPSCALER_OPTION_LOW_RESOLUTION_MOTION_VECTORS
-#pragma multi_compile_local __ FFX_FSR3UPSCALER_OPTION_APPLY_SHARPENING
-
-#pragma multi_compile __ UNITY_FSR_TEXTURE2D_X_ARRAY
+#define FFX_FSR3UPSCALER_OPTION_HDR_COLOR_INPUT                 1
+#define FFX_FSR3UPSCALER_OPTION_LOW_RESOLUTION_MOTION_VECTORS   1
+#define FFX_FSR3UPSCALER_OPTION_INVERTED_DEPTH                  1
+#define FFX_FSR3UPSCALER_OPTION_APPLY_SHARPENING                1
 
 #include "ffx_fsr_unity_common.cginc"
 

Shaders/ffx_fsr3upscaler_autogen_reactive_pass.compute

@@ -20,9 +20,9 @@
 
 #pragma kernel CS
 
-#pragma multi_compile_local __ FFX_HALF
-
-#pragma multi_compile __ UNITY_FSR_TEXTURE2D_X_ARRAY
+#define FFX_FSR3UPSCALER_OPTION_HDR_COLOR_INPUT                 1
+#define FFX_FSR3UPSCALER_OPTION_LOW_RESOLUTION_MOTION_VECTORS   1
+#define FFX_FSR3UPSCALER_OPTION_INVERTED_DEPTH                  1
 
 #include "ffx_fsr_unity_common.cginc"
 

Shaders/ffx_fsr3upscaler_debug_view_pass.compute

@@ -20,9 +20,9 @@
 
 #pragma kernel CS
 
-#pragma multi_compile_local __ FFX_HALF
-
-#pragma multi_compile __ UNITY_FSR_TEXTURE2D_X_ARRAY
+#define FFX_FSR3UPSCALER_OPTION_HDR_COLOR_INPUT                 1
+#define FFX_FSR3UPSCALER_OPTION_LOW_RESOLUTION_MOTION_VECTORS   1
+#define FFX_FSR3UPSCALER_OPTION_INVERTED_DEPTH                  1
 
 #include "ffx_fsr_unity_common.cginc"
 

Shaders/ffx_fsr3upscaler_luma_instability_pass.compute

@@ -20,9 +20,9 @@
 
 #pragma kernel CS
 
-#pragma multi_compile_local __ FFX_HALF
-
-#pragma multi_compile __ UNITY_FSR_TEXTURE2D_X_ARRAY
+#define FFX_FSR3UPSCALER_OPTION_HDR_COLOR_INPUT                 1
+#define FFX_FSR3UPSCALER_OPTION_LOW_RESOLUTION_MOTION_VECTORS   1
+#define FFX_FSR3UPSCALER_OPTION_INVERTED_DEPTH                  1
 
 #include "ffx_fsr_unity_common.cginc"
 

Shaders/ffx_fsr3upscaler_luma_pyramid_pass.compute

@@ -20,9 +20,9 @@
 
 #pragma kernel CS
 
-#pragma multi_compile_local __ FFX_HALF
-
-#pragma multi_compile __ UNITY_FSR_TEXTURE2D_X_ARRAY
+#define FFX_FSR3UPSCALER_OPTION_HDR_COLOR_INPUT                 1
+#define FFX_FSR3UPSCALER_OPTION_LOW_RESOLUTION_MOTION_VECTORS   1
+#define FFX_FSR3UPSCALER_OPTION_INVERTED_DEPTH                  1
 
 #include "ffx_fsr_unity_common.cginc"
 

Shaders/ffx_fsr3upscaler_prepare_inputs_pass.compute

@@ -20,11 +20,9 @@
 
 #pragma kernel CS
 
-#pragma multi_compile_local __ FFX_HALF
-#pragma multi_compile_local __ FFX_FSR3UPSCALER_OPTION_LOW_RESOLUTION_MOTION_VECTORS
-#pragma multi_compile_local __ FFX_FSR3UPSCALER_OPTION_INVERTED_DEPTH
-
-#pragma multi_compile __ UNITY_FSR_TEXTURE2D_X_ARRAY
+#define FFX_FSR3UPSCALER_OPTION_HDR_COLOR_INPUT                 1
+#define FFX_FSR3UPSCALER_OPTION_LOW_RESOLUTION_MOTION_VECTORS   1
+#define FFX_FSR3UPSCALER_OPTION_INVERTED_DEPTH                  1
 
 #include "ffx_fsr_unity_common.cginc"
 

Shaders/ffx_fsr3upscaler_prepare_reactivity_pass.compute

@@ -20,9 +20,9 @@
 
 #pragma kernel CS
 
-#pragma multi_compile_local __ FFX_HALF
-
-#pragma multi_compile __ UNITY_FSR_TEXTURE2D_X_ARRAY
+#define FFX_FSR3UPSCALER_OPTION_HDR_COLOR_INPUT                 1
+#define FFX_FSR3UPSCALER_OPTION_LOW_RESOLUTION_MOTION_VECTORS   1
+#define FFX_FSR3UPSCALER_OPTION_INVERTED_DEPTH                  1
 
 #include "ffx_fsr_unity_common.cginc"
 

Shaders/ffx_fsr3upscaler_rcas_pass.compute

@@ -20,7 +20,9 @@
 
 #pragma kernel CS
 
-#pragma multi_compile __ UNITY_FSR_TEXTURE2D_X_ARRAY
+#define FFX_FSR3UPSCALER_OPTION_HDR_COLOR_INPUT                 1
+#define FFX_FSR3UPSCALER_OPTION_LOW_RESOLUTION_MOTION_VECTORS   1
+#define FFX_FSR3UPSCALER_OPTION_INVERTED_DEPTH                  1
 
 #include "ffx_fsr_unity_common.cginc"
 

Shaders/ffx_fsr3upscaler_shading_change_pass.compute

@@ -20,9 +20,9 @@
 
 #pragma kernel CS
 
-#pragma multi_compile_local __ FFX_HALF
-
-#pragma multi_compile __ UNITY_FSR_TEXTURE2D_X_ARRAY
+#define FFX_FSR3UPSCALER_OPTION_HDR_COLOR_INPUT                 1
+#define FFX_FSR3UPSCALER_OPTION_LOW_RESOLUTION_MOTION_VECTORS   1
+#define FFX_FSR3UPSCALER_OPTION_INVERTED_DEPTH                  1
 
 #include "ffx_fsr_unity_common.cginc"
 

Shaders/ffx_fsr3upscaler_shading_change_pyramid_pass.compute

@@ -20,9 +20,9 @@
 
 #pragma kernel CS
 
-#pragma multi_compile_local __ FFX_HALF
-
-#pragma multi_compile __ UNITY_FSR_TEXTURE2D_X_ARRAY
+#define FFX_FSR3UPSCALER_OPTION_HDR_COLOR_INPUT                 1
+#define FFX_FSR3UPSCALER_OPTION_LOW_RESOLUTION_MOTION_VECTORS   1
+#define FFX_FSR3UPSCALER_OPTION_INVERTED_DEPTH                  1
 
 #include "ffx_fsr_unity_common.cginc"
 

Shaders/ffx_fsr3upscaler_tcr_autogen_pass.compute

@@ -20,10 +20,9 @@
 
 #pragma kernel CS
 
-#pragma multi_compile_local __ FFX_HALF
-#pragma multi_compile_local __ FFX_FSR3UPSCALER_OPTION_JITTERED_MOTION_VECTORS
-
-#pragma multi_compile __ UNITY_FSR_TEXTURE2D_X_ARRAY
+#define FFX_FSR3UPSCALER_OPTION_HDR_COLOR_INPUT                 1
+#define FFX_FSR3UPSCALER_OPTION_LOW_RESOLUTION_MOTION_VECTORS   1
+#define FFX_FSR3UPSCALER_OPTION_INVERTED_DEPTH                  1
 
 #include "ffx_fsr_unity_common.cginc"
 

package.json

@@ -3,7 +3,7 @@
   "version": "1.0.0",
   "displayName": "FidelityFX FSR",
   "description": "FidelityFX Super Resolution 2/3 Upscaler core assets",
-  "unity": "2020.1",
+  "unity": "2019.1",
   "documentationUrl": "https://github.com/ndepoel/FSR2Unity",
   "author": {
     "name": "Nico de Poel",