diff options
| author | Mathias Agopian <mathias@google.com> | 2010-10-06 17:07:39 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-10-06 17:07:39 -0700 |
| commit | 499f518400d54f2f14753a674edd95c5bb11acfd (patch) | |
| tree | 4a985755f7752b22cdea5d7cbaa4f5417d53da65 /include/ui | |
| parent | 7930b5bc068e92a1eaaa6c890b77aebbdf01e259 (diff) | |
| parent | ff04e97faf75c435e453d4c1caf7eeac8b9c1ceb (diff) | |
| download | frameworks_base-499f518400d54f2f14753a674edd95c5bb11acfd.zip frameworks_base-499f518400d54f2f14753a674edd95c5bb11acfd.tar.gz frameworks_base-499f518400d54f2f14753a674edd95c5bb11acfd.tar.bz2 | |
am ff04e97f: am f4619308: Merge "fix [2835280] Add support for cancelling buffers to ANativeWindow" into gingerbread
Merge commit 'ff04e97faf75c435e453d4c1caf7eeac8b9c1ceb'
* commit 'ff04e97faf75c435e453d4c1caf7eeac8b9c1ceb':
fix [2835280] Add support for cancelling buffers to ANativeWindow
Diffstat (limited to 'include/ui')
| -rw-r--r-- | include/ui/egl/android_natives.h | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/include/ui/egl/android_natives.h b/include/ui/egl/android_natives.h index d59d72b..654d0f3 100644 --- a/include/ui/egl/android_natives.h +++ b/include/ui/egl/android_natives.h @@ -218,7 +218,17 @@ struct ANativeWindow int (*perform)(struct ANativeWindow* window, int operation, ... ); - void* reserved_proc[3]; + /* + * hook used to cancel a buffer that has been dequeued. + * No synchronization is performed between dequeue() and cancel(), so + * either external synchronization is needed, or these functions must be + * called from the same thread. + */ + int (*cancelBuffer)(struct ANativeWindow* window, + struct android_native_buffer_t* buffer); + + + void* reserved_proc[2]; }; // Backwards compatibility... please switch to ANativeWindow. |