diff options
author | Mathias Agopian <mathias@google.com> | 2009-11-03 20:38:08 -0800 |
---|---|---|
committer | Mathias Agopian <mathias@google.com> | 2009-11-03 21:08:06 -0800 |
commit | bc4929117d0b07fec2f0986f38641eecc9f20d55 (patch) | |
tree | aee28b171b44bad968e739cd2252e00bae0bd99e /opengl/libagl | |
parent | 009248d978db78dc3c4a02b960d68745d2e99487 (diff) | |
download | frameworks_native-bc4929117d0b07fec2f0986f38641eecc9f20d55.zip frameworks_native-bc4929117d0b07fec2f0986f38641eecc9f20d55.tar.gz frameworks_native-bc4929117d0b07fec2f0986f38641eecc9f20d55.tar.bz2 |
fix [2236832] software OpenGL ES driver doesn't work on sholes
make sure to not pass our fake handles to the real gralloc
Diffstat (limited to 'opengl/libagl')
-rw-r--r-- | opengl/libagl/egl.cpp | 18 |
1 files changed, 15 insertions, 3 deletions
diff --git a/opengl/libagl/egl.cpp b/opengl/libagl/egl.cpp index 80ddc02..b522e11 100644 --- a/opengl/libagl/egl.cpp +++ b/opengl/libagl/egl.cpp @@ -40,6 +40,7 @@ #include <pixelflinger/pixelflinger.h> #include <private/ui/android_natives_priv.h> +#include <private/ui/sw_gralloc_handle.h> #include <hardware/copybit.h> @@ -449,15 +450,26 @@ void egl_window_surface_v2_t::disconnect() status_t egl_window_surface_v2_t::lock( android_native_buffer_t* buf, int usage, void** vaddr) { - int err = module->lock(module, buf->handle, - usage, 0, 0, buf->width, buf->height, vaddr); + int err; + if (sw_gralloc_handle_t::validate(buf->handle) < 0) { + err = module->lock(module, buf->handle, + usage, 0, 0, buf->width, buf->height, vaddr); + } else { + sw_gralloc_handle_t const* hnd = + reinterpret_cast<sw_gralloc_handle_t const*>(buf->handle); + *vaddr = (void*)hnd->base; + err = NO_ERROR; + } return err; } status_t egl_window_surface_v2_t::unlock(android_native_buffer_t* buf) { if (!buf) return BAD_VALUE; - int err = module->unlock(module, buf->handle); + int err = NO_ERROR; + if (sw_gralloc_handle_t::validate(buf->handle) < 0) { + err = module->unlock(module, buf->handle); + } return err; } |