From 2adaf04fab35cf47c824d74d901b54094e01ccd3 Mon Sep 17 00:00:00 2001 From: Andy McFadden Date: Tue, 18 Dec 2012 09:49:45 -0800 Subject: 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 --- services/surfaceflinger/SurfaceFlingerConsumer.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'services/surfaceflinger/SurfaceFlingerConsumer.h') diff --git a/services/surfaceflinger/SurfaceFlingerConsumer.h b/services/surfaceflinger/SurfaceFlingerConsumer.h index 308a2880f8..22eec81f74 100644 --- a/services/surfaceflinger/SurfaceFlingerConsumer.h +++ b/services/surfaceflinger/SurfaceFlingerConsumer.h @@ -17,20 +17,20 @@ #ifndef ANDROID_SURFACEFLINGERCONSUMER_H #define ANDROID_SURFACEFLINGERCONSUMER_H -#include +#include 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 = 0) - : SurfaceTexture(tex, allowSynchronousMode, texTarget, useFenceSync, + : GLConsumer(tex, allowSynchronousMode, texTarget, useFenceSync, bufferQueue) {} @@ -44,12 +44,12 @@ public: }; // 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(); }; -- cgit v1.2.3-59-g8ed1b