From 5b5c9144872b4e31ba5a041dce585a8ddbbe495d Mon Sep 17 00:00:00 2001 From: Mathias Agopian Date: Thu, 30 Jul 2009 18:14:56 -0700 Subject: fixed some issues with the software renderer when surfaces are made current. there was several issues: - when a surface was made non-current, the last frame wasn't shown and the buffer could stay locked - when a surface was made current the 2nd time, it would not dequeue a new buffer now, queue/dequeue are done when the surface is made current. for this to work, a new query() hook had to be added on android_native_window_t, it allows to retrieve some attributes of a window (currently only width and height). --- include/ui/FramebufferNativeWindow.h | 1 + include/ui/Surface.h | 6 ++++++ include/ui/egl/android_natives.h | 15 ++++++++++++++- 3 files changed, 21 insertions(+), 1 deletion(-) (limited to 'include/ui') diff --git a/include/ui/FramebufferNativeWindow.h b/include/ui/FramebufferNativeWindow.h index e72357a..cb9bf94 100644 --- a/include/ui/FramebufferNativeWindow.h +++ b/include/ui/FramebufferNativeWindow.h @@ -62,6 +62,7 @@ private: static int dequeueBuffer(android_native_window_t* window, android_native_buffer_t** buffer); static int lockBuffer(android_native_window_t* window, android_native_buffer_t* buffer); static int queueBuffer(android_native_window_t* window, android_native_buffer_t* buffer); + static int query(android_native_window_t* window, int what, int* value); framebuffer_device_t* fbDev; alloc_device_t* grDev; diff --git a/include/ui/Surface.h b/include/ui/Surface.h index 8c4f63d..156d453 100644 --- a/include/ui/Surface.h +++ b/include/ui/Surface.h @@ -115,6 +115,8 @@ private: sp mSurface; SurfaceID mToken; uint32_t mIdentity; + uint32_t mWidth; + uint32_t mHeight; PixelFormat mFormat; uint32_t mFlags; mutable Mutex mLock; @@ -192,10 +194,12 @@ private: static int dequeueBuffer(android_native_window_t* window, android_native_buffer_t** buffer); static int lockBuffer(android_native_window_t* window, android_native_buffer_t* buffer); static int queueBuffer(android_native_window_t* window, android_native_buffer_t* buffer); + static int query(android_native_window_t* window, int what, int* value); int dequeueBuffer(android_native_buffer_t** buffer); int lockBuffer(android_native_buffer_t* buffer); int queueBuffer(android_native_buffer_t* buffer); + int query(int what, int* value); status_t dequeueBuffer(sp* buffer); status_t lockBuffer(const sp& buffer); @@ -209,6 +213,8 @@ private: sp mLockedBuffer; SurfaceID mToken; uint32_t mIdentity; + uint32_t mWidth; + uint32_t mHeight; PixelFormat mFormat; uint32_t mFlags; mutable Region mDirtyRegion; diff --git a/include/ui/egl/android_natives.h b/include/ui/egl/android_natives.h index 0398ea7..a3a1316 100644 --- a/include/ui/egl/android_natives.h +++ b/include/ui/egl/android_natives.h @@ -60,6 +60,12 @@ struct android_native_base_t // --------------------------------------------------------------------------- +/* attributes queriable with query() */ +enum { + NATIVE_WINDOW_WIDTH = 0, + NATIVE_WINDOW_HEIGHT = 1 +}; + struct android_native_window_t { #ifdef __cplusplus @@ -129,8 +135,15 @@ struct android_native_window_t int (*queueBuffer)(struct android_native_window_t* window, struct android_native_buffer_t* buffer); + /* + * hook used to retrieve information about the native window. + * + * Returns 0 on success or -errno on error. + */ + int (*query)(struct android_native_window_t* window, + int what, int* value); - void* reserved_proc[5]; + void* reserved_proc[4]; }; // --------------------------------------------------------------------------- -- cgit v1.1