summaryrefslogtreecommitdiff
path: root/opengl/libagl/TextureObjectManager.h
diff options
context:
space:
mode:
author Mathias Agopian <mathias@google.com> 2010-07-30 18:03:17 -0700
committer Android Git Automerger <android-git-automerger@android.com> 2010-07-30 18:03:17 -0700
commitd7beac601a153c4543813d3100f160cdb8d8ed4c (patch)
tree81e3f34c8345b60f834f7ae515dab583345d0835 /opengl/libagl/TextureObjectManager.h
parent86486c255fcfe8ea748072dab1a565131d3d4371 (diff)
parent3efd03a3c2c26ee2bcdf6d7798c870300d2eb326 (diff)
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.h')
-rw-r--r--opengl/libagl/TextureObjectManager.h3
1 files changed, 0 insertions, 3 deletions
diff --git a/opengl/libagl/TextureObjectManager.h b/opengl/libagl/TextureObjectManager.h
index 279e0406c2..70e3bef6e7 100644
--- a/opengl/libagl/TextureObjectManager.h
+++ b/opengl/libagl/TextureObjectManager.h
@@ -80,9 +80,6 @@ public:
GLint crop_rect[4];
GLint generate_mipmap;
GLint direct;
-#ifdef LIBAGL_USE_GRALLOC_COPYBITS
- bool try_copybit;
-#endif // LIBAGL_USE_GRALLOC_COPYBITS
android_native_buffer_t* buffer;
};