diff options
| author | Victor Tasayco Loarte <victorx.tasayco.loarte@intel.com> | 2016-06-08 01:24:54 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-06-08 01:24:54 +0000 |
| commit | 32a86332b1afe6494d83026992daaab85680492f (patch) | |
| tree | 1c57449003cbb9c64d6a2f193562d97092ec3c35 | |
| parent | 530fd5114ebd3862520fa64d491730a845392320 (diff) | |
| parent | 179758ea061e9cee5e6326d44b8a348b2742b4bf (diff) | |
| download | hwcomposer-32a86332b1afe6494d83026992daaab85680492f.tar.gz | |
display: re-implement assignToDevice method am: a174f45487
am: 179758ea06
Change-Id: I6a4acb44e2b888a019e6a83426f6d427e27e9c81
| -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 |