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

Commit e59f1b0b authored by neo.he's avatar neo.he Committed by android-build-merger
Browse files

Merge changes If756ad2a,I19aeb7ac am: 15feba03 

am: 47609db7

Change-Id: I5a7ceb58874d4432d51342d275610dc46a539a61
parents 829f3c6d 47609db7

services/surfaceflinger/Layer.cpp

100644 → 100755
+2 −2
Original line number Diff line number Diff line
@@ -1271,9 +1271,9 @@ void Layer::computeGeometry(const sp<const DisplayDevice>& hw, Mesh& mesh, 


bool Layer::isOpaque(const Layer::State& s) const

{

    // if we don't have a buffer yet, we're translucent regardless of the

    // if we don't have a buffer or sidebandStream yet, we're translucent regardless of the

    // layer's opaque flag.

    if (mActiveBuffer == 0) {

    if ((mSidebandStream == nullptr) && (mActiveBuffer == nullptr)) {

        return false;

    }

services/surfaceflinger/RenderEngine/RenderEngine.cpp

+1 −0
Original line number Diff line number Diff line
@@ -380,6 +380,7 @@ static status_t selectEGLConfig(EGLDisplay display, EGLint format, 
        attribs[EGL_RED_SIZE]                   = 8;

        attribs[EGL_GREEN_SIZE]                 = 8;

        attribs[EGL_BLUE_SIZE]                  = 8;

        attribs[EGL_ALPHA_SIZE]                 = 8;

        wantedAttribute                         = EGL_NONE;

        wantedAttributeValue                    = EGL_NONE;

    } else {