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

Commit 6279619e authored by Mathias Agopian's avatar Mathias Agopian
Browse files

minor clean-up in FramebufferNativeWindow

parent dff8e58d

include/ui/FramebufferNativeWindow.h

+0 −6
Original line number Diff line number Diff line
@@ -76,13 +76,9 @@ public: 


    framebuffer_device_t const * getDevice() const { return fbDev; } 



    void setSwapRectangle(const Rect& dirty);



private:

    friend class LightRefBase<FramebufferNativeWindow>;    

    ~FramebufferNativeWindow(); // this class cannot be overloaded

    static void connect(android_native_window_t* window);

    static void disconnect(android_native_window_t* window);

    static int setSwapInterval(android_native_window_t* window, int interval);

    static int dequeueBuffer(android_native_window_t* window, android_native_buffer_t** buffer);

    static int lockBuffer(android_native_window_t* window, android_native_buffer_t* buffer);
@@ -94,8 +90,6 @@ private: 
    sp<NativeBuffer> buffers[2];

    sp<NativeBuffer> front;

    

    Rect mDirty;



    mutable Mutex mutex;

    Condition mCondition;

    int32_t mNumBuffers;

libs/surfaceflinger/DisplayHardware/DisplayHardware.cpp

+4 −7
Original line number Diff line number Diff line
@@ -305,15 +305,12 @@ void DisplayHardware::flip(const Region& dirty) const 
    EGLDisplay dpy = mDisplay;

    EGLSurface surface = mSurface;



    if (mFlags & BUFFER_PRESERVED) {

        Region newDirty(dirty);

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



    if (mFlags & BUFFER_PRESERVED) {

        mDirty = newDirty;

    } 



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

    mNativeWindow->setSwapRectangle(b);

        //mNativeWindow->setSwapRectangle(b);

    } 



    mPageFlipCount++;

    eglSwapBuffers(dpy, surface);

libs/surfaceflinger/DisplayHardware/DisplayHardware.h

+0 −1
Original line number Diff line number Diff line
@@ -102,7 +102,6 @@ private: 
    int             mHeight;

    PixelFormat     mFormat;

    uint32_t        mFlags;

    mutable Region  mDirty;

    mutable uint32_t mPageFlipCount;

    

    sp<FramebufferNativeWindow> mNativeWindow;

libs/ui/FramebufferNativeWindow.cpp

+0 −14
Original line number Diff line number Diff line
@@ -131,14 +131,6 @@ FramebufferNativeWindow::~FramebufferNativeWindow() { 
    framebuffer_close(fbDev);

}



void FramebufferNativeWindow::connect(android_native_window_t* window) 

{

}



void FramebufferNativeWindow::disconnect(android_native_window_t* window) 

{

}



int FramebufferNativeWindow::setSwapInterval(

        android_native_window_t* window, int interval) 

{
@@ -146,12 +138,6 @@ int FramebufferNativeWindow::setSwapInterval( 
    return fb->setSwapInterval(fb, interval);

}



void FramebufferNativeWindow::setSwapRectangle(const Rect& dirty)

{

    Mutex::Autolock _l(mutex);

    mDirty = dirty; 

}



int FramebufferNativeWindow::dequeueBuffer(android_native_window_t* window, 

        android_native_buffer_t** buffer)

{