Skip to content

Commit b555511

Browse files
authored
fix[x11]: crash in gpu process with software compositor (microsoft#215954)
* fix[x11]: crash in gpu process with software compositor * chore: bump distro
1 parent 40c845e commit b555511

File tree

4 files changed

+8
-5
lines changed

4 files changed

+8
-5
lines changed

.yarnrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
disturl "https://electronjs.org/headers"
22
target "29.4.0"
3-
ms_build_id "9593362"
3+
ms_build_id "9728852"
44
runtime "electron"
55
build_from_source "true"

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "code-oss-dev",
33
"version": "1.90.2",
4-
"distro": "4729d9dae7d87c18fbe0614f875a60672e2b8603",
4+
"distro": "337309ecc166d98d0bce49869ee0cf7713ded698",
55
"author": {
66
"name": "Microsoft Corporation"
77
},

resources/linux/snap/electron-launch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -261,4 +261,4 @@ fi
261261

262262
wait_for_async_execs
263263

264-
exec "$@" "--no-sandbox" "--use-gl=angle" "--use-angle=swiftshader"
264+
exec "$@"

resources/linux/snap/snapcraft.yaml

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,15 +30,18 @@ parts:
3030
- libcurl3-gnutls
3131
- libcurl3-nss
3232
- libcurl4
33+
- libegl1
3334
- libdrm2
3435
- libgbm1
3536
- libgl1
37+
- libgles2
3638
- libglib2.0-0
3739
- libgtk-3-0
3840
- libibus-1.0-5
3941
- libnss3
4042
- libpango-1.0-0
4143
- libsecret-1-0
44+
- libwayland-egl1
4245
- libxcomposite1
4346
- libxdamage1
4447
- libxfixes3
@@ -74,8 +77,8 @@ parts:
7477
7578
apps:
7679
@@NAME@@:
77-
command: electron-launch $SNAP/usr/share/@@NAME@@/bin/@@NAME@@
80+
command: electron-launch $SNAP/usr/share/@@NAME@@/bin/@@NAME@@ --no-sandbox
7881
common-id: @@NAME@@.desktop
7982

8083
url-handler:
81-
command: electron-launch $SNAP/usr/share/@@NAME@@/bin/@@NAME@@ --open-url
84+
command: electron-launch $SNAP/usr/share/@@NAME@@/bin/@@NAME@@ --open-url --no-sandbox

0 commit comments

Comments
 (0)