diff options
| author | 2009-07-06 14:52:04 -0700 | |
|---|---|---|
| committer | 2009-07-06 14:52:04 -0700 | |
| commit | d8b2a6412daef032d89c23e979758f6334b62093 (patch) | |
| tree | dba55e2701d88e7bb380604520a230abb16b4b66 /libs/rs/rsContext.cpp | |
| parent | d719890cab1eec09cbf556a3b86cc02b0f0ef8d7 (diff) | |
| parent | 03a9a3449af3e0e79e9bbcd87f8057189ab9e151 (diff) | |
Merge commit 'goog/master_gl' into merge_master_gl
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 c731db00afcc..4025ff81a008 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> #include <GLES/gl.h> #include <GLES/glext.h> @@ -46,8 +47,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, |