drm_hwcomposer: remove separate_rects
As part of removing GL compositing, separate_rects.cpp is no long
needed. Use hwc_rect_t and hwc_frect_t in places instead of our own
class.
Signed-off-by: Rob Herring <robh@kernel.org>
diff --git a/drmhwcomposer.h b/drmhwcomposer.h
index 1723fcb..f3b000b 100644
--- a/drmhwcomposer.h
+++ b/drmhwcomposer.h
@@ -20,10 +20,11 @@
#include <stdbool.h>
#include <stdint.h>
+#include <vector>
+
#include <hardware/hardware.h>
#include <hardware/hwcomposer.h>
#include "autofd.h"
-#include "separate_rects.h"
#include "drmhwcgralloc.h"
struct hwc_import_context;
@@ -110,9 +111,6 @@
native_handle_t *handle_ = NULL;
};
-template <typename T>
-using DrmHwcRect = separate_rects::Rect<T>;
-
enum DrmHwcTransform {
kIdentity = 0,
kFlipH = 1 << 0,
@@ -136,8 +134,8 @@
uint32_t transform;
DrmHwcBlending blending = DrmHwcBlending::kNone;
uint16_t alpha = 0xffff;
- DrmHwcRect<float> source_crop;
- DrmHwcRect<int> display_frame;
+ hwc_frect_t source_crop;
+ hwc_rect_t display_frame;
UniqueFd acquire_fence;
OutputFd release_fence;