github/electron
1
1
Fork 0
mirror of https://github.com/electron/electron.git synced 2026-04-10 03:01:51 -04:00
Code Issues Packages Projects Releases Wiki Activity

chore: cherry-pick 5487040a284a from chromium (#30203)

Browse Source
This commit is contained in:
Jeremy Rose
2021-07-22 10:14:14 -07:00
committed by GitHub
parent 30b6330189
commit 64c6737bb2
2 changed files with 61 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
patches/chromium/.patches
View File

@@ -117,4 +117,5 @@ make_keychain_service_account_optionally_configurable_at_runtime.patch
don_t_run_pcscan_notifythreadcreated_if_pcscan_is_disabled.patch
cherry-pick-cc20b36a5845.patch
set_svgimage_page_after_document_install.patch
cherry-pick-5487040a284a.patch
cherry-pick-e60cc80ff744.patch

60
patches/chromium/cherry-pick-5487040a284a.patch Normal file
View File

@@ -0,0 +1,60 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Dale Curtis <dalecurtis@chromium.org>
Date: Mon, 12 Jul 2021 19:29:39 +0000
Subject: Don't TexImage via GPU when OOP raster is disabled on Windows.
For some reason it's much slower than the the non-GPU based path. The
test page https://koush.github.io/webcodecs/ goes from ~270fps decoding
and ~5fps rendering to ~300fps decoding and >> 60fps rendering when
running with --disable-oop-rasterization.
R=kbr
Bug: 1227921
Change-Id: I1abbcfd5c4a515540753c8c5e681949f6f236c9c
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3018801
Commit-Queue: Dale Curtis <dalecurtis@chromium.org>
Reviewed-by: Kenneth Russell <kbr@chromium.org>
Cr-Commit-Position: refs/heads/master@{#900587}
diff --git a/third_party/blink/renderer/modules/webgl/webgl_rendering_context_base.cc b/third_party/blink/renderer/modules/webgl/webgl_rendering_context_base.cc
index 31a22fa48c001a07d1b848c107d22c7d1342c2a6..f70dd9b9d0eb405736e8830feb9cb32bbdb5af4a 100644
--- a/third_party/blink/renderer/modules/webgl/webgl_rendering_context_base.cc
+++ b/third_party/blink/renderer/modules/webgl/webgl_rendering_context_base.cc
@@ -5955,6 +5955,14 @@ void WebGLRenderingContextBase::TexImageHelperMediaVideoFrame(
CanUseTexImageViaGPU(format, type) &&
transform == media::kNoTransformation;
+#if defined(OS_WIN)
+ // TODO(crbug.com/1227921): When OOP GPU rasterization is disabled, uploading
+ // via the GPU becomes extremely slow.
+ const bool gpu_teximage_is_slow = !caps.supports_oop_raster;
+#else
+ const bool gpu_teximage_is_slow = false;
+#endif
+
// Callers may chose to provide a renderer which ensures that generated
// intermediates will be cached across TexImage calls for the same frame.
std::unique_ptr<media::PaintCanvasVideoRenderer> local_video_renderer;
@@ -6000,7 +6008,7 @@ void WebGLRenderingContextBase::TexImageHelperMediaVideoFrame(
// TODO(crbug.com/1180879): I420A should be supported, but currently fails
// conformance/textures/misc/texture-video-transparent.html.
if (!media_video_frame->HasTextures() &&
- media::IsOpaque(media_video_frame->format()) &&
+ media::IsOpaque(media_video_frame->format()) && !gpu_teximage_is_slow &&
video_renderer->CopyVideoFrameYUVDataToGLTexture(
raster_context_provider, ContextGL(), media_video_frame, target,
texture->Object(), adjusted_internalformat, format, type, level,
@@ -6068,9 +6076,9 @@ void WebGLRenderingContextBase::TexImageHelperMediaVideoFrame(
function_id == kTexImage2D || function_id == kTexSubImage2D;
#endif
- const bool can_upload_via_gpu = function_supports_gpu_teximage &&
- CanUseTexImageViaGPU(format, type) &&
- source_image_rect_is_default;
+ const bool can_upload_via_gpu =
+ function_supports_gpu_teximage && CanUseTexImageViaGPU(format, type) &&
+ source_image_rect_is_default && !gpu_teximage_is_slow;
// If we can upload via GPU, try to to use an accelerated resource provider
// configured appropriately for video. Otherwise use the software cache.