From 544f89aece46e8f4bbe4eed93116c8736e68ac07 Mon Sep 17 00:00:00 2001 From: Teng-Hui Zhu Date: Mon, 9 Apr 2012 14:51:48 -0700 Subject: [PATCH] Update SurfaceTexture interface for forward compatibility Change-Id: I32d224428c0127800714a976b4d7bb68cc7c2464 --- include/gui/SurfaceTexture.h | 9 ++++++++- libs/gui/SurfaceTexture.cpp | 2 +- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/include/gui/SurfaceTexture.h b/include/gui/SurfaceTexture.h index a8c76725e7c91..511b3eccb7e7a 100644 --- a/include/gui/SurfaceTexture.h +++ b/include/gui/SurfaceTexture.h @@ -38,6 +38,12 @@ namespace android { class IGraphicBufferAlloc; class String8; +class BufferQueue : public RefBase { +public: + BufferQueue(bool allowSynchronousMode) {}; + status_t setBufferCount(int bufferCount) { return 0; } +}; + class SurfaceTexture : public BnSurfaceTexture { public: enum { MIN_UNDEQUEUED_BUFFERS = 2 }; @@ -69,7 +75,8 @@ public: // fences should be used to synchronize access to buffers if that behavior // is enabled at compile-time. SurfaceTexture(GLuint tex, bool allowSynchronousMode = true, - GLenum texTarget = GL_TEXTURE_EXTERNAL_OES, bool useFenceSync = true); + GLenum texTarget = GL_TEXTURE_EXTERNAL_OES, bool useFenceSync = true, + const sp &bufferQueue = 0); virtual ~SurfaceTexture(); diff --git a/libs/gui/SurfaceTexture.cpp b/libs/gui/SurfaceTexture.cpp index c80d93d7512c4..5a643d3c975c4 100644 --- a/libs/gui/SurfaceTexture.cpp +++ b/libs/gui/SurfaceTexture.cpp @@ -115,7 +115,7 @@ static int32_t createProcessUniqueId() { } SurfaceTexture::SurfaceTexture(GLuint tex, bool allowSynchronousMode, - GLenum texTarget, bool useFenceSync) : + GLenum texTarget, bool useFenceSync, const sp &bufferQueue) : mDefaultWidth(1), mDefaultHeight(1), mPixelFormat(PIXEL_FORMAT_RGBA_8888),