summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Mathias Agopian <mathias@google.com> 2011-05-02 16:27:21 -0700
committer Mathias Agopian <mathias@google.com> 2011-05-02 16:27:21 -0700
commit6b85f173046340da7ccd503845a2950843f085f3 (patch)
tree5dfb42ce758d7c8c04755b44b68145afd9cb1f20
parent939ccad344c5f32bc9e7dbfa80648c1e75cac62a (diff)
remove last traces of copybit
Change-Id: Ia0f13a0ee6f702256482b5eb29d7fa2aa840bfc7
-rw-r--r--include/private/opengles/gl_context.h16
-rw-r--r--opengl/libagl/egl.cpp1
-rw-r--r--opengl/libagl2/src/egl.cpp1
3 files changed, 0 insertions, 18 deletions
diff --git a/include/private/opengles/gl_context.h b/include/private/opengles/gl_context.h
index 72416c1a22c7..6b1fa770281d 100644
--- a/include/private/opengles/gl_context.h
+++ b/include/private/opengles/gl_context.h
@@ -31,8 +31,6 @@
#include <GLES/gl.h>
#include <GLES/glext.h>
-struct android_native_buffer_t;
-
namespace android {
@@ -603,13 +601,6 @@ struct prims_t {
void (*renderTriangle)(GL, vertex_t*, vertex_t*, vertex_t*);
};
-struct copybits_context_t {
- // A handle to the blit engine, if it exists, else NULL.
- int32_t minScale;
- int32_t maxScale;
- android_native_buffer_t* drawSurfaceBuffer;
-};
-
struct ogles_context_t {
context_t rasterizer;
array_machine_t arrays __attribute__((aligned(32)));
@@ -634,13 +625,6 @@ struct ogles_context_t {
EGLSurfaceManager* surfaceManager;
EGLBufferObjectManager* bufferObjectManager;
- // copybits is only used if LIBAGL_USE_GRALLOC_COPYBITS is
- // defined, but it is always present because ogles_context_t is a public
- // struct that is used by clients of libagl. We want the size and offsets
- // to stay the same, whether or not LIBAGL_USE_GRALLOC_COPYBITS is defined.
-
- copybits_context_t copybits;
-
GLenum error;
static inline ogles_context_t* get() {
diff --git a/opengl/libagl/egl.cpp b/opengl/libagl/egl.cpp
index 40fa1481494f..97e913ba156c 100644
--- a/opengl/libagl/egl.cpp
+++ b/opengl/libagl/egl.cpp
@@ -440,7 +440,6 @@ void egl_window_surface_v2_t::copyBlt(
android_native_buffer_t* src, void const* src_vaddr,
const Region& clip)
{
- // FIXME: use copybit if possible
// NOTE: dst and src must be the same format
Region::const_iterator cur = clip.begin();
diff --git a/opengl/libagl2/src/egl.cpp b/opengl/libagl2/src/egl.cpp
index ba771c3fba33..ec5889d7560e 100644
--- a/opengl/libagl2/src/egl.cpp
+++ b/opengl/libagl2/src/egl.cpp
@@ -432,7 +432,6 @@ void egl_window_surface_v2_t::copyBlt(
android_native_buffer_t* src, void const* src_vaddr,
const Region& clip)
{
- // FIXME: use copybit if possible
// NOTE: dst and src must be the same format
Region::const_iterator cur = clip.begin();