Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: google/skia
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: main
Choose a base ref
...
head repository: skia4delphi/skia
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: sk4d/m132
Choose a head ref
Can’t automatically merge. Don’t worry, you can still create the pull request.

Commits on Nov 12, 2024

  1. Filter unsupported CQ try jobs on chrome/m132

    Change-Id: Ic664f675d7af71be6a336b26026a76ddc69da990
    Reviewed-on: https://skia-review.googlesource.com/c/skia/+/918976
    Reviewed-by: Heather Miller <hcm@google.com>
    sharakss authored and heathmill committed Nov 12, 2024
    Copy the full SHA
    781b824 View commit details
  2. Merge 4 release notes into RELEASE_NOTES.md

    Change-Id: I80b07b8fdc4adf20945628765a48ebb42da4f296
    Reviewed-on: https://skia-review.googlesource.com/c/skia/+/918978
    Reviewed-by: Heather Miller <hcm@google.com>
    sharakss authored and heathmill committed Nov 12, 2024
    Copy the full SHA
    b1fb88a View commit details

Commits on Nov 27, 2024

  1. [graphite] Fix texture matrix for asyncReadPixelsYUV420

    Bug: b/379916147
    Bug: b/341104760
    Change-Id: I895494bd1dc22fb275fc58535185917cf50891a3
    Reviewed-on: https://skia-review.googlesource.com/c/skia/+/923589
    Auto-Submit: Michael Ludwig <michaelludwig@google.com>
    Commit-Queue: Michael Ludwig <michaelludwig@google.com>
    Commit-Queue: Jim Van Verth <jvanverth@google.com>
    Reviewed-by: Jim Van Verth <jvanverth@google.com>
    (cherry picked from commit e7b2772)
    Reviewed-on: https://skia-review.googlesource.com/c/skia/+/925217
    Reviewed-by: Kaylee Lubick <kjlubick@google.com>
    Commit-Queue: Kaylee Lubick <kjlubick@google.com>
    lhkbob authored and SkCQ committed Nov 27, 2024
    Copy the full SHA
    377dd9c View commit details

Commits on Nov 29, 2024

  1. Fix DefaultImageProvider::Make() leak

    The sk_sp<DefaultImageProvider> had two references for one sk_sp
    existing so it wouldn't get destroyed when the last sk_sp was destroyed.
    
    Bug: b/380783677, 381044051
    Change-Id: I46d8bb51f29f4b7012923297cdc1023a9635aecf
    Reviewed-on: https://skia-review.googlesource.com/c/skia/+/924116
    Commit-Queue: Jim Van Verth <jvanverth@google.com>
    Reviewed-by: Michael Ludwig <michaelludwig@google.com>
    Reviewed-by: Jim Van Verth <jvanverth@google.com>
    Commit-Queue: Kyle Charbonneau <kylechar@chromium.org>
    (cherry picked from commit 2135f39)
    Reviewed-on: https://skia-review.googlesource.com/c/skia/+/925256
    kylechar authored and SkCQ committed Nov 29, 2024
    Copy the full SHA
    a756a57 View commit details

Commits on Dec 9, 2024

  1. [M132] Address some numerical instability in SkRRect::transform

    In some cases the radii after an SkRRect transformation are not valid due to floating point math. This CL just moves the radii validity check to after the fixup process.
    
    Note that the repro case only seems to happen for release builds.
    
    Bug: b/380234223
    Change-Id: I7b79c5990196db9ced6446f64051d8d91192f22a
    Reviewed-on: https://skia-review.googlesource.com/c/skia/+/926768
    Reviewed-by: Michael Ludwig <michaelludwig@google.com>
    Commit-Queue: Robert Phillips <robertphillips@google.com>
    Reviewed-on: https://skia-review.googlesource.com/c/skia/+/927977
    rphilli authored and SkCQ committed Dec 9, 2024
    Copy the full SHA
    07f41bc View commit details

Commits on Jan 6, 2025

  1. [ganesh] Avoid overflow when combining AAHairlineOps

    Bug: b/382786791
    Change-Id: I955d943015cce76f75221df9fab0897a6f22fe4b
    Reviewed-on: https://skia-review.googlesource.com/c/skia/+/930577
    Reviewed-by: Michael Ludwig <michaelludwig@google.com>
    Commit-Queue: James Godfrey-Kittle <jamesgk@google.com>
    (cherry picked from commit 8b030e4)
    Reviewed-on: https://skia-review.googlesource.com/c/skia/+/935337
    Reviewed-by: James Godfrey-Kittle <jamesgk@google.com>
    Auto-Submit: Michael Ludwig <michaelludwig@google.com>
    Commit-Queue: Michael Ludwig <michaelludwig@google.com>
    James Godfrey-Kittle authored and SkCQ committed Jan 6, 2025
    Copy the full SHA
    c17fe9b View commit details

