mirror of
https://github.com/electron/electron.git
synced 2026-04-10 03:01:51 -04:00
e1c17fd1e8
* chore: cherry-pick fbfb27470bf6 from chromium
* chore: update patches
* chore: cherry-pick bf6dd974238b from angle (#50437)
* fix: remove duplicate MaxGeometryUniformBlocks from angle cherry-pick patch
The angle cherry-pick added MaxGeometryUniformBlocks in new locations,
but it already existed in the EXT_geometry_shader section on 40-x-y,
causing a duplicate struct member build error in ShaderLang.h.
Re-exported the patch from the angle repo to correctly generate context
lines instead of additions for fields that already exist in the base.
Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
* fix: guard validatePerStageMaxUniformBlocks with ANGLE_SH_VERSION check
The angle cherry-pick patch that adds this field to ShCompileOptions
may not be applied in CI due to the angle repo not being found during
patch application. Guard the usage with a version check so compilation
succeeds regardless of angle patch application order.
Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
* Revert "fix: guard validatePerStageMaxUniformBlocks with ANGLE_SH_VERSION check"
This reverts commit 9ebf565988.
* fix: add angle to patches config and re-export angle patches for M144
The angle entry was missing from patches/config.json on 40-x-y, which
meant angle patches were never applied during gclient sync or CI builds.
This caused the chromium cherry-pick to fail with "no member named
'validatePerStageMaxUniformBlocks' in 'ShCompileOptions'".
Also re-exports the angle patches against the M144 base, resolving
conflicts from the M142-targeted patches.
Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
* chore: Update patches
---------
Co-authored-by: PatchUp <73610968+patchup[bot]@users.noreply.github.com>
Co-authored-by: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
19 lines
1.4 KiB
JSON
19 lines
1.4 KiB
JSON
[
|
|
{ "patch_dir": "src/electron/patches/chromium", "repo": "src" },
|
|
{ "patch_dir": "src/electron/patches/boringssl", "repo": "src/third_party/boringssl/src" },
|
|
{ "patch_dir": "src/electron/patches/devtools_frontend", "repo": "src/third_party/devtools-frontend/src" },
|
|
{ "patch_dir": "src/electron/patches/ffmpeg", "repo": "src/third_party/ffmpeg" },
|
|
{ "patch_dir": "src/electron/patches/v8", "repo": "src/v8" },
|
|
{ "patch_dir": "src/electron/patches/node", "repo": "src/third_party/electron_node" },
|
|
{ "patch_dir": "src/electron/patches/nan", "repo": "src/third_party/nan" },
|
|
{ "patch_dir": "src/electron/patches/perfetto", "repo": "src/third_party/perfetto" },
|
|
{ "patch_dir": "src/electron/patches/squirrel.mac", "repo": "src/third_party/squirrel.mac" },
|
|
{ "patch_dir": "src/electron/patches/Mantle", "repo": "src/third_party/squirrel.mac/vendor/Mantle" },
|
|
{ "patch_dir": "src/electron/patches/ReactiveObjC", "repo": "src/third_party/squirrel.mac/vendor/ReactiveObjC" },
|
|
{ "patch_dir": "src/electron/patches/webrtc", "repo": "src/third_party/webrtc" },
|
|
{ "patch_dir": "src/electron/patches/reclient-configs", "repo": "src/third_party/engflow-reclient-configs" },
|
|
{ "patch_dir": "src/electron/patches/sqlite", "repo": "src/third_party/sqlite/src" },
|
|
{ "patch_dir": "src/electron/patches/skia", "repo": "src/third_party/skia" },
|
|
{ "patch_dir": "src/electron/patches/angle", "repo": "src/third_party/angle/src" }
|
|
]
|