From 0976656c34d20d2fc4d7269afe3a82f0ca01e8ea Mon Sep 17 00:00:00 2001 From: StarBeats <977663818@qq.com> Date: Wed, 19 Feb 2025 17:51:58 +0800 Subject: [PATCH] sync --- Assets/Settings/Mobile/Mobile_High.asset | 6 +++--- Assets/Settings/Mobile/Mobile_High_Renderer.asset | 8 ++++---- NativeRenderPlugin/xmake.lua | 7 +++++-- .../SuperRendering/NatvieHelper/RenderingPlugin.cs | 2 +- 4 files changed, 13 insertions(+), 10 deletions(-) diff --git a/Assets/Settings/Mobile/Mobile_High.asset b/Assets/Settings/Mobile/Mobile_High.asset index 80832a7..edc4346 100644 --- a/Assets/Settings/Mobile/Mobile_High.asset +++ b/Assets/Settings/Mobile/Mobile_High.asset @@ -28,8 +28,8 @@ MonoBehaviour: m_SupportsHDR: 1 m_HDRColorBufferPrecision: 0 m_MSAA: 1 - m_RenderScale: 1 - m_UpscalingFilter: 3 + m_RenderScale: 0.58823526 + m_UpscalingFilter: 0 m_FsrOverrideSharpness: 1 m_FsrSharpness: 1 m_EnableLODCrossFade: 1 @@ -114,5 +114,5 @@ MonoBehaviour: m_PrefilterNativeRenderPass: 1 m_ShaderVariantLogLevel: 0 m_ShadowCascades: 0 - superResolution: 0 + superResolution: 5 vrsRate: 0 diff --git a/Assets/Settings/Mobile/Mobile_High_Renderer.asset b/Assets/Settings/Mobile/Mobile_High_Renderer.asset index 2dd9bc2..870d7ec 100644 --- a/Assets/Settings/Mobile/Mobile_High_Renderer.asset +++ b/Assets/Settings/Mobile/Mobile_High_Renderer.asset @@ -79,7 +79,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: a00dddc5b3ea7fe45953ccbd49b58b94, type: 3} m_Name: GSR m_EditorClassIdentifier: - m_Active: 0 + m_Active: 1 quality: 4 v1settings: EnableEdgeDirection: 1 @@ -88,12 +88,12 @@ MonoBehaviour: MipMapBias: -0.35 GSRV1Material: {fileID: 2100000, guid: d57e64d5723127243b429034bed82c7d, type: 2} v2settings: - UseCompute2Pass: 1 + UseCompute2Pass: 0 GSRV2Material: {fileID: 2100000, guid: faa906817c0647f42a0cec70faeb91c1, type: 2} GSRV2ComputeShader: {fileID: 7200000, guid: 9a4e6ff1f9a33fa4ea1e9744e313e2fd, type: 3} FiveSample: 0 - Exposure_co_rcp: 1 - MipMapBias: 0 + Exposure_co_rcp: 0.55 + MipMapBias: -0.04 --- !u!114 &-2390300670611609275 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/NativeRenderPlugin/xmake.lua b/NativeRenderPlugin/xmake.lua index 1c82cda..f70b7a2 100644 --- a/NativeRenderPlugin/xmake.lua +++ b/NativeRenderPlugin/xmake.lua @@ -103,6 +103,7 @@ target("GfxPluginNativeRender") if is_plat("harmonyos") then add_links("xengine") + add_cxxflags("-fPIE", "-fPIC") add_ldflags("-fPIE", "-fPIC") add_links("framegeneration") add_defines("OHOS=1") @@ -118,8 +119,10 @@ target_end() toolchain("ohndk") -- mark as standalone toolchain set_kind("standalone") - set_bindir("C:/Users/xinyt/AppData/Local/OpenHarmony/Sdk/12/native/llvm/bin") - + -- set_bindir("C:/Users/xinyt/AppData/Local/OpenHarmony/Sdk/12/native/llvm/bin") + + set_bindir("D:/tj/2022.3.48t2/Editor/Data/PlaybackEngines/OpenHarmonyPlayer/SDK/12/native/llvm/bin") + -- set toolset set_toolset("cc", "clang") set_toolset("cxx", "clang", "clang++") diff --git a/Packages/com.unity.render-pipelines.universal@14.0.11/Runtime/SuperRendering/NatvieHelper/RenderingPlugin.cs b/Packages/com.unity.render-pipelines.universal@14.0.11/Runtime/SuperRendering/NatvieHelper/RenderingPlugin.cs index 5811607..19e7f21 100644 --- a/Packages/com.unity.render-pipelines.universal@14.0.11/Runtime/SuperRendering/NatvieHelper/RenderingPlugin.cs +++ b/Packages/com.unity.render-pipelines.universal@14.0.11/Runtime/SuperRendering/NatvieHelper/RenderingPlugin.cs @@ -28,7 +28,7 @@ namespace X.Rendering.Feature #endif public static extern bool GetInputResolution(int outw, int outh, int quality, ref int width, ref int height); - //#if (PLATFORM_IOS || PLATFORM_TVOS || PLATFORM_BRATWURST ) && !UNITY_EDITOR + //#if (PLATFORM_IOS || PLATFORM_TVOS || PLATFORM_BRATWURST) && !UNITY_EDITOR // [DllImport("__Internal")] //#else // [DllImport("GfxPluginNativeRender")]