diff options
Diffstat (limited to 'libs/ui')
| -rw-r--r-- | libs/ui/FramebufferNativeWindow.cpp | 16 | ||||
| -rw-r--r-- | libs/ui/GraphicBuffer.cpp | 8 |
2 files changed, 12 insertions, 12 deletions
diff --git a/libs/ui/FramebufferNativeWindow.cpp b/libs/ui/FramebufferNativeWindow.cpp index 0c820e5..4393504 100644 --- a/libs/ui/FramebufferNativeWindow.cpp +++ b/libs/ui/FramebufferNativeWindow.cpp @@ -47,16 +47,16 @@ namespace android { class NativeBuffer : public EGLNativeBase< - android_native_buffer_t, + ANativeWindowBuffer, NativeBuffer, LightRefBase<NativeBuffer> > { public: NativeBuffer(int w, int h, int f, int u) : BASE() { - android_native_buffer_t::width = w; - android_native_buffer_t::height = h; - android_native_buffer_t::format = f; - android_native_buffer_t::usage = u; + ANativeWindowBuffer::width = w; + ANativeWindowBuffer::height = h; + ANativeWindowBuffer::format = f; + ANativeWindowBuffer::usage = u; } private: friend class LightRefBase<NativeBuffer>; @@ -201,7 +201,7 @@ int FramebufferNativeWindow::getCurrentBufferIndex() const } int FramebufferNativeWindow::dequeueBuffer(ANativeWindow* window, - android_native_buffer_t** buffer) + ANativeWindowBuffer** buffer) { FramebufferNativeWindow* self = getSelf(window); Mutex::Autolock _l(self->mutex); @@ -229,7 +229,7 @@ int FramebufferNativeWindow::dequeueBuffer(ANativeWindow* window, } int FramebufferNativeWindow::lockBuffer(ANativeWindow* window, - android_native_buffer_t* buffer) + ANativeWindowBuffer* buffer) { FramebufferNativeWindow* self = getSelf(window); Mutex::Autolock _l(self->mutex); @@ -249,7 +249,7 @@ int FramebufferNativeWindow::lockBuffer(ANativeWindow* window, } int FramebufferNativeWindow::queueBuffer(ANativeWindow* window, - android_native_buffer_t* buffer) + ANativeWindowBuffer* buffer) { FramebufferNativeWindow* self = getSelf(window); Mutex::Autolock _l(self->mutex); diff --git a/libs/ui/GraphicBuffer.cpp b/libs/ui/GraphicBuffer.cpp index 97312a6..54a3ffa 100644 --- a/libs/ui/GraphicBuffer.cpp +++ b/libs/ui/GraphicBuffer.cpp @@ -33,7 +33,7 @@ namespace android { // =========================================================================== -// Buffer and implementation of android_native_buffer_t +// Buffer and implementation of ANativeWindowBuffer // =========================================================================== GraphicBuffer::GraphicBuffer() @@ -77,7 +77,7 @@ GraphicBuffer::GraphicBuffer(uint32_t w, uint32_t h, handle = inHandle; } -GraphicBuffer::GraphicBuffer(android_native_buffer_t* buffer, bool keepOwnership) +GraphicBuffer::GraphicBuffer(ANativeWindowBuffer* buffer, bool keepOwnership) : BASE(), mOwner(keepOwnership ? ownHandle : ownNone), mBufferMapper(GraphicBufferMapper::get()), mInitCheck(NO_ERROR), mIndex(-1), mWrappedBuffer(buffer) @@ -119,9 +119,9 @@ void GraphicBuffer::dumpAllocationsToSystemLog() GraphicBufferAllocator::dumpToSystemLog(); } -android_native_buffer_t* GraphicBuffer::getNativeBuffer() const +ANativeWindowBuffer* GraphicBuffer::getNativeBuffer() const { - return static_cast<android_native_buffer_t*>( + return static_cast<ANativeWindowBuffer*>( const_cast<GraphicBuffer*>(this)); } |