summaryrefslogtreecommitdiffstats
path: root/services/surfaceflinger
diff options
context:
space:
mode:
authorMathias Agopian <mathias@google.com>2013-09-26 19:41:22 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2013-09-26 19:41:22 +0000
commit86206b41b2ff000e086301c6bafb8da577e563b2 (patch)
treecf7d1dd189342292dacd76ef62046e9092815ba9 /services/surfaceflinger
parent6da15f46f5f8b38e31384d641f8d3db2c3c6ea30 (diff)
parent8f63c2049b93819c41d390fc4222b9307e3a61c7 (diff)
downloadframeworks_native-86206b41b2ff000e086301c6bafb8da577e563b2.zip
frameworks_native-86206b41b2ff000e086301c6bafb8da577e563b2.tar.gz
frameworks_native-86206b41b2ff000e086301c6bafb8da577e563b2.tar.bz2
Merge "fix initialization of framebuffer target crop rect on hwc 1.3" into klp-dev
Diffstat (limited to 'services/surfaceflinger')
-rw-r--r--services/surfaceflinger/DisplayHardware/HWComposer.cpp9
1 files changed, 8 insertions, 1 deletions
diff --git a/services/surfaceflinger/DisplayHardware/HWComposer.cpp b/services/surfaceflinger/DisplayHardware/HWComposer.cpp
index 32c55fd..c851a2c 100644
--- a/services/surfaceflinger/DisplayHardware/HWComposer.cpp
+++ b/services/surfaceflinger/DisplayHardware/HWComposer.cpp
@@ -524,7 +524,14 @@ status_t HWComposer::createWorkList(int32_t id, size_t numLayers) {
disp.framebufferTarget->handle = disp.fbTargetHandle;
disp.framebufferTarget->transform = 0;
disp.framebufferTarget->blending = HWC_BLENDING_PREMULT;
- disp.framebufferTarget->sourceCrop = r;
+ if (hwcHasApiVersion(mHwc, HWC_DEVICE_API_VERSION_1_3)) {
+ disp.framebufferTarget->sourceCropf.left = 0;
+ disp.framebufferTarget->sourceCropf.top = 0;
+ disp.framebufferTarget->sourceCropf.right = disp.width;
+ disp.framebufferTarget->sourceCropf.bottom = disp.height;
+ } else {
+ disp.framebufferTarget->sourceCrop = r;
+ }
disp.framebufferTarget->displayFrame = r;
disp.framebufferTarget->visibleRegionScreen.numRects = 1;
disp.framebufferTarget->visibleRegionScreen.rects =