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

Commit 8355281e authored by Courtney Goeltzenleuchter's avatar Courtney Goeltzenleuchter
Browse files

Early exit to prep for refactoring 

Making the function exit early puts the code in a form that
makes future refactoring easier to see.
Test: make
Bug: 80297325

Change-Id: Ic90f5006566fd87310ad3c83c57ba020e588f370
(cherry picked from commit 89a52d4a7c3312ec9625ad1d07647d17f102cc33)
parent 4adf75bf

opengl/libs/EGL/egl_platform_entries.cpp

+59 −64
Original line number Diff line number Diff line
@@ -718,11 +718,12 @@ EGLSurface eglCreateWindowSurfaceImpl( EGLDisplay dpy, EGLConfig config, 
                                        NativeWindowType window,

                                        const EGLint *attrib_list)

{

    const EGLint *origAttribList = attrib_list;



    egl_connection_t* cnx = nullptr;

    egl_display_ptr dp = validate_display_connection(dpy, cnx);

    if (dp) {

    if (!dp) {

        return EGL_NO_SURFACE;

    }



    if (!window) {

        return setError(EGL_BAD_NATIVE_WINDOW, EGL_NO_SURFACE);

    }
@@ -752,8 +753,7 @@ EGLSurface eglCreateWindowSurfaceImpl( EGLDisplay dpy, EGLConfig config, 
    // now select correct colorspace and dataspace based on user's attribute list

    EGLint colorSpace = EGL_UNKNOWN;

    std::vector<EGLint> strippedAttribList;

        if (!processAttributes(dp, window, format, attrib_list, &colorSpace,

                               &strippedAttribList)) {

    if (!processAttributes(dp, window, format, attrib_list, &colorSpace, &strippedAttribList)) {

        ALOGE("error invalid colorspace: %d", colorSpace);

        return setError(EGL_BAD_ATTRIBUTE, EGL_NO_SURFACE);

    }
@@ -762,8 +762,7 @@ EGLSurface eglCreateWindowSurfaceImpl( EGLDisplay dpy, EGLConfig config, 
    if (cnx->angleBackend != EGL_PLATFORM_ANGLE_TYPE_VULKAN_ANGLE) {

        int err = native_window_set_buffers_format(window, format);

        if (err != 0) {

                ALOGE("error setting native window pixel format: %s (%d)",

                      strerror(-err), err);

            ALOGE("error setting native window pixel format: %s (%d)", strerror(-err), err);

            native_window_api_disconnect(window, NATIVE_WINDOW_API_EGL);

            return setError(EGL_BAD_NATIVE_WINDOW, EGL_NO_SURFACE);

        }
@@ -772,8 +771,7 @@ EGLSurface eglCreateWindowSurfaceImpl( EGLDisplay dpy, EGLConfig config, 
        if (dataSpace != HAL_DATASPACE_UNKNOWN) {

            err = native_window_set_buffers_data_space(window, dataSpace);

            if (err != 0) {

                    ALOGE("error setting native window pixel dataSpace: %s (%d)", strerror(-err),

                          err);

                ALOGE("error setting native window pixel dataSpace: %s (%d)", strerror(-err), err);

                native_window_api_disconnect(window, NATIVE_WINDOW_API_EGL);

                return setError(EGL_BAD_NATIVE_WINDOW, EGL_NO_SURFACE);

            }
@@ -785,11 +783,9 @@ EGLSurface eglCreateWindowSurfaceImpl( EGLDisplay dpy, EGLConfig config, 
    ANativeWindow* anw = reinterpret_cast<ANativeWindow*>(window);

    anw->setSwapInterval(anw, 1);



        EGLSurface surface = cnx->egl.eglCreateWindowSurface(

                iDpy, config, window, attrib_list);

    EGLSurface surface = cnx->egl.eglCreateWindowSurface(iDpy, config, window, attrib_list);

    if (surface != EGL_NO_SURFACE) {

            egl_surface_t* s =

                    new egl_surface_t(dp.get(), config, window, surface,

        egl_surface_t* s = new egl_surface_t(dp.get(), config, window, surface,

                                             getReportedColorSpace(colorSpace), cnx);

        return s;

    }
@@ -799,7 +795,6 @@ EGLSurface eglCreateWindowSurfaceImpl( EGLDisplay dpy, EGLConfig config, 
        native_window_set_buffers_format(window, 0);

        native_window_api_disconnect(window, NATIVE_WINDOW_API_EGL);

    }

    }

    return EGL_NO_SURFACE;

}