diff options
| author | Mathias Agopian <mathias@google.com> | 2009-06-22 18:01:09 -0700 |
|---|---|---|
| committer | Mathias Agopian <mathias@google.com> | 2009-06-22 18:01:09 -0700 |
| commit | 3142f4f40ba745ecd3cd9f1839adaebc1f20fede (patch) | |
| tree | c1a21762935c87d6f0bccea1a3e25d6d55c88da5 | |
| parent | ab445152f94460281aab87fc123c935b67857e81 (diff) | |
| download | frameworks_base-3142f4f40ba745ecd3cd9f1839adaebc1f20fede.zip frameworks_base-3142f4f40ba745ecd3cd9f1839adaebc1f20fede.tar.gz frameworks_base-3142f4f40ba745ecd3cd9f1839adaebc1f20fede.tar.bz2 | |
update renderscript to master_gl APIs
| -rw-r--r-- | libs/rs/jni/RenderScript_jni.cpp | 1 | ||||
| -rw-r--r-- | libs/rs/rsContext.cpp | 4 | ||||
| -rw-r--r-- | libs/rs/rsContext.h | 1 |
3 files changed, 2 insertions, 4 deletions
diff --git a/libs/rs/jni/RenderScript_jni.cpp b/libs/rs/jni/RenderScript_jni.cpp index ab17a4a..dcf3850 100644 --- a/libs/rs/jni/RenderScript_jni.cpp +++ b/libs/rs/jni/RenderScript_jni.cpp @@ -23,7 +23,6 @@ #include <utils/misc.h> #include <utils/Log.h> -#include <ui/EGLNativeWindowSurface.h> #include <ui/Surface.h> #include <core/SkBitmap.h> diff --git a/libs/rs/rsContext.cpp b/libs/rs/rsContext.cpp index 7c46c0e..455c18d 100644 --- a/libs/rs/rsContext.cpp +++ b/libs/rs/rsContext.cpp @@ -18,6 +18,7 @@ #include "rsContext.h" #include "rsThreadIO.h" #include "utils/String8.h" +#include <ui/FramebufferNativeWindow.h> using namespace android; using namespace android::renderscript; @@ -43,8 +44,7 @@ void Context::initEGL() eglChooseConfig(mDisplay, s_configAttribs, &mConfig, 1, &mNumConfigs); if (mWndSurface) { - mSurface = eglCreateWindowSurface(mDisplay, mConfig, - new EGLNativeWindowSurface(mWndSurface), + mSurface = eglCreateWindowSurface(mDisplay, mConfig, mWndSurface, NULL); } else { mSurface = eglCreateWindowSurface(mDisplay, mConfig, diff --git a/libs/rs/rsContext.h b/libs/rs/rsContext.h index 334ef3c..e9d75e0 100644 --- a/libs/rs/rsContext.h +++ b/libs/rs/rsContext.h @@ -18,7 +18,6 @@ #define ANDROID_RS_CONTEXT_H #include <utils/Vector.h> -#include <ui/EGLNativeWindowSurface.h> #include <ui/Surface.h> #include "rsType.h" |