diff options
| author | Mathias Agopian <mathias@google.com> | 2011-04-28 19:50:21 -0700 |
|---|---|---|
| committer | Mathias Agopian <mathias@google.com> | 2011-04-28 19:50:21 -0700 |
| commit | 8e86a7aba5003a620bb130b8ab7b444dacf6da9f (patch) | |
| tree | 8abc4ce4b65719a78c4a7fe887ad206ce7de958a /include | |
| parent | 61773dbda321be54cce0ff4b8cfa993433c1543f (diff) | |
| download | frameworks_base-8e86a7aba5003a620bb130b8ab7b444dacf6da9f.zip frameworks_base-8e86a7aba5003a620bb130b8ab7b444dacf6da9f.tar.gz frameworks_base-8e86a7aba5003a620bb130b8ab7b444dacf6da9f.tar.bz2 | |
get rid of dependency on copybit HAL module
Change-Id: Ia608099a2426c11a91d33063ba53c93e1eccb428
Diffstat (limited to 'include')
| -rw-r--r-- | include/private/opengles/gl_context.h | 2 | ||||
| -rw-r--r-- | include/ui/Region.h | 23 |
2 files changed, 0 insertions, 25 deletions
diff --git a/include/private/opengles/gl_context.h b/include/private/opengles/gl_context.h index c7db9a6..72416c1 100644 --- a/include/private/opengles/gl_context.h +++ b/include/private/opengles/gl_context.h @@ -26,7 +26,6 @@ #endif #include <private/pixelflinger/ggl_context.h> -#include <hardware/copybit.h> #include <hardware/gralloc.h> #include <GLES/gl.h> @@ -606,7 +605,6 @@ struct prims_t { struct copybits_context_t { // A handle to the blit engine, if it exists, else NULL. - copybit_device_t* blitEngine; int32_t minScale; int32_t maxScale; android_native_buffer_t* drawSurfaceBuffer; diff --git a/include/ui/Region.h b/include/ui/Region.h index 925fd06..6c9a620 100644 --- a/include/ui/Region.h +++ b/include/ui/Region.h @@ -24,8 +24,6 @@ #include <ui/Rect.h> -#include <hardware/copybit.h> - namespace android { // --------------------------------------------------------------------------- @@ -183,27 +181,6 @@ Region& Region::operator -= (const Region& rhs) { Region& Region::operator += (const Point& pt) { return translateSelf(pt.x, pt.y); } - -// --------------------------------------------------------------------------- - -struct region_iterator : public copybit_region_t { - region_iterator(const Region& region) - : b(region.begin()), e(region.end()) { - this->next = iterate; - } -private: - static int iterate(copybit_region_t const * self, copybit_rect_t* rect) { - region_iterator const* me = static_cast<region_iterator const*>(self); - if (me->b != me->e) { - *reinterpret_cast<Rect*>(rect) = *me->b++; - return 1; - } - return 0; - } - mutable Region::const_iterator b; - Region::const_iterator const e; -}; - // --------------------------------------------------------------------------- }; // namespace android |