From 3142f4f40ba745ecd3cd9f1839adaebc1f20fede Mon Sep 17 00:00:00 2001
From: Mathias Agopian <mathias@google.com>
Date: Mon, 22 Jun 2009 18:01:09 -0700
Subject: [PATCH] update renderscript to master_gl APIs

---
 libs/rs/jni/RenderScript_jni.cpp | 1 -
 libs/rs/rsContext.cpp            | 4 ++--
 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 ab17a4a996c71..dcf3850e6c73d 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 7c46c0e9fd006..455c18dd940c5 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 334ef3c475b30..e9d75e09b534e 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"