chore: cherry-pick fbfb27470bf6 from chromium#50438
Merged
VerteDinde merged 8 commits into40-x-yfrom Mar 25, 2026
Merged
Conversation
526607c to
c35e4a1
Compare
georgexu99
approved these changes
Mar 24, 2026
MarshallOfSound
approved these changes
Mar 24, 2026
… 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>
c35e4a1 to
725761e
Compare
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>
…SION check" This reverts commit 9ebf565.
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>
|
Release Notes Persisted
|
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
3 participants
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.
Validate uniform block count limits at compile time on IMG.
Normally these limits are validated at link time but the IMG compiler
has issues when these limits are exceeded. Validate at compile time
instead.
Bug: chromium:475877320
Change-Id: Ieeed6914b8cdd2b5e50242d06facae62badddefd
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/7568129
Auto-Submit: Geoff Lang geofflang@chromium.org
Reviewed-by: Kyle Charbonneau kylechar@chromium.org
Commit-Queue: Kyle Charbonneau kylechar@chromium.org
Cr-Commit-Position: refs/heads/main@{#1586673}
Notes: Backported fix for chromium:475877320.