From 6ff93e79ad45a4bf844fdbba5dcbc14f0a12552b Mon Sep 17 00:00:00 2001 From: Nico de Poel Date: Fri, 28 Feb 2025 10:30:01 +0100 Subject: [PATCH] Auto-sync from SVN revision 59715 --- .../RenderPass/Upscalers/PSSRUpscalerPlugin.cs | 2 +- Packages/com.unity.ugui/Runtime/TMP/TMP_SubMeshUI.cs | 9 ++++++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/Packages/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/RenderPass/Upscalers/PSSRUpscalerPlugin.cs b/Packages/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/RenderPass/Upscalers/PSSRUpscalerPlugin.cs index 06a29ee6..6ab557cb 100644 --- a/Packages/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/RenderPass/Upscalers/PSSRUpscalerPlugin.cs +++ b/Packages/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/RenderPass/Upscalers/PSSRUpscalerPlugin.cs @@ -159,7 +159,7 @@ namespace UnityEngine.Rendering.HighDefinition.AMD.PSSR public override void Execute(CommandBuffer cmd, in FSR2CommandExecutionData executeData, in FSR2TextureTable textures) { - if (!_initialized) + if (!_initialized || executeData.renderSizeWidth < _initData.displaySizeWidth / 3 || executeData.renderSizeHeight < _initData.displaySizeHeight / 3) { cmd.Blit(textures.colorInput, textures.colorOutput); return; diff --git a/Packages/com.unity.ugui/Runtime/TMP/TMP_SubMeshUI.cs b/Packages/com.unity.ugui/Runtime/TMP/TMP_SubMeshUI.cs index 9aa238be..1b959cac 100644 --- a/Packages/com.unity.ugui/Runtime/TMP/TMP_SubMeshUI.cs +++ b/Packages/com.unity.ugui/Runtime/TMP/TMP_SubMeshUI.cs @@ -216,7 +216,14 @@ namespace TMPro go.hideFlags = TMP_Settings.hideSubTextObjects ? HideFlags.HideAndDontSave : HideFlags.DontSave; go.transform.SetParent(textComponent.transform, false); - go.transform.SetAsFirstSibling(); + + // -- WW1MOD -- + // This SpriteAsset check determines if this SubText is a sprite + // If it is, we move it to the top of the Child Order so it renders first (behind the keybind label) + if(materialReference.spriteAsset != null) + go.transform.SetAsFirstSibling(); + // -- END WW1MOD -- + go.layer = textComponent.gameObject.layer; #if UNITY_EDITOR