diff options
| author | Mathias Agopian <mathias@google.com> | 2012-09-24 19:26:11 -0700 |
|---|---|---|
| committer | Mathias Agopian <mathias@google.com> | 2012-09-24 19:26:11 -0700 |
| commit | e96e9e1093b5700e9f403a6e2479da7dc36d3b71 (patch) | |
| tree | 491a63497ce36abdfcd940c3770309f819bdb458 /include/gui | |
| parent | 13de3699807f3260cfbabd196a08191d6a80a99a (diff) | |
| download | frameworks_native-e96e9e1093b5700e9f403a6e2479da7dc36d3b71.zip frameworks_native-e96e9e1093b5700e9f403a6e2479da7dc36d3b71.tar.gz frameworks_native-e96e9e1093b5700e9f403a6e2479da7dc36d3b71.tar.bz2 | |
fix a crasher in SurfaceTexture's setFilteringEnabled
bug: 7211067
Change-Id: Id8658a8df429d76c20ab9112858b38e52343dc9c
Diffstat (limited to 'include/gui')
| -rw-r--r-- | include/gui/SurfaceTexture.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/include/gui/SurfaceTexture.h b/include/gui/SurfaceTexture.h index 37e7eb1..7c519ae 100644 --- a/include/gui/SurfaceTexture.h +++ b/include/gui/SurfaceTexture.h @@ -259,10 +259,11 @@ private: // This method must be called with mMutex locked. virtual void freeBufferLocked(int slotIndex); - // computeCurrentTransformMatrix computes the transform matrix for the + // computeCurrentTransformMatrixLocked computes the transform matrix for the // current texture. It uses mCurrentTransform and the current GraphicBuffer // to compute this matrix and stores it in mCurrentTransformMatrix. - void computeCurrentTransformMatrix(); + // mCurrentTextureBuf must not be NULL. + void computeCurrentTransformMatrixLocked(); // doGLFenceWaitLocked inserts a wait command into the OpenGL ES command // stream to ensure that it is safe for future OpenGL ES commands to |