diff options
| author | Dianne Hackborn <hackbod@google.com> | 2010-06-30 16:08:24 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-06-30 16:08:24 -0700 |
| commit | 177c405a242e811b1010bd8382b5807ab8df31a8 (patch) | |
| tree | 6931bc5a00c2bf75d6b3c31754fa1d7bbe3da03d /libs/rs/rsContext.cpp | |
| parent | e341a0b5e9a1e30a020970a69c58c34f902ea06f (diff) | |
| parent | c6e1d88022db800773401c16803e1ab27fd01a7e (diff) | |
| download | frameworks_base-177c405a242e811b1010bd8382b5807ab8df31a8.zip frameworks_base-177c405a242e811b1010bd8382b5807ab8df31a8.tar.gz frameworks_base-177c405a242e811b1010bd8382b5807ab8df31a8.tar.bz2 | |
am c6e1d880: Merge "Introduce official public NativeWindow type." into gingerbread
Merge commit 'c6e1d88022db800773401c16803e1ab27fd01a7e' into gingerbread-plus-aosp
* commit 'c6e1d88022db800773401c16803e1ab27fd01a7e':
Introduce official public NativeWindow type.
Diffstat (limited to 'libs/rs/rsContext.cpp')
| -rw-r--r-- | libs/rs/rsContext.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libs/rs/rsContext.cpp b/libs/rs/rsContext.cpp index d8a9a99..596f533 100644 --- a/libs/rs/rsContext.cpp +++ b/libs/rs/rsContext.cpp @@ -473,7 +473,7 @@ Context::~Context() objDestroyOOBDestroy(); } -void Context::setSurface(uint32_t w, uint32_t h, android_native_window_t *sur) +void Context::setSurface(uint32_t w, uint32_t h, ANativeWindow *sur) { rsAssert(mIsGraphicsContext); @@ -888,7 +888,7 @@ void rsi_ContextResume(Context *rsc) rsc->resume(); } -void rsi_ContextSetSurface(Context *rsc, uint32_t w, uint32_t h, android_native_window_t *sur) +void rsi_ContextSetSurface(Context *rsc, uint32_t w, uint32_t h, ANativeWindow *sur) { rsc->setSurface(w, h, sur); } |