From 6c2df0cbddcf538b8982f942c02a69e179db0aea Mon Sep 17 00:00:00 2001 From: Andrew Wolfers Date: Thu, 6 Nov 2025 18:01:23 +0000 Subject: [PATCH] Move CompositionPlanner from backend/ to compositor/ Change-Id: Iebd4a4d0e15c5171aa20fafe3686b7bc8c08a175 --- Android.bp | 4 ++-- backend/BackendManager.h | 2 +- backend/ClientBackend.cpp | 4 ++-- backend/GenericBackend.cpp | 2 +- backend/GenericBackend.h | 2 +- {backend => compositor}/CompositionPlanner.cpp | 2 +- {backend => compositor}/CompositionPlanner.h | 0 {backend => compositor}/GenericCompositionPlanner.cpp | 2 +- {backend => compositor}/GenericCompositionPlanner.h | 0 drm/DrmDisplayPipeline.cpp | 2 +- hwc/HwcDisplay.cpp | 2 +- hwc/HwcDisplay.h | 2 +- hwc2_device/DrmHwcTwo.cpp | 2 +- hwc2_device/hwc2_device.cpp | 2 +- meson.build | 10 +++++----- stats/CompositionStats.h | 2 +- stats/CompositionStatsAtomReporter.h | 2 +- stats/CompositionStatsAtomReporterDesktop.cpp | 2 +- 18 files changed, 22 insertions(+), 22 deletions(-) rename {backend => compositor}/CompositionPlanner.cpp (97%) rename {backend => compositor}/CompositionPlanner.h (100%) rename {backend => compositor}/GenericCompositionPlanner.cpp (99%) rename {backend => compositor}/GenericCompositionPlanner.h (100%) diff --git a/Android.bp b/Android.bp index 3081a8b..fb28bfd 100644 --- a/Android.bp +++ b/Android.bp @@ -74,8 +74,10 @@ filegroup { "bufferinfo/BufferInfoGetter.cpp", "bufferinfo/BufferInfoMapperMetadata.cpp", + "compositor/CompositionPlanner.cpp", "compositor/DrmKmsPlan.cpp", "compositor/FlatteningController.cpp", + "compositor/GenericCompositionPlanner.cpp", "drm/DrmAtomicStateManager.cpp", "drm/DrmConnector.cpp", @@ -94,9 +96,7 @@ filegroup { "backend/BackendManager.cpp", "backend/ClientBackend.cpp", - "backend/CompositionPlanner.cpp", "backend/GenericBackend.cpp", - "backend/GenericCompositionPlanner.cpp", "hwc/HwcDisplay.cpp", "hwc/HwcDisplayConfigs.cpp", diff --git a/backend/BackendManager.h b/backend/BackendManager.h index 3fb7ec2..f76d71e 100644 --- a/backend/BackendManager.h +++ b/backend/BackendManager.h @@ -21,7 +21,7 @@ #include #include -#include "CompositionPlanner.h" +#include "compositor/CompositionPlanner.h" namespace android::drm_hwcomposer { diff --git a/backend/ClientBackend.cpp b/backend/ClientBackend.cpp index db83a67..7eaf769 100644 --- a/backend/ClientBackend.cpp +++ b/backend/ClientBackend.cpp @@ -14,8 +14,8 @@ * limitations under the License. */ -#include "GenericBackend.h" -#include "GenericCompositionPlanner.h" +#include "backend/GenericBackend.h" +#include "compositor/GenericCompositionPlanner.h" #include "hwc/HwcDisplay.h" namespace android::drm_hwcomposer { diff --git a/backend/GenericBackend.cpp b/backend/GenericBackend.cpp index 6c8eabd..090d201 100644 --- a/backend/GenericBackend.cpp +++ b/backend/GenericBackend.cpp @@ -16,7 +16,7 @@ #include "backend/GenericBackend.h" -#include "backend/GenericCompositionPlanner.h" +#include "compositor/GenericCompositionPlanner.h" #include "drm/DrmDisplayPipeline.h" namespace android::drm_hwcomposer { diff --git a/backend/GenericBackend.h b/backend/GenericBackend.h index 7bec83d..dd61a06 100644 --- a/backend/GenericBackend.h +++ b/backend/GenericBackend.h @@ -17,7 +17,7 @@ #pragma once #include "backend/BackendManager.h" -#include "backend/CompositionPlanner.h" +#include "compositor/CompositionPlanner.h" namespace android::drm_hwcomposer { diff --git a/backend/CompositionPlanner.cpp b/compositor/CompositionPlanner.cpp similarity index 97% rename from backend/CompositionPlanner.cpp rename to compositor/CompositionPlanner.cpp index 7b1f317..3e00e27 100644 --- a/backend/CompositionPlanner.cpp +++ b/compositor/CompositionPlanner.cpp @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "backend/CompositionPlanner.h" +#include "CompositionPlanner.h" #include "hwc/HwcLayer.h" diff --git a/backend/CompositionPlanner.h b/compositor/CompositionPlanner.h similarity index 100% rename from backend/CompositionPlanner.h rename to compositor/CompositionPlanner.h diff --git a/backend/GenericCompositionPlanner.cpp b/compositor/GenericCompositionPlanner.cpp similarity index 99% rename from backend/GenericCompositionPlanner.cpp rename to compositor/GenericCompositionPlanner.cpp index 080c457..392e80b 100644 --- a/backend/GenericCompositionPlanner.cpp +++ b/compositor/GenericCompositionPlanner.cpp @@ -20,7 +20,7 @@ #include #include -#include "BackendManager.h" +#include "backend/BackendManager.h" #include "compositor/FlatteningController.h" #include "compositor/LayerData.h" #include "hwc/HwcDisplay.h" diff --git a/backend/GenericCompositionPlanner.h b/compositor/GenericCompositionPlanner.h similarity index 100% rename from backend/GenericCompositionPlanner.h rename to compositor/GenericCompositionPlanner.h diff --git a/drm/DrmDisplayPipeline.cpp b/drm/DrmDisplayPipeline.cpp index aca4892..ee9dd3c 100644 --- a/drm/DrmDisplayPipeline.cpp +++ b/drm/DrmDisplayPipeline.cpp @@ -24,7 +24,7 @@ #include "DrmDevice.h" #include "DrmEncoder.h" #include "DrmPlane.h" -#include "backend/CompositionPlanner.h" +#include "compositor/CompositionPlanner.h" #include "utils/log.h" #include "utils/properties.h" diff --git a/hwc/HwcDisplay.cpp b/hwc/HwcDisplay.cpp index 1d21504..92d11ee 100644 --- a/hwc/HwcDisplay.cpp +++ b/hwc/HwcDisplay.cpp @@ -27,7 +27,7 @@ #include #include -#include "backend/CompositionPlanner.h" +#include "compositor/CompositionPlanner.h" #include "compositor/DisplayInfo.h" #include "compositor/FlatteningController.h" #include "drm/DrmConnector.h" diff --git a/hwc/HwcDisplay.h b/hwc/HwcDisplay.h index fd1f099..ba4936b 100644 --- a/hwc/HwcDisplay.h +++ b/hwc/HwcDisplay.h @@ -20,7 +20,7 @@ #include "HwcDisplayConfigs.h" #include "HwcLayer.h" -#include "backend/CompositionPlanner.h" +#include "compositor/CompositionPlanner.h" #include "compositor/DisplayInfo.h" #include "compositor/LayerData.h" #include "drm/DrmAtomicStateManager.h" diff --git a/hwc2_device/DrmHwcTwo.cpp b/hwc2_device/DrmHwcTwo.cpp index 6e8d085..311c2fe 100644 --- a/hwc2_device/DrmHwcTwo.cpp +++ b/hwc2_device/DrmHwcTwo.cpp @@ -20,7 +20,7 @@ #include -#include "backend/CompositionPlanner.h" +#include "compositor/CompositionPlanner.h" #include "utils/log.h" namespace android::drm_hwcomposer { diff --git a/hwc2_device/hwc2_device.cpp b/hwc2_device/hwc2_device.cpp index fffe7aa..dac8511 100644 --- a/hwc2_device/hwc2_device.cpp +++ b/hwc2_device/hwc2_device.cpp @@ -28,7 +28,7 @@ #include #include "DrmHwcTwo.h" -#include "backend/CompositionPlanner.h" +#include "compositor/CompositionPlanner.h" #include "compositor/DisplayInfo.h" #include "hardware/hwcomposer2.h" #include "hwc/HwcLayer.h" diff --git a/meson.build b/meson.build index 453f456..05a3b9f 100644 --- a/meson.build +++ b/meson.build @@ -10,14 +10,14 @@ project( inc_include = [include_directories('.')] src_common = files( + 'backend/BackendManager.cpp', + 'backend/ClientBackend.cpp', + 'backend/GenericBackend.cpp', + 'compositor/CompositionPlanner.cpp', 'compositor/DrmKmsPlan.cpp', 'compositor/FlatteningController.cpp', 'compositor/FlatteningEventAtomReporter.cpp', - 'backend/BackendManager.cpp', - 'backend/GenericCompositionPlanner.cpp', - 'backend/ClientBackend.cpp', - 'backend/CompositionPlanner.cpp', - 'backend/GenericBackend.cpp', + 'compositor/GenericCompositionPlanner.cpp', 'hwc/HwcDisplayConfigs.cpp', 'hwc/HwcDisplay.cpp', 'hwc/HwcLayer.cpp', diff --git a/stats/CompositionStats.h b/stats/CompositionStats.h index 36fd1f3..5aa6343 100644 --- a/stats/CompositionStats.h +++ b/stats/CompositionStats.h @@ -20,7 +20,7 @@ #include #include -#include "backend/CompositionPlanner.h" +#include "compositor/CompositionPlanner.h" namespace android::drm_hwcomposer { diff --git a/stats/CompositionStatsAtomReporter.h b/stats/CompositionStatsAtomReporter.h index 14911a2..40cd7c1 100644 --- a/stats/CompositionStatsAtomReporter.h +++ b/stats/CompositionStatsAtomReporter.h @@ -19,7 +19,7 @@ #include #include "CompositionStats.h" -#include "backend/CompositionPlanner.h" +#include "compositor/CompositionPlanner.h" namespace android::drm_hwcomposer { diff --git a/stats/CompositionStatsAtomReporterDesktop.cpp b/stats/CompositionStatsAtomReporterDesktop.cpp index 1bb0183..87ef9ae 100644 --- a/stats/CompositionStatsAtomReporterDesktop.cpp +++ b/stats/CompositionStatsAtomReporterDesktop.cpp @@ -26,7 +26,7 @@ #include #include "CompositionStats.h" -#include "backend/CompositionPlanner.h" +#include "compositor/CompositionPlanner.h" #include "desktopatoms.h" #include "utils/log.h"