update renderscript to master_gl APIs

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>

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,

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"