diff options
| author | Jesse Hall <jessehall@google.com> | 2013-01-14 09:47:49 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-01-14 09:47:49 -0800 |
| commit | f3e9d5bde57a41593a7dbc15e6f1fdb1ea64ea74 (patch) | |
| tree | 8d31907a3fb7f9495cea3f27264b9f990f628180 /services/surfaceflinger/DisplayHardware | |
| parent | 8d9f0118926d54b5a5fc1508a7c43aa661839f1f (diff) | |
| parent | cbe5135610cd3c919e6334fada72cc52238bb8b0 (diff) | |
| download | frameworks_native-f3e9d5bde57a41593a7dbc15e6f1fdb1ea64ea74.zip frameworks_native-f3e9d5bde57a41593a7dbc15e6f1fdb1ea64ea74.tar.gz frameworks_native-f3e9d5bde57a41593a7dbc15e6f1fdb1ea64ea74.tar.bz2 | |
am cbe51356: Merge "Remove support for legacy HWC version encoding"
* commit 'cbe5135610cd3c919e6334fada72cc52238bb8b0':
Remove support for legacy HWC version encoding
Diffstat (limited to 'services/surfaceflinger/DisplayHardware')
| -rw-r--r-- | services/surfaceflinger/DisplayHardware/HWComposer.cpp | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/services/surfaceflinger/DisplayHardware/HWComposer.cpp b/services/surfaceflinger/DisplayHardware/HWComposer.cpp index 2eb74b7..068fdcd 100644 --- a/services/surfaceflinger/DisplayHardware/HWComposer.cpp +++ b/services/surfaceflinger/DisplayHardware/HWComposer.cpp @@ -48,25 +48,15 @@ namespace android { -#define MIN_HWC_HEADER_VERSION 0 +#define MIN_HWC_HEADER_VERSION HWC_HEADER_VERSION static uint32_t hwcApiVersion(const hwc_composer_device_1_t* hwc) { uint32_t hwcVersion = hwc->common.version; - if (MIN_HWC_HEADER_VERSION == 0 && - (hwcVersion & HARDWARE_API_VERSION_2_MAJ_MIN_MASK) == 0) { - // legacy version encoding - hwcVersion <<= 16; - } return hwcVersion & HARDWARE_API_VERSION_2_MAJ_MIN_MASK; } static uint32_t hwcHeaderVersion(const hwc_composer_device_1_t* hwc) { uint32_t hwcVersion = hwc->common.version; - if (MIN_HWC_HEADER_VERSION == 0 && - (hwcVersion & HARDWARE_API_VERSION_2_MAJ_MIN_MASK) == 0) { - // legacy version encoding - hwcVersion <<= 16; - } return hwcVersion & HARDWARE_API_VERSION_2_HEADER_MASK; } |