summaryrefslogtreecommitdiff
path: root/libs/gui/SurfaceTexture.cpp
diff options
context:
space:
mode:
author Jamie Gennis <jgennis@google.com> 2011-02-04 15:03:30 -0800
committer Android (Google) Code Review <android-gerrit@google.com> 2011-02-04 15:03:30 -0800
commitc2efcd2ceadab33b42d938e3771c994816e9a4b0 (patch)
treefc22e7cd2863e449139f8fe31cde86e4650afd58 /libs/gui/SurfaceTexture.cpp
parent24c8ac3b0912762ce6f3cdadc46c253f407af396 (diff)
parent267222630184d08ba06949d1199a13e2e83fe068 (diff)
Merge "Initialize the SurfaceTexture transform fields." into honeycomb
Diffstat (limited to 'libs/gui/SurfaceTexture.cpp')
-rw-r--r--libs/gui/SurfaceTexture.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/libs/gui/SurfaceTexture.cpp b/libs/gui/SurfaceTexture.cpp
index 3c4b565d466b..d6cc8ce03443 100644
--- a/libs/gui/SurfaceTexture.cpp
+++ b/libs/gui/SurfaceTexture.cpp
@@ -77,7 +77,8 @@ static void mtxMul(float out[16], const float a[16], const float b[16]);
SurfaceTexture::SurfaceTexture(GLuint tex) :
mBufferCount(MIN_BUFFER_SLOTS), mCurrentTexture(INVALID_BUFFER_SLOT),
- mLastQueued(INVALID_BUFFER_SLOT), mTexName(tex) {
+ mCurrentTransform(0), mLastQueued(INVALID_BUFFER_SLOT),
+ mLastQueuedTransform(0), mNextTransform(0), mTexName(tex) {
LOGV("SurfaceTexture::SurfaceTexture");
for (int i = 0; i < NUM_BUFFER_SLOTS; i++) {
mSlots[i].mEglImage = EGL_NO_IMAGE_KHR;