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

Commit c84b9ba4 authored by Ady Abraham's avatar Ady Abraham Committed by Automerger Merge Worker
Browse files

Merge "SF: RenderEngine::primeCache should not be called as SCHED_FIFO" into sc-dev am: e0220cee 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/14922412

Change-Id: Ibd58c4068f9a59df8100e7d6f75bfbbeef7857a1
parents 4d77c14b e0220cee

libs/renderengine/gl/GLESRenderEngine.cpp

+2 −1
Original line number Original line Diff line number Diff line
@@ -515,9 +515,10 @@ Framebuffer* GLESRenderEngine::getFramebufferForDrawing() { 
    return mDrawingBuffer.get();

    return mDrawingBuffer.get();

}

}





void GLESRenderEngine::primeCache() {

std::future<void> GLESRenderEngine::primeCache() {

    ProgramCache::getInstance().primeCache(mInProtectedContext ? mProtectedEGLContext : mEGLContext,

    ProgramCache::getInstance().primeCache(mInProtectedContext ? mProtectedEGLContext : mEGLContext,

                                           mUseColorManagement, mPrecacheToneMapperShaderOnly);

                                           mUseColorManagement, mPrecacheToneMapperShaderOnly);

    return {};

}

}





base::unique_fd GLESRenderEngine::flush() {

base::unique_fd GLESRenderEngine::flush() {

libs/renderengine/gl/GLESRenderEngine.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -57,7 +57,7 @@ public: 
                     EGLSurface protectedStub);

                     EGLSurface protectedStub);

    ~GLESRenderEngine() override EXCLUDES(mRenderingMutex);

    ~GLESRenderEngine() override EXCLUDES(mRenderingMutex);





    void primeCache() override;

    std::future<void> primeCache() override;

    void genTextures(size_t count, uint32_t* names) override;

    void genTextures(size_t count, uint32_t* names) override;

    void deleteTextures(size_t count, uint32_t const* names) override;

    void deleteTextures(size_t count, uint32_t const* names) override;

    bool isProtected() const override { return mInProtectedContext; }

    bool isProtected() const override { return mInProtectedContext; }

libs/renderengine/include/renderengine/RenderEngine.h

+2 −1
Original line number Original line Diff line number Diff line
@@ -29,6 +29,7 @@ 
#include <ui/GraphicTypes.h>

#include <ui/GraphicTypes.h>

#include <ui/Transform.h>

#include <ui/Transform.h>





#include <future>

#include <memory>

#include <memory>





/**

/**
@@ -104,7 +105,7 @@ public: 
    // This interface, while still in use until a suitable replacement is built,

    // This interface, while still in use until a suitable replacement is built,

    // should be considered deprecated, minus some methods which still may be

    // should be considered deprecated, minus some methods which still may be

    // used to support legacy behavior.

    // used to support legacy behavior.

    virtual void primeCache() = 0;

    virtual std::future<void> primeCache() = 0;





    // dump the extension strings. always call the base class.

    // dump the extension strings. always call the base class.

    virtual void dump(std::string& result) = 0;

    virtual void dump(std::string& result) = 0;

libs/renderengine/include/renderengine/mock/RenderEngine.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -35,7 +35,7 @@ public: 
    RenderEngine();

    RenderEngine();

    ~RenderEngine() override;

    ~RenderEngine() override;





    MOCK_METHOD0(primeCache, void());

    MOCK_METHOD0(primeCache, std::future<void>());

    MOCK_METHOD1(dump, void(std::string&));

    MOCK_METHOD1(dump, void(std::string&));

    MOCK_METHOD2(genTextures, void(size_t, uint32_t*));

    MOCK_METHOD2(genTextures, void(size_t, uint32_t*));

    MOCK_METHOD2(deleteTextures, void(size_t, uint32_t const*));

    MOCK_METHOD2(deleteTextures, void(size_t, uint32_t const*));

libs/renderengine/skia/SkiaGLRenderEngine.cpp

+2 −1
Original line number Original line Diff line number Diff line
@@ -235,8 +235,9 @@ std::unique_ptr<SkiaGLRenderEngine> SkiaGLRenderEngine::create( 
    return engine;

    return engine;

}

}





void SkiaGLRenderEngine::primeCache() {

std::future<void> SkiaGLRenderEngine::primeCache() {

    Cache::primeShaderCache(this);

    Cache::primeShaderCache(this);

    return {};

}

}





EGLConfig SkiaGLRenderEngine::chooseEglConfig(EGLDisplay display, int format, bool logConfig) {

EGLConfig SkiaGLRenderEngine::chooseEglConfig(EGLDisplay display, int format, bool logConfig) {