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

Commit 4037c458 authored by Andreas Gampe's avatar Andreas Gampe
Browse files

resolved conflicts for merge of 07dffa18 to lmp-mr1-dev-plus-aosp 

Change-Id: I42d8bc291f4f48f3098754b076889159c4b20e41
parents c5657b0c 07dffa18

services/surfaceflinger/Android.mk

+32 −26
Original line number Diff line number Diff line
@@ -108,6 +108,8 @@ LOCAL_SHARED_LIBRARIES := \ 


LOCAL_MODULE:= libsurfaceflinger



LOCAL_CFLAGS += -Wall -Werror -Wunused -Wunreachable-code



include $(BUILD_SHARED_LIBRARY)



###############################################################
@@ -137,6 +139,8 @@ ifdef TARGET_32_BIT_SURFACEFLINGER 
LOCAL_32_BIT_ONLY := true

endif



LOCAL_CFLAGS += -Wall -Werror -Wunused -Wunreachable-code



include $(BUILD_EXECUTABLE)



###############################################################
@@ -155,5 +159,7 @@ LOCAL_SHARED_LIBRARIES := \ 


LOCAL_MODULE:= libsurfaceflinger_ddmconnection



LOCAL_CFLAGS += -Wall -Werror -Wunused -Wunreachable-code



include $(BUILD_SHARED_LIBRARY)

endif # libnativehelper

services/surfaceflinger/DisplayDevice.cpp

+19 −13
Original line number Diff line number Diff line
@@ -44,6 +44,18 @@ 
using namespace android;

// ----------------------------------------------------------------------------



#ifdef EGL_ANDROID_swap_rectangle

static constexpr bool kEGLAndroidSwapRectangle = true;

#else

static constexpr bool kEGLAndroidSwapRectangle = false;

#endif



#if !defined(EGL_EGLEXT_PROTOTYPES) || !defined(EGL_ANDROID_swap_rectangle)

// Dummy implementation in case it is missing.

inline void eglSetSwapRectangleANDROID (EGLDisplay, EGLSurface, EGLint, EGLint, EGLint, EGLint) {

}

#endif



/*

 * Initialize the display to the specified values.

 *
@@ -84,7 +96,6 @@ DisplayDevice::DisplayDevice( 
     */



    EGLSurface surface;

    EGLint w, h;

    EGLDisplay display = eglGetDisplay(EGL_DEFAULT_DISPLAY);

    if (config == EGL_NO_CONFIG) {

        config = RenderEngine::chooseEglConfig(display, format);
@@ -188,19 +199,14 @@ void DisplayDevice::flip(const Region& dirty) const 
{

    mFlinger->getRenderEngine().checkErrors();



    EGLDisplay dpy = mDisplay;

    EGLSurface surface = mSurface;



#ifdef EGL_ANDROID_swap_rectangle

    if (kEGLAndroidSwapRectangle) {

        if (mFlags & SWAP_RECTANGLE) {

            const Region newDirty(dirty.intersect(bounds()));

            const Rect b(newDirty.getBounds());

        eglSetSwapRectangleANDROID(dpy, surface,

            eglSetSwapRectangleANDROID(mDisplay, mSurface,

                    b.left, b.top, b.width(), b.height());

        }

#else

    (void) dirty; // Eliminate unused parameter warning

#endif

    }



    mPageFlipCount++;

}

services/surfaceflinger/DisplayHardware/VirtualDisplaySurface.h

+1 −0
Original line number Diff line number Diff line
@@ -86,6 +86,7 @@ public: 
    virtual status_t compositionComplete();

    virtual status_t advanceFrame();

    virtual void onFrameCommitted();

    using BBinder::dump;

    virtual void dump(String8& result) const;

    virtual void resizeBuffers(const uint32_t w, const uint32_t h);

services/surfaceflinger/Layer.cpp

+0 −2
Original line number Diff line number Diff line
@@ -63,7 +63,6 @@ Layer::Layer(SurfaceFlinger* flinger, const sp<Client>& client, 
        mTextureName(-1U),

        mPremultipliedAlpha(true),

        mName("unnamed"),

        mDebug(false),

        mFormat(PIXEL_FORMAT_NONE),

        mTransactionFlags(0),

        mQueuedFrames(0),
@@ -666,7 +665,6 @@ void Layer::clearWithOpenGL( 


void Layer::drawWithOpenGL(const sp<const DisplayDevice>& hw,

        const Region& /* clip */, bool useIdentityTransform) const {

    const uint32_t fbHeight = hw->getHeight();

    const State& s(getDrawingState());



    computeGeometry(hw, mMesh, useIdentityTransform);

services/surfaceflinger/Layer.h

+0 −1
Original line number Diff line number Diff line
@@ -361,7 +361,6 @@ private: 
    uint32_t mTextureName;      // from GLES

    bool mPremultipliedAlpha;

    String8 mName;

    mutable bool mDebug;

    PixelFormat mFormat;



    // these are protected by an external lock