diff options
| author | Jack Palevich <jackpal@google.com> | 2010-02-12 18:21:26 +0800 |
|---|---|---|
| committer | Jack Palevich <jackpal@google.com> | 2010-02-12 18:21:26 +0800 |
| commit | a0659aa36c987e28e29778bd97e75fe52152c60e (patch) | |
| tree | b3cb8b2888c171060e94a787381cfa3303dda100 /libs | |
| parent | 470969346d7958f859d97d1a136b4ecc11e2a464 (diff) | |
| download | frameworks_base-a0659aa36c987e28e29778bd97e75fe52152c60e.zip frameworks_base-a0659aa36c987e28e29778bd97e75fe52152c60e.tar.gz frameworks_base-a0659aa36c987e28e29778bd97e75fe52152c60e.tar.bz2 | |
Revert "RenderScript should not depend on libsurfaceflinger_client.so"
This reverts commit 88b55fb090ace1a835f890758866f42f03795c12.
Diffstat (limited to 'libs')
| -rw-r--r-- | libs/rs/rsContext.cpp | 6 | ||||
| -rw-r--r-- | libs/rs/rsContext.h | 7 |
2 files changed, 7 insertions, 6 deletions
diff --git a/libs/rs/rsContext.cpp b/libs/rs/rsContext.cpp index e94aece..2a0ccfb 100644 --- a/libs/rs/rsContext.cpp +++ b/libs/rs/rsContext.cpp @@ -19,7 +19,7 @@ #include "rsThreadIO.h" #include <ui/FramebufferNativeWindow.h> #include <ui/EGLUtils.h> -#include <ui/egl/android_natives.h> +#include <surfaceflinger/Surface.h> #include <sys/types.h> #include <sys/resource.h> @@ -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, Surface *sur) { rsAssert(mIsGraphicsContext); @@ -859,7 +859,7 @@ void rsi_ContextResume(Context *rsc) void rsi_ContextSetSurface(Context *rsc, uint32_t w, uint32_t h, void *sur) { - rsc->setSurface(w, h, (android_native_window_t *)sur); + rsc->setSurface(w, h, (Surface *)sur); } void rsi_ContextSetPriority(Context *rsc, int32_t p) diff --git a/libs/rs/rsContext.h b/libs/rs/rsContext.h index 03e65f1..caf9728 100644 --- a/libs/rs/rsContext.h +++ b/libs/rs/rsContext.h @@ -41,11 +41,12 @@ #include "rsgApiStructs.h" #include "rsLocklessFifo.h" -#include <ui/egl/android_natives.h> // --------------------------------------------------------------------------- namespace android { +class Surface; + namespace renderscript { class Context @@ -98,7 +99,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, Surface *sur); void setPriority(int32_t p); void assignName(ObjectBase *obj, const char *name, uint32_t len); @@ -238,7 +239,7 @@ private: static void * threadProc(void *); - android_native_window_t *mWndSurface; + Surface *mWndSurface; Vector<ObjectBase *> mNames; |