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

Commit f7701fab authored by Mathias Agopian's avatar Mathias Agopian Committed by Android Git Automerger
Browse files

am d0441f92: Merge "fix a small bug that caused screenshot to show garbage in... 

am d0441f92: Merge "fix a small bug that caused screenshot to show garbage in some cases (DO NOT MERGE)" into gingerbread

* commit 'd0441f921b2b1879fb44041f521d9bfaa5a547d0':
  fix a small bug that caused screenshot to show garbage in some cases (DO NOT MERGE)
parents 63e4bba5 2462602e

services/surfaceflinger/SurfaceFlinger.cpp

+2 −1
Original line number Diff line number Diff line
@@ -2114,6 +2114,7 @@ status_t SurfaceFlinger::captureScreenImplLocked(DisplayID dpy, 


        // invert everything, b/c glReadPixel() below will invert the FB

        glViewport(0, 0, sw, sh);

        glScissor(0, 0, sw, sh);

        glMatrixMode(GL_PROJECTION);

        glPushMatrix();

        glLoadIdentity();
@@ -2123,6 +2124,7 @@ status_t SurfaceFlinger::captureScreenImplLocked(DisplayID dpy, 
        // redraw the screen entirely...

        glClearColor(0,0,0,1);

        glClear(GL_COLOR_BUFFER_BIT);



        const Vector< sp<LayerBase> >& layers(mVisibleLayersSortedByZ);

        const size_t count = layers.size();

        for (size_t i=0 ; i<count ; ++i) {
@@ -2157,7 +2159,6 @@ status_t SurfaceFlinger::captureScreenImplLocked(DisplayID dpy, 
                result = NO_MEMORY;

            }

        }



        glEnable(GL_SCISSOR_TEST);

        glViewport(0, 0, hw_w, hw_h);

        glMatrixMode(GL_PROJECTION);