diff options
author | Mathias Agopian <mathias@google.com> | 2011-05-02 16:31:52 -0700 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-05-02 16:31:52 -0700 |
commit | e0642859a0a12203807c7c2a996a3ea52a399cb3 (patch) | |
tree | 83fd8df26789a2d1ed3710797975004ec740391f /include | |
parent | c777a8526a6517e5fbfa713651da280fd1bdd502 (diff) | |
parent | 68178d6419df65d606d9105b3324260d38d7b02c (diff) | |
download | frameworks_av-e0642859a0a12203807c7c2a996a3ea52a399cb3.zip frameworks_av-e0642859a0a12203807c7c2a996a3ea52a399cb3.tar.gz frameworks_av-e0642859a0a12203807c7c2a996a3ea52a399cb3.tar.bz2 |
Merge "remove last traces of copybit"
Diffstat (limited to 'include')
-rw-r--r-- | include/private/opengles/gl_context.h | 16 |
1 files changed, 0 insertions, 16 deletions
diff --git a/include/private/opengles/gl_context.h b/include/private/opengles/gl_context.h index 72416c1..6b1fa77 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() { |