Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7617b91e authored by Mathias Agopian's avatar Mathias Agopian Committed by Android Git Automerger
Browse files

am 9a54d7dd: Merge change Ibbf945f3 into eclair 

Merge commit '9a54d7dddcbc982d644c627693dc39fb2cb5c0fb' into eclair-mr2

* commit '9a54d7dddcbc982d644c627693dc39fb2cb5c0fb':
  fix [2236832] software OpenGL ES driver doesn't work on sholes
parents 2a8fb8e1 d5bee934

opengl/libagl/egl.cpp

+15 −3
Original line number Diff line number Diff line
@@ -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, 

    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;

}