diff options
| author | Dianne Hackborn <hackbod@google.com> | 2010-06-30 16:11:21 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-06-30 16:11:21 -0700 |
| commit | efcd77407b321498a43ca380c8f67b84eb5a2d6e (patch) | |
| tree | 7860ab6884ca2ed8911c4108cfa88f82c63718ea /libs/rs/rsContext.h | |
| parent | 01959f65520a69537a2d93f4e543b03705694ad9 (diff) | |
| parent | 177c405a242e811b1010bd8382b5807ab8df31a8 (diff) | |
| download | frameworks_base-efcd77407b321498a43ca380c8f67b84eb5a2d6e.zip frameworks_base-efcd77407b321498a43ca380c8f67b84eb5a2d6e.tar.gz frameworks_base-efcd77407b321498a43ca380c8f67b84eb5a2d6e.tar.bz2 | |
am 177c405a: am c6e1d880: Merge "Introduce official public NativeWindow type." into gingerbread
Merge commit '177c405a242e811b1010bd8382b5807ab8df31a8'
* commit '177c405a242e811b1010bd8382b5807ab8df31a8':
Introduce official public NativeWindow type.
Diffstat (limited to 'libs/rs/rsContext.h')
| -rw-r--r-- | libs/rs/rsContext.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libs/rs/rsContext.h b/libs/rs/rsContext.h index 1485d8a..73f478a 100644 --- a/libs/rs/rsContext.h +++ b/libs/rs/rsContext.h @@ -103,7 +103,7 @@ public: void pause(); void resume(); - void setSurface(uint32_t w, uint32_t h, android_native_window_t *sur); + void setSurface(uint32_t w, uint32_t h, ANativeWindow *sur); void setPriority(int32_t p); void assignName(ObjectBase *obj, const char *name, uint32_t len); @@ -250,7 +250,7 @@ private: static void * threadProc(void *); - android_native_window_t *mWndSurface; + ANativeWindow *mWndSurface; Vector<ObjectBase *> mNames; |