openharmony/graphic_graphic_2d
1
0
Fork 0
mirror of https://gitee.com/openharmony/graphic_graphic_2d synced 2024-11-23 07:02:25 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

!10002 修复跨平台pixelMap不显示问题

Browse Source 
Merge pull request !10002 from lmy/weekly0401
This commit is contained in:
openharmony_ci 2024-04-15 01:05:38 +00:00 committed by Gitee
commit 375fadc824
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
3 changed files with 24 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
rosen/modules/render_service_base/BUILD.gn
View File

@ -380,6 +380,14 @@ ohos_source_set("render_service_base_src") {
"$graphic_2d_root/utils/log",
"$graphic_2d_root/interfaces/inner_api/surface",
]
if (is_arkui_x) {
include_dirs += [
"$graphic_2d_root/utils/color_manager/export",
"//foundation/multimedia/image_framework/interfaces/innerkits/include",
]
}
include_dirs += [ "//third_party/skia/src" ]
deps = [
"$graphic_2d_root/utils/sandbox:sandbox_utils",

17
rosen/modules/render_service_client/BUILD.gn
View File

@ -34,8 +34,14 @@ config("render_service_client_config") {
"$graphic_2d_root/rosen/modules/2d_graphics/src/drawing/engine_adapter",
]
defines = rs_common_define
if (defined(is_arkui_x) && is_arkui_x && ace_enable_gpu) {
defines += [ "ACE_ENABLE_GPU" ]
if (defined(is_arkui_x) && is_arkui_x) {
include_dirs += [
"$graphic_2d_root/utils/color_manager/export",
"//foundation/multimedia/image_framework/interfaces/innerkits/include",
]
if (ace_enable_gpu) {
defines += [ "ACE_ENABLE_GPU" ]
}
}
}
@ -62,6 +68,13 @@ template("render_service_client_source_set") {
"$graphic_2d_root/utils/sandbox",
]
if (defined(is_arkui_x) && is_arkui_x) {
include_dirs += [
"$graphic_2d_root/utils/color_manager/export",
"//foundation/multimedia/image_framework/interfaces/innerkits/include",
]
}
sources = [
#animation
"core/animation/rs_animation.cpp",

2
rosen/modules/render_service_profiler/rs_profiler_pixelmap.cpp
View File

@ -269,7 +269,7 @@ PixelMap* ImageSource::Unmarshalling(uint64_t id, Parcel& parcel)
return nullptr;
}
#if !defined(_WIN32) && !defined(_APPLE) && !defined(IOS_PLATFORM) && !defined(A_PLATFORM)
#if !defined(_WIN32) && !defined(_APPLE) && !defined(IOS_PLATFORM) && !defined(ANDROID_PLATFORM)
if (context.allocType == AllocatorType::SHARE_MEM_ALLOC) {
if (!UnmarshallFromSharedMem(context)) {
return nullptr;