Commits on Jan 30, 2025

  1. [Cherry-pick][Fontations] Protect path retrieval arrays with lock

    Addresses issue with concurrent access to SkFontationsScalerContext, in
    particular with regards to writing and resizing of path extraction
    buffers.
    
    Test: Manually verified with poc.html/font.woff2 from issue.
    Bug: chromium:390889644
    Cq-Include-Trybots: luci.skia.skia.primary:Build-Debian10-Clang-x86_64-Debug-Fontations,Build-Mac-Clang-x86_64-Debug-Fontations,Test-Debian10-Clang-GCE-CPU-AVX2-x86_64-Debug-All-NativeFonts_Fontations,Test-Mac12-Clang-MacBookPro16.2-CPU-AppleIntel-x86_64-Debug-All-NativeFonts_Fontations
    Change-Id: Ibf21569e80469a9991646586d15df50d18a669a1
    Reviewed-on: https://skia-review.googlesource.com/c/skia/+/938517
    Reviewed-by: Ben Wagner <bungeman@google.com>
    Reviewed-by: Dominik Röttsches <drott@google.com>
    Commit-Queue: Dominik Röttsches <drott@google.com>
    (cherry picked from commit 5a63237)
    Reviewed-on: https://skia-review.googlesource.com/c/skia/+/944376
    Commit-Queue: Ben Wagner <bungeman@google.com>
    drott authored and SkCQ committed Jan 30, 2025
    Copy the full SHA
    ee9db7d View commit details

Commits on Feb 21, 2025

  1. Copy the full SHA
    fc7c68d View commit details

Commits on Feb 22, 2025

  1. Copy the full SHA
    aed58f9 View commit details

Commits on Feb 24, 2025

  1. Copy the full SHA
    abfc6c0 View commit details

Commits on Feb 25, 2025

  1. Copy the full SHA
    e4c0d5c View commit details
  2. Copy the full SHA
    18e1bf1 View commit details
  3. Copy the full SHA
    fdfeadd View commit details
  4. Copy the full SHA
    4d3f7fa View commit details

Commits on Mar 5, 2025

  1. [sk4d] Improve backward compatibility for sk4d_font_create with null …

    …typeface
    
    In m122, the behavior when typeface is null was changed, which now indicates an empty typeface (e.g. no glyphs), instead of the default typeface.
    viniciusfbb committed Mar 5, 2025
    Copy the full SHA
    07a905a View commit details
  2. [sk4d] Improve backwards compatibility for sk4d_typefacefontprovider_…

    …create which no longer provided default font
    viniciusfbb committed Mar 5, 2025
    Copy the full SHA
    ec7e208 View commit details

Commits on Mar 8, 2025

  1. Copy the full SHA
    4a52866 View commit details

Commits on Mar 10, 2025

  1. [sk4d] Improve backwards compatibility for sk4d_typefacefontprovider_…

    …create which no longer provided default font
    viniciusfbb committed Mar 10, 2025
    Copy the full SHA
    a1213d9 View commit details

Commits on Mar 13, 2025

  1. Fixed an issue with the Android font manager and improved the backwar…

    …d compatibility code for default font manager creation.
    paulocesarbot committed Mar 13, 2025
    Copy the full SHA
    7831e9b View commit details
  2. Copy the full SHA
    8127810 View commit details
  3. Fixed an access violation in Flush() and FlushAndSubmit() of SkSurfac…

    …e when using the raster backend.
    paulocesarbot committed Mar 13, 2025
    Copy the full SHA
    1eecc68 View commit details

Commits on Mar 14, 2025

  1. Ensures the global variable gICU is initialized only once via SkGetIC…

    …ULib, preventing multiple SkUnicode instances and potential issues in multi-threaded environments.
    paulocesarbot committed Mar 14, 2025
    Copy the full SHA
    d1aa665 View commit details
  2. This patch attempts to fix static linkage issues by disabling AVX2 an…

    …d AVX512 by default, and includes a minor SkUnicode fix.
    paulocesarbot committed Mar 14, 2025
    Copy the full SHA
    b5c13d8 View commit details
  3. A minor correction to the previous patch, allowing compilation with l…

    …lvm-mingw without AVX2 or AVX512.
    paulocesarbot committed Mar 14, 2025
    Copy the full SHA
    911c6ac View commit details
  4. Copy the full SHA
    df26a95 View commit details
  5. Copy the full SHA
    ff318ce View commit details
  6. Revert "Fix for llvm-mingw Win64 build."

    This reverts commit df26a95.
    viniciusfbb committed Mar 14, 2025
    Copy the full SHA
    c7e30f0 View commit details
  7. Revert "A minor correction to the previous patch, allowing compilatio…

    …n with llvm-mingw without AVX2 or AVX512."
    
    This reverts commit 911c6ac.
    viniciusfbb committed Mar 14, 2025
    Copy the full SHA
    e848d49 View commit details
  8. Revert "This patch attempts to fix static linkage issues by disabling…

    … AVX2 and AVX512 by default, and includes a minor SkUnicode fix."
    
    This reverts commit b5c13d8.
    viniciusfbb committed Mar 14, 2025
    Copy the full SHA
    76daa70 View commit details
  9. Revert "Ensures the global variable gICU is initialized only once via…

    … SkGetICULib, preventing multiple SkUnicode instances and potential issues in multi-threaded environments."
    
    This reverts commit d1aa665.
    viniciusfbb committed Mar 14, 2025
    Copy the full SHA
    11d3f02 View commit details
  10. Removed AVX2 and AVX512 usage for Windows, as Windows ARM64 under Par…

    …allels lacks AVX2 support and AVX512 is limited to certain processors, aligning with Delphi users' need for maximum backward compatibility.
    paulocesarbot committed Mar 14, 2025
    Copy the full SHA
    4c14e4c View commit details
