diff options
| author | Mathias Agopian <mathias@google.com> | 2010-12-07 14:22:56 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-12-07 14:22:56 -0800 |
| commit | 4e345ab7df737592528e99db73612c6b37e34545 (patch) | |
| tree | 8eded6da95e3c0929209c992c7f0c5db9778508e /include/ui/android_native_buffer.h | |
| parent | a0f011ff499289c89535c41ebe79c8c642414dff (diff) | |
| parent | a2977c383d363e1e88a5b36230b1fa4c312807d2 (diff) | |
| download | frameworks_base-4e345ab7df737592528e99db73612c6b37e34545.zip frameworks_base-4e345ab7df737592528e99db73612c6b37e34545.tar.gz frameworks_base-4e345ab7df737592528e99db73612c6b37e34545.tar.bz2 | |
am a2977c38: Merge changes Ie03796ae,Ide3e980a into gingerbread
* commit 'a2977c383d363e1e88a5b36230b1fa4c312807d2':
[3171580] SurfaceFlinger Bypass mode. (DO NOT MERGE)
[3171580] Add transform field to native buffers. (DO NOT MERGE)
Diffstat (limited to 'include/ui/android_native_buffer.h')
| -rw-r--r-- | include/ui/android_native_buffer.h | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/include/ui/android_native_buffer.h b/include/ui/android_native_buffer.h index 402843e..a472824 100644 --- a/include/ui/android_native_buffer.h +++ b/include/ui/android_native_buffer.h @@ -51,8 +51,12 @@ typedef struct android_native_buffer_t int stride; int format; int usage; - - void* reserved[2]; + + /* transformation as defined in hardware.h */ + uint8_t transform; + + uint8_t reserved_bytes[3]; + void* reserved[1]; buffer_handle_t handle; |