diff options
| author | David Turner <digit@android.com> | 2014-07-17 13:00:57 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-07-17 13:00:57 +0000 |
| commit | 878dc460ffd10f02300edaa3c264aa296fd02406 (patch) | |
| tree | 9471fb6d99055b33632ee51b9c0ec765e8c945ac /opengl | |
| parent | 4c2ffa8c7a79574f4dba0fc125e97f81507b8f79 (diff) | |
| parent | 9b1e6c5a3ccd943b7158dce83387fbfcc1162d69 (diff) | |
| download | android_device_generic_goldfish-878dc460ffd10f02300edaa3c264aa296fd02406.tar.gz android_device_generic_goldfish-878dc460ffd10f02300edaa3c264aa296fd02406.tar.bz2 android_device_generic_goldfish-878dc460ffd10f02300edaa3c264aa296fd02406.zip | |
am 9b1e6c5a: Merge "Make the size of "cb_handle_t" same for 32/64-bit"
* commit '9b1e6c5a3ccd943b7158dce83387fbfcc1162d69':
Make the size of "cb_handle_t" same for 32/64-bit
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 |