From cc3a42a7a14052a8e46084134d465101e25b14c4 Mon Sep 17 00:00:00 2001 From: StarBeats <977663818@qq.com> Date: Thu, 26 Dec 2024 15:09:43 +0800 Subject: [PATCH] xess add antighost --- Assets/Scenes/Test.cs | 2 +- Assets/Scenes/Test.cs.meta | 2 +- Assets/Settings/Mobile/Mobile_High.asset | 4 +- .../Mobile/Mobile_High_Renderer.asset | 27 ++-- .../package/Plugins/x86_64/sl.pcl.dll.meta | 27 ---- .../Runtime/StreamlineDLSSCore.cs.meta | 11 ++ .../Runtime}/Plugins.meta | 0 .../Runtime}/Plugins/Android.meta | 0 .../Android/libGfxPluginNativeRender.so | Bin .../Android/libGfxPluginNativeRender.so.meta | 0 .../Runtime}/Plugins/Mac.meta | 0 .../Runtime}/Plugins/Mac/MetalFX.swift | 0 .../Runtime}/Plugins/Mac/MetalFX.swift.meta | 0 .../Mac/libGfxPluginNativeRender.dylib | Bin .../Mac/libGfxPluginNativeRender.dylib.meta | 0 .../Runtime}/Plugins/Windows.meta | 0 .../Plugins/Windows/GfxPluginNativeRender.dll | Bin 296960 -> 296960 bytes .../Windows/GfxPluginNativeRender.dll.meta | 0 .../Runtime}/Plugins/Windows/libxess.dll | Bin .../Runtime}/Plugins/Windows/libxess.dll.meta | 0 .../Runtime}/Plugins/iOS.meta | 0 .../Runtime}/Plugins/iOS/IUnityGraphics.h | 124 +++++++++--------- .../Plugins/iOS/IUnityGraphics.h.meta | 0 .../Runtime}/Plugins/iOS/RegisterPlugin.mm | 42 +++--- .../Plugins/iOS/RegisterPlugin.mm.meta | 0 .../Plugins/iOS/libGfxPluginNativeRender.a | Bin .../iOS/libGfxPluginNativeRender.a.meta | 0 .../Runtime/SuperRendering/SR/Scripts/XESS.cs | 16 ++- .../Runtime/TemporalAA.cs | 10 ++ UserSettings/EditorUserSettings.asset | 4 +- 30 files changed, 135 insertions(+), 134 deletions(-) delete mode 100644 Packages/com.nvidia.streamline.core-0.0.1-alpha1.dev/package/Plugins/x86_64/sl.pcl.dll.meta create mode 100644 Packages/com.nvidia.streamline.core-0.0.1-alpha1.dev/package/Runtime/StreamlineDLSSCore.cs.meta rename {Assets => Packages/com.unity.render-pipelines.universal@14.0.11/Runtime}/Plugins.meta (100%) rename {Assets => Packages/com.unity.render-pipelines.universal@14.0.11/Runtime}/Plugins/Android.meta (100%) rename {Assets => Packages/com.unity.render-pipelines.universal@14.0.11/Runtime}/Plugins/Android/libGfxPluginNativeRender.so (100%) rename {Assets => Packages/com.unity.render-pipelines.universal@14.0.11/Runtime}/Plugins/Android/libGfxPluginNativeRender.so.meta (100%) rename {Assets => Packages/com.unity.render-pipelines.universal@14.0.11/Runtime}/Plugins/Mac.meta (100%) rename {Assets => Packages/com.unity.render-pipelines.universal@14.0.11/Runtime}/Plugins/Mac/MetalFX.swift (100%) rename {Assets => Packages/com.unity.render-pipelines.universal@14.0.11/Runtime}/Plugins/Mac/MetalFX.swift.meta (100%) rename {Assets => Packages/com.unity.render-pipelines.universal@14.0.11/Runtime}/Plugins/Mac/libGfxPluginNativeRender.dylib (100%) mode change 100755 => 100644 rename {Assets => Packages/com.unity.render-pipelines.universal@14.0.11/Runtime}/Plugins/Mac/libGfxPluginNativeRender.dylib.meta (100%) rename {Assets => Packages/com.unity.render-pipelines.universal@14.0.11/Runtime}/Plugins/Windows.meta (100%) rename {Assets => Packages/com.unity.render-pipelines.universal@14.0.11/Runtime}/Plugins/Windows/GfxPluginNativeRender.dll (99%) rename {Assets => Packages/com.unity.render-pipelines.universal@14.0.11/Runtime}/Plugins/Windows/GfxPluginNativeRender.dll.meta (100%) rename {Assets => Packages/com.unity.render-pipelines.universal@14.0.11/Runtime}/Plugins/Windows/libxess.dll (100%) rename {Assets => Packages/com.unity.render-pipelines.universal@14.0.11/Runtime}/Plugins/Windows/libxess.dll.meta (100%) rename {Assets => Packages/com.unity.render-pipelines.universal@14.0.11/Runtime}/Plugins/iOS.meta (100%) rename {Assets => Packages/com.unity.render-pipelines.universal@14.0.11/Runtime}/Plugins/iOS/IUnityGraphics.h (98%) rename {Assets => Packages/com.unity.render-pipelines.universal@14.0.11/Runtime}/Plugins/iOS/IUnityGraphics.h.meta (100%) rename {Assets => Packages/com.unity.render-pipelines.universal@14.0.11/Runtime}/Plugins/iOS/RegisterPlugin.mm (96%) rename {Assets => Packages/com.unity.render-pipelines.universal@14.0.11/Runtime}/Plugins/iOS/RegisterPlugin.mm.meta (100%) rename {Assets => Packages/com.unity.render-pipelines.universal@14.0.11/Runtime}/Plugins/iOS/libGfxPluginNativeRender.a (100%) rename {Assets => Packages/com.unity.render-pipelines.universal@14.0.11/Runtime}/Plugins/iOS/libGfxPluginNativeRender.a.meta (100%) diff --git a/Assets/Scenes/Test.cs b/Assets/Scenes/Test.cs index b2f25b7..d30aef5 100644 --- a/Assets/Scenes/Test.cs +++ b/Assets/Scenes/Test.cs @@ -25,7 +25,7 @@ public class Test : MonoBehaviour private void Update() { - transform?.Rotate(new Vector3(0, 0.5f, 0)); + transform?.Rotate(new Vector3(0, 0.1f, 0)); } private void OnGUI() diff --git a/Assets/Scenes/Test.cs.meta b/Assets/Scenes/Test.cs.meta index 2df8e81..d17b863 100644 --- a/Assets/Scenes/Test.cs.meta +++ b/Assets/Scenes/Test.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: Xnwd4ymoVn5T21JNkRdz/wbaTps3w3Z40N+XT4ognLZgPi/O+54tq4M= +guid: a8f562490b8d41b47a6b21e2f514d782 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Assets/Settings/Mobile/Mobile_High.asset b/Assets/Settings/Mobile/Mobile_High.asset index 35933c4..b11d182 100644 --- a/Assets/Settings/Mobile/Mobile_High.asset +++ b/Assets/Settings/Mobile/Mobile_High.asset @@ -28,7 +28,7 @@ MonoBehaviour: m_SupportsHDR: 1 m_HDRColorBufferPrecision: 0 m_MSAA: 1 - m_RenderScale: 0.75 + m_RenderScale: 0.3335938 m_UpscalingFilter: 0 m_FsrOverrideSharpness: 1 m_FsrSharpness: 1 @@ -114,5 +114,5 @@ MonoBehaviour: m_PrefilterNativeRenderPass: 1 m_ShaderVariantLogLevel: 0 m_ShadowCascades: 0 - superResolution: 12 + superResolution: 16 vrsRate: 0 diff --git a/Assets/Settings/Mobile/Mobile_High_Renderer.asset b/Assets/Settings/Mobile/Mobile_High_Renderer.asset index deb1d73..4e1dec9 100644 --- a/Assets/Settings/Mobile/Mobile_High_Renderer.asset +++ b/Assets/Settings/Mobile/Mobile_High_Renderer.asset @@ -102,7 +102,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: f5759a0bb27e83b4ab2925ac09c35710, type: 3} m_Name: DLSS m_EditorClassIdentifier: - m_Active: 1 + m_Active: 0 quality: 1 useOptimalSetting: 1 sharpness: 0.126 @@ -318,25 +318,26 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: b1643a5e9ea49724e8a7bc2c6f3713e1, type: 3} m_Name: XESS m_EditorClassIdentifier: - m_Active: 0 + m_Active: 1 xess1ConfigParam: - OutputWidth: 0 - OutputHeight: 0 - Quality: 0 + OutputWidth: 2560 + OutputHeight: 1440 + Quality: 103 UseHiResMotionVectors: 0 UseJitteredMotionVectors: 0 - UseMotionVectorsInNDC: 0 + UseMotionVectorsInNDC: 1 UseExposureTexture: 0 UseResponsiveMask: 0 UseAutoExposure: 0 EnableProfiling: 0 - InvertedDepth: 0 - VelocityScaleX: 0 - VelocityScaleY: 0 - JitterScaleX: 0 - JitterScaleY: 0 - ExposureScale: 0 - MipMapBias: 0 + InvertedDepth: 1 + VelocityScaleX: 1 + VelocityScaleY: 1 + JitterScaleX: 1 + JitterScaleY: 1 + ExposureScale: 1 + MipMapBias: -2.13 + antiGhosting: 0.385 --- !u!114 &6334271670068977784 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/Packages/com.nvidia.streamline.core-0.0.1-alpha1.dev/package/Plugins/x86_64/sl.pcl.dll.meta b/Packages/com.nvidia.streamline.core-0.0.1-alpha1.dev/package/Plugins/x86_64/sl.pcl.dll.meta deleted file mode 100644 index d6ddc05..0000000 --- a/Packages/com.nvidia.streamline.core-0.0.1-alpha1.dev/package/Plugins/x86_64/sl.pcl.dll.meta +++ /dev/null @@ -1,27 +0,0 @@ -fileFormatVersion: 2 -guid: aa3cdfd7567ede4499cc98b29a53314c -PluginImporter: - externalObjects: {} - serializedVersion: 2 - iconMap: {} - executionOrder: {} - defineConstraints: [] - isPreloaded: 0 - isOverridable: 0 - isExplicitlyReferenced: 0 - validateReferences: 1 - platformData: - - first: - Any: - second: - enabled: 1 - settings: {} - - first: - Editor: Editor - second: - enabled: 0 - settings: - DefaultValueInitialized: true - userData: - assetBundleName: - assetBundleVariant: diff --git a/Packages/com.nvidia.streamline.core-0.0.1-alpha1.dev/package/Runtime/StreamlineDLSSCore.cs.meta b/Packages/com.nvidia.streamline.core-0.0.1-alpha1.dev/package/Runtime/StreamlineDLSSCore.cs.meta new file mode 100644 index 0000000..3c7e474 --- /dev/null +++ b/Packages/com.nvidia.streamline.core-0.0.1-alpha1.dev/package/Runtime/StreamlineDLSSCore.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: a5171d7af8fd96541abc84cf8775397e +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Plugins.meta b/Packages/com.unity.render-pipelines.universal@14.0.11/Runtime/Plugins.meta similarity index 100% rename from Assets/Plugins.meta rename to Packages/com.unity.render-pipelines.universal@14.0.11/Runtime/Plugins.meta diff --git a/Assets/Plugins/Android.meta b/Packages/com.unity.render-pipelines.universal@14.0.11/Runtime/Plugins/Android.meta similarity index 100% rename from Assets/Plugins/Android.meta rename to Packages/com.unity.render-pipelines.universal@14.0.11/Runtime/Plugins/Android.meta diff --git a/Assets/Plugins/Android/libGfxPluginNativeRender.so b/Packages/com.unity.render-pipelines.universal@14.0.11/Runtime/Plugins/Android/libGfxPluginNativeRender.so similarity index 100% rename from Assets/Plugins/Android/libGfxPluginNativeRender.so rename to Packages/com.unity.render-pipelines.universal@14.0.11/Runtime/Plugins/Android/libGfxPluginNativeRender.so diff --git a/Assets/Plugins/Android/libGfxPluginNativeRender.so.meta b/Packages/com.unity.render-pipelines.universal@14.0.11/Runtime/Plugins/Android/libGfxPluginNativeRender.so.meta similarity index 100% rename from Assets/Plugins/Android/libGfxPluginNativeRender.so.meta rename to Packages/com.unity.render-pipelines.universal@14.0.11/Runtime/Plugins/Android/libGfxPluginNativeRender.so.meta diff --git a/Assets/Plugins/Mac.meta b/Packages/com.unity.render-pipelines.universal@14.0.11/Runtime/Plugins/Mac.meta similarity index 100% rename from Assets/Plugins/Mac.meta rename to Packages/com.unity.render-pipelines.universal@14.0.11/Runtime/Plugins/Mac.meta diff --git a/Assets/Plugins/Mac/MetalFX.swift b/Packages/com.unity.render-pipelines.universal@14.0.11/Runtime/Plugins/Mac/MetalFX.swift similarity index 100% rename from Assets/Plugins/Mac/MetalFX.swift rename to Packages/com.unity.render-pipelines.universal@14.0.11/Runtime/Plugins/Mac/MetalFX.swift diff --git a/Assets/Plugins/Mac/MetalFX.swift.meta b/Packages/com.unity.render-pipelines.universal@14.0.11/Runtime/Plugins/Mac/MetalFX.swift.meta similarity index 100% rename from Assets/Plugins/Mac/MetalFX.swift.meta rename to Packages/com.unity.render-pipelines.universal@14.0.11/Runtime/Plugins/Mac/MetalFX.swift.meta diff --git a/Assets/Plugins/Mac/libGfxPluginNativeRender.dylib b/Packages/com.unity.render-pipelines.universal@14.0.11/Runtime/Plugins/Mac/libGfxPluginNativeRender.dylib old mode 100755 new mode 100644 similarity index 100% rename from Assets/Plugins/Mac/libGfxPluginNativeRender.dylib rename to Packages/com.unity.render-pipelines.universal@14.0.11/Runtime/Plugins/Mac/libGfxPluginNativeRender.dylib diff --git a/Assets/Plugins/Mac/libGfxPluginNativeRender.dylib.meta b/Packages/com.unity.render-pipelines.universal@14.0.11/Runtime/Plugins/Mac/libGfxPluginNativeRender.dylib.meta similarity index 100% rename from Assets/Plugins/Mac/libGfxPluginNativeRender.dylib.meta rename to Packages/com.unity.render-pipelines.universal@14.0.11/Runtime/Plugins/Mac/libGfxPluginNativeRender.dylib.meta diff --git a/Assets/Plugins/Windows.meta b/Packages/com.unity.render-pipelines.universal@14.0.11/Runtime/Plugins/Windows.meta similarity index 100% rename from Assets/Plugins/Windows.meta rename to Packages/com.unity.render-pipelines.universal@14.0.11/Runtime/Plugins/Windows.meta diff --git a/Assets/Plugins/Windows/GfxPluginNativeRender.dll b/Packages/com.unity.render-pipelines.universal@14.0.11/Runtime/Plugins/Windows/GfxPluginNativeRender.dll similarity index 99% rename from Assets/Plugins/Windows/GfxPluginNativeRender.dll rename to Packages/com.unity.render-pipelines.universal@14.0.11/Runtime/Plugins/Windows/GfxPluginNativeRender.dll index 3b91eae0c5eb577c5978246ffe5a8ff0a00bd108..e680352ebb637bba46ae7acfefc7a3fba2702329 100644 GIT binary patch delta 40 rcmZpeAk;8HXoCPF^TB^P&BBcB!i*ryv|X5yIq^P7aC`X!=Fa5+5("NeedJitter", true); - SuperResolutionParamSets.Instance.Set("MipmapBias", xess1ConfigParam.MipMapBias); + SuperResolutionParamSets.Instance.Set("MipmapBias", MipMapBias); SuperResolutionParamSets.Instance.Set("JitterScale", xess1ConfigParam.JitterScaleX); + SuperResolutionParamSets.Instance.Set("AntiGhosting", antiGhosting); var jitter = TemporalAA.CurrentJitter; diff --git a/Packages/com.unity.render-pipelines.universal@14.0.11/Runtime/TemporalAA.cs b/Packages/com.unity.render-pipelines.universal@14.0.11/Runtime/TemporalAA.cs index 65596ae..6a5c1cd 100644 --- a/Packages/com.unity.render-pipelines.universal@14.0.11/Runtime/TemporalAA.cs +++ b/Packages/com.unity.render-pipelines.universal@14.0.11/Runtime/TemporalAA.cs @@ -341,7 +341,17 @@ namespace UnityEngine.Rendering.Universal // instability in Unity's shadow maps, so we avoid index 0. float jitterX = HaltonSequence.Get((frameIndex & 1023) + 1, 2) - 0.5f; float jitterY = HaltonSequence.Get((frameIndex & 1023) + 1, 3) - 0.5f; + float antiGhosting = 0; + SuperResolutionParamSets.Instance.Get("AntiGhosting", ref antiGhosting); + if (antiGhosting > 0.0f) + { + jitterX += Random.Range(-0.1f * antiGhosting, 0.1f * antiGhosting); + jitterY += Random.Range(-0.1f * antiGhosting, 0.1f * antiGhosting); + + jitterX = Mathf.Clamp(jitterX, -0.5f, 0.5f); + jitterY = Mathf.Clamp(jitterY, -0.5f, 0.5f); + } return new Vector2(jitterX, jitterY); } diff --git a/UserSettings/EditorUserSettings.asset b/UserSettings/EditorUserSettings.asset index e8526a7..f62c9b3 100644 --- a/UserSettings/EditorUserSettings.asset +++ b/UserSettings/EditorUserSettings.asset @@ -15,10 +15,10 @@ EditorUserSettings: value: 5b00515154055e035459547042705a44154f1e2c2e2e7f677e7d4567e1b9376d flags: 0 RecentlyUsedSceneGuid-3: - value: 57050d5004060d590f56087046700f4445164c7e7a7824312e7c4e6bb0e1376d + value: 5a57555407545f0b5e0f5f764277594914161e2b787977692b714e64e4b2363b flags: 0 RecentlyUsedSceneGuid-4: - value: 5a57555407545f0b5e0f5f764277594914161e2b787977692b714e64e4b2363b + value: 57050d5004060d590f56087046700f4445164c7e7a7824312e7c4e6bb0e1376d flags: 0 vcSharedLogLevel: value: 0d5e400f0650