chromium/src
0
Fork 0
Code Activity

[//ash] Remove ViewTreeHostAddScanoutUsageOnlyIfSupportedBySharedImage

Browse Source 
This killswitch shipped default-on in 132 [1], and there have been no
reports of any problems.

[1] https://chromiumdash.appspot.com/commit/6c1ee2b18a108010841179901ebea93e202a3be6

Bug: 330865436
Change-Id: Iefc5bcba67db4874da7f1a29fae16168f7f46917
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/6275945
Reviewed-by: Kentaro Hara <haraken@chromium.org>
Commit-Queue: Colin Blundell <blundell@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1421255}
This commit is contained in:
Colin Blundell
2025-02-17 23:47:40 -08:00
committed by Chromium LUCI CQ
parent ff7f871106
commit d8adb55459
4 changed files with 2 additions and 21 deletions

14
ash/fast_ink/view_tree_host_root_view_frame_factory.cc

@ -19,7 +19,6 @@
#include "gpu/command_buffer/client/shared_image_interface.h" #include "gpu/command_buffer/client/shared_image_interface.h"
#include "gpu/command_buffer/common/shared_image_capabilities.h" #include "gpu/command_buffer/common/shared_image_capabilities.h"
#include "gpu/command_buffer/common/shared_image_usage.h" #include "gpu/command_buffer/common/shared_image_usage.h"
#include "gpu/config/gpu_finch_features.h"
#include "ui/aura/env.h" #include "ui/aura/env.h"
#include "ui/aura/window_tree_host.h" #include "ui/aura/window_tree_host.h"
#include "ui/compositor/compositor.h" #include "ui/compositor/compositor.h"
@ -82,17 +81,8 @@ ViewTreeHostRootViewFrameFactory::CreateUiResource(
gpu::SharedImageUsageSet usage = gpu::SHARED_IMAGE_USAGE_DISPLAY_READ; gpu::SharedImageUsageSet usage = gpu::SHARED_IMAGE_USAGE_DISPLAY_READ;
bool add_scanout_usage = is_overlay_candidate; if (is_overlay_candidate &&
sii->GetCapabilities().supports_scanout_shared_images) {
// Scanout usage should be added only if scanout of SharedImages is supported.
// However, historically this was not checked.
// TODO(crbug.com/330865436): Remove killswitch post-safe rollout.
if (base::FeatureList::IsEnabled(
features::kViewTreeHostAddScanoutUsageOnlyIfSupportedBySharedImage)) {
add_scanout_usage &= sii->GetCapabilities().supports_scanout_shared_images;
}
if (add_scanout_usage) {
usage |= gpu::SHARED_IMAGE_USAGE_SCANOUT; usage |= gpu::SHARED_IMAGE_USAGE_SCANOUT;
} }

4
gpu/command_buffer/service/shared_image/gl_texture_image_backing_factory.cc

@ -42,10 +42,6 @@ bool SupportScanout() {
kRoundedDisplayAddScanoutUsageOnlyIfSupportedBySharedImage)) { kRoundedDisplayAddScanoutUsageOnlyIfSupportedBySharedImage)) {
return true; return true;
} }
if (!base::FeatureList::IsEnabled(
features::kViewTreeHostAddScanoutUsageOnlyIfSupportedBySharedImage)) {
return true;
}
return base::FeatureList::IsEnabled(kSupportScanoutInGLTextureImageBacking); return base::FeatureList::IsEnabled(kSupportScanoutInGLTextureImageBacking);
} }

3
gpu/config/gpu_finch_features.cc

@ -400,9 +400,6 @@ BASE_FEATURE(kFastInkHostAddScanoutUsageOnlyIfSupportedBySharedImage,
BASE_FEATURE(kRoundedDisplayAddScanoutUsageOnlyIfSupportedBySharedImage, BASE_FEATURE(kRoundedDisplayAddScanoutUsageOnlyIfSupportedBySharedImage,
"RoundedDisplayAddScanoutUsageOnlyIfSupportedBySharedImage", "RoundedDisplayAddScanoutUsageOnlyIfSupportedBySharedImage",
base::FEATURE_ENABLED_BY_DEFAULT); base::FEATURE_ENABLED_BY_DEFAULT);
BASE_FEATURE(kViewTreeHostAddScanoutUsageOnlyIfSupportedBySharedImage,
"ViewTreeHostAddScanoutUsageOnlyIfSupportedBySharedImage",
base::FEATURE_ENABLED_BY_DEFAULT);
// Enable persistent storage of VkPipelineCache data. // Enable persistent storage of VkPipelineCache data.
BASE_FEATURE(kEnableVkPipelineCache, BASE_FEATURE(kEnableVkPipelineCache,

2
gpu/config/gpu_finch_features.h

@ -77,8 +77,6 @@ GPU_EXPORT BASE_DECLARE_FEATURE(
kFastInkHostAddScanoutUsageOnlyIfSupportedBySharedImage); kFastInkHostAddScanoutUsageOnlyIfSupportedBySharedImage);
GPU_EXPORT BASE_DECLARE_FEATURE( GPU_EXPORT BASE_DECLARE_FEATURE(
kRoundedDisplayAddScanoutUsageOnlyIfSupportedBySharedImage); kRoundedDisplayAddScanoutUsageOnlyIfSupportedBySharedImage);
GPU_EXPORT BASE_DECLARE_FEATURE(
kViewTreeHostAddScanoutUsageOnlyIfSupportedBySharedImage);
GPU_EXPORT BASE_DECLARE_FEATURE(kConditionallySkipGpuChannelFlush); GPU_EXPORT BASE_DECLARE_FEATURE(kConditionallySkipGpuChannelFlush);