Skip to content
This repository was archived by the owner on Feb 25, 2025. It is now read-only.

[Impeller] Use type safe masks for HardwareBufferUsage. #52008

Merged
merged 1 commit into from
Apr 10, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 6 additions & 12 deletions impeller/toolkit/android/hardware_buffer.cc
Original file line number Diff line number Diff line change
Expand Up @@ -24,16 +24,13 @@ static AHardwareBuffer_Desc ToAHardwareBufferDesc(
ahb_desc.height = desc.size.height;
ahb_desc.format = ToAHardwareBufferFormat(desc.format);
ahb_desc.layers = 1u;
if (desc.usage & static_cast<HardwareBufferUsage>(
HardwareBufferUsageFlags::kFrameBufferAttachment)) {
if (desc.usage & HardwareBufferUsageFlags::kFrameBufferAttachment) {
ahb_desc.usage |= AHARDWAREBUFFER_USAGE_GPU_FRAMEBUFFER;
}
if (desc.usage & static_cast<HardwareBufferUsage>(
HardwareBufferUsageFlags::kCompositorOverlay)) {
if (desc.usage & HardwareBufferUsageFlags::kCompositorOverlay) {
ahb_desc.usage |= AHARDWAREBUFFER_USAGE_COMPOSER_OVERLAY;
}
if (desc.usage & static_cast<HardwareBufferUsage>(
HardwareBufferUsageFlags::kSampledImage)) {
if (desc.usage & HardwareBufferUsageFlags::kSampledImage) {
ahb_desc.usage |= AHARDWAREBUFFER_USAGE_GPU_SAMPLED_IMAGE;
}
return ahb_desc;
Expand Down Expand Up @@ -80,12 +77,9 @@ HardwareBufferDescriptor HardwareBufferDescriptor::MakeForSwapchainImage(
desc.format = HardwareBufferFormat::kR8G8B8A8UNormInt;
// Zero sized hardware buffers cannot be allocated.
desc.size = size.Max(ISize{1u, 1u});
desc.usage =
static_cast<HardwareBufferUsage>(
HardwareBufferUsageFlags::kFrameBufferAttachment) |
static_cast<HardwareBufferUsage>(
HardwareBufferUsageFlags::kCompositorOverlay) |
static_cast<HardwareBufferUsage>(HardwareBufferUsageFlags::kSampledImage);
desc.usage = HardwareBufferUsageFlags::kFrameBufferAttachment |
HardwareBufferUsageFlags::kCompositorOverlay |
HardwareBufferUsageFlags::kSampledImage;
return desc;
}

Expand Down
16 changes: 12 additions & 4 deletions impeller/toolkit/android/hardware_buffer.h
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
#include <optional>

#include "flutter/fml/unique_object.h"
#include "impeller/base/mask.h"
#include "impeller/geometry/size.h"
#include "impeller/toolkit/android/proc_table.h"

Expand All @@ -26,21 +27,22 @@ enum class HardwareBufferFormat {
kR8G8B8A8UNormInt,
};

using HardwareBufferUsage = uint8_t;

enum class HardwareBufferUsageFlags : HardwareBufferUsage {
enum class HardwareBufferUsageFlags {
kNone = 0u,
kFrameBufferAttachment = 1u << 0u,
kCompositorOverlay = 1u << 1u,
kSampledImage = 1u << 2u,
};

using HardwareBufferUsage = Mask<HardwareBufferUsageFlags>;

//------------------------------------------------------------------------------
/// @brief A descriptor use to specify hardware buffer allocations.
///
struct HardwareBufferDescriptor {
HardwareBufferFormat format = HardwareBufferFormat::kR8G8B8A8UNormInt;
ISize size;
HardwareBufferUsage usage = 0u;
HardwareBufferUsage usage = HardwareBufferUsageFlags::kNone;

//----------------------------------------------------------------------------
/// @brief Create a descriptor of the given size that is suitable for use
Expand Down Expand Up @@ -146,4 +148,10 @@ class HardwareBuffer {

} // namespace impeller::android

namespace impeller {

IMPELLER_ENUM_IS_MASK(android::HardwareBufferUsageFlags);

} // namespace impeller

#endif // FLUTTER_IMPELLER_TOOLKIT_ANDROID_HARDWARE_BUFFER_H_