ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge "Remove support for legacy HWC version encoding"

Browse Source
This commit is contained in:
Jesse Hall 2013-01-14 09:25:21 -08:00 committed by Gerrit Code Review
commit cbe5135610
1 changed files with 1 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
services/surfaceflinger/DisplayHardware/HWComposer.cpp
View File

@ -48,25 +48,15 @@
namespace android { 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) { static uint32_t hwcApiVersion(const hwc_composer_device_1_t* hwc) {
uint32_t hwcVersion = hwc->common.version; 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; return hwcVersion & HARDWARE_API_VERSION_2_MAJ_MIN_MASK;
} }
static uint32_t hwcHeaderVersion(const hwc_composer_device_1_t* hwc) { static uint32_t hwcHeaderVersion(const hwc_composer_device_1_t* hwc) {
uint32_t hwcVersion = hwc->common.version; 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; return hwcVersion & HARDWARE_API_VERSION_2_HEADER_MASK;
} }