drm_hwcomposer: Move include/drmhwcgralloc.h to bufferinfo/BufferInfo.h
... to emphasize its purpose.
- Rename struct HwcDrmBo -> struct BufferInfo
- Remove unused BufferInfo::acquire_fence, BufferInfo::hal_format and
BufferInfo::usage fields
Signed-off-by: Roman Stratiienko <roman.o.stratiienko@globallogic.com>
diff --git a/include/drmhwcgralloc.h b/include/drmhwcgralloc.h
deleted file mode 100644
index 949912d..0000000
--- a/include/drmhwcgralloc.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Copyright (C) 2015 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef ANDROID_DRMHWCGRALLOC_H_
-#define ANDROID_DRMHWCGRALLOC_H_
-
-#include <cstdint>
-
-constexpr int kHwcDrmBoMaxPlanes = 4;
-
-struct HwcDrmBo {
- uint32_t width;
- uint32_t height;
- uint32_t format; /* DRM_FORMAT_* from drm_fourcc.h */
- uint32_t hal_format; /* HAL_PIXEL_FORMAT_* */
- uint32_t usage;
- uint32_t pitches[kHwcDrmBoMaxPlanes];
- uint32_t offsets[kHwcDrmBoMaxPlanes];
- /* sizes[] is used only by mapper@4 metadata getter for internal purposes */
- uint32_t sizes[kHwcDrmBoMaxPlanes];
- int prime_fds[kHwcDrmBoMaxPlanes];
- uint64_t modifiers[kHwcDrmBoMaxPlanes];
- int acquire_fence_fd;
-};
-
-// NOLINTNEXTLINE(readability-identifier-naming)
-using hwc_drm_bo_t = HwcDrmBo;
-
-#endif // ANDROID_DRMHWCGRALLOC_H_
diff --git a/include/drmhwcomposer.h b/include/drmhwcomposer.h
index 4fb0efd..211ffd2 100644
--- a/include/drmhwcomposer.h
+++ b/include/drmhwcomposer.h
@@ -24,8 +24,8 @@
#include <cstdint>
#include <vector>
+#include "bufferinfo/BufferInfo.h"
#include "drm/DrmFbImporter.h"
-#include "drmhwcgralloc.h"
#include "utils/UniqueFd.h"
namespace android {
@@ -62,10 +62,9 @@
struct DrmHwcLayer {
buffer_handle_t sf_handle = nullptr;
- hwc_drm_bo_t buffer_info{};
+ BufferInfo buffer_info{};
std::shared_ptr<DrmFbIdHandle> fb_id_handle;
- int gralloc_buffer_usage = 0;
DrmHwcTransform transform{};
DrmHwcBlending blending = DrmHwcBlending::kNone;
uint16_t alpha = UINT16_MAX;
@@ -77,11 +76,6 @@
UniqueFd acquire_fence;
int ImportBuffer(DrmDevice *drm_device);
-
- bool IsProtected() const {
- return (gralloc_buffer_usage & GRALLOC_USAGE_PROTECTED) ==
- GRALLOC_USAGE_PROTECTED;
- }
};
} // namespace android