ADHOC
/
replicant-frameworks_native
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix build. 

Change-Id: I49262ac143da297efcaec4eed04052274c73b7f8
This commit is contained in:
Mathias Agopian 2010-12-08 17:44:07 -08:00
parent 0e5484f7d8
commit 695b66f082
1 changed files with 7 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
opengl/libagl/egl.cpp
View File

@ -40,7 +40,6 @@
#include <pixelflinger/pixelflinger.h>
#include <private/ui/android_natives_priv.h>
#include <private/ui/sw_gralloc_handle.h>
#include <hardware/copybit.h>
@ -446,15 +445,10 @@ status_t egl_window_surface_v2_t::lock(
android_native_buffer_t* buf, int usage, void** 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;
}
err = module->lock(module, buf->handle,
usage, 0, 0, buf->width, buf->height, vaddr);
return err;
}
@ -462,9 +456,9 @@ status_t egl_window_surface_v2_t::unlock(android_native_buffer_t* buf)
{
if (!buf) return BAD_VALUE;
int err = NO_ERROR;
if (sw_gralloc_handle_t::validate(buf->handle) < 0) {
err = module->unlock(module, buf->handle);
}
err = module->unlock(module, buf->handle);
return err;
}