mirror of
https://github.com/electron/electron.git
synced 2026-05-02 03:00:22 -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>
33 lines
1.4 KiB
Diff
33 lines
1.4 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Geoff Lang <geofflang@chromium.org>
|
|
Date: Thu, 6 Mar 2025 19:39:37 -0800
|
|
Subject: Disable setting primtive restart for WebGL in the cmd decoder.
|
|
|
|
Until it's blocked in ANGLE for WebGL contexts, disable it in the
|
|
command decoder on the service side.
|
|
|
|
Bug: 401059730
|
|
Change-Id: Ia9c7d951cbd122454afec2f884968e0a709cee77
|
|
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/6334632
|
|
Reviewed-by: Shahbaz Youssefi <syoussefi@chromium.org>
|
|
Reviewed-by: Kenneth Russell <kbr@chromium.org>
|
|
Commit-Queue: Kenneth Russell <kbr@chromium.org>
|
|
Cr-Commit-Position: refs/heads/main@{#1429307}
|
|
|
|
diff --git a/gpu/command_buffer/service/gles2_cmd_decoder_passthrough.cc b/gpu/command_buffer/service/gles2_cmd_decoder_passthrough.cc
|
|
index 54310b8878fa7aeca45e6001cb884a794272138c..2cb2a3b4913a54373b84cebf9326ee09a98f6bcc 100644
|
|
--- a/gpu/command_buffer/service/gles2_cmd_decoder_passthrough.cc
|
|
+++ b/gpu/command_buffer/service/gles2_cmd_decoder_passthrough.cc
|
|
@@ -2160,6 +2160,11 @@ bool GLES2DecoderPassthroughImpl::IsIgnoredCap(GLenum cap) const {
|
|
case GL_DEBUG_OUTPUT:
|
|
return true;
|
|
|
|
+ case GL_PRIMITIVE_RESTART_FIXED_INDEX:
|
|
+ // Disable setting primitive restart at the command decoder level until
|
|
+ // it's blocked in ANGLE for WebGL contexts.
|
|
+ return feature_info_->IsWebGLContext();
|
|
+
|
|
default:
|
|
return false;
|
|
}
|