Skip to content

Support Skia M149#7

Merged
olilarkin merged 2 commits into
mainfrom
m149-and-canvaskit
Jun 15, 2026
Merged

Support Skia M149#7
olilarkin merged 2 commits into
mainfrom
m149-and-canvaskit

Conversation

@olilarkin

@olilarkin olilarkin commented May 22, 2026

Copy link
Copy Markdown
Owner
  1. Support Skia M149 — bump CI LLVM to 20.1.0 (M149's bundled MSVC STL needs Clang 20+); handle M149's wasm toolchain emitting lib<name>.wasm.a by passing bare GN target names to ninja and renaming back to lib<name>.a on copy.
  2. Patch m149 D3D release build (@danielraffel, folds in Keep D3D enabled for Skia m149 Windows Release #11) — patches/fix_m149_d3d_backend_surface.patch ungates GrD3DBackendFormatData::equal so Windows Direct3D Release builds compile on m149; skia_use_direct3d stays true.

Supersedes #11 (folded in).

@chatgpt-codex-connector chatgpt-codex-connector Bot left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: e550db8ef8

ℹ️ About Codex in GitHub

Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you

  • Open a pull request for review
  • Mark a draft as ready
  • Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".

Comment thread build-skia.py
Comment on lines +670 to +672
if self.platform == "wasm" and lib.endswith('.a'):
src_file = src_dir / f"{lib[:-2]}.wasm.a"
else:

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

P1 Badge Fall back to legacy wasm archive names

Handle both lib*.wasm.a and lib*.a in move_libs() for wasm. The new code always reads lib<name>.wasm.a, but this rename only applies to M149+ (as your own comment notes), while the workflow default branch is still chrome/m144; on those branches the build outputs remain lib<name>.a. In that case this loop only logs warnings and produces an artifact missing the wasm static libs, so downstream consumers get a successful CI run with broken contents.

Useful? React with 👍 / 👎.

Comment thread .github/workflows/build-skia.yml Outdated
Comment on lines +89 to +93
- os: ubuntu-latest
platform: canvaskit
variant: gpu
arch: "wasm32"
config: Release

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

P2 Badge Publish CanvasKit output in release assets

Wire the new canvaskit matrix build into the release payload. This commit adds a dedicated CanvasKit job, but the create-release step still enumerates a fixed file list that does not include skia-build-canvaskit-wasm32-gpu-release.zip, so platforms=all releases silently omit the new artifact even though it was built and uploaded earlier in the workflow.

Useful? React with 👍 / 👎.

@olilarkin olilarkin force-pushed the m149-and-canvaskit branch from 4a50af1 to ad1c402 Compare June 14, 2026 21:06
@olilarkin olilarkin changed the title Support Skia M149 + CanvasKit (Graphite/WebGPU) Support Skia M149 + CanvasKit (Graphite/WebGPU), keep Windows D3D Jun 14, 2026
olilarkin and others added 2 commits June 15, 2026 00:51
- Bump CI LLVM to 20.1.0; M149's bundled MSVC STL requires Clang 20+
- M149's wasm toolchain emits lib<name>.wasm.a; pass bare GN target names
  to ninja and rename outputs back to lib<name>.a on copy for downstream
  compatibility
Ungate GrD3DBackendFormatData::equal so Direct3D Release builds compile on
M149, where the base class declares equal() as unconditionally pure virtual.
@olilarkin olilarkin force-pushed the m149-and-canvaskit branch from ad1c402 to dd3da7c Compare June 14, 2026 22:52
@olilarkin olilarkin changed the title Support Skia M149 + CanvasKit (Graphite/WebGPU), keep Windows D3D Support Skia M149 (keep Windows D3D) Jun 14, 2026
@olilarkin olilarkin changed the title Support Skia M149 (keep Windows D3D) Support Skia M149 Jun 15, 2026
@olilarkin olilarkin merged commit 8a944f2 into main Jun 15, 2026
13 checks passed
@olilarkin olilarkin deleted the m149-and-canvaskit branch June 15, 2026 06:24
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