DEV/flutter_flutter
1
0
Fork 0
mirror of https://github.com/flutter/flutter.git synced 2026-02-20 02:29:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

[Impeller] Use type safe masks for HardwareBufferUsage. (flutter/engine#52008)

Browse Source 
These were added to //impeller/base/mask.h recently. No change in functionality. Removes a bunch of casts.
This commit is contained in:
Chinmay Garde 2024-04-09 18:43:12 -07:00 committed by GitHub
parent cf23d87f53
commit cfaa074fc8
2 changed files with 18 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
engine/src/flutter/impeller/toolkit/android/hardware_buffer.cc
View File

@ -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;
@ -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;
}

16
engine/src/flutter/impeller/toolkit/android/hardware_buffer.h
View File

@ -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"
@ -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
@ -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_