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

Commit 39f40018 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Flag removal: calc_workload_orig_deadline" into main

parents b5a1f75b 09e7d6f1

libs/hwui/Properties.cpp

+0 −9
Original line number Diff line number Diff line
@@ -54,9 +54,6 @@ constexpr bool resample_gainmap_regions() { 
constexpr bool early_preload_gl_context() {

    return false;

}

constexpr bool calc_workload_orig_deadline() {

    return false;

}

}  // namespace hwui_flags

#endif // __linux__
@@ -297,11 +294,5 @@ bool Properties::earlyPreloadGlContext() { 
    return base::GetBoolProperty(PROPERTY_EARLY_PRELOAD_GL_CONTEXT,

                                 hwui_flags::early_preload_gl_context());

}



bool Properties::calcWorkloadOrigDeadline() {

    static bool sCalcWorkloadOrigDeadline = base::GetBoolProperty(

            "debug.hwui.calc_workload_orig_deadline", hwui_flags::calc_workload_orig_deadline());

    return sCalcWorkloadOrigDeadline;

}

}  // namespace uirenderer

}  // namespace android

libs/hwui/Properties.h

+0 −1
Original line number Diff line number Diff line
@@ -398,7 +398,6 @@ public: 
    static bool initializeGlAlways();

    static bool resampleGainmapRegions();

    static bool earlyPreloadGlContext();

    static bool calcWorkloadOrigDeadline();



private:

    static StretchEffectBehavior stretchEffectBehavior;

libs/hwui/aconfig/hwui_flags.aconfig

+0 −11
Original line number Diff line number Diff line
@@ -177,17 +177,6 @@ flag { 
  bug: "383612849"

}



flag {

  name: "calc_workload_orig_deadline"

  namespace: "window_surfaces"

  description: "Use original frame deadline to calculate the workload target deadline for jank tracking"

  bug: "389939827"

  is_fixed_read_only: true

  metadata {

    purpose: PURPOSE_BUGFIX

  }

}



flag {

  name: "early_preinit_buffer_allocator"

  namespace: "core_graphics"

libs/hwui/renderthread/CanvasContext.cpp

+2 −7
Original line number Diff line number Diff line
@@ -816,13 +816,8 @@ void CanvasContext::draw(bool solelyTextureViewUpdates) { 
    int64_t frameDeadline = mCurrentFrameInfo->get(FrameInfoIndex::FrameDeadline);

    int64_t dequeueBufferDuration = mCurrentFrameInfo->get(FrameInfoIndex::DequeueBufferDuration);



    if (Properties::calcWorkloadOrigDeadline()) {

        // Uses the unmodified frame deadline in calculating workload target duration

    mHintSessionWrapper->updateTargetWorkDuration(

            mCurrentFrameInfo->get(FrameInfoIndex::WorkloadTarget));

    } else {

        mHintSessionWrapper->updateTargetWorkDuration(frameDeadline - intendedVsync);

    }



    if (didDraw) {

        int64_t frameStartTime = mCurrentFrameInfo->get(FrameInfoIndex::FrameStartTime);