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

Commit 9b0db86c authored by Jean-Baptiste Queru's avatar Jean-Baptiste Queru
Browse files

resolved conflicts for merge of 6c9a3004 to master 

Change-Id: Ia1a8a2015c087004d3dfc64681dbe0315558dc95
parents 9a5366d7 ecfae4c8

opengl/libagl/egl.cpp

+2 −2
Original line number Diff line number Diff line
@@ -485,13 +485,13 @@ void egl_window_surface_v2_t::copyBlt( 
    copybit_device_t* const copybit = blitengine;

    if (copybit)  {

        copybit_image_t simg;

        simg.w = src->width;

        simg.w = src->stride;

        simg.h = src->height;

        simg.format = src->format;

        simg.handle = const_cast<native_handle_t*>(src->handle);



        copybit_image_t dimg;

        dimg.w = dst->width;

        dimg.w = dst->stride;

        dimg.h = dst->height;

        dimg.format = dst->format;

        dimg.handle = const_cast<native_handle_t*>(dst->handle);