Support Skia M149

.github/workflows/build-skia.yml

@@ -194,14 +194,14 @@ jobs:
         if: steps.check.outputs.should_build == 'true' && runner.os != 'macOS' && matrix.os != 'windows-11-arm'
         uses: KyleMayes/install-llvm-action@v2
         with:
-          version: "19.1.0"
+          version: "20.1.0"
           env: true
 
       - name: Install LLVM and Clang (Windows ARM64)
         if: steps.check.outputs.should_build == 'true' && matrix.os == 'windows-11-arm'
         shell: pwsh
         run: |
-          $llvmUrl = "https://github.com/llvm/llvm-project/releases/download/llvmorg-19.1.0/LLVM-19.1.0-woa64.exe"
+          $llvmUrl = "https://github.com/llvm/llvm-project/releases/download/llvmorg-20.1.0/LLVM-20.1.0-woa64.exe"
           $installerPath = "$env:TEMP\llvm-installer.exe"
           Write-Host "Downloading LLVM installer..."
           Invoke-WebRequest -Uri $llvmUrl -OutFile $installerPath

build-skia.py

@@ -223,6 +223,10 @@ def colored_print(message, color):
 
     "win": """
     skia_use_dawn = true
+    # Keep Direct3D enabled. M149 makes GrBackendFormatData::equal unconditionally
+    # pure virtual while GrD3DBackendFormatData's override is gated by GPU_TEST_UTILS,
+    # leaving the subclass abstract in Release builds. patches/fix_m149_d3d_backend_surface.patch
+    # ungates the override so D3D Release builds compile. Re-enable plain once Skia fixes upstream.
     skia_use_direct3d = true
     is_trivial_abi = false
     """,
@@ -449,7 +453,7 @@ def validate_archs(self):
             "visionos": ["arm64"],
             "win": ["x64", "arm64", "Win32"],
             "linux": ["x64", "arm64"],
-            "wasm": ["wasm32"]
+            "wasm": ["wasm32"],
         }
         for arch in self.archs:
             if arch not in valid_archs[self.platform]:
@@ -620,6 +624,10 @@ def build_skia(self, arch: str):
         # On Windows, ninja expects targets without the .lib extension
         if self.platform == "win":
             libs_to_build = [lib[:-4] if lib.endswith('.lib') else lib for lib in libs_to_build]
+        # On wasm, M149+ outputs lib<name>.wasm.a (when is_canvaskit=false),
+        # so pass bare GN target names to ninja and rename at move_libs time.
+        elif self.platform == "wasm":
+            libs_to_build = [lib[3:-2] if lib.startswith('lib') and lib.endswith('.a') else lib for lib in libs_to_build]
 
         # Construct the ninja command with all library targets
         ninja_command = ["ninja", "-C", str(output_dir)] + libs_to_build
@@ -659,7 +667,11 @@ def move_libs(self, arch: str):
 
         # Copy the libraries
         for lib in LIBS[self.platform]:
-            src_file = src_dir / lib
+            # M149+ wasm toolchain emits lib<name>.wasm.a; copy to lib<name>.a for compatibility.
+            if self.platform == "wasm" and lib.endswith('.a'):
+                src_file = src_dir / f"{lib[:-2]}.wasm.a"
+            else:
+                src_file = src_dir / lib
             dest_file = dest_dir / lib
             if src_file.exists():
                 shutil.copy2(str(src_file), str(dest_file))

patches/fix_m149_d3d_backend_surface.patch

@@ -0,0 +1,36 @@
+diff --git a/src/gpu/ganesh/d3d/GrD3DBackendSurface.cpp b/src/gpu/ganesh/d3d/GrD3DBackendSurface.cpp
+index 8d20c4fbda..e4d94b0c76 100644
+--- a/src/gpu/ganesh/d3d/GrD3DBackendSurface.cpp
++++ b/src/gpu/ganesh/d3d/GrD3DBackendSurface.cpp
+@@ -39,7 +39,6 @@ private:
+
+     GrColorFormatDesc desc() const override { return GrDxgiFormatDesc(fFormat); }
+
+-#if defined(GPU_TEST_UTILS)
+     bool equal(const GrBackendFormatData* that) const override {
+         SkASSERT(!that || that->type() == GrBackendApi::kDirect3D);
+         if (auto otherD3D = static_cast<const GrD3DBackendFormatData*>(that)) {
+@@ -47,7 +46,6 @@ private:
+         }
+         return false;
+     }
+-#endif
+
+     std::string toString() const override {
+ #if defined(SK_DEBUG) || defined(GPU_TEST_UTILS)
+@@ -114,6 +112,7 @@ private:
+
+     bool isProtected() const override { return false; }
+
++#if defined(GPU_TEST_UTILS)
+     bool equal(const GrBackendTextureData* that) const override {
+         SkASSERT(!that || that->type() == GrBackendApi::kDirect3D);
+ #if defined(GPU_TEST_UTILS)
+@@ -123,6 +122,7 @@ private:
+ #endif
+         return false;
+     }
++#endif
+
+     bool isSameTexture(const GrBackendTextureData* that) const override {
+         SkASSERT(!that || that->type() == GrBackendApi::kDirect3D);