From 0917c3b4bcd5ef7ffc88db9e71416c77523b9bee Mon Sep 17 00:00:00 2001 From: yanansong Date: Thu, 8 Jun 2023 09:13:28 +0800 Subject: [PATCH 1/4] easy to use --- build/builder.py | 4 ++- build/builder/commands/build.py | 6 +++- build/prebuild.sh | 10 +++++-- .../core/pipeline/rs_render_service.cpp | 7 ----- etc/ft.xml | 30 +++++++++++++++++++ 5 files changed, 45 insertions(+), 12 deletions(-) create mode 100644 etc/ft.xml diff --git a/build/builder.py b/build/builder.py index a474f8c..efabf5d 100755 --- a/build/builder.py +++ b/build/builder.py @@ -87,7 +87,9 @@ class FtBuilder: choices=['DEBUG', 'INFO', 'WARNING', 'ERROR', 'FATAL', 'CRITICAL'], default='NOTSET', help='Set log level of builder.') - + build_parser.add_argument('-i', '--install', + action='store_true', + help='Install all library to /usr/lib64.') # Subcommand: format format_parser = subparsers.add_parser('format', help='Format C/C++ & GN files') format_parser.add_argument('--code-path', diff --git a/build/builder/commands/build.py b/build/builder/commands/build.py index fb530b0..e912040 100755 --- a/build/builder/commands/build.py +++ b/build/builder/commands/build.py @@ -53,7 +53,11 @@ class Builder: # return exec_sys_command(['ln', '-sf', os.path.join(self.build_output_dir, 'compile_commands.json'), self.project_dir])[0] exec_sys_command(['rm', '-f', os.path.join(self.project_dir, 'compile_commands.json')]) return exec_sys_command(['cp', os.path.join(self.build_output_dir, 'compile_commands.json'), self.project_dir])[0] - + if self.args.install is True: + librarys = os.listdir(os.path.join(self.build_output_dir, 'common/common/')) + for lib in librarys: + if '.so' in lib: + exec_sys_command(['cp', '-rf', os.path.join(self.build_output_dir, 'common/common/', lib), "/usr/lib64/"])[0] return True def launch_gn(self) -> bool: diff --git a/build/prebuild.sh b/build/prebuild.sh index 4b76d96..470d1ce 100755 --- a/build/prebuild.sh +++ b/build/prebuild.sh @@ -70,13 +70,13 @@ python3 ${PROJECT_DIR}/build/builder.py check --install-packages $* # install prebuild library if [ ! -d ${PROJECT_DIR}/prebuilts/libs ]; then -git clone https://gitee.com/yanansong/ft_engine_prebuild.git ${PROJECT_DIR}/prebuilts/libs +git clone https://gitee.com/yanansong/ft_engine_prebuild.git -b rpms ${PROJECT_DIR}/prebuilts/libs fi # copy prebuild library to /usr/lib64 ARCHNAME=`uname -m` -cd ${PROJECT_DIR}/prebuilts/libs/library/${ARCHNAME} -sudo cp -fr *.so /usr/local/lib64 +cd ${PROJECT_DIR}/prebuilts/libs/rpms/${ARCHNAME} +sudo installRPM cd ${PROJECT_DIR} rm -fr ${PROJECT_DIR}/prebuilts/libs @@ -99,6 +99,7 @@ cd ${PROJECT_DIR}/prebuilts/rpm/ft_surface_wrapper/ if [ ! -d ${PROJECT_DIR}/prebuilts/rpm/ft_surface_wrapper/build ]; then mkdir build fi + cd build cmake .. make -j6 @@ -114,4 +115,7 @@ cd ${PROJECT_DIR}/prebuilts/rpm/binary ./install.sh cd ${PROJECT_DIR} +sudo mkdir -p /usr/local/share/ft +sudo cp -fr ${PROJECT_DIR}/etc/ft.xml /usr/local/share/ft/ + echo -e "\033[32m[*] Pre-build Done. You need exec 'build.sh'.\033[0m" diff --git a/display_server/rosen/modules/render_service/core/pipeline/rs_render_service.cpp b/display_server/rosen/modules/render_service/core/pipeline/rs_render_service.cpp index e858f53..6999d86 100644 --- a/display_server/rosen/modules/render_service/core/pipeline/rs_render_service.cpp +++ b/display_server/rosen/modules/render_service/core/pipeline/rs_render_service.cpp @@ -74,13 +74,6 @@ bool RSRenderService::Init() RSQosThread::GetInstance()->appVSyncDistributor_ = appVSyncDistributor_; RSQosThread::ThreadStart(); - - // Wait samgr ready for up to 5 second to ensure adding service to samgr. - int status = WaitParameter("bootevent.samgr.ready", "true", 5); - if (status != 0) { - RS_LOGE("RSRenderService wait SAMGR error, return value [%d].", status); - } - return true; } diff --git a/etc/ft.xml b/etc/ft.xml new file mode 100644 index 0000000..c332ff9 --- /dev/null +++ b/etc/ft.xml @@ -0,0 +1,30 @@ + + + + + FT + + /usr/lib64/librender_service.so + + + + 10 + /usr/lib64/librender_service.so + true + false + 1 + + + -- Gitee From 4442c9d645da433bbff22038575ffffc19619c70 Mon Sep 17 00:00:00 2001 From: yanansong Date: Thu, 8 Jun 2023 14:14:07 +0800 Subject: [PATCH 2/4] eglChooseConfig: esv3 --> esv2 --- .../modules/2d_graphics/src/render_context/render_context.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/display_server/rosen/modules/2d_graphics/src/render_context/render_context.cpp b/display_server/rosen/modules/2d_graphics/src/render_context/render_context.cpp index ae7570b..84bb6e5 100644 --- a/display_server/rosen/modules/2d_graphics/src/render_context/render_context.cpp +++ b/display_server/rosen/modules/2d_graphics/src/render_context/render_context.cpp @@ -165,7 +165,7 @@ void RenderContext::InitializeEglContext() unsigned int ret; EGLint count; EGLint config_attribs[] = { EGL_SURFACE_TYPE, EGL_WINDOW_BIT, EGL_RED_SIZE, 8, EGL_GREEN_SIZE, 8, EGL_BLUE_SIZE, 8, - EGL_ALPHA_SIZE, 8, EGL_RENDERABLE_TYPE, EGL_OPENGL_ES3_BIT, EGL_NONE }; + EGL_ALPHA_SIZE, 8, EGL_RENDERABLE_TYPE, EGL_OPENGL_ES2_BIT, EGL_NONE }; ret = eglChooseConfig(eglDisplay_, config_attribs, &config_, 1, &count); if (!(ret && static_cast(count) >= 1)) { -- Gitee From e10d66ea34d685bfd59f1448112ac91cbca03714 Mon Sep 17 00:00:00 2001 From: yanansong Date: Thu, 8 Jun 2023 16:17:58 +0800 Subject: [PATCH 3/4] fix bug: installRPM script --- build/prebuild.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/prebuild.sh b/build/prebuild.sh index 3a4318e..ce7115f 100755 --- a/build/prebuild.sh +++ b/build/prebuild.sh @@ -76,7 +76,7 @@ fi # copy prebuild library to /usr/lib64 ARCHNAME=`uname -m` cd ${PROJECT_DIR}/prebuilts/libs/rpms/${ARCHNAME} -sudo installRPM +sudo ./installRPM cd ${PROJECT_DIR} rm -fr ${PROJECT_DIR}/prebuilts/libs -- Gitee From 4bf322a4c0d2f6b4142010fd408199d1005eb63e Mon Sep 17 00:00:00 2001 From: yanansong Date: Thu, 8 Jun 2023 20:31:45 +0800 Subject: [PATCH 4/4] add runscript --- runFT.sh | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100755 runFT.sh diff --git a/runFT.sh b/runFT.sh new file mode 100755 index 0000000..cef6669 --- /dev/null +++ b/runFT.sh @@ -0,0 +1,16 @@ +# Copyright (c) 2023 Huawei Technologies Co., Ltd. +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +sudo systemctl restart samgr +sudo systemctl restart hilogd +sa_main /usr/local/share/ft/ft.xml -- Gitee