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 { diff --git a/Packages/fidelityfx.fsr/Runtime/FSR2/Fsr2.cs b/Packages/fidelityfx.fsr/Runtime/FSR2/Fsr2.cs index 8c29447..4632b96 100644 --- a/Packages/fidelityfx.fsr/Runtime/FSR2/Fsr2.cs +++ b/Packages/fidelityfx.fsr/Runtime/FSR2/Fsr2.cs @@ -23,7 +23,7 @@ using System.Runtime.InteropServices; using UnityEngine; using UnityEngine.Rendering; -namespace FidelityFX +namespace FidelityFX.FSR2 { /// /// A collection of helper functions and data structures required by the FSR2 process. diff --git a/Packages/fidelityfx.fsr/Runtime/FSR2/Fsr2Assets.cs b/Packages/fidelityfx.fsr/Runtime/FSR2/Fsr2Assets.cs index 840d16b..c30a8f6 100644 --- a/Packages/fidelityfx.fsr/Runtime/FSR2/Fsr2Assets.cs +++ b/Packages/fidelityfx.fsr/Runtime/FSR2/Fsr2Assets.cs @@ -20,7 +20,7 @@ using UnityEngine; -namespace FidelityFX +namespace FidelityFX.FSR2 { /// /// Scriptable object containing all shader resources required by FidelityFX Super Resolution 2 (FSR2). diff --git a/Packages/fidelityfx.fsr/Runtime/FSR2/Fsr2Callbacks.cs b/Packages/fidelityfx.fsr/Runtime/FSR2/Fsr2Callbacks.cs index c4ea19e..06151b5 100644 --- a/Packages/fidelityfx.fsr/Runtime/FSR2/Fsr2Callbacks.cs +++ b/Packages/fidelityfx.fsr/Runtime/FSR2/Fsr2Callbacks.cs @@ -20,7 +20,7 @@ using UnityEngine; -namespace FidelityFX +namespace FidelityFX.FSR2 { /// /// A collection of callbacks required by the FSR2 process. diff --git a/Packages/fidelityfx.fsr/Runtime/FSR2/Fsr2Context.cs b/Packages/fidelityfx.fsr/Runtime/FSR2/Fsr2Context.cs index 75679a0..38d380b 100644 --- a/Packages/fidelityfx.fsr/Runtime/FSR2/Fsr2Context.cs +++ b/Packages/fidelityfx.fsr/Runtime/FSR2/Fsr2Context.cs @@ -23,7 +23,7 @@ using System.Runtime.InteropServices; using UnityEngine; using UnityEngine.Rendering; -namespace FidelityFX +namespace FidelityFX.FSR2 { /// /// This class loosely matches the FfxFsr2Context struct from the original FSR2 codebase. diff --git a/Packages/fidelityfx.fsr/Runtime/FSR2/Fsr2Pass.cs b/Packages/fidelityfx.fsr/Runtime/FSR2/Fsr2Pass.cs index 5114a01..bda5092 100644 --- a/Packages/fidelityfx.fsr/Runtime/FSR2/Fsr2Pass.cs +++ b/Packages/fidelityfx.fsr/Runtime/FSR2/Fsr2Pass.cs @@ -24,7 +24,7 @@ using UnityEngine; using UnityEngine.Profiling; using UnityEngine.Rendering; -namespace FidelityFX +namespace FidelityFX.FSR2 { /// /// Base class for all of the compute passes that make up the FSR2 process. diff --git a/Packages/fidelityfx.fsr/Runtime/FSR2/Fsr2Resources.cs b/Packages/fidelityfx.fsr/Runtime/FSR2/Fsr2Resources.cs index a0dde4a..f0f49a6 100644 --- a/Packages/fidelityfx.fsr/Runtime/FSR2/Fsr2Resources.cs +++ b/Packages/fidelityfx.fsr/Runtime/FSR2/Fsr2Resources.cs @@ -23,7 +23,7 @@ using UnityEngine; using UnityEngine.Experimental.Rendering; using UnityEngine.Rendering; -namespace FidelityFX +namespace FidelityFX.FSR2 { /// /// Helper class for bundling and managing persistent resources required by the FSR2 process. diff --git a/Packages/fidelityfx.fsr/Runtime/FSR2/Fsr2ShaderIDs.cs b/Packages/fidelityfx.fsr/Runtime/FSR2/Fsr2ShaderIDs.cs index 5b8fa4b..0adbf6b 100644 --- a/Packages/fidelityfx.fsr/Runtime/FSR2/Fsr2ShaderIDs.cs +++ b/Packages/fidelityfx.fsr/Runtime/FSR2/Fsr2ShaderIDs.cs @@ -20,7 +20,7 @@ using UnityEngine; -namespace FidelityFX +namespace FidelityFX.FSR2 { public static class Fsr2ShaderIDs { diff --git a/Packages/fidelityfx.fsr/Runtime/FSR3/Fsr3ShaderIDs.cs b/Packages/fidelityfx.fsr/Runtime/FSR3/Fsr3ShaderIDs.cs index 8d972ca..6e543fe 100644 --- a/Packages/fidelityfx.fsr/Runtime/FSR3/Fsr3ShaderIDs.cs +++ b/Packages/fidelityfx.fsr/Runtime/FSR3/Fsr3ShaderIDs.cs @@ -20,7 +20,7 @@ using UnityEngine; -namespace FidelityFX +namespace FidelityFX.FSR3 { public static class Fsr3ShaderIDs { diff --git a/Packages/fidelityfx.fsr/Runtime/FSR3/Fsr3Upscaler.cs b/Packages/fidelityfx.fsr/Runtime/FSR3/Fsr3Upscaler.cs index 30b873c..d69aa29 100644 --- a/Packages/fidelityfx.fsr/Runtime/FSR3/Fsr3Upscaler.cs +++ b/Packages/fidelityfx.fsr/Runtime/FSR3/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/Packages/fidelityfx.fsr/Runtime/FSR3/Fsr3UpscalerAssets.cs b/Packages/fidelityfx.fsr/Runtime/FSR3/Fsr3UpscalerAssets.cs index c77a998..84c4474 100644 --- a/Packages/fidelityfx.fsr/Runtime/FSR3/Fsr3UpscalerAssets.cs +++ b/Packages/fidelityfx.fsr/Runtime/FSR3/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/Packages/fidelityfx.fsr/Runtime/FSR3/Fsr3UpscalerCallbacks.cs b/Packages/fidelityfx.fsr/Runtime/FSR3/Fsr3UpscalerCallbacks.cs index e91d358..2cb48f2 100644 --- a/Packages/fidelityfx.fsr/Runtime/FSR3/Fsr3UpscalerCallbacks.cs +++ b/Packages/fidelityfx.fsr/Runtime/FSR3/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/Packages/fidelityfx.fsr/Runtime/FSR3/Fsr3UpscalerContext.cs b/Packages/fidelityfx.fsr/Runtime/FSR3/Fsr3UpscalerContext.cs index 80769c8..2b7f2ef 100644 --- a/Packages/fidelityfx.fsr/Runtime/FSR3/Fsr3UpscalerContext.cs +++ b/Packages/fidelityfx.fsr/Runtime/FSR3/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/Packages/fidelityfx.fsr/Runtime/FSR3/Fsr3UpscalerPass.cs b/Packages/fidelityfx.fsr/Runtime/FSR3/Fsr3UpscalerPass.cs index fa3aa65..3b76eb4 100644 --- a/Packages/fidelityfx.fsr/Runtime/FSR3/Fsr3UpscalerPass.cs +++ b/Packages/fidelityfx.fsr/Runtime/FSR3/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/Packages/fidelityfx.fsr/Runtime/FSR3/Fsr3UpscalerResources.cs b/Packages/fidelityfx.fsr/Runtime/FSR3/Fsr3UpscalerResources.cs index d6a08ab..112b98d 100644 --- a/Packages/fidelityfx.fsr/Runtime/FSR3/Fsr3UpscalerResources.cs +++ b/Packages/fidelityfx.fsr/Runtime/FSR3/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/com.unity.postprocessing/PostProcessing/Runtime/Effects/SuperResolution.cs b/com.unity.postprocessing/PostProcessing/Runtime/Effects/SuperResolution.cs index 2feece4..e997b3f 100644 --- a/com.unity.postprocessing/PostProcessing/Runtime/Effects/SuperResolution.cs +++ b/com.unity.postprocessing/PostProcessing/Runtime/Effects/SuperResolution.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 Nico de Poel +// Copyright (c) 2024 Nico de Poel // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal @@ -24,6 +24,7 @@ using System.Collections.Generic; using UnityEngine; using UnityEngine.Experimental.Rendering; using FidelityFX; +using FidelityFX.FSR3; namespace UnityEngine.Rendering.PostProcessing { diff --git a/com.unity.postprocessing/PostProcessing/Runtime/PostProcessResources.cs b/com.unity.postprocessing/PostProcessing/Runtime/PostProcessResources.cs index 35293ef..e745fa6 100644 --- a/com.unity.postprocessing/PostProcessing/Runtime/PostProcessResources.cs +++ b/com.unity.postprocessing/PostProcessing/Runtime/PostProcessResources.cs @@ -1,5 +1,5 @@ using System; -using FidelityFX; +using FidelityFX.FSR3; namespace UnityEngine.Rendering.PostProcessing { diff --git a/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/RenderPass/Fsr3Upscaler/Fsr3UpscalerPlugin.cs b/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/RenderPass/Fsr3Upscaler/Fsr3UpscalerPlugin.cs index 3ebac5d..012cf05 100644 --- a/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/RenderPass/Fsr3Upscaler/Fsr3UpscalerPlugin.cs +++ b/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/RenderPass/Fsr3Upscaler/Fsr3UpscalerPlugin.cs @@ -1,6 +1,7 @@ using System; using System.Collections.Generic; using FidelityFX; +using FidelityFX.FSR3; // We use an old C# trick here to override the UnityEngine.AMD namespace and force FSR2Pass to use code from this namespace instead. // By exactly mimicking the interface of the AMDUnityPlugin module, we can replace Unity's implementation of FSR2 with one of our own.