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

Commit 99204942 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Remove VrFlinger usages from SF." am: 63e04c85

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia5d3535f059ab132103261e686e297c9877dd091
parents 1e86b8a6 63e04c85
Loading
Loading
Loading
Loading
+0 −21
Original line number Diff line number Diff line
@@ -20,7 +20,6 @@ cc_defaults {
        "-DEGL_EGLEXT_PROTOTYPES",
    ],
    shared_libs: [
        "android.frameworks.vr.composer@2.0",
        "android.hardware.configstore-utils",
        "android.hardware.configstore@1.0",
        "android.hardware.configstore@1.1",
@@ -58,21 +57,12 @@ cc_defaults {
        "libutils",
        "libSurfaceFlingerProp",
    ],
    // VrComposer is not used when building surfaceflinger for vendors
    target: {
        vendor: {
            exclude_shared_libs: [
                "android.frameworks.vr.composer@2.0",
            ],
        },
    },
    static_libs: [
        "libcompositionengine",
        "libperfetto_client_experimental",
        "librenderengine",
        "libserviceutils",
        "libtrace_proto",
        "libvrflinger",
    ],
    header_libs: [
        "android.hardware.graphics.composer@2.1-command-buffer",
@@ -198,17 +188,6 @@ cc_library_shared {
        // can be easily replaced.
        "SurfaceFlingerFactory.cpp",
    ],
    cflags: [
        "-DUSE_VR_COMPOSER=1",
    ],
    // VrComposer is not used when building surfaceflinger for vendors
    target: {
        vendor: {
            cflags: [
                "-DUSE_VR_COMPOSER=0",
            ],
        },
    },
    logtags: ["EventLog/EventLogTags.logtags"],
}

+0 −1
Original line number Diff line number Diff line
@@ -6,7 +6,6 @@ cc_defaults {
        "-DATRACE_TAG=ATRACE_TAG_GRAPHICS",
    ],
    shared_libs: [
        "android.frameworks.vr.composer@2.0",
        "android.hardware.graphics.allocator@2.0",
        "android.hardware.graphics.composer@2.1",
        "android.hardware.graphics.composer@2.2",
+0 −10
Original line number Diff line number Diff line
@@ -130,16 +130,6 @@ struct LayerFECompositionState {
    Rect geomContentCrop;
    Rect geomCrop;

    /*
     * Extra metadata
     */

    // The type for this layer
    int type{0};

    // The appId for this layer
    int appId{0};

    GenericLayerMetadataMap metadata;

    /*
+0 −4
Original line number Diff line number Diff line
@@ -75,10 +75,6 @@ void LayerFECompositionState::dump(std::string& out) const {
    dumpVal(out, "alpha", alpha);
    dumpVal(out, "backgroundBlurRadius", backgroundBlurRadius);

    out.append("\n      ");
    dumpVal(out, "type", type);
    dumpVal(out, "appId", appId);

    if (!metadata.empty()) {
        out.append("\n      metadata {");
        for (const auto& [key, entry] : metadata) {
+0 −7
Original line number Diff line number Diff line
@@ -402,13 +402,6 @@ void OutputLayer::writeOutputIndependentGeometryStateToHWC(
              outputIndependentState.alpha, to_string(error).c_str(), static_cast<int32_t>(error));
    }

    if (auto error = hwcLayer->setInfo(static_cast<uint32_t>(outputIndependentState.type),
                                       static_cast<uint32_t>(outputIndependentState.appId));
        error != hal::Error::NONE) {
        ALOGE("[%s] Failed to set info %s (%d)", getLayerFE().getDebugName(),
              to_string(error).c_str(), static_cast<int32_t>(error));
    }

    for (const auto& [name, entry] : outputIndependentState.metadata) {
        if (auto error = hwcLayer->setLayerGenericMetadata(name, entry.mandatory, entry.value);
            error != hal::Error::NONE) {
Loading