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

Commit 848f6515 authored by John Reck's avatar John Reck
Browse files

Revert "Revert "Make HWUI's surface Reliable^TM"" 

This reverts commit dd08224e.

Bug: 120097554
Bug: 120342364
Bug: 120421537

Test: verified emulator can boot OK, with no log warnings
Test: verified keyboard works in landscape

Change-Id: Iae2cd1140d81755b126adfb21ec885181f3bc6b6
parent f660c012

libs/hwui/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -177,6 +177,7 @@ cc_defaults { 
        "renderthread/CanvasContext.cpp",

        "renderthread/DrawFrameTask.cpp",

        "renderthread/EglManager.cpp",

        "renderthread/ReliableSurface.cpp",

        "renderthread/VulkanManager.cpp",

        "renderthread/RenderProxy.cpp",

        "renderthread/RenderTask.cpp",

libs/hwui/pipeline/skia/SkiaOpenGLPipeline.cpp

+1 −1
Original line number Diff line number Diff line
@@ -155,7 +155,7 @@ void SkiaOpenGLPipeline::onStop() { 
    }

}



bool SkiaOpenGLPipeline::setSurface(Surface* surface, SwapBehavior swapBehavior,

bool SkiaOpenGLPipeline::setSurface(ANativeWindow* surface, SwapBehavior swapBehavior,

                                    ColorMode colorMode) {

    if (mEglSurface != EGL_NO_SURFACE) {

        mEglManager.destroySurface(mEglSurface);

libs/hwui/pipeline/skia/SkiaOpenGLPipeline.h

+1 −1
Original line number Diff line number Diff line
@@ -42,7 +42,7 @@ public: 
    bool swapBuffers(const renderthread::Frame& frame, bool drew, const SkRect& screenDirty,

                     FrameInfo* currentFrameInfo, bool* requireSwap) override;

    DeferredLayerUpdater* createTextureLayer() override;

    bool setSurface(Surface* window, renderthread::SwapBehavior swapBehavior,

    bool setSurface(ANativeWindow* surface, renderthread::SwapBehavior swapBehavior,

                    renderthread::ColorMode colorMode) override;

    void onStop() override;

    bool isSurfaceReady() override;

libs/hwui/pipeline/skia/SkiaVulkanPipeline.cpp

+1 −1
Original line number Diff line number Diff line
@@ -115,7 +115,7 @@ DeferredLayerUpdater* SkiaVulkanPipeline::createTextureLayer() { 


void SkiaVulkanPipeline::onStop() {}



bool SkiaVulkanPipeline::setSurface(Surface* surface, SwapBehavior swapBehavior,

bool SkiaVulkanPipeline::setSurface(ANativeWindow* surface, SwapBehavior swapBehavior,

                                    ColorMode colorMode) {

    if (mVkSurface) {

        mVkManager.destroySurface(mVkSurface);

libs/hwui/pipeline/skia/SkiaVulkanPipeline.h

+1 −1
Original line number Diff line number Diff line
@@ -38,7 +38,7 @@ public: 
    bool swapBuffers(const renderthread::Frame& frame, bool drew, const SkRect& screenDirty,

                     FrameInfo* currentFrameInfo, bool* requireSwap) override;

    DeferredLayerUpdater* createTextureLayer() override;

    bool setSurface(Surface* window, renderthread::SwapBehavior swapBehavior,

    bool setSurface(ANativeWindow* surface, renderthread::SwapBehavior swapBehavior,

                    renderthread::ColorMode colorMode) override;

    void onStop() override;

    bool isSurfaceReady() override;