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

Commit dc346e8c authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Delete RenderEngine unused code"

parents 259fd5fb 081be4c3

libs/renderengine/RenderEngine.cpp

+0 −12
Original line number Diff line number Diff line
@@ -18,7 +18,6 @@ 


#include <cutils/properties.h>

#include <log/log.h>

#include <private/gui/SyncFeatures.h>

#include "gl/GLESRenderEngine.h"

#include "threaded/RenderEngineThreaded.h"
@@ -59,16 +58,5 @@ std::unique_ptr<RenderEngine> RenderEngine::create(const RenderEngineCreationArg 


RenderEngine::~RenderEngine() = default;



namespace impl {



RenderEngine::RenderEngine(const RenderEngineCreationArgs& args) : mArgs(args) {}



RenderEngine::~RenderEngine() = default;



bool RenderEngine::useNativeFenceSync() const {

    return SyncFeatures::getInstance().useNativeFenceSync();

}



} // namespace impl

} // namespace renderengine

} // namespace android

libs/renderengine/gl/GLESRenderEngine.cpp

+4 −5
Original line number Diff line number Diff line
@@ -356,8 +356,7 @@ EGLConfig GLESRenderEngine::chooseEglConfig(EGLDisplay display, int format, bool 
GLESRenderEngine::GLESRenderEngine(const RenderEngineCreationArgs& args, EGLDisplay display,

                                   EGLConfig config, EGLContext ctxt, EGLSurface stub,

                                   EGLContext protectedContext, EGLSurface protectedStub)

      : renderengine::impl::RenderEngine(args),

        mEGLDisplay(display),

      : mEGLDisplay(display),

        mEGLConfig(config),

        mEGLContext(ctxt),

        mStubSurface(stub),
@@ -366,7 +365,8 @@ GLESRenderEngine::GLESRenderEngine(const RenderEngineCreationArgs& args, EGLDisp 
        mVpWidth(0),

        mVpHeight(0),

        mFramebufferImageCacheSize(args.imageCacheSize),

        mUseColorManagement(args.useColorManagement) {

        mUseColorManagement(args.useColorManagement),

        mPrecacheToneMapperShaderOnly(args.precacheToneMapperShaderOnly) {

    glGetIntegerv(GL_MAX_TEXTURE_SIZE, &mMaxTextureSize);

    glGetIntegerv(GL_MAX_VIEWPORT_DIMS, mMaxViewportDims);
@@ -475,8 +475,7 @@ Framebuffer* GLESRenderEngine::getFramebufferForDrawing() { 


void GLESRenderEngine::primeCache() const {

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

                                           mArgs.useColorManagement,

                                           mArgs.precacheToneMapperShaderOnly);

                                           mUseColorManagement, mPrecacheToneMapperShaderOnly);

}



base::unique_fd GLESRenderEngine::flush() {

libs/renderengine/gl/GLESRenderEngine.h

+5 −1
Original line number Diff line number Diff line
@@ -48,7 +48,7 @@ namespace gl { 
class GLImage;

class BlurFilter;



class GLESRenderEngine : public impl::RenderEngine {

class GLESRenderEngine : public RenderEngine {

public:

    static std::unique_ptr<GLESRenderEngine> create(const RenderEngineCreationArgs& args);
@@ -231,6 +231,10 @@ private: 
    // supports sRGB, DisplayP3 color spaces.

    const bool mUseColorManagement = false;



    // Whether only shaders performing tone mapping from HDR to SDR will be generated on

    // primeCache().

    const bool mPrecacheToneMapperShaderOnly = false;



    // Cache of GL images that we'll store per GraphicBuffer ID

    std::unordered_map<uint64_t, std::unique_ptr<Image>> mImageCache GUARDED_BY(mRenderingMutex);

    std::unordered_map<uint32_t, std::optional<uint64_t>> mTextureView;

libs/renderengine/include/renderengine/RenderEngine.h

+0 −16
Original line number Diff line number Diff line
@@ -89,7 +89,6 @@ public: 
    // dump the extension strings. always call the base class.

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



    virtual bool useNativeFenceSync() const = 0;

    virtual void genTextures(size_t count, uint32_t* names) = 0;

    virtual void deleteTextures(size_t count, uint32_t const* names) = 0;

    // Caches Image resources for this buffer, but does not bind the buffer to
@@ -263,21 +262,6 @@ private: 
    RenderEngine::RenderEngineType renderEngineType = RenderEngine::RenderEngineType::GLES;

};



namespace impl {



// impl::RenderEngine contains common implementation that is graphics back-end agnostic.

class RenderEngine : public renderengine::RenderEngine {

public:

    virtual ~RenderEngine() = 0;



    bool useNativeFenceSync() const override;



protected:

    RenderEngine(const RenderEngineCreationArgs& args);

    const RenderEngineCreationArgs mArgs;

};



} // namespace impl

} // namespace renderengine

} // namespace android

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

+0 −8
Original line number Diff line number Diff line
@@ -35,20 +35,12 @@ public: 
    RenderEngine();

    ~RenderEngine() override;



    MOCK_METHOD0(getFramebufferForDrawing, Framebuffer*());

    MOCK_CONST_METHOD0(primeCache, void());

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

    MOCK_CONST_METHOD0(useNativeFenceSync, bool());

    MOCK_CONST_METHOD0(useWaitSync, bool());

    MOCK_CONST_METHOD0(isCurrent, bool());

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

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

    MOCK_METHOD1(cacheExternalTextureBuffer, void(const sp<GraphicBuffer>&));

    MOCK_METHOD3(bindExternalTextureBuffer,

                 status_t(uint32_t, const sp<GraphicBuffer>&, const sp<Fence>&));

    MOCK_METHOD1(unbindExternalTextureBuffer, void(uint64_t));

    MOCK_METHOD1(bindFrameBuffer, status_t(renderengine::Framebuffer*));

    MOCK_METHOD1(unbindFrameBuffer, void(renderengine::Framebuffer*));

    MOCK_METHOD1(drawMesh, void(const renderengine::Mesh&));

    MOCK_CONST_METHOD0(getMaxTextureSize, size_t());

    MOCK_CONST_METHOD0(getMaxViewportDims, size_t());