diff options
| author | Mathias Agopian <mathias@google.com> | 2012-02-24 18:25:41 -0800 |
|---|---|---|
| committer | Mathias Agopian <mathias@google.com> | 2012-02-24 18:26:01 -0800 |
| commit | af01feafc30152baf8e0a5cfddbf02bd14731fd2 (patch) | |
| tree | e19b244ff773d206d21ecccf29296f1848790dd6 /libs/ui | |
| parent | cc0eaa6582563f51c98db1b232200ac4d2a9a996 (diff) | |
| download | frameworks_base-af01feafc30152baf8e0a5cfddbf02bd14731fd2.zip frameworks_base-af01feafc30152baf8e0a5cfddbf02bd14731fd2.tar.gz frameworks_base-af01feafc30152baf8e0a5cfddbf02bd14731fd2.tar.bz2 | |
remove dependency on android_native{s_priv|buffer}.h
Change-Id: Ie4b95f7061c240f37c504414259f92d72c4ffc89
Diffstat (limited to 'libs/ui')
| -rw-r--r-- | libs/ui/FramebufferNativeWindow.cpp | 10 | ||||
| -rw-r--r-- | libs/ui/GraphicBuffer.cpp | 17 |
2 files changed, 3 insertions, 24 deletions
diff --git a/libs/ui/FramebufferNativeWindow.cpp b/libs/ui/FramebufferNativeWindow.cpp index 26d4823..dec99b6 100644 --- a/libs/ui/FramebufferNativeWindow.cpp +++ b/libs/ui/FramebufferNativeWindow.cpp @@ -27,25 +27,21 @@ #include <utils/threads.h> #include <utils/RefBase.h> -#include <ui/Rect.h> +#include <ui/ANativeObjectBase.h> #include <ui/FramebufferNativeWindow.h> +#include <ui/Rect.h> #include <EGL/egl.h> -#include <pixelflinger/format.h> -#include <pixelflinger/pixelflinger.h> - #include <hardware/hardware.h> #include <hardware/gralloc.h> -#include <private/ui/android_natives_priv.h> - // ---------------------------------------------------------------------------- namespace android { // ---------------------------------------------------------------------------- class NativeBuffer - : public EGLNativeBase< + : public ANativeObjectBase< ANativeWindowBuffer, NativeBuffer, LightRefBase<NativeBuffer> > diff --git a/libs/ui/GraphicBuffer.cpp b/libs/ui/GraphicBuffer.cpp index f549a37..57063e5 100644 --- a/libs/ui/GraphicBuffer.cpp +++ b/libs/ui/GraphicBuffer.cpp @@ -28,8 +28,6 @@ #include <ui/GraphicBufferMapper.h> #include <ui/PixelFormat.h> -#include <pixelflinger/pixelflinger.h> - namespace android { // =========================================================================== @@ -182,21 +180,6 @@ status_t GraphicBuffer::unlock() return res; } -status_t GraphicBuffer::lock(GGLSurface* sur, uint32_t usage) -{ - void* vaddr; - status_t res = GraphicBuffer::lock(usage, &vaddr); - if (res == NO_ERROR && sur) { - sur->version = sizeof(GGLSurface); - sur->width = width; - sur->height = height; - sur->stride = stride; - sur->format = format; - sur->data = static_cast<GGLubyte*>(vaddr); - } - return res; -} - size_t GraphicBuffer::getFlattenedSize() const { return (8 + (handle ? handle->numInts : 0))*sizeof(int); } |