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

Commit 8c9687ae authored by Mathias Agopian's avatar Mathias Agopian
Browse files

fix an update bug with SHOW_UPDATE debug feature. Fix a problem with the debug binder codes too

parent 5a8d6f44

libs/surfaceflinger/DisplayHardware/DisplayHardware.cpp

+2 −3
Original line number Diff line number Diff line
@@ -318,9 +318,8 @@ void DisplayHardware::flip(const Region& dirty) const 


#ifdef EGL_ANDROID_swap_rectangle    

    if (mFlags & SWAP_RECTANGLE) {

        Region newDirty(dirty);

        newDirty.andSelf(Rect(mWidth, mHeight));

        const Rect& b(newDirty.bounds());

        const Region newDirty(dirty.intersect(bounds()));

        const Rect b(newDirty.getBounds());

        eglSetSwapRectangleANDROID(dpy, surface,

                b.left, b.top, b.width(), b.height());

    }

libs/surfaceflinger/SurfaceFlinger.cpp

+17 −8
Original line number Diff line number Diff line
@@ -803,19 +803,24 @@ void SurfaceFlinger::unlockPageFlip(const LayerVector& currentLayers) 
    }

}





void SurfaceFlinger::handleRepaint()

{

    // set the frame buffer

    const DisplayHardware& hw(graphicPlane(0).displayHardware());

    glMatrixMode(GL_MODELVIEW);

    glLoadIdentity();

    // compute the invalid region

    mInvalidRegion.orSelf(mDirtyRegion);

    if (mInvalidRegion.isEmpty()) {

        // nothing to do

        return;

    }



    if (UNLIKELY(mDebugRegion)) {

        debugFlashRegions();

    }



    // compute the invalid region

    mInvalidRegion.orSelf(mDirtyRegion);

    // set the frame buffer

    const DisplayHardware& hw(graphicPlane(0).displayHardware());

    glMatrixMode(GL_MODELVIEW);

    glLoadIdentity();



    uint32_t flags = hw.getFlags();

    if ((flags & DisplayHardware::SWAP_RECTANGLE) ||
@@ -945,8 +950,11 @@ void SurfaceFlinger::debugFlashRegions() 
        glDrawArrays(GL_TRIANGLE_FAN, 0, 4);

    }

    

    hw.flip(mDirtyRegion.merge(mInvalidRegion));

    mInvalidRegion.clear();

    if (mInvalidRegion.isEmpty()) {

        mDirtyRegion.dump("mDirtyRegion");

        mInvalidRegion.dump("mInvalidRegion");

    }

    hw.flip(mInvalidRegion);



    if (mDebugRegion > 1)

       usleep(mDebugRegion * 1000);
@@ -1549,6 +1557,7 @@ status_t SurfaceFlinger::onTransact( 
    }

    status_t err = BnSurfaceComposer::onTransact(code, data, reply, flags);

    if (err == UNKNOWN_TRANSACTION || err == PERMISSION_DENIED) {

        CHECK_INTERFACE(ISurfaceComposer, data, reply);

        if (UNLIKELY(!mHardwareTest.checkCalling())) {

            IPCThreadState* ipc = IPCThreadState::self();

            const int pid = ipc->getCallingPid();