diff --git a/Assets/Scenes/Garden/Art/Terrain/Textures/Grass_01_T_H.png.meta b/Assets/Scenes/Garden/Art/Terrain/Textures/Grass_01_T_H.png.meta index 6189e1f..efdc9e0 100644 --- a/Assets/Scenes/Garden/Art/Terrain/Textures/Grass_01_T_H.png.meta +++ b/Assets/Scenes/Garden/Art/Terrain/Textures/Grass_01_T_H.png.meta @@ -3,7 +3,7 @@ guid: e9b44df76e8546f4d807ca8feb8089de TextureImporter: internalIDToNameTable: [] externalObjects: {} - serializedVersion: 12 + serializedVersion: 13 mipmaps: mipMapMode: 0 enableMipMap: 1 @@ -77,6 +77,7 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 - serializedVersion: 3 @@ -89,6 +90,7 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 - serializedVersion: 3 @@ -101,6 +103,7 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: diff --git a/Assets/Settings/Mobile/Mobile_High.asset b/Assets/Settings/Mobile/Mobile_High.asset index 7adbc00..4605d3b 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: 1 + m_RenderScale: 0.6666667 m_UpscalingFilter: 1 m_FsrOverrideSharpness: 1 m_FsrSharpness: 1 @@ -114,5 +114,5 @@ MonoBehaviour: m_PrefilterNativeRenderPass: 1 m_ShaderVariantLogLevel: 0 m_ShadowCascades: 0 - superResolution: 5 + superResolution: 3 vrsRate: 0 diff --git a/Assets/Settings/Mobile/Mobile_High_Renderer.asset b/Assets/Settings/Mobile/Mobile_High_Renderer.asset index 7b4417c..5045c81 100644 --- a/Assets/Settings/Mobile/Mobile_High_Renderer.asset +++ b/Assets/Settings/Mobile/Mobile_High_Renderer.asset @@ -43,7 +43,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 386e439eeef2849448d91896c74ff1d5, type: 3} m_Name: FSR m_EditorClassIdentifier: - m_Active: 0 + m_Active: 1 Quality: 1 v1setting: EasuCompute: {fileID: 7200000, guid: 787b0c165dad9074e9489817de945916, type: 3} @@ -94,7 +94,7 @@ MonoBehaviour: TransparencyAndCompositionMask: {fileID: 0} PreExposure: 1 PerformSharpenPass: 1 - Sharpness: 0.5 + Sharpness: 0.8 VelocityFactor: 1 AutoGenerateTransparencyAndComposition: 0 GenerateTransparencyAndCompositionParameters: @@ -122,6 +122,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_Active: 0 quality: 1 + superResolution: 4 spatialUpScaleSettings: sharpness: 0.35 --- !u!114 &-2621301742936824463 @@ -136,7 +137,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: a00dddc5b3ea7fe45953ccbd49b58b94, type: 3} m_Name: GSR m_EditorClassIdentifier: - m_Active: 1 + m_Active: 0 quality: 1 v1settings: EnableEdgeDirection: 1 @@ -144,13 +145,13 @@ MonoBehaviour: Sharp: 1.68 GSRV1Material: {fileID: 2100000, guid: d57e64d5723127243b429034bed82c7d, type: 2} v2settings: - UseCompute2Pass: 0 + UseCompute2Pass: 1 UseCompute3Pass: 0 GSRV2Material: {fileID: 2100000, guid: faa906817c0647f42a0cec70faeb91c1, type: 2} GSR2psComputeShader: {fileID: 7200000, guid: 9a4e6ff1f9a33fa4ea1e9744e313e2fd, type: 3} GSR3psComputeShader: {fileID: 7200000, guid: e1d5384c19bf4498b85b157bf0642a27, type: 3} FiveSample: 0 - Exposure_co_rcp: 3 + Exposure_co_rcp: 1 --- !u!114 &-2390300670611609275 MonoBehaviour: m_ObjectHideFlags: 0 @@ -248,11 +249,10 @@ MonoBehaviour: - {fileID: -8576419846133267094} - {fileID: 4395980931634258890} - {fileID: -8043853166483734676} - - {fileID: -4454652084718109581} - {fileID: 4071882023117421450} - {fileID: 5468006144702062375} - {fileID: -7284859345190182597} - m_RendererFeatureMap: bc3f630842f2e70dd6a559c442a94bfd4529d15534f2d3de228858dca8d12222716523fbf3439fdb7a327b7bff4bdd446ac59dfa966ffa88ca6373cd5da9013d6cff55ca297e5e90737c6cdc87e52dc28a7b3653203b8238279f9e2c9e42e24b3b2141bb05fbe69a + m_RendererFeatureMap: bc3f630842f2e70dd6a559c442a94bfd4529d15534f2d3de228858dca8d12222716523fbf3439fdb7a327b7bff4bdd446ac59dfa966ffa88ca6373cd5da9013d6cff55ca297e5e908a7b3653203b8238279f9e2c9e42e24b3b2141bb05fbe69a m_UseNativeRenderPass: 0 postProcessData: {fileID: 11400000, guid: 41439944d30ece34e96484bdb6645b55, type: 2} shaders: diff --git a/Packages/com.unity.render-pipelines.universal@14.0.11/Runtime/Passes/PostProcessPass.cs b/Packages/com.unity.render-pipelines.universal@14.0.11/Runtime/Passes/PostProcessPass.cs index 4716cd1..e738b18 100644 --- a/Packages/com.unity.render-pipelines.universal@14.0.11/Runtime/Passes/PostProcessPass.cs +++ b/Packages/com.unity.render-pipelines.universal@14.0.11/Runtime/Passes/PostProcessPass.cs @@ -497,7 +497,11 @@ namespace UnityEngine.Rendering.Universal } var asset = UniversalRenderPipeline.asset; // SuperResolution - if (asset.SuperResolution != ESuperResolution.None)// && asset.SuperResolution != ESuperResolution.FSR1) + if ( +#if UNITY_EDITOR + !cameraData.isPreviewCamera && !cameraData.isSceneViewCamera && +#endif + asset.SuperResolution != ESuperResolution.None)// && asset.SuperResolution != ESuperResolution.FSR1) { ref var colorDescriptor = ref cameraData.cameraTargetDescriptor; colorDescriptor.width = cameraData.camera.pixelWidth; 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 1be5410..b5be9d9 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 @@ -45,10 +45,6 @@ namespace X.Rendering.Feature PostFGExtrapolation, DisableFGExtrapolation, SpatialUpScale, - EnableXESS1, - DoXESS1, - UpdateXESS1Config, - DisableXESS1, }; public enum VRSPluginShadingRate @@ -62,6 +58,25 @@ namespace X.Rendering.Feature X1_PER_4X4_PIXELS, }; + //public enum PluginGraphicsFeature + //{ + // VRS_DRAW = 0, + // VRS_PRIMITIVE, + // VRS_ATTACHMENT, + // HW_SPATIAL_SR, + // METAL_VRR, + // HW_AI_SPATIAL_SR, + // HW_AI_TEMPORAL_SR, + // HW_ADAPTIVE_VRS, + // HW_FG_INTERPOLATE, + // HW_FG_EXTRAPOLATION, + // METAL_FX_SPATIAL_SR, + // METAL_FX_TEMPORAL_SR, + // VIVO_TEMPORAL_SR, + // QCOM_AFME, + // MAX_CNT + //}; + public enum GraphicsFeature { VRS_DRAW = 0, diff --git a/Packages/com.unity.render-pipelines.universal@14.0.11/Runtime/SuperRendering/SR/Scripts/XESS.cs b/Packages/com.unity.render-pipelines.universal@14.0.11/Runtime/SuperRendering/SR/Scripts/XESS.cs index 45ae5ea..f769f0c 100644 --- a/Packages/com.unity.render-pipelines.universal@14.0.11/Runtime/SuperRendering/SR/Scripts/XESS.cs +++ b/Packages/com.unity.render-pipelines.universal@14.0.11/Runtime/SuperRendering/SR/Scripts/XESS.cs @@ -151,7 +151,7 @@ namespace X.Rendering.Feature xesscfgPtr->VelocityScaleY = xess1ConfigParam.VelocityScaleY; xesscfgPtr->UseExposureTexture = xess1ConfigParam.UseExposureTexture; - cmd.IssuePluginEventAndData(RenderingPlugin.GetRenderEventAndDataFunc(), (int)RenderingPlugin.NativeRenderingEvent.EnableXESS1, IntPtr.Zero); + //cmd.IssuePluginEventAndData(RenderingPlugin.GetRenderEventAndDataFunc(), (int)RenderingPlugin.NativeRenderingEvent.EnableXESS1, IntPtr.Zero); resetHistory = true; deaylSetConfig = 3; //int w = 0, h = 0; @@ -193,7 +193,7 @@ namespace X.Rendering.Feature if (resetHistory) { xessexecPtr->ResetHistory = true; - cmd.IssuePluginEventAndData(RenderingPlugin.GetRenderEventAndDataFunc(), (int)RenderingPlugin.NativeRenderingEvent.UpdateXESS1Config, xess1ConfigParamPtr); + //cmd.IssuePluginEventAndData(RenderingPlugin.GetRenderEventAndDataFunc(), (int)RenderingPlugin.NativeRenderingEvent.UpdateXESS1Config, xess1ConfigParamPtr); resetHistory = false; } @@ -224,12 +224,12 @@ namespace X.Rendering.Feature xessexecPtr->Jitterx = jitter.x; xessexecPtr->Jittery = -jitter.y; - cmd.IssuePluginEventAndData(RenderingPlugin.GetRenderEventAndDataFunc(), (int)RenderingPlugin.NativeRenderingEvent.DoXESS1, xess1ExecParamPtr); + //cmd.IssuePluginEventAndData(RenderingPlugin.GetRenderEventAndDataFunc(), (int)RenderingPlugin.NativeRenderingEvent.DoXESS1, xess1ExecParamPtr); if (needTurnOffXess) { needTurnOffXess = false; - cmd.IssuePluginEventAndData(RenderingPlugin.GetRenderEventAndDataFunc(), (int)RenderingPlugin.NativeRenderingEvent.DisableXESS1, IntPtr.Zero); + //cmd.IssuePluginEventAndData(RenderingPlugin.GetRenderEventAndDataFunc(), (int)RenderingPlugin.NativeRenderingEvent.DisableXESS1, IntPtr.Zero); } if (sharpPass)