From 5cbb940cf6b1fd2b44d66bc40e5c3e8429bbd741 Mon Sep 17 00:00:00 2001
From: Mathias Agopian <mathias@google.com>
Date: Fri, 12 Feb 2010 12:00:38 -0800
Subject: Revert "Revert "RenderScript should not depend on
 libsurfaceflinger_client.so""

This reverts commit a0659aa36c987e28e29778bd97e75fe52152c60e.
---
 libs/rs/rsContext.cpp | 6 +++---
 libs/rs/rsContext.h   | 7 +++----
 2 files changed, 6 insertions(+), 7 deletions(-)

(limited to 'libs/rs')

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;
 
-- 
cgit v1.1