chore: cherry-pick bf6dd974238b from angle#50437
Merged
VerteDinde merged 1 commit intocherry-pick/40-x-y/chromium/fbfb27470bf6from Mar 24, 2026
Merged
Conversation
10aa04d
into
cherry-pick/40-x-y/chromium/fbfb27470bf6
161 of 164 checks passed
|
Release Notes Persisted
|
VerteDinde
added a commit
that referenced
this pull request
Mar 24, 2026
VerteDinde
added a commit
that referenced
this pull request
Mar 24, 2026
VerteDinde
added a commit
that referenced
this pull request
Mar 25, 2026
VerteDinde
added a commit
that referenced
this pull request
Mar 25, 2026
* 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>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Optionally validate GL_MAX_*_UNIFORM_BLOCKS at compile time.
These were validated at link time but some drivers have compiler crashes
when compiling shaders with too many uniform blocks.
Bug: chromium:475877320
Change-Id: I4413ce06307b4fe9e27105d85f66f610c235a301
Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/7568089
Commit-Queue: Geoff Lang geofflang@chromium.org
Reviewed-by: Shahbaz Youssefi syoussefi@chromium.org
Notes: Backported fix for chromium:475877320.