diff --git a/build/gn/configs/system_libs/BUILD.gn b/build/gn/configs/system_libs/BUILD.gn index c3b9cbca3a97b40b190b9788e4a47b4268e32c2f..ba92fc828114d08cd5bc4422ab0f246a2b27508d 100644 --- a/build/gn/configs/system_libs/BUILD.gn +++ b/build/gn/configs/system_libs/BUILD.gn @@ -37,7 +37,10 @@ config("eventhandler_config") { } config("skia_config") { - include_dirs = [ "${sys_inc}/skia" ] + include_dirs = [ + "${sys_inc}/skia", + "${sys_inc}/skia/include", + ] libs = [ "ace_skia_fangtian" ] } diff --git a/display_server/frameworks/surface/ft_build/BUILD.gn b/display_server/frameworks/surface/ft_build/BUILD.gn index 0ad66e01b6d904d321722d48c3b1f3264a9c2ff9..354bb306b11c12c8ec8fbf4a21501aff009be7b6 100644 --- a/display_server/frameworks/surface/ft_build/BUILD.gn +++ b/display_server/frameworks/surface/ft_build/BUILD.gn @@ -35,7 +35,7 @@ config("surface_config") { ] defines = [] - if (ace_enable_gpu) { + if (enable_gpu) { defines = [ "ACE_ENABLE_GPU" ] } defines += gpu_defines diff --git a/display_server/ft_configs/ds_config.gni b/display_server/ft_configs/ds_config.gni index da6dfdc3d9e1c0123dbca47cdb99324ceee1eb25..32b5fcad7eb20ba7540d47ec28eaaf52371d9c3a 100644 --- a/display_server/ft_configs/ds_config.gni +++ b/display_server/ft_configs/ds_config.gni @@ -11,8 +11,23 @@ # See the License for the specific language governing permissions and # limitations under the License. +declare_args() { + feature_enable_gpu = false +} +if (feature_enable_gpu) { + enable_gpu = true + rs_enable_eglimage = true + gpu_defines = [ + "ACE_ENABLE_GL", + "RS_ENABLE_GL", + "RS_ENABLE_EGLIMAGE", + "RS_ENABLE_EGLQUERYSURFACE", + ] +} else { + enable_gpu = false + rs_enable_eglimage = false + gpu_defines = [] +} + display_server_root = "//display_server" rosen_root = "//display_server/rosen" -rs_enable_gpu = false -ace_enable_gpu = false -gpu_defines = [] \ No newline at end of file diff --git a/display_server/rosen/modules/2d_graphics/src/render_context/cache_data.h b/display_server/rosen/modules/2d_graphics/src/render_context/cache_data.h index fe9c2634d6268acd54f3e3da520812e4587d64af..8164a9b38486d06d2c57cf0cecf72239014e738d 100644 --- a/display_server/rosen/modules/2d_graphics/src/render_context/cache_data.h +++ b/display_server/rosen/modules/2d_graphics/src/render_context/cache_data.h @@ -20,6 +20,7 @@ #include #include #include +#include #include #include #include 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 062e21cf427f7e5f4c3b679e034fd5de32f5b993..ae7570b2b91097d6d1544c7d4c1d83454aed87e4 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 @@ -19,6 +19,7 @@ #include #include "EGL/egl.h" +#include "EGL/eglext.h" #include "rs_trace.h" #include "window.h" @@ -90,7 +91,7 @@ static EGLDisplay GetPlatformEglDisplay(EGLenum platform, void* native_display, RenderContext::RenderContext() : grContext_(nullptr), skSurface_(nullptr), - nativeWindow_(nullptr), + nativeWindow_(0), eglDisplay_(EGL_NO_DISPLAY), eglContext_(EGL_NO_CONTEXT), eglSurface_(EGL_NO_SURFACE), diff --git a/display_server/rosen/modules/frame_analyzer/ft_build/BUILD.gn b/display_server/rosen/modules/frame_analyzer/ft_build/BUILD.gn index 131082ad284c6d8fef7185b2d03a893347f2e82f..d85e407717d7e4a13ecc87f95ad51b7f5d726007 100644 --- a/display_server/rosen/modules/frame_analyzer/ft_build/BUILD.gn +++ b/display_server/rosen/modules/frame_analyzer/ft_build/BUILD.gn @@ -36,7 +36,10 @@ ft_shared_library("libframe_analyzer") { "../src/frame_saver.cpp", ] - include_dirs = [ "//foundation/graphic/graphic_2d/utils/sandbox" ] + include_dirs = [ + "$display_server_root/utils/sandbox", + "$rosen_root/modules/render_service_base/src/platform/fangtian/include" + ] deps = [ "$display_server_root/utils/sandbox/ft_build:sandbox_utils", diff --git a/display_server/rosen/modules/render_service_base/ft_build/BUILD.gn b/display_server/rosen/modules/render_service_base/ft_build/BUILD.gn index 2c7dfe54347c4e68cba0438aa2aefdce45b11d10..db4109ac160ac0b058c4f6b63620c2b589a8220a 100644 --- a/display_server/rosen/modules/render_service_base/ft_build/BUILD.gn +++ b/display_server/rosen/modules/render_service_base/ft_build/BUILD.gn @@ -167,8 +167,8 @@ ft_source_set("render_service_base_src") { defines += [ "ENABLE_EXPORT_MACRO" ] } - if (rs_enable_gpu) { - sources += [ "src/common/rs_shared_context.cpp" ] + if (enable_gpu) { + sources += [ "../src/common/rs_shared_context.cpp" ] defines += [ "GR_TEST_UTILS=1", ] diff --git a/display_server/rosen/modules/render_service_base/src/common/rs_shared_context.cpp b/display_server/rosen/modules/render_service_base/src/common/rs_shared_context.cpp index 45cd981cf44db52550ddf804031dc12737693cce..7809ccc7a00c70430f6c028d11b6b0651ed45c10 100644 --- a/display_server/rosen/modules/render_service_base/src/common/rs_shared_context.cpp +++ b/display_server/rosen/modules/render_service_base/src/common/rs_shared_context.cpp @@ -16,7 +16,7 @@ #include "common/rs_shared_context.h" #include -#include "tools/gpu/GrContextFactory.h" +#include #include "platform/common/rs_log.h" #include "rs_trace.h" diff --git a/display_server/rosen/modules/render_service_base/src/platform/fangtian/BUILD.gn b/display_server/rosen/modules/render_service_base/src/platform/fangtian/BUILD.gn index 3048b31176b0060ffd7d1c06a9a2032a552c73ed..83b9e41bc896fb25f7106ae6536d2ed67a084527 100644 --- a/display_server/rosen/modules/render_service_base/src/platform/fangtian/BUILD.gn +++ b/display_server/rosen/modules/render_service_base/src/platform/fangtian/BUILD.gn @@ -69,9 +69,17 @@ ft_source_set("rosen_fangtian_sources") { "rs_surface_converter.cpp", "rs_system_properties.cpp", "rs_vsync_client.cpp", + "rs_event_detector.cpp", ] - sources += ["rs_event_detector.cpp",] - if (ace_enable_gpu) { + include_dirs = [ + "$rosen_root/modules/render_service_base/include", + "$rosen_root/modules/render_service_base/src/platform/fangtian/include", + "$rosen_root/modules/platform/image_native", + "$rosen_root/modules/render_service_base/src", + "$display_server_root/utils/log", + "$display_server_root/interfaces/inner_api/composer", + ] + if (enable_gpu) { defines += [ "GR_TEST_UTILS=1", ] @@ -82,21 +90,20 @@ ft_source_set("rosen_fangtian_sources") { ] sources += [ - "//display_server/rosen/modules/2d_graphics/src/render_context/cache_data.cpp", - "//display_server/rosen/modules/2d_graphics/src/render_context/memory_handler.cpp", - "//display_server/rosen/modules/2d_graphics/src/render_context/render_context.cpp", - "//display_server/rosen/modules/2d_graphics/src/render_context/shader_cache.cpp", + "$rosen_root/modules/2d_graphics/src/render_context/cache_data.cpp", + "$rosen_root/modules/2d_graphics/src/render_context/memory_handler.cpp", + "$rosen_root/modules/2d_graphics/src/render_context/render_context.cpp", + "$rosen_root/modules/2d_graphics/src/render_context/shader_cache.cpp", + ] + + include_dirs += [ + "$rosen_root/modules/2d_graphics/include", + "$rosen_root/modules/2d_graphics/src", + "$rosen_root/modules/render_service_client/core", ] + libs = [ "crypto", "EGL", "GLESv2" ] } - include_dirs = [ - "$rosen_root/modules/render_service_base/include", - "$rosen_root/modules/render_service_base/src/platform/fangtian/include", - "$rosen_root/modules/platform/image_native", - "$rosen_root/modules/render_service_base/src", - "$display_server_root/utils/log", - "$display_server_root/interfaces/inner_api/composer", - ] deps = [ "$display_server_root/frameworks/surface/ft_build:surface", @@ -105,8 +112,4 @@ ft_source_set("rosen_fangtian_sources") { "$display_server_root/utils/buffer_handle/ft_build:buffer_handle", "$display_server_root/utils/sandbox/ft_build:sandbox_utils", ] - - if (rs_enable_gpu) { - libs = [ "EGL", "GLESv2" ] - } } diff --git a/display_server/rosen/modules/render_service_base/src/platform/fangtian/backend/rs_surface_frame_gl.cpp b/display_server/rosen/modules/render_service_base/src/platform/fangtian/backend/rs_surface_frame_gl.cpp index 2b12662c9db03aaf1b481e9654c2d4d482cb2f68..388efd07a8e70e5952ea87bc3cdeb5a4e7e17feb 100644 --- a/display_server/rosen/modules/render_service_base/src/platform/fangtian/backend/rs_surface_frame_gl.cpp +++ b/display_server/rosen/modules/render_service_base/src/platform/fangtian/backend/rs_surface_frame_gl.cpp @@ -13,7 +13,7 @@ * limitations under the License. */ -#include "rs_surface_frame_ohos_gl.h" +#include "rs_surface_frame_gl.h" #include "platform/common/rs_log.h" #include "render_context/render_context.h" diff --git a/display_server/rosen/modules/render_service_base/src/platform/fangtian/backend/rs_surface_gl.cpp b/display_server/rosen/modules/render_service_base/src/platform/fangtian/backend/rs_surface_gl.cpp index af8f885da4f3e3a2e5cf25d74149abb47c2ea094..c465be832a3b6d3614d6532e8db1681146832b1d 100644 --- a/display_server/rosen/modules/render_service_base/src/platform/fangtian/backend/rs_surface_gl.cpp +++ b/display_server/rosen/modules/render_service_base/src/platform/fangtian/backend/rs_surface_gl.cpp @@ -13,7 +13,7 @@ * limitations under the License. */ -#include "rs_surface_ohos_gl.h" +#include "rs_surface_gl.h" #include "platform/common/rs_log.h" #include "window.h" #include diff --git a/display_server/rosen/modules/render_service_client/ft_build/BUILD.gn b/display_server/rosen/modules/render_service_client/ft_build/BUILD.gn index 91881d13dee5eed709f4772c67c362a41a4495de..8cc0381274909958ce8022f49cdb7df93265dc6a 100644 --- a/display_server/rosen/modules/render_service_client/ft_build/BUILD.gn +++ b/display_server/rosen/modules/render_service_client/ft_build/BUILD.gn @@ -24,8 +24,6 @@ config("render_service_client_config") { "$display_server_root/interfaces/inner_api/common", "$display_server_root/interfaces/inner_api/surface", "$display_server_root/interfaces/inner_api/composer", - #"//drivers/peripheral/display/interfaces/include", - #"//drivers/peripheral/base", ] defines = [ "ROSEN_OHOS" ] } @@ -109,10 +107,6 @@ ft_source_set("render_service_client_src") { "-fvisibility-inlines-hidden", ] - #if (enable_export_macro) { - # defines += [ "ENABLE_EXPORT_MACRO" ] - #} - deps = [ "$rosen_root/modules/composer/vsync/ft_build:libvsync", "$rosen_root/modules/frame_analyzer/ft_build:libframe_analyzer",