Skip to content

Update vendored angle to FIREFOX_140_12_0esr_RELEASE #100

Merged
jschwe merged 7 commits into
servo:mainfrom
jschwe:update_mozangle
Jul 13, 2026
Merged

Update vendored angle to FIREFOX_140_12_0esr_RELEASE #100
jschwe merged 7 commits into
servo:mainfrom
jschwe:update_mozangle

Conversation

@jschwe

@jschwe jschwe commented Jul 11, 2026

Copy link
Copy Markdown
Member

Followed the instruction from the readme, deleting gfx/angle and then
re-vendoring by copying the gfx/angle directory from the (firefox) upstream 140.12.0 ESR
firefox release (commit f802561).
See the individual commits.

Companion PR: servo/servo#46455

@sagudev

sagudev commented Jul 11, 2026

Copy link
Copy Markdown
Member

I am not sure it's enough to do just patch release here, given that we reexport many stuff from bindgen. Did you check that we are in fact semver compatible (we have much more stuff exposed on windows btw)?

Anyway, maybe we should be doing like in mozjs tracking and automating version bumps? Our LTS release follows firefox ESR I presume (mainly for SM and mozangle, but I guess that would could also work for WR and stylo as both can get security updates from upstream - should we make sure we are properly synchronized to ESR branch for the time of LTS release so that backporting is easier).

@jschwe

jschwe commented Jul 12, 2026

Copy link
Copy Markdown
Member Author

I was going to say it appears to be additive, but cargo semver-checks does complain:

A pub struct constructible with a struct literal has a new pub field. Existing struct literals must be updated to include the new field.

So, I guess a nice reminder for me that a change looking additive can still be breaking.

@sagudev

sagudev commented Jul 12, 2026

Copy link
Copy Markdown
Member

this PR needs companion PR in servo, we especially need to test windows builds

jschwe added 7 commits July 12, 2026 11:13
Followed the instruction from the readme, deleting gfx/angle and then
re-vendoring by copying the gfx/angle directory from the upstream 140.12.0 ESR
firefox release (commit f802561).
This does not yet contain our patches.
@jschwe

jschwe commented Jul 12, 2026

Copy link
Copy Markdown
Member Author

Companion PR servo/servo#46455. I also tested locally on a windows machine, and servoshell seemed to work fine.

@jschwe
jschwe marked this pull request as ready for review July 12, 2026 13:36
Comment thread gfx/angle/checkout/include/GLSLANG/ShaderLang.h
@jschwe
jschwe added this pull request to the merge queue Jul 13, 2026
Merged via the queue into servo:main with commit 7be30d4 Jul 13, 2026
9 checks passed
@jschwe
jschwe deleted the update_mozangle branch July 13, 2026 06:09
@jschwe

jschwe commented Jul 13, 2026

Copy link
Copy Markdown
Member Author

@sagudev could you do a new crates.io release when you have time?

@sagudev

sagudev commented Jul 13, 2026

Copy link
Copy Markdown
Member

Published!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants