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

Commit 230233aa authored by Juston Li's avatar Juston Li Committed by Android (Google) Code Review
Browse files

Merge "hwui: remove query_global_priority flag" into main

parents a0a82c6c b2c7b30f

libs/hwui/Properties.cpp

+0 −5
Original line number Diff line number Diff line
@@ -51,9 +51,6 @@ constexpr bool resample_gainmap_regions() { 
    return false;

}



constexpr bool query_global_priority() {

    return false;

}

constexpr bool early_preload_gl_context() {

    return false;

}
@@ -119,7 +116,6 @@ float Properties::maxHdrHeadroomOn8bit = 5.f; // TODO: Refine this number 
bool Properties::clipSurfaceViews = false;

bool Properties::hdr10bitPlus = false;

bool Properties::skipTelemetry = false;

bool Properties::queryGlobalPriority = false;



int Properties::timeoutMultiplier = 1;
@@ -195,7 +191,6 @@ bool Properties::load() { 
    clipSurfaceViews =

            base::GetBoolProperty("debug.hwui.clip_surfaceviews", hwui_flags::clip_surfaceviews());

    hdr10bitPlus = hwui_flags::hdr_10bit_plus();

    queryGlobalPriority = hwui_flags::query_global_priority();



    timeoutMultiplier = android::base::GetIntProperty("ro.hw_timeout_multiplier", 1);

    skipTelemetry = base::GetBoolProperty(PROPERTY_SKIP_EGLMANAGER_TELEMETRY,

libs/hwui/Properties.h

+0 −1
Original line number Diff line number Diff line
@@ -347,7 +347,6 @@ public: 
    static bool clipSurfaceViews;

    static bool hdr10bitPlus;

    static bool skipTelemetry;

    static bool queryGlobalPriority;



    static int timeoutMultiplier;

libs/hwui/aconfig/hwui_flags.aconfig

+0 −10
Original line number Diff line number Diff line
@@ -144,16 +144,6 @@ flag { 
  bug: "299670828"

}



flag {

  name: "query_global_priority"

  namespace: "core_graphics"

  description: "Attempt to query whether the vulkan driver supports the requested global priority before queue creation."

  bug: "343986434"

  metadata {

    purpose: PURPOSE_BUGFIX

  }

}



flag {

  name: "bitmap_ashmem_long_name"

  namespace: "core_graphics"

libs/hwui/renderthread/VulkanManager.cpp

+1 −2
Original line number Diff line number Diff line
@@ -381,8 +381,7 @@ void VulkanManager::setupDevice(skgpu::VulkanExtensions& grExtensions, 


        // check if the requested priority is reported by the query

        bool attachGlobalPriority = false;

        if (uirenderer::Properties::queryGlobalPriority &&

            globalPriorityQueryFeatures->globalPriorityQuery) {

        if (globalPriorityQueryFeatures->globalPriorityQuery) {

            for (uint32_t i = 0; i < queuePriorityProps[mGraphicsQueueIndex].priorityCount; i++) {

                if (queuePriorityProps[mGraphicsQueueIndex].priorities[i] == globalPriority) {

                    attachGlobalPriority = true;