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

Commit 131866e1 authored by Riley Andrews's avatar Riley Andrews Committed by Android (Google) Code Review
Browse files

Merge "Add glFlush in surfaceflinger screenshot code." into lmp-mr1-dev

parents 8ad8c0a7 9707f4df

services/surfaceflinger/RenderEngine/RenderEngine.cpp

+4 −0
Original line number Diff line number Diff line
@@ -219,6 +219,10 @@ void RenderEngine::fillRegionWithColor(const Region& region, uint32_t height, 
    drawMesh(mesh);

}



void RenderEngine::flush() {

    glFlush();

}



void RenderEngine::clearWithColor(float red, float green, float blue, float alpha) {

    glClearColor(red, green, blue, alpha);

    glClear(GL_COLOR_BUFFER_BIT);

services/surfaceflinger/RenderEngine/RenderEngine.h

+1 −0
Original line number Diff line number Diff line
@@ -67,6 +67,7 @@ public: 
    virtual void dump(String8& result);



    // helpers

    void flush();

    void clearWithColor(float red, float green, float blue, float alpha);

    void fillRegionWithColor(const Region& region, uint32_t height,

            float red, float green, float blue, float alpha);

services/surfaceflinger/SurfaceFlinger.cpp

+2 −0
Original line number Diff line number Diff line
@@ -3201,6 +3201,8 @@ status_t SurfaceFlinger::captureScreenImplLocked( 
                        EGLSyncKHR sync;

                        if (!DEBUG_SCREENSHOTS) {

                           sync = eglCreateSyncKHR(mEGLDisplay, EGL_SYNC_NATIVE_FENCE_ANDROID, NULL);

                           // native fence fd will not be populated until flush() is done.

                           getRenderEngine().flush();

                        } else {

                            sync = EGL_NO_SYNC_KHR;

                        }