From a0db308c3d62301ae41b2e2bcf295c4ee4c7b08e Mon Sep 17 00:00:00 2001 From: Mathias Agopian Date: Mon, 23 Apr 2012 13:59:36 -0700 Subject: [PATCH] remove SurfaceTexture::connect() use BufferQueue::connect() instead Change-Id: I04aab7cf11304bf962cde38470747f3b19ddba42 --- include/gui/SurfaceTexture.h | 2 -- libs/gui/SurfaceTexture.cpp | 7 ------- services/surfaceflinger/Layer.cpp | 5 +---- 3 files changed, 1 insertion(+), 13 deletions(-) diff --git a/include/gui/SurfaceTexture.h b/include/gui/SurfaceTexture.h index 3699cdf72..f4ed2264b 100644 --- a/include/gui/SurfaceTexture.h +++ b/include/gui/SurfaceTexture.h @@ -185,8 +185,6 @@ public: status_t setConsumerUsageBits(uint32_t usage); status_t setTransformHint(uint32_t hint); virtual status_t setSynchronousMode(bool enabled); - virtual status_t connect(int api, - uint32_t* outWidth, uint32_t* outHeight, uint32_t* outTransform); // getBufferQueue returns the BufferQueue object to which this // SurfaceTexture is connected. diff --git a/libs/gui/SurfaceTexture.cpp b/libs/gui/SurfaceTexture.cpp index a6e8dbfce..6562a94bb 100644 --- a/libs/gui/SurfaceTexture.cpp +++ b/libs/gui/SurfaceTexture.cpp @@ -743,13 +743,6 @@ sp SurfaceTexture::getBufferQueue() const { return mBufferQueue; } -// Used for refactoring, should not be in final interface -status_t SurfaceTexture::connect(int api, - uint32_t* outWidth, uint32_t* outHeight, uint32_t* outTransform) { - Mutex::Autolock lock(mMutex); - return mBufferQueue->connect(api, outWidth, outHeight, outTransform); -} - void SurfaceTexture::onFrameAvailable() { ST_LOGV("onFrameAvailable"); diff --git a/services/surfaceflinger/Layer.cpp b/services/surfaceflinger/Layer.cpp index 6d77daf3a..e15e73310 100644 --- a/services/surfaceflinger/Layer.cpp +++ b/services/surfaceflinger/Layer.cpp @@ -101,11 +101,8 @@ void Layer::onFirstRef() // Creates a custom BufferQueue for SurfaceTexture to use sp bq = new SurfaceTextureLayer(); mSurfaceTexture = new SurfaceTexture(mTextureName, true, - GL_TEXTURE_EXTERNAL_OES, false,bq); + GL_TEXTURE_EXTERNAL_OES, false, bq); - - - mSurfaceTexture->setTransformHint(getTransformHint()); mSurfaceTexture->setConsumerUsageBits(getEffectiveUsage(0)); mSurfaceTexture->setFrameAvailableListener(new FrameQueuedListener(this)); mSurfaceTexture->setSynchronousMode(true);