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.cpp | |
| 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.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 d8c3861..68eca44 100644 --- a/libs/rs/rsContext.cpp +++ b/libs/rs/rsContext.cpp @@ -461,7 +461,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); @@ -853,7 +853,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); } |