Showing with 11,194 additions and 320 deletions.
  1. +262 −22 BUILD.gn
  2. +1 −0 DEPS
  3. +13 −0 RELEASE_NOTES.md
  4. +2 −0 bin/fetch-gn
  5. +6 −4 gm/asyncrescaleandread.cpp
  6. +72 −34 gn/BUILDCONFIG.gn
  7. +2 −2 gn/portable/BUILD.gn
  8. +11 −1 gn/skia.gni
  9. +37 −13 gn/skia/BUILD.gn
  10. +34 −11 gn/toolchain/BUILD.gn
  11. +2 −1 include/core/SkSurface.h
  12. +2 −0 include/effects/SkRuntimeEffect.h
  13. +2 −2 include/private/base/SkAttributes.h
  14. +5 −0 infra/bots/deps/deps_gen.go
  15. +383 −168 infra/bots/jobs.json
  16. +23 −19 modules/skcms/BUILD.gn
  17. +9 −4 modules/skparagraph/src/FontCollection.cpp
  18. +1 −1 modules/skunicode/src/SkUnicode_icu.cpp
  19. +0 −1 relnotes/SkCodecHasHighBitDepthEncodedData.md
  20. +0 −3 relnotes/TimerQuery.md
  21. +0 −3 relnotes/WGLWaitSync.md
  22. +0 −1 relnotes/patheffect_dash.md
  23. +22 −0 sk4d/include/c/gr4d_backendsemaphore.h
  24. +39 −0 sk4d/include/c/gr4d_backendsurface.h
  25. +21 −0 sk4d/include/c/gr4d_backendsurfacemutablestate.h
  26. +22 −0 sk4d/include/c/gr4d_contextoptions.h
  27. +43 −0 sk4d/include/c/gr4d_directcontext.h
  28. +26 −0 sk4d/include/c/gr4d_gl_interface.h
  29. +22 −0 sk4d/include/c/gr4d_shadererrorhandler.h
  30. +23 −0 sk4d/include/c/gr4d_vk_extensions.h
  31. +21 −0 sk4d/include/c/sk4d_animatedwebpencoder.h
  32. +21 −0 sk4d/include/c/sk4d_blender.h
  33. +81 −0 sk4d/include/c/sk4d_canvas.h
  34. +35 −0 sk4d/include/c/sk4d_codec.h
  35. +30 −0 sk4d/include/c/sk4d_colorfilter.h
  36. +41 −0 sk4d/include/c/sk4d_colorspace.h
  37. +23 −0 sk4d/include/c/sk4d_data.h
  38. +26 −0 sk4d/include/c/sk4d_document.h
  39. +60 −0 sk4d/include/c/sk4d_font.h
  40. +36 −0 sk4d/include/c/sk4d_graphics.h
  41. +49 −0 sk4d/include/c/sk4d_image.h
  42. +21 −0 sk4d/include/c/sk4d_imageencoder.h
  43. +50 −0 sk4d/include/c/sk4d_imagefilter.h
  44. +24 −0 sk4d/include/c/sk4d_maskfilter.h
  45. +59 −0 sk4d/include/c/sk4d_paint.h
  46. +50 −0 sk4d/include/c/sk4d_path.h
  47. +52 −0 sk4d/include/c/sk4d_pathbuilder.h
  48. +33 −0 sk4d/include/c/sk4d_patheffect.h
  49. +27 −0 sk4d/include/c/sk4d_pathmeasure.h
  50. +26 −0 sk4d/include/c/sk4d_picture.h
  51. +24 −0 sk4d/include/c/sk4d_picturerecorder.h
  52. +39 −0 sk4d/include/c/sk4d_pixmap.h
  53. +23 −0 sk4d/include/c/sk4d_refcnt.h
  54. +54 −0 sk4d/include/c/sk4d_region.h
  55. +46 −0 sk4d/include/c/sk4d_rrect.h
  56. +49 −0 sk4d/include/c/sk4d_runtimeeffect.h
  57. +35 −0 sk4d/include/c/sk4d_shader.h
  58. +25 −0 sk4d/include/c/sk4d_stream.h
  59. +22 −0 sk4d/include/c/sk4d_string.h
  60. +36 −0 sk4d/include/c/sk4d_surface.h
  61. +20 −0 sk4d/include/c/sk4d_svgcanvas.h
  62. +26 −0 sk4d/include/c/sk4d_textblob.h
  63. +22 −0 sk4d/include/c/sk4d_tracememorydump.h
  64. +28 −0 sk4d/include/c/sk4d_typeface.h
  65. +865 −0 sk4d/include/c/sk4d_types.h
  66. +22 −0 sk4d/include/c/sk4d_vertices.h
  67. +71 −0 sk4d/include/core/Sk4DStream.h
  68. +43 −0 sk4d/include/core/Sk4DTraceMemoryDump.h
  69. +38 −0 sk4d/include/gpu/Gr4DContextOptions.h
  70. +35 −0 sk4d/include/gpu/Gr4DShaderErrorHandler.h
  71. +14 −0 sk4d/include/sk4d_version.h
  72. +39 −0 sk4d/modules/particles/include/sk4d_particleeffect.h
  73. +97 −0 sk4d/modules/particles/src/sk4d_particleeffect.cpp
  74. +32 −0 sk4d/modules/skottie/include/sk4d_skottie.h
  75. +24 −0 sk4d/modules/skottie/include/sk4d_skottie_types.h
  76. +71 −0 sk4d/modules/skottie/src/sk4d_skottie.cpp
  77. +30 −0 sk4d/modules/skottie/src/sk4d_skottie_assertions.cpp
  78. +18 −0 sk4d/modules/skottie/src/sk4d_skottie_mapping.h
  79. +37 −0 sk4d/modules/skparagraph/include/sk4d_paragraph.h
  80. +141 −0 sk4d/modules/skparagraph/include/sk4d_paragraph_types.h
  81. +27 −0 sk4d/modules/skparagraph/include/sk4d_paragraphbuilder.h
  82. +57 −0 sk4d/modules/skparagraph/include/sk4d_paragraphstyle.h
  83. +59 −0 sk4d/modules/skparagraph/include/sk4d_textstyle.h
  84. +22 −0 sk4d/modules/skparagraph/include/sk4d_typefacefontprovider.h
  85. +127 −0 sk4d/modules/skparagraph/src/sk4d_paragraph.cpp
  86. +110 −0 sk4d/modules/skparagraph/src/sk4d_paragraph_assertions.cpp
  87. +65 −0 sk4d/modules/skparagraph/src/sk4d_paragraph_mapping.h
  88. +51 −0 sk4d/modules/skparagraph/src/sk4d_paragraphbuilder.cpp
  89. +176 −0 sk4d/modules/skparagraph/src/sk4d_paragraphstyle.cpp
  90. +183 −0 sk4d/modules/skparagraph/src/sk4d_textstyle.cpp
  91. +22 −0 sk4d/modules/skparagraph/src/sk4d_typefacefontprovider.cpp
  92. +36 −0 sk4d/modules/skresources/include/Sk4DResources.h
  93. +21 −0 sk4d/modules/skresources/include/sk4d_resources.h
  94. +25 −0 sk4d/modules/skresources/include/sk4d_resources_types.h
  95. +43 −0 sk4d/modules/skresources/src/Sk4DResources.cpp
  96. +19 −0 sk4d/modules/skresources/src/sk4d_resources.cpp
  97. +29 −0 sk4d/modules/skresources/src/sk4d_resources_assertions.cpp
  98. +21 −0 sk4d/modules/skresources/src/sk4d_resources_mapping.h
  99. +22 −0 sk4d/modules/skshaper/include/sk4d_shaper.h
  100. +20 −0 sk4d/modules/skshaper/include/sk4d_shaper_types.h
  101. +28 −0 sk4d/modules/skshaper/src/sk4d_shaper.cpp
  102. +18 −0 sk4d/modules/skshaper/src/sk4d_shaper_mapping.h
  103. +28 −0 sk4d/modules/skunicode/include/sk4d_unicode.h
  104. +42 −0 sk4d/modules/skunicode/include/sk4d_unicode_types.h
  105. +61 −0 sk4d/modules/skunicode/src/sk4d_unicode.cpp
  106. +28 −0 sk4d/modules/skunicode/src/sk4d_unicode_assertions.cpp
  107. +22 −0 sk4d/modules/skunicode/src/sk4d_unicode_mapping.h
  108. +65 −0 sk4d/modules/svg/include/sk4d_svg_types.h
  109. +27 −0 sk4d/modules/svg/include/sk4d_svgdom.h
  110. +20 −0 sk4d/modules/svg/include/sk4d_svgnode.h
  111. +32 −0 sk4d/modules/svg/include/sk4d_svgsvg.h
  112. +68 −0 sk4d/modules/svg/src/sk4d_svg_assertions.cpp
  113. +27 −0 sk4d/modules/svg/src/sk4d_svg_mapping.h
  114. +44 −0 sk4d/modules/svg/src/sk4d_svgdom.cpp
  115. +14 −0 sk4d/modules/svg/src/sk4d_svgnode.cpp
  116. +66 −0 sk4d/modules/svg/src/sk4d_svgsvg.cpp
  117. +22 −0 sk4d/src/c/gr4d_backendsemaphore.cpp
  118. +95 −0 sk4d/src/c/gr4d_backendsurface.cpp
  119. +19 −0 sk4d/src/c/gr4d_backendsurfacemutablestate.cpp
  120. +22 −0 sk4d/src/c/gr4d_contextoptions.cpp
  121. +111 −0 sk4d/src/c/gr4d_directcontext.cpp
  122. +38 −0 sk4d/src/c/gr4d_gl_interface.cpp
  123. +22 −0 sk4d/src/c/gr4d_shadererrorhandler.cpp
  124. +31 −0 sk4d/src/c/gr4d_vk_extensions.cpp
  125. +43 −0 sk4d/src/c/sk4d_animatedwebpencoder.cpp
  126. +511 −0 sk4d/src/c/sk4d_assertions.cpp
  127. +13 −0 sk4d/src/c/sk4d_assertions.h
  128. +18 −0 sk4d/src/c/sk4d_blender.cpp
  129. +264 −0 sk4d/src/c/sk4d_canvas.cpp
  130. +87 −0 sk4d/src/c/sk4d_codec.cpp
  131. +54 −0 sk4d/src/c/sk4d_colorfilter.cpp
  132. +106 −0 sk4d/src/c/sk4d_colorspace.cpp
  133. +26 −0 sk4d/src/c/sk4d_data.cpp
  134. +74 −0 sk4d/src/c/sk4d_document.cpp
  135. +195 −0 sk4d/src/c/sk4d_font.cpp
  136. +78 −0 sk4d/src/c/sk4d_graphics.cpp
  137. +195 −0 sk4d/src/c/sk4d_image.cpp
  138. +36 −0 sk4d/src/c/sk4d_imageencoder.cpp
  139. +180 −0 sk4d/src/c/sk4d_imagefilter.cpp
  140. +673 −0 sk4d/src/c/sk4d_mapping.h
  141. +30 −0 sk4d/src/c/sk4d_maskfilter.cpp
  142. +173 −0 sk4d/src/c/sk4d_paint.cpp
  143. +156 −0 sk4d/src/c/sk4d_path.cpp
  144. +142 −0 sk4d/src/c/sk4d_pathbuilder.cpp
  145. +71 −0 sk4d/src/c/sk4d_patheffect.cpp
  146. +49 −0 sk4d/src/c/sk4d_pathmeasure.cpp
  147. +41 −0 sk4d/src/c/sk4d_picture.cpp
  148. +30 −0 sk4d/src/c/sk4d_picturerecorder.cpp
  149. +92 −0 sk4d/src/c/sk4d_pixmap.cpp
  150. +18 −0 sk4d/src/c/sk4d_refcnt.cpp
  151. +159 −0 sk4d/src/c/sk4d_region.cpp
  152. +119 −0 sk4d/src/c/sk4d_rrect.cpp
  153. +230 −0 sk4d/src/c/sk4d_runtimeeffect.cpp
  154. +98 −0 sk4d/src/c/sk4d_shader.cpp
  155. +34 −0 sk4d/src/c/sk4d_stream.cpp
  156. +21 −0 sk4d/src/c/sk4d_string.cpp
  157. +128 −0 sk4d/src/c/sk4d_surface.cpp
  158. +14 −0 sk4d/src/c/sk4d_svgcanvas.cpp
  159. +38 −0 sk4d/src/c/sk4d_textblob.cpp
  160. +22 −0 sk4d/src/c/sk4d_tracememorydump.cpp
  161. +56 −0 sk4d/src/c/sk4d_typeface.cpp
  162. +22 −0 sk4d/src/c/sk4d_vertices.cpp
  163. +44 −0 sk4d/src/comp/include/effects/SkOpPathEffect.h
  164. +29 −0 sk4d/src/comp/include/effects/SkStrokeAndFillPathEffect.h
  165. +103 −0 sk4d/src/comp/src/effects/SkOpPE.h
  166. +242 −0 sk4d/src/comp/src/effects/SkOpPathEffect.cpp
  167. +107 −0 sk4d/src/core/Sk4DStream.cpp
  168. +47 −0 sk4d/src/core/Sk4DTraceMemoryDump.cpp
  169. +29 −0 sk4d/src/gpu/Gr4DContextOptions.cpp
  170. +25 −0 sk4d/src/gpu/Gr4DShaderErrorHandler.cpp
  171. +123 −0 sk4d/src/sk4d_comp.cpp
  172. +24 −0 sk4d/src/sk4d_comp.h
  173. +3 −3 src/core/SkRRect.cpp
  174. +9 −0 src/core/SkRuntimeEffect.cpp
  175. +18 −5 src/gpu/ganesh/ops/AAHairLinePathRenderer.cpp
  176. +2 −2 src/gpu/graphite/Context.cpp
  177. +1 −3 src/gpu/graphite/Recorder.cpp
  178. +1 −1 src/gpu/vk/vulkanmemoryallocator/BUILD.gn
  179. +7 −2 src/image/SkSurface_Raster.cpp
  180. +8 −0 src/ports/SkScalerContext_win_dw.cpp
  181. +7 −0 src/ports/SkTypeface_fontations.cpp
  182. +14 −1 src/utils/SkParse.cpp
  183. +14 −2 src/utils/SkParsePath.cpp
  184. +8 −0 src/xps/SkXPSDevice.cpp
  185. +15 −0 tests/RoundRectTest.cpp
  186. +12 −0 third_party/dng_sdk/BUILD.gn
  187. +19 −0 third_party/fastfloat/BUILD.gn
  188. +18 −8 third_party/icu/BUILD.gn
  189. +5 −0 third_party/icu/icu.gni
  190. +2 −2 third_party/third_party.gni
  191. +1 −1 tools/git-sync-deps
