ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues 6 Pull Requests Releases Wiki Activity

Merge "resolved conflicts for merge of b7f09f28 to honeycomb-plus-aosp" into honeycomb-plus-aosp

Browse Source
This commit is contained in:
Derek Sollenberger 2011-07-29 11:24:37 -07:00 committed by Android (Google) Code Review
commit 9dd6682a5a
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/gui/SurfaceTexture.h
View File

@ -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();

2
libs/gui/SurfaceTexture.cpp
View File

@ -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) {