openharmony/graphic_graphic_2d
1
0
Fork 0
mirror of https://gitee.com/openharmony/graphic_graphic_2d synced 2024-11-27 09:10:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

!10236 告警修改

Browse Source 
Merge pull request !10236 from balingbaling/gaojin
This commit is contained in:
openharmony_ci 2024-04-20 12:59:46 +00:00 committed by Gitee
commit a53952f358
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
5 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
rosen/modules/render_service/core/pipeline/rs_main_thread.cpp
View File

@ -1764,14 +1764,14 @@ void RSMainThread::CheckSystemSceneStatus()
std::chrono::duration_cast<std::chrono::nanoseconds>(
std::chrono::steady_clock::now().time_since_epoch()).count());
while (!systemAnimatedScenesList_.empty()) {
if (curTime - systemAnimatedScenesList_.front().second > MAX_SYSTEM_SCENE_STATUS_TIME) {
if (curTime - static_cast<uint64_t>(systemAnimatedScenesList_.front().second) > MAX_SYSTEM_SCENE_STATUS_TIME) {
systemAnimatedScenesList_.pop_front();
} else {
break;
}
}
while (!threeFingerScenesList_.empty()) {
if (curTime - threeFingerScenesList_.front().second > MAX_SYSTEM_SCENE_STATUS_TIME) {
if (curTime - static_cast<uint64_t>(threeFingerScenesList_.front().second) > MAX_SYSTEM_SCENE_STATUS_TIME) {
threeFingerScenesList_.pop_front();
} else {
break;

6
rosen/modules/render_service/core/pipeline/rs_uni_render_visitor.cpp
View File

@ -4019,9 +4019,9 @@ void RSUniRenderVisitor::ProcessDisplayRenderNode(RSDisplayRenderNode& node)
}
RS_LOGD("RSUniRenderVisitor::ProcessDisplayRenderNode end");
#ifdef RS_ENABLE_VK
if (RSSystemProperties::GetGpuApiType() == GpuApiType::VULKAN) {
renderEngine_->GetRenderContext()->GetDrGPUContext()->StoreVkPipelineCacheData();
}
if (RSSystemProperties::GetGpuApiType() == GpuApiType::VULKAN) {
renderEngine_->GetRenderContext()->GetDrGPUContext()->StoreVkPipelineCacheData();
}
#endif
}

1
rosen/modules/render_service/core/screen_manager/rs_screen_manager.cpp
View File

@ -565,7 +565,6 @@ void RSScreenManager::ProcessScreenConnectedLocked(std::shared_ptr<HdiOutput> &o
void RSScreenManager::ProcessScreenDisConnectedLocked(std::shared_ptr<HdiOutput> &output)
{
ScreenId id = ToScreenId(output->GetScreenId());
if (screens_.count(id) == 0) {
RS_LOGW("RSScreenManager %{public}s: There is no screen for id %{public}" PRIu64, __func__, id);
} else {

1
rosen/modules/render_service_base/include/drawable/rs_drawable.h
View File

@ -132,7 +132,6 @@ public:
// Call on thread sync
virtual void OnSync() = 0;
// !!!!!!!!!!!!!!!!!!!!!!!!!! Important Note:
// DrawFunc can only access the RT members variables, accessing staging members will cause a crash
virtual Drawing::RecordingCanvas::DrawFunc CreateDrawFunc() const = 0;

4
utils/color_manager/src/color_space.cpp
View File

@ -116,7 +116,7 @@ ColorSpace::ColorSpace(const ColorSpacePrimaries &primaries, const TransferFunc
toXYZ(ComputeXYZD50(primaries)),
transferFunc(transferFunc)
{
std::array<float, 2> whiteP = {primaries.wX, primaries.wY};
std::array<float, 2> whiteP = {primaries.wX, primaries.wY}; // 2 means two dimension x, y
whitePoint = whiteP;
}
@ -124,7 +124,7 @@ ColorSpace::ColorSpace(const ColorSpacePrimaries &primaries, float gamma)
: colorSpaceName(ColorSpaceName::CUSTOM),
toXYZ(ComputeXYZD50(primaries))
{
std::array<float, 2> whiteP = {primaries.wX, primaries.wY};
std::array<float, 2> whiteP = {primaries.wX, primaries.wY}; // 2 means two dimension x, y
whitePoint = whiteP;
transferFunc = {};
transferFunc.g = gamma;