diff options
| author | Mathias Agopian <mathias@google.com> | 2010-02-11 15:24:01 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-02-11 15:24:01 -0800 |
| commit | 111c178bc46fa2c61027bc3870a2c8c442936821 (patch) | |
| tree | 32617c8ad15a0d32476e7097645cec1c21183af1 | |
| parent | 7356b0b0661f61a161ac6771e4325ad5f687cb2e (diff) | |
| parent | 88b55fb090ace1a835f890758866f42f03795c12 (diff) | |
| download | frameworks_base-111c178bc46fa2c61027bc3870a2c8c442936821.zip frameworks_base-111c178bc46fa2c61027bc3870a2c8c442936821.tar.gz frameworks_base-111c178bc46fa2c61027bc3870a2c8c442936821.tar.bz2 | |
Merge "RenderScript should not depend on libsurfaceflinger_client.so"
| -rw-r--r-- | libs/rs/rsContext.cpp | 6 | ||||
| -rw-r--r-- | libs/rs/rsContext.h | 7 |
2 files changed, 6 insertions, 7 deletions
diff --git a/libs/rs/rsContext.cpp b/libs/rs/rsContext.cpp index 2a0ccfb..e94aece 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 <surfaceflinger/Surface.h> +#include <ui/egl/android_natives.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, Surface *sur) +void Context::setSurface(uint32_t w, uint32_t h, android_native_window_t *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, (Surface *)sur); + rsc->setSurface(w, h, (android_native_window_t *)sur); } void rsi_ContextSetPriority(Context *rsc, int32_t p) diff --git a/libs/rs/rsContext.h b/libs/rs/rsContext.h index caf9728..03e65f1 100644 --- a/libs/rs/rsContext.h +++ b/libs/rs/rsContext.h @@ -41,12 +41,11 @@ #include "rsgApiStructs.h" #include "rsLocklessFifo.h" +#include <ui/egl/android_natives.h> // --------------------------------------------------------------------------- namespace android { -class Surface; - namespace renderscript { class Context @@ -99,7 +98,7 @@ public: void pause(); void resume(); - void setSurface(uint32_t w, uint32_t h, Surface *sur); + void setSurface(uint32_t w, uint32_t h, android_native_window_t *sur); void setPriority(int32_t p); void assignName(ObjectBase *obj, const char *name, uint32_t len); @@ -239,7 +238,7 @@ private: static void * threadProc(void *); - Surface *mWndSurface; + android_native_window_t *mWndSurface; Vector<ObjectBase *> mNames; |