[//ash] Remove killswitch gating CameraVideoFrameHandler SCANOUT usage
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: I6bd62a2e79c79c70edb1a663ef1d7e2b4cf18685 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/6268490 Commit-Queue: Colin Blundell <blundell@chromium.org> Reviewed-by: Vasiliy Telezhnikov <vasilyt@chromium.org> Cr-Commit-Position: refs/heads/main@{#1420988}
This commit is contained in:

committed by
Chromium LUCI CQ

parent
012f615034
commit
d0b2220e83
components/capture_mode
gpu
command_buffer
service
shared_image
config
@ -311,19 +311,8 @@ class GpuMemoryBufferHandleHolder : public BufferHandleHolder,
|
||||
gpu::SHARED_IMAGE_USAGE_RASTER_READ |
|
||||
gpu::SHARED_IMAGE_USAGE_DISPLAY_READ;
|
||||
|
||||
bool add_scanout_usage = true;
|
||||
|
||||
// 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::
|
||||
kCameraVideoFrameHandlerAddScanoutUsageOnlyIfSupportedBySharedImage)) {
|
||||
add_scanout_usage &= shared_image_interface->GetCapabilities()
|
||||
.supports_scanout_shared_images;
|
||||
}
|
||||
|
||||
if (add_scanout_usage) {
|
||||
if (shared_image_interface->GetCapabilities()
|
||||
.supports_scanout_shared_images) {
|
||||
shared_image_usage |= gpu::SHARED_IMAGE_USAGE_SCANOUT;
|
||||
}
|
||||
|
||||
|
@ -33,11 +33,6 @@ bool SupportScanout() {
|
||||
// If any of the below clients are not guarding their addition of SCANOUT
|
||||
// usage by SCANOUT support being present in SharedImageCapabilities, then
|
||||
// GLTextureImageBacking *must* accept SCANOUT usage for this use case.
|
||||
if (!base::FeatureList::IsEnabled(
|
||||
features::
|
||||
kCameraVideoFrameHandlerAddScanoutUsageOnlyIfSupportedBySharedImage)) {
|
||||
return true;
|
||||
}
|
||||
if (!base::FeatureList::IsEnabled(
|
||||
features::kExoBufferAddScanoutUsageOnlyIfSupportedBySharedImage)) {
|
||||
return true;
|
||||
|
@ -408,10 +408,6 @@ BASE_FEATURE(kSkiaGraphiteDawnUseD3D12,
|
||||
BASE_FEATURE(kExoBufferAddScanoutUsageOnlyIfSupportedBySharedImage,
|
||||
"ExoBufferAddScanoutUsageOnlyIfSupportedBySharedImage",
|
||||
base::FEATURE_ENABLED_BY_DEFAULT);
|
||||
BASE_FEATURE(
|
||||
kCameraVideoFrameHandlerAddScanoutUsageOnlyIfSupportedBySharedImage,
|
||||
"CameraVideoFrameHandlerAddScanoutUsageOnlyIfSupportedBySharedImage",
|
||||
base::FEATURE_ENABLED_BY_DEFAULT);
|
||||
BASE_FEATURE(kFastInkHostAddScanoutUsageOnlyIfSupportedBySharedImage,
|
||||
"FastInkHostAddScanoutUsageOnlyIfSupportedBySharedImage",
|
||||
base::FEATURE_ENABLED_BY_DEFAULT);
|
||||
|
@ -78,8 +78,6 @@ GPU_EXPORT extern const base::FeatureParam<bool>
|
||||
GPU_EXPORT BASE_DECLARE_FEATURE(kSkiaGraphiteDawnUseD3D12);
|
||||
#endif
|
||||
|
||||
GPU_EXPORT BASE_DECLARE_FEATURE(
|
||||
kCameraVideoFrameHandlerAddScanoutUsageOnlyIfSupportedBySharedImage);
|
||||
GPU_EXPORT BASE_DECLARE_FEATURE(
|
||||
kExoBufferAddScanoutUsageOnlyIfSupportedBySharedImage);
|
||||
GPU_EXPORT BASE_DECLARE_FEATURE(
|
||||
|
Reference in New Issue
Block a user