diff options
| author | Jesse Hall <jessehall@google.com> | 2013-01-10 16:19:56 -0800 |
|---|---|---|
| committer | Jesse Hall <jessehall@google.com> | 2013-01-10 18:17:13 -0800 |
| commit | 7296051995fbaea919480a6cc2dabb729dabc95b (patch) | |
| tree | e984ce76b8a296bac72d57847b7b526b5edd0105 | |
| parent | fdd8551fe83754846cb91e2d7325ef90d2e0fb28 (diff) | |
| download | frameworks_native-7296051995fbaea919480a6cc2dabb729dabc95b.zip frameworks_native-7296051995fbaea919480a6cc2dabb729dabc95b.tar.gz frameworks_native-7296051995fbaea919480a6cc2dabb729dabc95b.tar.bz2 | |
Remove support for legacy HWC version encoding
Change-Id: If03ae1ebf10d15777310e1449a57473021390582
| -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 31d731e..8d92bd3 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; } |