Skip to content

Commit

Permalink
Revert "Reland "Use OzoneBacking on ChromeOS Ash""
Browse files Browse the repository at this point in the history
This reverts commit 40007b1.

Reason for revert: Breaks WebGL 2 tests on Kevin crbug.com/1327044

Original change's description:
> Reland "Use OzoneBacking on ChromeOS Ash"
>
> This is a reland of commit f539d7c
>
> Original change did not check for fence null checks properly when passed
> to SharedImageBackingOzone::EndAccess. That has been fixed.
>
> Fix CL - https://chromium-review.googlesource.com/c/chromium/src/+/3616662
>
> Original change's description:
> > Use OzoneBacking on ChromeOS Ash
> >
> > Use OzoneBacking for ChromeOS Ash and remove the interop checks from
> > SharedImageBackingFactoryOzone::IsSupported.
> >
> > Currently, ChromeOS Ash also uses Canvas2D feature which does concurrent read/writes for which Ozone support has not been added. In this case, GLImageBacking will be used but the concurrent read/write support should be added to Ozone as well.
> >
> > Bug: 1241537
> > Change-Id: I4c9a5e60ba9c1ea28151cb4b89565c2a7fa0fe0d
> > Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3613749
> > Reviewed-by: Vasiliy Telezhnikov <vasilyt@chromium.org>
> > Commit-Queue: Saifuddin Hitawala <hitawala@chromium.org>
> > Cr-Commit-Position: refs/heads/main@{#997326}
>
> Bug: 1241537
> Change-Id: Ic6474bf9e64c1c5bb07c279a352929e1521c34f6
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3621677
> Commit-Queue: Saifuddin Hitawala <hitawala@chromium.org>
> Reviewed-by: Vasiliy Telezhnikov <vasilyt@chromium.org>
> Cr-Commit-Position: refs/heads/main@{#998832}

(cherry picked from commit 1ff5153)

Bug: 1241537, 1327044
Change-Id: Id924539772a6d8c70b96f9f213f63d3b29d71807
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3655883
Commit-Queue: Brian Sheedy <bsheedy@chromium.org>
Reviewed-by: Zhenyao Mo <zmo@chromium.org>
Reviewed-by: Saifuddin Hitawala <hitawala@chromium.org>
Auto-Submit: Brian Sheedy <bsheedy@chromium.org>
Commit-Queue: Zhenyao Mo <zmo@chromium.org>
Cr-Original-Commit-Position: refs/heads/main@{#1005889}
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3670128
Reviewed-by: Vasiliy Telezhnikov <vasilyt@chromium.org>
Commit-Queue: Brian Norris <briannorris@chromium.org>
Cr-Commit-Position: refs/branch-heads/5060@{#420}
Cr-Branched-From: b83393d-refs/heads/main@{#1002911}
  • Loading branch information
Brian Sheedy authored and Chromium LUCI CQ committed May 31, 2022
1 parent d42296d commit 70a639d
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 3 deletions.
10 changes: 10 additions & 0 deletions gpu/command_buffer/service/shared_image_backing_factory_ozone.cc
Original file line number Diff line number Diff line change
Expand Up @@ -237,6 +237,16 @@ bool SharedImageBackingFactoryOzone::IsSupported(
!gl::GLSurfaceEGL::GetGLDisplayEGL()->HasEGLExtension("EGL_KHR_image")) {
return false;
}
#else
// TODO(hitawala): Until SharedImageBackingOzone supports all use cases prefer
// using SharedImageBackingGLImage instead
bool needs_interop_factory = (gr_context_type == GrContextType::kVulkan &&
(usage & SHARED_IMAGE_USAGE_DISPLAY)) ||
(usage & SHARED_IMAGE_USAGE_WEBGPU) ||
(usage & SHARED_IMAGE_USAGE_VIDEO_DECODE);
if (!needs_interop_factory) {
return false;
}
#endif

*allow_legacy_mailbox = false;
Expand Down
9 changes: 6 additions & 3 deletions gpu/command_buffer/service/shared_image_factory.cc
Original file line number Diff line number Diff line change
Expand Up @@ -412,9 +412,12 @@ SharedImageFactory::SharedImageFactory(
}
vulkan_context_provider_ = context_state->vk_context_provider();
#elif BUILDFLAG(IS_CHROMEOS_ASH)
auto ozone_factory =
std::make_unique<SharedImageBackingFactoryOzone>(context_state);
factories_.push_back(std::move(ozone_factory));
if (gpu_preferences.enable_webgpu ||
gr_context_type_ == GrContextType::kVulkan) {
auto ozone_factory =
std::make_unique<SharedImageBackingFactoryOzone>(context_state);
factories_.push_back(std::move(ozone_factory));
}
#endif // BUILDFLAG(IS_CHROMEOS_ASH)
#endif // defined(USE_OZONE)

Expand Down

0 comments on commit 70a639d

Please sign in to comment.