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: Ia03e468888025b5cae3c0ee1995434515dbea387
diff --git a/services/surfaceflinger/SurfaceFlingerConsumer.h b/services/surfaceflinger/SurfaceFlingerConsumer.h
index 308a288..22eec81 100644
--- a/services/surfaceflinger/SurfaceFlingerConsumer.h
+++ b/services/surfaceflinger/SurfaceFlingerConsumer.h
@@ -17,20 +17,20 @@
#ifndef ANDROID_SURFACEFLINGERCONSUMER_H
#define ANDROID_SURFACEFLINGERCONSUMER_H
-#include <gui/SurfaceTexture.h>
+#include <gui/GLConsumer.h>
namespace android {
// ----------------------------------------------------------------------------
/*
- * This is a thin wrapper around SurfaceTexture.
+ * This is a thin wrapper around GLConsumer.
*/
-class SurfaceFlingerConsumer : public SurfaceTexture {
+class SurfaceFlingerConsumer : public GLConsumer {
public:
SurfaceFlingerConsumer(GLuint tex, bool allowSynchronousMode = true,
GLenum texTarget = GL_TEXTURE_EXTERNAL_OES, bool useFenceSync = true,
const sp<BufferQueue> &bufferQueue = 0)
- : SurfaceTexture(tex, allowSynchronousMode, texTarget, useFenceSync,
+ : GLConsumer(tex, allowSynchronousMode, texTarget, useFenceSync,
bufferQueue)
{}
@@ -44,12 +44,12 @@
};
// This version of updateTexImage() takes a functor that may be used to
- // reject the newly acquired buffer. Unlike the SurfaceTexture version,
+ // reject the newly acquired buffer. Unlike the GLConsumer version,
// this does not guarantee that the buffer has been bound to the GL
// texture.
status_t updateTexImage(BufferRejecter* rejecter);
- // See SurfaceTexture::bindTextureImageLocked().
+ // See GLConsumer::bindTextureImageLocked().
status_t bindTextureImage();
};