ndepoel
/
FSRTestPPV2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Added a quick and dirty upscaler integration and fixed global keyword creation

asr-console
Nico de Poel 11 months ago
parent
ac0adc168b
commit
2a88584eb2
4 changed files with 155 additions and 8 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 7
      Packages/com.unity.postprocessing@3.2.2/PostProcessing/Runtime/Effects/Upscaling.cs
  2. 14
      Packages/com.unity.postprocessing@3.2.2/PostProcessing/Runtime/Effects/Upscaling/ASR/Runtime/AsrKeywords.cs
  3. 131
      Packages/com.unity.postprocessing@3.2.2/PostProcessing/Runtime/Effects/Upscaling/ASRUpscaler.cs
  4. 11
      Packages/com.unity.postprocessing@3.2.2/PostProcessing/Runtime/Effects/Upscaling/ASRUpscaler.cs.meta

7
Packages/com.unity.postprocessing@3.2.2/PostProcessing/Runtime/Effects/Upscaling.cs
View File

@ -15,7 +15,9 @@ namespace UnityEngine.Rendering.PostProcessing
{
[InspectorName("FidelityFX Super Resolution 2.2 (FSR2)")] FSR2,
[InspectorName("FidelityFX Super Resolution 3.1 (FSR3)")] FSR3,
//[InspectorName("Arm Accuracy Super Resolution (ASR)")] ASR,
[InspectorName("Arm Accuracy Super Resolution (ASR) Quality")] ASR_Quality,
[InspectorName("Arm Accuracy Super Resolution (ASR) Balanced")] ASR_Balanced,
[InspectorName("Arm Accuracy Super Resolution (ASR) Performance")] ASR_Performance,
[InspectorName("Snapdragon Game Super Resolution 2 (SGSR2) 2-Pass Fragment")] SGSR2_2PassFS,
[InspectorName("Snapdragon Game Super Resolution 2 (SGSR2) 2-Pass Compute")] SGSR2_2PassCS,
[InspectorName("Snapdragon Game Super Resolution 2 (SGSR2) 3-Pass Compute")] SGSR2_3PassCS,
@ -182,6 +184,9 @@ namespace UnityEngine.Rendering.PostProcessing
{
UpscalerType.FSR2 when FSR2Upscaler.IsSupported => new FSR2Upscaler(),
UpscalerType.FSR3 when FSR3Upscaler.IsSupported => new FSR3Upscaler(),
UpscalerType.ASR_Quality when ASRUpscaler.IsSupported => new ASRUpscaler_Quality(),
UpscalerType.ASR_Balanced when ASRUpscaler.IsSupported => new ASRUpscaler_Balanced(),
UpscalerType.ASR_Performance when ASRUpscaler.IsSupported => new ASRUpscaler_Performance(),
UpscalerType.SGSR2_2PassFS => new SGSR2Upscaler_2PassFS(),
UpscalerType.SGSR2_2PassCS when SGSR2Upscaler.IsSupported => new SGSR2Upscaler_2PassCS(),
UpscalerType.SGSR2_3PassCS when SGSR2Upscaler.IsSupported => new SGSR2Upscaler_3PassCS(),

14
Packages/com.unity.postprocessing@3.2.2/PostProcessing/Runtime/Effects/Upscaling/ASR/Runtime/AsrKeywords.cs
View File

@ -26,13 +26,13 @@ namespace ArmASR
public AsrKeywords()
{
#if UNITY_2021_2_OR_NEWER
_halfPrecisionKeyword = new GlobalKeyword(OptionHalfPrecision);
_hdrColorInputKeyword = new GlobalKeyword(OptionHdrColorInput);
_lowResMotionVectorsKeyword = new GlobalKeyword(OptionLowResolutionMotionVectors);
_jitteredMotionVectorsKeyword = new GlobalKeyword(OptionJitteredMotionVectors);
_invertedDepthKeyword = new GlobalKeyword(OptionInvertedDepth);
_reprojectUseLutKeyword = new GlobalKeyword(OptionReprojectUseLut);
_applySharpeningKeyword = new GlobalKeyword(OptionApplySharpening);
_halfPrecisionKeyword = GlobalKeyword.Create(OptionHalfPrecision);
_hdrColorInputKeyword = GlobalKeyword.Create(OptionHdrColorInput);
_lowResMotionVectorsKeyword = GlobalKeyword.Create(OptionLowResolutionMotionVectors);
_jitteredMotionVectorsKeyword = GlobalKeyword.Create(OptionJitteredMotionVectors);
_invertedDepthKeyword = GlobalKeyword.Create(OptionInvertedDepth);
_reprojectUseLutKeyword = GlobalKeyword.Create(OptionReprojectUseLut);
_applySharpeningKeyword = GlobalKeyword.Create(OptionApplySharpening);
#endif
}

131
Packages/com.unity.postprocessing@3.2.2/PostProcessing/Runtime/Effects/Upscaling/ASRUpscaler.cs
View File

@ -0,0 +1,131 @@
using ArmASR;
using UnityEngine.Experimental.Rendering;
namespace UnityEngine.Rendering.PostProcessing
{
internal abstract class ASRUpscaler: Upscaler
{
public static bool IsSupported => SystemInfo.supportsComputeShaders;
protected abstract Asr.Variant Variant { get; }
private AsrContext _asrContext;
private Asr.DispatchDescription _dispatchDescription = new();
private Asr.GenerateReactiveDescription _genReactiveDescription = new();
public override void CreateContext(PostProcessRenderContext context, Upscaling config)
{
// Initialize ASR context
Asr.InitializationFlags flags = 0;
if (context.camera.allowHDR) flags |= Asr.InitializationFlags.EnableHighDynamicRange;
if (config.exposureSource == Upscaling.ExposureSource.Auto) flags |= Asr.InitializationFlags.EnableAutoExposure;
if (RuntimeUtilities.IsDynamicResolutionEnabled(context.camera)) flags |= Asr.InitializationFlags.EnableDynamicResolution;
_asrContext = Asr.CreateContext(Variant, config.UpscaleSize, config.MaxRenderSize, context.resources.asrUpscalerShaders, flags);
}
public override void DestroyContext()
{
base.DestroyContext();
if (_asrContext != null)
{
_asrContext.Destroy();
_asrContext = null;
}
}
public override void Render(PostProcessRenderContext context, Upscaling config)
{
var cmd = context.command;
cmd.BeginSample("ASR");
SetupDispatchDescription(context, config);
if (config.autoGenerateReactiveMask)
{
SetupAutoReactiveDescription(context, config);
var scaledRenderSize = _genReactiveDescription.RenderSize;
cmd.GetTemporaryRT(AsrShaderIDs.UavAutoReactive, scaledRenderSize.x, scaledRenderSize.y, 0, default, GraphicsFormat.R8_UNorm, 1, true);
_asrContext.GenerateReactiveMask(_genReactiveDescription, cmd);
_dispatchDescription.Reactive = new ResourceView(AsrShaderIDs.UavAutoReactive);
}
_asrContext.Dispatch(_dispatchDescription, cmd);
cmd.EndSample("ASR");
}
private void SetupDispatchDescription(PostProcessRenderContext context, Upscaling config)
{
var camera = context.camera;
// Set up the main ASR dispatch parameters
_dispatchDescription.Color = new ResourceView(context.source);
_dispatchDescription.Depth = new ResourceView(Upscaling.GetDepthTexture(context.camera), RenderTextureSubElement.Depth);
_dispatchDescription.MotionVectors = new ResourceView(BuiltinRenderTextureType.MotionVectors);
_dispatchDescription.Exposure = ResourceView.Unassigned;
_dispatchDescription.Reactive = ResourceView.Unassigned;
_dispatchDescription.TransparencyAndComposition = ResourceView.Unassigned;
if (config.exposureSource == Upscaling.ExposureSource.Manual && config.exposure != null) _dispatchDescription.Exposure = new ResourceView(config.exposure);
if (config.exposureSource == Upscaling.ExposureSource.Unity) _dispatchDescription.Exposure = new ResourceView(context.autoExposureTexture);
if (config.reactiveMask != null) _dispatchDescription.Reactive = new ResourceView(config.reactiveMask);
if (config.transparencyAndCompositionMask != null) _dispatchDescription.TransparencyAndComposition = new ResourceView(config.transparencyAndCompositionMask);
var scaledRenderSize = config.GetScaledRenderSize(context.camera);
_dispatchDescription.Output = new ResourceView(context.destination);
_dispatchDescription.PreExposure = config.preExposure;
_dispatchDescription.EnableSharpening = config.performSharpenPass;
_dispatchDescription.Sharpness = config.sharpness;
_dispatchDescription.JitterOffset = config.JitterOffset;
_dispatchDescription.MotionVectorScale.x = -scaledRenderSize.x;
_dispatchDescription.MotionVectorScale.y = -scaledRenderSize.y;
_dispatchDescription.RenderSize = scaledRenderSize;
_dispatchDescription.InputResourceSize = scaledRenderSize;
_dispatchDescription.FrameTimeDelta = Time.unscaledDeltaTime;
_dispatchDescription.CameraNear = camera.nearClipPlane;
_dispatchDescription.CameraFar = camera.farClipPlane;
_dispatchDescription.CameraFovAngleVertical = camera.fieldOfView * Mathf.Deg2Rad;
_dispatchDescription.ViewSpaceToMetersFactor = 1.0f; // 1 unit is 1 meter in Unity
_dispatchDescription.Reset = config.Reset;
if (SystemInfo.usesReversedZBuffer)
{
// Swap the near and far clip plane distances as FSR2 expects this when using inverted depth
(_dispatchDescription.CameraNear, _dispatchDescription.CameraFar) = (_dispatchDescription.CameraFar, _dispatchDescription.CameraNear);
}
}
private void SetupAutoReactiveDescription(PostProcessRenderContext context, Upscaling config)
{
// Set up the parameters to auto-generate a reactive mask
_genReactiveDescription.ColorOpaqueOnly = new ResourceView(config.ColorOpaqueOnly);
_genReactiveDescription.ColorPreUpscale = new ResourceView(context.source);
_genReactiveDescription.OutReactive = new ResourceView(AsrShaderIDs.UavAutoReactive);
_genReactiveDescription.RenderSize = config.GetScaledRenderSize(context.camera);
_genReactiveDescription.Scale = config.generateReactiveParameters.scale;
_genReactiveDescription.CutoffThreshold = config.generateReactiveParameters.cutoffThreshold;
_genReactiveDescription.BinaryValue = config.generateReactiveParameters.binaryValue;
_genReactiveDescription.Flags = (Asr.GenerateReactiveFlags)config.generateReactiveParameters.flags;
}
}
internal class ASRUpscaler_Quality : ASRUpscaler
{
protected override Asr.Variant Variant => Asr.Variant.Quality;
}
internal class ASRUpscaler_Balanced : ASRUpscaler
{
protected override Asr.Variant Variant => Asr.Variant.Balanced;
}
internal class ASRUpscaler_Performance : ASRUpscaler
{
protected override Asr.Variant Variant => Asr.Variant.Performance;
}
}

11
Packages/com.unity.postprocessing@3.2.2/PostProcessing/Runtime/Effects/Upscaling/ASRUpscaler.cs.meta
View File

@ -0,0 +1,11 @@
fileFormatVersion: 2
guid: efc2b52b928eb184da8528721dc1503b
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:
Write Preview
Loading…
Cancel
Save