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

Commit 631108b6 authored by Ian Elliott's avatar Ian Elliott Committed by Automerger Merge Worker
Browse files

Merge "Plumb 2 EGL surface attributes to ANGLE" am: 412da819 am: c3843ac8... 

Merge "Plumb 2 EGL surface attributes to ANGLE" am: 412da819 am: c3843ac8 am: 7692db70 am: b635a857

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2120668



Change-Id: Idf15b13acde2df6b3efdbb0440bd47eebd6a4150
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 6e6307ab b635a857

opengl/libs/EGL/egl_platform_entries.cpp

+10 −2
Original line number Diff line number Diff line
@@ -1453,7 +1453,11 @@ EGLBoolean eglSurfaceAttribImpl(EGLDisplay dpy, EGLSurface surface, EGLint attri 
            setError(EGL_BAD_SURFACE, EGL_FALSE);

        }

        int err = native_window_set_auto_refresh(s->getNativeWindow(), value != 0);

        return (err == 0) ? EGL_TRUE : setError(EGL_BAD_SURFACE, (EGLBoolean)EGL_FALSE);

        if (err != 0) {

            return setError(EGL_BAD_SURFACE, (EGLBoolean)EGL_FALSE);

        } else if (!s->cnx->useAngle) {

            return EGL_TRUE;

        } // else if ANGLE, fall through to the call to the driver (i.e. ANGLE) below

    }



    if (attribute == EGL_TIMESTAMPS_ANDROID) {
@@ -1463,7 +1467,11 @@ EGLBoolean eglSurfaceAttribImpl(EGLDisplay dpy, EGLSurface surface, EGLint attri 
            return EGL_TRUE;

        }

        int err = native_window_enable_frame_timestamps(s->getNativeWindow(), value != 0);

        return (err == 0) ? EGL_TRUE : setError(EGL_BAD_SURFACE, (EGLBoolean)EGL_FALSE);

        if (err != 0) {

            return setError(EGL_BAD_SURFACE, (EGLBoolean)EGL_FALSE);

        } else if (!s->cnx->useAngle) {

            return EGL_TRUE;

        } // else if ANGLE, fall through to the call to the driver (i.e. ANGLE) below

    }



    if (s->setSmpte2086Attribute(attribute, value)) {