summaryrefslogtreecommitdiffstats
path: root/opengl
diff options
context:
space:
mode:
authorMathias Agopian <mathias@google.com>2010-12-08 17:44:07 -0800
committerMathias Agopian <mathias@google.com>2010-12-08 17:44:07 -0800
commitb5393dc479183740c58c73daffbce8fd24d8ddd7 (patch)
treee84a6fc92536ee68d261c4e1f22ca9f0fd25a3c0 /opengl
parent2d54cd6637d3bf2eb55e2ff6a48c50fea80f796f (diff)
downloadframeworks_base-b5393dc479183740c58c73daffbce8fd24d8ddd7.zip
frameworks_base-b5393dc479183740c58c73daffbce8fd24d8ddd7.tar.gz
frameworks_base-b5393dc479183740c58c73daffbce8fd24d8ddd7.tar.bz2
fix build.
Change-Id: I49262ac143da297efcaec4eed04052274c73b7f8
Diffstat (limited to 'opengl')
-rw-r--r--opengl/libagl/egl.cpp20
1 files changed, 7 insertions, 13 deletions
diff --git a/opengl/libagl/egl.cpp b/opengl/libagl/egl.cpp
index 7c496e7..7ac6f92 100644
--- a/opengl/libagl/egl.cpp
+++ b/opengl/libagl/egl.cpp
@@ -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;
}