From e97aed0f769ceada1401a129de2e92b81bceee66 Mon Sep 17 00:00:00 2001
From: fseeeye <liyifan57@huawei.com>
Date: Thu, 13 Jul 2023 20:58:04 +0800
Subject: [PATCH 1/2] fix(ds): adaptor demos to GPU rendering

---
 .../test/systemtest/native_window_buffer_test_oe.cpp |  4 ++--
 .../render_service_client/test/ft_build/BUILD.gn     | 12 ++++++++++++
 .../rosen/samples/composer/layer_context.cpp         |  2 +-
 3 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/display_server/frameworks/surface/test/systemtest/native_window_buffer_test_oe.cpp b/display_server/frameworks/surface/test/systemtest/native_window_buffer_test_oe.cpp
index a580edd..7966922 100644
--- a/display_server/frameworks/surface/test/systemtest/native_window_buffer_test_oe.cpp
+++ b/display_server/frameworks/surface/test/systemtest/native_window_buffer_test_oe.cpp
@@ -130,7 +130,7 @@ pid_t NativeWindowBufferTest::ChildProcessMain()
     struct NativeWindowBuffer *nativeWindowBuffer = nullptr;
 
     int code = SET_USAGE;
-    uint64_t usage = BUFFER_USAGE_CPU_READ | BUFFER_USAGE_CPU_WRITE | BUFFER_USAGE_MEM_DMA;
+    uint64_t usage = BUFFER_USAGE_CPU_READ | BUFFER_USAGE_CPU_WRITE;
     OH_NativeWindow_NativeWindowHandleOpt(nativeWindow, code, usage);
 
     code = SET_BUFFER_GEOMETRY;
@@ -213,7 +213,7 @@ void NativeWindowBufferTest::DoTest()
 
     int64_t data = 0;
     write(pipeFd[1], &data, sizeof(data));
-    usleep(1000); // sleep 1000000 microseconds (equals 1 second)
+    usleep(1000); // sleep 1000 microseconds (equals 1 milliseconds)
     read(pipeFd[0], &data, sizeof(data));
     assert(data == OHOS::GSERROR_OK);
 
diff --git a/display_server/rosen/modules/render_service_client/test/ft_build/BUILD.gn b/display_server/rosen/modules/render_service_client/test/ft_build/BUILD.gn
index daf48fd..698038c 100644
--- a/display_server/rosen/modules/render_service_client/test/ft_build/BUILD.gn
+++ b/display_server/rosen/modules/render_service_client/test/ft_build/BUILD.gn
@@ -17,6 +17,12 @@ import("//display_server/ft_build/ds_config.gni")
 ft_executable("render_service_client_rs_demo") {
   sources = [ "../render_service_client_rs_demo.cpp" ]
 
+  defines = []
+  if (ds_enable_gpu) {
+    defines += [ "ACE_ENABLE_GPU" ]
+  }
+  defines += gpu_defines
+
   include_dirs = [
     "$display_server_root/rosen/modules/render_service_base/src",
     "$display_server_root/rosen/include",
@@ -36,6 +42,12 @@ ft_executable("render_service_client_rs_demo") {
 ft_executable("render_service_client_gravity_demo") {
   sources = [ "../render_service_client_gravity_demo.cpp" ]
 
+  defines = []
+  if (ds_enable_gpu) {
+    defines += [ "ACE_ENABLE_GPU" ]
+  }
+  defines += gpu_defines
+
   cflags = [ "-Wno-c++11-narrowing" ]
 
   include_dirs = [
diff --git a/display_server/rosen/samples/composer/layer_context.cpp b/display_server/rosen/samples/composer/layer_context.cpp
index 9d14f97..8b8e58c 100644
--- a/display_server/rosen/samples/composer/layer_context.cpp
+++ b/display_server/rosen/samples/composer/layer_context.cpp
@@ -35,7 +35,7 @@ LayerContext::LayerContext(IRect dst, IRect src, uint32_t zorder, LayerType laye
 {
     cSurface_ = Surface::CreateSurfaceAsConsumer();
     cSurface_->SetDefaultWidthAndHeight(src.w, src.h);
-    cSurface_->SetDefaultUsage(BUFFER_USAGE_CPU_READ | BUFFER_USAGE_CPU_WRITE | BUFFER_USAGE_MEM_DMA);
+    cSurface_->SetDefaultUsage(BUFFER_USAGE_CPU_READ | BUFFER_USAGE_CPU_WRITE);
 
     OHOS::sptr<IBufferProducer> producer = cSurface_->GetProducer();
     pSurface_ = Surface::CreateSurfaceAsProducer(producer);
-- 
Gitee


From 5e13866e8a224f3f81a0c0187c854475ff4fc192 Mon Sep 17 00:00:00 2001
From: fseeeye <liyifan57@huawei.com>
Date: Fri, 14 Jul 2023 09:26:39 +0800
Subject: [PATCH 2/2] refactor(demo): sync clock demo config with rs

---
 samples/BUILD.gn | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/samples/BUILD.gn b/samples/BUILD.gn
index e22ba7f..a23f464 100644
--- a/samples/BUILD.gn
+++ b/samples/BUILD.gn
@@ -13,17 +13,13 @@
 
 import("//build/gn/fangtian.gni")
 import("//config.gni")
-
-
-declare_args() {
-  enable_gpu = true
-}
+import("//display_server/ft_build/ds_config.gni")
 
 ft_executable("clock") {
   sources = [ "clock.cpp" ]
 
   cflags = [ "-Wno-c++11-narrowing" ]
-  if (enable_gpu) {
+  if (ds_enable_gpu) {
     defines = [ "ENABLE_GPU" ]
     libs = [ "EGL", "GLESv2" ]
   }
-- 
Gitee