From 442f7402b7fba89a62d798c8b503e31c1f3383d3 Mon Sep 17 00:00:00 2001 From: Zeqiang Li Date: Thu, 31 Aug 2023 15:03:42 +0800 Subject: [PATCH 01/28] macos 10.x -> 11+ api change (#16153) --- native/cocos/renderer/gfx-metal/MTLTexture.mm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/native/cocos/renderer/gfx-metal/MTLTexture.mm b/native/cocos/renderer/gfx-metal/MTLTexture.mm index 2359cd99697..028baba2a35 100644 --- a/native/cocos/renderer/gfx-metal/MTLTexture.mm +++ b/native/cocos/renderer/gfx-metal/MTLTexture.mm @@ -235,6 +235,7 @@ of this software and associated engine source code (the "Software"), a limited, descriptor.arrayLength = _info.type == TextureType::CUBE ? 1 : _info.layerCount; bool memoryless = false; +#if !(CC_PLATFORM == CC_PLATFORM_MACOS && __MAC_OS_X_VERSION_MIN_REQUIRED < 110000) if (@available(macos 11.0, ios 10.0, *)) { memoryless = hasFlag(_info.flags, TextureFlagBit::LAZILY_ALLOCATED) && hasAllFlags(TextureUsageBit::COLOR_ATTACHMENT | TextureUsageBit::DEPTH_STENCIL_ATTACHMENT | TextureUsageBit::INPUT_ATTACHMENT, _info.usage); @@ -243,7 +244,7 @@ of this software and associated engine source code (the "Software"), a limited, _allocateMemory = false; } } - +#endif if (!memoryless && !_isPVRTC) { // pvrtc can not use blit encoder to upload data. descriptor.storageMode = MTLStorageModePrivate; From 2b275816fcb651fb1ee890ed54447d17044eaabf Mon Sep 17 00:00:00 2001 From: troublemaker52025 Date: Thu, 31 Aug 2023 16:00:36 +0800 Subject: [PATCH 02/28] post-final pass keep alpha channel (#16149) --- editor/assets/effects/pipeline/post-process/post-final.effect | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/editor/assets/effects/pipeline/post-process/post-final.effect b/editor/assets/effects/pipeline/post-process/post-final.effect index a1c6e08c4d2..3d8aa313f37 100644 --- a/editor/assets/effects/pipeline/post-process/post-final.effect +++ b/editor/assets/effects/pipeline/post-process/post-final.effect @@ -33,7 +33,7 @@ CCProgram fs %{ layout(location = 0) out vec4 fragColor; void main () { - fragColor = vec4(texture(inputTexture, v_uv).rgb, 1.0); + fragColor = texture(inputTexture, v_uv); } }% From 4d213938e972e84ba718e18927e8be6dfbe01727 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=84=E6=A3=AE=E6=96=8C?= Date: Thu, 31 Aug 2023 16:22:24 +0800 Subject: [PATCH 03/28] fix update widget occur error (#16139) * fix update widget occur error * update expression --- editor/inspector/components/widget.js | 8 ++++++-- editor/inspector/contributions/node.js | 6 +++--- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/editor/inspector/components/widget.js b/editor/inspector/components/widget.js index a4b52964acd..85e97d536a5 100644 --- a/editor/inspector/components/widget.js +++ b/editor/inspector/components/widget.js @@ -8,6 +8,7 @@ const Vue = require('vue/dist/vue.min.js'); const propUtils = require('../utils/prop'); const cssMediaWidth = 340; +let layout = 'vertical'; exports.template = `