summaryrefslogtreecommitdiff
path: root/opengl/libagl/array.cpp
diff options
context:
space:
mode:
author Mathias Agopian <mathias@google.com> 2010-07-31 12:19:26 -0700
committer Android Git Automerger <android-git-automerger@android.com> 2010-07-31 12:19:26 -0700
commit5688ac84bd337c6c7a2df4330e40d04af903f74d (patch)
treea34cf0d56f0c40cf1f8b0ea2384f8d851c932e7e /opengl/libagl/array.cpp
parentcb2d4c27712d83cea7a84c9f7a850e4ad3321e50 (diff)
parent67e4ff768d71088a64fbac3b8e398e2e16dd84ec (diff)
am 67e4ff76: am 4d7fc365: Merge "remove copybit hack from software opengl (libagl)" into gingerbread
Merge commit '67e4ff768d71088a64fbac3b8e398e2e16dd84ec' * commit '67e4ff768d71088a64fbac3b8e398e2e16dd84ec': 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 71825c502a03..4997dc8d5028 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);
}