[skia-sync] Merge upstream chrome/m150#258
Closed
mattleibow wants to merge 2 commits into
Closed
Conversation
Since the layouts are passed by pointer in the `nextInChain` field, their addresses need to stay valid until the BindGroupLayout is created. With vector, if it ever grew, that would not remain the case. Since there are usually only 0 to 1 immutable samplers, this likely never happened (and also why it uses a built-in storage for 1). Also removes the include for vector and uses TArray (we had been mixing both throughout the file). Bug: 520514458 Fixed: 523531101 Change-Id: I44c9566c68ab0e6c6d659ea77a423ddc50d53c76 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/1264157 Reviewed-by: Thomas Smith <thomsmit@google.com> Auto-Submit: Michael Ludwig <michaelludwig@google.com> Commit-Queue: Michael Ludwig <michaelludwig@google.com> (cherry picked from commit 6a4be3a) Reviewed-on: https://skia-review.googlesource.com/c/skia/+/1266416 Commit-Queue: Thomas Smith <thomsmit@google.com>
Merge new upstream commits from chrome/m150: - [graphite] Use stable collection for static bindings (Bug: 520514458, Fixed: 523531101) - DawnGraphicsPipeline: use TArray instead of std::vector for layout pointers - Graphite-only change, no impact on SkiaSharp's Ganesh backend or C API Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.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
2 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.
Automated upstream merge of
chrome/m150.mono/skia Sync Summary — chrome/m150 bug fixes
Type
Same-milestone bug-fix sync (m150 → m150)
Upstream Merge Details
chrome/m15094451aa2839ed8ae5185d25d88784c6185381fa09f330f1704305686dafa9eeef11de77caa5314b1caf4799537ffa861286559fa39ff6e99b295f874Upstream Commits Merged
9f330f1704[graphite] Use stable collection for static bindingssrc/gpu/graphite/dawn/DawnGraphicsPipeline.cppConflict Resolution
None — merge was clean (automatic, no conflicts).
Breaking Change Analysis
DawnGraphicsPipeline: useTArrayinstead ofstd::vectorfor layout pointer stabilitySummary: Graphite-only bug fix for a use-after-free in the Dawn GPU backend's pipeline layout handling. SkiaSharp uses Ganesh, not Graphite, so there is no impact on the C API shim or any user-visible behavior.
C API Files Verified
All C API files intact post-merge:
src/c/*.cpp— all present, no conflictsinclude/c/*.h— all present, no conflictsItems Needing Human Attention
None. This is a low-risk Graphite-only bug fix.
Created by skia-upstream-sync.