From 25157d11aa9d7f4d8e38e1dded3ef6fc4bdfa8b6 Mon Sep 17 00:00:00 2001 From: Nico de Poel Date: Sat, 20 Jul 2024 18:25:56 +0200 Subject: [PATCH] Moved FSR3 classes into their own sub-namespace. This is more future-proof with an eye on porting over more FidelityFX technologies. --- Assets/Scripts/Core/Fsr3ShaderIDs.cs | 2 +- Assets/Scripts/Core/Fsr3Upscaler.cs | 2 +- Assets/Scripts/Core/Fsr3UpscalerAssets.cs | 2 +- Assets/Scripts/Core/Fsr3UpscalerCallbacks.cs | 2 +- Assets/Scripts/Core/Fsr3UpscalerContext.cs | 2 +- Assets/Scripts/Core/Fsr3UpscalerPass.cs | 2 +- Assets/Scripts/Core/Fsr3UpscalerResources.cs | 2 +- Assets/Scripts/Debug/DebugDumper.cs | 3 ++- Assets/Scripts/Fsr3UpscalerCameraHelper.cs | 1 + Assets/Scripts/Fsr3UpscalerImageEffect.cs | 1 + Assets/Scripts/Fsr3UpscalerImageEffectHelper.cs | 1 + 11 files changed, 12 insertions(+), 8 deletions(-) diff --git a/Assets/Scripts/Core/Fsr3ShaderIDs.cs b/Assets/Scripts/Core/Fsr3ShaderIDs.cs index 8d972ca..6e543fe 100644 --- a/Assets/Scripts/Core/Fsr3ShaderIDs.cs +++ b/Assets/Scripts/Core/Fsr3ShaderIDs.cs @@ -20,7 +20,7 @@ using UnityEngine; -namespace FidelityFX +namespace FidelityFX.FSR3 { public static class Fsr3ShaderIDs { diff --git a/Assets/Scripts/Core/Fsr3Upscaler.cs b/Assets/Scripts/Core/Fsr3Upscaler.cs index 30b873c..d69aa29 100644 --- a/Assets/Scripts/Core/Fsr3Upscaler.cs +++ b/Assets/Scripts/Core/Fsr3Upscaler.cs @@ -23,7 +23,7 @@ using System.Runtime.InteropServices; using UnityEngine; using UnityEngine.Rendering; -namespace FidelityFX +namespace FidelityFX.FSR3 { /// /// A collection of helper functions and data structures required by the FSR3 Upscaler process. diff --git a/Assets/Scripts/Core/Fsr3UpscalerAssets.cs b/Assets/Scripts/Core/Fsr3UpscalerAssets.cs index c77a998..84c4474 100644 --- a/Assets/Scripts/Core/Fsr3UpscalerAssets.cs +++ b/Assets/Scripts/Core/Fsr3UpscalerAssets.cs @@ -21,7 +21,7 @@ using UnityEngine; using UnityEngine.Serialization; -namespace FidelityFX +namespace FidelityFX.FSR3 { /// /// Scriptable object containing all shader resources required by FidelityFX Super Resolution 3 (FSR3) Upscaler. diff --git a/Assets/Scripts/Core/Fsr3UpscalerCallbacks.cs b/Assets/Scripts/Core/Fsr3UpscalerCallbacks.cs index e91d358..2cb48f2 100644 --- a/Assets/Scripts/Core/Fsr3UpscalerCallbacks.cs +++ b/Assets/Scripts/Core/Fsr3UpscalerCallbacks.cs @@ -20,7 +20,7 @@ using UnityEngine; -namespace FidelityFX +namespace FidelityFX.FSR3 { /// /// A collection of callbacks required by the FSR3 Upscaler process. diff --git a/Assets/Scripts/Core/Fsr3UpscalerContext.cs b/Assets/Scripts/Core/Fsr3UpscalerContext.cs index 80769c8..2b7f2ef 100644 --- a/Assets/Scripts/Core/Fsr3UpscalerContext.cs +++ b/Assets/Scripts/Core/Fsr3UpscalerContext.cs @@ -23,7 +23,7 @@ using System.Runtime.InteropServices; using UnityEngine; using UnityEngine.Rendering; -namespace FidelityFX +namespace FidelityFX.FSR3 { /// /// This class loosely matches the FfxFsr3UpscalerContext struct from the original FSR3 codebase. diff --git a/Assets/Scripts/Core/Fsr3UpscalerPass.cs b/Assets/Scripts/Core/Fsr3UpscalerPass.cs index fa3aa65..3b76eb4 100644 --- a/Assets/Scripts/Core/Fsr3UpscalerPass.cs +++ b/Assets/Scripts/Core/Fsr3UpscalerPass.cs @@ -24,7 +24,7 @@ using UnityEngine; using UnityEngine.Profiling; using UnityEngine.Rendering; -namespace FidelityFX +namespace FidelityFX.FSR3 { /// /// Base class for all of the compute passes that make up the FSR3 Upscaler process. diff --git a/Assets/Scripts/Core/Fsr3UpscalerResources.cs b/Assets/Scripts/Core/Fsr3UpscalerResources.cs index d6a08ab..112b98d 100644 --- a/Assets/Scripts/Core/Fsr3UpscalerResources.cs +++ b/Assets/Scripts/Core/Fsr3UpscalerResources.cs @@ -23,7 +23,7 @@ using UnityEngine; using UnityEngine.Experimental.Rendering; using UnityEngine.Rendering; -namespace FidelityFX +namespace FidelityFX.FSR3 { /// /// Helper class for bundling and managing persistent resources required by the FSR3 Upscaler process. diff --git a/Assets/Scripts/Debug/DebugDumper.cs b/Assets/Scripts/Debug/DebugDumper.cs index 8064e5e..f3a1963 100644 --- a/Assets/Scripts/Debug/DebugDumper.cs +++ b/Assets/Scripts/Debug/DebugDumper.cs @@ -24,8 +24,9 @@ using System.Collections.Generic; using System.IO; using System.Reflection; using System.Text; -using FidelityFX; using UnityEngine; +using FidelityFX; +using FidelityFX.FSR3; public class DebugDumper : MonoBehaviour { diff --git a/Assets/Scripts/Fsr3UpscalerCameraHelper.cs b/Assets/Scripts/Fsr3UpscalerCameraHelper.cs index 75c9fe1..3357f34 100644 --- a/Assets/Scripts/Fsr3UpscalerCameraHelper.cs +++ b/Assets/Scripts/Fsr3UpscalerCameraHelper.cs @@ -23,6 +23,7 @@ using System.Collections; using UnityEngine; using UnityEngine.Experimental.Rendering; using UnityEngine.Rendering; +using FidelityFX.FSR3; namespace FidelityFX { diff --git a/Assets/Scripts/Fsr3UpscalerImageEffect.cs b/Assets/Scripts/Fsr3UpscalerImageEffect.cs index ff57391..bbde974 100644 --- a/Assets/Scripts/Fsr3UpscalerImageEffect.cs +++ b/Assets/Scripts/Fsr3UpscalerImageEffect.cs @@ -22,6 +22,7 @@ using System; using UnityEngine; using UnityEngine.Experimental.Rendering; using UnityEngine.Rendering; +using FidelityFX.FSR3; namespace FidelityFX { diff --git a/Assets/Scripts/Fsr3UpscalerImageEffectHelper.cs b/Assets/Scripts/Fsr3UpscalerImageEffectHelper.cs index 785ab8c..87bc8c9 100644 --- a/Assets/Scripts/Fsr3UpscalerImageEffectHelper.cs +++ b/Assets/Scripts/Fsr3UpscalerImageEffectHelper.cs @@ -20,6 +20,7 @@ using System.Collections; using UnityEngine; +using FidelityFX.FSR3; namespace FidelityFX {