M124 public #236

HinTak · 2024-03-28T21:25:40Z

@kyamagu nothing too exciting compared to m123 - the vulkan initialization changed - from instance = class() ; instance.initVulkan() to instance = class.MakeVk(). So tests need to change - I chose to mark the old test as skip and add a new test, rather than replace, since the calling is quite different.

This includes the fix to #235 so needs reviewing in the next few weeks when you get around to it (before m125). Includes the other pulls.

I think there was a earlier MakeGL that I missed. ( I just commented out the initGL). M124 release notes mention a similar MakeMetal() change too.

…nvaskit/0.38.2-3316-g982874994d)

SkTypeface::MakeFromName is gone SkTypeface::MakeFromFile also gone SkTypeface::MakeFromData is gone New lastResortMgr argument to SkTypeface::MakeDeserialize Milestone 122 ------------- * `SkFontMgr::RefDefault()` has been deleted. Clients should instantiate and manage their own `SkFontMgr`s and use them to explicitly create `SkTypeface`s Fixes kyamagu#231 Adapted from chromium/chromium@a6166e8

The FontConfigInterface version somehow segfaults.

…ize()

… failure Upstream problem reported at pypa/cibuildwheel#1740 .

…994d to canvaskit/0.38.2-3317-gc6835e2d5f

…anvaskit/0.38.2-3701-gaeae2261c7)

See google/skia@64e67c3 "Remove deprecated getBlendMode" for how this emulation is inspired. Fixes kyamagu#235 drop const in function prototype.

…3318-g8464f41cf0 on m122

…3702-g3d4e45907f on m123

…askit/0.38.2-3702-g3d4e45907f)

Not really a merge - just to make sure m124-public is marked as a proper decendent of m122-public.

Conflicts: setup.py

