Browse Source

Merge branch 'framework' into fsr3framegen

fsr3framegen
Nico de Poel 2 years ago
parent
commit
f1e963dfc1
  1. 4
      Runtime/Common/FfxPassBase.cs
  2. 5
      Runtime/FSR2/Fsr2.cs
  3. 5
      Runtime/FSR3/Fsr3Upscaler.cs
  4. 1
      Runtime/FSR3/Fsr3UpscalerAssets.cs
  5. 1
      Runtime/FSR3/Fsr3UpscalerContext.cs

4
Runtime/Common/FfxPassBase.cs

@ -6,7 +6,7 @@ using UnityEngine.Rendering;
namespace FidelityFX namespace FidelityFX
{ {
internal abstract class FfxPassBase<TDispatch>: IDisposable internal abstract class FfxPassBase<TDispatch>: IDisposable
//where TDispatch: struct
where TDispatch: struct
{ {
private readonly string _techName; private readonly string _techName;
@ -47,7 +47,7 @@ namespace FidelityFX
} }
internal abstract class FfxPassWithFlags<TDispatch, TFlags> : FfxPassBase<TDispatch> internal abstract class FfxPassWithFlags<TDispatch, TFlags> : FfxPassBase<TDispatch>
//where TDispatch: struct
where TDispatch: struct
where TFlags: Enum where TFlags: Enum
{ {
protected readonly TFlags Flags; protected readonly TFlags Flags;

5
Runtime/FSR2/Fsr2.cs

@ -21,7 +21,6 @@
using System; using System;
using System.Runtime.InteropServices; using System.Runtime.InteropServices;
using UnityEngine; using UnityEngine;
using UnityEngine.Rendering;
namespace FidelityFX.FSR2 namespace FidelityFX.FSR2
{ {
@ -80,9 +79,7 @@ namespace FidelityFX.FSR2
} }
} }
public static void GetRenderResolutionFromQualityMode(
out int renderWidth, out int renderHeight,
int displayWidth, int displayHeight, QualityMode qualityMode)
public static void GetRenderResolutionFromQualityMode(out int renderWidth, out int renderHeight, int displayWidth, int displayHeight, QualityMode qualityMode)
{ {
float ratio = GetUpscaleRatioFromQualityMode(qualityMode); float ratio = GetUpscaleRatioFromQualityMode(qualityMode);
renderWidth = Mathf.RoundToInt(displayWidth / ratio); renderWidth = Mathf.RoundToInt(displayWidth / ratio);

5
Runtime/FSR3/Fsr3Upscaler.cs

@ -21,7 +21,6 @@
using System; using System;
using System.Runtime.InteropServices; using System.Runtime.InteropServices;
using UnityEngine; using UnityEngine;
using UnityEngine.Rendering;
namespace FidelityFX.FSR3 namespace FidelityFX.FSR3
{ {
@ -80,9 +79,7 @@ namespace FidelityFX.FSR3
} }
} }
public static void GetRenderResolutionFromQualityMode(
out int renderWidth, out int renderHeight,
int displayWidth, int displayHeight, QualityMode qualityMode)
public static void GetRenderResolutionFromQualityMode(out int renderWidth, out int renderHeight, int displayWidth, int displayHeight, QualityMode qualityMode)
{ {
float ratio = GetUpscaleRatioFromQualityMode(qualityMode); float ratio = GetUpscaleRatioFromQualityMode(qualityMode);
renderWidth = Mathf.RoundToInt(displayWidth / ratio); renderWidth = Mathf.RoundToInt(displayWidth / ratio);

1
Runtime/FSR3/Fsr3UpscalerAssets.cs

@ -19,7 +19,6 @@
// THE SOFTWARE. // THE SOFTWARE.
using UnityEngine; using UnityEngine;
using UnityEngine.Serialization;
namespace FidelityFX.FSR3 namespace FidelityFX.FSR3
{ {

1
Runtime/FSR3/Fsr3UpscalerContext.cs

@ -19,7 +19,6 @@
// THE SOFTWARE. // THE SOFTWARE.
using System; using System;
using System.Runtime.InteropServices;
using UnityEngine; using UnityEngine;
using UnityEngine.Profiling; using UnityEngine.Profiling;
using UnityEngine.Rendering; using UnityEngine.Rendering;

Loading…
Cancel
Save