diff options
| author | Jesse Hall <jessehall@google.com> | 2014-01-03 18:36:29 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-01-03 18:36:29 +0000 |
| commit | 524672571f1df138eb913e672aaa74e0257aa8c0 (patch) | |
| tree | 707b2b97aa08d69cab290a19753aafa85326b1d2 /services/surfaceflinger/DisplayHardware/HWComposer.cpp | |
| parent | 10ca42cbdc75c6a36d0b72dadbe845d990e31e95 (diff) | |
| parent | 03691218ada2fb7e084ad4ae7ddd54f9b28d5611 (diff) | |
| download | frameworks_native-524672571f1df138eb913e672aaa74e0257aa8c0.zip frameworks_native-524672571f1df138eb913e672aaa74e0257aa8c0.tar.gz frameworks_native-524672571f1df138eb913e672aaa74e0257aa8c0.tar.bz2 | |
am 03691218: am e5f7bf74: am b6c21004: Merge "Implement per-display EGLConfig and configless EGLContext"
* commit '03691218ada2fb7e084ad4ae7ddd54f9b28d5611':
Implement per-display EGLConfig and configless EGLContext
Diffstat (limited to 'services/surfaceflinger/DisplayHardware/HWComposer.cpp')
| -rw-r--r-- | services/surfaceflinger/DisplayHardware/HWComposer.cpp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/services/surfaceflinger/DisplayHardware/HWComposer.cpp b/services/surfaceflinger/DisplayHardware/HWComposer.cpp index 642702f..474f633 100644 --- a/services/surfaceflinger/DisplayHardware/HWComposer.cpp +++ b/services/surfaceflinger/DisplayHardware/HWComposer.cpp @@ -454,7 +454,11 @@ uint32_t HWComposer::getHeight(int disp) const { } uint32_t HWComposer::getFormat(int disp) const { - return mDisplayData[disp].format; + if (uint32_t(disp)>31 || !mAllocatedDisplayIDs.hasBit(disp)) { + return HAL_PIXEL_FORMAT_RGBA_8888; + } else { + return mDisplayData[disp].format; + } } float HWComposer::getDpiX(int disp) const { @@ -1146,7 +1150,7 @@ bool HWComposer::VSyncThread::threadLoop() { } HWComposer::DisplayData::DisplayData() -: width(0), height(0), format(0), +: width(0), height(0), format(HAL_PIXEL_FORMAT_RGBA_8888), xdpi(0.0f), ydpi(0.0f), refresh(0), connected(false), |