diff options
author | Victor Tasayco Loarte <victorx.tasayco.loarte@intel.com> | 2016-06-08 01:38:51 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2016-06-08 01:38:51 +0000 |
commit | 6ce16253a8a528897710c7354c83acb06d197c8f (patch) | |
tree | 35c37dd2ae9f1ec8932dd38f346d0bcfeb2ef06f | |
parent | 8bc6e995d66bd1ee35f8fb25a4b57344594c0a90 (diff) | |
parent | 6f865a49766903d6ea2a92568912c4a6b6f08bf1 (diff) | |
download | hwcomposer-6ce16253a8a528897710c7354c83acb06d197c8f.tar.gz |
display: re-implement assignToDevice method am: a174f45487 am: 179758ea06 am: 32a86332b1 am: 923a0cfa84
am: 6f865a4976
Change-Id: I23dd3687e9ab5784c2931abd682685f6ceac3f4a
-rw-r--r-- | merrifield/ips/tangier/TngPrimaryPlane.cpp | 1 | ||||
-rw-r--r-- | merrifield/ips/tangier/TngSpritePlane.cpp | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/merrifield/ips/tangier/TngPrimaryPlane.cpp b/merrifield/ips/tangier/TngPrimaryPlane.cpp index cfa1406..e811a3b 100644 --- a/merrifield/ips/tangier/TngPrimaryPlane.cpp +++ b/merrifield/ips/tangier/TngPrimaryPlane.cpp @@ -167,6 +167,7 @@ void TngPrimaryPlane::setZOrderConfig(ZOrderConfig& zorderConfig, bool TngPrimaryPlane::assignToDevice(int disp) { + DisplayPlane::assignToDevice(disp); return true; } diff --git a/merrifield/ips/tangier/TngSpritePlane.cpp b/merrifield/ips/tangier/TngSpritePlane.cpp index 8e5a7f1..0571283 100644 --- a/merrifield/ips/tangier/TngSpritePlane.cpp +++ b/merrifield/ips/tangier/TngSpritePlane.cpp @@ -66,8 +66,6 @@ bool TngSpritePlane::setDataBuffer(BufferMapper& mapper) stride = mapper.getStride().rgb.stride; #ifdef ENABLE_ROTATION_180 linoff = (mapper.getCrop().h + srcY - 1) * stride + (srcX + mapper.getCrop().w) * bpp; - dstX = dstW - (srcX + mapper.getCrop().w); - dstY = dstH - (srcY + mapper.getCrop().h); #else linoff = srcY * stride + srcX * bpp; #endif |