diff options
| author | 2011-07-29 14:16:18 -0400 | |
|---|---|---|
| committer | 2011-07-29 14:16:18 -0400 | |
| commit | 33e86c7a9143f89ae932034bbfe4c3a9f71114fd (patch) | |
| tree | 42326f0f3d84236a13917882c8d0ee48074faa8c | |
| parent | 67020c06fcfe2c8d905008412afffbd6f259cdf6 (diff) | |
| parent | bbfbd30383bb8410604f257512a206c2d672776b (diff) | |
resolved conflicts for merge of b7f09f28 to honeycomb-plus-aosp
Change-Id: Iebde13c41a2adf4e693d87e808cb0659f913e4e6
| -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 9bf38f7430..993806d49e 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 5c6d71b150..9cf841ec8d 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) { |