Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 9a54d7dd: Merge change Ibbf945f3 into eclair

Browse Source 
Merge commit '9a54d7dddcbc982d644c627693dc39fb2cb5c0fb' into eclair-mr2

* commit '9a54d7dddcbc982d644c627693dc39fb2cb5c0fb':
  fix [2236832] software OpenGL ES driver doesn't work on sholes
This commit is contained in:
Mathias Agopian
2009-11-04 13:14:59 -08:00
committed by Android Git Automerger
parent 8742696b0d 9a54d7dddc
commit 8e5e44e953
1 changed files with 15 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
opengl/libagl/egl.cpp
View File

@@ -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;
}