diff options
Diffstat (limited to 'services')
| -rw-r--r-- | services/surfaceflinger/Layer.cpp | 4 | ||||
| -rw-r--r-- | services/surfaceflinger/SurfaceFlingerConsumer.h | 9 |
2 files changed, 6 insertions, 7 deletions
diff --git a/services/surfaceflinger/Layer.cpp b/services/surfaceflinger/Layer.cpp index f31d650..2962115 100644 --- a/services/surfaceflinger/Layer.cpp +++ b/services/surfaceflinger/Layer.cpp @@ -110,8 +110,8 @@ void Layer::onFirstRef() { // Creates a custom BufferQueue for SurfaceFlingerConsumer to use sp<BufferQueue> bq = new SurfaceTextureLayer(mFlinger); - mSurfaceFlingerConsumer = new SurfaceFlingerConsumer(mTextureName, true, - GL_TEXTURE_EXTERNAL_OES, false, bq); + mSurfaceFlingerConsumer = new SurfaceFlingerConsumer(bq, mTextureName, + GL_TEXTURE_EXTERNAL_OES, false); mSurfaceFlingerConsumer->setConsumerUsageBits(getEffectiveUsage(0)); mSurfaceFlingerConsumer->setFrameAvailableListener(this); diff --git a/services/surfaceflinger/SurfaceFlingerConsumer.h b/services/surfaceflinger/SurfaceFlingerConsumer.h index d774c33..5de6d12 100644 --- a/services/surfaceflinger/SurfaceFlingerConsumer.h +++ b/services/surfaceflinger/SurfaceFlingerConsumer.h @@ -27,11 +27,10 @@ namespace android { */ 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) - : GLConsumer(tex, allowSynchronousMode, texTarget, useFenceSync, - bufferQueue) + SurfaceFlingerConsumer(const sp<BufferQueue>& bq, GLuint tex, + GLenum texTarget = GL_TEXTURE_EXTERNAL_OES, + bool useFenceSync = true) + : GLConsumer(bq, tex, texTarget, useFenceSync) {} class BufferRejecter { |