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

Commit 5d0024b3 authored by Mathias Agopian's avatar Mathias Agopian Committed by Android Git Automerger
Browse files

am f989c114: Merge change If007a2fa into eclair 

Merge commit 'f989c1140bbc84480498df38abec0fafff04e6ee' into eclair-mr2

* commit 'f989c1140bbc84480498df38abec0fafff04e6ee':
  return proper error code from eglCreateImageKHR
parents e5084cd5 b4d8fbb1

libs/surfaceflinger/LayerBuffer.cpp

+1 −3
Original line number Diff line number Diff line
@@ -437,9 +437,7 @@ void LayerBuffer::BufferSource::onDraw(const Region& clip) const 
    }



    if (err != NO_ERROR) {

        // OpenGL fall-back

        GLuint w = 0;

        GLuint h = 0;

        // slower fallback

        GGLSurface t;

        t.version = sizeof(GGLSurface);

        t.width  = src.crop.r;

opengl/libagl/copybit.cpp

+14 −0
Original line number Diff line number Diff line
@@ -74,6 +74,7 @@ private: 
    static int iterate_done(copybit_region_t const *, copybit_rect_t*) {

        return 0;

    }

public:

    copybit_rect_t r;

};
@@ -421,6 +422,19 @@ static bool copybit(GLint x, GLint y, 
                (enables & GGL_ENABLE_DITHER) ?

                        COPYBIT_ENABLE : COPYBIT_DISABLE);

        clipRectRegion it(c);



        LOGD("dst={%d, %d, %d, %p, %p}, "

             "src={%d, %d, %d, %p, %p}, "

             "drect={%d,%d,%d,%d}, "

             "srect={%d,%d,%d,%d}, "

             "it={%d,%d,%d,%d}, " ,

             dst.w, dst.h, dst.format, dst.base, dst.handle,

             src.w, src.h, src.format, src.base, src.handle,

             drect.l, drect.t, drect.r, drect.b,

             srect.l, srect.t, srect.r, srect.b,

             it.r.l, it.r.t, it.r.r, it.r.b

        );



        err = copybit->stretch(copybit, &dst, &src, &drect, &srect, &it);

    }

    if (err != NO_ERROR) {

opengl/libs/EGL/egl.cpp

+24 −4
Original line number Diff line number Diff line
@@ -1641,8 +1641,13 @@ EGLImageKHR eglCreateImageKHR(EGLDisplay dpy, EGLContext ctx, EGLenum target, 
        if (dp == 0) {

            return setError(EGL_BAD_DISPLAY, EGL_NO_IMAGE_KHR);

        }

        // since we don't have a way to know which implementation to call,

        // we're calling all of them



        /* Since we don't have a way to know which implementation to call,

         * we're calling all of them. If at least one of the implementation

         * succeeded, this is a success.

         */



        EGLint currentError = eglGetError();



        EGLImageKHR implImages[IMPL_NUM_IMPLEMENTATIONS];

        bool success = false;
@@ -1659,8 +1664,23 @@ EGLImageKHR eglCreateImageKHR(EGLDisplay dpy, EGLContext ctx, EGLenum target, 
                }

            }

        }

        if (!success)



        if (!success) {

            // failure, if there was an error when we entered this function,

            // the error flag must not be updated.

            // Otherwise, the error is whatever happened in the implementation

            // that faulted.

            if (currentError != EGL_SUCCESS) {

                setError(currentError, EGL_NO_IMAGE_KHR);

            }

            return EGL_NO_IMAGE_KHR;

        } else {

            // In case of success, we need to clear all error flags

            // (especially those caused by the implementation that didn't

            // succeed). TODO: we could about this if we knew this was

            // a "full" success (all implementation succeeded).

            eglGetError();

        }



        egl_image_t* result = new egl_image_t(dpy, ctx);

        memcpy(result->images, implImages, sizeof(implImages));