From 24ae1957d6925ece0c2f5a046f63b7092008cd6b Mon Sep 17 00:00:00 2001 From: Nico de Poel Date: Wed, 28 Jun 2023 18:14:12 +0200 Subject: [PATCH] Small tweaks: - Disable plugin importer settings on all FSR2 header include files. - Made undoing of mipmap bias a distinct separate callback, so that it can be overridden by client apps. - Skip textures that don't have mipmaps and thus don't have any use for a mipmap bias. --- .../FSR2/shaders/ffx_common_types.h.meta | 35 ++++++++++++++++++- Assets/Resources/FSR2/shaders/ffx_core.h.meta | 35 ++++++++++++++++++- .../FSR2/shaders/ffx_core_cpu.h.meta | 35 ++++++++++++++++++- .../FSR2/shaders/ffx_core_gpu_common.h.meta | 35 ++++++++++++++++++- .../shaders/ffx_core_gpu_common_half.h.meta | 35 ++++++++++++++++++- .../FSR2/shaders/ffx_core_hlsl.h.meta | 35 ++++++++++++++++++- .../FSR2/shaders/ffx_core_portability.h.meta | 35 ++++++++++++++++++- Assets/Resources/FSR2/shaders/ffx_fsr1.h.meta | 35 ++++++++++++++++++- .../FSR2/shaders/ffx_fsr2_accumulate.h.meta | 35 ++++++++++++++++++- .../shaders/ffx_fsr2_callbacks_hlsl.h.meta | 35 ++++++++++++++++++- .../FSR2/shaders/ffx_fsr2_common.h.meta | 35 ++++++++++++++++++- .../ffx_fsr2_compute_luminance_pyramid.h.meta | 35 ++++++++++++++++++- .../FSR2/shaders/ffx_fsr2_depth_clip.h.meta | 35 ++++++++++++++++++- .../FSR2/shaders/ffx_fsr2_lock.h.meta | 35 ++++++++++++++++++- .../ffx_fsr2_postprocess_lock_status.h.meta | 35 ++++++++++++++++++- .../FSR2/shaders/ffx_fsr2_rcas.h.meta | 35 ++++++++++++++++++- ...dilated_velocity_and_previous_depth.h.meta | 35 ++++++++++++++++++- .../FSR2/shaders/ffx_fsr2_reproject.h.meta | 35 ++++++++++++++++++- .../FSR2/shaders/ffx_fsr2_resources.h.meta | 35 ++++++++++++++++++- .../FSR2/shaders/ffx_fsr2_sample.h.meta | 35 ++++++++++++++++++- .../FSR2/shaders/ffx_fsr2_tcr_autogen.h.meta | 35 ++++++++++++++++++- .../FSR2/shaders/ffx_fsr2_upsample.h.meta | 35 ++++++++++++++++++- Assets/Resources/FSR2/shaders/ffx_spd.h.meta | 35 ++++++++++++++++++- Assets/Scripts/Core/Fsr2Callbacks.cs | 15 ++++++++ Assets/Scripts/Fsr2ImageEffect.cs | 4 +-- 25 files changed, 799 insertions(+), 25 deletions(-) diff --git a/Assets/Resources/FSR2/shaders/ffx_common_types.h.meta b/Assets/Resources/FSR2/shaders/ffx_common_types.h.meta index 203c57a..f2cc805 100644 --- a/Assets/Resources/FSR2/shaders/ffx_common_types.h.meta +++ b/Assets/Resources/FSR2/shaders/ffx_common_types.h.meta @@ -11,10 +11,25 @@ PluginImporter: isExplicitlyReferenced: 0 validateReferences: 1 platformData: + - first: + : Any + second: + enabled: 0 + settings: + Exclude Editor: 1 + Exclude GameCoreScarlett: 1 + Exclude GameCoreXboxOne: 1 + Exclude Linux64: 1 + Exclude OSXUniversal: 1 + Exclude PS4: 1 + Exclude PS5: 1 + Exclude WebGL: 1 + Exclude Win: 1 + Exclude Win64: 1 - first: Any: second: - enabled: 1 + enabled: 0 settings: {} - first: Editor: Editor @@ -22,6 +37,24 @@ PluginImporter: enabled: 0 settings: DefaultValueInitialized: true + - first: + Standalone: Linux64 + second: + enabled: 0 + settings: + CPU: None + - first: + Standalone: Win + second: + enabled: 0 + settings: + CPU: None + - first: + Standalone: Win64 + second: + enabled: 0 + settings: + CPU: None userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Resources/FSR2/shaders/ffx_core.h.meta b/Assets/Resources/FSR2/shaders/ffx_core.h.meta index db53534..a5f80a7 100644 --- a/Assets/Resources/FSR2/shaders/ffx_core.h.meta +++ b/Assets/Resources/FSR2/shaders/ffx_core.h.meta @@ -11,10 +11,25 @@ PluginImporter: isExplicitlyReferenced: 0 validateReferences: 1 platformData: + - first: + : Any + second: + enabled: 0 + settings: + Exclude Editor: 1 + Exclude GameCoreScarlett: 1 + Exclude GameCoreXboxOne: 1 + Exclude Linux64: 1 + Exclude OSXUniversal: 1 + Exclude PS4: 1 + Exclude PS5: 1 + Exclude WebGL: 1 + Exclude Win: 1 + Exclude Win64: 1 - first: Any: second: - enabled: 1 + enabled: 0 settings: {} - first: Editor: Editor @@ -22,6 +37,24 @@ PluginImporter: enabled: 0 settings: DefaultValueInitialized: true + - first: + Standalone: Linux64 + second: + enabled: 0 + settings: + CPU: None + - first: + Standalone: Win + second: + enabled: 0 + settings: + CPU: None + - first: + Standalone: Win64 + second: + enabled: 0 + settings: + CPU: None userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Resources/FSR2/shaders/ffx_core_cpu.h.meta b/Assets/Resources/FSR2/shaders/ffx_core_cpu.h.meta index 704e2e3..7edf590 100644 --- a/Assets/Resources/FSR2/shaders/ffx_core_cpu.h.meta +++ b/Assets/Resources/FSR2/shaders/ffx_core_cpu.h.meta @@ -11,10 +11,25 @@ PluginImporter: isExplicitlyReferenced: 0 validateReferences: 1 platformData: + - first: + : Any + second: + enabled: 0 + settings: + Exclude Editor: 1 + Exclude GameCoreScarlett: 1 + Exclude GameCoreXboxOne: 1 + Exclude Linux64: 1 + Exclude OSXUniversal: 1 + Exclude PS4: 1 + Exclude PS5: 1 + Exclude WebGL: 1 + Exclude Win: 1 + Exclude Win64: 1 - first: Any: second: - enabled: 1 + enabled: 0 settings: {} - first: Editor: Editor @@ -22,6 +37,24 @@ PluginImporter: enabled: 0 settings: DefaultValueInitialized: true + - first: + Standalone: Linux64 + second: + enabled: 0 + settings: + CPU: None + - first: + Standalone: Win + second: + enabled: 0 + settings: + CPU: None + - first: + Standalone: Win64 + second: + enabled: 0 + settings: + CPU: None userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Resources/FSR2/shaders/ffx_core_gpu_common.h.meta b/Assets/Resources/FSR2/shaders/ffx_core_gpu_common.h.meta index 26832e5..8f9711f 100644 --- a/Assets/Resources/FSR2/shaders/ffx_core_gpu_common.h.meta +++ b/Assets/Resources/FSR2/shaders/ffx_core_gpu_common.h.meta @@ -11,10 +11,25 @@ PluginImporter: isExplicitlyReferenced: 0 validateReferences: 1 platformData: + - first: + : Any + second: + enabled: 0 + settings: + Exclude Editor: 1 + Exclude GameCoreScarlett: 1 + Exclude GameCoreXboxOne: 1 + Exclude Linux64: 1 + Exclude OSXUniversal: 1 + Exclude PS4: 1 + Exclude PS5: 1 + Exclude WebGL: 1 + Exclude Win: 1 + Exclude Win64: 1 - first: Any: second: - enabled: 1 + enabled: 0 settings: {} - first: Editor: Editor @@ -22,6 +37,24 @@ PluginImporter: enabled: 0 settings: DefaultValueInitialized: true + - first: + Standalone: Linux64 + second: + enabled: 0 + settings: + CPU: None + - first: + Standalone: Win + second: + enabled: 0 + settings: + CPU: None + - first: + Standalone: Win64 + second: + enabled: 0 + settings: + CPU: None userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Resources/FSR2/shaders/ffx_core_gpu_common_half.h.meta b/Assets/Resources/FSR2/shaders/ffx_core_gpu_common_half.h.meta index 22f9f75..1d826e4 100644 --- a/Assets/Resources/FSR2/shaders/ffx_core_gpu_common_half.h.meta +++ b/Assets/Resources/FSR2/shaders/ffx_core_gpu_common_half.h.meta @@ -11,10 +11,25 @@ PluginImporter: isExplicitlyReferenced: 0 validateReferences: 1 platformData: + - first: + : Any + second: + enabled: 0 + settings: + Exclude Editor: 1 + Exclude GameCoreScarlett: 1 + Exclude GameCoreXboxOne: 1 + Exclude Linux64: 1 + Exclude OSXUniversal: 1 + Exclude PS4: 1 + Exclude PS5: 1 + Exclude WebGL: 1 + Exclude Win: 1 + Exclude Win64: 1 - first: Any: second: - enabled: 1 + enabled: 0 settings: {} - first: Editor: Editor @@ -22,6 +37,24 @@ PluginImporter: enabled: 0 settings: DefaultValueInitialized: true + - first: + Standalone: Linux64 + second: + enabled: 0 + settings: + CPU: None + - first: + Standalone: Win + second: + enabled: 0 + settings: + CPU: None + - first: + Standalone: Win64 + second: + enabled: 0 + settings: + CPU: None userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Resources/FSR2/shaders/ffx_core_hlsl.h.meta b/Assets/Resources/FSR2/shaders/ffx_core_hlsl.h.meta index 996147a..5a91c43 100644 --- a/Assets/Resources/FSR2/shaders/ffx_core_hlsl.h.meta +++ b/Assets/Resources/FSR2/shaders/ffx_core_hlsl.h.meta @@ -11,10 +11,25 @@ PluginImporter: isExplicitlyReferenced: 0 validateReferences: 1 platformData: + - first: + : Any + second: + enabled: 0 + settings: + Exclude Editor: 1 + Exclude GameCoreScarlett: 1 + Exclude GameCoreXboxOne: 1 + Exclude Linux64: 1 + Exclude OSXUniversal: 1 + Exclude PS4: 1 + Exclude PS5: 1 + Exclude WebGL: 1 + Exclude Win: 1 + Exclude Win64: 1 - first: Any: second: - enabled: 1 + enabled: 0 settings: {} - first: Editor: Editor @@ -22,6 +37,24 @@ PluginImporter: enabled: 0 settings: DefaultValueInitialized: true + - first: + Standalone: Linux64 + second: + enabled: 0 + settings: + CPU: None + - first: + Standalone: Win + second: + enabled: 0 + settings: + CPU: None + - first: + Standalone: Win64 + second: + enabled: 0 + settings: + CPU: None userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Resources/FSR2/shaders/ffx_core_portability.h.meta b/Assets/Resources/FSR2/shaders/ffx_core_portability.h.meta index 7cc75c1..aad361f 100644 --- a/Assets/Resources/FSR2/shaders/ffx_core_portability.h.meta +++ b/Assets/Resources/FSR2/shaders/ffx_core_portability.h.meta @@ -11,10 +11,25 @@ PluginImporter: isExplicitlyReferenced: 0 validateReferences: 1 platformData: + - first: + : Any + second: + enabled: 0 + settings: + Exclude Editor: 1 + Exclude GameCoreScarlett: 1 + Exclude GameCoreXboxOne: 1 + Exclude Linux64: 1 + Exclude OSXUniversal: 1 + Exclude PS4: 1 + Exclude PS5: 1 + Exclude WebGL: 1 + Exclude Win: 1 + Exclude Win64: 1 - first: Any: second: - enabled: 1 + enabled: 0 settings: {} - first: Editor: Editor @@ -22,6 +37,24 @@ PluginImporter: enabled: 0 settings: DefaultValueInitialized: true + - first: + Standalone: Linux64 + second: + enabled: 0 + settings: + CPU: None + - first: + Standalone: Win + second: + enabled: 0 + settings: + CPU: None + - first: + Standalone: Win64 + second: + enabled: 0 + settings: + CPU: None userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Resources/FSR2/shaders/ffx_fsr1.h.meta b/Assets/Resources/FSR2/shaders/ffx_fsr1.h.meta index 9691905..cf43a8b 100644 --- a/Assets/Resources/FSR2/shaders/ffx_fsr1.h.meta +++ b/Assets/Resources/FSR2/shaders/ffx_fsr1.h.meta @@ -11,10 +11,25 @@ PluginImporter: isExplicitlyReferenced: 0 validateReferences: 1 platformData: + - first: + : Any + second: + enabled: 0 + settings: + Exclude Editor: 1 + Exclude GameCoreScarlett: 1 + Exclude GameCoreXboxOne: 1 + Exclude Linux64: 1 + Exclude OSXUniversal: 1 + Exclude PS4: 1 + Exclude PS5: 1 + Exclude WebGL: 1 + Exclude Win: 1 + Exclude Win64: 1 - first: Any: second: - enabled: 1 + enabled: 0 settings: {} - first: Editor: Editor @@ -22,6 +37,24 @@ PluginImporter: enabled: 0 settings: DefaultValueInitialized: true + - first: + Standalone: Linux64 + second: + enabled: 0 + settings: + CPU: None + - first: + Standalone: Win + second: + enabled: 0 + settings: + CPU: None + - first: + Standalone: Win64 + second: + enabled: 0 + settings: + CPU: None userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Resources/FSR2/shaders/ffx_fsr2_accumulate.h.meta b/Assets/Resources/FSR2/shaders/ffx_fsr2_accumulate.h.meta index 203a52f..51859c3 100644 --- a/Assets/Resources/FSR2/shaders/ffx_fsr2_accumulate.h.meta +++ b/Assets/Resources/FSR2/shaders/ffx_fsr2_accumulate.h.meta @@ -11,10 +11,25 @@ PluginImporter: isExplicitlyReferenced: 0 validateReferences: 1 platformData: + - first: + : Any + second: + enabled: 0 + settings: + Exclude Editor: 1 + Exclude GameCoreScarlett: 1 + Exclude GameCoreXboxOne: 1 + Exclude Linux64: 1 + Exclude OSXUniversal: 1 + Exclude PS4: 1 + Exclude PS5: 1 + Exclude WebGL: 1 + Exclude Win: 1 + Exclude Win64: 1 - first: Any: second: - enabled: 1 + enabled: 0 settings: {} - first: Editor: Editor @@ -22,6 +37,24 @@ PluginImporter: enabled: 0 settings: DefaultValueInitialized: true + - first: + Standalone: Linux64 + second: + enabled: 0 + settings: + CPU: None + - first: + Standalone: Win + second: + enabled: 0 + settings: + CPU: None + - first: + Standalone: Win64 + second: + enabled: 0 + settings: + CPU: None userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Resources/FSR2/shaders/ffx_fsr2_callbacks_hlsl.h.meta b/Assets/Resources/FSR2/shaders/ffx_fsr2_callbacks_hlsl.h.meta index 1627fd4..97858ae 100644 --- a/Assets/Resources/FSR2/shaders/ffx_fsr2_callbacks_hlsl.h.meta +++ b/Assets/Resources/FSR2/shaders/ffx_fsr2_callbacks_hlsl.h.meta @@ -11,10 +11,25 @@ PluginImporter: isExplicitlyReferenced: 0 validateReferences: 1 platformData: + - first: + : Any + second: + enabled: 0 + settings: + Exclude Editor: 1 + Exclude GameCoreScarlett: 1 + Exclude GameCoreXboxOne: 1 + Exclude Linux64: 1 + Exclude OSXUniversal: 1 + Exclude PS4: 1 + Exclude PS5: 1 + Exclude WebGL: 1 + Exclude Win: 1 + Exclude Win64: 1 - first: Any: second: - enabled: 1 + enabled: 0 settings: {} - first: Editor: Editor @@ -22,6 +37,24 @@ PluginImporter: enabled: 0 settings: DefaultValueInitialized: true + - first: + Standalone: Linux64 + second: + enabled: 0 + settings: + CPU: None + - first: + Standalone: Win + second: + enabled: 0 + settings: + CPU: None + - first: + Standalone: Win64 + second: + enabled: 0 + settings: + CPU: None userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Resources/FSR2/shaders/ffx_fsr2_common.h.meta b/Assets/Resources/FSR2/shaders/ffx_fsr2_common.h.meta index 2264050..0e3bb9c 100644 --- a/Assets/Resources/FSR2/shaders/ffx_fsr2_common.h.meta +++ b/Assets/Resources/FSR2/shaders/ffx_fsr2_common.h.meta @@ -11,10 +11,25 @@ PluginImporter: isExplicitlyReferenced: 0 validateReferences: 1 platformData: + - first: + : Any + second: + enabled: 0 + settings: + Exclude Editor: 1 + Exclude GameCoreScarlett: 1 + Exclude GameCoreXboxOne: 1 + Exclude Linux64: 1 + Exclude OSXUniversal: 1 + Exclude PS4: 1 + Exclude PS5: 1 + Exclude WebGL: 1 + Exclude Win: 1 + Exclude Win64: 1 - first: Any: second: - enabled: 1 + enabled: 0 settings: {} - first: Editor: Editor @@ -22,6 +37,24 @@ PluginImporter: enabled: 0 settings: DefaultValueInitialized: true + - first: + Standalone: Linux64 + second: + enabled: 0 + settings: + CPU: None + - first: + Standalone: Win + second: + enabled: 0 + settings: + CPU: None + - first: + Standalone: Win64 + second: + enabled: 0 + settings: + CPU: None userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Resources/FSR2/shaders/ffx_fsr2_compute_luminance_pyramid.h.meta b/Assets/Resources/FSR2/shaders/ffx_fsr2_compute_luminance_pyramid.h.meta index 08c002c..c8cb631 100644 --- a/Assets/Resources/FSR2/shaders/ffx_fsr2_compute_luminance_pyramid.h.meta +++ b/Assets/Resources/FSR2/shaders/ffx_fsr2_compute_luminance_pyramid.h.meta @@ -11,10 +11,25 @@ PluginImporter: isExplicitlyReferenced: 0 validateReferences: 1 platformData: + - first: + : Any + second: + enabled: 0 + settings: + Exclude Editor: 1 + Exclude GameCoreScarlett: 1 + Exclude GameCoreXboxOne: 1 + Exclude Linux64: 1 + Exclude OSXUniversal: 1 + Exclude PS4: 1 + Exclude PS5: 1 + Exclude WebGL: 1 + Exclude Win: 1 + Exclude Win64: 1 - first: Any: second: - enabled: 1 + enabled: 0 settings: {} - first: Editor: Editor @@ -22,6 +37,24 @@ PluginImporter: enabled: 0 settings: DefaultValueInitialized: true + - first: + Standalone: Linux64 + second: + enabled: 0 + settings: + CPU: None + - first: + Standalone: Win + second: + enabled: 0 + settings: + CPU: None + - first: + Standalone: Win64 + second: + enabled: 0 + settings: + CPU: None userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Resources/FSR2/shaders/ffx_fsr2_depth_clip.h.meta b/Assets/Resources/FSR2/shaders/ffx_fsr2_depth_clip.h.meta index eca1b58..dbdf299 100644 --- a/Assets/Resources/FSR2/shaders/ffx_fsr2_depth_clip.h.meta +++ b/Assets/Resources/FSR2/shaders/ffx_fsr2_depth_clip.h.meta @@ -11,10 +11,25 @@ PluginImporter: isExplicitlyReferenced: 0 validateReferences: 1 platformData: + - first: + : Any + second: + enabled: 0 + settings: + Exclude Editor: 1 + Exclude GameCoreScarlett: 1 + Exclude GameCoreXboxOne: 1 + Exclude Linux64: 1 + Exclude OSXUniversal: 1 + Exclude PS4: 1 + Exclude PS5: 1 + Exclude WebGL: 1 + Exclude Win: 1 + Exclude Win64: 1 - first: Any: second: - enabled: 1 + enabled: 0 settings: {} - first: Editor: Editor @@ -22,6 +37,24 @@ PluginImporter: enabled: 0 settings: DefaultValueInitialized: true + - first: + Standalone: Linux64 + second: + enabled: 0 + settings: + CPU: None + - first: + Standalone: Win + second: + enabled: 0 + settings: + CPU: None + - first: + Standalone: Win64 + second: + enabled: 0 + settings: + CPU: None userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Resources/FSR2/shaders/ffx_fsr2_lock.h.meta b/Assets/Resources/FSR2/shaders/ffx_fsr2_lock.h.meta index 6d83098..21f4814 100644 --- a/Assets/Resources/FSR2/shaders/ffx_fsr2_lock.h.meta +++ b/Assets/Resources/FSR2/shaders/ffx_fsr2_lock.h.meta @@ -11,10 +11,25 @@ PluginImporter: isExplicitlyReferenced: 0 validateReferences: 1 platformData: + - first: + : Any + second: + enabled: 0 + settings: + Exclude Editor: 1 + Exclude GameCoreScarlett: 1 + Exclude GameCoreXboxOne: 1 + Exclude Linux64: 1 + Exclude OSXUniversal: 1 + Exclude PS4: 1 + Exclude PS5: 1 + Exclude WebGL: 1 + Exclude Win: 1 + Exclude Win64: 1 - first: Any: second: - enabled: 1 + enabled: 0 settings: {} - first: Editor: Editor @@ -22,6 +37,24 @@ PluginImporter: enabled: 0 settings: DefaultValueInitialized: true + - first: + Standalone: Linux64 + second: + enabled: 0 + settings: + CPU: None + - first: + Standalone: Win + second: + enabled: 0 + settings: + CPU: None + - first: + Standalone: Win64 + second: + enabled: 0 + settings: + CPU: None userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Resources/FSR2/shaders/ffx_fsr2_postprocess_lock_status.h.meta b/Assets/Resources/FSR2/shaders/ffx_fsr2_postprocess_lock_status.h.meta index ab7b1dd..ddb6dda 100644 --- a/Assets/Resources/FSR2/shaders/ffx_fsr2_postprocess_lock_status.h.meta +++ b/Assets/Resources/FSR2/shaders/ffx_fsr2_postprocess_lock_status.h.meta @@ -11,10 +11,25 @@ PluginImporter: isExplicitlyReferenced: 0 validateReferences: 1 platformData: + - first: + : Any + second: + enabled: 0 + settings: + Exclude Editor: 1 + Exclude GameCoreScarlett: 1 + Exclude GameCoreXboxOne: 1 + Exclude Linux64: 1 + Exclude OSXUniversal: 1 + Exclude PS4: 1 + Exclude PS5: 1 + Exclude WebGL: 1 + Exclude Win: 1 + Exclude Win64: 1 - first: Any: second: - enabled: 1 + enabled: 0 settings: {} - first: Editor: Editor @@ -22,6 +37,24 @@ PluginImporter: enabled: 0 settings: DefaultValueInitialized: true + - first: + Standalone: Linux64 + second: + enabled: 0 + settings: + CPU: None + - first: + Standalone: Win + second: + enabled: 0 + settings: + CPU: None + - first: + Standalone: Win64 + second: + enabled: 0 + settings: + CPU: None userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Resources/FSR2/shaders/ffx_fsr2_rcas.h.meta b/Assets/Resources/FSR2/shaders/ffx_fsr2_rcas.h.meta index 5df489b..e962499 100644 --- a/Assets/Resources/FSR2/shaders/ffx_fsr2_rcas.h.meta +++ b/Assets/Resources/FSR2/shaders/ffx_fsr2_rcas.h.meta @@ -11,10 +11,25 @@ PluginImporter: isExplicitlyReferenced: 0 validateReferences: 1 platformData: + - first: + : Any + second: + enabled: 0 + settings: + Exclude Editor: 1 + Exclude GameCoreScarlett: 1 + Exclude GameCoreXboxOne: 1 + Exclude Linux64: 1 + Exclude OSXUniversal: 1 + Exclude PS4: 1 + Exclude PS5: 1 + Exclude WebGL: 1 + Exclude Win: 1 + Exclude Win64: 1 - first: Any: second: - enabled: 1 + enabled: 0 settings: {} - first: Editor: Editor @@ -22,6 +37,24 @@ PluginImporter: enabled: 0 settings: DefaultValueInitialized: true + - first: + Standalone: Linux64 + second: + enabled: 0 + settings: + CPU: None + - first: + Standalone: Win + second: + enabled: 0 + settings: + CPU: None + - first: + Standalone: Win64 + second: + enabled: 0 + settings: + CPU: None userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Resources/FSR2/shaders/ffx_fsr2_reconstruct_dilated_velocity_and_previous_depth.h.meta b/Assets/Resources/FSR2/shaders/ffx_fsr2_reconstruct_dilated_velocity_and_previous_depth.h.meta index 9af47d5..9b82a1a 100644 --- a/Assets/Resources/FSR2/shaders/ffx_fsr2_reconstruct_dilated_velocity_and_previous_depth.h.meta +++ b/Assets/Resources/FSR2/shaders/ffx_fsr2_reconstruct_dilated_velocity_and_previous_depth.h.meta @@ -11,10 +11,25 @@ PluginImporter: isExplicitlyReferenced: 0 validateReferences: 1 platformData: + - first: + : Any + second: + enabled: 0 + settings: + Exclude Editor: 1 + Exclude GameCoreScarlett: 1 + Exclude GameCoreXboxOne: 1 + Exclude Linux64: 1 + Exclude OSXUniversal: 1 + Exclude PS4: 1 + Exclude PS5: 1 + Exclude WebGL: 1 + Exclude Win: 1 + Exclude Win64: 1 - first: Any: second: - enabled: 1 + enabled: 0 settings: {} - first: Editor: Editor @@ -22,6 +37,24 @@ PluginImporter: enabled: 0 settings: DefaultValueInitialized: true + - first: + Standalone: Linux64 + second: + enabled: 0 + settings: + CPU: None + - first: + Standalone: Win + second: + enabled: 0 + settings: + CPU: None + - first: + Standalone: Win64 + second: + enabled: 0 + settings: + CPU: None userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Resources/FSR2/shaders/ffx_fsr2_reproject.h.meta b/Assets/Resources/FSR2/shaders/ffx_fsr2_reproject.h.meta index 1071a12..ef8ce86 100644 --- a/Assets/Resources/FSR2/shaders/ffx_fsr2_reproject.h.meta +++ b/Assets/Resources/FSR2/shaders/ffx_fsr2_reproject.h.meta @@ -11,10 +11,25 @@ PluginImporter: isExplicitlyReferenced: 0 validateReferences: 1 platformData: + - first: + : Any + second: + enabled: 0 + settings: + Exclude Editor: 1 + Exclude GameCoreScarlett: 1 + Exclude GameCoreXboxOne: 1 + Exclude Linux64: 1 + Exclude OSXUniversal: 1 + Exclude PS4: 1 + Exclude PS5: 1 + Exclude WebGL: 1 + Exclude Win: 1 + Exclude Win64: 1 - first: Any: second: - enabled: 1 + enabled: 0 settings: {} - first: Editor: Editor @@ -22,6 +37,24 @@ PluginImporter: enabled: 0 settings: DefaultValueInitialized: true + - first: + Standalone: Linux64 + second: + enabled: 0 + settings: + CPU: None + - first: + Standalone: Win + second: + enabled: 0 + settings: + CPU: None + - first: + Standalone: Win64 + second: + enabled: 0 + settings: + CPU: None userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Resources/FSR2/shaders/ffx_fsr2_resources.h.meta b/Assets/Resources/FSR2/shaders/ffx_fsr2_resources.h.meta index 9ee0942..69e95a4 100644 --- a/Assets/Resources/FSR2/shaders/ffx_fsr2_resources.h.meta +++ b/Assets/Resources/FSR2/shaders/ffx_fsr2_resources.h.meta @@ -11,10 +11,25 @@ PluginImporter: isExplicitlyReferenced: 0 validateReferences: 1 platformData: + - first: + : Any + second: + enabled: 0 + settings: + Exclude Editor: 1 + Exclude GameCoreScarlett: 1 + Exclude GameCoreXboxOne: 1 + Exclude Linux64: 1 + Exclude OSXUniversal: 1 + Exclude PS4: 1 + Exclude PS5: 1 + Exclude WebGL: 1 + Exclude Win: 1 + Exclude Win64: 1 - first: Any: second: - enabled: 1 + enabled: 0 settings: {} - first: Editor: Editor @@ -22,6 +37,24 @@ PluginImporter: enabled: 0 settings: DefaultValueInitialized: true + - first: + Standalone: Linux64 + second: + enabled: 0 + settings: + CPU: None + - first: + Standalone: Win + second: + enabled: 0 + settings: + CPU: None + - first: + Standalone: Win64 + second: + enabled: 0 + settings: + CPU: None userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Resources/FSR2/shaders/ffx_fsr2_sample.h.meta b/Assets/Resources/FSR2/shaders/ffx_fsr2_sample.h.meta index 8977d12..acc8bab 100644 --- a/Assets/Resources/FSR2/shaders/ffx_fsr2_sample.h.meta +++ b/Assets/Resources/FSR2/shaders/ffx_fsr2_sample.h.meta @@ -11,10 +11,25 @@ PluginImporter: isExplicitlyReferenced: 0 validateReferences: 1 platformData: + - first: + : Any + second: + enabled: 0 + settings: + Exclude Editor: 1 + Exclude GameCoreScarlett: 1 + Exclude GameCoreXboxOne: 1 + Exclude Linux64: 1 + Exclude OSXUniversal: 1 + Exclude PS4: 1 + Exclude PS5: 1 + Exclude WebGL: 1 + Exclude Win: 1 + Exclude Win64: 1 - first: Any: second: - enabled: 1 + enabled: 0 settings: {} - first: Editor: Editor @@ -22,6 +37,24 @@ PluginImporter: enabled: 0 settings: DefaultValueInitialized: true + - first: + Standalone: Linux64 + second: + enabled: 0 + settings: + CPU: None + - first: + Standalone: Win + second: + enabled: 0 + settings: + CPU: None + - first: + Standalone: Win64 + second: + enabled: 0 + settings: + CPU: None userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Resources/FSR2/shaders/ffx_fsr2_tcr_autogen.h.meta b/Assets/Resources/FSR2/shaders/ffx_fsr2_tcr_autogen.h.meta index c135d50..a2af34e 100644 --- a/Assets/Resources/FSR2/shaders/ffx_fsr2_tcr_autogen.h.meta +++ b/Assets/Resources/FSR2/shaders/ffx_fsr2_tcr_autogen.h.meta @@ -11,10 +11,25 @@ PluginImporter: isExplicitlyReferenced: 0 validateReferences: 1 platformData: + - first: + : Any + second: + enabled: 0 + settings: + Exclude Editor: 1 + Exclude GameCoreScarlett: 1 + Exclude GameCoreXboxOne: 1 + Exclude Linux64: 1 + Exclude OSXUniversal: 1 + Exclude PS4: 1 + Exclude PS5: 1 + Exclude WebGL: 1 + Exclude Win: 1 + Exclude Win64: 1 - first: Any: second: - enabled: 1 + enabled: 0 settings: {} - first: Editor: Editor @@ -22,6 +37,24 @@ PluginImporter: enabled: 0 settings: DefaultValueInitialized: true + - first: + Standalone: Linux64 + second: + enabled: 0 + settings: + CPU: None + - first: + Standalone: Win + second: + enabled: 0 + settings: + CPU: None + - first: + Standalone: Win64 + second: + enabled: 0 + settings: + CPU: None userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Resources/FSR2/shaders/ffx_fsr2_upsample.h.meta b/Assets/Resources/FSR2/shaders/ffx_fsr2_upsample.h.meta index 778092e..c9fa0a3 100644 --- a/Assets/Resources/FSR2/shaders/ffx_fsr2_upsample.h.meta +++ b/Assets/Resources/FSR2/shaders/ffx_fsr2_upsample.h.meta @@ -11,10 +11,25 @@ PluginImporter: isExplicitlyReferenced: 0 validateReferences: 1 platformData: + - first: + : Any + second: + enabled: 0 + settings: + Exclude Editor: 1 + Exclude GameCoreScarlett: 1 + Exclude GameCoreXboxOne: 1 + Exclude Linux64: 1 + Exclude OSXUniversal: 1 + Exclude PS4: 1 + Exclude PS5: 1 + Exclude WebGL: 1 + Exclude Win: 1 + Exclude Win64: 1 - first: Any: second: - enabled: 1 + enabled: 0 settings: {} - first: Editor: Editor @@ -22,6 +37,24 @@ PluginImporter: enabled: 0 settings: DefaultValueInitialized: true + - first: + Standalone: Linux64 + second: + enabled: 0 + settings: + CPU: None + - first: + Standalone: Win + second: + enabled: 0 + settings: + CPU: None + - first: + Standalone: Win64 + second: + enabled: 0 + settings: + CPU: None userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Resources/FSR2/shaders/ffx_spd.h.meta b/Assets/Resources/FSR2/shaders/ffx_spd.h.meta index e17851b..d896fc1 100644 --- a/Assets/Resources/FSR2/shaders/ffx_spd.h.meta +++ b/Assets/Resources/FSR2/shaders/ffx_spd.h.meta @@ -11,10 +11,25 @@ PluginImporter: isExplicitlyReferenced: 0 validateReferences: 1 platformData: + - first: + : Any + second: + enabled: 0 + settings: + Exclude Editor: 1 + Exclude GameCoreScarlett: 1 + Exclude GameCoreXboxOne: 1 + Exclude Linux64: 1 + Exclude OSXUniversal: 1 + Exclude PS4: 1 + Exclude PS5: 1 + Exclude WebGL: 1 + Exclude Win: 1 + Exclude Win64: 1 - first: Any: second: - enabled: 1 + enabled: 0 settings: {} - first: Editor: Editor @@ -22,6 +37,24 @@ PluginImporter: enabled: 0 settings: DefaultValueInitialized: true + - first: + Standalone: Linux64 + second: + enabled: 0 + settings: + CPU: None + - first: + Standalone: Win + second: + enabled: 0 + settings: + CPU: None + - first: + Standalone: Win64 + second: + enabled: 0 + settings: + CPU: None userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Scripts/Core/Fsr2Callbacks.cs b/Assets/Scripts/Core/Fsr2Callbacks.cs index cc384f9..c3c06e1 100644 --- a/Assets/Scripts/Core/Fsr2Callbacks.cs +++ b/Assets/Scripts/Core/Fsr2Callbacks.cs @@ -42,6 +42,8 @@ namespace FidelityFX /// You may also want to store the bias offset value and apply it to any assets that are loaded in on demand. /// void ApplyMipmapBias(float biasOffset); + + void UndoMipmapBias(float biasOffset); } /// @@ -76,10 +78,23 @@ namespace FidelityFX { CurrentBiasOffset += biasOffset; + if (Mathf.Approximately(CurrentBiasOffset, 0f)) + { + CurrentBiasOffset = 0f; + } + foreach (var texture in Resources.FindObjectsOfTypeAll()) { + if (texture.mipmapCount <= 1) + continue; + texture.mipMapBias += biasOffset; } } + + public virtual void UndoMipmapBias(float biasOffset) + { + ApplyMipmapBias(-biasOffset); + } } } diff --git a/Assets/Scripts/Fsr2ImageEffect.cs b/Assets/Scripts/Fsr2ImageEffect.cs index 3d06aba..4475ebd 100644 --- a/Assets/Scripts/Fsr2ImageEffect.cs +++ b/Assets/Scripts/Fsr2ImageEffect.cs @@ -249,9 +249,9 @@ namespace FidelityFX private void UndoMipmapBias() { // Undo the current mipmap bias offset - if (!float.IsNaN(_appliedBiasOffset) && !float.IsInfinity(_appliedBiasOffset) && _appliedBiasOffset != 0f) + if (_appliedBiasOffset != 0f && !float.IsNaN(_appliedBiasOffset) && !float.IsInfinity(_appliedBiasOffset)) { - Callbacks.ApplyMipmapBias(-_appliedBiasOffset); + Callbacks.UndoMipmapBias(_appliedBiasOffset); _appliedBiasOffset = 0f; } }