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

Commit be70507b authored by Ian Elliott's avatar Ian Elliott
Browse files

Remove RE_SKIAVK ifdefs (always Compile SkiaVkRenderEngine) 

This reverts 2 previous commits:

- "Allow SkiaVkRenderEngine to not be compiled" (commit
  646ebf21)
- "Compile SkiaVkRenderEngine so that it can be enabled" ( commit
  32f9e699)

that allowed SkiaVkRenderEngine to be conditionally compiled and then
set the define so that it would always be compiled.  We have decided
for now to have both SkiaGL and SkiaVk in RenderEngine, and so
removing the ifdef's makes the code simpler.

Note: the total increase in pinned memory that was observed in testing was between 360-362 KB (see b/263443538)

Test: `git revert` and visual inspection with gitk
Bug: 236390072
Change-Id: Ia49a2971c544db1d6b9a8996220e2b3e2d0ab437
parent 6b65c0c7

libs/renderengine/Android.bp

+0 −2
Original line number Diff line number Diff line
@@ -133,8 +133,6 @@ cc_library_static { 
        "-fvisibility=hidden",

        "-Werror=format",

        "-Wno-unused-parameter",

        // TODO: Investigate reducing pinned-memory usage (b/263377839)

        "-DRE_SKIAVK",

    ],

    srcs: [

        ":librenderengine_sources",

libs/renderengine/RenderEngine.cpp

+0 −8
Original line number Diff line number Diff line
@@ -39,12 +39,8 @@ std::unique_ptr<RenderEngine> RenderEngine::create(const RenderEngineCreationArg 
            ALOGD("RenderEngine with SkiaGL Backend");

            return renderengine::skia::SkiaGLRenderEngine::create(args);

        case RenderEngineType::SKIA_VK:

#ifdef RE_SKIAVK

            ALOGD("RenderEngine with SkiaVK Backend");

            return renderengine::skia::SkiaVkRenderEngine::create(args);

#else

            LOG_ALWAYS_FATAL("Requested VK backend, but RE_SKIAVK is not defined!");

#endif

        case RenderEngineType::SKIA_GL_THREADED: {

            ALOGD("Threaded RenderEngine with SkiaGL Backend");

            return renderengine::threaded::RenderEngineThreaded::create(
@@ -54,16 +50,12 @@ std::unique_ptr<RenderEngine> RenderEngine::create(const RenderEngineCreationArg 
                    args.renderEngineType);

        }

        case RenderEngineType::SKIA_VK_THREADED:

#ifdef RE_SKIAVK

            ALOGD("Threaded RenderEngine with SkiaVK Backend");

            return renderengine::threaded::RenderEngineThreaded::create(

                    [args]() {

                        return android::renderengine::skia::SkiaVkRenderEngine::create(args);

                    },

                    args.renderEngineType);

#else

            LOG_ALWAYS_FATAL("Requested VK backend, but RE_SKIAVK is not defined!");

#endif

        case RenderEngineType::GLES:

        default:

            ALOGD("RenderEngine with GLES Backend");

libs/renderengine/skia/SkiaVkRenderEngine.cpp

+0 −5
Original line number Diff line number Diff line
@@ -14,10 +14,6 @@ 
 * limitations under the License.

 */



// Allow the SkiaVkRenderEngine class to not be compiled, to save space

// NOTE: In order to build this class, define `RE_SKIAVK` in a build file.

#ifdef RE_SKIAVK



// #define LOG_NDEBUG 0

#undef LOG_TAG

#define LOG_TAG "RenderEngine"
@@ -677,4 +673,3 @@ void SkiaVkRenderEngine::appendBackendSpecificInfoToDump(std::string& result) { 
} // namespace skia

} // namespace renderengine

} // namespace android
 
#endif // RE_SKIAVK

libs/renderengine/skia/SkiaVkRenderEngine.h

+1 −6
Original line number Diff line number Diff line
@@ -17,10 +17,6 @@ 
#ifndef SF_SKIAVKRENDERENGINE_H_

#define SF_SKIAVKRENDERENGINE_H_



// Allow the SkiaVkRenderEngine class to not be compiled, to save space

// NOTE: In order to build this class, define `RE_SKIAVK` in a build file.

#ifdef RE_SKIAVK



#include <vk/GrVkBackendContext.h>



#include "SkiaRenderEngine.h"
@@ -59,5 +55,4 @@ private: 
} // namespace renderengine

} // namespace android



#endif // RE_SKIAVK

#endif // SF_SKIAVKRENDERENGINE_H_
 
#endif

libs/renderengine/tests/RenderEngineTest.cpp

+0 −9
Original line number Diff line number Diff line
@@ -112,7 +112,6 @@ public: 
    virtual bool useColorManagement() const = 0;

};



#ifdef RE_SKIAVK

class SkiaVkRenderEngineFactory : public RenderEngineFactory {

public:

    std::string name() override { return "SkiaVkRenderEngineFactory"; }
@@ -153,8 +152,6 @@ class SkiaVkCMRenderEngineFactory : public SkiaVkRenderEngineFactory { 
public:

    bool useColorManagement() const override { return true; }

};

#endif // RE_SKIAVK



class SkiaGLESRenderEngineFactory : public RenderEngineFactory {

public:

    std::string name() override { return "SkiaGLRenderEngineFactory"; }
@@ -1560,17 +1557,11 @@ void RenderEngineTest::tonemap(ui::Dataspace sourceDataspace, std::function<vec3 
    expectBufferColor(Rect(kGreyLevels, 1), generator, 2);

}



#ifdef RE_SKIAVK

INSTANTIATE_TEST_SUITE_P(PerRenderEngineType, RenderEngineTest,

                         testing::Values(std::make_shared<SkiaGLESRenderEngineFactory>(),

                                         std::make_shared<SkiaGLESCMRenderEngineFactory>(),

                                         std::make_shared<SkiaVkRenderEngineFactory>(),

                                         std::make_shared<SkiaVkCMRenderEngineFactory>()));

#else  // RE_SKIAVK

INSTANTIATE_TEST_SUITE_P(PerRenderEngineType, RenderEngineTest,

                         testing::Values(std::make_shared<SkiaGLESRenderEngineFactory>(),

                                         std::make_shared<SkiaGLESCMRenderEngineFactory>()));

#endif // RE_SKIAVK



TEST_P(RenderEngineTest, drawLayers_noLayersToDraw) {

    if (!GetParam()->typeSupported()) {