diff options
| author | Derek Sollenberger <djsollen@google.com> | 2011-07-29 11:24:37 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-07-29 11:24:37 -0700 |
| commit | 13639b0d078836ef6ca14704ac3d6dde23832326 (patch) | |
| tree | 7a28275fa276a0ac31de9732df4abbca4784f28a | |
| parent | a128f5f8c952d7f519f64882792e832a4e75e2c8 (diff) | |
| parent | a30ed30b756136e253fd797b6eaf83205c413e15 (diff) | |
| download | frameworks_base-13639b0d078836ef6ca14704ac3d6dde23832326.zip frameworks_base-13639b0d078836ef6ca14704ac3d6dde23832326.tar.gz frameworks_base-13639b0d078836ef6ca14704ac3d6dde23832326.tar.bz2 | |
Merge "resolved conflicts for merge of b7f09f28 to honeycomb-plus-aosp" into honeycomb-plus-aosp
| -rw-r--r-- | include/gui/SurfaceTexture.h | 2 | ||||
| -rw-r--r-- | libs/gui/SurfaceTexture.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/include/gui/SurfaceTexture.h b/include/gui/SurfaceTexture.h index 9bf38f7..993806d 100644 --- a/include/gui/SurfaceTexture.h +++ b/include/gui/SurfaceTexture.h @@ -47,7 +47,7 @@ public: // tex indicates the name OpenGL texture to which images are to be streamed. // This texture name cannot be changed once the SurfaceTexture is created. - SurfaceTexture(GLuint tex); + SurfaceTexture(GLuint tex, bool allowSynchronousMode = true); virtual ~SurfaceTexture(); diff --git a/libs/gui/SurfaceTexture.cpp b/libs/gui/SurfaceTexture.cpp index 5c6d71b..9cf841e 100644 --- a/libs/gui/SurfaceTexture.cpp +++ b/libs/gui/SurfaceTexture.cpp @@ -75,7 +75,7 @@ static float mtxRot270[16] = { static void mtxMul(float out[16], const float a[16], const float b[16]); -SurfaceTexture::SurfaceTexture(GLuint tex) : +SurfaceTexture::SurfaceTexture(GLuint tex, bool allowSynchronousMode) : mBufferCount(MIN_BUFFER_SLOTS), mCurrentTexture(INVALID_BUFFER_SLOT), mCurrentTransform(0), mLastQueued(INVALID_BUFFER_SLOT), mLastQueuedTransform(0), mNextTransform(0), mTexName(tex) { |