summaryrefslogtreecommitdiffstats
path: root/opengl/libagl/TextureObjectManager.cpp
diff options
context:
space:
mode:
authorMathias Agopian <mathias@google.com>2010-07-30 18:03:17 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-07-30 18:03:17 -0700
commit67e4ff768d71088a64fbac3b8e398e2e16dd84ec (patch)
tree82e7cec2c16d2e6cfe263536f1d3040b9abc7a42 /opengl/libagl/TextureObjectManager.cpp
parentbd5029403e0f9d93086604df6dbb1b989e58e964 (diff)
parent4d7fc3651bd93d588d2b8580010414b59bc67729 (diff)
downloadframeworks_base-67e4ff768d71088a64fbac3b8e398e2e16dd84ec.zip
frameworks_base-67e4ff768d71088a64fbac3b8e398e2e16dd84ec.tar.gz
frameworks_base-67e4ff768d71088a64fbac3b8e398e2e16dd84ec.tar.bz2
am 4d7fc365: Merge "remove copybit hack from software opengl (libagl)" into gingerbread
Merge commit '4d7fc3651bd93d588d2b8580010414b59bc67729' into gingerbread-plus-aosp * commit '4d7fc3651bd93d588d2b8580010414b59bc67729': remove copybit hack from software opengl (libagl)
Diffstat (limited to 'opengl/libagl/TextureObjectManager.cpp')
-rw-r--r--opengl/libagl/TextureObjectManager.cpp3
1 files changed, 0 insertions, 3 deletions
diff --git a/opengl/libagl/TextureObjectManager.cpp b/opengl/libagl/TextureObjectManager.cpp
index 255ccac..bbb82fc 100644
--- a/opengl/libagl/TextureObjectManager.cpp
+++ b/opengl/libagl/TextureObjectManager.cpp
@@ -55,9 +55,6 @@ void EGLTextureObject::init()
memset(crop_rect, 0, sizeof(crop_rect));
generate_mipmap = GL_FALSE;
direct = GL_FALSE;
-#ifdef LIBAGL_USE_GRALLOC_COPYBITS
- try_copybit = false;
-#endif // LIBAGL_USE_GRALLOC_COPYBITS
buffer = 0;
}