diff options
| author | Mathias Agopian <mathias@google.com> | 2010-02-12 12:00:38 -0800 |
|---|---|---|
| committer | Mathias Agopian <mathias@google.com> | 2010-02-12 12:00:38 -0800 |
| commit | 5cbb940cf6b1fd2b44d66bc40e5c3e8429bbd741 (patch) | |
| tree | b159bd272cdb42a6c9a68a547334a38a2f0b8798 /libs/rs | |
| parent | 90762d35a99e32ed22cdfb1f81252544ee22e30b (diff) | |
| download | frameworks_base-5cbb940cf6b1fd2b44d66bc40e5c3e8429bbd741.zip frameworks_base-5cbb940cf6b1fd2b44d66bc40e5c3e8429bbd741.tar.gz frameworks_base-5cbb940cf6b1fd2b44d66bc40e5c3e8429bbd741.tar.bz2 | |
Revert "Revert "RenderScript should not depend on libsurfaceflinger_client.so""
This reverts commit a0659aa36c987e28e29778bd97e75fe52152c60e.
Diffstat (limited to 'libs/rs')
| -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; |