Merge "hwc: Color layer always has zero transform."

This commit is contained in:
Linux Build Service Account
2014-03-27 18:11:08 -07:00
committed by Gerrit - the friendly Code Review server
3 changed files with 8 additions and 4 deletions

View File

@@ -177,7 +177,7 @@ bool CopyBit::prepare(hwc_context_t *ctx, hwc_display_contents_1_t *list,
return true;
hwc_rect_t sourceCrop = integerizeSourceCrop(layer->sourceCropf);
if (layer->transform & HAL_TRANSFORM_ROT_90) {
if (has90Transform(layer)) {
src_h = sourceCrop.right - sourceCrop.left;
src_w = sourceCrop.bottom - sourceCrop.top;
} else {

View File

@@ -603,9 +603,10 @@ bool MDPComp::tryFullFrame(hwc_context_t *ctx,
//For 8x26 with panel width>1k, if RGB layer needs HFLIP fail mdp comp
// may not need it if Gfx pre-rotation can handle all flips & rotations
int transform = (layer->flags & HWC_COLOR_FILL) ? 0 : layer->transform;
if(qdutils::MDPVersion::getInstance().is8x26() &&
(ctx->dpyAttr[mDpy].xres > 1024) &&
(layer->transform & HWC_TRANSFORM_FLIP_H) &&
(transform & HWC_TRANSFORM_FLIP_H) &&
(!isYuvBuffer(hnd)))
return false;
}

View File

@@ -761,8 +761,10 @@ static void trimList(hwc_context_t *ctx, hwc_display_contents_1_t *list,
for(uint32_t i = 0; i < list->numHwLayers - 1; i++) {
hwc_layer_1_t *layer = &list->hwLayers[i];
hwc_rect_t crop = integerizeSourceCrop(layer->sourceCropf);
int transform = (list->hwLayers[i].flags & HWC_COLOR_FILL) ? 0 :
list->hwLayers[i].transform;
trimLayer(ctx, dpy,
list->hwLayers[i].transform,
transform,
(hwc_rect_t&)crop,
(hwc_rect_t&)list->hwLayers[i].displayFrame);
layer->sourceCropf.left = crop.left;
@@ -1155,7 +1157,8 @@ void optimizeLayerRects(const hwc_display_contents_1_t *list) {
hwc_rect_t& bottomframe = layer->displayFrame;
hwc_rect_t bottomCrop =
integerizeSourceCrop(layer->sourceCropf);
int transform =layer->transform;
int transform = (layer->flags & HWC_COLOR_FILL) ? 0 :
layer->transform;
hwc_rect_t irect = getIntersection(bottomframe, topframe);
if(isValidRect(irect)) {