Changes for May 2024, syncing up to 20240508
This commit is contained in:
@@ -1,4 +1,4 @@
|
||||
From 09fac47349b2e39d2e53b2b638b98d17d3bd18a4 Mon Sep 17 00:00:00 2001
|
||||
From d39466c50305a64ff3a683b1e13373379273ee57 Mon Sep 17 00:00:00 2001
|
||||
From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
|
||||
Date: Mon, 20 Nov 2023 22:00:14 +0800
|
||||
Subject: [PATCH 1/2] Revert "CompositionEngine: Request device composition for
|
||||
@@ -10,7 +10,7 @@ This reverts commit 69fad8aa4098b007fe17472902159705fdcd957f.
|
||||
1 file changed, 1 insertion(+), 15 deletions(-)
|
||||
|
||||
diff --git a/services/surfaceflinger/CompositionEngine/src/Output.cpp b/services/surfaceflinger/CompositionEngine/src/Output.cpp
|
||||
index 2eb1a5c399..793959cea6 100644
|
||||
index f680fc5eac..09c7c9933a 100644
|
||||
--- a/services/surfaceflinger/CompositionEngine/src/Output.cpp
|
||||
+++ b/services/surfaceflinger/CompositionEngine/src/Output.cpp
|
||||
@@ -22,7 +22,6 @@
|
||||
@@ -21,7 +21,7 @@ index 2eb1a5c399..793959cea6 100644
|
||||
#include <compositionengine/impl/HwcAsyncWorker.h>
|
||||
#include <compositionengine/impl/Output.h>
|
||||
#include <compositionengine/impl/OutputCompositionState.h>
|
||||
@@ -901,10 +900,7 @@ void Output::writeCompositionState(const compositionengine::CompositionRefreshAr
|
||||
@@ -915,10 +914,7 @@ void Output::writeCompositionState(const compositionengine::CompositionRefreshAr
|
||||
|
||||
compositionengine::OutputLayer* Output::findLayerRequestingBackgroundComposition() const {
|
||||
compositionengine::OutputLayer* layerRequestingBgComposition = nullptr;
|
||||
@@ -30,10 +30,10 @@ index 2eb1a5c399..793959cea6 100644
|
||||
- compositionengine::OutputLayer* nextLayer = getOutputLayerOrderedByZByIndex(i + 1);
|
||||
-
|
||||
+ for (auto* layer : getOutputLayersOrderedByZ()) {
|
||||
auto* compState = layer->getLayerFE().getCompositionState();
|
||||
const auto* compState = layer->getLayerFE().getCompositionState();
|
||||
|
||||
// If any layer has a sideband stream, we will disable blurs. In that case, we don't
|
||||
@@ -918,16 +914,6 @@ compositionengine::OutputLayer* Output::findLayerRequestingBackgroundComposition
|
||||
@@ -938,16 +934,6 @@ compositionengine::OutputLayer* Output::findLayerRequestingBackgroundComposition
|
||||
if (compState->backgroundBlurRadius > 0 || compState->blurRegions.size() > 0) {
|
||||
layerRequestingBgComposition = layer;
|
||||
}
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
From 9428b1b39a473592423f2d2f7812cf3815a68b86 Mon Sep 17 00:00:00 2001
|
||||
From 16d9d6827247991744b80aff6793582c42da9ba0 Mon Sep 17 00:00:00 2001
|
||||
From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
|
||||
Date: Mon, 20 Nov 2023 22:00:23 +0800
|
||||
Subject: [PATCH 2/2] Revert "surfaceflinger: Add support for Udfps extension
|
||||
@@ -15,10 +15,16 @@ This reverts commit 8655d06e960235c0f9ad079be3541fee2a0359f7.
|
||||
delete mode 100644 services/surfaceflinger/CompositionEngine/src/UdfpsExtension.cpp
|
||||
|
||||
diff --git a/services/surfaceflinger/CompositionEngine/Android.bp b/services/surfaceflinger/CompositionEngine/Android.bp
|
||||
index cdec4abdba..f3a0186e3e 100644
|
||||
index 52bc260720..ae2f2dbbf5 100644
|
||||
--- a/services/surfaceflinger/CompositionEngine/Android.bp
|
||||
+++ b/services/surfaceflinger/CompositionEngine/Android.bp
|
||||
@@ -61,10 +61,7 @@ cc_defaults {
|
||||
@@ -84,16 +84,12 @@ filegroup {
|
||||
"src/OutputLayer.cpp",
|
||||
"src/OutputLayerCompositionState.cpp",
|
||||
"src/RenderSurface.cpp",
|
||||
- "src/UdfpsExtension.cpp",
|
||||
],
|
||||
}
|
||||
|
||||
cc_library {
|
||||
name: "libcompositionengine",
|
||||
@@ -27,18 +33,10 @@ index cdec4abdba..f3a0186e3e 100644
|
||||
- "surfaceflinger_udfps_lib_defaults",
|
||||
- ],
|
||||
+ defaults: ["libcompositionengine_defaults"],
|
||||
srcs: [
|
||||
"src/planner/CachedSet.cpp",
|
||||
"src/planner/Flattener.cpp",
|
||||
@@ -86,7 +83,6 @@ cc_library {
|
||||
"src/OutputLayer.cpp",
|
||||
"src/OutputLayerCompositionState.cpp",
|
||||
"src/RenderSurface.cpp",
|
||||
- "src/UdfpsExtension.cpp",
|
||||
],
|
||||
local_include_dirs: ["include"],
|
||||
export_include_dirs: ["include"],
|
||||
@@ -115,14 +111,6 @@ cc_library {
|
||||
static_libs: [
|
||||
"libsurfaceflinger_common",
|
||||
"libsurfaceflingerflags",
|
||||
@@ -136,14 +132,6 @@ cc_library {
|
||||
export_include_dirs: ["include"],
|
||||
}
|
||||
|
||||
@@ -89,10 +87,10 @@ index 4306cb4a02..0000000000
|
||||
-
|
||||
-#endif /* __UDFPS_EXTENSION__H__ */
|
||||
diff --git a/services/surfaceflinger/CompositionEngine/src/OutputLayer.cpp b/services/surfaceflinger/CompositionEngine/src/OutputLayer.cpp
|
||||
index a314553dd2..0ac0ecb727 100644
|
||||
index 11b9024e99..7fe3369f88 100644
|
||||
--- a/services/surfaceflinger/CompositionEngine/src/OutputLayer.cpp
|
||||
+++ b/services/surfaceflinger/CompositionEngine/src/OutputLayer.cpp
|
||||
@@ -19,7 +19,6 @@
|
||||
@@ -18,7 +18,6 @@
|
||||
#include <compositionengine/DisplayColorProfile.h>
|
||||
#include <compositionengine/LayerFECompositionState.h>
|
||||
#include <compositionengine/Output.h>
|
||||
@@ -100,7 +98,7 @@ index a314553dd2..0ac0ecb727 100644
|
||||
#include <compositionengine/impl/HwcBufferCache.h>
|
||||
#include <compositionengine/impl/OutputCompositionState.h>
|
||||
#include <compositionengine/impl/OutputLayer.h>
|
||||
@@ -449,17 +448,7 @@ void OutputLayer::writeOutputDependentGeometryStateToHWC(HWC2::Layer* hwcLayer,
|
||||
@@ -459,17 +458,7 @@ void OutputLayer::writeOutputDependentGeometryStateToHWC(HWC2::Layer* hwcLayer,
|
||||
sourceCrop.bottom, to_string(error).c_str(), static_cast<int32_t>(error));
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user