From 92d465420ae8947c0feed11cbd7daa5c5f01fb83 Mon Sep 17 00:00:00 2001 From: jianghongxi Date: Thu, 27 Feb 2025 11:29:43 +0800 Subject: [PATCH 01/20] screenManager add dfx Signed-off-by: jianghongxi --- .../drawable/rs_display_render_node_drawable.cpp | 10 +++++++++- .../drawable/rs_surface_render_node_drawable.cpp | 13 +++++++++++-- .../drawable/rs_surface_render_node_drawable.h | 1 + .../capture/rs_surface_capture_task_parallel.cpp | 1 + .../pipeline/rs_render_service_connection.cpp | 12 ++++++++++++ .../core/pipeline/rs_render_service_connection.h | 1 + .../core/screen_manager/rs_screen.cpp | 7 ++++++- .../include/pipeline/rs_display_render_node.h | 10 +--------- .../src/pipeline/rs_display_render_node.cpp | 16 +++++++++++++++- .../src/pipeline/rs_render_node.cpp | 3 +++ .../src/pipeline/rs_surface_render_node.cpp | 4 ++-- .../core/ui/rs_display_node.cpp | 5 ++++- 12 files changed, 66 insertions(+), 17 deletions(-) diff --git a/rosen/modules/render_service/core/drawable/rs_display_render_node_drawable.cpp b/rosen/modules/render_service/core/drawable/rs_display_render_node_drawable.cpp index 665f31a540..a708c3bdc8 100644 --- a/rosen/modules/render_service/core/drawable/rs_display_render_node_drawable.cpp +++ b/rosen/modules/render_service/core/drawable/rs_display_render_node_drawable.cpp @@ -639,6 +639,10 @@ void RSDisplayRenderNodeDrawable::OnDraw(Drawing::Canvas& canvas) if (mirroredRenderParams) { enableVisibleRect_ = screenInfo.enableVisibleRect; if (enableVisibleRect_) { + RS_TRACE_NAME_FMT("RSDisplayRenderNodeDrawable::OnDraw VisibleRect[%d, %d, %d, %d] to [%d, %d, %d, %d]", + curVisibleRect_.GetLeft(), curVisibleRect_.GetTop(), + curVisibleRect_.GetWidth(), curVisibleRect_.GetHeight(), + rect.x, rect.y, rect.x + rect.w, rect.y + rect.h); const auto& rect = screenManager->GetMirrorScreenVisibleRect(paramScreenId); curVisibleRect_ = Drawing::RectI(rect.x, rect.y, rect.x + rect.w, rect.y + rect.h); RSUniRenderThread::Instance().SetVisibleRect(curVisibleRect_); @@ -664,6 +668,8 @@ void RSDisplayRenderNodeDrawable::OnDraw(Drawing::Canvas& canvas) RSUniRenderThread::Instance().SetVisibleRect(Drawing::RectI()); RSUniRenderThread::Instance().SetEnableVisiableRect(false); } else { + RS_TRACE_NAME("RSDisplayRenderNodeDrawable::Ondraw Expand screen"); + RS_LOGD("RSDisplayRenderNodeDrawable::Ondraw Expand screen"); bool isOpDropped = uniParam->IsOpDropped(); uniParam->SetOpDropped(false); auto expandProcessor = RSProcessor::ReinterpretCast(processor); @@ -1367,7 +1373,9 @@ void RSDisplayRenderNodeDrawable::DrawWiredMirrorCopy(RSDisplayRenderNodeDrawabl RS_TRACE_NAME("DrawWiredMirrorCopy with SkiaScale"); RSUniRenderUtil::ProcessCacheImage(*curCanvas_, *cacheImage); } else { - RS_TRACE_NAME("DrawWiredMirrorCopy with VisibleRect"); + RS_TRACE_NAME("DrawWiredMirrorCopy with VisibleRect[%d, %d, %d, %d]", + curVisibleRect_.GetLeft(), curVisibleRect_.GetTop(), + curVisibleRect_.GetWidth(), curVisibleRect_.GetHeight()); RSUniRenderUtil::ProcessCacheImageRect(*curCanvas_, *cacheImage, curVisibleRect_, Drawing::Rect(0, 0, curVisibleRect_.GetWidth(), curVisibleRect_.GetHeight())); } diff --git a/rosen/modules/render_service/core/drawable/rs_surface_render_node_drawable.cpp b/rosen/modules/render_service/core/drawable/rs_surface_render_node_drawable.cpp index 0052c3d674..41a69b6544 100644 --- a/rosen/modules/render_service/core/drawable/rs_surface_render_node_drawable.cpp +++ b/rosen/modules/render_service/core/drawable/rs_surface_render_node_drawable.cpp @@ -127,9 +127,18 @@ void RSSurfaceRenderNodeDrawable::OnGeneralProcess(RSPaintFilterCanvas& canvas, auto matrix = surfaceParams.GetTotalMatrix(); matrix.Translate(-offsetX_, -offsetY_); canvas.ConcatMatrix(matrix); - RS_LOGD("RSSurfaceRenderNodeDrawable::OnGeneralProcess Translate screenId=[%{public}" PRIu64 "] " - "offsetX=%{public}d offsetY=%{public}d", curDisplayScreenId_, offsetX_, offsetY_); + if (!lastGlobalPositionEnabled_) { + lastGlobalPositionEnabled_ = true; + RS_LOGI("RSSurfaceRenderNodeDrawable::OnGeneralProcess Translate screenId=[%{public}" PRIu64 "] " + "offsetX=%{public}d offsetY=%{public}d", curDisplayScreenId_, offsetX_, offsetY_); + } + } esle { + if (lastGlobalPositionEnabled_) { + lastGlobalPositionEnabled_ = false; + } } + RS_TRACE_NAME_FMT("RSSurfaceRenderNodeDrawable::OnGeneralProcess Translate screenId=[%" PRIu64 "] " + "offsetX=%d offsetY=%d", curDisplayScreenId_, offsetX_, offsetY_); // 1. draw background DrawBackground(canvas, bounds); diff --git a/rosen/modules/render_service/core/drawable/rs_surface_render_node_drawable.h b/rosen/modules/render_service/core/drawable/rs_surface_render_node_drawable.h index 8e739e0470..4c0c771c93 100644 --- a/rosen/modules/render_service/core/drawable/rs_surface_render_node_drawable.h +++ b/rosen/modules/render_service/core/drawable/rs_surface_render_node_drawable.h @@ -386,6 +386,7 @@ private: uint32_t uifirstPostOrder_ = 0; static inline bool isInRotationFixed_ = false; + bool lastGlobalPositionEnabled_ = false; }; } // namespace DrawableV2 } // namespace OHOS::Rosen diff --git a/rosen/modules/render_service/core/feature/capture/rs_surface_capture_task_parallel.cpp b/rosen/modules/render_service/core/feature/capture/rs_surface_capture_task_parallel.cpp index 9462c669ff..f4ac5c1472 100644 --- a/rosen/modules/render_service/core/feature/capture/rs_surface_capture_task_parallel.cpp +++ b/rosen/modules/render_service/core/feature/capture/rs_surface_capture_task_parallel.cpp @@ -78,6 +78,7 @@ void RSSurfaceCaptureTaskParallel::CheckModifiers(NodeId id, bool useCurWindow) } std::function syncTask = []() -> void { RS_TRACE_NAME("RSSurfaceCaptureTaskParallel::SyncModifiers"); + RS_LOGI("RSSurfaceCaptureTaskParallel::SyncModifiers"); RSPointerWindowManager::Instance().UpdatePointerInfo(); auto& pendingSyncNodes = RSMainThread::Instance()->GetContext().pendingSyncNodes_; int skipTimes = 0; diff --git a/rosen/modules/render_service/core/pipeline/rs_render_service_connection.cpp b/rosen/modules/render_service/core/pipeline/rs_render_service_connection.cpp index 52736b8b04..f94059d295 100644 --- a/rosen/modules/render_service/core/pipeline/rs_render_service_connection.cpp +++ b/rosen/modules/render_service/core/pipeline/rs_render_service_connection.cpp @@ -1175,6 +1175,8 @@ void RSRenderServiceConnection::TakeSurfaceCapture(NodeId id, sptr void { + RS_TRACE_NAME_FMT("RSRenderServiceConnection::TakeSurfaceCapture captureTask nodeId:[%" PRIu64 "]", id); + RS_LOGI("RSRenderServiceConnection::TakeSurfaceCapture captureTask begin nodeId:[%{public}" PRIu64 "]", id); if (captureConfig.captureType == SurfaceCaptureType::UICAPTURE) { // When the isSync flag in captureConfig is true, UI capture processes commands before capture. // When the isSync flag in captureConfig is false, UI capture will check null node independently. @@ -1512,6 +1514,11 @@ void RSRenderServiceConnection::SetScreenBacklight(ScreenId id, uint32_t level) connection->mainThread_->RequestNextVSync(); }; mainThread_->PostTask(task); + if (!lastScreenBacklightWithHdr_) { + lastScreenBacklightWithHdr_ = true; + RS_LOGI("RSRenderServiceConnection::%{public}s IsHdrOn screenId:%{public}" PRIu64 " level:%{public}d", + __func__, id, level); + } return; } @@ -1524,6 +1531,11 @@ void RSRenderServiceConnection::SetScreenBacklight(ScreenId id, uint32_t level) mainThread_->ScheduleTask( [=]() { screenManager_->SetScreenBacklight(id, level); }).wait(); } + if (lastScreenBacklightWithHdr_) { + lastScreenBacklightWithHdr_ = false; + RS_LOGI("RSRenderServiceConnection::%{public}s without Hdr screenId:%{public}" PRIu64 " level:%{public}d", + __func__, id, level); + } } void RSRenderServiceConnection::RegisterBufferClearListener( diff --git a/rosen/modules/render_service/core/pipeline/rs_render_service_connection.h b/rosen/modules/render_service/core/pipeline/rs_render_service_connection.h index 0c2be5daba..1b4670d7d6 100644 --- a/rosen/modules/render_service/core/pipeline/rs_render_service_connection.h +++ b/rosen/modules/render_service/core/pipeline/rs_render_service_connection.h @@ -416,6 +416,7 @@ private: #ifdef RS_PROFILER_ENABLED friend class RSProfiler; #endif + bool lastScreenBacklightWithHdr_ = false; }; } // namespace Rosen } // namespace OHOS diff --git a/rosen/modules/render_service/core/screen_manager/rs_screen.cpp b/rosen/modules/render_service/core/screen_manager/rs_screen.cpp index 4721f53c1c..cfb7374020 100644 --- a/rosen/modules/render_service/core/screen_manager/rs_screen.cpp +++ b/rosen/modules/render_service/core/screen_manager/rs_screen.cpp @@ -155,10 +155,15 @@ void RSScreen::PhysicalScreenInit() noexcept [](GraphicHDRFormat item) -> ScreenHDRFormat {return HDI_HDR_FORMAT_TO_RS_MAP[item];}); auto status = GraphicDispPowerStatus::GRAPHIC_POWER_STATUS_ON; if (RSMainThread::Instance()->GetDeviceType() != DeviceType::PC || id_ == 0) { + RS_LOGI("%{public}s: RSScreen(id %{public}" PRIu64 ") start SetScreenPowerStatus to On", + __func__, id_); if (hdiScreen_->SetScreenPowerStatus(status) < 0) { RS_LOGE("%{public}s: RSScreen(id %{public}" PRIu64 ") failed to SetScreenPowerStatus.", __func__, id_); - } + } else { + RS_LOGI("%{public}s: RSScreen(id %{public}" PRIu64 ") end SetScreenPowerStatus to On", + __func__, id_); + } } auto activeMode = GetActiveMode(); if (activeMode) { diff --git a/rosen/modules/render_service_base/include/pipeline/rs_display_render_node.h b/rosen/modules/render_service_base/include/pipeline/rs_display_render_node.h index 166b80d117..ed3eb38a70 100644 --- a/rosen/modules/render_service_base/include/pipeline/rs_display_render_node.h +++ b/rosen/modules/render_service_base/include/pipeline/rs_display_render_node.h @@ -69,15 +69,7 @@ public: NodeId firstLevelNodeId = INVALID_NODEID, NodeId cacheNodeId = INVALID_NODEID, NodeId uifirstRootNodeId = INVALID_NODEID, NodeId displayNodeId = INVALID_NODEID) override; - void SetScreenId(uint64_t screenId) - { - if (releaseScreenDmaBufferTask_ && screenId_ != screenId) { - releaseScreenDmaBufferTask_(screenId_); - } - RS_LOGW("RSScreenManager %{public}s:displayNode[%{public}" PRIu64 "] change screen [%{public}" PRIu64 "] " - "to [%{public}" PRIu64 "].", __func__, GetId(), screenId_, screenId); - screenId_ = screenId; - } + void SetScreenId(uint64_t screenId); uint64_t GetScreenId() const { diff --git a/rosen/modules/render_service_base/src/pipeline/rs_display_render_node.cpp b/rosen/modules/render_service_base/src/pipeline/rs_display_render_node.cpp index 945c03811c..99c61f3a31 100644 --- a/rosen/modules/render_service_base/src/pipeline/rs_display_render_node.cpp +++ b/rosen/modules/render_service_base/src/pipeline/rs_display_render_node.cpp @@ -34,7 +34,9 @@ RSDisplayRenderNode::RSDisplayRenderNode( : RSRenderNode(id, context), isMirroredDisplay_(config.isMirrored), offsetX_(0), offsetY_(0), screenId_(config.screenId), dirtyManager_(std::make_shared(true)) { - RS_LOGI("RSScreen RSDisplayRenderNode ctor id:%{public}" PRIu64 ", screenid:%{public}" PRIu64, id, screenId_); + RS_LOGI("RSScreen RSDisplayRenderNode ctor id:%{public}" PRIu64 ", config[screenid:%{public}" PRIu64 + ", isMirrored%{public}d, mirrorNodeId:%{public}" PRIu64 ", isSync:%{public}d", + id, screenId_, config.isMirror, config.mirrorNodeId, config.isSync); MemoryInfo info = {sizeof(*this), ExtractPid(id), id, MEMORY_TYPE::MEM_RENDER_NODE}; MemoryTrack::Instance().AddNodeRecord(id, info); MemorySnapshot::Instance().AddCpuMemory(ExtractPid(id), sizeof(*this)); @@ -91,6 +93,18 @@ void RSDisplayRenderNode::SetIsOnTheTree(bool flag, NodeId instanceRootNodeId, N RSRenderNode::SetIsOnTheTree(flag, GetId(), firstLevelNodeId, cacheNodeId, uifirstRootNodeId, GetId()); } +void RSDisplayRenderNode::SetScreenId(uint64_t screenId) +{ + if (releaseScreenDmaBufferTask_ && screenId_ != screenId) { + releaseScreenDmaBufferTask_(screenId_); + } + RS_TRACE_NAME_FMT("RSScreenManager %s:displayNode[%" PRIu64 "] change screen [%" PRIu64 "] " + "to [%" PRIu64 "].", __func__, GetId(), screenId_, screenId); + RS_LOGW("RSScreenManager %{public}s:displayNode[%{public}" PRIu64 "] change screen [%{public}" PRIu64 "] " + "to [%{public}" PRIu64 "].", __func__, GetId(), screenId_, screenId); + screenId_ = screenId; +} + RSDisplayRenderNode::CompositeType RSDisplayRenderNode::GetCompositeType() const { return compositeType_; diff --git a/rosen/modules/render_service_base/src/pipeline/rs_render_node.cpp b/rosen/modules/render_service_base/src/pipeline/rs_render_node.cpp index 84585fff93..edbcab319c 100644 --- a/rosen/modules/render_service_base/src/pipeline/rs_render_node.cpp +++ b/rosen/modules/render_service_base/src/pipeline/rs_render_node.cpp @@ -928,6 +928,9 @@ void RSRenderNode::DumpTree(int32_t depth, std::string& out) const DumpNodeType(GetType(), out); out += "[" + std::to_string(GetId()) + "], instanceRootNodeId" + "[" + std::to_string(GetInstanceRootNodeId()) + "]"; + if (auto displayNode = ReinterpretCastTo()) { + out += ", screenId[" + std::to_string(displayNode->GetScreenId()) + "]"; + } if (auto surfaceNode = ReinterpretCastTo()) { #if defined(ROSEN_OHOS) if (surfaceNode->GetRSSurfaceHandler() && surfaceNode->GetRSSurfaceHandler()->GetConsumer()) { diff --git a/rosen/modules/render_service_base/src/pipeline/rs_surface_render_node.cpp b/rosen/modules/render_service_base/src/pipeline/rs_surface_render_node.cpp index 4fcba26528..0b748d6050 100644 --- a/rosen/modules/render_service_base/src/pipeline/rs_surface_render_node.cpp +++ b/rosen/modules/render_service_base/src/pipeline/rs_surface_render_node.cpp @@ -2761,8 +2761,8 @@ void RSSurfaceRenderNode::SetIsOnTheTree(bool onTree, NodeId instanceRootNodeId, std::to_string(GetRSSurfaceHandler()->GetConsumer()->GetUniqueId()) : "null"; #endif RS_LOGI("RSSurfaceRenderNode:SetIsOnTheTree, node:[name: %{public}s, id: %{public}" PRIu64 "], " - "on tree: %{public}d, nodeType: %{public}d, uniqueId: %{public}s", GetName().c_str(), GetId(), onTree, - static_cast(nodeType_), uniqueIdStr.c_str()); + "on tree: %{public}d, nodeType: %{public}d, uniqueId: %{public}s, displayNodeId: %{public}" PRIu64, + GetName().c_str(), GetId(), onTree, static_cast(nodeType_), uniqueIdStr.c_str(), displayNodeId); } RS_TRACE_NAME_FMT("RSSurfaceRenderNode:SetIsOnTheTree, node:[name: %s, id: %" PRIu64 "], " "on tree: %d, nodeType: %d", GetName().c_str(), GetId(), onTree, static_cast(nodeType_)); diff --git a/rosen/modules/render_service_client/core/ui/rs_display_node.cpp b/rosen/modules/render_service_client/core/ui/rs_display_node.cpp index 99dd233110..5b6ad1fe63 100644 --- a/rosen/modules/render_service_client/core/ui/rs_display_node.cpp +++ b/rosen/modules/render_service_client/core/ui/rs_display_node.cpp @@ -45,7 +45,10 @@ RSDisplayNode::SharedPtr RSDisplayNode::Create(const RSDisplayNodeConfig& displa return nullptr; } } - ROSEN_LOGI("RSDisplayNode::Create, id:%{public}" PRIu64, node->GetId()); + ROSEN_LOGI("RSDisplayNode::Create, id:%{public}" PRIu64 " config[screenId=%{public}" PRIu64 + ", isMirrored=%{public}d, mirrorNodeId=%{public}" PRIu64 ", isSync=%{public}d", + node->GetId(), displayNodeConfig.screenId, displayNodeConfig.isMirrored, + displayNodeConfig.mirrorNodeId, displayNodeConfig.isSync); return node; } -- Gitee From 9002e794fd077c1de55cf306c346d433104adc5c Mon Sep 17 00:00:00 2001 From: jianghongxi Date: Thu, 27 Feb 2025 06:47:25 +0000 Subject: [PATCH 02/20] update rosen/modules/render_service/core/pipeline/rs_render_service_connection.h. Signed-off-by: jianghongxi --- .../render_service/core/pipeline/rs_render_service_connection.h | 1 - 1 file changed, 1 deletion(-) diff --git a/rosen/modules/render_service/core/pipeline/rs_render_service_connection.h b/rosen/modules/render_service/core/pipeline/rs_render_service_connection.h index 1b4670d7d6..0c2be5daba 100644 --- a/rosen/modules/render_service/core/pipeline/rs_render_service_connection.h +++ b/rosen/modules/render_service/core/pipeline/rs_render_service_connection.h @@ -416,7 +416,6 @@ private: #ifdef RS_PROFILER_ENABLED friend class RSProfiler; #endif - bool lastScreenBacklightWithHdr_ = false; }; } // namespace Rosen } // namespace OHOS -- Gitee From 331084c71bfa3930e88ad472a8e1c086b427a10c Mon Sep 17 00:00:00 2001 From: jianghongxi Date: Thu, 27 Feb 2025 06:47:59 +0000 Subject: [PATCH 03/20] update rosen/modules/render_service/core/pipeline/rs_render_service_connection.cpp. Signed-off-by: jianghongxi --- .../core/pipeline/rs_render_service_connection.cpp | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/rosen/modules/render_service/core/pipeline/rs_render_service_connection.cpp b/rosen/modules/render_service/core/pipeline/rs_render_service_connection.cpp index f94059d295..1c65f94fd8 100644 --- a/rosen/modules/render_service/core/pipeline/rs_render_service_connection.cpp +++ b/rosen/modules/render_service/core/pipeline/rs_render_service_connection.cpp @@ -1514,11 +1514,6 @@ void RSRenderServiceConnection::SetScreenBacklight(ScreenId id, uint32_t level) connection->mainThread_->RequestNextVSync(); }; mainThread_->PostTask(task); - if (!lastScreenBacklightWithHdr_) { - lastScreenBacklightWithHdr_ = true; - RS_LOGI("RSRenderServiceConnection::%{public}s IsHdrOn screenId:%{public}" PRIu64 " level:%{public}d", - __func__, id, level); - } return; } @@ -1531,11 +1526,6 @@ void RSRenderServiceConnection::SetScreenBacklight(ScreenId id, uint32_t level) mainThread_->ScheduleTask( [=]() { screenManager_->SetScreenBacklight(id, level); }).wait(); } - if (lastScreenBacklightWithHdr_) { - lastScreenBacklightWithHdr_ = false; - RS_LOGI("RSRenderServiceConnection::%{public}s without Hdr screenId:%{public}" PRIu64 " level:%{public}d", - __func__, id, level); - } } void RSRenderServiceConnection::RegisterBufferClearListener( -- Gitee From 2a96cf7ea6b8582f905f73be6e777606f649034c Mon Sep 17 00:00:00 2001 From: jianghongxi Date: Thu, 27 Feb 2025 07:18:10 +0000 Subject: [PATCH 04/20] update rosen/modules/render_service/core/drawable/rs_display_render_node_drawable.cpp. Signed-off-by: jianghongxi --- .../core/drawable/rs_display_render_node_drawable.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/rosen/modules/render_service/core/drawable/rs_display_render_node_drawable.cpp b/rosen/modules/render_service/core/drawable/rs_display_render_node_drawable.cpp index a708c3bdc8..b8be44956b 100644 --- a/rosen/modules/render_service/core/drawable/rs_display_render_node_drawable.cpp +++ b/rosen/modules/render_service/core/drawable/rs_display_render_node_drawable.cpp @@ -668,8 +668,8 @@ void RSDisplayRenderNodeDrawable::OnDraw(Drawing::Canvas& canvas) RSUniRenderThread::Instance().SetVisibleRect(Drawing::RectI()); RSUniRenderThread::Instance().SetEnableVisiableRect(false); } else { - RS_TRACE_NAME("RSDisplayRenderNodeDrawable::Ondraw Expand screen"); - RS_LOGD("RSDisplayRenderNodeDrawable::Ondraw Expand screen"); + RS_TRACE_NAME("RSDisplayRenderNodeDrawable::OnDraw Expand screen"); + RS_LOGD("RSDisplayRenderNodeDrawable::OnDraw Expand screen"); bool isOpDropped = uniParam->IsOpDropped(); uniParam->SetOpDropped(false); auto expandProcessor = RSProcessor::ReinterpretCast(processor); @@ -1373,7 +1373,7 @@ void RSDisplayRenderNodeDrawable::DrawWiredMirrorCopy(RSDisplayRenderNodeDrawabl RS_TRACE_NAME("DrawWiredMirrorCopy with SkiaScale"); RSUniRenderUtil::ProcessCacheImage(*curCanvas_, *cacheImage); } else { - RS_TRACE_NAME("DrawWiredMirrorCopy with VisibleRect[%d, %d, %d, %d]", + RS_TRACE_NAME_FMT("DrawWiredMirrorCopy with VisibleRect[%d, %d, %d, %d]", curVisibleRect_.GetLeft(), curVisibleRect_.GetTop(), curVisibleRect_.GetWidth(), curVisibleRect_.GetHeight()); RSUniRenderUtil::ProcessCacheImageRect(*curCanvas_, *cacheImage, curVisibleRect_, -- Gitee From a6ef00bb987fed6517f5ae413552ee2b579cfe0e Mon Sep 17 00:00:00 2001 From: jianghongxi Date: Thu, 27 Feb 2025 07:20:14 +0000 Subject: [PATCH 05/20] update rosen/modules/render_service/core/drawable/rs_surface_render_node_drawable.cpp. Signed-off-by: jianghongxi --- .../core/drawable/rs_surface_render_node_drawable.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/rosen/modules/render_service/core/drawable/rs_surface_render_node_drawable.cpp b/rosen/modules/render_service/core/drawable/rs_surface_render_node_drawable.cpp index 41a69b6544..45f7fd07d6 100644 --- a/rosen/modules/render_service/core/drawable/rs_surface_render_node_drawable.cpp +++ b/rosen/modules/render_service/core/drawable/rs_surface_render_node_drawable.cpp @@ -129,10 +129,10 @@ void RSSurfaceRenderNodeDrawable::OnGeneralProcess(RSPaintFilterCanvas& canvas, canvas.ConcatMatrix(matrix); if (!lastGlobalPositionEnabled_) { lastGlobalPositionEnabled_ = true; - RS_LOGI("RSSurfaceRenderNodeDrawable::OnGeneralProcess Translate screenId=[%{public}" PRIu64 "] " - "offsetX=%{public}d offsetY=%{public}d", curDisplayScreenId_, offsetX_, offsetY_); + RS_LOGI("RSSurfaceRenderNodeDrawable::%{public}s Translate screenId=[%{public}" PRIu64 "] " + "offsetX=%{public}d offsetY=%{public}d", __func__, curDisplayScreenId_, offsetX_, offsetY_); } - } esle { + } else { if (lastGlobalPositionEnabled_) { lastGlobalPositionEnabled_ = false; } -- Gitee From 919009c020f4f9884b327bed676c180bcdeb43f0 Mon Sep 17 00:00:00 2001 From: jianghongxi Date: Thu, 27 Feb 2025 07:20:48 +0000 Subject: [PATCH 06/20] update rosen/modules/render_service/core/drawable/rs_surface_render_node_drawable.cpp. Signed-off-by: jianghongxi --- .../core/drawable/rs_surface_render_node_drawable.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rosen/modules/render_service/core/drawable/rs_surface_render_node_drawable.cpp b/rosen/modules/render_service/core/drawable/rs_surface_render_node_drawable.cpp index 45f7fd07d6..dee8812ced 100644 --- a/rosen/modules/render_service/core/drawable/rs_surface_render_node_drawable.cpp +++ b/rosen/modules/render_service/core/drawable/rs_surface_render_node_drawable.cpp @@ -137,8 +137,8 @@ void RSSurfaceRenderNodeDrawable::OnGeneralProcess(RSPaintFilterCanvas& canvas, lastGlobalPositionEnabled_ = false; } } - RS_TRACE_NAME_FMT("RSSurfaceRenderNodeDrawable::OnGeneralProcess Translate screenId=[%" PRIu64 "] " - "offsetX=%d offsetY=%d", curDisplayScreenId_, offsetX_, offsetY_); + RS_TRACE_NAME_FMT("RSSurfaceRenderNodeDrawable::%s Translate screenId=[%" PRIu64 "] " + "offsetX=%d offsetY=%d", __func__, curDisplayScreenId_, offsetX_, offsetY_); // 1. draw background DrawBackground(canvas, bounds); -- Gitee From d6ac64c2cd23fba80d4f36b1eb73be0ac838eb39 Mon Sep 17 00:00:00 2001 From: jianghongxi Date: Thu, 27 Feb 2025 07:23:01 +0000 Subject: [PATCH 07/20] update rosen/modules/render_service/core/pipeline/rs_render_service_connection.cpp. Signed-off-by: jianghongxi --- .../core/pipeline/rs_render_service_connection.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rosen/modules/render_service/core/pipeline/rs_render_service_connection.cpp b/rosen/modules/render_service/core/pipeline/rs_render_service_connection.cpp index 1c65f94fd8..f74d77cb60 100644 --- a/rosen/modules/render_service/core/pipeline/rs_render_service_connection.cpp +++ b/rosen/modules/render_service/core/pipeline/rs_render_service_connection.cpp @@ -1175,8 +1175,8 @@ void RSRenderServiceConnection::TakeSurfaceCapture(NodeId id, sptr void { - RS_TRACE_NAME_FMT("RSRenderServiceConnection::TakeSurfaceCapture captureTask nodeId:[%" PRIu64 "]", id); - RS_LOGI("RSRenderServiceConnection::TakeSurfaceCapture captureTask begin nodeId:[%{public}" PRIu64 "]", id); + RS_TRACE_NAME_FMT("RSRenderService::TakeSurfaceCapture captureTask nodeId:[%" PRIu64 "]", id); + RS_LOGI("RSRenderService::TakeSurfaceCapture captureTask begin nodeId:[%{public}" PRIu64 "]", id); if (captureConfig.captureType == SurfaceCaptureType::UICAPTURE) { // When the isSync flag in captureConfig is true, UI capture processes commands before capture. // When the isSync flag in captureConfig is false, UI capture will check null node independently. -- Gitee From 09e978fd324a898f9a80d3e7b3f29d079794d9bb Mon Sep 17 00:00:00 2001 From: jianghongxi Date: Thu, 27 Feb 2025 07:24:46 +0000 Subject: [PATCH 08/20] update rosen/modules/render_service/core/screen_manager/rs_screen.cpp. Signed-off-by: jianghongxi --- rosen/modules/render_service/core/screen_manager/rs_screen.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rosen/modules/render_service/core/screen_manager/rs_screen.cpp b/rosen/modules/render_service/core/screen_manager/rs_screen.cpp index cfb7374020..b4b04c4928 100644 --- a/rosen/modules/render_service/core/screen_manager/rs_screen.cpp +++ b/rosen/modules/render_service/core/screen_manager/rs_screen.cpp @@ -163,7 +163,7 @@ void RSScreen::PhysicalScreenInit() noexcept } else { RS_LOGI("%{public}s: RSScreen(id %{public}" PRIu64 ") end SetScreenPowerStatus to On", __func__, id_); - } + } } auto activeMode = GetActiveMode(); if (activeMode) { -- Gitee From 7f44faf9bb953dff57e4f638caaa190e7d89cf09 Mon Sep 17 00:00:00 2001 From: jianghongxi Date: Thu, 27 Feb 2025 07:28:48 +0000 Subject: [PATCH 09/20] update rosen/modules/render_service_base/src/pipeline/rs_display_render_node.cpp. Signed-off-by: jianghongxi --- .../src/pipeline/rs_display_render_node.cpp | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/rosen/modules/render_service_base/src/pipeline/rs_display_render_node.cpp b/rosen/modules/render_service_base/src/pipeline/rs_display_render_node.cpp index 99c61f3a31..7d12178d78 100644 --- a/rosen/modules/render_service_base/src/pipeline/rs_display_render_node.cpp +++ b/rosen/modules/render_service_base/src/pipeline/rs_display_render_node.cpp @@ -35,8 +35,8 @@ RSDisplayRenderNode::RSDisplayRenderNode( screenId_(config.screenId), dirtyManager_(std::make_shared(true)) { RS_LOGI("RSScreen RSDisplayRenderNode ctor id:%{public}" PRIu64 ", config[screenid:%{public}" PRIu64 - ", isMirrored%{public}d, mirrorNodeId:%{public}" PRIu64 ", isSync:%{public}d", - id, screenId_, config.isMirror, config.mirrorNodeId, config.isSync); + ", isMirrored%{public}d, mirrorNodeId:%{public}" PRIu64 ", isSync:%{public}d]", + id, screenId_, config.isMirrored, config.mirrorNodeId, config.isSync); MemoryInfo info = {sizeof(*this), ExtractPid(id), id, MEMORY_TYPE::MEM_RENDER_NODE}; MemoryTrack::Instance().AddNodeRecord(id, info); MemorySnapshot::Instance().AddCpuMemory(ExtractPid(id), sizeof(*this)); @@ -95,14 +95,14 @@ void RSDisplayRenderNode::SetIsOnTheTree(bool flag, NodeId instanceRootNodeId, N void RSDisplayRenderNode::SetScreenId(uint64_t screenId) { - if (releaseScreenDmaBufferTask_ && screenId_ != screenId) { - releaseScreenDmaBufferTask_(screenId_); - } - RS_TRACE_NAME_FMT("RSScreenManager %s:displayNode[%" PRIu64 "] change screen [%" PRIu64 "] " - "to [%" PRIu64 "].", __func__, GetId(), screenId_, screenId); - RS_LOGW("RSScreenManager %{public}s:displayNode[%{public}" PRIu64 "] change screen [%{public}" PRIu64 "] " - "to [%{public}" PRIu64 "].", __func__, GetId(), screenId_, screenId); - screenId_ = screenId; + if (releaseScreenDmaBufferTask_ && screenId_ != screenId) { + releaseScreenDmaBufferTask_(screenId_); + } + RS_TRACE_NAME_FMT("RSScreenManager %s:displayNode[%" PRIu64 "] change screen [%" PRIu64 "] " + "to [%" PRIu64 "].", __func__, GetId(), screenId_, screenId); + RS_LOGI("RSScreenManager %{public}s:displayNode[%{public}" PRIu64 "] change screen [%{public}" PRIu64 "] " + "to [%{public}" PRIu64 "].", __func__, GetId(), screenId_, screenId); + screenId_ = screenId; } RSDisplayRenderNode::CompositeType RSDisplayRenderNode::GetCompositeType() const -- Gitee From 83aa0d2357d8ad559797826a14f422704fd9960b Mon Sep 17 00:00:00 2001 From: jianghongxi Date: Thu, 27 Feb 2025 07:31:30 +0000 Subject: [PATCH 10/20] update rosen/modules/render_service_client/core/ui/rs_display_node.cpp. Signed-off-by: jianghongxi --- rosen/modules/render_service_client/core/ui/rs_display_node.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rosen/modules/render_service_client/core/ui/rs_display_node.cpp b/rosen/modules/render_service_client/core/ui/rs_display_node.cpp index 5b6ad1fe63..dede0a3d5a 100644 --- a/rosen/modules/render_service_client/core/ui/rs_display_node.cpp +++ b/rosen/modules/render_service_client/core/ui/rs_display_node.cpp @@ -46,7 +46,7 @@ RSDisplayNode::SharedPtr RSDisplayNode::Create(const RSDisplayNodeConfig& displa } } ROSEN_LOGI("RSDisplayNode::Create, id:%{public}" PRIu64 " config[screenId=%{public}" PRIu64 - ", isMirrored=%{public}d, mirrorNodeId=%{public}" PRIu64 ", isSync=%{public}d", + ", isMirrored=%{public}d, mirrorNodeId=%{public}" PRIu64 ", isSync=%{public}d]", node->GetId(), displayNodeConfig.screenId, displayNodeConfig.isMirrored, displayNodeConfig.mirrorNodeId, displayNodeConfig.isSync); return node; -- Gitee From 094d2fbdbe176666398226d1dd91b371177ec1fd Mon Sep 17 00:00:00 2001 From: jianghongxi Date: Thu, 27 Feb 2025 08:24:07 +0000 Subject: [PATCH 11/20] update rosen/modules/render_service/core/drawable/rs_display_render_node_drawable.cpp. Signed-off-by: jianghongxi --- .../core/drawable/rs_display_render_node_drawable.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rosen/modules/render_service/core/drawable/rs_display_render_node_drawable.cpp b/rosen/modules/render_service/core/drawable/rs_display_render_node_drawable.cpp index b8be44956b..7167dfd26b 100644 --- a/rosen/modules/render_service/core/drawable/rs_display_render_node_drawable.cpp +++ b/rosen/modules/render_service/core/drawable/rs_display_render_node_drawable.cpp @@ -639,11 +639,11 @@ void RSDisplayRenderNodeDrawable::OnDraw(Drawing::Canvas& canvas) if (mirroredRenderParams) { enableVisibleRect_ = screenInfo.enableVisibleRect; if (enableVisibleRect_) { + const auto& rect = screenManager->GetMirrorScreenVisibleRect(paramScreenId); RS_TRACE_NAME_FMT("RSDisplayRenderNodeDrawable::OnDraw VisibleRect[%d, %d, %d, %d] to [%d, %d, %d, %d]", curVisibleRect_.GetLeft(), curVisibleRect_.GetTop(), curVisibleRect_.GetWidth(), curVisibleRect_.GetHeight(), rect.x, rect.y, rect.x + rect.w, rect.y + rect.h); - const auto& rect = screenManager->GetMirrorScreenVisibleRect(paramScreenId); curVisibleRect_ = Drawing::RectI(rect.x, rect.y, rect.x + rect.w, rect.y + rect.h); RSUniRenderThread::Instance().SetVisibleRect(curVisibleRect_); RSUniRenderThread::Instance().SetEnableVisiableRect(enableVisibleRect_); -- Gitee From 6b7043472eceaa37f0efb421e5eb0cc17bfc96d3 Mon Sep 17 00:00:00 2001 From: jianghongxi Date: Fri, 28 Feb 2025 02:36:56 +0000 Subject: [PATCH 12/20] update rosen/modules/render_service/core/drawable/rs_surface_render_node_drawable.cpp. Signed-off-by: jianghongxi --- .../core/drawable/rs_surface_render_node_drawable.cpp | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/rosen/modules/render_service/core/drawable/rs_surface_render_node_drawable.cpp b/rosen/modules/render_service/core/drawable/rs_surface_render_node_drawable.cpp index dee8812ced..ef44f62786 100644 --- a/rosen/modules/render_service/core/drawable/rs_surface_render_node_drawable.cpp +++ b/rosen/modules/render_service/core/drawable/rs_surface_render_node_drawable.cpp @@ -132,10 +132,8 @@ void RSSurfaceRenderNodeDrawable::OnGeneralProcess(RSPaintFilterCanvas& canvas, RS_LOGI("RSSurfaceRenderNodeDrawable::%{public}s Translate screenId=[%{public}" PRIu64 "] " "offsetX=%{public}d offsetY=%{public}d", __func__, curDisplayScreenId_, offsetX_, offsetY_); } - } else { - if (lastGlobalPositionEnabled_) { - lastGlobalPositionEnabled_ = false; - } + } else if (lastGlobalPositionEnabled_) { + lastGlobalPositionEnabled_ = false; } RS_TRACE_NAME_FMT("RSSurfaceRenderNodeDrawable::%s Translate screenId=[%" PRIu64 "] " "offsetX=%d offsetY=%d", __func__, curDisplayScreenId_, offsetX_, offsetY_); -- Gitee From 63c46ddf8512943f5c279e1242000361737be4a6 Mon Sep 17 00:00:00 2001 From: jianghongxi Date: Fri, 28 Feb 2025 06:32:53 +0000 Subject: [PATCH 13/20] update rosen/modules/render_service_base/src/pipeline/rs_display_render_node.cpp. Signed-off-by: jianghongxi --- .../src/pipeline/rs_display_render_node.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/rosen/modules/render_service_base/src/pipeline/rs_display_render_node.cpp b/rosen/modules/render_service_base/src/pipeline/rs_display_render_node.cpp index 7d12178d78..d43ecb6fd5 100644 --- a/rosen/modules/render_service_base/src/pipeline/rs_display_render_node.cpp +++ b/rosen/modules/render_service_base/src/pipeline/rs_display_render_node.cpp @@ -35,7 +35,7 @@ RSDisplayRenderNode::RSDisplayRenderNode( screenId_(config.screenId), dirtyManager_(std::make_shared(true)) { RS_LOGI("RSScreen RSDisplayRenderNode ctor id:%{public}" PRIu64 ", config[screenid:%{public}" PRIu64 - ", isMirrored%{public}d, mirrorNodeId:%{public}" PRIu64 ", isSync:%{public}d]", + ", isMirrored:%{public}d, mirrorNodeId:%{public}" PRIu64 ", isSync:%{public}d]", id, screenId_, config.isMirrored, config.mirrorNodeId, config.isSync); MemoryInfo info = {sizeof(*this), ExtractPid(id), id, MEMORY_TYPE::MEM_RENDER_NODE}; MemoryTrack::Instance().AddNodeRecord(id, info); @@ -95,13 +95,13 @@ void RSDisplayRenderNode::SetIsOnTheTree(bool flag, NodeId instanceRootNodeId, N void RSDisplayRenderNode::SetScreenId(uint64_t screenId) { - if (releaseScreenDmaBufferTask_ && screenId_ != screenId) { - releaseScreenDmaBufferTask_(screenId_); - } RS_TRACE_NAME_FMT("RSScreenManager %s:displayNode[%" PRIu64 "] change screen [%" PRIu64 "] " "to [%" PRIu64 "].", __func__, GetId(), screenId_, screenId); RS_LOGI("RSScreenManager %{public}s:displayNode[%{public}" PRIu64 "] change screen [%{public}" PRIu64 "] " "to [%{public}" PRIu64 "].", __func__, GetId(), screenId_, screenId); + if (releaseScreenDmaBufferTask_ && screenId_ != screenId) { + releaseScreenDmaBufferTask_(screenId_); + } screenId_ = screenId; } -- Gitee From 223d1099aa9bc73d6905939676b4a372644a8482 Mon Sep 17 00:00:00 2001 From: jianghongxi Date: Fri, 28 Feb 2025 06:34:17 +0000 Subject: [PATCH 14/20] update rosen/modules/render_service/core/drawable/rs_display_render_node_drawable.cpp. Signed-off-by: jianghongxi --- .../core/drawable/rs_display_render_node_drawable.cpp | 2 -- 1 file changed, 2 deletions(-) diff --git a/rosen/modules/render_service/core/drawable/rs_display_render_node_drawable.cpp b/rosen/modules/render_service/core/drawable/rs_display_render_node_drawable.cpp index 7167dfd26b..50228d6be4 100644 --- a/rosen/modules/render_service/core/drawable/rs_display_render_node_drawable.cpp +++ b/rosen/modules/render_service/core/drawable/rs_display_render_node_drawable.cpp @@ -668,8 +668,6 @@ void RSDisplayRenderNodeDrawable::OnDraw(Drawing::Canvas& canvas) RSUniRenderThread::Instance().SetVisibleRect(Drawing::RectI()); RSUniRenderThread::Instance().SetEnableVisiableRect(false); } else { - RS_TRACE_NAME("RSDisplayRenderNodeDrawable::OnDraw Expand screen"); - RS_LOGD("RSDisplayRenderNodeDrawable::OnDraw Expand screen"); bool isOpDropped = uniParam->IsOpDropped(); uniParam->SetOpDropped(false); auto expandProcessor = RSProcessor::ReinterpretCast(processor); -- Gitee From 7c3b4c5a79036edc4177edb7a6a573c2ed7c1aa5 Mon Sep 17 00:00:00 2001 From: jianghongxi Date: Fri, 28 Feb 2025 06:36:45 +0000 Subject: [PATCH 15/20] update rosen/modules/render_service/core/pipeline/rs_render_service_connection.cpp. Signed-off-by: jianghongxi --- .../core/pipeline/rs_render_service_connection.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rosen/modules/render_service/core/pipeline/rs_render_service_connection.cpp b/rosen/modules/render_service/core/pipeline/rs_render_service_connection.cpp index f74d77cb60..1c65f94fd8 100644 --- a/rosen/modules/render_service/core/pipeline/rs_render_service_connection.cpp +++ b/rosen/modules/render_service/core/pipeline/rs_render_service_connection.cpp @@ -1175,8 +1175,8 @@ void RSRenderServiceConnection::TakeSurfaceCapture(NodeId id, sptr void { - RS_TRACE_NAME_FMT("RSRenderService::TakeSurfaceCapture captureTask nodeId:[%" PRIu64 "]", id); - RS_LOGI("RSRenderService::TakeSurfaceCapture captureTask begin nodeId:[%{public}" PRIu64 "]", id); + RS_TRACE_NAME_FMT("RSRenderServiceConnection::TakeSurfaceCapture captureTask nodeId:[%" PRIu64 "]", id); + RS_LOGI("RSRenderServiceConnection::TakeSurfaceCapture captureTask begin nodeId:[%{public}" PRIu64 "]", id); if (captureConfig.captureType == SurfaceCaptureType::UICAPTURE) { // When the isSync flag in captureConfig is true, UI capture processes commands before capture. // When the isSync flag in captureConfig is false, UI capture will check null node independently. -- Gitee From 070f4897d3fd4741b8b8a93531f64c7e0743b605 Mon Sep 17 00:00:00 2001 From: jianghongxi Date: Fri, 28 Feb 2025 06:46:53 +0000 Subject: [PATCH 16/20] update rosen/modules/render_service/core/drawable/rs_display_render_node_drawable.cpp. Signed-off-by: jianghongxi --- .../core/drawable/rs_display_render_node_drawable.cpp | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/rosen/modules/render_service/core/drawable/rs_display_render_node_drawable.cpp b/rosen/modules/render_service/core/drawable/rs_display_render_node_drawable.cpp index 50228d6be4..db68657b76 100644 --- a/rosen/modules/render_service/core/drawable/rs_display_render_node_drawable.cpp +++ b/rosen/modules/render_service/core/drawable/rs_display_render_node_drawable.cpp @@ -586,9 +586,11 @@ void RSDisplayRenderNodeDrawable::OnDraw(Drawing::Canvas& canvas) const RectI& dirtyRegion = GetSyncDirtyManager()->GetCurrentFrameDirtyRegion(); const auto& activeSurfaceRect = GetSyncDirtyManager()->GetActiveSurfaceRect(); - RS_TRACE_NAME_FMT("RSDisplayRenderNodeDrawable[%" PRIu64 "](%d, %d, %d, %d), zoomed(%d), active(%d, %d, %d, %d)", - paramScreenId, dirtyRegion.left_, dirtyRegion.top_, dirtyRegion.width_, dirtyRegion.height_, - params->GetZoomed(), activeSurfaceRect.left_, activeSurfaceRect.top_, activeSurfaceRect.width_, + RS_TRACE_NAME_FMT("RSDisplayRenderNodeDrawable[%" PRIu64 "][%" PRIu64 + "] zoomed(%d), dirty(%d, %d, %d, %d), active(%d, %d, %d, %d)", + paramScreenId, GerId(), params->GetZoomed(), + dirtyRegion.left_, dirtyRegion.top_, dirtyRegion.width_, dirtyRegion.height_, + activeSurfaceRect.left_, activeSurfaceRect.top_, activeSurfaceRect.width_, activeSurfaceRect.height_); RS_LOGD("RSDisplayRenderNodeDrawable::OnDraw node: %{public}" PRIu64 "", GetId()); ScreenInfo curScreenInfo = screenManager->QueryScreenInfo(paramScreenId); @@ -643,7 +645,7 @@ void RSDisplayRenderNodeDrawable::OnDraw(Drawing::Canvas& canvas) RS_TRACE_NAME_FMT("RSDisplayRenderNodeDrawable::OnDraw VisibleRect[%d, %d, %d, %d] to [%d, %d, %d, %d]", curVisibleRect_.GetLeft(), curVisibleRect_.GetTop(), curVisibleRect_.GetWidth(), curVisibleRect_.GetHeight(), - rect.x, rect.y, rect.x + rect.w, rect.y + rect.h); + rect.x, rect.y, rect.w, rect.h); curVisibleRect_ = Drawing::RectI(rect.x, rect.y, rect.x + rect.w, rect.y + rect.h); RSUniRenderThread::Instance().SetVisibleRect(curVisibleRect_); RSUniRenderThread::Instance().SetEnableVisiableRect(enableVisibleRect_); -- Gitee From e2f578689a0d2c5c0b8915ccb95319372bfe0de1 Mon Sep 17 00:00:00 2001 From: jianghongxi Date: Fri, 28 Feb 2025 06:49:08 +0000 Subject: [PATCH 17/20] update rosen/modules/render_service/core/drawable/rs_display_render_node_drawable.cpp. Signed-off-by: jianghongxi --- .../core/drawable/rs_display_render_node_drawable.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rosen/modules/render_service/core/drawable/rs_display_render_node_drawable.cpp b/rosen/modules/render_service/core/drawable/rs_display_render_node_drawable.cpp index db68657b76..21223af696 100644 --- a/rosen/modules/render_service/core/drawable/rs_display_render_node_drawable.cpp +++ b/rosen/modules/render_service/core/drawable/rs_display_render_node_drawable.cpp @@ -588,7 +588,7 @@ void RSDisplayRenderNodeDrawable::OnDraw(Drawing::Canvas& canvas) const auto& activeSurfaceRect = GetSyncDirtyManager()->GetActiveSurfaceRect(); RS_TRACE_NAME_FMT("RSDisplayRenderNodeDrawable[%" PRIu64 "][%" PRIu64 "] zoomed(%d), dirty(%d, %d, %d, %d), active(%d, %d, %d, %d)", - paramScreenId, GerId(), params->GetZoomed(), + paramScreenId, GetId(), params->GetZoomed(), dirtyRegion.left_, dirtyRegion.top_, dirtyRegion.width_, dirtyRegion.height_, activeSurfaceRect.left_, activeSurfaceRect.top_, activeSurfaceRect.width_, activeSurfaceRect.height_); -- Gitee From 9481c0b4b455bd2ecce7da471ec3277aa7589407 Mon Sep 17 00:00:00 2001 From: jianghongxi Date: Fri, 28 Feb 2025 06:54:04 +0000 Subject: [PATCH 18/20] update rosen/modules/render_service/core/drawable/rs_display_render_node_drawable.cpp. Signed-off-by: jianghongxi --- .../core/drawable/rs_display_render_node_drawable.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/rosen/modules/render_service/core/drawable/rs_display_render_node_drawable.cpp b/rosen/modules/render_service/core/drawable/rs_display_render_node_drawable.cpp index 21223af696..104c913e9b 100644 --- a/rosen/modules/render_service/core/drawable/rs_display_render_node_drawable.cpp +++ b/rosen/modules/render_service/core/drawable/rs_display_render_node_drawable.cpp @@ -590,8 +590,7 @@ void RSDisplayRenderNodeDrawable::OnDraw(Drawing::Canvas& canvas) "] zoomed(%d), dirty(%d, %d, %d, %d), active(%d, %d, %d, %d)", paramScreenId, GetId(), params->GetZoomed(), dirtyRegion.left_, dirtyRegion.top_, dirtyRegion.width_, dirtyRegion.height_, - activeSurfaceRect.left_, activeSurfaceRect.top_, activeSurfaceRect.width_, - activeSurfaceRect.height_); + activeSurfaceRect.left_, activeSurfaceRect.top_, activeSurfaceRect.width_, activeSurfaceRect.height_); RS_LOGD("RSDisplayRenderNodeDrawable::OnDraw node: %{public}" PRIu64 "", GetId()); ScreenInfo curScreenInfo = screenManager->QueryScreenInfo(paramScreenId); ScreenId activeScreenId = HgmCore::Instance().GetActiveScreenId(); -- Gitee From ba0db3a804025d2b75de6b58aaefe74642f035e8 Mon Sep 17 00:00:00 2001 From: jianghongxi Date: Fri, 28 Feb 2025 06:55:49 +0000 Subject: [PATCH 19/20] update rosen/modules/render_service/core/drawable/rs_display_render_node_drawable.cpp. Signed-off-by: jianghongxi --- .../core/drawable/rs_display_render_node_drawable.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rosen/modules/render_service/core/drawable/rs_display_render_node_drawable.cpp b/rosen/modules/render_service/core/drawable/rs_display_render_node_drawable.cpp index 104c913e9b..f4e75bd9c0 100644 --- a/rosen/modules/render_service/core/drawable/rs_display_render_node_drawable.cpp +++ b/rosen/modules/render_service/core/drawable/rs_display_render_node_drawable.cpp @@ -586,7 +586,7 @@ void RSDisplayRenderNodeDrawable::OnDraw(Drawing::Canvas& canvas) const RectI& dirtyRegion = GetSyncDirtyManager()->GetCurrentFrameDirtyRegion(); const auto& activeSurfaceRect = GetSyncDirtyManager()->GetActiveSurfaceRect(); - RS_TRACE_NAME_FMT("RSDisplayRenderNodeDrawable[%" PRIu64 "][%" PRIu64 + RS_TRACE_NAME_FMT("RSDisplayRenderNodeDrawable::OnDraw[%" PRIu64 "][%" PRIu64 "] zoomed(%d), dirty(%d, %d, %d, %d), active(%d, %d, %d, %d)", paramScreenId, GetId(), params->GetZoomed(), dirtyRegion.left_, dirtyRegion.top_, dirtyRegion.width_, dirtyRegion.height_, -- Gitee From 646bcd0b88b65697beb420911533acb818c78125 Mon Sep 17 00:00:00 2001 From: jianghongxi Date: Fri, 28 Feb 2025 07:00:47 +0000 Subject: [PATCH 20/20] update rosen/modules/render_service/core/drawable/rs_display_render_node_drawable.cpp. Signed-off-by: jianghongxi --- .../core/drawable/rs_display_render_node_drawable.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/rosen/modules/render_service/core/drawable/rs_display_render_node_drawable.cpp b/rosen/modules/render_service/core/drawable/rs_display_render_node_drawable.cpp index f4e75bd9c0..750dfcf1ee 100644 --- a/rosen/modules/render_service/core/drawable/rs_display_render_node_drawable.cpp +++ b/rosen/modules/render_service/core/drawable/rs_display_render_node_drawable.cpp @@ -643,8 +643,7 @@ void RSDisplayRenderNodeDrawable::OnDraw(Drawing::Canvas& canvas) const auto& rect = screenManager->GetMirrorScreenVisibleRect(paramScreenId); RS_TRACE_NAME_FMT("RSDisplayRenderNodeDrawable::OnDraw VisibleRect[%d, %d, %d, %d] to [%d, %d, %d, %d]", curVisibleRect_.GetLeft(), curVisibleRect_.GetTop(), - curVisibleRect_.GetWidth(), curVisibleRect_.GetHeight(), - rect.x, rect.y, rect.w, rect.h); + curVisibleRect_.GetWidth(), curVisibleRect_.GetHeight(), rect.x, rect.y, rect.w, rect.h); curVisibleRect_ = Drawing::RectI(rect.x, rect.y, rect.x + rect.w, rect.y + rect.h); RSUniRenderThread::Instance().SetVisibleRect(curVisibleRect_); RSUniRenderThread::Instance().SetEnableVisiableRect(enableVisibleRect_); -- Gitee