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

Commit e86b7fb0 authored by Craig Donner's avatar Craig Donner Committed by android-build-merger
Browse files

Merge "Keep protected content in EGLImage attrs as needed."

am: 5a03327f

Change-Id: Id79a4a1548e5c7f4cb504d474f856727bf0b51ee
parents 3aa7f61e 5a03327f
Loading
Loading
Loading
Loading
+8 −3
Original line number Diff line number Diff line
@@ -1228,14 +1228,19 @@ EGLImageKHR GLConsumer::EglImage::createImage(EGLDisplay dpy,
        EGL_NONE,
    };
    if (!crop.isValid()) {
        // No crop rect to set, so terminate the attrib array before the crop.
        attrs[2] = EGL_NONE;
        // No crop rect to set, so leave the crop out of the attrib array. Make
        // sure to propagate the protected content attrs if they are set.
        attrs[2] = attrs[10];
        attrs[3] = attrs[11];
        attrs[4] = EGL_NONE;
    } else if (!isEglImageCroppable(crop)) {
        // The crop rect is not at the origin, so we can't set the crop on the
        // EGLImage because that's not allowed by the EGL_ANDROID_image_crop
        // extension.  In the future we can add a layered extension that
        // removes this restriction if there is hardware that can support it.
        attrs[2] = EGL_NONE;
        attrs[2] = attrs[10];
        attrs[3] = attrs[11];
        attrs[4] = EGL_NONE;
    }
    eglInitialize(dpy, 0, 0);
    EGLImageKHR image = eglCreateImageKHR(dpy, EGL_NO_CONTEXT,