diff options
author | Jamie Gennis <jgennis@google.com> | 2011-03-15 10:42:06 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2011-03-15 10:42:06 -0700 |
commit | f38d253ccd79e645baf3c12eed35fc98a4ffa858 (patch) | |
tree | 0b73dd88c2f1869d0464c257d10e762b4b6e2467 /include/ui | |
parent | 005de48cfbce35d1f2914ed7d975fa1ed6e702ba (diff) | |
parent | ceb7cb1460484eda1a3cb9cd271d7caf3a3dcbd1 (diff) | |
download | frameworks_base-f38d253ccd79e645baf3c12eed35fc98a4ffa858.zip frameworks_base-f38d253ccd79e645baf3c12eed35fc98a4ffa858.tar.gz frameworks_base-f38d253ccd79e645baf3c12eed35fc98a4ffa858.tar.bz2 |
am ceb7cb14: am 02805a40: Merge "ANativeWindow: add query for the concrete type." into honeycomb-mr1
* commit 'ceb7cb1460484eda1a3cb9cd271d7caf3a3dcbd1':
ANativeWindow: add query for the concrete type.
Diffstat (limited to 'include/ui')
-rw-r--r-- | include/ui/egl/android_natives.h | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/include/ui/egl/android_natives.h b/include/ui/egl/android_natives.h index 0ac34d0..0fc1ddf 100644 --- a/include/ui/egl/android_natives.h +++ b/include/ui/egl/android_natives.h @@ -110,6 +110,14 @@ enum { * conjunction with this query. */ NATIVE_WINDOW_QUEUES_TO_WINDOW_COMPOSER, + + /* Get the concrete type of a ANativeWindow. See below for the list of + * possible return values. + * + * This query should not be used outside the Android framework and will + * likely be removed in the near future. + */ + NATIVE_WINDOW_CONCRETE_TYPE, }; /* valid operations for the (*perform)() hook */ @@ -142,6 +150,13 @@ enum { NATIVE_WINDOW_TRANSFORM_ROT_270 = HAL_TRANSFORM_ROT_270, }; +/* values returned by the NATIVE_WINDOW_CONCRETE_TYPE query */ +enum { + NATIVE_WINDOW_FRAMEBUFFER, // FramebufferNativeWindow + NATIVE_WINDOW_SURFACE, // Surface + NATIVE_WINDOW_SURFACE_TEXTURE_CLIENT, // SurfaceTextureClient +}; + struct ANativeWindow { #ifdef __cplusplus |