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

Commit 6e62b812 authored by Ady Abraham's avatar Ady Abraham Committed by Android (Google) Code Review
Browse files

Merge "SF: remove usage of eVsyncSourceSurfaceFlinger" into main

parents d7d989ad b334758f

services/surfaceflinger/SurfaceFlinger.cpp

+10 −3
Original line number Diff line number Diff line
@@ -2073,10 +2073,17 @@ status_t SurfaceFlinger::getDisplayDecorationSupport( 
sp<IDisplayEventConnection> SurfaceFlinger::createDisplayEventConnection(

        gui::ISurfaceComposer::VsyncSource vsyncSource, EventRegistrationFlags eventRegistration,

        const sp<IBinder>& layerHandle) {

    const auto cycle = vsyncSource == gui::ISurfaceComposer::VsyncSource::eVsyncSourceSurfaceFlinger

    const auto cycle = [&] {

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

            ALOGW_IF(vsyncSource == gui::ISurfaceComposer::VsyncSource::eVsyncSourceSurfaceFlinger,

                "requested unsupported config eVsyncSourceSurfaceFlinger");

            return scheduler::Cycle::Render;

        }



        return vsyncSource == gui::ISurfaceComposer::VsyncSource::eVsyncSourceSurfaceFlinger

              ? scheduler::Cycle::LastComposite

              : scheduler::Cycle::Render;



    }();

    return mScheduler->createDisplayEventConnection(cycle, eventRegistration, layerHandle);

}

services/surfaceflinger/common/FlagManager.cpp

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

    DUMP_READ_ONLY_FLAG(graphite_renderengine);

    DUMP_READ_ONLY_FLAG(latch_unsignaled_with_auto_refresh_changed);

    DUMP_READ_ONLY_FLAG(deprecate_vsync_sf);



#undef DUMP_READ_ONLY_FLAG

#undef DUMP_SERVER_FLAG
@@ -232,6 +233,7 @@ FLAG_MANAGER_READ_ONLY_FLAG(protected_if_client, "") 
FLAG_MANAGER_READ_ONLY_FLAG(ce_fence_promise, "");

FLAG_MANAGER_READ_ONLY_FLAG(graphite_renderengine, "debug.renderengine.graphite")

FLAG_MANAGER_READ_ONLY_FLAG(latch_unsignaled_with_auto_refresh_changed, "");

FLAG_MANAGER_READ_ONLY_FLAG(deprecate_vsync_sf, "");



/// Trunk stable server flags ///

FLAG_MANAGER_SERVER_FLAG(refresh_rate_overlay_on_external_display, "")

services/surfaceflinger/common/include/common/FlagManager.h

+1 −0
Original line number Diff line number Diff line
@@ -79,6 +79,7 @@ public: 
    bool idle_screen_refresh_rate_timeout() const;

    bool graphite_renderengine() const;

    bool latch_unsignaled_with_auto_refresh_changed() const;

    bool deprecate_vsync_sf() const;



protected:

    // overridden for unit tests

services/surfaceflinger/surfaceflinger_flags_new.aconfig

+11 −0
Original line number Diff line number Diff line
@@ -21,6 +21,17 @@ flag { 
  }

 } # ce_fence_promise



 flag {

  name: "deprecate_vsync_sf"

  namespace: "core_graphics"

  description: "Depracate eVsyncSourceSurfaceFlinger and use vsync_app everywhere"

  bug: "162235855"

  is_fixed_read_only: true

  metadata {

    purpose: PURPOSE_BUGFIX

  }

} # deprecate_vsync_sf



flag {

  name: "frame_rate_category_mrr"

  namespace: "core_graphics"