Skip to content

Commit e36f0ea

Browse files
committed
update to fix HWComposer
1 parent 2a3acec commit e36f0ea

File tree

2 files changed

+22
-0
lines changed

2 files changed

+22
-0
lines changed

include/hardware/hwcomposer.h

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -167,6 +167,13 @@ typedef struct hwc_layer_1 {
167167
/* blending to apply during composition */
168168
int32_t blending;
169169

170+
#ifdef MRVL_HARDWARE
171+
/* for HWC_BLENDING_NONE, alpha is not used.
172+
* for HWC_BLENDING_PREMULT and HWC_BLENDING_COVERAGE, it is plane alpha value.
173+
* for HWC_BLENDING_DIM, it is the alpha in source color (0,0,0,alpha). */
174+
int32_t alpha;
175+
#endif
176+
170177
/* area of the source to consider, the origin is the top-left corner of
171178
* the buffer. As of HWC_DEVICE_API_VERSION_1_3, sourceRect uses floats.
172179
* If the h/w can't support a non-integer source crop rectangle, it should
@@ -642,7 +649,14 @@ typedef struct hwc_composer_device_1 {
642649
/*
643650
* Reserved for future use. Must be NULL.
644651
*/
652+
#ifdef MRVL_HARDWARE
653+
int (*fbPrePost)(struct hwc_composer_device_1* dev, buffer_handle_t buffer);
654+
int (*stretchBlit)(struct hwc_composer_device_1 * dev, buffer_handle_t Dest, buffer_handle_t Source, hwc_rect_t * DestRect,hwc_rect_t * SourceRect, uint32_t transform);
655+
int (*getBackBuffer)(buffer_handle_t * backbuffer);
656+
void* reserved_proc[1];
657+
#else
645658
void* reserved_proc[4];
659+
#endif
646660

647661
} hwc_composer_device_1_t;
648662

include/hardware/hwcomposer_v0.h

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -102,6 +102,13 @@ typedef struct hwc_layer {
102102

103103
/* blending to apply during composition */
104104
int32_t blending;
105+
106+
#ifdef MRVL_HARDWARE
107+
/* for HWC_BLENDING_NONE, alpha is not used.
108+
* for HWC_BLENDING_PREMULT and HWC_BLENDING_COVERAGE, it is plane alpha value.
109+
* for HWC_BLENDING_DIM, it is the alpha in source color (0,0,0,alpha). */
110+
int32_t alpha;
111+
#endif
105112

106113
/* area of the source to consider, the origin is the top-left corner of
107114
* the buffer */
@@ -270,3 +277,4 @@ static inline int hwc_close(hwc_composer_device_t* device) {
270277
/*****************************************************************************/
271278

272279
#endif /* ANDROID_INCLUDE_HARDWARE_HWCOMPOSER_V0_H */
280+

0 commit comments

Comments
 (0)