diff options
| author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-07-03 15:49:41 +0000 |
|---|---|---|
| committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-07-03 15:49:41 +0000 |
| commit | 6753696fb792578bb32f2312e66d189d95c7f46e (patch) | |
| tree | 0be8b55408ec891b7c275a1eb9e4f0310702b339 /drm/DrmPlane.h | |
| parent | d7d78156a4700fc34a524c3fdc5d5af0166ec8bd (diff) | |
| parent | 39e9dc65f3a608c85124d4014b07ede70680f18b (diff) | |
| download | drm_hwcomposer-aml_adb_340912200.tar.gz | |
Snap for 10428683 from 39e9dc65f3a608c85124d4014b07ede70680f18b to mainline-adbd-releaseaml_adb_341520010aml_adb_341517070aml_adb_340912530aml_adb_340912350aml_adb_340912200aml_adb_340912000android14-mainline-adbd-release
Change-Id: I2213ce7a479cd995044eb32028a53b01b6f7f355
Diffstat (limited to 'drm/DrmPlane.h')
| -rw-r--r-- | drm/DrmPlane.h | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/drm/DrmPlane.h b/drm/DrmPlane.h index 65f458f..31f0a33 100644 --- a/drm/DrmPlane.h +++ b/drm/DrmPlane.h @@ -24,12 +24,12 @@ #include "DrmCrtc.h" #include "DrmProperty.h" -#include "drmhwcomposer.h" +#include "compositor/LayerData.h" namespace android { class DrmDevice; -struct DrmHwcLayer; +struct LayerData; class DrmPlane : public PipelineBindable<DrmPlane> { public: @@ -40,7 +40,7 @@ class DrmPlane : public PipelineBindable<DrmPlane> { -> std::unique_ptr<DrmPlane>; bool IsCrtcSupported(const DrmCrtc &crtc) const; - bool IsValidForLayer(DrmHwcLayer *layer); + bool IsValidForLayer(LayerData *layer); auto GetType() const { return type_; @@ -49,7 +49,7 @@ class DrmPlane : public PipelineBindable<DrmPlane> { bool IsFormatSupported(uint32_t format) const; bool HasNonRgbFormat() const; - auto AtomicSetState(drmModeAtomicReq &pset, DrmHwcLayer &layer, uint32_t zpos, + auto AtomicSetState(drmModeAtomicReq &pset, LayerData &layer, uint32_t zpos, uint32_t crtc_id) -> int; auto AtomicDisablePlane(drmModeAtomicReq &pset) -> int; auto &GetZPosProperty() const { @@ -94,10 +94,10 @@ class DrmPlane : public PipelineBindable<DrmPlane> { DrmProperty color_encoding_propery_; DrmProperty color_range_property_; - std::map<DrmHwcBlending, uint64_t> blending_enum_map_; - std::map<DrmHwcColorSpace, uint64_t> color_encoding_enum_map_; - std::map<DrmHwcSampleRange, uint64_t> color_range_enum_map_; - std::map<DrmHwcTransform, uint64_t> transform_enum_map_; + std::map<BufferBlendMode, uint64_t> blending_enum_map_; + std::map<BufferColorSpace, uint64_t> color_encoding_enum_map_; + std::map<BufferSampleRange, uint64_t> color_range_enum_map_; + std::map<LayerTransform, uint64_t> transform_enum_map_; }; } // namespace android |