diff options
author | Jamie Gennis <jgennis@google.com> | 2011-07-25 11:46:51 -0700 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-07-25 11:46:51 -0700 |
commit | d50aef50f640723e95ca270441161dfb042115d0 (patch) | |
tree | 8acec272063a9d3fa95f2a39320aebe2478bb93d /include | |
parent | 0d1d96272025f30f40c49c387f2fe9daaf6133c9 (diff) | |
parent | ecfa1d3a7941a4f1a9c381c9c7419ecd0bd86967 (diff) | |
download | frameworks_base-d50aef50f640723e95ca270441161dfb042115d0.zip frameworks_base-d50aef50f640723e95ca270441161dfb042115d0.tar.gz frameworks_base-d50aef50f640723e95ca270441161dfb042115d0.tar.bz2 |
Merge "SurfaceTexture: enable RGB external textures"
Diffstat (limited to 'include')
-rw-r--r-- | include/gui/SurfaceTexture.h | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/include/gui/SurfaceTexture.h b/include/gui/SurfaceTexture.h index 134c208..2a8e725 100644 --- a/include/gui/SurfaceTexture.h +++ b/include/gui/SurfaceTexture.h @@ -211,7 +211,6 @@ protected: // all slots. void freeAllBuffers(); static bool isExternalFormat(uint32_t format); - static GLenum getTextureTarget(uint32_t format); private: @@ -348,10 +347,6 @@ private: // reset mCurrentTexture to INVALID_BUFFER_SLOT. int mCurrentTexture; - // mCurrentTextureTarget is the GLES texture target to be used with the - // current texture. - GLenum mCurrentTextureTarget; - // mCurrentTextureBuf is the graphic buffer of the current texture. It's // possible that this buffer is not associated with any buffer slot, so we // must track it separately in order to support the getCurrentBuffer method. |