mirror of
https://github.com/electron/electron.git
synced 2026-04-10 03:01:51 -04:00
165ea64314
* build: fail for out of date patches on forks Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com> * chore: update patches --------- Co-authored-by: trop[bot] <37223003+trop[bot]@users.noreply.github.com> Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com> Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org>
95 lines
4.9 KiB
Diff
95 lines
4.9 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Geoff Lang <geofflang@chromium.org>
|
|
Date: Thu, 6 Mar 2025 16:02:41 -0800
|
|
Subject: Move WebGL primitive restart state setting to the GPU process.
|
|
|
|
ANGLE will validate and initialize this state and errors are generated
|
|
when the WebGL client also initializes it on startup.
|
|
|
|
Initialize it even in the passthrough command decoder temporarily so
|
|
that ANGLE can roll without breaking WebGL tests.
|
|
|
|
Bug: 401059730
|
|
Change-Id: I0bfee710673bbcea6f915ffc4fc9be20438a2654
|
|
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/6330188
|
|
Auto-Submit: Geoff Lang <geofflang@chromium.org>
|
|
Commit-Queue: Kenneth Russell <kbr@chromium.org>
|
|
Reviewed-by: Kenneth Russell <kbr@chromium.org>
|
|
Cr-Commit-Position: refs/heads/main@{#1429228}
|
|
|
|
diff --git a/gpu/command_buffer/service/gles2_cmd_decoder.cc b/gpu/command_buffer/service/gles2_cmd_decoder.cc
|
|
index 03a26a5f81dee1cd1bba28621c1ecd30ea709df8..60447a8e71e056db01515db8bc6c56048537870f 100644
|
|
--- a/gpu/command_buffer/service/gles2_cmd_decoder.cc
|
|
+++ b/gpu/command_buffer/service/gles2_cmd_decoder.cc
|
|
@@ -3285,6 +3285,13 @@ gpu::ContextResult GLES2DecoderImpl::Initialize(
|
|
}
|
|
}
|
|
|
|
+ if (feature_info_->context_type() == CONTEXT_TYPE_WEBGL2) {
|
|
+ // If WebGL 2, the PRIMITIVE_RESTART_FIXED_INDEX should be always enabled.
|
|
+ // See the section <Primitive Restart is Always Enabled> in WebGL 2 spec:
|
|
+ // https://www.khronos.org/registry/webgl/specs/latest/2.0/#4.1.4
|
|
+ DoEnable(GL_PRIMITIVE_RESTART_FIXED_INDEX);
|
|
+ }
|
|
+
|
|
if (group_->gpu_preferences().enable_gpu_driver_debug_logging &&
|
|
feature_info_->feature_flags().khr_debug) {
|
|
InitializeGLDebugLogging(true, GLDebugMessageCallback, &logger_);
|
|
diff --git a/gpu/command_buffer/service/gles2_cmd_decoder_passthrough.cc b/gpu/command_buffer/service/gles2_cmd_decoder_passthrough.cc
|
|
index 2cb2a3b4913a54373b84cebf9326ee09a98f6bcc..ee9ad4fa2838a22bc8b24185267a29687129f721 100644
|
|
--- a/gpu/command_buffer/service/gles2_cmd_decoder_passthrough.cc
|
|
+++ b/gpu/command_buffer/service/gles2_cmd_decoder_passthrough.cc
|
|
@@ -1065,6 +1065,17 @@ gpu::ContextResult GLES2DecoderPassthroughImpl::Initialize(
|
|
api()->glDisableFn(GL_TEXTURE_RECTANGLE_ANGLE);
|
|
#endif
|
|
|
|
+ // TEMPORARY: Set primitive restart to enabled by default for WebGL2. Clear
|
|
+ // errors afterwards so that when this state is initialized and validated in
|
|
+ // ANGLE, it will not generate errors during command buffer initialization.
|
|
+ if (feature_info_->context_type() == CONTEXT_TYPE_WEBGL2) {
|
|
+ // If WebGL 2, the PRIMITIVE_RESTART_FIXED_INDEX should be always enabled.
|
|
+ // See the section <Primitive Restart is Always Enabled> in WebGL 2 spec:
|
|
+ // https://www.khronos.org/registry/webgl/specs/latest/2.0/#4.1.4
|
|
+ api()->glEnableFn(GL_PRIMITIVE_RESTART_FIXED_INDEX);
|
|
+ CheckErrorCallbackState();
|
|
+ }
|
|
+
|
|
// Register this object as a GPU switching observer.
|
|
if (feature_info_->IsWebGLContext()) {
|
|
ui::GpuSwitchingManager::GetInstance()->AddObserver(this);
|
|
diff --git a/gpu/command_buffer/service/gles2_cmd_decoder_unittest_base.cc b/gpu/command_buffer/service/gles2_cmd_decoder_unittest_base.cc
|
|
index 1683b266f349d4b70ae2861cf4f05542380d8c44..0a0c1b3f6f9fe2caddf86602d2ae9978eff928f1 100644
|
|
--- a/gpu/command_buffer/service/gles2_cmd_decoder_unittest_base.cc
|
|
+++ b/gpu/command_buffer/service/gles2_cmd_decoder_unittest_base.cc
|
|
@@ -440,6 +440,13 @@ ContextResult GLES2DecoderTestBase::MaybeInitDecoderWithWorkarounds(
|
|
}
|
|
#endif
|
|
|
|
+ if (init.context_type == CONTEXT_TYPE_WEBGL2 &&
|
|
+ group_->feature_info()->gl_version_info().is_es3) {
|
|
+ EXPECT_CALL(*gl_, Enable(GL_PRIMITIVE_RESTART_FIXED_INDEX))
|
|
+ .Times(1)
|
|
+ .RetiresOnSaturation();
|
|
+ }
|
|
+
|
|
if (context_->HasRobustness()) {
|
|
EXPECT_CALL(*gl_, GetGraphicsResetStatusARB())
|
|
.WillOnce(Return(init.lose_context_on_init ? GL_GUILTY_CONTEXT_RESET_ARB
|
|
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 6057cf83454f0deabc1904cb5e87b306bda4e788..304f4c7beb87212c70e91770d494254da7ed24bf 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
|
|
@@ -1432,12 +1432,6 @@ void WebGLRenderingContextBase::InitializeNewContext() {
|
|
->GetCapabilities()
|
|
.mesa_framebuffer_flip_y;
|
|
|
|
- // If WebGL 2, the PRIMITIVE_RESTART_FIXED_INDEX should be always enabled.
|
|
- // See the section <Primitive Restart is Always Enabled> in WebGL 2 spec:
|
|
- // https://www.khronos.org/registry/webgl/specs/latest/2.0/#4.1.4
|
|
- if (IsWebGL2())
|
|
- ContextGL()->Enable(GL_PRIMITIVE_RESTART_FIXED_INDEX);
|
|
-
|
|
// This ensures that the context has a valid "lastFlushID" and won't be
|
|
// mistakenly identified as the "least recently used" context.
|
|
ContextGL()->Flush();
|