From 6652497baf1987fbff11f22cbfe24ef2d51d49bd Mon Sep 17 00:00:00 2001 From: Jason Simmons Date: Thu, 5 Sep 2024 11:01:09 -0700 Subject: [PATCH 1/2] Manual Skia roll to 809f868ded1c Includes a build script update required for a new source file added on Windows --- DEPS | 2 +- skia/BUILD.gn | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/DEPS b/DEPS index 3e70d4a26d69f..a154102df1376 100644 --- a/DEPS +++ b/DEPS @@ -14,7 +14,7 @@ vars = { 'flutter_git': 'https://flutter.googlesource.com', 'skia_git': 'https://skia.googlesource.com', 'llvm_git': 'https://llvm.googlesource.com', - 'skia_revision': '655699edfc9745af2172ba79b5a99b169fa800fb', + 'skia_revision': '809f868ded1c56b8ad79e2c0f4e5c243263c7c79', # WARNING: DO NOT EDIT canvaskit_cipd_instance MANUALLY # See `lib/web_ui/README.md` for how to roll CanvasKit to a new version. diff --git a/skia/BUILD.gn b/skia/BUILD.gn index 339b4be7bffd5..202716d0ca872 100644 --- a/skia/BUILD.gn +++ b/skia/BUILD.gn @@ -431,6 +431,7 @@ optional("gpu") { } else if (is_win) { sources += [ "$_skia_root/src/gpu/ganesh/gl/win/GrGLMakeNativeInterface_win.cpp", + "$_skia_root/src/gpu/ganesh/gl/win/GrGLMakeWinInterface.cpp", ] if (target_cpu != "arm64") { libs += [ "OpenGL32.lib" ] From 95e95ec01f648339a1ca4d159ae5bdbd9a68d716 Mon Sep 17 00:00:00 2001 From: Jason Simmons Date: Thu, 5 Sep 2024 13:16:00 -0700 Subject: [PATCH 2/2] Licenses and OpenGL32 dependency on arm64 --- ci/licenses_golden/excluded_files | 1 + ci/licenses_golden/licenses_skia | 6 +++++- skia/BUILD.gn | 4 +--- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/ci/licenses_golden/excluded_files b/ci/licenses_golden/excluded_files index 4dfa9ac134ef2..9da604db65594 100644 --- a/ci/licenses_golden/excluded_files +++ b/ci/licenses_golden/excluded_files @@ -2708,6 +2708,7 @@ ../../../flutter/third_party/skia/include/gpu/ganesh/gl/glx/BUILD.bazel ../../../flutter/third_party/skia/include/gpu/ganesh/gl/ios/BUILD.bazel ../../../flutter/third_party/skia/include/gpu/ganesh/gl/mac/BUILD.bazel +../../../flutter/third_party/skia/include/gpu/ganesh/gl/win/BUILD.bazel ../../../flutter/third_party/skia/include/gpu/ganesh/mock/BUILD.bazel ../../../flutter/third_party/skia/include/gpu/ganesh/mtl/BUILD.bazel ../../../flutter/third_party/skia/include/gpu/ganesh/vk/BUILD.bazel diff --git a/ci/licenses_golden/licenses_skia b/ci/licenses_golden/licenses_skia index 1f4fe1f4186cc..f59e322bc55d2 100644 --- a/ci/licenses_golden/licenses_skia +++ b/ci/licenses_golden/licenses_skia @@ -1,4 +1,4 @@ -Signature: 460cd81c397855690a585125a19843f4 +Signature: ff06ba0045a99313531b85e5bb4cefe8 ==================================================================================================== LIBRARY: etc1 @@ -9476,6 +9476,7 @@ ORIGIN: ../../../flutter/third_party/skia/modules/svg/src/SkSVGRectPriv.h + ../. ORIGIN: ../../../flutter/third_party/skia/src/codec/SkJpegMetadataDecoderImpl.cpp + ../../../flutter/third_party/skia/LICENSE ORIGIN: ../../../flutter/third_party/skia/src/codec/SkJpegMetadataDecoderImpl.h + ../../../flutter/third_party/skia/LICENSE ORIGIN: ../../../flutter/third_party/skia/src/core/SkFontScanner.h + ../../../flutter/third_party/skia/LICENSE +ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/gl/win/GrGLMakeWinInterface.cpp + ../../../flutter/third_party/skia/LICENSE ORIGIN: ../../../flutter/third_party/skia/src/ports/SkFontMgr_fontations_empty.cpp + ../../../flutter/third_party/skia/LICENSE ORIGIN: ../../../flutter/third_party/skia/src/sfnt/SkOTTable_sbix.h + ../../../flutter/third_party/skia/LICENSE TYPE: LicenseType.bsd @@ -9491,6 +9492,7 @@ FILE: ../../../flutter/third_party/skia/modules/svg/src/SkSVGRectPriv.h FILE: ../../../flutter/third_party/skia/src/codec/SkJpegMetadataDecoderImpl.cpp FILE: ../../../flutter/third_party/skia/src/codec/SkJpegMetadataDecoderImpl.h FILE: ../../../flutter/third_party/skia/src/core/SkFontScanner.h +FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/gl/win/GrGLMakeWinInterface.cpp FILE: ../../../flutter/third_party/skia/src/ports/SkFontMgr_fontations_empty.cpp FILE: ../../../flutter/third_party/skia/src/sfnt/SkOTTable_sbix.h ---------------------------------------------------------------------------------------------------- @@ -9538,6 +9540,7 @@ ORIGIN: ../../../flutter/third_party/skia/include/gpu/ganesh/gl/GrGLMakeWebGLInt ORIGIN: ../../../flutter/third_party/skia/include/gpu/ganesh/gl/epoxy/GrGLMakeEpoxyEGLInterface.h + ../../../flutter/third_party/skia/LICENSE ORIGIN: ../../../flutter/third_party/skia/include/gpu/ganesh/gl/ios/GrGLMakeIOSInterface.h + ../../../flutter/third_party/skia/LICENSE ORIGIN: ../../../flutter/third_party/skia/include/gpu/ganesh/gl/mac/GrGLMakeMacInterface.h + ../../../flutter/third_party/skia/LICENSE +ORIGIN: ../../../flutter/third_party/skia/include/gpu/ganesh/gl/win/GrGLMakeWinInterface.h + ../../../flutter/third_party/skia/LICENSE ORIGIN: ../../../flutter/third_party/skia/include/gpu/ganesh/mtl/GrMtlBackendSemaphore.h + ../../../flutter/third_party/skia/LICENSE ORIGIN: ../../../flutter/third_party/skia/include/gpu/ganesh/mtl/GrMtlBackendSurface.h + ../../../flutter/third_party/skia/LICENSE ORIGIN: ../../../flutter/third_party/skia/include/gpu/ganesh/mtl/GrMtlDirectContext.h + ../../../flutter/third_party/skia/LICENSE @@ -9651,6 +9654,7 @@ FILE: ../../../flutter/third_party/skia/include/gpu/ganesh/gl/GrGLMakeWebGLInter FILE: ../../../flutter/third_party/skia/include/gpu/ganesh/gl/epoxy/GrGLMakeEpoxyEGLInterface.h FILE: ../../../flutter/third_party/skia/include/gpu/ganesh/gl/ios/GrGLMakeIOSInterface.h FILE: ../../../flutter/third_party/skia/include/gpu/ganesh/gl/mac/GrGLMakeMacInterface.h +FILE: ../../../flutter/third_party/skia/include/gpu/ganesh/gl/win/GrGLMakeWinInterface.h FILE: ../../../flutter/third_party/skia/include/gpu/ganesh/mtl/GrMtlBackendSemaphore.h FILE: ../../../flutter/third_party/skia/include/gpu/ganesh/mtl/GrMtlBackendSurface.h FILE: ../../../flutter/third_party/skia/include/gpu/ganesh/mtl/GrMtlDirectContext.h diff --git a/skia/BUILD.gn b/skia/BUILD.gn index 202716d0ca872..68825ba104aa2 100644 --- a/skia/BUILD.gn +++ b/skia/BUILD.gn @@ -433,9 +433,7 @@ optional("gpu") { "$_skia_root/src/gpu/ganesh/gl/win/GrGLMakeNativeInterface_win.cpp", "$_skia_root/src/gpu/ganesh/gl/win/GrGLMakeWinInterface.cpp", ] - if (target_cpu != "arm64") { - libs += [ "OpenGL32.lib" ] - } + libs += [ "OpenGL32.lib" ] } else { sources += [ "$_skia_root/src/gpu/ganesh/gl/GrGLMakeNativeInterface_none.cpp" ]