diff options
| author | Vince Harron <vharron@google.com> | 2014-09-19 20:35:28 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-09-19 20:35:28 +0000 |
| commit | 6dc9b1b64a3a01ddcce9e664dc0153021a595130 (patch) | |
| tree | adcdc60450a8b2a11711a108e2f1e5e962eb2a42 /opengl | |
| parent | a354e897f1ab5d1aad913e90d1e26a8326ced8c1 (diff) | |
| parent | 57df810e26b7538f7ff802072f6d5e918c957454 (diff) | |
| download | android_device_generic_goldfish-6dc9b1b64a3a01ddcce9e664dc0153021a595130.tar.gz android_device_generic_goldfish-6dc9b1b64a3a01ddcce9e664dc0153021a595130.tar.bz2 android_device_generic_goldfish-6dc9b1b64a3a01ddcce9e664dc0153021a595130.zip | |
Merge "Make the size of "cb_handle_t" same for 32/64-bit" into lmp-dev
Diffstat (limited to 'opengl')
| -rw-r--r-- | opengl/system/OpenglSystemCommon/gralloc_cb.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/opengl/system/OpenglSystemCommon/gralloc_cb.h b/opengl/system/OpenglSystemCommon/gralloc_cb.h index c138964..a0f6ed8 100644 --- a/opengl/system/OpenglSystemCommon/gralloc_cb.h +++ b/opengl/system/OpenglSystemCommon/gralloc_cb.h @@ -96,7 +96,11 @@ struct cb_handle_t : public native_handle { int glType; // OpenGL type enum used when uploading to host int ashmemSize; // ashmem region size for the buffer (0 unless is HW_FB buffer or // s/w access is needed) - intptr_t ashmemBase; // CPU address of the mapped ashmem region + union { + intptr_t ashmemBase; // CPU address of the mapped ashmem region + uint64_t padding; // enforce same size on 32-bit/64-bit + } __attribute__((aligned(8))); + int ashmemBasePid; // process id which mapped the ashmem region int mappedPid; // process id which succeeded gralloc_register call int lockedLeft; // region of buffer locked for s/w write |