Commit e1c17fd
chore: cherry-pick fbfb27470bf6 from chromium (#50438)
* 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 9ebf565.
* 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>1 parent 2871c1d commit e1c17fd
6 files changed
Lines changed: 445 additions & 242 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1 | | - | |
| 1 | + | |
This file was deleted.
0 commit comments