284 changes: 262 additions & 22 deletions BUILD.gn
Original file line number Diff line number Diff line change
@@ -170,19 +170,19 @@ is_loong64 = current_cpu == "loong64"
opts("hsw") {
enabled = is_x86
sources = skia_opts.hsw_sources
if (is_win) {
if (is_win && !is_mingw) {
cflags = [ "/arch:AVX2" ]
} else {
} else if (!is_win || !is_sk4d_build) {
cflags = [ "-march=haswell" ]
}
}

opts("skx") {
enabled = is_x86
sources = skia_opts.skx_sources
if (is_win) {
if (is_win && !is_mingw) {
cflags = [ "/arch:AVX512" ]
} else {
} else if (!is_win || !is_sk4d_build) {
cflags = [ "-march=skylake-avx512" ]
}
}
@@ -491,7 +491,11 @@ optional("fontmgr_win_gdi") {
public_defines = [ "SK_FONTMGR_GDI_AVAILABLE" ]
public = skia_ports_windows_fonts_public
sources = skia_ports_fonthost_win_sources
libs = [ "Gdi32.lib" ]
if (!is_mingw) {
libs = [ "Gdi32.lib" ]
} else {
libs = [ "Gdi32" ]
}
}

if (skia_lex) {
@@ -568,6 +572,12 @@ if (skia_compile_modules || skia_compile_sksl_tests) {
}
}

optional("fastfloat") {
enabled = skia_use_fastfloat
public_defines = [ "SK_FAST_FLOAT" ]
public_deps = [ "//third_party/fastfloat" ]
}

if (skia_compile_modules) {
# Generate the sksl-minify binary.
skia_executable("sksl-minify") {
@@ -598,7 +608,10 @@ if (skia_compile_modules) {
sources += skia_sksl_core_sources
sources += skia_sksl_codegen_sources
include_dirs = [ "." ]
deps = [ ":run_sksllex" ]
deps = [
":run_sksllex",
":fastfloat",
]
}

sksl_minify_path = "$root_out_dir/"
@@ -736,6 +749,7 @@ if (skia_compile_sksl_tests) {
"//third_party/externals/spirv-tools:spvtools",
"//third_party/externals/spirv-tools:spvtools_val",
"//third_party/spirv-cross:spirv_cross",
":fastfloat",
]
}

@@ -1016,8 +1030,12 @@ optional("gpu") {
"src/gpu/ganesh/gl/win/GrGLMakeNativeInterface_win.cpp",
"src/gpu/ganesh/gl/win/GrGLMakeWinInterface.cpp",
]
if (target_cpu != "arm64") {
libs += [ "OpenGL32.lib" ]
if (target_cpu != "arm64" || skia_link_gl_winarm) {
if (!is_mingw) {
libs += [ "OpenGL32.lib" ]
} else {
libs += [ "OpenGL32" ]
}
}
} else {
sources += [ "src/gpu/ganesh/gl/GrGLMakeNativeInterface_none.cpp" ]
@@ -1605,6 +1623,7 @@ skia_component("skia") {
":wuffs",
":xml",
"modules/skcms",
":fastfloat",
]

public = skia_core_public
@@ -1661,18 +1680,34 @@ skia_component("skia") {
"src/ports/SkDebug_win.cpp",
"src/ports/SkImageGeneratorWIC.cpp",
]
libs += [
"Ole32.lib",
"OleAut32.lib",
]

if (!skia_enable_winuwp) {
if (!is_mingw) {
libs += [
"Ole32.lib",
"OleAut32.lib",
]
} else {
libs += [
"FontSub.lib",
"User32.lib",
"Usp10.lib",
"Ole32",
"OleAut32",
"Uuid",
]
}

if (!skia_enable_winuwp) {
if (!is_mingw) {
libs += [
"FontSub.lib",
"User32.lib",
"Usp10.lib",
]
} else {
libs += [
"FontSub",
"User32",
"Usp10",
]
}
}
} else {
sources += [ "src/ports/SkOSFile_posix.cpp" ]
if (is_ios) {
@@ -1772,7 +1807,10 @@ skia_static_library("pathkit") {
public_configs = [ ":skia_public" ]
configs = skia_library_configs

deps = [ ":hsw" ]
deps = [
":hsw",
":fastfloat",
]

sources = []
sources += skia_pathops_sources
@@ -1928,7 +1966,7 @@ if (skia_enable_tools) {
}

config("cpp17") {
if (is_win) {
if (is_win && !is_mingw) {
cflags_cc = [ "/std:c++17" ]
} else {
cflags_cc = [ "-std=c++17" ]
@@ -2137,9 +2175,17 @@ if (skia_enable_tools) {
"tools/gpu/gl/win/SkWGL.h",
"tools/gpu/gl/win/SkWGL_win.cpp",
]
libs += [ "Gdi32.lib" ]
if (target_cpu != "arm64") {
libs += [ "OpenGL32.lib" ]
if (!is_mingw) {
libs += [ "Gdi32.lib" ]
} else {
libs += [ "Gdi32" ]
}
if (target_cpu != "arm64" || skia_link_gl_winarm) {
if (!is_mingw) {
libs += [ "OpenGL32.lib" ]
} else {
libs += [ "OpenGL32" ]
}
}
}
}
@@ -3595,3 +3641,197 @@ if (skia_build_rust_targets) {
]
}
}

if (is_sk4d_build) {
config("sk4d_public") {
include_dirs = [
"sk4d",
"sk4d/src/comp",
]
defines = []
if (is_sk4d_component_build) {
defines += [ "SK4D_DLL" ]
}
}

sk4d_component("sk4d") {
defines = [ "SK4D_IMPLEMENTATION=1" ]
deps = [
":skia",
"modules/skottie",
"modules/skparagraph",
"modules/skshaper",
"modules/svg",
"modules/skunicode",
]
public_configs = [ ":sk4d_public" ]
public = [
"sk4d/include/sk4d_version.h",
"sk4d/include/c/gr4d_backendsemaphore.h",
"sk4d/include/c/gr4d_backendsurface.h",
"sk4d/include/c/gr4d_backendsurfacemutablestate.h",
"sk4d/include/c/gr4d_contextoptions.h",
"sk4d/include/c/gr4d_directcontext.h",
"sk4d/include/c/gr4d_gl_interface.h",
"sk4d/include/c/gr4d_shadererrorhandler.h",
"sk4d/include/c/gr4d_vk_extensions.h",
"sk4d/include/c/sk4d_animatedwebpencoder.h",
"sk4d/include/c/sk4d_blender.h",
"sk4d/include/c/sk4d_canvas.h",
"sk4d/include/c/sk4d_codec.h",
"sk4d/include/c/sk4d_colorfilter.h",
"sk4d/include/c/sk4d_colorspace.h",
"sk4d/include/c/sk4d_data.h",
"sk4d/include/c/sk4d_document.h",
"sk4d/include/c/sk4d_font.h",
"sk4d/include/c/sk4d_graphics.h",
"sk4d/include/c/sk4d_image.h",
"sk4d/include/c/sk4d_imageencoder.h",
"sk4d/include/c/sk4d_imagefilter.h",
"sk4d/include/c/sk4d_maskfilter.h",
"sk4d/include/c/sk4d_paint.h",
"sk4d/include/c/sk4d_path.h",
"sk4d/include/c/sk4d_pathbuilder.h",
"sk4d/include/c/sk4d_patheffect.h",
"sk4d/include/c/sk4d_pathmeasure.h",
"sk4d/include/c/sk4d_picture.h",
"sk4d/include/c/sk4d_picturerecorder.h",
"sk4d/include/c/sk4d_pixmap.h",
"sk4d/include/c/sk4d_refcnt.h",
"sk4d/include/c/sk4d_region.h",
"sk4d/include/c/sk4d_rrect.h",
"sk4d/include/c/sk4d_runtimeeffect.h",
"sk4d/include/c/sk4d_shader.h",
"sk4d/include/c/sk4d_stream.h",
"sk4d/include/c/sk4d_string.h",
"sk4d/include/c/sk4d_surface.h",
"sk4d/include/c/sk4d_svgcanvas.h",
"sk4d/include/c/sk4d_textblob.h",
"sk4d/include/c/sk4d_tracememorydump.h",
"sk4d/include/c/sk4d_typeface.h",
"sk4d/include/c/sk4d_types.h",
"sk4d/include/c/sk4d_vertices.h",
"sk4d/include/core/Sk4DStream.h",
"sk4d/include/core/Sk4DTraceMemoryDump.h",
"sk4d/modules/particles/include/sk4d_particleeffect.h",
"sk4d/modules/skottie/include/sk4d_skottie.h",
"sk4d/modules/skottie/include/sk4d_skottie_types.h",
"sk4d/modules/skparagraph/include/sk4d_paragraph.h",
"sk4d/modules/skparagraph/include/sk4d_paragraph_types.h",
"sk4d/modules/skparagraph/include/sk4d_paragraphbuilder.h",
"sk4d/modules/skparagraph/include/sk4d_paragraphstyle.h",
"sk4d/modules/skparagraph/include/sk4d_textstyle.h",
"sk4d/modules/skparagraph/include/sk4d_typefacefontprovider.h",
"sk4d/modules/skresources/include/sk4d_resources.h",
"sk4d/modules/skresources/include/sk4d_resources_types.h",
"sk4d/modules/skresources/include/Sk4DResources.h",
"sk4d/modules/skshaper/include/sk4d_shaper.h",
"sk4d/modules/skshaper/include/sk4d_shaper_types.h",
"sk4d/modules/skunicode/include/sk4d_unicode.h",
"sk4d/modules/skunicode/include/sk4d_unicode_types.h",
"sk4d/modules/svg/include/sk4d_svg_types.h",
"sk4d/modules/svg/include/sk4d_svgdom.h",
"sk4d/modules/svg/include/sk4d_svgnode.h",
"sk4d/modules/svg/include/sk4d_svgsvg.h",
]
sources = [
"sk4d/src/c/gr4d_backendsemaphore.cpp",
"sk4d/src/c/gr4d_backendsurface.cpp",
"sk4d/src/c/gr4d_backendsurfacemutablestate.cpp",
"sk4d/src/c/gr4d_contextoptions.cpp",
"sk4d/src/c/gr4d_directcontext.cpp",
"sk4d/src/c/gr4d_gl_interface.cpp",
"sk4d/src/c/gr4d_shadererrorhandler.cpp",
"sk4d/src/c/gr4d_vk_extensions.cpp",
"sk4d/src/c/sk4d_animatedwebpencoder.cpp",
"sk4d/src/c/sk4d_blender.cpp",
"sk4d/src/c/sk4d_canvas.cpp",
"sk4d/src/c/sk4d_codec.cpp",
"sk4d/src/c/sk4d_colorfilter.cpp",
"sk4d/src/c/sk4d_colorspace.cpp",
"sk4d/src/c/sk4d_data.cpp",
"sk4d/src/c/sk4d_document.cpp",
"sk4d/src/c/sk4d_font.cpp",
"sk4d/src/c/sk4d_graphics.cpp",
"sk4d/src/c/sk4d_image.cpp",
"sk4d/src/c/sk4d_imageencoder.cpp",
"sk4d/src/c/sk4d_imagefilter.cpp",
"sk4d/src/c/sk4d_mapping.h",
"sk4d/src/c/sk4d_maskfilter.cpp",
"sk4d/src/c/sk4d_paint.cpp",
"sk4d/src/c/sk4d_path.cpp",
"sk4d/src/c/sk4d_pathbuilder.cpp",
"sk4d/src/c/sk4d_patheffect.cpp",
"sk4d/src/c/sk4d_pathmeasure.cpp",
"sk4d/src/c/sk4d_picture.cpp",
"sk4d/src/c/sk4d_picturerecorder.cpp",
"sk4d/src/c/sk4d_pixmap.cpp",
"sk4d/src/c/sk4d_refcnt.cpp",
"sk4d/src/c/sk4d_region.cpp",
"sk4d/src/c/sk4d_rrect.cpp",
"sk4d/src/c/sk4d_runtimeeffect.cpp",
"sk4d/src/c/sk4d_shader.cpp",
"sk4d/src/c/sk4d_stream.cpp",
"sk4d/src/c/sk4d_string.cpp",
"sk4d/src/c/sk4d_surface.cpp",
"sk4d/src/c/sk4d_svgcanvas.cpp",
"sk4d/src/c/sk4d_textblob.cpp",
"sk4d/src/c/sk4d_tracememorydump.cpp",
"sk4d/src/c/sk4d_typeface.cpp",
"sk4d/src/c/sk4d_vertices.cpp",
"sk4d/src/core/Sk4DStream.cpp",
"sk4d/src/core/Sk4DTraceMemoryDump.cpp",
"sk4d/src/sk4d_comp.cpp",
"sk4d/src/sk4d_comp.h",
"sk4d/modules/particles/src/sk4d_particleeffect.cpp",
"sk4d/modules/skottie/src/sk4d_skottie.cpp",
"sk4d/modules/skottie/src/sk4d_skottie_mapping.h",
"sk4d/modules/skparagraph/src/sk4d_paragraph.cpp",
"sk4d/modules/skparagraph/src/sk4d_paragraph_mapping.h",
"sk4d/modules/skparagraph/src/sk4d_paragraphbuilder.cpp",
"sk4d/modules/skparagraph/src/sk4d_paragraphstyle.cpp",
"sk4d/modules/skparagraph/src/sk4d_textstyle.cpp",
"sk4d/modules/skparagraph/src/sk4d_typefacefontprovider.cpp",
"sk4d/modules/skresources/src/sk4d_resources.cpp",
"sk4d/modules/skresources/src/sk4d_resources_mapping.h",
"sk4d/modules/skresources/src/Sk4DResources.cpp",
"sk4d/modules/skshaper/src/sk4d_shaper.cpp",
"sk4d/modules/skshaper/src/sk4d_shaper_mapping.h",
"sk4d/modules/skunicode/src/sk4d_unicode.cpp",
"sk4d/modules/skunicode/src/sk4d_unicode_mapping.h",
"sk4d/modules/svg/src/sk4d_svg_mapping.h",
"sk4d/modules/svg/src/sk4d_svgdom.cpp",
"sk4d/modules/svg/src/sk4d_svgnode.cpp",
"sk4d/modules/svg/src/sk4d_svgsvg.cpp",
"sk4d/src/comp/include/effects/SkOpPathEffect.h",
"sk4d/src/comp/src/effects/SkOpPathEffect.cpp",
"sk4d/src/comp/src/effects/SkOpPE.h",
]
if (sk4d_enable_assertions) {
sources += [
"sk4d/src/c/sk4d_assertions.cpp",
"sk4d/src/c/sk4d_assertions.h",
"sk4d/modules/skottie/src/sk4d_skottie_assertions.cpp",
"sk4d/modules/skparagraph/src/sk4d_paragraph_assertions.cpp",
"sk4d/modules/skresources/src/sk4d_resources_assertions.cpp",
"sk4d/modules/skunicode/src/sk4d_unicode_assertions.cpp",
"sk4d/modules/svg/src/sk4d_svg_assertions.cpp",
]
}
if (skia_enable_gpu) {
public += [
"sk4d/include/gpu/Gr4DContextOptions.h",
"sk4d/include/gpu/Gr4DShaderErrorHandler.h",
]
sources += [
"sk4d/src/gpu/Gr4DContextOptions.cpp",
"sk4d/src/gpu/Gr4DShaderErrorHandler.cpp",
]
# To ensure Vulkan headers are compatible with Skia, always use the ones
# provided with Skia.
if (skia_use_vulkan) {
all_dependent_configs = [ ":use_skia_vulkan_headers" ]
}
}
}
}
1 change: 1 addition & 0 deletions DEPS
Original file line number Diff line number Diff line change
@@ -80,6 +80,7 @@ deps = {
#"third_party/externals/v8" : "https://chromium.googlesource.com/v8/v8.git@5f1ae66d5634e43563b2d25ea652dfb94c31a3b4",
"third_party/externals/wuffs" : "https://skia.googlesource.com/external/github.com/google/wuffs-mirror-release-c.git@e3f919ccfe3ef542cfc983a82146070258fb57f8",
"third_party/externals/zlib" : "https://chromium.googlesource.com/chromium/src/third_party/zlib@646b7f569718921d7d4b5b8e22572ff6c76f2596",
"third_party/externals/fastfloat" : "https://github.com/skia4delphi/fast_float.git@77cc847c842c49e7e3477c1e95da2b6540166d66",

'bin': {
'packages': [
Loading