commit 58fd6a5f10480551786739280d56dfa620c80b39
author Andy McFadden <fadden@android.com> Tue Dec 18 09:50:03 2012 -0800
committer Andy McFadden <fadden@android.com> Tue Dec 18 11:22:21 2012 -0800
tree bc07ffa74e3ae8a4609e7a733d149a93bf5e0f7c
parent f79af7e3dfd48b8fda6e4f342809a4a74cb187a5

Rename ISurfaceTexture and SurfaceTexture

The C++ class names don't match what the classes do, so rename
ISurfaceTexture to IGraphicBufferProducer, and SurfaceTexture to
GLConsumer.

Bug 7736700

Change-Id: I268f78847fcb7094fdfd17484c7f20e128b950e1

rsAllocation.cpp

diff --git a/rsAllocation.cpp b/rsAllocation.cpp
index f4f6d95..db3b958 100644
--- a/rsAllocation.cpp
+++ b/rsAllocation.cpp
@@ -20,7 +20,7 @@
 #include "rs_hal.h"
 
 #include "system/window.h"
-#include "gui/SurfaceTexture.h"
+#include "gui/GLConsumer.h"
 
 using namespace android;
 using namespace android::renderscript;
@@ -470,7 +470,7 @@
     return id;
 }
 
-void Allocation::setSurfaceTexture(const Context *rsc, SurfaceTexture *st) {
+void Allocation::setSurfaceTexture(const Context *rsc, GLConsumer *st) {
     if(st != mHal.state.surfaceTexture) {
         if(mHal.state.surfaceTexture != NULL) {
             mHal.state.surfaceTexture->decStrong(NULL);
@@ -669,7 +669,7 @@
 
 void rsi_AllocationGetSurfaceTextureID2(Context *rsc, RsAllocation valloc, void *vst, size_t len) {
     Allocation *alloc = static_cast<Allocation *>(valloc);
-    alloc->setSurfaceTexture(rsc, static_cast<SurfaceTexture *>(vst));
+    alloc->setSurfaceTexture(rsc, static_cast<GLConsumer *>(vst));
 }
 
 void rsi_AllocationSetSurface(Context *rsc, RsAllocation valloc, RsNativeWindow sur) {