From 1e986bf7239fd4b8b01f3729cbfa3f5835e588b8 Mon Sep 17 00:00:00 2001 From: hezhengyi Date: Mon, 22 Jan 2024 17:33:46 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=BC=96=E8=AF=91host?= =?UTF-8?q?=E7=9B=B8=E5=85=B3=E7=9A=84=E6=8A=A5=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: hezhengyi --- fml/logging_unittests.cc | 4 ++++ impeller/playground/playground_impl.cc | 4 ++++ impeller/renderer/backend/vulkan/render_pass_vk.cc | 2 ++ 3 files changed, 10 insertions(+) diff --git a/fml/logging_unittests.cc b/fml/logging_unittests.cc index a64d33e52f..74caf80d71 100644 --- a/fml/logging_unittests.cc +++ b/fml/logging_unittests.cc @@ -16,6 +16,10 @@ #include "gmock/gmock.h" #endif +#ifdef __clang__ +#pragma clang diagnostic ignored "-Wreturn-type" +#endif + namespace fml { namespace testing { diff --git a/impeller/playground/playground_impl.cc b/impeller/playground/playground_impl.cc index 613de6e411..e26f84ff6b 100644 --- a/impeller/playground/playground_impl.cc +++ b/impeller/playground/playground_impl.cc @@ -19,6 +19,10 @@ #include "impeller/playground/backend/vulkan/playground_impl_vk.h" #endif // IMPELLER_ENABLE_VULKAN +#ifdef __clang__ +#pragma clang diagnostic ignored "-Wreturn-type" +#endif + namespace impeller { std::unique_ptr PlaygroundImpl::Create( diff --git a/impeller/renderer/backend/vulkan/render_pass_vk.cc b/impeller/renderer/backend/vulkan/render_pass_vk.cc index 08d4cd6fad..2d20bd0510 100644 --- a/impeller/renderer/backend/vulkan/render_pass_vk.cc +++ b/impeller/renderer/backend/vulkan/render_pass_vk.cc @@ -1,7 +1,9 @@ // Copyright 2013 The Flutter Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#ifdef __clang__ #pragma clang diagnostic ignored "-Wreturn-type" +#endif #include "impeller/renderer/backend/vulkan/render_pass_vk.h" -- Gitee From 531b458df4a870413f05fd8f47c60e0dac3582e3 Mon Sep 17 00:00:00 2001 From: hezhengyi Date: Thu, 25 Jan 2024 15:29:00 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=BC=96=E8=AF=91android?= =?UTF-8?q?=E7=9B=B8=E5=85=B3=E7=9A=84=E6=8A=A5=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: hezhengyi --- impeller/tools/impeller.gni | 4 ++-- shell/platform/android/android_surface_gl_impeller.cc | 4 ++++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/impeller/tools/impeller.gni b/impeller/tools/impeller.gni index 3df2553437..6490cd7a9d 100644 --- a/impeller/tools/impeller.gni +++ b/impeller/tools/impeller.gni @@ -17,8 +17,8 @@ declare_args() { impeller_enable_opengles = is_linux || is_win || is_android ||is_ohos # Whether the Vulkan backend is enabled. - #impeller_enable_vulkan = is_mac || is_linux || is_win || is_android - impeller_enable_vulkan = is_win || is_android + impeller_enable_vulkan = is_mac || is_linux || is_win || is_android + #impeller_enable_vulkan = is_win || is_android # Whether to use a prebuilt impellerc. # If this is the empty string, impellerc will be built. diff --git a/shell/platform/android/android_surface_gl_impeller.cc b/shell/platform/android/android_surface_gl_impeller.cc index 89cbf668a7..5d66ab422f 100644 --- a/shell/platform/android/android_surface_gl_impeller.cc +++ b/shell/platform/android/android_surface_gl_impeller.cc @@ -12,6 +12,10 @@ #include "flutter/impeller/toolkit/egl/surface.h" #include "flutter/shell/gpu/gpu_surface_gl_impeller.h" +#ifdef __clang__ +#pragma clang diagnostic ignored "-Wreturn-type" +#endif + namespace flutter { class AndroidSurfaceGLImpeller::ReactorWorker final -- Gitee From b860d612cfebbfb2867c61030ae86462a297a8f2 Mon Sep 17 00:00:00 2001 From: hezhengyi Date: Thu, 25 Jan 2024 20:47:55 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=BC=96=E8=AF=91?= =?UTF-8?q?=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: hezhengyi --- impeller/tools/impeller.gni | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/impeller/tools/impeller.gni b/impeller/tools/impeller.gni index 6490cd7a9d..0c54d8de36 100644 --- a/impeller/tools/impeller.gni +++ b/impeller/tools/impeller.gni @@ -17,8 +17,8 @@ declare_args() { impeller_enable_opengles = is_linux || is_win || is_android ||is_ohos # Whether the Vulkan backend is enabled. - impeller_enable_vulkan = is_mac || is_linux || is_win || is_android - #impeller_enable_vulkan = is_win || is_android + #impeller_enable_vulkan = is_mac || is_linux || is_win || is_android + impeller_enable_vulkan = (is_win || is_android || is_linux) && !is_ohos # Whether to use a prebuilt impellerc. # If this is the empty string, impellerc will be built. -- Gitee From 3b3900813d44d2f7df8c13919813d6e5e110bd75 Mon Sep 17 00:00:00 2001 From: hezhengyi Date: Fri, 23 Feb 2024 18:05:14 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E7=BC=96=E8=AF=91host=E4=BA=A7=E7=89=A9?= =?UTF-8?q?=E8=B0=83=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: hezhengyi --- fml/message_loop_impl_unittests.cc | 2 +- tools/gn | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/fml/message_loop_impl_unittests.cc b/fml/message_loop_impl_unittests.cc index 1846f8c9d4..4225ef84e5 100644 --- a/fml/message_loop_impl_unittests.cc +++ b/fml/message_loop_impl_unittests.cc @@ -13,7 +13,7 @@ #define TIMESENSITIVE(x) TimeSensitiveTest_##x TEST(MessageLoopImpl, TIMESENSITIVE(WakeUpTimersAreSingletons)) { - auto loop_impl = fml::MessageLoopImpl::Create(); + auto loop_impl = fml::MessageLoopImpl::Create(nullptr); const auto t1 = fml::TimeDelta::FromMilliseconds(10); const auto t2 = fml::TimeDelta::FromMilliseconds(30); diff --git a/tools/gn b/tools/gn index 98a207a1be..a9f38074da 100755 --- a/tools/gn +++ b/tools/gn @@ -280,9 +280,6 @@ def to_gn_args(args): if args.enable_unittests: gn_args['enable_unittests'] = args.enable_unittests - gn_args['enable_unittests'] = False - print("enable_unittests:%s" % gn_args['enable_unittests'] ); - # Skia GN args. gn_args['skia_enable_flutter_defines' ] = True # Enable Flutter API guards in Skia. -- Gitee From 7565f6e2896c90d4dd0717b7fbd8f674924949c7 Mon Sep 17 00:00:00 2001 From: hezhengyi Date: Wed, 28 Feb 2024 09:38:16 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9ohos=5Fapi=5Finit?= =?UTF-8?q?=E8=B5=8B=E5=80=BC=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: hezhengyi --- tools/gn | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/tools/gn b/tools/gn index a9f38074da..881c32f7ec 100755 --- a/tools/gn +++ b/tools/gn @@ -301,8 +301,9 @@ def to_gn_args(args): gn_args['android_full_debug' ] = args.target_os == 'android' and args.unoptimized - gn_args['ohos_api_int'] = args.ohos_api_int - + if args.target_os == 'ohos': + gn_args['ohos_api_int'] = args.ohos_api_int + if args.clang is None: gn_args['is_clang'] = True else: -- Gitee From afcfc0f8ea647c99f1b8afa4ebc628987f4f1429 Mon Sep 17 00:00:00 2001 From: hezhengyi Date: Tue, 5 Mar 2024 17:24:42 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dmacos=E7=BC=96=E8=AF=91en?= =?UTF-8?q?gine=E7=9A=84host=E4=BA=A7=E7=89=A9=E6=8A=A5=E9=94=99=E7=9A=84?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: hezhengyi --- impeller/tools/impeller.gni | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/impeller/tools/impeller.gni b/impeller/tools/impeller.gni index 0c54d8de36..28484b966a 100644 --- a/impeller/tools/impeller.gni +++ b/impeller/tools/impeller.gni @@ -11,13 +11,12 @@ declare_args() { impeller_enable_playground = false # Whether the Metal backend is enabled. - impeller_enable_metal = is_ios + impeller_enable_metal = is_mac || is_ios # Whether the OpenGLES backend is enabled. - impeller_enable_opengles = is_linux || is_win || is_android ||is_ohos + impeller_enable_opengles = is_mac || is_linux || is_win || is_android || is_ohos # Whether the Vulkan backend is enabled. - #impeller_enable_vulkan = is_mac || is_linux || is_win || is_android impeller_enable_vulkan = (is_win || is_android || is_linux) && !is_ohos # Whether to use a prebuilt impellerc. -- Gitee