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

Commit 26201ec2 authored by Leon Scroggins's avatar Leon Scroggins Committed by Android (Google) Code Review
Browse files

Merge "Use a flag to determine isRenderable" into main

parents 08e7fe6b df8166e6

libs/renderengine/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -48,6 +48,7 @@ cc_defaults { 
    static_libs: [

        "libshaders",

        "libtonemap",

        "libsurfaceflinger_common",

    ],

    local_include_dirs: ["include"],

    export_include_dirs: ["include"],

libs/renderengine/benchmark/Android.bp

+2 −0
Original line number Diff line number Diff line
@@ -37,6 +37,7 @@ cc_benchmark { 
    static_libs: [

        "librenderengine",

        "libshaders",

        "libsurfaceflinger_common",

        "libtonemap",

    ],

    cflags: [
@@ -54,6 +55,7 @@ cc_benchmark { 
        "libsync",

        "libui",

        "libutils",

        "server_configurable_flags",

    ],



    data: ["resources/*"],

libs/renderengine/skia/SkiaRenderEngine.cpp

+4 −0
Original line number Diff line number Diff line
@@ -53,6 +53,7 @@ 
#include <SkSurface.h>

#include <SkTileMode.h>

#include <android-base/stringprintf.h>

#include <common/FlagManager.h>

#include <gui/FenceMonitor.h>

#include <gui/TraceUtils.h>

#include <include/gpu/ganesh/SkSurfaceGanesh.h>
@@ -419,6 +420,9 @@ void SkiaRenderEngine::mapExternalTextureBuffer(const sp<GraphicBuffer>& buffer, 
    mGraphicBufferExternalRefs[buffer->getId()]++;



    if (const auto& iter = cache.find(buffer->getId()); iter == cache.end()) {

        if (FlagManager::getInstance().renderable_buffer_usage()) {

            isRenderable = buffer->getUsage() & GRALLOC_USAGE_HW_RENDER;

        }

        std::shared_ptr<AutoBackendTexture::LocalRef> imageTextureRef =

                std::make_shared<AutoBackendTexture::LocalRef>(grContext,

                                                               buffer->toAHardwareBuffer(),

libs/renderengine/tests/Android.bp

+2 −0
Original line number Diff line number Diff line
@@ -44,6 +44,7 @@ cc_test { 
        "librenderengine_mocks",

        "libshaders",

        "libtonemap",

        "libsurfaceflinger_common",

    ],

    header_libs: [

        "libtonemap_headers",
@@ -61,5 +62,6 @@ cc_test { 
        "libsync",

        "libui",

        "libutils",

        "server_configurable_flags",

    ],

}

services/surfaceflinger/common/FlagManager.cpp

+2 −0
Original line number Diff line number Diff line
@@ -130,6 +130,7 @@ void FlagManager::dump(std::string& result) const { 
    DUMP_READ_ONLY_FLAG(enable_layer_command_batching);

    DUMP_READ_ONLY_FLAG(screenshot_fence_preservation);

    DUMP_READ_ONLY_FLAG(vulkan_renderengine);

    DUMP_READ_ONLY_FLAG(renderable_buffer_usage);

#undef DUMP_READ_ONLY_FLAG

#undef DUMP_SERVER_FLAG

#undef DUMP_FLAG_INTERVAL
@@ -206,6 +207,7 @@ FLAG_MANAGER_READ_ONLY_FLAG(game_default_frame_rate, "") 
FLAG_MANAGER_READ_ONLY_FLAG(enable_layer_command_batching, "")

FLAG_MANAGER_READ_ONLY_FLAG(screenshot_fence_preservation, "debug.sf.screenshot_fence_preservation")

FLAG_MANAGER_READ_ONLY_FLAG(vulkan_renderengine, "debug.renderengine.vulkan")

FLAG_MANAGER_READ_ONLY_FLAG(renderable_buffer_usage, "")



/// Trunk stable server flags ///

FLAG_MANAGER_SERVER_FLAG(late_boot_misc2, "")