summaryrefslogtreecommitdiff
path: root/opengl/libagl/array.cpp
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/array.cpp
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/array.cpp')
-rw-r--r--opengl/libagl/array.cpp9
1 files changed, 0 insertions, 9 deletions
diff --git a/opengl/libagl/array.cpp b/opengl/libagl/array.cpp
index 71825c502a..4997dc8d50 100644
--- a/opengl/libagl/array.cpp
+++ b/opengl/libagl/array.cpp
@@ -26,9 +26,6 @@
#include "primitives.h"
#include "texture.h"
#include "BufferObjectManager.h"
-#ifdef LIBAGL_USE_GRALLOC_COPYBITS
-#include "copybit.h"
-#endif // LIBAGL_USE_GRALLOC_COPYBITS
// ----------------------------------------------------------------------------
@@ -707,12 +704,6 @@ void drawPrimitivesTriangleStrip(ogles_context_t* c,
void drawPrimitivesTriangleFan(ogles_context_t* c,
GLint first, GLsizei count) {
-#ifdef LIBAGL_USE_GRALLOC_COPYBITS
- if (drawTriangleFanWithCopybit(c, first, count)) {
- return;
- }
-#endif // LIBAGL_USE_GRALLOC_COPYBITS
-
drawPrimitivesTriangleFanOrStrip(c, first, count, 2);
}