…ndSemaphores::MakeVk/GetVkSemaphore` The change was in 121 but emulation removed in 124. Milestone 121 ------------- * `GrBackendSemaphore::initVk` and `GrBackendSemaphore::vkSemaphore` have been replaced with `GrBackendSemaphores::MakeVk` and `GrBackendSemaphores::GetVkSemaphore`, defined in `include/gpu/ganesh/vk/GrVkBackendSemaphore.h` See google/skia@e9206d2 Extract Vulkan methods out of GrBackendSemaphore

…emaphore::initVulkan()

HinTak · 2024-03-29T16:48:47Z

I also don't quite get the reinterprete_cast before/after this 3ca9d20 - the vulkan pointer seems to be quite strange and not template'able.

HinTak · 2024-03-30T01:38:01Z

The vulkan header situation is a mess - within skia, there is one under third_party/externals/vulkan-headers/include, another under include/third_party/vulkan, and also, on Linux, under /usr/include.

I started using the third_party/externals one since we started using the freetype ones there too. But it seems that internally skia switches between the other two (system or private under include/third_party).

… known not to work in m122+

Mention SkPaint::getBlendMode in README.m123.md

HinTak · 2024-04-27T01:57:23Z

@kyamagu I added readme m121 to 124, and also updated m116, so those give a summary of changes. SampleOptions() and paint.getblendmode() are new work on issues, in addition to just updating the upstream skia. Ready for review for another public beta.

Upstream m125 was out about a week ago.

HinTak · 2024-04-29T18:13:04Z

@kyamagu ping on review? M125 is out, small adjustments in skpath, changes in MemoryStream looks slightly complicated, and libunicode has split into _core and _icu and it seems we needs both; and it seems to require the internal copy of libicu (and doesn't work with my system-wide one). M125 looks a bit troublesome.

…canvaskit/0.38.2-4059-ge2ea2eb3e0 on m124

The macOS detector macro is called `__APPLE__`, not `__apple__`

Revert "m122 Breakage on Mac OS X: NoneType not subscribable" This reverts commit 43a5e63. Revert "Typo - missing one bracket" This reverts commit a526e34. Revert "m122 Breakage: On Mac OS X, these two tests no longer give valid paths" This reverts commit ecba963.

The macOS detector macro is called `__APPLE__`, not `__apple__`

Revert "m122 Breakage on Mac OS X: NoneType not subscribable" This reverts commit 43a5e63. Revert "Typo - missing one bracket" This reverts commit a526e34. Revert "m122 Breakage: On Mac OS X, these two tests no longer give valid paths" This reverts commit ecba963.

The macOS detector macro is called `__APPLE__`, not `__apple__`

Revert "m122 Breakage on Mac OS X: NoneType not subscribable" This reverts commit 43a5e63. Revert "Typo - missing one bracket" This reverts commit a526e34. Revert "m122 Breakage: On Mac OS X, these two tests no longer give valid paths" This reverts commit ecba963.

kyamagu

Thanks!

Now we have addressed kyamagu#241

HinTak · 2024-04-30T16:02:40Z

Latest:

2091 passed, 98 skipped, 11 xfailed, 27 warnings

HinTak added 25 commits February 1, 2024 15:57

Update skia from m121 to 122 (canvaskit/0.38.2-2848-g589c465550 to ca…

144d01c

…nvaskit/0.38.2-3316-g982874994d)

m122 patches plus adjustments

ddce88f

update to 122

f0ebf14

Use SkFontMgr_fontconfig.h instead of SkFontMgr_FontConfigInterface.h

46c6dfd

The FontConfigInterface version somehow segfaults.

Adjust test for new additional argument to skia.Typeface.MakeDeserial…

fa991c1

…ize()

m122 Breakage: On Mac OS X, these two tests no longer give valid paths

ecba963

Bump pypa/cibuildwheel up to v2.16.5 to fix intermitent windows build…

56e3b85

… failure Upstream problem reported at pypa/cibuildwheel#1740 .

Typo - missing one bracket

a526e34

m122 Breakage on Mac OS X: NoneType not subscribable

43a5e63

Fixes "Node.js 16 actions deprecated..." warnings

7c9cbe8

Roll bundled Skia forward slightly from canvaskit/0.38.2-3316-g982874…

05a0d96

…994d to canvaskit/0.38.2-3317-gc6835e2d5f

Upgrade skia from m122 (canvaskit/0.38.2-3317-gc6835e2d5f) to m123 (c…

d080ab2

…anvaskit/0.38.2-3701-gaeae2261c7)

bump version up to m123

b0b26a4

m123 patches plus adjustments

b043d0b

Emulate SkPaint::getBlendMode

69e25c3

See google/skia@64e67c3 "Remove deprecated getBlendMode" for how this emulation is inspired. Fixes kyamagu#235 drop const in function prototype.

Re-enable test for emulated paint.getBlendMode()

f78f4c9

Roll skia from canvaskit/0.38.2-3317-gc6835e2d5f to canvaskit/0.38.2-…

5317f92

…3318-g8464f41cf0 on m122

Roll skia from canvaskit/0.38.2-3701-gaeae2261c7 to canvaskit/0.38.2-…

4560e92

…3702-g3d4e45907f on m123

Move skia to m124 (canvaskit/0.38.2-4058-ge7bf161ff9) from m123 (canv…

253b082

…askit/0.38.2-3702-g3d4e45907f)

m124 patches plus adjustments

a796cd9

Merge branch 'm122-public' into m124-public

219b8fe

Not really a merge - just to make sure m124-public is marked as a proper decendent of m122-public.

bump version up to m124

14c229b

Conflicts: setup.py

Adding tests for GrBackendSemaphore::MakeVk() ; switch off GrBackendS…

186294c

…emaphore::initVulkan()

HinTak mentioned this pull request Mar 28, 2024

"instance = class() ; instance.initGL()" vs "instance = class.MakeGL() #237

Open

HinTak force-pushed the m124-public branch from 5acdcbe to 75dc40b Compare March 30, 2024 01:27

Another in-tree location for vulkan headers in skia

5fac7e4

HinTak added 8 commits April 27, 2024 01:34

Update README.m121.md to mention that skia.Font(skia.Typeface('')) is…

92ea7d1

… known not to work in m122+

new README.m122.md

ce9de17

README.m123

4752abb

Mention SkPaint::getBlendMode in README.m123.md

README.m124

8146b86

Updating README.m116.md for m124 Addendum on SamplingOption

2710b3e

Remove stray white space

b3e0798

bump version up to 124.0b7

46c09fc

Mention SkFontMgr::RefDefault() in README.m122.md

ead48c5

HinTak requested a review from kyamagu April 27, 2024 01:51

HinTak force-pushed the m124-public branch from 3cf8711 to ead48c5 Compare April 27, 2024 13:23

HinTak mentioned this pull request Apr 29, 2024

Support for Python 3.12 #242

Closed

roll skia slightly forward from canvaskit/0.38.2-4058-ge7bf161ff9 to …

9f75041

…canvaskit/0.38.2-4059-ge2ea2eb3e0 on m124

HinTak mentioned this pull request Apr 29, 2024

Build for python3.21 #243

Closed

pavpanchekha and others added 8 commits April 30, 2024 04:32

Fix fonts on macOS by using the right macro

346b630

The macOS detector macro is called `__APPLE__`, not `__apple__`

Fix fonts on macOS by using the right macro

889e57d

The macOS detector macro is called `__APPLE__`, not `__apple__`

Fix fonts on macOS by using the right macro

c9f7bc5

The macOS detector macro is called `__APPLE__`, not `__apple__`

Merge branch 'm122-public' into m124-public

c5b64b1

Merge branch 'm123-public' into m124-public

1f9c56c

kyamagu approved these changes Apr 30, 2024

View reviewed changes

HinTak added 2 commits April 30, 2024 11:06

Remove "skia.Font(skia.Typeface('')) not work on Mac OS X" paragraphs

8aaa228

Now we have addressed kyamagu#241

Update README.md to refer to README.m122, README.m123, README.m124

fe2df88

HinTak mentioned this pull request Apr 30, 2024

git-sync-deps seems to no longer require or support Python 2 #245

Merged

HinTak merged commit 4faf14d into kyamagu:main Apr 30, 2024
14 checks passed

HinTak deleted the m124-public branch April 30, 2024 14:58

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

M124 public #236

M124 public #236

HinTak commented Mar 28, 2024

HinTak commented Mar 29, 2024

HinTak commented Mar 30, 2024 •

edited

Loading

HinTak commented Apr 27, 2024

HinTak commented Apr 29, 2024

kyamagu left a comment

HinTak commented Apr 30, 2024

M124 public #236

M124 public #236

Conversation

HinTak commented Mar 28, 2024

HinTak commented Mar 29, 2024

HinTak commented Mar 30, 2024 • edited Loading

HinTak commented Apr 27, 2024

HinTak commented Apr 29, 2024

kyamagu left a comment

Choose a reason for hiding this comment

HinTak commented Apr 30, 2024

HinTak commented Mar 30, 2024 •

edited

Loading