diff options
| author | Teng-Hui Zhu <ztenghui@google.com> | 2012-04-10 08:38:39 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-04-10 08:38:39 -0700 |
| commit | bbc46ae7499bc0fa67612c67dd23c1758336c935 (patch) | |
| tree | 8635384ab332b2be00f057a024799bf3b91d7ded | |
| parent | b92851d850a778d1a2e5a797c2ddd315b61b15f9 (diff) | |
| parent | 544f89aece46e8f4bbe4eed93116c8736e68ac07 (diff) | |
| download | frameworks_base-bbc46ae7499bc0fa67612c67dd23c1758336c935.zip frameworks_base-bbc46ae7499bc0fa67612c67dd23c1758336c935.tar.gz frameworks_base-bbc46ae7499bc0fa67612c67dd23c1758336c935.tar.bz2 | |
am 544f89ae: Update SurfaceTexture interface for forward compatibility
* commit '544f89aece46e8f4bbe4eed93116c8736e68ac07':
Update SurfaceTexture interface for forward compatibility
| -rw-r--r-- | include/gui/SurfaceTexture.h | 9 | ||||
| -rw-r--r-- | 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 a8c7672..511b3ec 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> &bufferQueue = 0); virtual ~SurfaceTexture(); diff --git a/libs/gui/SurfaceTexture.cpp b/libs/gui/SurfaceTexture.cpp index c80d93d..5a643d3 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> &bufferQueue) : mDefaultWidth(1), mDefaultHeight(1), mPixelFormat(PIXEL_FORMAT_RGBA_8888), |