aboutsummaryrefslogtreecommitdiff
path: root/compositor
diff options
context:
space:
mode:
authorRoman Stratiienko <r.stratiienko@gmail.com>2021-03-09 21:56:50 +0200
committerRoman Stratiienko <r.stratiienko@gmail.com>2021-04-06 12:12:17 +0300
commitd21071f7d5eaa8385fac8eabee73c17d2868775d (patch)
treef8bb981801ab2d880c92a47e2f5c0e61cbfbb1b4 /compositor
parent6a7ac12a2fdd6e82ed6f4e64899236794363ac06 (diff)
downloaddrm_hwcomposer-d21071f7d5eaa8385fac8eabee73c17d2868775d.tar.gz
drm_hwcomposer: CI: Increase coverage
Add the following files to the build: backend/BackendClient.cpp backend/Backend.cpp backend/BackendManager.cpp backend/BackendRCarDu.cpp bufferinfo/legacy/BufferInfoImagination.cpp bufferinfo/legacy/BufferInfoLibdrm.cpp bufferinfo/legacy/BufferInfoMaliHisi.cpp bufferinfo/legacy/BufferInfoMaliMediatek.cpp bufferinfo/legacy/BufferInfoMaliMeson.cpp bufferinfo/legacy/BufferInfoMinigbm.cpp compositor/DrmDisplayComposition.cpp compositor/DrmDisplayCompositor.cpp compositor/Planner.cpp drm/DrmGenericImporter.cpp DrmHwcTwo.cpp drm/ResourceManager.cpp drm/VSyncWorker.cpp tests/worker_test.cpp utils/autolock.cpp Files 'bufferinfo/BufferInfoMapperMetadata.cpp' and 'utils/hwcutils.cpp' require a lot of additional headers, therefore move them out of the scope of this commit. 'utils/gralloc.h' isn't planned to use in pure-linux builds, therefore remove it from 'utils' and put it into '.ci/android_headers/hardware/' Fix minor tidy fails. Fix linux build fails (missing includes) due to differences between libc and bionic. Comment-out some sections in 'tests/test_include' which aren't used by drm_hwc but causing build failures for CI due to missing dependencies. Signed-off-by: Roman Stratiienko <r.stratiienko@gmail.com> Reviewed-by: Matvii Zorin <matvii.zorin@globallogic.com>
Diffstat (limited to 'compositor')
-rw-r--r--compositor/DrmDisplayComposition.cpp2
-rw-r--r--compositor/DrmDisplayCompositor.cpp2
-rw-r--r--compositor/DrmDisplayCompositor.h1
-rw-r--r--compositor/Planner.cpp3
-rw-r--r--compositor/Planner.h3
5 files changed, 7 insertions, 4 deletions
diff --git a/compositor/DrmDisplayComposition.cpp b/compositor/DrmDisplayComposition.cpp
index ef151a1..31d8693 100644
--- a/compositor/DrmDisplayComposition.cpp
+++ b/compositor/DrmDisplayComposition.cpp
@@ -18,7 +18,6 @@
#include "DrmDisplayComposition.h"
-#include <log/log.h>
#include <sync/sync.h>
#include <xf86drmMode.h>
@@ -29,6 +28,7 @@
#include "DrmDisplayCompositor.h"
#include "Planner.h"
#include "drm/DrmDevice.h"
+#include "utils/log.h"
namespace android {
diff --git a/compositor/DrmDisplayCompositor.cpp b/compositor/DrmDisplayCompositor.cpp
index 2cc0da5..fd60f97 100644
--- a/compositor/DrmDisplayCompositor.cpp
+++ b/compositor/DrmDisplayCompositor.cpp
@@ -20,7 +20,6 @@
#include "DrmDisplayCompositor.h"
#include <drm/drm_mode.h>
-#include <log/log.h>
#include <pthread.h>
#include <sched.h>
#include <sync/sync.h>
@@ -36,6 +35,7 @@
#include "drm/DrmDevice.h"
#include "drm/DrmPlane.h"
#include "utils/autolock.h"
+#include "utils/log.h"
namespace android {
diff --git a/compositor/DrmDisplayCompositor.h b/compositor/DrmDisplayCompositor.h
index 8660a6d..9ce91b7 100644
--- a/compositor/DrmDisplayCompositor.h
+++ b/compositor/DrmDisplayCompositor.h
@@ -21,6 +21,7 @@
#include <hardware/hwcomposer.h>
#include <pthread.h>
+#include <functional>
#include <memory>
#include <sstream>
#include <tuple>
diff --git a/compositor/Planner.cpp b/compositor/Planner.cpp
index b6f10d2..58db2ea 100644
--- a/compositor/Planner.cpp
+++ b/compositor/Planner.cpp
@@ -18,9 +18,10 @@
#include "Planner.h"
-#include <log/log.h>
+#include <algorithm>
#include "drm/DrmDevice.h"
+#include "utils/log.h"
namespace android {
diff --git a/compositor/Planner.h b/compositor/Planner.h
index 09034ff..5d448a4 100644
--- a/compositor/Planner.h
+++ b/compositor/Planner.h
@@ -21,6 +21,7 @@
#include <hardware/hwcomposer.h>
#include <map>
+#include <memory>
#include <vector>
#include "compositor/DrmDisplayComposition.h"
@@ -99,7 +100,7 @@ class Planner {
std::vector<DrmPlane *> *overlay_planes);
template <typename T, typename... A>
- void AddStage(A &&... args) {
+ void AddStage(A &&...args) {
stages_.emplace_back(
std::unique_ptr<PlanStage>(new T(std::forward(args)...)));
}