diff options
| author | 2011-02-02 16:21:24 -0800 | |
|---|---|---|
| committer | 2011-02-02 16:21:24 -0800 | |
| commit | a257be1895218e5c3e153313db9dd703fd9cc84f (patch) | |
| tree | 457726588b7e414388795ed24f1c38a67dc96dd6 /libs/gui/SurfaceTextureClient.cpp | |
| parent | 9d3fb3717f2acec71a3330e448ecf63ee997b1f8 (diff) | |
| parent | 421d94c20321e1de528416b279bf148baba47b39 (diff) | |
am 421d94c2: am ecb4b3f0: Merge "Pass the IGraphicBufferAlloc to SurfaceTextureClient." into honeycomb
* commit '421d94c20321e1de528416b279bf148baba47b39':
Pass the IGraphicBufferAlloc to SurfaceTextureClient.
Diffstat (limited to 'libs/gui/SurfaceTextureClient.cpp')
| -rw-r--r-- | libs/gui/SurfaceTextureClient.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/libs/gui/SurfaceTextureClient.cpp b/libs/gui/SurfaceTextureClient.cpp index 50cbdb8f3581..ee14ac9006a4 100644 --- a/libs/gui/SurfaceTextureClient.cpp +++ b/libs/gui/SurfaceTextureClient.cpp @@ -25,8 +25,8 @@ namespace android { SurfaceTextureClient::SurfaceTextureClient( const sp<ISurfaceTexture>& surfaceTexture): - mSurfaceTexture(surfaceTexture), mReqWidth(1), mReqHeight(1), - mReqFormat(DEFAULT_FORMAT), mReqUsage(0), mMutex() { + mSurfaceTexture(surfaceTexture), mAllocator(0), mReqWidth(1), + mReqHeight(1), mReqFormat(DEFAULT_FORMAT), mReqUsage(0), mMutex() { // Initialize the ANativeWindow function pointers. ANativeWindow::setSwapInterval = setSwapInterval; ANativeWindow::dequeueBuffer = dequeueBuffer; @@ -35,6 +35,9 @@ SurfaceTextureClient::SurfaceTextureClient( ANativeWindow::queueBuffer = queueBuffer; ANativeWindow::query = query; ANativeWindow::perform = perform; + + // Get a reference to the allocator. + mAllocator = mSurfaceTexture->getAllocator(); } int SurfaceTextureClient::setSwapInterval(ANativeWindow* window, int interval) { |