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

Commit cf39b7bc authored by Yiwei Zhang's avatar Yiwei Zhang
Browse files

DO NOT MERGE Apply scissor in render engine for main display 

Bug: b/113041377
Test: manually
Change-Id: I651357d456f13ff67961b75d3630aca91aa512ac
parent e06ad77b

services/surfaceflinger/SurfaceFlinger.cpp

+11 −16
Original line number Diff line number Diff line
@@ -3060,10 +3060,6 @@ bool SurfaceFlinger::doComposeSurfaces(const sp<const DisplayDevice>& displayDev 
            }

        }



        if (displayDevice->getDisplayType() != DisplayDevice::DISPLAY_PRIMARY) {

            // just to be on the safe side, we don't set the

            // scissor on the main display. It should never be needed

            // anyways (though in theory it could since the API allows it).

        const Rect& bounds(displayDevice->getBounds());

        const Rect& scissor(displayDevice->getScissor());

        if (scissor != bounds) {
@@ -3077,7 +3073,6 @@ bool SurfaceFlinger::doComposeSurfaces(const sp<const DisplayDevice>& displayDev 
                                              scissor.getWidth(), scissor.getHeight());

        }

    }

    }



    /*

     * and then, render the layers targeted at the framebuffer