Skip to content
This repository was archived by the owner on Feb 25, 2025. It is now read-only.

Manual Skia roll to 809f868ded1c #54972

Merged
merged 2 commits into from
Sep 5, 2024
Merged

Manual Skia roll to 809f868ded1c #54972

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6652497
Manual Skia roll to 809f868ded1c
jason-simmons Sep 5, 2024
95e95ec
Licenses and OpenGL32 dependency on arm64
jason-simmons Sep 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion DEPS
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
1 change: 1 addition & 0 deletions ci/licenses_golden/excluded_files
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 5 additions & 1 deletion ci/licenses_golden/licenses_skia
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Signature: 460cd81c397855690a585125a19843f4
Signature: ff06ba0045a99313531b85e5bb4cefe8

====================================================================================================
LIBRARY: etc1
Expand Down Expand Up @@ -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
Expand All @@ -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
----------------------------------------------------------------------------------------------------
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
5 changes: 2 additions & 3 deletions skia/BUILD.gn
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -431,10 +431,9 @@ 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" ]
}
libs += [ "OpenGL32.lib" ]
} else {
sources +=
[ "$_skia_root/src/gpu/ganesh/gl/GrGLMakeNativeInterface_none.cpp" ]
Expand Down