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

Commit 1e24cceb authored by Chia-I Wu's avatar Chia-I Wu
Browse files

surfaceflinger: remove all direct use of EGL 

SurfaceFlinger now uses EGL/GLES only indirectly through
RenderEngine and GLConsumer.

Test: SurfaceFlinger_test
Change-Id: I78418b00168b79594979212eb488f530e738498d
parent f846a35a

libs/gui/include/gui/ConsumerBase.h

+1 −1
Original line number Diff line number Diff line
@@ -187,7 +187,7 @@ protected: 
    // ConsumerBase::releaseBufferLocked.

    virtual status_t releaseBufferLocked(int slot,

            const sp<GraphicBuffer> graphicBuffer,

            EGLDisplay display, EGLSyncKHR eglFence);

            EGLDisplay display = EGL_NO_DISPLAY, EGLSyncKHR eglFence = EGL_NO_SYNC_KHR);



    // returns true iff the slot still has the graphicBuffer in it.

    bool stillTracking(int slot, const sp<GraphicBuffer> graphicBuffer);

services/surfaceflinger/BufferLayer.h

+0 −3
Original line number Diff line number Diff line
@@ -32,9 +32,6 @@ 
#include <gui/ISurfaceComposerClient.h>

#include <gui/LayerState.h>



#include <EGL/egl.h>

#include <EGL/eglext.h>



#include <ui/FrameStats.h>

#include <ui/GraphicBuffer.h>

#include <ui/PixelFormat.h>

services/surfaceflinger/DisplayHardware/FramebufferSurface.cpp

+1 −4
Original line number Diff line number Diff line
@@ -27,8 +27,6 @@ 
#include <utils/String8.h>

#include <log/log.h>



#include <EGL/egl.h>



#include <hardware/hardware.h>

#include <gui/BufferItem.h>

#include <gui/BufferQueue.h>
@@ -164,8 +162,7 @@ void FramebufferSurface::onFrameCommitted() { 
            ALOGE_IF(result != NO_ERROR, "onFrameCommitted: failed to add the"

                    " fence: %s (%d)", strerror(-result), result);

        }

        status_t result = releaseBufferLocked(mPreviousBufferSlot,

                mPreviousBuffer, EGL_NO_DISPLAY, EGL_NO_SYNC_KHR);

        status_t result = releaseBufferLocked(mPreviousBufferSlot, mPreviousBuffer);

        ALOGE_IF(result != NO_ERROR, "onFrameCommitted: error releasing buffer:"

                " %s (%d)", strerror(-result), result);

services/surfaceflinger/DisplayHardware/VirtualDisplaySurface.cpp

+1 −2
Original line number Diff line number Diff line
@@ -244,8 +244,7 @@ void VirtualDisplaySurface::onFrameCommitted() { 
        VDS_LOGV("onFrameCommitted: release scratch sslot=%d", sslot);

        addReleaseFenceLocked(sslot, mProducerBuffers[mFbProducerSlot],

                retireFence);

        releaseBufferLocked(sslot, mProducerBuffers[mFbProducerSlot],

                EGL_NO_DISPLAY, EGL_NO_SYNC_KHR);

        releaseBufferLocked(sslot, mProducerBuffers[mFbProducerSlot]);

    }



    if (mOutputProducerSlot >= 0) {

services/surfaceflinger/Layer.h

+0 −3
Original line number Diff line number Diff line
@@ -20,9 +20,6 @@ 
#include <stdint.h>

#include <sys/types.h>



#include <EGL/egl.h>

#include <EGL/eglext.h>



#include <utils/RefBase.h>

#include <utils/String8.h>

#include <utils/Timers.h>