Issue 14317 in skia: Remove references to GPU code from src/core

kjlub… via monorail

unread,

May 17, 2023, 11:07:23 AM5/17/23

to bu...@skia.org

Updates:
	Labels: -Restrict-View-Google Type-Task

Comment #1 on issue 14317 by kjlu...@google.com: Remove references to GPU code from src/core
https://bugs.chromium.org/p/skia/issues/detail?id=14317#c1

(No comment was entered for this change.)

-- 
You received this message because:
  1. The project was configured to send all issue notifications to this address

You may adjust your notification preferences at:
https://bugs.chromium.org/hosting/settings

Git Watcher via monorail

unread,

May 17, 2023, 2:06:09 PM5/17/23

to bu...@skia.org

Comment #2 on issue 14317 by Git Watcher: Remove references to GPU code from src/core
https://bugs.chromium.org/p/skia/issues/detail?id=14317#c2

The following revision refers to this bug:
  https://skia.googlesource.com/skia/+/69e76e99035d19c758a27af206a37961cf201454

commit 69e76e99035d19c758a27af206a37961cf201454
Author: Kevin Lubick <kjlu...@google.com>
Date: Wed May 17 15:23:10 2023

Move SkStrikeSpec::MakeSDFT to src/text/gpu

This removes a few links between src/core and gpu code

Change-Id: I5f873864fcbc64b09a0846b1e77650944870a434
Bug: skia:14317
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/699597
Reviewed-by: Herb Derby <he...@google.com>
Commit-Queue: Kevin Lubick <kjlu...@google.com>
Reviewed-by: Jim Van Verth <jvan...@google.com>

[modify] https://crrev.com/69e76e99035d19c758a27af206a37961cf201454/src/text/gpu/SubRunContainer.cpp
[modify] https://crrev.com/69e76e99035d19c758a27af206a37961cf201454/src/core/SkStrikeSpec.cpp
[modify] https://crrev.com/69e76e99035d19c758a27af206a37961cf201454/src/core/SkStrikeSpec.h

Git Watcher via monorail

unread,

May 17, 2023, 2:06:12 PM5/17/23

to bu...@skia.org

Comment #3 on issue 14317 by Git Watcher: Remove references to GPU code from src/core
https://bugs.chromium.org/p/skia/issues/detail?id=14317#c3

The following revision refers to this bug:
  

https://skia.googlesource.com/skia/+/a7e578d89004c53dda29b1ad5f240e14233c7bb1

commit a7e578d89004c53dda29b1ad5f240e14233c7bb1
Author: Kevin Lubick <kjlu...@google.com>
Date: Wed May 17 15:04:54 2023

Enforce IWYU on SkStrike* and src/text/*

Change-Id: Ibea57656724ea2a09b8172ec3ca58e0bd3f6b83f
Bug: skia:13052, skia:14317
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/698842
Reviewed-by: Herb Derby <he...@google.com>

[modify] https://crrev.com/a7e578d89004c53dda29b1ad5f240e14233c7bb1/src/text/gpu/SDFTControl.h
[modify] https://crrev.com/a7e578d89004c53dda29b1ad5f240e14233c7bb1/src/text/gpu/TextBlobRedrawCoordinator.h
[modify] https://crrev.com/a7e578d89004c53dda29b1ad5f240e14233c7bb1/src/text/GlyphRun.cpp
[modify] https://crrev.com/a7e578d89004c53dda29b1ad5f240e14233c7bb1/src/text/gpu/StrikeCache.h
[modify] https://crrev.com/a7e578d89004c53dda29b1ad5f240e14233c7bb1/src/text/gpu/SDFTControl.cpp
[modify] https://crrev.com/a7e578d89004c53dda29b1ad5f240e14233c7bb1/src/text/StrikeForGPU.cpp
[modify] https://crrev.com/a7e578d89004c53dda29b1ad5f240e14233c7bb1/src/core/SkStrikeSpec.cpp
[modify] https://crrev.com/a7e578d89004c53dda29b1ad5f240e14233c7bb1/src/text/gpu/TextBlob.h
[modify] https://crrev.com/a7e578d89004c53dda29b1ad5f240e14233c7bb1/src/core/SkStrikeSpec.h
[modify] https://crrev.com/a7e578d89004c53dda29b1ad5f240e14233c7bb1/src/text/gpu/SDFMaskFilter.cpp
[modify] https://crrev.com/a7e578d89004c53dda29b1ad5f240e14233c7bb1/src/text/gpu/SubRunContainer.cpp
[modify] https://crrev.com/a7e578d89004c53dda29b1ad5f240e14233c7bb1/src/text/StrikeForGPU.h
[modify] https://crrev.com/a7e578d89004c53dda29b1ad5f240e14233c7bb1/src/text/gpu/SubRunAllocator.h
[modify] https://crrev.com/a7e578d89004c53dda29b1ad5f240e14233c7bb1/src/text/gpu/SubRunContainer.h
[modify] https://crrev.com/a7e578d89004c53dda29b1ad5f240e14233c7bb1/src/core/SkStrike.cpp
[modify] https://crrev.com/a7e578d89004c53dda29b1ad5f240e14233c7bb1/src/core/SkStrikeCache.h
[modify] https://crrev.com/a7e578d89004c53dda29b1ad5f240e14233c7bb1/src/core/SkStrikeCache.cpp
[modify] https://crrev.com/a7e578d89004c53dda29b1ad5f240e14233c7bb1/src/core/SkStrike.h
[modify] https://crrev.com/a7e578d89004c53dda29b1ad5f240e14233c7bb1/src/text/gpu/TextBlobRedrawCoordinator.cpp
[modify] https://crrev.com/a7e578d89004c53dda29b1ad5f240e14233c7bb1/src/text/gpu/SDFMaskFilter.h
[modify] https://crrev.com/a7e578d89004c53dda29b1ad5f240e14233c7bb1/toolchain/linux_trampolines/clang_trampoline_linux.sh
[modify] https://crrev.com/a7e578d89004c53dda29b1ad5f240e14233c7bb1/src/text/gpu/GlyphVector.cpp
[modify] https://crrev.com/a7e578d89004c53dda29b1ad5f240e14233c7bb1/src/text/gpu/TextBlob.cpp
[modify] https://crrev.com/a7e578d89004c53dda29b1ad5f240e14233c7bb1/src/text/gpu/Slug.cpp
[modify] https://crrev.com/a7e578d89004c53dda29b1ad5f240e14233c7bb1/src/core/SkChromeRemoteGlyphCache.cpp
[modify] https://crrev.com/a7e578d89004c53dda29b1ad5f240e14233c7bb1/src/text/gpu/StrikeCache.cpp
[modify] https://crrev.com/a7e578d89004c53dda29b1ad5f240e14233c7bb1/src/text/gpu/GlyphVector.h
[modify] https://crrev.com/a7e578d89004c53dda29b1ad5f240e14233c7bb1/src/text/GlyphRun.h
[modify] https://crrev.com/a7e578d89004c53dda29b1ad5f240e14233c7bb1/include/private/chromium/Slug.h
[modify] https://crrev.com/a7e578d89004c53dda29b1ad5f240e14233c7bb1/src/text/gpu/DistanceFieldAdjustTable.cpp
[modify] https://crrev.com/a7e578d89004c53dda29b1ad5f240e14233c7bb1/src/text/gpu/SubRunAllocator.cpp

Git Watcher via monorail

unread,

May 22, 2023, 9:55:06 AM5/22/23

to bu...@skia.org

Comment #4 on issue 14317 by Git Watcher: Remove references to GPU code from src/core
https://bugs.chromium.org/p/skia/issues/detail?id=14317#c4

The following revision refers to this bug:
  

https://skia.googlesource.com/skia/+/2612bb159848f42dd201630e19f3bfb589f6fffb

commit 2612bb159848f42dd201630e19f3bfb589f6fffb
Author: Kevin Lubick <kjlu...@google.com>
Date: Fri May 19 15:42:55 2023

Remove GPU code from MaskFilters

This splits src/core/SkBlurMF.cpp -> SkBlurMaskFilterImpl.h/.cpp
and moves the GPU specific parts to src/gpu/ganesh/GrBlurUtils.cpp.
It appeared only the Blur MaskFilter used the filter mask virtuals
on SkMaskFilterBase, so I removed them.

Additionally, I split src/effects/SkShaderMaskFilter.cpp ->
SkShaderMaskFilterImpl.h/.cpp and moved the fragment processor
creation code to (newly created)
src/gpu/ganesh/GrFragmentProcessors.h/.cpp, where I think we will
be able to move other asFragmentProcessor methods as time goes on.
The Shader MaskFilter was the only implementor of asFragmentProcessor
so I also removed that from the base mask filter class.

Then I enforced IWYU on GrBlurUtils and GrFragmentProcessors.

I contemplated moving MaskFilter and BlurMaskFilterImpl into
src/effects, but that can be its own CL if we want.

Change-Id: Icea867671f05ed70b5b39bcc74aead20adedb9f9
Bug: skia:14317
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/700227
Reviewed-by: Michael Ludwig <michae...@google.com>
Commit-Queue: Kevin Lubick <kjlu...@google.com>

[modify] https://crrev.com/2612bb159848f42dd201630e19f3bfb589f6fffb/src/gpu/ganesh/BUILD.bazel
[modify] https://crrev.com/2612bb159848f42dd201630e19f3bfb589f6fffb/gn/core.gni
[modify] https://crrev.com/2612bb159848f42dd201630e19f3bfb589f6fffb/src/effects/SkEmbossMaskFilter.h
[modify] https://crrev.com/2612bb159848f42dd201630e19f3bfb589f6fffb/src/core/BUILD.bazel
[add] https://crrev.com/2612bb159848f42dd201630e19f3bfb589f6fffb/src/core/SkBlurMaskFilterImpl.h
[modify] https://crrev.com/2612bb159848f42dd201630e19f3bfb589f6fffb/src/gpu/ganesh/GrBlurUtils.cpp
[modify] https://crrev.com/2612bb159848f42dd201630e19f3bfb589f6fffb/src/text/gpu/SDFMaskFilter.cpp
[add] https://crrev.com/2612bb159848f42dd201630e19f3bfb589f6fffb/src/effects/SkShaderMaskFilterImpl.cpp
[modify] https://crrev.com/2612bb159848f42dd201630e19f3bfb589f6fffb/src/gpu/ganesh/GrBlurUtils.h
[add] https://crrev.com/2612bb159848f42dd201630e19f3bfb589f6fffb/src/effects/SkShaderMaskFilterImpl.h
[modify] https://crrev.com/2612bb159848f42dd201630e19f3bfb589f6fffb/src/core/SkMaskFilterBase.h
[add] https://crrev.com/2612bb159848f42dd201630e19f3bfb589f6fffb/src/gpu/ganesh/GrFragmentProcessors.h
[modify] https://crrev.com/2612bb159848f42dd201630e19f3bfb589f6fffb/src/gpu/ganesh/SkGr.cpp
[modify] https://crrev.com/2612bb159848f42dd201630e19f3bfb589f6fffb/src/core/SkMaskFilter.cpp
[modify] https://crrev.com/2612bb159848f42dd201630e19f3bfb589f6fffb/toolchain/linux_trampolines/clang_trampoline_linux.sh
[modify] https://crrev.com/2612bb159848f42dd201630e19f3bfb589f6fffb/gn/effects.gni
[add] https://crrev.com/2612bb159848f42dd201630e19f3bfb589f6fffb/src/core/SkBlurMaskFilterImpl.cpp
[modify] https://crrev.com/2612bb159848f42dd201630e19f3bfb589f6fffb/gn/gpu.gni
[modify] https://crrev.com/2612bb159848f42dd201630e19f3bfb589f6fffb/src/effects/BUILD.bazel
[modify] https://crrev.com/2612bb159848f42dd201630e19f3bfb589f6fffb/src/gpu/ganesh/Device_drawTexture.cpp
[delete] https://crrev.com/ef226c5a7930c04e78f987ff7bfb14f487baf79f/src/effects/SkShaderMaskFilter.cpp
[delete] https://crrev.com/ef226c5a7930c04e78f987ff7bfb14f487baf79f/src/core/SkBlurMF.cpp
[modify] https://crrev.com/2612bb159848f42dd201630e19f3bfb589f6fffb/public.bzl
[add] https://crrev.com/2612bb159848f42dd201630e19f3bfb589f6fffb/src/gpu/ganesh/GrFragmentProcessors.cpp
[modify] https://crrev.com/2612bb159848f42dd201630e19f3bfb589f6fffb/src/effects/SkTableMaskFilter.cpp
[modify] https://crrev.com/2612bb159848f42dd201630e19f3bfb589f6fffb/src/gpu/ganesh/Device.cpp

Git Watcher via monorail

unread,

May 25, 2023, 11:21:06 AM5/25/23

to bu...@skia.org

Comment #5 on issue 14317 by Git Watcher: Remove references to GPU code from src/core
https://bugs.chromium.org/p/skia/issues/detail?id=14317#c5

The following revision refers to this bug:
  

https://skia.googlesource.com/skia/+/38aca78130748ee7d5386c009ca7230ab5e52b18

commit 38aca78130748ee7d5386c009ca7230ab5e52b18
Author: Kevin Lubick <kjlu...@google.com>
Date: Thu May 25 14:13:03 2023

Remove Ganesh code from SkBlenderBase and SkBlendModeBlender

This copies SkRuntimeEffect::make_effect_fp into GrFragmentProcessors
and that copy should be removed when other parts of SkRuntimeEffect
are decoupled from Ganesh.

In order to move SkRuntimeBlender into its own header, I hoisted some
classes and functions to SkRuntimeEffectPriv. I also enforced IWYU
on SkRuntimeEffect.cpp and the newly added SkRuntimeBlender.cpp

Change-Id: I9da04a64ac4d31949532f7fc3f8010b1b58c94f3
Bug: skia:14317
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/701520
Reviewed-by: Brian Osman <brian...@google.com>
Commit-Queue: Kevin Lubick <kjlu...@google.com>

[modify] https://crrev.com/38aca78130748ee7d5386c009ca7230ab5e52b18/src/core/SkBlendModeBlender.cpp
[modify] https://crrev.com/38aca78130748ee7d5386c009ca7230ab5e52b18/src/core/SkBlenderBase.h
[modify] https://crrev.com/38aca78130748ee7d5386c009ca7230ab5e52b18/gn/core.gni
[add] https://crrev.com/38aca78130748ee7d5386c009ca7230ab5e52b18/src/core/SkRuntimeBlender.h
[modify] https://crrev.com/38aca78130748ee7d5386c009ca7230ab5e52b18/src/gpu/ganesh/GrFragmentProcessors.h
[modify] https://crrev.com/38aca78130748ee7d5386c009ca7230ab5e52b18/src/core/BUILD.bazel
[modify] https://crrev.com/38aca78130748ee7d5386c009ca7230ab5e52b18/src/gpu/ganesh/SkGr.cpp
[modify] https://crrev.com/38aca78130748ee7d5386c009ca7230ab5e52b18/toolchain/linux_trampolines/clang_trampoline_linux.sh
[modify] https://crrev.com/38aca78130748ee7d5386c009ca7230ab5e52b18/src/core/SkBlendModeBlender.h
[modify] https://crrev.com/38aca78130748ee7d5386c009ca7230ab5e52b18/src/effects/imagefilters/SkBlendImageFilter.cpp
[add] https://crrev.com/38aca78130748ee7d5386c009ca7230ab5e52b18/src/core/SkRuntimeBlender.cpp
[modify] https://crrev.com/38aca78130748ee7d5386c009ca7230ab5e52b18/src/core/SkRuntimeEffect.cpp
[modify] https://crrev.com/38aca78130748ee7d5386c009ca7230ab5e52b18/src/core/SkRuntimeEffectPriv.h
[modify] https://crrev.com/38aca78130748ee7d5386c009ca7230ab5e52b18/src/BUILD.bazel
[modify] https://crrev.com/38aca78130748ee7d5386c009ca7230ab5e52b18/include/core/SkBlender.h
[modify] https://crrev.com/38aca78130748ee7d5386c009ca7230ab5e52b18/public.bzl
[modify] https://crrev.com/38aca78130748ee7d5386c009ca7230ab5e52b18/include/effects/SkRuntimeEffect.h
[modify] https://crrev.com/38aca78130748ee7d5386c009ca7230ab5e52b18/src/gpu/ganesh/GrFragmentProcessors.cpp

Git Watcher via monorail

unread,

May 26, 2023, 2:39:06 PM5/26/23

to bu...@skia.org

Comment #6 on issue 14317 by Git Watcher: Remove references to GPU code from src/core
https://bugs.chromium.org/p/skia/issues/detail?id=14317#c6

The following revision refers to this bug:
  

https://skia.googlesource.com/skia/+/8d475ae01f098f137f939572aca311fb3df4ac4e

commit 8d475ae01f098f137f939572aca311fb3df4ac4e
Author: Kevin Lubick <kjlu...@google.com>
Date: Fri May 26 15:26:49 2023

Remove SkTableColorFilter from public API

Client CLs:
 - http://cl/535621706
 - https://crrev.com/c/4566410

This allows us to refactor colorfilters to have a more internal
naming convention as we decouple the Ganesh backend from them.

Change-Id: I1630c263c6a6b66b0b29a94340936252840bcc85
Bug: skia:14317
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/703936
Reviewed-by: Brian Osman <brian...@google.com>
Reviewed-by: Michael Ludwig <michae...@google.com>

[delete] https://crrev.com/cf317a61ca972d909e9ab3a8358b6c308cf489f6/include/effects/SkTableColorFilter.h
[add] https://crrev.com/8d475ae01f098f137f939572aca311fb3df4ac4e/relnotes/sktablecolorfilter.md
[modify] https://crrev.com/8d475ae01f098f137f939572aca311fb3df4ac4e/include/effects/BUILD.bazel
[modify] https://crrev.com/8d475ae01f098f137f939572aca311fb3df4ac4e/gn/effects.gni
[modify] https://crrev.com/8d475ae01f098f137f939572aca311fb3df4ac4e/public.bzl
[modify] https://crrev.com/8d475ae01f098f137f939572aca311fb3df4ac4e/src/effects/SkTableColorFilter.cpp

Git Watcher via monorail

unread,

May 31, 2023, 11:09:06 AM5/31/23

to bu...@skia.org

Comment #7 on issue 14317 by Git Watcher: Remove references to GPU code from src/core
https://bugs.chromium.org/p/skia/issues/detail?id=14317#c7

The following revision refers to this bug:
  

https://skia.googlesource.com/skia/+/6f1b24d4069790efec2e8cd077a2c2f9cb965c54

commit 6f1b24d4069790efec2e8cd077a2c2f9cb965c54
Author: Kevin Lubick <kjlu...@google.com>
Date: Wed May 31 14:34:12 2023

Decouple SkColorFilters and Ganesh GPU code

This moves all asFragmentProcessor code to GrFragmentProcessors.cpp

In order to do this, I needed to extract some class definitions
to headers and rename some files/filters to be more consistent
so we can use a macro like SK_ALL_COLOR_FILTERS.

I decided to expose some fields in the color filters as
public (but still internal to Skia) methods instead of defining
friend functions, as those definitions were long and unwieldy.

As I was doing this, I enforced IWYU on the files I modified
to help streamline #includes.

Suggested Review order:
 - SkColorFIlterBase.h
 - SkColorFilter.cpp -> SkComposeColorFilter,
   SkWorkingFormatColorFilter, SkColorSpaceXformColorFilter
 - SkTableColorFilter.cpp -> SkTableColorFilter.h,
   GrColorTableEffect
 - SkRuntimeEffect.cpp -> SkRuntimeColorFilter
 - SkColorFilter_Matrix.cpp -> SkMatrixColorFilter
 - Other colorfilters to see .cpp -> .h
 - GrFragmentProcessors.cpp
 - Remaining files.

Change-Id: Ifce96cf854166a46a81a4a354154a00d4c300e1d
Bug: skia:14317
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/703678
Reviewed-by: Michael Ludwig <michae...@google.com>

Reviewed-by: Brian Osman <brian...@google.com>
Commit-Queue: Kevin Lubick <kjlu...@google.com>

[modify] https://crrev.com/6f1b24d4069790efec2e8cd077a2c2f9cb965c54/src/core/SkVMBlitter.cpp
[modify] https://crrev.com/6f1b24d4069790efec2e8cd077a2c2f9cb965c54/gn/core.gni
[modify] https://crrev.com/6f1b24d4069790efec2e8cd077a2c2f9cb965c54/include/core/SkColorFilter.h
[modify] https://crrev.com/6f1b24d4069790efec2e8cd077a2c2f9cb965c54/src/core/BUILD.bazel
[add] https://crrev.com/6f1b24d4069790efec2e8cd077a2c2f9cb965c54/src/core/SkBlendModeColorFilter.cpp
[delete] https://crrev.com/cb883f64681ba939414a9c0ed00ae7e294774805/src/core/SkColorFilter_Matrix.cpp
[modify] https://crrev.com/6f1b24d4069790efec2e8cd077a2c2f9cb965c54/src/effects/SkTableColorFilter.cpp
[modify] https://crrev.com/6f1b24d4069790efec2e8cd077a2c2f9cb965c54/tests/ColorFilterTest.cpp
[modify] https://crrev.com/6f1b24d4069790efec2e8cd077a2c2f9cb965c54/gn/utils.gni
[modify] https://crrev.com/6f1b24d4069790efec2e8cd077a2c2f9cb965c54/src/core/SkRuntimeEffect.cpp
[modify] https://crrev.com/6f1b24d4069790efec2e8cd077a2c2f9cb965c54/src/core/SkColorFilter.cpp
[add] https://crrev.com/6f1b24d4069790efec2e8cd077a2c2f9cb965c54/src/core/SkRuntimeColorFilter.cpp
[modify] https://crrev.com/6f1b24d4069790efec2e8cd077a2c2f9cb965c54/src/core/SkColorFilterBase.h
[modify] https://crrev.com/6f1b24d4069790efec2e8cd077a2c2f9cb965c54/src/gpu/ganesh/effects/GrSkSLFP.cpp
[add] https://crrev.com/6f1b24d4069790efec2e8cd077a2c2f9cb965c54/src/core/SkMatrixColorFilter.cpp
[modify] https://crrev.com/6f1b24d4069790efec2e8cd077a2c2f9cb965c54/src/gpu/ganesh/GrFragmentProcessors.h
[modify] https://crrev.com/6f1b24d4069790efec2e8cd077a2c2f9cb965c54/modules/sksg/include/SkSGColorFilter.h
[add] https://crrev.com/6f1b24d4069790efec2e8cd077a2c2f9cb965c54/src/core/SkColorSpaceXformColorFilter.cpp
[modify] https://crrev.com/6f1b24d4069790efec2e8cd077a2c2f9cb965c54/src/shaders/SkColorFilterShader.cpp
[modify] https://crrev.com/6f1b24d4069790efec2e8cd077a2c2f9cb965c54/src/gpu/ganesh/SkGr.cpp
[delete] https://crrev.com/cb883f64681ba939414a9c0ed00ae7e294774805/src/core/SkModeColorFilter.cpp
[modify] https://crrev.com/6f1b24d4069790efec2e8cd077a2c2f9cb965c54/toolchain/linux_trampolines/clang_trampoline_linux.sh
[modify] https://crrev.com/6f1b24d4069790efec2e8cd077a2c2f9cb965c54/gn/effects.gni
[add] https://crrev.com/6f1b24d4069790efec2e8cd077a2c2f9cb965c54/src/core/SkWorkingFormatColorFilter.cpp
[modify] https://crrev.com/6f1b24d4069790efec2e8cd077a2c2f9cb965c54/src/gpu/ganesh/effects/BUILD.bazel
[modify] https://crrev.com/6f1b24d4069790efec2e8cd077a2c2f9cb965c54/gn/gpu.gni
[add] https://crrev.com/6f1b24d4069790efec2e8cd077a2c2f9cb965c54/src/effects/SkTableColorFilter.h
[add] https://crrev.com/6f1b24d4069790efec2e8cd077a2c2f9cb965c54/src/utils/SkGaussianColorFilter.h
[add] https://crrev.com/6f1b24d4069790efec2e8cd077a2c2f9cb965c54/src/core/SkComposeColorFilter.h
[add] https://crrev.com/6f1b24d4069790efec2e8cd077a2c2f9cb965c54/src/core/SkWorkingFormatColorFilter.h
[modify] https://crrev.com/6f1b24d4069790efec2e8cd077a2c2f9cb965c54/src/effects/BUILD.bazel
[add] https://crrev.com/6f1b24d4069790efec2e8cd077a2c2f9cb965c54/src/core/SkBlendModeColorFilter.h
[modify] https://crrev.com/6f1b24d4069790efec2e8cd077a2c2f9cb965c54/src/utils/SkGaussianColorFilter.cpp
[add] https://crrev.com/6f1b24d4069790efec2e8cd077a2c2f9cb965c54/src/core/SkRuntimeColorFilter.h
[add] https://crrev.com/6f1b24d4069790efec2e8cd077a2c2f9cb965c54/src/gpu/ganesh/effects/GrColorTableEffect.cpp
[modify] https://crrev.com/6f1b24d4069790efec2e8cd077a2c2f9cb965c54/public.bzl
[add] https://crrev.com/6f1b24d4069790efec2e8cd077a2c2f9cb965c54/src/core/SkMatrixColorFilter.h
[modify] https://crrev.com/6f1b24d4069790efec2e8cd077a2c2f9cb965c54/src/gpu/ganesh/GrFragmentProcessors.cpp
[modify] https://crrev.com/6f1b24d4069790efec2e8cd077a2c2f9cb965c54/src/utils/BUILD.bazel
[add] https://crrev.com/6f1b24d4069790efec2e8cd077a2c2f9cb965c54/src/core/SkColorSpaceXformColorFilter.h
[add] https://crrev.com/6f1b24d4069790efec2e8cd077a2c2f9cb965c54/src/core/SkComposeColorFilter.cpp
[add] https://crrev.com/6f1b24d4069790efec2e8cd077a2c2f9cb965c54/src/gpu/ganesh/effects/GrColorTableEffect.h
[modify] https://crrev.com/6f1b24d4069790efec2e8cd077a2c2f9cb965c54/src/ports/SkGlobalInitialization_default.cpp

Git Watcher via monorail

unread,

May 31, 2023, 3:05:06 PM5/31/23

to bu...@skia.org

Comment #8 on issue 14317 by Git Watcher: Remove references to GPU code from src/core
https://bugs.chromium.org/p/skia/issues/detail?id=14317#c8

The following revision refers to this bug:
  

https://chromium.googlesource.com/chromium/src/+/f3367d31759792f6cefad64ad52807ccbea12fd0

commit f3367d31759792f6cefad64ad52807ccbea12fd0
Author: Kevin Lubick <kjlu...@google.com>
Date: Wed May 31 19:04:20 2023

Use more granular gni file lists

Allows us to land https://skia-review.googlesource.com/c/skia/+/705224
and cleans up from a previous gni rename.

Change-Id: I46638054c8f36c4688a2944c0033713951bf330a
Bug: skia:14317
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4577599
Auto-Submit: Kevin Lubick <kjlu...@chromium.org>
Reviewed-by: Ben Wagner <bung...@chromium.org>
Commit-Queue: Kevin Lubick <kjlu...@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1151399}

[modify] https://crrev.com/f3367d31759792f6cefad64ad52807ccbea12fd0/skia/BUILD.gn

Git Watcher via monorail

unread,

May 31, 2023, 4:38:07 PM5/31/23

to bu...@skia.org

Comment #9 on issue 14317 by Git Watcher: Remove references to GPU code from src/core
https://bugs.chromium.org/p/skia/issues/detail?id=14317#c9

The following revision refers to this bug:
  

https://pdfium.googlesource.com/pdfium/+/53dcf78f71132823879150129fd148f6a76f9c44

commit 53dcf78f71132823879150129fd148f6a76f9c44
Author: Kevin Lubick <kjlu...@google.com>
Date: Wed May 31 20:37:36 2023

Use newer gni file lists for Skia

This will allow us to use filelists created in [1] and filled in
with moved files in [2].

[1] http://review.skia.org/705223
[2] http://review.skia.org/705224

Bug: skia:14317
Change-Id: I69c64bc507bf5b3279dec94b311bf9cdebc6cac9
Reviewed-on: https://pdfium-review.googlesource.com/c/pdfium/+/108230
Commit-Queue: Kevin Lubick <kjlu...@google.com>
Reviewed-by: Lei Zhang <the...@chromium.org>

[modify] https://pdfium.googlesource.com/pdfium/+/53dcf78f71132823879150129fd148f6a76f9c44/skia/BUILD.gn

Git Watcher via monorail

unread,

Jun 5, 2023, 12:24:09 PM6/5/23

to bu...@skia.org

Comment #10 on issue 14317 by Git Watcher: Remove references to GPU code from src/core
https://bugs.chromium.org/p/skia/issues/detail?id=14317#c10

The following revision refers to this bug:
  

https://skia.googlesource.com/skia/+/8a0152a423497497cc7425541947cf1bb3745a2e

commit 8a0152a423497497cc7425541947cf1bb3745a2e
Author: Kevin Lubick <kjlu...@google.com>
Date: Mon Jun 05 15:41:39 2023

Make SkShaders a namespace and move SkPerlinNoiseShader functions into it

I want to reclaim SkPerlinNoiseShader in src/shaders when refactoring
it to remove asFragmentProcessor.

This also enforces IWYU on three public shader headers.

Client CLs:
 - http://ag/23535765
 - https://crrev.com/c/4584205
 - http://cl/537870282

Canary-Chromium-CL:4584205
Change-Id: I9a09f1aa6b2b58fd40e41e74b4a290e75699c220

Bug: skia:13052, skia:14317

Reviewed-on: https://skia-review.googlesource.com/c/skia/+/706539

Reviewed-by: Brian Osman <brian...@google.com>
Commit-Queue: Kevin Lubick <kjlu...@google.com>

[modify] https://crrev.com/8a0152a423497497cc7425541947cf1bb3745a2e/src/core/SkRasterClip.cpp
[modify] https://crrev.com/8a0152a423497497cc7425541947cf1bb3745a2e/src/gpu/ganesh/GrDefaultGeoProcFactory.cpp
[modify] https://crrev.com/8a0152a423497497cc7425541947cf1bb3745a2e/src/pdf/SkPDFShader.h
[modify] https://crrev.com/8a0152a423497497cc7425541947cf1bb3745a2e/src/shaders/SkShaderBase.h
[modify] https://crrev.com/8a0152a423497497cc7425541947cf1bb3745a2e/toolchain/linux_trampolines/clang_trampoline_linux.sh
[modify] https://crrev.com/8a0152a423497497cc7425541947cf1bb3745a2e/gm/yuv420_odd_dim.cpp
[modify] https://crrev.com/8a0152a423497497cc7425541947cf1bb3745a2e/tools/viewer/RepeatTileSlide.cpp
[modify] https://crrev.com/8a0152a423497497cc7425541947cf1bb3745a2e/bench/RepeatTileBench.cpp
[modify] https://crrev.com/8a0152a423497497cc7425541947cf1bb3745a2e/include/effects/SkGradientShader.h
[modify] https://crrev.com/8a0152a423497497cc7425541947cf1bb3745a2e/src/shaders/SkPerlinNoiseShader.cpp
[modify] https://crrev.com/8a0152a423497497cc7425541947cf1bb3745a2e/include/BUILD.bazel
[modify] https://crrev.com/8a0152a423497497cc7425541947cf1bb3745a2e/src/pdf/SkPDFUtils.cpp
[modify] https://crrev.com/8a0152a423497497cc7425541947cf1bb3745a2e/bench/TileBench.cpp
[modify] https://crrev.com/8a0152a423497497cc7425541947cf1bb3745a2e/gm/rsxtext.cpp
[modify] https://crrev.com/8a0152a423497497cc7425541947cf1bb3745a2e/src/pdf/SkPDFUtils.h
[add] https://crrev.com/8a0152a423497497cc7425541947cf1bb3745a2e/relnotes/skshaders_namespace.md
[modify] https://crrev.com/8a0152a423497497cc7425541947cf1bb3745a2e/include/core/SkShader.h
[modify] https://crrev.com/8a0152a423497497cc7425541947cf1bb3745a2e/modules/sksg/include/SkSGRenderNode.h
[modify] https://crrev.com/8a0152a423497497cc7425541947cf1bb3745a2e/modules/svg/src/SkSVGGradient.cpp
[modify] https://crrev.com/8a0152a423497497cc7425541947cf1bb3745a2e/bench/FilteringBench.cpp
[modify] https://crrev.com/8a0152a423497497cc7425541947cf1bb3745a2e/include/effects/SkPerlinNoiseShader.h
[modify] https://crrev.com/8a0152a423497497cc7425541947cf1bb3745a2e/src/gpu/ganesh/GrDefaultGeoProcFactory.h
[modify] https://crrev.com/8a0152a423497497cc7425541947cf1bb3745a2e/src/ports/SkGlobalInitialization_default.cpp

Git Watcher via monorail

unread,

Jun 5, 2023, 5:42:04 PM6/5/23

to bu...@skia.org

Comment #11 on issue 14317 by Git Watcher: Remove references to GPU code from src/core
https://bugs.chromium.org/p/skia/issues/detail?id=14317#c11

The following revision refers to this bug:
  

https://chromium.googlesource.com/chromium/src/+/08e92af1b24e360b8f5dd1766a8a811cfcf7ba92

commit 08e92af1b24e360b8f5dd1766a8a811cfcf7ba92
Author: Kevin Lubick <kjlu...@google.com>
Date: Mon Jun 05 21:41:15 2023

Use SkShaders namespace for Perlin Noise shaders

This was changed in http://review.skia.org/706539

Bug: skia:14317
Change-Id: Iec3c22f4a9899918d134ca50f12c32143b10cadb
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4591270
Auto-Submit: Kevin Lubick <kjlu...@chromium.org>
Commit-Queue: Kevin Lubick <kjlu...@chromium.org>
Reviewed-by: Florin Malita <fma...@chromium.org>
Commit-Queue: Florin Malita <fma...@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1153485}

[modify] https://crrev.com/08e92af1b24e360b8f5dd1766a8a811cfcf7ba92/cc/paint/paint_filter.cc

Git Watcher via monorail

unread,

Jun 7, 2023, 6:27:05 PM6/7/23

to bu...@skia.org

Comment #12 on issue 14317 by Git Watcher: Remove references to GPU code from src/core
https://bugs.chromium.org/p/skia/issues/detail?id=14317#c12

The following revision refers to this bug:
  

https://skia.googlesource.com/skia/+/8fdbbca7d35db149148019993fe12df850b9970c

commit 8fdbbca7d35db149148019993fe12df850b9970c
Author: Kevin Lubick <kjlu...@google.com>
Date: Wed Jun 07 20:14:51 2023

Decouple SkShaders from Ganesh backend

This moves all asFragmentProcessor methods from the src/shaders
and src/shaders/gradients into GrFragmentProcessors. As a requirement
to do so, all shaders have had a public header made with the class
declaration. Many classes required new getters to expose some
fields for the construction of the GrFragmentProcessor. I briefly
toyed with the idea of using friend functions, but decided against
it for 2 reasons: 1) the syntax was verbose and gnarly; 2) the
syntax would make the functions of GrFragmentProcessors callable
from other places and not be static / contained to just
GrFragmentProcessors.cpp.

Other notable changes:
 - SkShaderBase::GradientType::kColor removed, as it has been
   superseded by SkShaderBase::ShaderType::kColor for detecting
   "is this a color shader?" Callsites that needed the color
   now cast it to SkColorShader
 - SkPerlinNoiseShader class removed from public API
   (Chromium migrated in https://crrev.com/c/4591270) and
   used internally instead of SkPerlinNoiseShaderImpl for closer
   alignment with the ShaderType enum.
 - SkPerlinNoiseShader::PaintingData no longer uses #ifdefs
   to make the bitmaps for the GPU backends, but this is now
   explicitly done in a function generateBitmaps().
 - SkShaderBase::MatrixRec has been moved to the SkShaders
   namespace and had the Ganesh-specific apply() changed to
   applyForFragmentProcessor(). The Ganesh-parts (e.g. the creation
   of the GrMatrixEffect) were made the responsibility of
   the caller (e.g. in GrFragmentProcessors.cpp).
 - I thought it was strange that SkBitmapProcShader.h (but not
   the .cpp) was in public.bzl. I made that not necessary by
   #ifdef'ing the one include that was necessary removing
   other unnecessary ones. This is because G3 sets
   SK_DISABLE_LEGACY_SHADERCONTEXT

The following shader subclasses did not appear to have Ganesh
implementations and that is still the case:
 - SkEmptyShader
 - SpriteShader (appears SkVM only)
 - DitherShader (appears SkVM only)
 - SkTransformShader
 - SkTriColorShader
 - SkUpdatableColorShader

I enforced IWYU on src/shaders and all other new files I created
in this CL. This had some impact in wider files, but I do not
expect it to impact clients as no public #includes had #includes
removed.

Suggested Review Order:
 - SkShaderBase.h/.cpp, noting that much of the .cpp came from
   SkShader.cpp
 - GrFragmentProcessors.cpp, glancing at the relevant subclass
   .h and .cpp changes as necessary
 - SkPerlinNoise* and GrPerlinNoise* to make sure I didn't overlook
   something in the refactor/extraction
 - Another pass through other changes in src/shaders and
   src/shaders/gradients
 - All other files in any order.


Change-Id: Icf3db955d0653f97d7c793b167463162fb70d9f2
Bug: skia:14317
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/706216

Reviewed-by: Brian Osman <brian...@google.com>
Commit-Queue: Kevin Lubick <kjlu...@google.com>

[delete] https://crrev.com/1a3adf848e61905c97bac5626bb0a197f7ddcc1b/src/shaders/gradients/SkGradientShader.cpp
[add] https://crrev.com/8fdbbca7d35db149148019993fe12df850b9970c/src/shaders/SkEmptyShader.h
[modify] https://crrev.com/8fdbbca7d35db149148019993fe12df850b9970c/gm/imagefiltersscaled.cpp
[add] https://crrev.com/8fdbbca7d35db149148019993fe12df850b9970c/src/shaders/gradients/SkRadialGradient.h
[modify] https://crrev.com/8fdbbca7d35db149148019993fe12df850b9970c/tests/TriangulatingPathRendererTests.cpp
[add] https://crrev.com/8fdbbca7d35db149148019993fe12df850b9970c/src/shaders/SkCoordClampShader.h
[rename] https://crrev.com/8fdbbca7d35db149148019993fe12df850b9970c/src/shaders/gradients/SkGradientBaseShader.h
[modify] https://crrev.com/8fdbbca7d35db149148019993fe12df850b9970c/src/shaders/SkTransformShader.cpp
[modify] https://crrev.com/8fdbbca7d35db149148019993fe12df850b9970c/docs/examples/skpaint_turb.cpp
[modify] https://crrev.com/8fdbbca7d35db149148019993fe12df850b9970c/src/shaders/SkPictureShader.h
[modify] https://crrev.com/8fdbbca7d35db149148019993fe12df850b9970c/gm/composecolorfilter.cpp
[delete] https://crrev.com/1a3adf848e61905c97bac5626bb0a197f7ddcc1b/src/shaders/SkComposeShader.cpp
[modify] https://crrev.com/8fdbbca7d35db149148019993fe12df850b9970c/src/gpu/ganesh/effects/GrConvexPolyEffect.h
[add] https://crrev.com/8fdbbca7d35db149148019993fe12df850b9970c/src/gpu/ganesh/effects/GrPerlinNoise2Effect.h
[rename] https://crrev.com/8fdbbca7d35db149148019993fe12df850b9970c/src/shaders/gradients/SkGradientBaseShader.cpp
[modify] https://crrev.com/8fdbbca7d35db149148019993fe12df850b9970c/tools/skpbench/skpbench.cpp
[modify] https://crrev.com/8fdbbca7d35db149148019993fe12df850b9970c/src/gpu/ganesh/GrFragmentProcessors.h
[modify] https://crrev.com/8fdbbca7d35db149148019993fe12df850b9970c/src/shaders/gradients/BUILD.bazel
[modify] https://crrev.com/8fdbbca7d35db149148019993fe12df850b9970c/src/shaders/SkTransformShader.h
[add] https://crrev.com/8fdbbca7d35db149148019993fe12df850b9970c/src/shaders/gradients/SkConicalGradient.cpp
[add] https://crrev.com/8fdbbca7d35db149148019993fe12df850b9970c/src/shaders/SkShaderBase.cpp
[modify] https://crrev.com/8fdbbca7d35db149148019993fe12df850b9970c/src/shaders/SkColorFilterShader.h
[modify] https://crrev.com/8fdbbca7d35db149148019993fe12df850b9970c/src/shaders/gradients/SkLinearGradient.cpp
[modify] https://crrev.com/8fdbbca7d35db149148019993fe12df850b9970c/src/BUILD.bazel
[add] https://crrev.com/8fdbbca7d35db149148019993fe12df850b9970c/src/shaders/SkPerlinNoiseShaderImpl.cpp
[modify] https://crrev.com/8fdbbca7d35db149148019993fe12df850b9970c/src/shaders/SkPictureShader.cpp
[add] https://crrev.com/8fdbbca7d35db149148019993fe12df850b9970c/src/shaders/gradients/SkSweepGradient.h
[modify] https://crrev.com/8fdbbca7d35db149148019993fe12df850b9970c/src/core/SkCoreBlitters.h
[add] https://crrev.com/8fdbbca7d35db149148019993fe12df850b9970c/src/shaders/SkRuntimeShader.cpp
[modify] https://crrev.com/8fdbbca7d35db149148019993fe12df850b9970c/include/private/SkGainmapShader.h
[add] https://crrev.com/8fdbbca7d35db149148019993fe12df850b9970c/src/shaders/SkRuntimeShader.h
[add] https://crrev.com/8fdbbca7d35db149148019993fe12df850b9970c/src/shaders/SkPerlinNoiseShaderImpl.h
[modify] https://crrev.com/8fdbbca7d35db149148019993fe12df850b9970c/src/shaders/SkGainmapShader.cpp
[modify] https://crrev.com/8fdbbca7d35db149148019993fe12df850b9970c/src/core/SkRasterPipelineBlitter.cpp
[modify] https://crrev.com/8fdbbca7d35db149148019993fe12df850b9970c/src/shaders/SkCoordClampShader.cpp
[modify] https://crrev.com/8fdbbca7d35db149148019993fe12df850b9970c/src/xps/SkXPSDevice.cpp
[modify] https://crrev.com/8fdbbca7d35db149148019993fe12df850b9970c/docs/examples/skpaint_compose_shader.cpp
[modify] https://crrev.com/8fdbbca7d35db149148019993fe12df850b9970c/src/gpu/ganesh/SkGr.cpp
[add] https://crrev.com/8fdbbca7d35db149148019993fe12df850b9970c/src/shaders/SkBlendShader.h
[modify] https://crrev.com/8fdbbca7d35db149148019993fe12df850b9970c/toolchain/linux_trampolines/clang_trampoline_linux.sh
[modify] https://crrev.com/8fdbbca7d35db149148019993fe12df850b9970c/src/gpu/ganesh/ClipStack.cpp
[modify] https://crrev.com/8fdbbca7d35db149148019993fe12df850b9970c/gn/effects.gni
[modify] https://crrev.com/8fdbbca7d35db149148019993fe12df850b9970c/gn/gpu.gni
[modify] https://crrev.com/8fdbbca7d35db149148019993fe12df850b9970c/src/gpu/ganesh/GrProcessorUnitTest.h
[modify] https://crrev.com/8fdbbca7d35db149148019993fe12df850b9970c/src/shaders/SkImageShader.h
[modify] https://crrev.com/8fdbbca7d35db149148019993fe12df850b9970c/gm/imagefiltersclipped.cpp
[modify] https://crrev.com/8fdbbca7d35db149148019993fe12df850b9970c/src/core/SkTextBlob.cpp
[modify] https://crrev.com/8fdbbca7d35db149148019993fe12df850b9970c/src/shaders/SkImageShader.cpp
[modify] https://crrev.com/8fdbbca7d35db149148019993fe12df850b9970c/src/shaders/SkLocalMatrixShader.h
[modify] https://crrev.com/8fdbbca7d35db149148019993fe12df850b9970c/public.bzl
[modify] https://crrev.com/8fdbbca7d35db149148019993fe12df850b9970c/gn/core.gni
[modify] https://crrev.com/8fdbbca7d35db149148019993fe12df850b9970c/tests/PDFPrimitivesTest.cpp
[modify] https://crrev.com/8fdbbca7d35db149148019993fe12df850b9970c/src/effects/colorfilters/SkColorFilterBase.h
[modify] https://crrev.com/8fdbbca7d35db149148019993fe12df850b9970c/src/gpu/ganesh/gradients/GrGradientBitmapCache.cpp
[add] https://crrev.com/8fdbbca7d35db149148019993fe12df850b9970c/src/shaders/SkColorShader.h
[modify] https://crrev.com/8fdbbca7d35db149148019993fe12df850b9970c/tests/ShaderTest.cpp
[modify] https://crrev.com/8fdbbca7d35db149148019993fe12df850b9970c/modules/svg/src/SkSVGFeTurbulence.cpp
[modify] https://crrev.com/8fdbbca7d35db149148019993fe12df850b9970c/src/shaders/SkColorShader.cpp
[modify] https://crrev.com/8fdbbca7d35db149148019993fe12df850b9970c/docs/examples/skpaint_perlin.cpp
[modify] https://crrev.com/8fdbbca7d35db149148019993fe12df850b9970c/src/core/SkDraw_atlas.cpp
[modify] https://crrev.com/8fdbbca7d35db149148019993fe12df850b9970c/src/opts/SkRasterPipeline_opts.h
[modify] https://crrev.com/8fdbbca7d35db149148019993fe12df850b9970c/src/android/SkAndroidFrameworkUtils.cpp
[modify] https://crrev.com/8fdbbca7d35db149148019993fe12df850b9970c/gm/perlinnoise.cpp
[modify] https://crrev.com/8fdbbca7d35db149148019993fe12df850b9970c/tests/BlurTest.cpp
[modify] https://crrev.com/8fdbbca7d35db149148019993fe12df850b9970c/include/effects/SkPerlinNoiseShader.h
[add] https://crrev.com/8fdbbca7d35db149148019993fe12df850b9970c/src/gpu/ganesh/effects/GrPerlinNoise2Effect.cpp
[modify] https://crrev.com/8fdbbca7d35db149148019993fe12df850b9970c/src/gpu/ganesh/effects/GrRRectEffect.cpp
[modify] https://crrev.com/8fdbbca7d35db149148019993fe12df850b9970c/tests/graphite/ImageShaderTest.cpp
[modify] https://crrev.com/8fdbbca7d35db149148019993fe12df850b9970c/src/core/SkVMBlitter.h
[modify] https://crrev.com/8fdbbca7d35db149148019993fe12df850b9970c/src/gpu/ganesh/Device_drawTexture.cpp
[modify] https://crrev.com/8fdbbca7d35db149148019993fe12df850b9970c/src/shaders/SkLocalMatrixShader.cpp
[modify] https://crrev.com/8fdbbca7d35db149148019993fe12df850b9970c/src/shaders/SkBitmapProcShader.cpp
[modify] https://crrev.com/8fdbbca7d35db149148019993fe12df850b9970c/src/pdf/SkPDFDevice.cpp
[modify] https://crrev.com/8fdbbca7d35db149148019993fe12df850b9970c/src/gpu/ganesh/GrFragmentProcessors.cpp
[modify] https://crrev.com/8fdbbca7d35db149148019993fe12df850b9970c/modules/canvaskit/canvaskit_bindings.cpp
[modify] https://crrev.com/8fdbbca7d35db149148019993fe12df850b9970c/src/ports/SkGlobalInitialization_default.cpp
[modify] https://crrev.com/8fdbbca7d35db149148019993fe12df850b9970c/src/core/SkVMBlitter.cpp
[modify] https://crrev.com/8fdbbca7d35db149148019993fe12df850b9970c/src/shaders/BUILD.bazel
[modify] https://crrev.com/8fdbbca7d35db149148019993fe12df850b9970c/src/shaders/SkShaderBase.h
[add] https://crrev.com/8fdbbca7d35db149148019993fe12df850b9970c/src/shaders/SkBlendShader.cpp
[delete] https://crrev.com/1a3adf848e61905c97bac5626bb0a197f7ddcc1b/src/shaders/gradients/SkTwoPointConicalGradient.cpp
[modify] https://crrev.com/8fdbbca7d35db149148019993fe12df850b9970c/src/shaders/SkEmptyShader.cpp
[delete] https://crrev.com/1a3adf848e61905c97bac5626bb0a197f7ddcc1b/src/shaders/SkPerlinNoiseShader.cpp
[modify] https://crrev.com/8fdbbca7d35db149148019993fe12df850b9970c/gm/constcolorprocessor.cpp
[modify] https://crrev.com/8fdbbca7d35db149148019993fe12df850b9970c/src/core/SkDraw_vertices.cpp
[modify] https://crrev.com/8fdbbca7d35db149148019993fe12df850b9970c/src/core/SkRuntimeBlender.cpp
[add] https://crrev.com/8fdbbca7d35db149148019993fe12df850b9970c/src/shaders/SkTriColorShader.cpp
[modify] https://crrev.com/8fdbbca7d35db149148019993fe12df850b9970c/src/gpu/graphite/KeyHelpers.cpp
[modify] https://crrev.com/8fdbbca7d35db149148019993fe12df850b9970c/src/core/SkRuntimeEffect.cpp
[modify] https://crrev.com/8fdbbca7d35db149148019993fe12df850b9970c/src/core/SkRuntimeEffectPriv.h
[modify] https://crrev.com/8fdbbca7d35db149148019993fe12df850b9970c/bench/PerlinNoiseBench.cpp
[modify] https://crrev.com/8fdbbca7d35db149148019993fe12df850b9970c/include/effects/SkRuntimeEffect.h
[modify] https://crrev.com/8fdbbca7d35db149148019993fe12df850b9970c/src/pdf/SkPDFGradientShader.cpp
[modify] https://crrev.com/8fdbbca7d35db149148019993fe12df850b9970c/src/shaders/gradients/SkLinearGradient.h
[modify] https://crrev.com/8fdbbca7d35db149148019993fe12df850b9970c/src/shaders/SkColorFilterShader.cpp
[modify] https://crrev.com/8fdbbca7d35db149148019993fe12df850b9970c/fuzz/FuzzCanvas.cpp
[modify] https://crrev.com/8fdbbca7d35db149148019993fe12df850b9970c/src/shaders/gradients/SkRadialGradient.cpp
[modify] https://crrev.com/8fdbbca7d35db149148019993fe12df850b9970c/docs/examples/skpaint_compose.cpp
[modify] https://crrev.com/8fdbbca7d35db149148019993fe12df850b9970c/src/shaders/SkShader.cpp
[modify] https://crrev.com/8fdbbca7d35db149148019993fe12df850b9970c/src/gpu/ganesh/effects/BUILD.bazel
[modify] https://crrev.com/8fdbbca7d35db149148019993fe12df850b9970c/src/shaders/gradients/SkSweepGradient.cpp
[modify] https://crrev.com/8fdbbca7d35db149148019993fe12df850b9970c/tests/GradientTest.cpp
[modify] https://crrev.com/8fdbbca7d35db149148019993fe12df850b9970c/tests/graphite/PaintParamsKeyTest.cpp
[add] https://crrev.com/8fdbbca7d35db149148019993fe12df850b9970c/src/shaders/gradients/SkConicalGradient.h
[modify] https://crrev.com/8fdbbca7d35db149148019993fe12df850b9970c/src/core/SkTextBlobTrace.cpp
[modify] https://crrev.com/8fdbbca7d35db149148019993fe12df850b9970c/src/svg/SkSVGDevice.cpp
[modify] https://crrev.com/8fdbbca7d35db149148019993fe12df850b9970c/src/effects/colorfilters/SkRuntimeColorFilter.cpp
[add] https://crrev.com/8fdbbca7d35db149148019993fe12df850b9970c/src/shaders/SkTriColorShader.h
[modify] https://crrev.com/8fdbbca7d35db149148019993fe12df850b9970c/src/shaders/SkBitmapProcShader.h
[modify] https://crrev.com/8fdbbca7d35db149148019993fe12df850b9970c/tests/ImageFilterTest.cpp
[modify] https://crrev.com/8fdbbca7d35db149148019993fe12df850b9970c/bazel/exporter_tool/main.go
[modify] https://crrev.com/8fdbbca7d35db149148019993fe12df850b9970c/src/gpu/ganesh/gradients/GrGradientShader.cpp
[modify] https://crrev.com/8fdbbca7d35db149148019993fe12df850b9970c/src/gpu/ganesh/gradients/GrGradientShader.h

Git Watcher via monorail

unread,

Jun 9, 2023, 9:56:04 AM6/9/23

to bu...@skia.org

Comment #13 on issue 14317 by Git Watcher: Remove references to GPU code from src/core
https://bugs.chromium.org/p/skia/issues/detail?id=14317#c13

The following revision refers to this bug:
  

https://skia.googlesource.com/skia/+/283a40454803ec3d907a0414e55a3fba103afcce

commit 283a40454803ec3d907a0414e55a3fba103afcce
Author: Kevin Lubick <kjlu...@google.com>
Date: Thu Jun 08 20:23:38 2023

Remove Ganesh code from SkBlendMode/XferMode

SkBlendMode_AsXPFactory -> GrXferProcessor::FromBlendMode

This removes some unused code leftover from an XferMode -> BlendMode
migration.

Change-Id: I0405b26ed493eebbc335742fdf018ae4b609fab7
Bug: skia:14317
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/709204
Reviewed-by: Michael Ludwig <michae...@google.com>
Auto-Submit: Kevin Lubick <kjlu...@google.com>
Commit-Queue: Michael Ludwig <michae...@google.com>

[modify] https://crrev.com/283a40454803ec3d907a0414e55a3fba103afcce/src/gpu/ganesh/ops/TextureOp.cpp
[modify] https://crrev.com/283a40454803ec3d907a0414e55a3fba103afcce/src/gpu/ganesh/GrXferProcessor.h
[modify] https://crrev.com/283a40454803ec3d907a0414e55a3fba103afcce/gn/core.gni
[modify] https://crrev.com/283a40454803ec3d907a0414e55a3fba103afcce/src/gpu/ganesh/GrXferProcessor.cpp
[modify] https://crrev.com/283a40454803ec3d907a0414e55a3fba103afcce/src/core/SkBlendModePriv.h
[modify] https://crrev.com/283a40454803ec3d907a0414e55a3fba103afcce/src/core/BUILD.bazel
[modify] https://crrev.com/283a40454803ec3d907a0414e55a3fba103afcce/src/gpu/ganesh/SkGr.cpp
[modify] https://crrev.com/283a40454803ec3d907a0414e55a3fba103afcce/toolchain/linux_trampolines/clang_trampoline_linux.sh
[modify] https://crrev.com/283a40454803ec3d907a0414e55a3fba103afcce/tests/DMSAATest.cpp
[modify] https://crrev.com/283a40454803ec3d907a0414e55a3fba103afcce/tests/BulkRectTest.cpp
[modify] https://crrev.com/283a40454803ec3d907a0414e55a3fba103afcce/src/gpu/ganesh/SurfaceDrawContext.cpp
[delete] https://crrev.com/daa23f9096fb87013df181d3b06b18e9a5c0a03f/src/core/SkXfermodePriv.h
[delete] https://crrev.com/daa23f9096fb87013df181d3b06b18e9a5c0a03f/src/core/SkXfermode.cpp
[modify] https://crrev.com/283a40454803ec3d907a0414e55a3fba103afcce/src/core/SkBlendMode.cpp
[modify] https://crrev.com/283a40454803ec3d907a0414e55a3fba103afcce/public.bzl
[modify] https://crrev.com/283a40454803ec3d907a0414e55a3fba103afcce/src/gpu/ganesh/GrProcessorSet.cpp
[modify] https://crrev.com/283a40454803ec3d907a0414e55a3fba103afcce/src/gpu/ganesh/Device.cpp
[modify] https://crrev.com/283a40454803ec3d907a0414e55a3fba103afcce/src/gpu/ganesh/ops/AtlasRenderTask.cpp

Git Watcher via monorail

unread,

Jun 9, 2023, 11:51:05 AM6/9/23

to bu...@skia.org

Comment #14 on issue 14317 by Git Watcher: Remove references to GPU code from src/core
https://bugs.chromium.org/p/skia/issues/detail?id=14317#c14

The following revision refers to this bug:
  

https://skia.googlesource.com/skia/+/acdc108e8a9bffb27d1f7f77d0cd1c5a66da2cda

commit acdc108e8a9bffb27d1f7f77d0cd1c5a66da2cda
Author: Kevin Lubick <kjlu...@google.com>
Date: Fri Jun 09 15:05:24 2023

Remove Ganesh code from SkCanvasPriv

This also moves a few Android+Ganesh specific methods to a new header
so they can be exposed only for Android.

This enforces IWYU on the affected files (ganesh/Device was
impacted because originally I was going to put the functions
in there, but decided a new file was better).

Change-Id: I96e3e557d5ccf9698fd2b747c0709f6a1444ce22
Bug: skia:14317
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/709957
Owners-Override: Kevin Lubick <kjlu...@google.com>
Reviewed-by: John Stiles <johns...@google.com>
Commit-Queue: Kevin Lubick <kjlu...@google.com>

[modify] https://crrev.com/acdc108e8a9bffb27d1f7f77d0cd1c5a66da2cda/bench/BulkRectBench.cpp
[modify] https://crrev.com/acdc108e8a9bffb27d1f7f77d0cd1c5a66da2cda/tests/SurfaceTest.cpp
[modify] https://crrev.com/acdc108e8a9bffb27d1f7f77d0cd1c5a66da2cda/include/android/BUILD.bazel
[modify] https://crrev.com/acdc108e8a9bffb27d1f7f77d0cd1c5a66da2cda/tests/WrappedSurfaceCopyOnWriteTest.cpp
[modify] https://crrev.com/acdc108e8a9bffb27d1f7f77d0cd1c5a66da2cda/src/gpu/ganesh/surface/SkSurface_Ganesh.cpp
[modify] https://crrev.com/acdc108e8a9bffb27d1f7f77d0cd1c5a66da2cda/src/gpu/ganesh/GrDirectContextPriv.h
[add] https://crrev.com/acdc108e8a9bffb27d1f7f77d0cd1c5a66da2cda/src/gpu/ganesh/GrCanvas.h
[modify] https://crrev.com/acdc108e8a9bffb27d1f7f77d0cd1c5a66da2cda/gm/attributes.cpp
[modify] https://crrev.com/acdc108e8a9bffb27d1f7f77d0cd1c5a66da2cda/gm/rrects.cpp
[add] https://crrev.com/acdc108e8a9bffb27d1f7f77d0cd1c5a66da2cda/include/android/SkCanvasAndroid.h
[modify] https://crrev.com/acdc108e8a9bffb27d1f7f77d0cd1c5a66da2cda/src/gpu/ganesh/GrRecordingContextPriv.cpp
[modify] https://crrev.com/acdc108e8a9bffb27d1f7f77d0cd1c5a66da2cda/gm/drawquadset.cpp
[modify] https://crrev.com/acdc108e8a9bffb27d1f7f77d0cd1c5a66da2cda/gm/convexpolyeffect.cpp
[modify] https://crrev.com/acdc108e8a9bffb27d1f7f77d0cd1c5a66da2cda/gm/lazytiling.cpp
[modify] https://crrev.com/acdc108e8a9bffb27d1f7f77d0cd1c5a66da2cda/src/gpu/ganesh/Device_drawTexture.cpp
[modify] https://crrev.com/acdc108e8a9bffb27d1f7f77d0cd1c5a66da2cda/gm/fpcoordinateoverride.cpp
[modify] https://crrev.com/acdc108e8a9bffb27d1f7f77d0cd1c5a66da2cda/tests/GrThreadSafeCacheTest.cpp
[modify] https://crrev.com/acdc108e8a9bffb27d1f7f77d0cd1c5a66da2cda/gm/bigrrectaaeffect.cpp
[modify] https://crrev.com/acdc108e8a9bffb27d1f7f77d0cd1c5a66da2cda/gm/fp_sample_chaining.cpp
[modify] https://crrev.com/acdc108e8a9bffb27d1f7f77d0cd1c5a66da2cda/src/core/SkCanvasPriv.cpp
[modify] https://crrev.com/acdc108e8a9bffb27d1f7f77d0cd1c5a66da2cda/gm/yuvtorgbsubset.cpp
[modify] https://crrev.com/acdc108e8a9bffb27d1f7f77d0cd1c5a66da2cda/src/gpu/ganesh/BUILD.bazel
[modify] https://crrev.com/acdc108e8a9bffb27d1f7f77d0cd1c5a66da2cda/gm/swizzle.cpp
[modify] https://crrev.com/acdc108e8a9bffb27d1f7f77d0cd1c5a66da2cda/src/core/SkCanvasPriv.h
[modify] https://crrev.com/acdc108e8a9bffb27d1f7f77d0cd1c5a66da2cda/gm/constcolorprocessor.cpp
[modify] https://crrev.com/acdc108e8a9bffb27d1f7f77d0cd1c5a66da2cda/gm/texelsubset.cpp
[modify] https://crrev.com/acdc108e8a9bffb27d1f7f77d0cd1c5a66da2cda/gm/beziereffects.cpp
[modify] https://crrev.com/acdc108e8a9bffb27d1f7f77d0cd1c5a66da2cda/tools/debugger/DebugCanvas.cpp
[add] https://crrev.com/acdc108e8a9bffb27d1f7f77d0cd1c5a66da2cda/src/gpu/ganesh/GrCanvas.cpp
[modify] https://crrev.com/acdc108e8a9bffb27d1f7f77d0cd1c5a66da2cda/src/gpu/ganesh/surface/SkSurface_AndroidFactories.cpp
[modify] https://crrev.com/acdc108e8a9bffb27d1f7f77d0cd1c5a66da2cda/gm/fwidth_squircle.cpp
[rename] https://crrev.com/acdc108e8a9bffb27d1f7f77d0cd1c5a66da2cda/src/gpu/ganesh/Device.h
[modify] https://crrev.com/acdc108e8a9bffb27d1f7f77d0cd1c5a66da2cda/tests/GrMipMappedTest.cpp
[modify] https://crrev.com/acdc108e8a9bffb27d1f7f77d0cd1c5a66da2cda/src/core/SkCanvas.cpp
[modify] https://crrev.com/acdc108e8a9bffb27d1f7f77d0cd1c5a66da2cda/gm/clockwise.cpp
[modify] https://crrev.com/acdc108e8a9bffb27d1f7f77d0cd1c5a66da2cda/src/gpu/ganesh/GrRecordingContextPriv.h
[modify] https://crrev.com/acdc108e8a9bffb27d1f7f77d0cd1c5a66da2cda/src/gpu/ganesh/GrDirectContext.cpp
[modify] https://crrev.com/acdc108e8a9bffb27d1f7f77d0cd1c5a66da2cda/toolchain/linux_trampolines/clang_trampoline_linux.sh
[modify] https://crrev.com/acdc108e8a9bffb27d1f7f77d0cd1c5a66da2cda/gn/gpu.gni
[modify] https://crrev.com/acdc108e8a9bffb27d1f7f77d0cd1c5a66da2cda/src/text/gpu/TextBlob.cpp
[modify] https://crrev.com/acdc108e8a9bffb27d1f7f77d0cd1c5a66da2cda/tools/viewer/PathTessellatorsSlide.cpp
[modify] https://crrev.com/acdc108e8a9bffb27d1f7f77d0cd1c5a66da2cda/gm/aarecteffect.cpp
[modify] https://crrev.com/acdc108e8a9bffb27d1f7f77d0cd1c5a66da2cda/gm/clear_swizzle.cpp
[modify] https://crrev.com/acdc108e8a9bffb27d1f7f77d0cd1c5a66da2cda/bench/ClearBench.cpp
[modify] https://crrev.com/acdc108e8a9bffb27d1f7f77d0cd1c5a66da2cda/tools/rewrite_includes.py
[modify] https://crrev.com/acdc108e8a9bffb27d1f7f77d0cd1c5a66da2cda/gm/gpu_blur_utils.cpp
[modify] https://crrev.com/acdc108e8a9bffb27d1f7f77d0cd1c5a66da2cda/tests/DeviceTest.cpp
[modify] https://crrev.com/acdc108e8a9bffb27d1f7f77d0cd1c5a66da2cda/public.bzl
[modify] https://crrev.com/acdc108e8a9bffb27d1f7f77d0cd1c5a66da2cda/src/gpu/ganesh/Device.cpp

Git Watcher via monorail

unread,

Jun 12, 2023, 11:29:04 AM6/12/23

to bu...@skia.org

Comment #15 on issue 14317 by Git Watcher: Remove references to GPU code from src/core
https://bugs.chromium.org/p/skia/issues/detail?id=14317#c15

The following revision refers to this bug:
  

https://chromium.googlesource.com/chromium/src/+/cddaf15afb0696c4a370238371f279a7ec17b9ad

commit cddaf15afb0696c4a370238371f279a7ec17b9ad
Author: Kevin Lubick <kjlu...@google.com>
Date: Mon Jun 12 15:28:35 2023

Use renamed SkDeferredDisplayList et al and skgpu::ganesh::DrawDDL

This type (and two others) was renamed and moved in
http://review.skia.org/706017, as well as moving the draw call
off of SkSurface and into the skgpu::ganesh namespace.

Some of the previous #includes seemed unused, so I removed them.

Bug: skia:14317
Change-Id: I2c95e381aee516bb97e916527a78c266d3282816
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4605876
Reviewed-by: Vasiliy Telezhnikov <vas...@chromium.org>
Commit-Queue: Kevin Lubick <kjlu...@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1156213}

[modify] https://crrev.com/cddaf15afb0696c4a370238371f279a7ec17b9ad/components/viz/service/display_embedder/skia_output_device_vulkan_secondary_cb.cc
[modify] https://crrev.com/cddaf15afb0696c4a370238371f279a7ec17b9ad/ui/ozone/demo/skia/skia_gl_renderer.cc
[modify] https://crrev.com/cddaf15afb0696c4a370238371f279a7ec17b9ad/components/viz/service/display_embedder/skia_output_surface_impl_on_gpu.cc
[modify] https://crrev.com/cddaf15afb0696c4a370238371f279a7ec17b9ad/components/viz/service/display/ca_layer_overlay.cc
[modify] https://crrev.com/cddaf15afb0696c4a370238371f279a7ec17b9ad/components/viz/service/display_embedder/skia_output_device.h
[modify] https://crrev.com/cddaf15afb0696c4a370238371f279a7ec17b9ad/components/viz/service/display_embedder/skia_output_device.cc
[modify] https://crrev.com/cddaf15afb0696c4a370238371f279a7ec17b9ad/android_webview/browser/gfx/aw_vulkan_context_provider.h
[modify] https://crrev.com/cddaf15afb0696c4a370238371f279a7ec17b9ad/components/viz/service/display_embedder/skia_output_surface_dependency.h
[modify] https://crrev.com/cddaf15afb0696c4a370238371f279a7ec17b9ad/skia/BUILD.gn
[modify] https://crrev.com/cddaf15afb0696c4a370238371f279a7ec17b9ad/components/viz/service/display_embedder/skia_output_surface_impl_on_gpu.h
[modify] https://crrev.com/cddaf15afb0696c4a370238371f279a7ec17b9ad/components/viz/service/display_embedder/skia_output_surface_impl.h
[modify] https://crrev.com/cddaf15afb0696c4a370238371f279a7ec17b9ad/components/viz/service/display/overlay_candidate.h
[modify] https://crrev.com/cddaf15afb0696c4a370238371f279a7ec17b9ad/components/viz/service/display/skia_output_surface.h
[modify] https://crrev.com/cddaf15afb0696c4a370238371f279a7ec17b9ad/components/viz/service/display_embedder/skia_output_device_webview.cc
[modify] https://crrev.com/cddaf15afb0696c4a370238371f279a7ec17b9ad/components/viz/service/display_embedder/skia_output_surface_impl.cc
[modify] https://crrev.com/cddaf15afb0696c4a370238371f279a7ec17b9ad/components/viz/service/display/skia_renderer.cc
[modify] https://crrev.com/cddaf15afb0696c4a370238371f279a7ec17b9ad/android_webview/browser/gfx/vulkan_gl_interop.cc
[modify] https://crrev.com/cddaf15afb0696c4a370238371f279a7ec17b9ad/components/viz/service/display_embedder/skia_output_device_vulkan_secondary_cb.h
[modify] https://crrev.com/cddaf15afb0696c4a370238371f279a7ec17b9ad/components/viz/service/display/overlay_candidate_factory.h
[modify] https://crrev.com/cddaf15afb0696c4a370238371f279a7ec17b9ad/ui/ozone/demo/skia/skia_gl_renderer.h
[modify] https://crrev.com/cddaf15afb0696c4a370238371f279a7ec17b9ad/ui/ozone/demo/skia/skia_surfaceless_gl_renderer.cc

Git Watcher via monorail

unread,

Jun 12, 2023, 1:28:06 PM6/12/23

to bu...@skia.org

Comment #16 on issue 14317 by Git Watcher: Remove references to GPU code from src/core
https://bugs.chromium.org/p/skia/issues/detail?id=14317#c16

The following revision refers to this bug:
  

https://skia.googlesource.com/skia/+/5d3817aea7713454f0020d4602cc8db6570ceb5f

commit 5d3817aea7713454f0020d4602cc8db6570ceb5f
Author: Kevin Lubick <kjlu...@google.com>
Date: Mon Jun 12 14:12:37 2023

Remove stub GrBackend* classes

These should no longer be necessary to compile Skia without a GPU
backend.

Change-Id: I1cacb00644daf0b6cfb4828b9d1f1ff23c442061
Bug: skia:14317
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/710678

Owners-Override: Kevin Lubick <kjlu...@google.com>
Reviewed-by: John Stiles <johns...@google.com>

[modify] https://crrev.com/5d3817aea7713454f0020d4602cc8db6570ceb5f/include/gpu/GrBackendSurface.h

Git Watcher via monorail

unread,

Jun 12, 2023, 5:53:10 PM6/12/23

to bu...@skia.org

Comment #17 on issue 14317 by Git Watcher: Remove references to GPU code from src/core
https://bugs.chromium.org/p/skia/issues/detail?id=14317#c17

The following revision refers to this bug:
  

https://skia.googlesource.com/skia/+/0521a2d1b01c464595d4a287ad43fdce4d0ba5ea

commit 0521a2d1b01c464595d4a287ad43fdce4d0ba5ea
Author: Kevin Lubick <kjlu...@google.com>
Date: Mon Jun 12 19:15:36 2023

Remove ddl from SkSurface

Follow-up to https://crrev.com/c/4605876

Change-Id: Ifaf1ff6144c7d627a67cf94b9b0383fcbde7b3a5
Bug: skia:14317
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/710898
Reviewed-by: Robert Phillips <robertp...@google.com>
Owners-Override: Kevin Lubick <kjlu...@google.com>
Commit-Queue: Kevin Lubick <kjlu...@google.com>

[modify] https://crrev.com/0521a2d1b01c464595d4a287ad43fdce4d0ba5ea/include/core/SkSurface.h
[modify] https://crrev.com/0521a2d1b01c464595d4a287ad43fdce4d0ba5ea/src/gpu/ganesh/surface/SkSurface_Ganesh.cpp

Git Watcher via monorail

unread,

Jun 13, 2023, 10:24:13 AM6/13/23

to bu...@skia.org

Comment #18 on issue 14317 by Git Watcher: Remove references to GPU code from src/core
https://bugs.chromium.org/p/skia/issues/detail?id=14317#c18

The following revision refers to this bug:
  

https://skia.googlesource.com/skia/+/a201943c15d33d8000fe60c5252e14b870455ded

commit a201943c15d33d8000fe60c5252e14b870455ded
Author: Kevin Lubick <kjlu...@google.com>
Date: Mon Jun 12 19:42:51 2023

Remove SkYUVAPixmapInfo::SupportedDataTypes(const GrImageContext&)

This has been moved to private because it is unused externally (AFAIK)
and we want to decouple src/core and the GPU backend.

Change-Id: I00fa395c95cf7379093703d1ca5ebe428e3cbd98
Bug: skia:14317
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/710901
Owners-Override: Kevin Lubick <kjlu...@google.com>
Reviewed-by: Jim Van Verth <jvan...@google.com>
Commit-Queue: Kevin Lubick <kjlu...@google.com>

[add] https://crrev.com/a201943c15d33d8000fe60c5252e14b870455ded/relnotes/yuv-supported-formats.md
[modify] https://crrev.com/a201943c15d33d8000fe60c5252e14b870455ded/tools/skpbench/skpbench.cpp
[modify] https://crrev.com/a201943c15d33d8000fe60c5252e14b870455ded/src/gpu/ganesh/image/GrImageUtils.h
[modify] https://crrev.com/a201943c15d33d8000fe60c5252e14b870455ded/dm/DMSrcSink.cpp
[modify] https://crrev.com/a201943c15d33d8000fe60c5252e14b870455ded/toolchain/linux_trampolines/clang_trampoline_linux.sh
[modify] https://crrev.com/a201943c15d33d8000fe60c5252e14b870455ded/include/core/SkYUVAPixmaps.h
[modify] https://crrev.com/a201943c15d33d8000fe60c5252e14b870455ded/src/core/SkYUVAPixmaps.cpp
[modify] https://crrev.com/a201943c15d33d8000fe60c5252e14b870455ded/src/gpu/ganesh/image/GrImageUtils.cpp

Git Watcher via monorail

unread,

Jun 13, 2023, 10:42:10 AM6/13/23

to bu...@skia.org

Comment #19 on issue 14317 by Git Watcher: Remove references to GPU code from src/core
https://bugs.chromium.org/p/skia/issues/detail?id=14317#c19

The following revision refers to this bug:
  

https://chromium.googlesource.com/chromium/src/+/b3cf2367662c9fc0c82c66dddb58f8052ec8abb1

commit b3cf2367662c9fc0c82c66dddb58f8052ec8abb1
Author: Kevin Lubick <kjlu...@google.com>
Date: Tue Jun 13 14:40:56 2023

Replace forward declarations of SkPromiseImageTexture with #include

In http://review.skia.org/710679 we are moving and renaming this type.
The shim typedef we have conflicts with the existing forward declares
in chromium, so I am replacing them with an #include until we can
do the migration.

Bug: skia:14317
Change-Id: I95edc189bb3f75c1d1b69d9250bdbc3d2982952b
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4608923
Commit-Queue: Kevin Lubick <kjlu...@chromium.org>
Commit-Queue: Vasiliy Telezhnikov <vas...@chromium.org>
Reviewed-by: Vasiliy Telezhnikov <vas...@chromium.org>
Auto-Submit: Kevin Lubick <kjlu...@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1156902}

[modify] https://crrev.com/b3cf2367662c9fc0c82c66dddb58f8052ec8abb1/gpu/command_buffer/service/shared_image/shared_image_representation.h
[modify] https://crrev.com/b3cf2367662c9fc0c82c66dddb58f8052ec8abb1/gpu/command_buffer/service/shared_image/raw_draw_image_backing.h
[modify] https://crrev.com/b3cf2367662c9fc0c82c66dddb58f8052ec8abb1/components/viz/service/display_embedder/image_context_impl.h

Git Watcher via monorail

unread,

Jun 13, 2023, 2:16:09 PM6/13/23

to bu...@skia.org

Comment #20 on issue 14317 by Git Watcher: Remove references to GPU code from src/core
https://bugs.chromium.org/p/skia/issues/detail?id=14317#c20

The following revision refers to this bug:
  

https://skia.googlesource.com/skia/+/eb98125f2d98670b4f1cac1217949625e8148898

commit eb98125f2d98670b4f1cac1217949625e8148898
Author: Kevin Lubick <kjlu...@google.com>
Date: Tue Jun 13 11:51:26 2023

Rename SkPromiseImageTexture -> GrPromiseImageTexture

This moves it into include/private/chromium because this is
only used in DDLs, which are exclusive to chromium.

We also move SkImages::PromiseTextureFrom and SkImages::PromiseTextureFromYUVA
into include/private/chromium/SkImageChromium.h because those
are the public consumers of promise textures. We already have
include/android/SkImageAndroid.h and might one day have
something like include/private/flutter/SkImageFlutter.h for
Flutter-exclusive image factories.

Nothing functionally changes, just the name of the type
and where it lives.

See also https://crrev.com/c/4608923

Change-Id: I86285035f9ceab1e1ffc0ee3f13dcb31006e6dd0
Bug: skia:14317
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/710679
Commit-Queue: Kevin Lubick <kjlu...@google.com>

Reviewed-by: Robert Phillips <robertp...@google.com>
Owners-Override: Kevin Lubick <kjlu...@google.com>

[modify] https://crrev.com/eb98125f2d98670b4f1cac1217949625e8148898/tools/DDLTileHelper.cpp
[modify] https://crrev.com/eb98125f2d98670b4f1cac1217949625e8148898/src/gpu/ganesh/BUILD.bazel
[modify] https://crrev.com/eb98125f2d98670b4f1cac1217949625e8148898/gn/core.gni
[add] https://crrev.com/eb98125f2d98670b4f1cac1217949625e8148898/src/gpu/ganesh/GrPromiseImageTexture.cpp
[modify] https://crrev.com/eb98125f2d98670b4f1cac1217949625e8148898/src/core/BUILD.bazel
[modify] https://crrev.com/eb98125f2d98670b4f1cac1217949625e8148898/src/gpu/ganesh/image/SkImage_GaneshBase.cpp
[modify] https://crrev.com/eb98125f2d98670b4f1cac1217949625e8148898/include/private/chromium/BUILD.bazel
[modify] https://crrev.com/eb98125f2d98670b4f1cac1217949625e8148898/src/gpu/ganesh/GrDeferredDisplayListRecorder.cpp
[modify] https://crrev.com/eb98125f2d98670b4f1cac1217949625e8148898/src/gpu/ganesh/image/SkImage_GaneshFactories.cpp
[modify] https://crrev.com/eb98125f2d98670b4f1cac1217949625e8148898/tools/DDLPromiseImageHelper.cpp
[modify] https://crrev.com/eb98125f2d98670b4f1cac1217949625e8148898/include/BUILD.bazel
[modify] https://crrev.com/eb98125f2d98670b4f1cac1217949625e8148898/include/core/SkPromiseImageTexture.h
[modify] https://crrev.com/eb98125f2d98670b4f1cac1217949625e8148898/gm/compressed_textures.cpp
[modify] https://crrev.com/eb98125f2d98670b4f1cac1217949625e8148898/src/gpu/ganesh/image/SkImage_GaneshBase.h
[modify] https://crrev.com/eb98125f2d98670b4f1cac1217949625e8148898/tests/DeferredDisplayListTest.cpp
[modify] https://crrev.com/eb98125f2d98670b4f1cac1217949625e8148898/tools/DDLTileHelper.h
[modify] https://crrev.com/eb98125f2d98670b4f1cac1217949625e8148898/tests/PromiseImageTest.cpp
[modify] https://crrev.com/eb98125f2d98670b4f1cac1217949625e8148898/gm/exoticformats.cpp
[modify] https://crrev.com/eb98125f2d98670b4f1cac1217949625e8148898/include/gpu/ganesh/SkImageGanesh.h
[modify] https://crrev.com/eb98125f2d98670b4f1cac1217949625e8148898/toolchain/linux_trampolines/clang_trampoline_linux.sh
[add] https://crrev.com/eb98125f2d98670b4f1cac1217949625e8148898/include/private/chromium/GrPromiseImageTexture.h
[modify] https://crrev.com/eb98125f2d98670b4f1cac1217949625e8148898/gn/gpu.gni
[modify] https://crrev.com/eb98125f2d98670b4f1cac1217949625e8148898/include/private/chromium/GrDeferredDisplayListRecorder.h
[modify] https://crrev.com/eb98125f2d98670b4f1cac1217949625e8148898/gm/bc1_transparency.cpp
[add] https://crrev.com/eb98125f2d98670b4f1cac1217949625e8148898/include/private/chromium/SkImageChromium.h
[modify] https://crrev.com/eb98125f2d98670b4f1cac1217949625e8148898/tools/DDLPromiseImageHelper.h
[modify] https://crrev.com/eb98125f2d98670b4f1cac1217949625e8148898/fuzz/FuzzDDLThreading.cpp
[add] https://crrev.com/eb98125f2d98670b4f1cac1217949625e8148898/relnotes/SkPromiseImageTexture.md
[modify] https://crrev.com/eb98125f2d98670b4f1cac1217949625e8148898/include/core/BUILD.bazel
[delete] https://crrev.com/0d592c26edaf86ea471b985931ebf27b5390073d/src/core/SkPromiseImageTexture.cpp
[modify] https://crrev.com/eb98125f2d98670b4f1cac1217949625e8148898/src/gpu/ganesh/image/SkImage_GaneshYUVA.cpp
[modify] https://crrev.com/eb98125f2d98670b4f1cac1217949625e8148898/public.bzl

Git Watcher via monorail

unread,

Jun 15, 2023, 11:49:10 AM6/15/23

to bu...@skia.org

Comment #21 on issue 14317 by Git Watcher: Remove references to GPU code from src/core
https://bugs.chromium.org/p/skia/issues/detail?id=14317#c21

The following revision refers to this bug:
  

https://chromium.googlesource.com/chromium/src/+/9865bc8b4ef8d89ab0bb4964473aa95e36e43e0f

commit 9865bc8b4ef8d89ab0bb4964473aa95e36e43e0f
Author: Kevin Lubick <kjlu...@google.com>
Date: Thu Jun 15 15:48:30 2023

Rename SkPromiseImageTexture to GrPromiseImageTexture

In http://review.skia.org/710679 Skia moved and renamed this type.

It additionally moved SkImages::PromiseTextureFrom* to
include/private/chromium/SkImageChromium.h, so the one file that
used those APIs has been moved.

Some of the existing #includes seemed unnecessary, so I removed
those.

Bug: skia:14317
Change-Id: I34fac7bbfa85d3c668b6e8ed6f70e6685aae05b0
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4616508
Auto-Submit: Kevin Lubick <kjlu...@chromium.org>

Commit-Queue: Vasiliy Telezhnikov <vas...@chromium.org>
Reviewed-by: Vasiliy Telezhnikov <vas...@chromium.org>

Cr-Commit-Position: refs/heads/main@{#1158199}

[modify] https://crrev.com/9865bc8b4ef8d89ab0bb4964473aa95e36e43e0f/gpu/command_buffer/service/shared_image/dcomp_surface_image_representation.cc
[modify] https://crrev.com/9865bc8b4ef8d89ab0bb4964473aa95e36e43e0f/gpu/command_buffer/service/shared_image/gl_texture_image_backing.h
[modify] https://crrev.com/9865bc8b4ef8d89ab0bb4964473aa95e36e43e0f/gpu/command_buffer/service/webgpu_decoder_impl.cc
[modify] https://crrev.com/9865bc8b4ef8d89ab0bb4964473aa95e36e43e0f/gpu/command_buffer/service/shared_image/iosurface_image_backing_factory_unittest.cc
[modify] https://crrev.com/9865bc8b4ef8d89ab0bb4964473aa95e36e43e0f/gpu/command_buffer/service/shared_image/ahardwarebuffer_image_backing_factory.cc
[modify] https://crrev.com/9865bc8b4ef8d89ab0bb4964473aa95e36e43e0f/gpu/command_buffer/service/shared_image/gl_texture_holder.h
[modify] https://crrev.com/9865bc8b4ef8d89ab0bb4964473aa95e36e43e0f/gpu/command_buffer/service/shared_image/wrapped_sk_image_backing.h
[modify] https://crrev.com/9865bc8b4ef8d89ab0bb4964473aa95e36e43e0f/gpu/command_buffer/service/shared_image/ahardwarebuffer_image_backing_factory_unittest.cc
[modify] https://crrev.com/9865bc8b4ef8d89ab0bb4964473aa95e36e43e0f/gpu/command_buffer/service/shared_image/skia_vk_android_image_representation.cc
[modify] https://crrev.com/9865bc8b4ef8d89ab0bb4964473aa95e36e43e0f/gpu/command_buffer/service/shared_image/iosurface_image_backing.h
[modify] https://crrev.com/9865bc8b4ef8d89ab0bb4964473aa95e36e43e0f/gpu/command_buffer/service/shared_image/shared_image_representation_unittest.cc
[modify] https://crrev.com/9865bc8b4ef8d89ab0bb4964473aa95e36e43e0f/gpu/command_buffer/service/shared_image/wrapped_sk_image_backing_factory_unittest.cc
[modify] https://crrev.com/9865bc8b4ef8d89ab0bb4964473aa95e36e43e0f/gpu/command_buffer/service/copy_shared_image_helper.cc
[modify] https://crrev.com/9865bc8b4ef8d89ab0bb4964473aa95e36e43e0f/gpu/command_buffer/service/shared_image/shared_image_test_base.cc
[modify] https://crrev.com/9865bc8b4ef8d89ab0bb4964473aa95e36e43e0f/gpu/command_buffer/service/shared_image/external_vk_image_backing_factory_unittest.cc
[modify] https://crrev.com/9865bc8b4ef8d89ab0bb4964473aa95e36e43e0f/gpu/command_buffer/service/shared_image/angle_vulkan_image_backing.h
[modify] https://crrev.com/9865bc8b4ef8d89ab0bb4964473aa95e36e43e0f/gpu/command_buffer/service/shared_image/iosurface_image_backing_factory.mm
[modify] https://crrev.com/9865bc8b4ef8d89ab0bb4964473aa95e36e43e0f/gpu/command_buffer/service/shared_image/test_image_backing.cc
[modify] https://crrev.com/9865bc8b4ef8d89ab0bb4964473aa95e36e43e0f/components/viz/service/display_embedder/skia_output_surface_impl_on_gpu.cc
[modify] https://crrev.com/9865bc8b4ef8d89ab0bb4964473aa95e36e43e0f/gpu/command_buffer/service/shared_image/skia_vk_android_image_representation.h
[modify] https://crrev.com/9865bc8b4ef8d89ab0bb4964473aa95e36e43e0f/gpu/command_buffer/service/shared_image/skia_gl_image_representation.h
[modify] https://crrev.com/9865bc8b4ef8d89ab0bb4964473aa95e36e43e0f/gpu/command_buffer/service/shared_image/d3d_image_backing_factory_unittest.cc
[modify] https://crrev.com/9865bc8b4ef8d89ab0bb4964473aa95e36e43e0f/gpu/command_buffer/service/shared_image/dcomp_surface_image_representation.h
[modify] https://crrev.com/9865bc8b4ef8d89ab0bb4964473aa95e36e43e0f/gpu/command_buffer/service/shared_image/dxgi_swap_chain_image_representation.cc
[modify] https://crrev.com/9865bc8b4ef8d89ab0bb4964473aa95e36e43e0f/gpu/command_buffer/service/shared_image/gl_texture_holder.cc
[modify] https://crrev.com/9865bc8b4ef8d89ab0bb4964473aa95e36e43e0f/gpu/command_buffer/service/shared_image/compound_image_backing.cc
[modify] https://crrev.com/9865bc8b4ef8d89ab0bb4964473aa95e36e43e0f/components/viz/service/display_embedder/skia_output_surface_impl.cc
[modify] https://crrev.com/9865bc8b4ef8d89ab0bb4964473aa95e36e43e0f/gpu/command_buffer/service/shared_image/ozone_image_backing.cc
[modify] https://crrev.com/9865bc8b4ef8d89ab0bb4964473aa95e36e43e0f/gpu/command_buffer/service/shared_image/dxgi_swap_chain_image_representation.h
[modify] https://crrev.com/9865bc8b4ef8d89ab0bb4964473aa95e36e43e0f/gpu/command_buffer/service/shared_image/gl_texture_common_representations.cc
[modify] https://crrev.com/9865bc8b4ef8d89ab0bb4964473aa95e36e43e0f/gpu/command_buffer/service/shared_image/gl_texture_image_backing.cc
[modify] https://crrev.com/9865bc8b4ef8d89ab0bb4964473aa95e36e43e0f/gpu/command_buffer/service/shared_image/test_utils.cc
[modify] https://crrev.com/9865bc8b4ef8d89ab0bb4964473aa95e36e43e0f/gpu/command_buffer/service/shared_image/angle_vulkan_image_backing.cc
[modify] https://crrev.com/9865bc8b4ef8d89ab0bb4964473aa95e36e43e0f/gpu/command_buffer/service/shared_image/video_image_reader_image_backing.cc
[modify] https://crrev.com/9865bc8b4ef8d89ab0bb4964473aa95e36e43e0f/gpu/command_buffer/service/raster_decoder.cc
[modify] https://crrev.com/9865bc8b4ef8d89ab0bb4964473aa95e36e43e0f/gpu/command_buffer/service/shared_image/external_vk_image_skia_representation.cc
[modify] https://crrev.com/9865bc8b4ef8d89ab0bb4964473aa95e36e43e0f/gpu/command_buffer/service/shared_image/shared_image_representation.h
[modify] https://crrev.com/9865bc8b4ef8d89ab0bb4964473aa95e36e43e0f/components/viz/service/display_embedder/image_context_impl.cc
[modify] https://crrev.com/9865bc8b4ef8d89ab0bb4964473aa95e36e43e0f/gpu/command_buffer/service/shared_image/raw_draw_image_backing.h
[modify] https://crrev.com/9865bc8b4ef8d89ab0bb4964473aa95e36e43e0f/gpu/command_buffer/service/shared_image/wrapped_sk_image_backing.cc
[modify] https://crrev.com/9865bc8b4ef8d89ab0bb4964473aa95e36e43e0f/gpu/command_buffer/service/shared_image/external_vk_image_backing.h
[modify] https://crrev.com/9865bc8b4ef8d89ab0bb4964473aa95e36e43e0f/gpu/command_buffer/service/shared_image/raw_draw_image_backing.cc
[modify] https://crrev.com/9865bc8b4ef8d89ab0bb4964473aa95e36e43e0f/gpu/command_buffer/service/shared_image/skia_vk_ozone_image_representation.h
[modify] https://crrev.com/9865bc8b4ef8d89ab0bb4964473aa95e36e43e0f/gpu/command_buffer/service/shared_image/video_surface_texture_image_backing.cc
[modify] https://crrev.com/9865bc8b4ef8d89ab0bb4964473aa95e36e43e0f/components/viz/service/display_embedder/image_context_impl.h
[modify] https://crrev.com/9865bc8b4ef8d89ab0bb4964473aa95e36e43e0f/gpu/command_buffer/service/shared_image/external_vk_image_backing.cc
[modify] https://crrev.com/9865bc8b4ef8d89ab0bb4964473aa95e36e43e0f/gpu/command_buffer/service/shared_image/external_vk_image_skia_representation.h
[modify] https://crrev.com/9865bc8b4ef8d89ab0bb4964473aa95e36e43e0f/gpu/command_buffer/service/shared_image/texture_holder_vk.h
[modify] https://crrev.com/9865bc8b4ef8d89ab0bb4964473aa95e36e43e0f/gpu/command_buffer/service/shared_image/egl_image_backing_factory_unittest.cc
[modify] https://crrev.com/9865bc8b4ef8d89ab0bb4964473aa95e36e43e0f/gpu/command_buffer/service/shared_image/gl_texture_common_representations.h
[modify] https://crrev.com/9865bc8b4ef8d89ab0bb4964473aa95e36e43e0f/gpu/command_buffer/service/shared_image/skia_vk_ozone_image_representation.cc
[modify] https://crrev.com/9865bc8b4ef8d89ab0bb4964473aa95e36e43e0f/gpu/command_buffer/service/shared_image/iosurface_image_backing.mm
[modify] https://crrev.com/9865bc8b4ef8d89ab0bb4964473aa95e36e43e0f/gpu/command_buffer/service/shared_image/angle_vulkan_image_backing_factory_unittest.cc
[modify] https://crrev.com/9865bc8b4ef8d89ab0bb4964473aa95e36e43e0f/gpu/command_buffer/service/shared_image/skia_gl_image_representation.cc
[modify] https://crrev.com/9865bc8b4ef8d89ab0bb4964473aa95e36e43e0f/gpu/command_buffer/service/shared_image/shared_image_representation.cc
[modify] https://crrev.com/9865bc8b4ef8d89ab0bb4964473aa95e36e43e0f/gpu/command_buffer/service/shared_image/gl_texture_image_backing_factory_unittest.cc
[modify] https://crrev.com/9865bc8b4ef8d89ab0bb4964473aa95e36e43e0f/gpu/command_buffer/service/shared_image/texture_holder_vk.cc

Git Watcher via monorail

unread,

Jun 16, 2023, 9:22:11 AM6/16/23

to bu...@skia.org

Comment #22 on issue 14317 by Git Watcher: Remove references to GPU code from src/core
https://bugs.chromium.org/p/skia/issues/detail?id=14317#c22

The following revision refers to this bug:
  

https://skia.googlesource.com/skia/+/bb5fbf9d5a31a4f10cbc6cd21999e17841d1e2f8

commit bb5fbf9d5a31a4f10cbc6cd21999e17841d1e2f8
Author: Kevin Lubick <kjlu...@google.com>
Date: Thu Jun 15 20:50:26 2023

Introduce delegate for Atlas regeneration

I tried a few different things for this (see earlier PS if interested)
and settled on adding another delegate at the recommendation of
herb@, which has ended in a relatively clean way to break things up.

The Ganesh- and Graphite-specific part for GlyphVector (how to
add glyphs to the respective atlas) already live in src/gpu/ganesh
and src/gpu/graphite, so they are only compiled and linked in
when that particular backend is. However, to make either or both
of them available without ifdefs, I needed a way to call them
from SubRuns without forcing both of them to be there during
link-time.

Thus, an additional delegate which the Ganesh TextAtlasOp or
Graphite Device supplies to make the call to the right backend code.

Out of caution, I moved the GPU specific calls to be private
and then added friends to allow the blessed part in Ganesh/Graphite
to make the call. This way we don't have unintentional calls
to that, which could cause link-time errors or other issues
since regenerating the atlas should only be done in a single-threaded
environment due to how it mutates the underlying data.

I also added a way to query the required padding for a given
AtlasSubRun. This was necessary in an earlier version, and continues
to exist to document some otherwise magic numbers.

Next step in the ongoing effort to remove #ifdefs from src/text
would be looking at how the graphite instancing parts work and
how we can decouple that.

Change-Id: I272773ec5bc492994b04171c981f0c079e05961d
Bug: skia:14317
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/711682
Reviewed-by: Herb Derby <he...@google.com>
Commit-Queue: Kevin Lubick <kjlu...@google.com>

[modify] https://crrev.com/bb5fbf9d5a31a4f10cbc6cd21999e17841d1e2f8/src/text/gpu/SubRunContainer.cpp
[modify] https://crrev.com/bb5fbf9d5a31a4f10cbc6cd21999e17841d1e2f8/src/gpu/ganesh/ops/AtlasTextOp.cpp
[modify] https://crrev.com/bb5fbf9d5a31a4f10cbc6cd21999e17841d1e2f8/src/text/gpu/GlyphVector.h
[modify] https://crrev.com/bb5fbf9d5a31a4f10cbc6cd21999e17841d1e2f8/src/gpu/ganesh/text/GrAtlasManager.cpp
[modify] https://crrev.com/bb5fbf9d5a31a4f10cbc6cd21999e17841d1e2f8/src/text/gpu/SubRunContainer.h
[modify] https://crrev.com/bb5fbf9d5a31a4f10cbc6cd21999e17841d1e2f8/src/gpu/graphite/Device.cpp
[modify] https://crrev.com/bb5fbf9d5a31a4f10cbc6cd21999e17841d1e2f8/src/gpu/graphite/text/AtlasManager.cpp

Git Watcher via monorail

unread,

Jun 16, 2023, 9:22:13 AM6/16/23

to bu...@skia.org

Comment #23 on issue 14317 by Git Watcher: Remove references to GPU code from src/core
https://bugs.chromium.org/p/skia/issues/detail?id=14317#c23

The following revision refers to this bug:
  

https://skia.googlesource.com/skia/+/c18e0d8aa266a563b904dbe0294de0baa69886eb

commit c18e0d8aa266a563b904dbe0294de0baa69886eb
Author: Kevin Lubick <kjlu...@google.com>
Date: Thu Jun 15 20:40:26 2023

Extract VertexFiller and add AtlasDrawDelegate as GPU abstraction

Still need to decouple Ganesh/Graphite from AtlasSubRuns and
VertexFiller

Change-Id: I7f305f162751729da2b152781619b8ef6484ed39
Bug: skia:14317
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/711396
Reviewed-by: Herb Derby <he...@google.com>

[modify] https://crrev.com/c18e0d8aa266a563b904dbe0294de0baa69886eb/src/text/gpu/TextBlobRedrawCoordinator.h
[modify] https://crrev.com/c18e0d8aa266a563b904dbe0294de0baa69886eb/src/text/gpu/TextBlobRedrawCoordinator.cpp
[add] https://crrev.com/c18e0d8aa266a563b904dbe0294de0baa69886eb/src/text/gpu/VertexFiller.cpp
[modify] https://crrev.com/c18e0d8aa266a563b904dbe0294de0baa69886eb/gn/gpu.gni
[modify] https://crrev.com/c18e0d8aa266a563b904dbe0294de0baa69886eb/src/gpu/ganesh/SurfaceDrawContext.cpp
[modify] https://crrev.com/c18e0d8aa266a563b904dbe0294de0baa69886eb/src/text/gpu/TextBlob.cpp
[modify] https://crrev.com/c18e0d8aa266a563b904dbe0294de0baa69886eb/src/gpu/graphite/Device.cpp
[modify] https://crrev.com/c18e0d8aa266a563b904dbe0294de0baa69886eb/src/text/gpu/BUILD.bazel
[modify] https://crrev.com/c18e0d8aa266a563b904dbe0294de0baa69886eb/src/text/gpu/TextBlob.h
[modify] https://crrev.com/c18e0d8aa266a563b904dbe0294de0baa69886eb/src/text/gpu/SubRunContainer.cpp
[modify] https://crrev.com/c18e0d8aa266a563b904dbe0294de0baa69886eb/src/gpu/graphite/Device.h
[modify] https://crrev.com/c18e0d8aa266a563b904dbe0294de0baa69886eb/src/text/gpu/SubRunContainer.h
[modify] https://crrev.com/c18e0d8aa266a563b904dbe0294de0baa69886eb/public.bzl
[add] https://crrev.com/c18e0d8aa266a563b904dbe0294de0baa69886eb/src/text/gpu/VertexFiller.h
[modify] https://crrev.com/c18e0d8aa266a563b904dbe0294de0baa69886eb/src/gpu/ganesh/Device.cpp

Git Watcher via monorail

unread,

Jun 16, 2023, 9:27:05 AM6/16/23

to bu...@skia.org

Comment #24 on issue 14317 by Git Watcher: Remove references to GPU code from src/core
https://bugs.chromium.org/p/skia/issues/detail?id=14317#c24

The following revision refers to this bug:
  

https://skia.googlesource.com/skia/+/03b3e3f39a0a8a7f5613a538d38a80b81c9c1969

commit 03b3e3f39a0a8a7f5613a538d38a80b81c9c1969
Author: Kevin Lubick <kjlu...@google.com>
Date: Fri Jun 16 12:38:44 2023

Remove Android GPU methods from SkCanvas

Upstream change: http://ag/23656074

Change-Id: Ie2e5fe94615e55f37576b40c08237385a7e7543a
Bug: skia:14317
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/712716
Reviewed-by: Brian Osman <brian...@google.com>
Commit-Queue: Kevin Lubick <kjlu...@google.com>

[modify] https://crrev.com/03b3e3f39a0a8a7f5613a538d38a80b81c9c1969/src/core/SkCanvas.cpp
[modify] https://crrev.com/03b3e3f39a0a8a7f5613a538d38a80b81c9c1969/include/core/SkCanvas.h

Git Watcher via monorail

unread,

Jun 20, 2023, 8:18:06 PM6/20/23

to bu...@skia.org

Comment #25 on issue 14317 by Git Watcher: Remove references to GPU code from src/core
https://bugs.chromium.org/p/skia/issues/detail?id=14317#c25

The following revision refers to this bug:
  

https://skia.googlesource.com/skia/+/3a3f4e195ac17c71ed4a41a664f6fe8d56843e27

commit 3a3f4e195ac17c71ed4a41a664f6fe8d56843e27
Author: Kevin Lubick <kjlu...@google.com>
Date: Tue Jun 20 20:01:51 2023

Move SkTestCanvas impl to its own cpp

One small step towards removing SK_GANESH #ifdefs from SkCanvas

Had to move AutoLayerForImageFilter to a header to be used by
both SkCanvas.cpp and SkTestCanvas.cpp; I arbitrarily chose
SkCanvasPriv.h

Bug: skia:14317
Change-Id: I237052ba0c68bfb780af1172c08b166a5bd4f90a
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/714065

Reviewed-by: Brian Osman <brian...@google.com>
Commit-Queue: Kevin Lubick <kjlu...@google.com>

[modify] https://crrev.com/3a3f4e195ac17c71ed4a41a664f6fe8d56843e27/gn/utils.gni
[modify] https://crrev.com/3a3f4e195ac17c71ed4a41a664f6fe8d56843e27/src/core/SkCanvasPriv.cpp
[modify] https://crrev.com/3a3f4e195ac17c71ed4a41a664f6fe8d56843e27/src/core/SkCanvas.cpp
[modify] https://crrev.com/3a3f4e195ac17c71ed4a41a664f6fe8d56843e27/bench/GlyphQuadFillBench.cpp
[modify] https://crrev.com/3a3f4e195ac17c71ed4a41a664f6fe8d56843e27/src/utils/SkTestCanvas.h
[modify] https://crrev.com/3a3f4e195ac17c71ed4a41a664f6fe8d56843e27/src/core/SkCanvasPriv.h
[modify] https://crrev.com/3a3f4e195ac17c71ed4a41a664f6fe8d56843e27/public.bzl
[modify] https://crrev.com/3a3f4e195ac17c71ed4a41a664f6fe8d56843e27/src/utils/BUILD.bazel
[add] https://crrev.com/3a3f4e195ac17c71ed4a41a664f6fe8d56843e27/src/utils/SkTestCanvas.cpp

Git Watcher via monorail

unread,

Jun 21, 2023, 3:14:05 PM6/21/23

to bu...@skia.org

Comment #26 on issue 14317 by Git Watcher: Remove references to GPU code from src/core
https://bugs.chromium.org/p/skia/issues/detail?id=14317#c26

The following revision refers to this bug:
  

https://skia.googlesource.com/skia/+/4a187251e7e143a681b6a7b2901a61ac6c2ef0b0

commit 4a187251e7e143a681b6a7b2901a61ac6c2ef0b0
Author: Kevin Lubick <kjlu...@google.com>
Date: Wed Jun 21 17:32:48 2023

Remove SkCanvas::flush() from Skia-proper and remove other gpu-specific code

This removes more gpu-related #ifdefs from SkCanvas.cpp

Bug: skia:14317
Change-Id: I468c3e1e1abac130fa9204a98f9ce78bc1405eea
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/714643
Reviewed-by: Brian Osman <brian...@google.com>

[modify] https://crrev.com/4a187251e7e143a681b6a7b2901a61ac6c2ef0b0/docs/examples/Bitmap_extractAlpha_3.cpp
[modify] https://crrev.com/4a187251e7e143a681b6a7b2901a61ac6c2ef0b0/tests/CanvasTest.cpp
[modify] https://crrev.com/4a187251e7e143a681b6a7b2901a61ac6c2ef0b0/src/core/SkPictureRecord.cpp
[modify] https://crrev.com/4a187251e7e143a681b6a7b2901a61ac6c2ef0b0/docs/examples/no_gpu_blur.cpp
[add] https://crrev.com/4a187251e7e143a681b6a7b2901a61ac6c2ef0b0/relnotes/canvas_flush.md
[modify] https://crrev.com/4a187251e7e143a681b6a7b2901a61ac6c2ef0b0/src/core/SkRecorder.cpp
[modify] https://crrev.com/4a187251e7e143a681b6a7b2901a61ac6c2ef0b0/src/core/SkPictureRecord.h
[modify] https://crrev.com/4a187251e7e143a681b6a7b2901a61ac6c2ef0b0/src/gpu/graphite/Device.h
[modify] https://crrev.com/4a187251e7e143a681b6a7b2901a61ac6c2ef0b0/docs/examples/Canvas_MakeRasterDirect.cpp
[modify] https://crrev.com/4a187251e7e143a681b6a7b2901a61ac6c2ef0b0/docs/examples/Surface_MakeRasterDirectReleaseProc.cpp
[modify] https://crrev.com/4a187251e7e143a681b6a7b2901a61ac6c2ef0b0/src/core/SkRecordDraw.cpp
[modify] https://crrev.com/4a187251e7e143a681b6a7b2901a61ac6c2ef0b0/src/gpu/ganesh/Device.h
[modify] https://crrev.com/4a187251e7e143a681b6a7b2901a61ac6c2ef0b0/docs/examples/Surface_MakeRasterN32Premul.cpp
[modify] https://crrev.com/4a187251e7e143a681b6a7b2901a61ac6c2ef0b0/src/core/SkCanvas.cpp
[modify] https://crrev.com/4a187251e7e143a681b6a7b2901a61ac6c2ef0b0/src/core/SkDevice.h
[modify] https://crrev.com/4a187251e7e143a681b6a7b2901a61ac6c2ef0b0/fuzz/FuzzCanvas.cpp
[modify] https://crrev.com/4a187251e7e143a681b6a7b2901a61ac6c2ef0b0/tests/PictureTest.cpp
[modify] https://crrev.com/4a187251e7e143a681b6a7b2901a61ac6c2ef0b0/docs/examples/Surface_MakeRaster.cpp
[modify] https://crrev.com/4a187251e7e143a681b6a7b2901a61ac6c2ef0b0/include/utils/SkPaintFilterCanvas.h
[modify] https://crrev.com/4a187251e7e143a681b6a7b2901a61ac6c2ef0b0/src/core/SkRecorder.h
[modify] https://crrev.com/4a187251e7e143a681b6a7b2901a61ac6c2ef0b0/src/core/SkRecords.h
[modify] https://crrev.com/4a187251e7e143a681b6a7b2901a61ac6c2ef0b0/include/utils/SkNWayCanvas.h
[modify] https://crrev.com/4a187251e7e143a681b6a7b2901a61ac6c2ef0b0/docs/examples/Bitmap_extractAlpha_2.cpp
[modify] https://crrev.com/4a187251e7e143a681b6a7b2901a61ac6c2ef0b0/docs/examples/Surface_MakeRasterDirect.cpp
[modify] https://crrev.com/4a187251e7e143a681b6a7b2901a61ac6c2ef0b0/src/core/SkPicturePlayback.cpp
[modify] https://crrev.com/4a187251e7e143a681b6a7b2901a61ac6c2ef0b0/src/utils/SkNWayCanvas.cpp
[modify] https://crrev.com/4a187251e7e143a681b6a7b2901a61ac6c2ef0b0/src/core/SkPictureFlat.h
[modify] https://crrev.com/4a187251e7e143a681b6a7b2901a61ac6c2ef0b0/docs/examples/Surface_MakeRaster_2.cpp
[modify] https://crrev.com/4a187251e7e143a681b6a7b2901a61ac6c2ef0b0/include/core/SkCanvas.h
[modify] https://crrev.com/4a187251e7e143a681b6a7b2901a61ac6c2ef0b0/docs/examples/Canvas_MakeRasterDirectN32.cpp
[modify] https://crrev.com/4a187251e7e143a681b6a7b2901a61ac6c2ef0b0/docs/examples/Bitmap_extractAlpha.cpp

Git Watcher via monorail

unread,

Jun 22, 2023, 9:47:08 AM6/22/23

to bu...@skia.org

Comment #27 on issue 14317 by Git Watcher: Remove references to GPU code from src/core
https://bugs.chromium.org/p/skia/issues/detail?id=14317#c27

The following revision refers to this bug:
  

https://skia.googlesource.com/skia/+/ff347e5657a7050c23d2897c5dbcc8c5d9827e76

commit ff347e5657a7050c23d2897c5dbcc8c5d9827e76
Author: Kevin Lubick <kjlu...@google.com>
Date: Thu Jun 22 12:40:53 2023

Completely remove graphite #ifdefs from subruncontainer

This threads a RendererData struct through the AtlasDrawDelegate
call so the Graphite Device can choose the right renderer with
one less layer of abstraction.

After this CL, `git grep SK_GRAPHITE` returns 0 hits in
src/text

Change-Id: I2d02ba216c6d5ed60ac42901754da556bd5b0f5a
Bug: skia:14317
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/712862
Reviewed-by: Michael Ludwig <michae...@google.com>
Reviewed-by: Herb Derby <he...@google.com>

Reviewed-by: Jim Van Verth <jvan...@google.com>

[modify] https://crrev.com/ff347e5657a7050c23d2897c5dbcc8c5d9827e76/src/text/gpu/SubRunContainer.cpp
[modify] https://crrev.com/ff347e5657a7050c23d2897c5dbcc8c5d9827e76/src/gpu/graphite/Device.h
[modify] https://crrev.com/ff347e5657a7050c23d2897c5dbcc8c5d9827e76/src/gpu/ganesh/SurfaceDrawContext.cpp
[modify] https://crrev.com/ff347e5657a7050c23d2897c5dbcc8c5d9827e76/src/text/gpu/SubRunContainer.h
[modify] https://crrev.com/ff347e5657a7050c23d2897c5dbcc8c5d9827e76/src/gpu/graphite/Device.cpp
[modify] https://crrev.com/ff347e5657a7050c23d2897c5dbcc8c5d9827e76/src/gpu/graphite/geom/SubRunData.h
[modify] https://crrev.com/ff347e5657a7050c23d2897c5dbcc8c5d9827e76/src/gpu/ganesh/Device.cpp

Git Watcher via monorail

unread,

Jun 22, 2023, 9:47:10 AM6/22/23

to bu...@skia.org

Comment #28 on issue 14317 by Git Watcher: Remove references to GPU code from src/core
https://bugs.chromium.org/p/skia/issues/detail?id=14317#c28

The following revision refers to this bug:
  

https://skia.googlesource.com/skia/+/183bb6e2da4a6cbf3ca97fbd3df565b781fdd42d

commit 183bb6e2da4a6cbf3ca97fbd3df565b781fdd42d
Author: Kevin Lubick <kjlu...@google.com>
Date: Thu Jun 22 12:40:32 2023

Move VertexFiller::boundsAndDeviceMatrix impl to src/graphite

Change-Id: I5be3b58bc7b61b51dd3cf4b38270e526b001383c
Bug: skia:14317
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/712860

Reviewed-by: Herb Derby <he...@google.com>
Reviewed-by: Jim Van Verth <jvan...@google.com>

[modify] https://crrev.com/183bb6e2da4a6cbf3ca97fbd3df565b781fdd42d/src/text/gpu/SubRunContainer.cpp
[modify] https://crrev.com/183bb6e2da4a6cbf3ca97fbd3df565b781fdd42d/src/text/gpu/VertexFiller.cpp
[modify] https://crrev.com/183bb6e2da4a6cbf3ca97fbd3df565b781fdd42d/src/text/gpu/SubRunContainer.h
[modify] https://crrev.com/183bb6e2da4a6cbf3ca97fbd3df565b781fdd42d/src/gpu/graphite/Device.cpp
[modify] https://crrev.com/183bb6e2da4a6cbf3ca97fbd3df565b781fdd42d/src/text/gpu/VertexFiller.h
[modify] https://crrev.com/183bb6e2da4a6cbf3ca97fbd3df565b781fdd42d/src/gpu/graphite/render/GraphiteVertexFiller.cpp

Git Watcher via monorail

unread,

Jun 22, 2023, 9:47:11 AM6/22/23

to bu...@skia.org

Comment #29 on issue 14317 by Git Watcher: Remove references to GPU code from src/core
https://bugs.chromium.org/p/skia/issues/detail?id=14317#c29

The following revision refers to this bug:
  

https://skia.googlesource.com/skia/+/ff2edc94dca707c23fbd2dc53258eeda4c397355

commit ff2edc94dca707c23fbd2dc53258eeda4c397355
Author: Kevin Lubick <kjlu...@google.com>
Date: Thu Jun 22 12:37:22 2023

Move VertexFiller::fillInstanceData to src/graphite

All the implementations in AtlasSubrun subclasses just forwarded
the request to vertex filler. Thus, we can make the two callsites
bypass that intermediate call, exposing a few methods to make
that possible.

Since only graphite code is calling the graphite fillInstanceData
method, we do not need to #ifdef the implementation (or declaration)
to accomodate Ganesh-only builds.

Change-Id: I5c4e49ee08c6df3c5b92c88162897cd2b826df94
Bug: skia:14317
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/712858
Reviewed-by: Herb Derby <he...@google.com>

[modify] https://crrev.com/ff2edc94dca707c23fbd2dc53258eeda4c397355/gn/graphite.gni
[modify] https://crrev.com/ff2edc94dca707c23fbd2dc53258eeda4c397355/src/text/gpu/SubRunContainer.cpp
[modify] https://crrev.com/ff2edc94dca707c23fbd2dc53258eeda4c397355/src/gpu/graphite/render/SDFTextRenderStep.cpp
[modify] https://crrev.com/ff2edc94dca707c23fbd2dc53258eeda4c397355/src/text/gpu/VertexFiller.cpp
[modify] https://crrev.com/ff2edc94dca707c23fbd2dc53258eeda4c397355/src/text/gpu/SubRunContainer.h
[modify] https://crrev.com/ff2edc94dca707c23fbd2dc53258eeda4c397355/src/gpu/graphite/render/BitmapTextRenderStep.cpp
[modify] https://crrev.com/ff2edc94dca707c23fbd2dc53258eeda4c397355/src/text/gpu/VertexFiller.h
[add] https://crrev.com/ff2edc94dca707c23fbd2dc53258eeda4c397355/src/gpu/graphite/render/GraphiteVertexFiller.cpp

Git Watcher via monorail

unread,

Jun 23, 2023, 11:32:05 AM6/23/23

to bu...@skia.org

Comment #30 on issue 14317 by Git Watcher: Remove references to GPU code from src/core
https://bugs.chromium.org/p/skia/issues/detail?id=14317#c30

The following revision refers to this bug:
  

https://skia.googlesource.com/skia/+/e92f4420d263aeddf71ca4ea0c00257ed8611f4c

commit e92f4420d263aeddf71ca4ea0c00257ed8611f4c
Author: Leon Scroggins III <scr...@google.com>
Date: Fri Jun 23 14:17:40 2023

Revert "Remove SkCanvas::flush() from Skia-proper and remove other gpu-specific code"

This reverts commit 4a187251e7e143a681b6a7b2901a61ac6c2ef0b0.

Reason for revert: Breaking the Android roll, specifically
CtsUiRenderingTestCases:android.uirendering.cts.testclasses.LayerTests#testWebViewNoOverlappingRenderingAndAlpha

Original change's description:

> Remove SkCanvas::flush() from Skia-proper and remove other gpu-specific code
>
> This removes more gpu-related #ifdefs from SkCanvas.cpp
>
> Bug: skia:14317
> Change-Id: I468c3e1e1abac130fa9204a98f9ce78bc1405eea
> Reviewed-on: https://skia-review.googlesource.com/c/skia/+/714643
> Reviewed-by: Brian Osman <brian...@google.com>

In addition, revert the attempted fix-forward "Preserve SkNWayCanvas::onFlush"

This reverts commit 5265b5ee1afc64094250ee8d017df93b3d7b1407.

Original change's description:
> Preserve SkNWayCanvas::onFlush
>
> Follow-up to https://skia-review.googlesource.com/c/skia/+/714643
>
> Change-Id: I808281dd1ed4fc46df50b89620fcf3e5f691a6a1
> Reviewed-on: https://skia-review.googlesource.com/c/skia/+/715325
> Reviewed-by: Leon Scroggins <scr...@google.com>
> Auto-Submit: Kevin Lubick <kjlu...@google.com>

> Reviewed-by: Brian Osman <brian...@google.com>
> Commit-Queue: Kevin Lubick <kjlu...@google.com>

> Commit-Queue: Leon Scroggins <scr...@google.com>

Bug: skia:14317
Change-Id: I7e24b05275cd2d3550cada0deec0491201ea1eba
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/715349
Commit-Queue: Brian Osman <brian...@google.com>
Commit-Queue: Leon Scroggins <scr...@google.com>
Auto-Submit: Leon Scroggins <scr...@google.com>
Reviewed-by: Brian Osman <brian...@google.com>

[modify] https://crrev.com/e92f4420d263aeddf71ca4ea0c00257ed8611f4c/docs/examples/Bitmap_extractAlpha_3.cpp
[modify] https://crrev.com/e92f4420d263aeddf71ca4ea0c00257ed8611f4c/tests/CanvasTest.cpp
[modify] https://crrev.com/e92f4420d263aeddf71ca4ea0c00257ed8611f4c/src/core/SkPictureRecord.cpp
[modify] https://crrev.com/e92f4420d263aeddf71ca4ea0c00257ed8611f4c/docs/examples/no_gpu_blur.cpp
[delete] https://crrev.com/9635d54210dc3588746a81638669495810da5e9d/relnotes/canvas_flush.md
[modify] https://crrev.com/e92f4420d263aeddf71ca4ea0c00257ed8611f4c/src/core/SkRecorder.cpp
[modify] https://crrev.com/e92f4420d263aeddf71ca4ea0c00257ed8611f4c/src/core/SkPictureRecord.h
[modify] https://crrev.com/e92f4420d263aeddf71ca4ea0c00257ed8611f4c/src/gpu/graphite/Device.h
[modify] https://crrev.com/e92f4420d263aeddf71ca4ea0c00257ed8611f4c/docs/examples/Canvas_MakeRasterDirect.cpp
[modify] https://crrev.com/e92f4420d263aeddf71ca4ea0c00257ed8611f4c/docs/examples/Surface_MakeRasterDirectReleaseProc.cpp
[modify] https://crrev.com/e92f4420d263aeddf71ca4ea0c00257ed8611f4c/src/core/SkRecordDraw.cpp
[modify] https://crrev.com/e92f4420d263aeddf71ca4ea0c00257ed8611f4c/src/gpu/ganesh/Device.h
[modify] https://crrev.com/e92f4420d263aeddf71ca4ea0c00257ed8611f4c/docs/examples/Surface_MakeRasterN32Premul.cpp
[modify] https://crrev.com/e92f4420d263aeddf71ca4ea0c00257ed8611f4c/src/core/SkCanvas.cpp
[modify] https://crrev.com/e92f4420d263aeddf71ca4ea0c00257ed8611f4c/src/core/SkDevice.h
[modify] https://crrev.com/e92f4420d263aeddf71ca4ea0c00257ed8611f4c/fuzz/FuzzCanvas.cpp
[modify] https://crrev.com/e92f4420d263aeddf71ca4ea0c00257ed8611f4c/tests/PictureTest.cpp
[modify] https://crrev.com/e92f4420d263aeddf71ca4ea0c00257ed8611f4c/docs/examples/Surface_MakeRaster.cpp
[modify] https://crrev.com/e92f4420d263aeddf71ca4ea0c00257ed8611f4c/include/utils/SkPaintFilterCanvas.h
[modify] https://crrev.com/e92f4420d263aeddf71ca4ea0c00257ed8611f4c/src/core/SkRecorder.h
[modify] https://crrev.com/e92f4420d263aeddf71ca4ea0c00257ed8611f4c/src/core/SkRecords.h
[modify] https://crrev.com/e92f4420d263aeddf71ca4ea0c00257ed8611f4c/include/utils/SkNWayCanvas.h
[modify] https://crrev.com/e92f4420d263aeddf71ca4ea0c00257ed8611f4c/docs/examples/Bitmap_extractAlpha_2.cpp
[modify] https://crrev.com/e92f4420d263aeddf71ca4ea0c00257ed8611f4c/docs/examples/Surface_MakeRasterDirect.cpp
[modify] https://crrev.com/e92f4420d263aeddf71ca4ea0c00257ed8611f4c/src/core/SkPicturePlayback.cpp
[modify] https://crrev.com/e92f4420d263aeddf71ca4ea0c00257ed8611f4c/src/utils/SkNWayCanvas.cpp
[modify] https://crrev.com/e92f4420d263aeddf71ca4ea0c00257ed8611f4c/src/core/SkPictureFlat.h
[modify] https://crrev.com/e92f4420d263aeddf71ca4ea0c00257ed8611f4c/docs/examples/Surface_MakeRaster_2.cpp
[modify] https://crrev.com/e92f4420d263aeddf71ca4ea0c00257ed8611f4c/include/core/SkCanvas.h
[modify] https://crrev.com/e92f4420d263aeddf71ca4ea0c00257ed8611f4c/docs/examples/Canvas_MakeRasterDirectN32.cpp
[modify] https://crrev.com/e92f4420d263aeddf71ca4ea0c00257ed8611f4c/docs/examples/Bitmap_extractAlpha.cpp

Git Watcher via monorail

unread,

Jun 26, 2023, 7:48:06 AM6/26/23

to bu...@skia.org

Comment #31 on issue 14317 by Git Watcher: Remove references to GPU code from src/core
https://bugs.chromium.org/p/skia/issues/detail?id=14317#c31

The following revision refers to this bug:
  

https://skia.googlesource.com/skia/+/46dcf29e5dfe9be03b51eedf2ce97cd6f4b9f93a

commit 46dcf29e5dfe9be03b51eedf2ce97cd6f4b9f93a
Author: Kevin Lubick <kjlu...@google.com>
Date: Thu Jun 22 18:25:46 2023

Remove SkRuntimeEffect::makeImage

This was adding an implicit dependency on the GPU backend. Its effects
should be reproducable with public APIs (and the client can choose
what surface to draw it on).

Bug: skia:14317
Change-Id: If2d2335f1c7f0432cbb290924243757c4c265ed3
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/715323
Commit-Queue: Kevin Lubick <kjlu...@google.com>
Reviewed-by: Brian Osman <brian...@google.com>

[modify] https://crrev.com/46dcf29e5dfe9be03b51eedf2ce97cd6f4b9f93a/src/core/SkRuntimeEffect.cpp
[add] https://crrev.com/46dcf29e5dfe9be03b51eedf2ce97cd6f4b9f93a/relnotes/runtimeeffect_image.md
[modify] https://crrev.com/46dcf29e5dfe9be03b51eedf2ce97cd6f4b9f93a/include/effects/SkRuntimeEffect.h

Git Watcher via monorail

unread,

Jun 26, 2023, 10:30:14 AM6/26/23

to bu...@skia.org

Comment #32 on issue 14317 by Git Watcher: Remove references to GPU code from src/core
https://bugs.chromium.org/p/skia/issues/detail?id=14317#c32

The following revision refers to this bug:
  

https://skia.googlesource.com/skia/+/5174b3b1f599ba9105238ea8153215e123648d6b

commit 5174b3b1f599ba9105238ea8153215e123648d6b
Author: Kevin Lubick <kjlu...@google.com>
Date: Mon Jun 26 14:29:11 2023

Revert "Remove SkRuntimeEffect::makeImage"

This reverts commit 46dcf29e5dfe9be03b51eedf2ce97cd6f4b9f93a.

Reason for revert: Still used by Android

Original change's description:

> Remove SkRuntimeEffect::makeImage
>
> This was adding an implicit dependency on the GPU backend. Its effects
> should be reproducable with public APIs (and the client can choose
> what surface to draw it on).
>
> Bug: skia:14317
> Change-Id: If2d2335f1c7f0432cbb290924243757c4c265ed3
> Reviewed-on: https://skia-review.googlesource.com/c/skia/+/715323
> Commit-Queue: Kevin Lubick <kjlu...@google.com>
> Reviewed-by: Brian Osman <brian...@google.com>

Bug: skia:14317
Change-Id: I2fd6927a938978c0175fb661536c53997482deed
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/716536
Commit-Queue: John Stiles <johns...@google.com>
Reviewed-by: John Stiles <johns...@google.com>
Owners-Override: Kevin Lubick <kjlu...@google.com>
Auto-Submit: Kevin Lubick <kjlu...@google.com>

[modify] https://crrev.com/5174b3b1f599ba9105238ea8153215e123648d6b/src/core/SkRuntimeEffect.cpp
[delete] https://crrev.com/ac2465ea3669d6a98988b4cf4be0c777d45b5726/relnotes/runtimeeffect_image.md
[modify] https://crrev.com/5174b3b1f599ba9105238ea8153215e123648d6b/include/effects/SkRuntimeEffect.h

Git Watcher via monorail

unread,

Jun 27, 2023, 10:56:05 AM6/27/23

to bu...@skia.org

Comment #33 on issue 14317 by Git Watcher: Remove references to GPU code from src/core
https://bugs.chromium.org/p/skia/issues/detail?id=14317#c33

The following revision refers to this bug:
  

https://skia.googlesource.com/skia/+/f437d01005173a284d1e9c592bd0c61360a6cad1

commit f437d01005173a284d1e9c592bd0c61360a6cad1
Author: Kevin Lubick <kjlu...@google.com>
Date: Mon Jun 26 18:35:06 2023

Remove slug-related #ifdefs from src/core

This also enforces IWYU on some of the affected types
SkPicture etc.

I made SkPicturePlayback a friend of SkCanvas so the former
could call SkCanvas::draw(Slug) directly without needing to
have the implementation be linked in in a CPU build.

I added a null-returning implementation for deserialization
because there is still a connection between SlugImpl -> SubRunContainer
-> Ganesh code that means we cannot quite move slugs into
a CPU only build

Canary-Chromium-CL: 4649851
Bug: skia:14317
Change-Id: I98f776596288e2f6f3266549f5c9c8d12e9ba551
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/715416
Commit-Queue: Kevin Lubick <kjlu...@google.com>
Reviewed-by: Herb Derby <he...@google.com>

[modify] https://crrev.com/f437d01005173a284d1e9c592bd0c61360a6cad1/gn/core.gni
[modify] https://crrev.com/f437d01005173a284d1e9c592bd0c61360a6cad1/src/core/SkPictureRecord.cpp
[modify] https://crrev.com/f437d01005173a284d1e9c592bd0c61360a6cad1/src/pdf/SkPDFShader.cpp
[modify] https://crrev.com/f437d01005173a284d1e9c592bd0c61360a6cad1/modules/skottie/src/effects/BulgeEffect.cpp
[modify] https://crrev.com/f437d01005173a284d1e9c592bd0c61360a6cad1/src/core/SkPictureRecord.h
[modify] https://crrev.com/f437d01005173a284d1e9c592bd0c61360a6cad1/tests/ImageIsOpaqueTest.cpp
[add] https://crrev.com/f437d01005173a284d1e9c592bd0c61360a6cad1/src/text/EmptySlugImpl.cpp
[modify] https://crrev.com/f437d01005173a284d1e9c592bd0c61360a6cad1/tests/SVGDeviceTest.cpp
[modify] https://crrev.com/f437d01005173a284d1e9c592bd0c61360a6cad1/modules/skottie/src/effects/SphereEffect.cpp
[modify] https://crrev.com/f437d01005173a284d1e9c592bd0c61360a6cad1/modules/skottie/src/effects/MotionTileEffect.cpp
[modify] https://crrev.com/f437d01005173a284d1e9c592bd0c61360a6cad1/tests/SkResourceCacheTest.cpp
[modify] https://crrev.com/f437d01005173a284d1e9c592bd0c61360a6cad1/src/core/SkRecordDraw.cpp
[modify] https://crrev.com/f437d01005173a284d1e9c592bd0c61360a6cad1/src/core/SkPicture.cpp
[modify] https://crrev.com/f437d01005173a284d1e9c592bd0c61360a6cad1/src/core/SkPictureData.h
[modify] https://crrev.com/f437d01005173a284d1e9c592bd0c61360a6cad1/src/core/SkRecordDraw.h
[modify] https://crrev.com/f437d01005173a284d1e9c592bd0c61360a6cad1/src/core/SkRecorder.h
[modify] https://crrev.com/f437d01005173a284d1e9c592bd0c61360a6cad1/bench/PictureOverheadBench.cpp
[modify] https://crrev.com/f437d01005173a284d1e9c592bd0c61360a6cad1/modules/jetski/src/Surface.cpp
[modify] https://crrev.com/f437d01005173a284d1e9c592bd0c61360a6cad1/src/core/SkRecords.h
[modify] https://crrev.com/f437d01005173a284d1e9c592bd0c61360a6cad1/modules/svg/src/SkSVGPattern.cpp
[modify] https://crrev.com/f437d01005173a284d1e9c592bd0c61360a6cad1/src/core/SkPictureRecorder.cpp
[modify] https://crrev.com/f437d01005173a284d1e9c592bd0c61360a6cad1/src/core/SkPictureFlat.h
[modify] https://crrev.com/f437d01005173a284d1e9c592bd0c61360a6cad1/include/core/SkCanvas.h
[modify] https://crrev.com/f437d01005173a284d1e9c592bd0c61360a6cad1/modules/skottie/src/SkottieTool.cpp
[modify] https://crrev.com/f437d01005173a284d1e9c592bd0c61360a6cad1/src/BUILD.bazel
[modify] https://crrev.com/f437d01005173a284d1e9c592bd0c61360a6cad1/include/core/SkPicture.h
[modify] https://crrev.com/f437d01005173a284d1e9c592bd0c61360a6cad1/gm/picture.cpp
[modify] https://crrev.com/f437d01005173a284d1e9c592bd0c61360a6cad1/src/core/SkDrawable.cpp
[modify] https://crrev.com/f437d01005173a284d1e9c592bd0c61360a6cad1/src/core/SkRecordOpts.h
[modify] https://crrev.com/f437d01005173a284d1e9c592bd0c61360a6cad1/bench/PicturePlaybackBench.cpp
[modify] https://crrev.com/f437d01005173a284d1e9c592bd0c61360a6cad1/bench/ShaderMaskFilterBench.cpp
[modify] https://crrev.com/f437d01005173a284d1e9c592bd0c61360a6cad1/src/core/SkRecord.cpp
[modify] https://crrev.com/f437d01005173a284d1e9c592bd0c61360a6cad1/src/core/SkRecorder.cpp
[modify] https://crrev.com/f437d01005173a284d1e9c592bd0c61360a6cad1/src/core/SkRecordOpts.cpp
[modify] https://crrev.com/f437d01005173a284d1e9c592bd0c61360a6cad1/src/core/SkRecordedDrawable.h
[modify] https://crrev.com/f437d01005173a284d1e9c592bd0c61360a6cad1/src/core/SkPictureFlat.cpp
[modify] https://crrev.com/f437d01005173a284d1e9c592bd0c61360a6cad1/src/core/SkPictureData.cpp
[modify] https://crrev.com/f437d01005173a284d1e9c592bd0c61360a6cad1/BUILD.gn
[modify] https://crrev.com/f437d01005173a284d1e9c592bd0c61360a6cad1/bazel/exporter/gni_exporter.go
[modify] https://crrev.com/f437d01005173a284d1e9c592bd0c61360a6cad1/bench/DecodeBench.cpp
[modify] https://crrev.com/f437d01005173a284d1e9c592bd0c61360a6cad1/src/pdf/SkPDFGradientShader.cpp
[modify] https://crrev.com/f437d01005173a284d1e9c592bd0c61360a6cad1/modules/jetski/src/SurfaceThread.cpp
[modify] https://crrev.com/f437d01005173a284d1e9c592bd0c61360a6cad1/src/core/SkRecordedDrawable.cpp
[modify] https://crrev.com/f437d01005173a284d1e9c592bd0c61360a6cad1/src/core/SkRecord.h
[modify] https://crrev.com/f437d01005173a284d1e9c592bd0c61360a6cad1/src/core/SkDevice.h
[modify] https://crrev.com/f437d01005173a284d1e9c592bd0c61360a6cad1/toolchain/linux_trampolines/clang_trampoline_linux.sh
[modify] https://crrev.com/f437d01005173a284d1e9c592bd0c61360a6cad1/tests/graphite/ImageProviderTest.cpp
[modify] https://crrev.com/f437d01005173a284d1e9c592bd0c61360a6cad1/bench/nanobench.cpp
[modify] https://crrev.com/f437d01005173a284d1e9c592bd0c61360a6cad1/include/utils/SkNWayCanvas.h
[modify] https://crrev.com/f437d01005173a284d1e9c592bd0c61360a6cad1/src/text/BUILD.bazel
[modify] https://crrev.com/f437d01005173a284d1e9c592bd0c61360a6cad1/src/core/SkPicturePlayback.cpp
[modify] https://crrev.com/f437d01005173a284d1e9c592bd0c61360a6cad1/src/utils/SkNWayCanvas.cpp
[modify] https://crrev.com/f437d01005173a284d1e9c592bd0c61360a6cad1/src/core/SkRecords.cpp
[modify] https://crrev.com/f437d01005173a284d1e9c592bd0c61360a6cad1/bazel/exporter_tool/main.go
[modify] https://crrev.com/f437d01005173a284d1e9c592bd0c61360a6cad1/include/core/SkPictureRecorder.h

Git Watcher via monorail

unread,

Jun 27, 2023, 1:27:09 PM6/27/23

to bu...@skia.org

Comment #34 on issue 14317 by Git Watcher: Remove references to GPU code from src/core
https://bugs.chromium.org/p/skia/issues/detail?id=14317#c34

The following revision refers to this bug:
  

https://skia.googlesource.com/skia/+/f5dda1d37841d3ea025e833116b876c11b6815a9

commit f5dda1d37841d3ea025e833116b876c11b6815a9
Author: Kevin Lubick <kjlu...@google.com>

Date: Thu Jun 22 18:25:46 2023

Reland "Remove SkRuntimeEffect::makeImage"

This is a reland of commit 46dcf29e5dfe9be03b51eedf2ce97cd6f4b9f93a

Android change:
http://ag/23813288

Original change's description:
> Remove SkRuntimeEffect::makeImage
>
> This was adding an implicit dependency on the GPU backend. Its effects
> should be reproducable with public APIs (and the client can choose
> what surface to draw it on).
>
> Bug: skia:14317
> Change-Id: If2d2335f1c7f0432cbb290924243757c4c265ed3
> Reviewed-on: https://skia-review.googlesource.com/c/skia/+/715323

> Commit-Queue: Kevin Lubick <kjlu...@google.com>

> Reviewed-by: Brian Osman <brian...@google.com>

Bug: skia:14317

Change-Id: I19812e9dd72cba0310f81f08a15d24e5869a9993
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/716543
Reviewed-by: Brian Osman <brian...@google.com>
Commit-Queue: Kevin Lubick <kjlu...@google.com>

[modify] https://crrev.com/f5dda1d37841d3ea025e833116b876c11b6815a9/src/core/SkRuntimeEffect.cpp
[add] https://crrev.com/f5dda1d37841d3ea025e833116b876c11b6815a9/relnotes/runtimeeffect_image.md
[modify] https://crrev.com/f5dda1d37841d3ea025e833116b876c11b6815a9/include/effects/SkRuntimeEffect.h

Git Watcher via monorail

unread,

Jun 28, 2023, 3:54:05 PM6/28/23

to bu...@skia.org

Comment #35 on issue 14317 by Git Watcher: Remove references to GPU code from src/core
https://bugs.chromium.org/p/skia/issues/detail?id=14317#c35

The following revision refers to this bug:
  

https://skia.googlesource.com/skia/+/382599400ecb7b6f3fabf7c303959e9d67fb2a8e

commit 382599400ecb7b6f3fabf7c303959e9d67fb2a8e
Author: Kevin Lubick <kjlu...@google.com>
Date: Thu Jun 22 18:01:38 2023

Remove gSkBlobAsSlugTesting

Bug: skia:14317
Change-Id: Id4f88194021224287c90f06ecf597fa97b0bc3af
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/715321
Reviewed-by: Herb Derby <he...@google.com>
Commit-Queue: Kevin Lubick <kjlu...@google.com>

[modify] https://crrev.com/382599400ecb7b6f3fabf7c303959e9d67fb2a8e/src/core/SkCanvas.cpp
[modify] https://crrev.com/382599400ecb7b6f3fabf7c303959e9d67fb2a8e/tools/flags/CommonFlagsGpu.cpp
[modify] https://crrev.com/382599400ecb7b6f3fabf7c303959e9d67fb2a8e/dm/DM.cpp
[modify] https://crrev.com/382599400ecb7b6f3fabf7c303959e9d67fb2a8e/src/core/SkTextBlobPriv.h

Git Watcher via monorail

unread,

Jun 29, 2023, 11:06:19 AM6/29/23

to bu...@skia.org

Comment #36 on issue 14317 by Git Watcher: Remove references to GPU code from src/core
https://bugs.chromium.org/p/skia/issues/detail?id=14317#c36

The following revision refers to this bug:
  

https://skia.googlesource.com/skia/+/edb06e1a12b75635af742e080078c55557be83f9

commit edb06e1a12b75635af742e080078c55557be83f9
Author: Kevin Lubick <kjlu...@google.com>
Date: Wed Jun 28 12:27:51 2023

Reland "Remove SkCanvas::flush() from Skia-proper and remove other gpu-specific code"

This is a reland of commit 4a187251e7e143a681b6a7b2901a61ac6c2ef0b0

Fixed a missing overridden method in include/utils/SkPaintFilterCanvas.h
and was more cautious with #ifdefs

Original change's description:

> Remove SkCanvas::flush() from Skia-proper and remove other gpu-specific code
>
> This removes more gpu-related #ifdefs from SkCanvas.cpp
>
> Bug: skia:14317
> Change-Id: I468c3e1e1abac130fa9204a98f9ce78bc1405eea
> Reviewed-on: https://skia-review.googlesource.com/c/skia/+/714643

> Reviewed-by: Brian Osman <brian...@google.com>

Bug: skia:14317

Change-Id: I88c9b086f5f29757282d16f2a46dbe5bc5c395ba
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/716476
Owners-Override: Kevin Lubick <kjlu...@google.com>
Commit-Queue: Kevin Lubick <kjlu...@google.com>
Reviewed-by: Leon Scroggins <scr...@google.com>

[modify] https://crrev.com/edb06e1a12b75635af742e080078c55557be83f9/docs/examples/Bitmap_extractAlpha_3.cpp
[modify] https://crrev.com/edb06e1a12b75635af742e080078c55557be83f9/tests/CanvasTest.cpp
[modify] https://crrev.com/edb06e1a12b75635af742e080078c55557be83f9/src/core/SkPictureRecord.cpp
[modify] https://crrev.com/edb06e1a12b75635af742e080078c55557be83f9/docs/examples/no_gpu_blur.cpp
[add] https://crrev.com/edb06e1a12b75635af742e080078c55557be83f9/relnotes/canvas_flush.md
[modify] https://crrev.com/edb06e1a12b75635af742e080078c55557be83f9/src/core/SkRecorder.cpp
[modify] https://crrev.com/edb06e1a12b75635af742e080078c55557be83f9/src/core/SkPictureRecord.h
[modify] https://crrev.com/edb06e1a12b75635af742e080078c55557be83f9/docs/examples/Canvas_MakeRasterDirect.cpp
[modify] https://crrev.com/edb06e1a12b75635af742e080078c55557be83f9/docs/examples/Surface_MakeRasterDirectReleaseProc.cpp
[modify] https://crrev.com/edb06e1a12b75635af742e080078c55557be83f9/src/core/SkRecordDraw.cpp
[modify] https://crrev.com/edb06e1a12b75635af742e080078c55557be83f9/docs/examples/Surface_MakeRasterN32Premul.cpp
[modify] https://crrev.com/edb06e1a12b75635af742e080078c55557be83f9/src/core/SkCanvas.cpp
[modify] https://crrev.com/edb06e1a12b75635af742e080078c55557be83f9/fuzz/FuzzCanvas.cpp
[modify] https://crrev.com/edb06e1a12b75635af742e080078c55557be83f9/tests/PictureTest.cpp
[modify] https://crrev.com/edb06e1a12b75635af742e080078c55557be83f9/docs/examples/Surface_MakeRaster.cpp
[modify] https://crrev.com/edb06e1a12b75635af742e080078c55557be83f9/include/utils/SkPaintFilterCanvas.h
[modify] https://crrev.com/edb06e1a12b75635af742e080078c55557be83f9/src/core/SkRecorder.h
[modify] https://crrev.com/edb06e1a12b75635af742e080078c55557be83f9/include/utils/SkNWayCanvas.h
[modify] https://crrev.com/edb06e1a12b75635af742e080078c55557be83f9/docs/examples/Bitmap_extractAlpha_2.cpp
[modify] https://crrev.com/edb06e1a12b75635af742e080078c55557be83f9/docs/examples/Surface_MakeRasterDirect.cpp
[modify] https://crrev.com/edb06e1a12b75635af742e080078c55557be83f9/src/core/SkPicturePlayback.cpp
[modify] https://crrev.com/edb06e1a12b75635af742e080078c55557be83f9/src/utils/SkNWayCanvas.cpp
[modify] https://crrev.com/edb06e1a12b75635af742e080078c55557be83f9/src/core/SkPictureFlat.h
[modify] https://crrev.com/edb06e1a12b75635af742e080078c55557be83f9/docs/examples/Surface_MakeRaster_2.cpp
[modify] https://crrev.com/edb06e1a12b75635af742e080078c55557be83f9/include/core/SkCanvas.h
[modify] https://crrev.com/edb06e1a12b75635af742e080078c55557be83f9/docs/examples/Canvas_MakeRasterDirectN32.cpp
[modify] https://crrev.com/edb06e1a12b75635af742e080078c55557be83f9/docs/examples/Bitmap_extractAlpha.cpp

Git Watcher via monorail

unread,

Jun 29, 2023, 4:05:09 PM6/29/23

to bu...@skia.org

Comment #37 on issue 14317 by Git Watcher: Remove references to GPU code from src/core
https://bugs.chromium.org/p/skia/issues/detail?id=14317#c37

The following revision refers to this bug:
  

https://skia.googlesource.com/skia/+/484fbc1e9c5ee81040f239769294b2b0740b26ae

commit 484fbc1e9c5ee81040f239769294b2b0740b26ae
Author: Kevin Lubick <kjlu...@google.com>
Date: Thu Jun 29 17:50:11 2023

Move GPU specific ImageFilter context factories to src/gpu/

This removes ganesh- and graphite- specific code out of
src/core/SkImageFilterTypes

Bug: skia:14317
Change-Id: I6c4a62ede656c97e83663dc8c7cffa1803005eea
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/717976
Commit-Queue: Kevin Lubick <kjlu...@google.com>
Reviewed-by: Michael Ludwig <michae...@google.com>

[modify] https://crrev.com/484fbc1e9c5ee81040f239769294b2b0740b26ae/src/gpu/graphite/ImageUtils.cpp
[modify] https://crrev.com/484fbc1e9c5ee81040f239769294b2b0740b26ae/src/core/SkImageFilterTypes.cpp
[modify] https://crrev.com/484fbc1e9c5ee81040f239769294b2b0740b26ae/toolchain/linux_trampolines/clang_trampoline_linux.sh
[modify] https://crrev.com/484fbc1e9c5ee81040f239769294b2b0740b26ae/src/gpu/ganesh/image/SkImage_GaneshBase.cpp
[modify] https://crrev.com/484fbc1e9c5ee81040f239769294b2b0740b26ae/tests/FilterResultTest.cpp
[modify] https://crrev.com/484fbc1e9c5ee81040f239769294b2b0740b26ae/src/gpu/graphite/Device.cpp
[modify] https://crrev.com/484fbc1e9c5ee81040f239769294b2b0740b26ae/src/gpu/ganesh/image/GrImageUtils.cpp
[modify] https://crrev.com/484fbc1e9c5ee81040f239769294b2b0740b26ae/src/gpu/graphite/ImageUtils.h
[modify] https://crrev.com/484fbc1e9c5ee81040f239769294b2b0740b26ae/src/gpu/ganesh/image/GrImageUtils.h
[modify] https://crrev.com/484fbc1e9c5ee81040f239769294b2b0740b26ae/tests/ImageFilterTest.cpp
[modify] https://crrev.com/484fbc1e9c5ee81040f239769294b2b0740b26ae/src/core/SkImageFilterTypes.h
[modify] https://crrev.com/484fbc1e9c5ee81040f239769294b2b0740b26ae/src/gpu/ganesh/Device.cpp

Git Watcher via monorail

unread,

Jun 29, 2023, 4:17:07 PM6/29/23

to bu...@skia.org

Comment #38 on issue 14317 by Git Watcher: Remove references to GPU code from src/core
https://bugs.chromium.org/p/skia/issues/detail?id=14317#c38

The following revision refers to this bug:
  

https://skia.googlesource.com/skia/+/a1ae279692076552912a4f2662e4c7eacafcc8ef

commit a1ae279692076552912a4f2662e4c7eacafcc8ef
Author: John Stiles <johns...@google.com>
Date: Thu Jun 29 20:15:37 2023

Revert "Move GPU specific ImageFilter context factories to src/gpu/"

This reverts commit 484fbc1e9c5ee81040f239769294b2b0740b26ae.

Reason for revert: breakage on tree 

Original change's description:

> Move GPU specific ImageFilter context factories to src/gpu/
>
> This removes ganesh- and graphite- specific code out of
> src/core/SkImageFilterTypes
>
> Bug: skia:14317
> Change-Id: I6c4a62ede656c97e83663dc8c7cffa1803005eea
> Reviewed-on: https://skia-review.googlesource.com/c/skia/+/717976
> Commit-Queue: Kevin Lubick <kjlu...@google.com>
> Reviewed-by: Michael Ludwig <michae...@google.com>

Bug: skia:14317
Change-Id: I667e1d2d40dd1177f76d9958a519cf08a8111b88

No-Presubmit: true
No-Tree-Checks: true
No-Try: true

Reviewed-on: https://skia-review.googlesource.com/c/skia/+/718640
Auto-Submit: John Stiles <johns...@google.com>
Commit-Queue: Rubber Stamper <rubber-...@appspot.gserviceaccount.com>
Bot-Commit: Rubber Stamper <rubber-...@appspot.gserviceaccount.com>

[modify] https://crrev.com/a1ae279692076552912a4f2662e4c7eacafcc8ef/src/gpu/graphite/ImageUtils.cpp
[modify] https://crrev.com/a1ae279692076552912a4f2662e4c7eacafcc8ef/src/core/SkImageFilterTypes.cpp
[modify] https://crrev.com/a1ae279692076552912a4f2662e4c7eacafcc8ef/toolchain/linux_trampolines/clang_trampoline_linux.sh
[modify] https://crrev.com/a1ae279692076552912a4f2662e4c7eacafcc8ef/src/gpu/ganesh/image/SkImage_GaneshBase.cpp
[modify] https://crrev.com/a1ae279692076552912a4f2662e4c7eacafcc8ef/tests/FilterResultTest.cpp
[modify] https://crrev.com/a1ae279692076552912a4f2662e4c7eacafcc8ef/src/gpu/graphite/Device.cpp
[modify] https://crrev.com/a1ae279692076552912a4f2662e4c7eacafcc8ef/src/gpu/ganesh/image/GrImageUtils.cpp
[modify] https://crrev.com/a1ae279692076552912a4f2662e4c7eacafcc8ef/src/gpu/graphite/ImageUtils.h
[modify] https://crrev.com/a1ae279692076552912a4f2662e4c7eacafcc8ef/src/gpu/ganesh/image/GrImageUtils.h
[modify] https://crrev.com/a1ae279692076552912a4f2662e4c7eacafcc8ef/tests/ImageFilterTest.cpp
[modify] https://crrev.com/a1ae279692076552912a4f2662e4c7eacafcc8ef/src/core/SkImageFilterTypes.h
[modify] https://crrev.com/a1ae279692076552912a4f2662e4c7eacafcc8ef/src/gpu/ganesh/Device.cpp

Git Watcher via monorail

unread,

Jun 30, 2023, 2:24:05 PM6/30/23

to bu...@skia.org

Comment #39 on issue 14317 by Git Watcher: Remove references to GPU code from src/core
https://bugs.chromium.org/p/skia/issues/detail?id=14317#c39

The following revision refers to this bug:
  

https://skia.googlesource.com/skia/+/24f2bcbb3221b4f8818de62d468643a799658a12

commit 24f2bcbb3221b4f8818de62d468643a799658a12
Author: Kevin Lubick <kjlu...@google.com>
Date: Fri Jun 30 12:30:28 2023

Reland "Move GPU specific ImageFilter context factories to src/gpu/"

This is a reland of commit 484fbc1e9c5ee81040f239769294b2b0740b26ae

Original change's description:
> Move GPU specific ImageFilter context factories to src/gpu/
>
> This removes ganesh- and graphite- specific code out of
> src/core/SkImageFilterTypes
>
> Bug: skia:14317
> Change-Id: I6c4a62ede656c97e83663dc8c7cffa1803005eea
> Reviewed-on: https://skia-review.googlesource.com/c/skia/+/717976
> Commit-Queue: Kevin Lubick <kjlu...@google.com>
> Reviewed-by: Michael Ludwig <michae...@google.com>

Bug: skia:14317

Change-Id: Ie82050c789bf21a7892dc992b189a5b9f4dbb0e4
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/718976
Reviewed-by: Michael Ludwig <michae...@google.com>
Commit-Queue: Kevin Lubick <kjlu...@google.com>

[modify] https://crrev.com/24f2bcbb3221b4f8818de62d468643a799658a12/src/gpu/graphite/ImageUtils.cpp
[modify] https://crrev.com/24f2bcbb3221b4f8818de62d468643a799658a12/src/core/SkImageFilterTypes.cpp
[modify] https://crrev.com/24f2bcbb3221b4f8818de62d468643a799658a12/toolchain/linux_trampolines/clang_trampoline_linux.sh
[modify] https://crrev.com/24f2bcbb3221b4f8818de62d468643a799658a12/src/gpu/ganesh/image/SkImage_GaneshBase.cpp
[modify] https://crrev.com/24f2bcbb3221b4f8818de62d468643a799658a12/tests/FilterResultTest.cpp
[modify] https://crrev.com/24f2bcbb3221b4f8818de62d468643a799658a12/src/gpu/graphite/Device.cpp
[modify] https://crrev.com/24f2bcbb3221b4f8818de62d468643a799658a12/src/gpu/ganesh/image/GrImageUtils.cpp
[modify] https://crrev.com/24f2bcbb3221b4f8818de62d468643a799658a12/src/gpu/graphite/ImageUtils.h
[modify] https://crrev.com/24f2bcbb3221b4f8818de62d468643a799658a12/src/gpu/ganesh/image/GrImageUtils.h
[modify] https://crrev.com/24f2bcbb3221b4f8818de62d468643a799658a12/tests/ImageFilterTest.cpp
[modify] https://crrev.com/24f2bcbb3221b4f8818de62d468643a799658a12/src/core/SkImageFilterTypes.h
[modify] https://crrev.com/24f2bcbb3221b4f8818de62d468643a799658a12/src/gpu/ganesh/Device.cpp

Git Watcher via monorail

unread,

Jul 11, 2023, 12:37:05 PM7/11/23

to bu...@skia.org

Comment #40 on issue 14317 by Git Watcher: Remove references to GPU code from src/core
https://bugs.chromium.org/p/skia/issues/detail?id=14317#c40

The following revision refers to this bug:
  

https://chromium.googlesource.com/chromium/src/+/b74f6d2842e052939a1eab06e1f045f92a99415b

commit b74f6d2842e052939a1eab06e1f045f92a99415b
Author: Kevin Lubick <kjlu...@google.com>
Date: Tue Jul 11 16:36:37 2023

Remove uses of SkCanvas::flush()

In http://review.skia.org/716476, Skia removed SkCanvas::flush()
and SkCanvas::onFlush(). The previous behavior had been a no-op
for raster-backed and Graphite canvases, and calling GrDirectContext::flushAndSubmit()
for Ganesh-backed surfaces.

This replaces all calls to SkCanvas::flush() with the correct
behavior, depending on the type of canvas. The non-trivial change
in skia_paint_canvas is to allow unit tests to make sure that
flushes still happen in batches (as this had been spied upon with
the onFlush() override before).

This also changes the method type of SkCanvas::recordingContext()
overrides to be const (now explicitly declared).

Bug: skia:14317
Change-Id: I26d85ebc3ece82328d8571855307171beffacf70
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4636561
Reviewed-by: Colin Blundell <blun...@chromium.org>
Reviewed-by: Florin Malita <fma...@chromium.org>
Commit-Queue: Kevin Lubick <kjlu...@chromium.org>
Reviewed-by: ccameron chromium <ccam...@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1168766}

[modify] https://crrev.com/b74f6d2842e052939a1eab06e1f045f92a99415b/cc/paint/skia_paint_canvas.h
[modify] https://crrev.com/b74f6d2842e052939a1eab06e1f045f92a99415b/ui/base/x/x11_software_bitmap_presenter.cc
[modify] https://crrev.com/b74f6d2842e052939a1eab06e1f045f92a99415b/components/exo/wayland/clients/hdr.cc
[modify] https://crrev.com/b74f6d2842e052939a1eab06e1f045f92a99415b/cc/test/test_skcanvas.h
[modify] https://crrev.com/b74f6d2842e052939a1eab06e1f045f92a99415b/cc/paint/skia_paint_canvas_unittest.cc
[modify] https://crrev.com/b74f6d2842e052939a1eab06e1f045f92a99415b/skia/BUILD.gn
[modify] https://crrev.com/b74f6d2842e052939a1eab06e1f045f92a99415b/cc/resources/ui_resource_bitmap.cc
[modify] https://crrev.com/b74f6d2842e052939a1eab06e1f045f92a99415b/chrome/browser/vr/skia_surface_provider.cc
[modify] https://crrev.com/b74f6d2842e052939a1eab06e1f045f92a99415b/ui/gfx/skbitmap_operations.cc
[modify] https://crrev.com/b74f6d2842e052939a1eab06e1f045f92a99415b/cc/paint/skia_paint_canvas.cc

Git Watcher via monorail

unread,

Jul 14, 2023, 10:45:08 AM7/14/23

to bu...@skia.org

Comment #41 on issue 14317 by Git Watcher: Remove references to GPU code from src/core
https://bugs.chromium.org/p/skia/issues/detail?id=14317#c41

The following revision refers to this bug:
  

https://skia.googlesource.com/skia/+/77fbc084f798d7330e697212210da1255d1ec9bc

commit 77fbc084f798d7330e697212210da1255d1ec9bc
Author: Kevin Lubick <kjlu...@google.com>
Date: Fri Jul 14 13:31:30 2023

Move most of the Ganesh-specific logic out of SkSpecialImage.cpp

This introduces a namespace called SkSpecialImages which
allows us to define Ganesh- and Graphite-specific factories
in different files and remove a bunch of #ifdefs from SkSpecialImage.cpp

Because FilterResult::MakeFromImage needed to call a potentially
Ganesh-specific version of SkSpecialImages::MakeFromImage, I
introduced a delegate for making images (like we had for making
SkSpecialSurfaces).

The Graphite version of this delegate just produces a raster-backed
SkSpecialImage to preserve the same functionality as before.

Change-Id: I4a738f78c0e2c95539e66bf3a15c6b786e0393bd
Bug: skia:14317
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/722476

Reviewed-by: Michael Ludwig <michae...@google.com>
Commit-Queue: Kevin Lubick <kjlu...@google.com>

[modify] https://crrev.com/77fbc084f798d7330e697212210da1255d1ec9bc/src/effects/imagefilters/SkBlurImageFilter.cpp
[modify] https://crrev.com/77fbc084f798d7330e697212210da1255d1ec9bc/src/effects/imagefilters/SkMatrixConvolutionImageFilter.cpp
[modify] https://crrev.com/77fbc084f798d7330e697212210da1255d1ec9bc/src/gpu/ganesh/image/SkImage_GaneshBase.cpp
[add] https://crrev.com/77fbc084f798d7330e697212210da1255d1ec9bc/src/gpu/ganesh/image/SkSpecialImage_Ganesh.h
[modify] https://crrev.com/77fbc084f798d7330e697212210da1255d1ec9bc/src/gpu/graphite/Device.cpp
[modify] https://crrev.com/77fbc084f798d7330e697212210da1255d1ec9bc/src/gpu/ganesh/image/BUILD.bazel
[modify] https://crrev.com/77fbc084f798d7330e697212210da1255d1ec9bc/tests/ImageFilterCacheTest.cpp
[modify] https://crrev.com/77fbc084f798d7330e697212210da1255d1ec9bc/src/core/SkBitmapDevice.cpp
[modify] https://crrev.com/77fbc084f798d7330e697212210da1255d1ec9bc/tests/SpecialImageTest.cpp
[modify] https://crrev.com/77fbc084f798d7330e697212210da1255d1ec9bc/src/core/SkImageFilterTypes.h
[modify] https://crrev.com/77fbc084f798d7330e697212210da1255d1ec9bc/src/gpu/graphite/SpecialImage_Graphite.cpp
[modify] https://crrev.com/77fbc084f798d7330e697212210da1255d1ec9bc/src/gpu/graphite/ImageUtils.cpp
[modify] https://crrev.com/77fbc084f798d7330e697212210da1255d1ec9bc/src/core/SkImageFilterTypes.cpp
[modify] https://crrev.com/77fbc084f798d7330e697212210da1255d1ec9bc/src/core/SkSpecialImage.cpp
[modify] https://crrev.com/77fbc084f798d7330e697212210da1255d1ec9bc/toolchain/linux_trampolines/clang_trampoline_linux.sh
[modify] https://crrev.com/77fbc084f798d7330e697212210da1255d1ec9bc/gn/gpu.gni
[modify] https://crrev.com/77fbc084f798d7330e697212210da1255d1ec9bc/src/core/SkImageFilter.cpp
[add] https://crrev.com/77fbc084f798d7330e697212210da1255d1ec9bc/src/gpu/graphite/SpecialImage_Graphite.h
[add] https://crrev.com/77fbc084f798d7330e697212210da1255d1ec9bc/src/gpu/ganesh/image/SkSpecialImage_Ganesh.cpp
[modify] https://crrev.com/77fbc084f798d7330e697212210da1255d1ec9bc/src/gpu/ganesh/image/GrImageUtils.cpp
[modify] https://crrev.com/77fbc084f798d7330e697212210da1255d1ec9bc/src/core/SkSpecialImage.h
[modify] https://crrev.com/77fbc084f798d7330e697212210da1255d1ec9bc/src/image/SkImage_Base.cpp
[modify] https://crrev.com/77fbc084f798d7330e697212210da1255d1ec9bc/tests/ImageFilterTest.cpp
[modify] https://crrev.com/77fbc084f798d7330e697212210da1255d1ec9bc/src/pdf/SkPDFDevice.cpp
[modify] https://crrev.com/77fbc084f798d7330e697212210da1255d1ec9bc/public.bzl
[modify] https://crrev.com/77fbc084f798d7330e697212210da1255d1ec9bc/src/gpu/ganesh/Device.cpp

Git Watcher via monorail

unread,

Jul 14, 2023, 4:31:07 PM7/14/23

to bu...@skia.org

Comment #42 on issue 14317 by Git Watcher: Remove references to GPU code from src/core
https://bugs.chromium.org/p/skia/issues/detail?id=14317#c42

The following revision refers to this bug:
  

https://skia.googlesource.com/skia/+/e2e5b841e92bb80da627ceab414d17af4542a38f

commit e2e5b841e92bb80da627ceab414d17af4542a38f
Author: Kevin Lubick <kjlu...@google.com>
Date: Fri Jul 14 17:56:32 2023

Decouple SkMesh from Ganesh backend

This involves moving SkMesh::MakeIndexBuffer,
SkMesh::CopyIndexBuffer, SkMesh::MakeVertexBuffer, and
SkMesh::CopyVertexBuffer to a new SkMeshes namespace.

There are versions that take in a GrDirectContext* for the
Ganesh backend and the ones that don't are for the CPU backend.

Change-Id: Iaa12871d2b66fbdfa8a35a52f89d800563be6df0
Bug: skia:14317
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/721899
Reviewed-by: Brian Osman <brian...@google.com>
Commit-Queue: Kevin Lubick <kjlu...@google.com>

[modify] https://crrev.com/e2e5b841e92bb80da627ceab414d17af4542a38f/src/gpu/ganesh/BUILD.bazel
[add] https://crrev.com/e2e5b841e92bb80da627ceab414d17af4542a38f/relnotes/mesh_ganesh.md
[modify] https://crrev.com/e2e5b841e92bb80da627ceab414d17af4542a38f/include/gpu/ganesh/BUILD.bazel
[modify] https://crrev.com/e2e5b841e92bb80da627ceab414d17af4542a38f/src/gpu/ganesh/ops/DrawMeshOp.cpp
[modify] https://crrev.com/e2e5b841e92bb80da627ceab414d17af4542a38f/toolchain/linux_trampolines/clang_trampoline_linux.sh
[modify] https://crrev.com/e2e5b841e92bb80da627ceab414d17af4542a38f/src/core/SkMeshPriv.h
[modify] https://crrev.com/e2e5b841e92bb80da627ceab414d17af4542a38f/gn/gpu.gni
[add] https://crrev.com/e2e5b841e92bb80da627ceab414d17af4542a38f/src/gpu/ganesh/GrMeshBuffers.cpp
[modify] https://crrev.com/e2e5b841e92bb80da627ceab414d17af4542a38f/include/BUILD.bazel
[modify] https://crrev.com/e2e5b841e92bb80da627ceab414d17af4542a38f/src/core/SkMesh.cpp
[modify] https://crrev.com/e2e5b841e92bb80da627ceab414d17af4542a38f/modules/canvaskit/compile.sh
[modify] https://crrev.com/e2e5b841e92bb80da627ceab414d17af4542a38f/gm/mesh.cpp
[add] https://crrev.com/e2e5b841e92bb80da627ceab414d17af4542a38f/include/gpu/ganesh/SkMeshGanesh.h
[modify] https://crrev.com/e2e5b841e92bb80da627ceab414d17af4542a38f/public.bzl
[modify] https://crrev.com/e2e5b841e92bb80da627ceab414d17af4542a38f/include/core/SkMesh.h
[add] https://crrev.com/e2e5b841e92bb80da627ceab414d17af4542a38f/src/gpu/ganesh/GrMeshBuffers.h

Git Watcher via monorail

unread,

Jul 15, 2023, 1:34:06 PM7/15/23

to bu...@skia.org

Comment #43 on issue 14317 by Git Watcher: Remove references to GPU code from src/core
https://bugs.chromium.org/p/skia/issues/detail?id=14317#c43

The following revision refers to this bug:
  

https://skia.googlesource.com/skia/+/75613b9d2f477d9d9c997b46d2695f36a699aa09

commit 75613b9d2f477d9d9c997b46d2695f36a699aa09
Author: Brian Osman <brian...@google.com>
Date: Sat Jul 15 17:32:37 2023

Revert "Decouple SkMesh from Ganesh backend"

This reverts commit e2e5b841e92bb80da627ceab414d17af4542a38f.

Reason for revert: G3 IWYU

Original change's description:

> Decouple SkMesh from Ganesh backend
>
> This involves moving SkMesh::MakeIndexBuffer,
> SkMesh::CopyIndexBuffer, SkMesh::MakeVertexBuffer, and
> SkMesh::CopyVertexBuffer to a new SkMeshes namespace.
>
> There are versions that take in a GrDirectContext* for the
> Ganesh backend and the ones that don't are for the CPU backend.
>
> Change-Id: Iaa12871d2b66fbdfa8a35a52f89d800563be6df0
> Bug: skia:14317
> Reviewed-on: https://skia-review.googlesource.com/c/skia/+/721899
> Reviewed-by: Brian Osman <brian...@google.com>
> Commit-Queue: Kevin Lubick <kjlu...@google.com>

Bug: skia:14317
Change-Id: Ibff09b44d395c60a9ad490a55fed9a06fd6a93c3

No-Presubmit: true
No-Tree-Checks: true
No-Try: true

Reviewed-on: https://skia-review.googlesource.com/c/skia/+/724036
Auto-Submit: Brian Osman <brian...@google.com>

Commit-Queue: Rubber Stamper <rubber-...@appspot.gserviceaccount.com>
Bot-Commit: Rubber Stamper <rubber-...@appspot.gserviceaccount.com>

[modify] https://crrev.com/75613b9d2f477d9d9c997b46d2695f36a699aa09/src/gpu/ganesh/BUILD.bazel
[delete] https://crrev.com/6fb535aede4e570e97fd0623d57e10c0f9af948b/relnotes/mesh_ganesh.md
[modify] https://crrev.com/75613b9d2f477d9d9c997b46d2695f36a699aa09/include/gpu/ganesh/BUILD.bazel
[modify] https://crrev.com/75613b9d2f477d9d9c997b46d2695f36a699aa09/toolchain/linux_trampolines/clang_trampoline_linux.sh
[modify] https://crrev.com/75613b9d2f477d9d9c997b46d2695f36a699aa09/src/gpu/ganesh/ops/DrawMeshOp.cpp
[modify] https://crrev.com/75613b9d2f477d9d9c997b46d2695f36a699aa09/src/core/SkMeshPriv.h
[modify] https://crrev.com/75613b9d2f477d9d9c997b46d2695f36a699aa09/gn/gpu.gni
[delete] https://crrev.com/6fb535aede4e570e97fd0623d57e10c0f9af948b/src/gpu/ganesh/GrMeshBuffers.cpp
[modify] https://crrev.com/75613b9d2f477d9d9c997b46d2695f36a699aa09/src/core/SkMesh.cpp
[modify] https://crrev.com/75613b9d2f477d9d9c997b46d2695f36a699aa09/include/BUILD.bazel
[modify] https://crrev.com/75613b9d2f477d9d9c997b46d2695f36a699aa09/modules/canvaskit/compile.sh
[modify] https://crrev.com/75613b9d2f477d9d9c997b46d2695f36a699aa09/gm/mesh.cpp
[delete] https://crrev.com/6fb535aede4e570e97fd0623d57e10c0f9af948b/include/gpu/ganesh/SkMeshGanesh.h
[modify] https://crrev.com/75613b9d2f477d9d9c997b46d2695f36a699aa09/public.bzl
[modify] https://crrev.com/75613b9d2f477d9d9c997b46d2695f36a699aa09/include/core/SkMesh.h
[delete] https://crrev.com/6fb535aede4e570e97fd0623d57e10c0f9af948b/src/gpu/ganesh/GrMeshBuffers.h

Git Watcher via monorail

unread,

Jul 17, 2023, 10:37:05 AM7/17/23

to bu...@skia.org

Comment #44 on issue 14317 by Git Watcher: Remove references to GPU code from src/core
https://bugs.chromium.org/p/skia/issues/detail?id=14317#c44

The following revision refers to this bug:
  

https://skia.googlesource.com/skia/+/9daea7b8515be4770d510cf987577a7fda289def

commit 9daea7b8515be4770d510cf987577a7fda289def
Author: Kevin Lubick <kjlu...@google.com>
Date: Mon Jul 17 12:31:41 2023

Revert "Revert "Decouple SkMesh from Ganesh backend""

This relands https://skia-review.googlesource.com/c/skia/+/721899
and https://skia-review.googlesource.com/c/skia/+/723342

This involves moving SkMesh::MakeIndexBuffer,
SkMesh::CopyIndexBuffer, SkMesh::MakeVertexBuffer, and
SkMesh::CopyVertexBuffer to a new SkMeshes namespace.

There are versions that take in a GrDirectContext* for the
Ganesh backend and the ones that don't are for the CPU backend.

Bug: skia:14317
Change-Id: If7417351b2c3e4fa38c96d626bda2d3696028897
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/724398
Reviewed-by: Brian Osman <brian...@google.com>

[modify] https://crrev.com/9daea7b8515be4770d510cf987577a7fda289def/src/gpu/ganesh/BUILD.bazel
[add] https://crrev.com/9daea7b8515be4770d510cf987577a7fda289def/relnotes/mesh_ganesh.md
[modify] https://crrev.com/9daea7b8515be4770d510cf987577a7fda289def/include/gpu/ganesh/BUILD.bazel
[modify] https://crrev.com/9daea7b8515be4770d510cf987577a7fda289def/src/pdf/SkPDFDevice.h
[modify] https://crrev.com/9daea7b8515be4770d510cf987577a7fda289def/src/gpu/ganesh/ops/DrawMeshOp.cpp
[modify] https://crrev.com/9daea7b8515be4770d510cf987577a7fda289def/toolchain/linux_trampolines/clang_trampoline_linux.sh
[modify] https://crrev.com/9daea7b8515be4770d510cf987577a7fda289def/src/core/SkMeshPriv.h
[modify] https://crrev.com/9daea7b8515be4770d510cf987577a7fda289def/gn/gpu.gni
[add] https://crrev.com/9daea7b8515be4770d510cf987577a7fda289def/src/gpu/ganesh/GrMeshBuffers.cpp
[modify] https://crrev.com/9daea7b8515be4770d510cf987577a7fda289def/include/BUILD.bazel
[modify] https://crrev.com/9daea7b8515be4770d510cf987577a7fda289def/src/core/SkMesh.cpp
[modify] https://crrev.com/9daea7b8515be4770d510cf987577a7fda289def/modules/canvaskit/compile.sh
[modify] https://crrev.com/9daea7b8515be4770d510cf987577a7fda289def/src/svg/SkSVGDevice.cpp
[modify] https://crrev.com/9daea7b8515be4770d510cf987577a7fda289def/gm/mesh.cpp
[add] https://crrev.com/9daea7b8515be4770d510cf987577a7fda289def/include/gpu/ganesh/SkMeshGanesh.h
[modify] https://crrev.com/9daea7b8515be4770d510cf987577a7fda289def/src/svg/SkSVGDevice.h
[modify] https://crrev.com/9daea7b8515be4770d510cf987577a7fda289def/src/pdf/SkPDFDevice.cpp
[modify] https://crrev.com/9daea7b8515be4770d510cf987577a7fda289def/public.bzl
[modify] https://crrev.com/9daea7b8515be4770d510cf987577a7fda289def/include/core/SkMesh.h
[add] https://crrev.com/9daea7b8515be4770d510cf987577a7fda289def/src/gpu/ganesh/GrMeshBuffers.h

Git Watcher via monorail

unread,

Jul 17, 2023, 11:19:05 AM7/17/23

to bu...@skia.org

Comment #45 on issue 14317 by Git Watcher: Remove references to GPU code from src/core
https://bugs.chromium.org/p/skia/issues/detail?id=14317#c45

The following revision refers to this bug:
  

https://skia.googlesource.com/skia/+/eb11aed042ddfb6bede3a99b3c6ee514df0019ac

commit eb11aed042ddfb6bede3a99b3c6ee514df0019ac
Author: Kevin Lubick <kjlu...@google.com>
Date: Fri Jul 14 15:13:03 2023

Remove SkCanvas::flush() call from skottielib

Follow-up to https://skia-review.googlesource.com/c/skia/+/716476

Change-Id: I4c67a667f3187d1c108608efa9cdf8df3cf55b3e
Bug: skia:14317
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/723413
Reviewed-by: Jorge Betancourt <jmbeta...@google.com>
Commit-Queue: Kevin Lubick <kjlu...@google.com>

[modify] https://crrev.com/eb11aed042ddfb6bede3a99b3c6ee514df0019ac/platform_tools/android/apps/skottie/skottielib/src/main/cpp/native-lib.cpp

Git Watcher via monorail

unread,

Jul 17, 2023, 2:04:12 PM7/17/23

to bu...@skia.org

Comment #46 on issue 14317 by Git Watcher: Remove references to GPU code from src/core
https://bugs.chromium.org/p/skia/issues/detail?id=14317#c46

The following revision refers to this bug:
  

https://skia.googlesource.com/skia/+/d4be7dba460679a03b3957b090e67a832704718b

commit d4be7dba460679a03b3957b090e67a832704718b
Author: Kevin Lubick <kjlu...@google.com>
Date: Mon Jul 17 16:54:55 2023

Decouple SkSpecialImage from Ganesh and Graphite

This will help us build src/core without #defines

Bug: skia:14317
Change-Id: I39bfedd7e3712bd252bbca4c08d887f0d0b13980
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/723397
Reviewed-by: Michael Ludwig <michae...@google.com>
Commit-Queue: Kevin Lubick <kjlu...@google.com>

[modify] https://crrev.com/d4be7dba460679a03b3957b090e67a832704718b/src/gpu/graphite/SpecialImage_Graphite.cpp
[modify] https://crrev.com/d4be7dba460679a03b3957b090e67a832704718b/src/effects/imagefilters/SkBlurImageFilter.cpp
[modify] https://crrev.com/d4be7dba460679a03b3957b090e67a832704718b/src/effects/imagefilters/SkMatrixConvolutionImageFilter.cpp
[modify] https://crrev.com/d4be7dba460679a03b3957b090e67a832704718b/src/core/SkSpecialImage.cpp
[modify] https://crrev.com/d4be7dba460679a03b3957b090e67a832704718b/src/gpu/ganesh/image/SkImage_GaneshBase.cpp
[modify] https://crrev.com/d4be7dba460679a03b3957b090e67a832704718b/tests/FilterResultTest.cpp
[modify] https://crrev.com/d4be7dba460679a03b3957b090e67a832704718b/src/gpu/ganesh/image/SkSpecialImage_Ganesh.h
[modify] https://crrev.com/d4be7dba460679a03b3957b090e67a832704718b/src/core/SkImageFilter.cpp
[modify] https://crrev.com/d4be7dba460679a03b3957b090e67a832704718b/src/gpu/graphite/SpecialImage_Graphite.h
[modify] https://crrev.com/d4be7dba460679a03b3957b090e67a832704718b/src/gpu/ganesh/image/SkSpecialImage_Ganesh.cpp
[modify] https://crrev.com/d4be7dba460679a03b3957b090e67a832704718b/src/gpu/ganesh/Device_drawTexture.cpp
[modify] https://crrev.com/d4be7dba460679a03b3957b090e67a832704718b/src/gpu/ganesh/image/GrImageUtils.cpp
[modify] https://crrev.com/d4be7dba460679a03b3957b090e67a832704718b/src/core/SkImageFilter_Base.h
[modify] https://crrev.com/d4be7dba460679a03b3957b090e67a832704718b/src/core/SkSpecialImage.h
[modify] https://crrev.com/d4be7dba460679a03b3957b090e67a832704718b/tests/DeviceTest.cpp
[modify] https://crrev.com/d4be7dba460679a03b3957b090e67a832704718b/src/core/SkBitmapDevice.cpp
[modify] https://crrev.com/d4be7dba460679a03b3957b090e67a832704718b/tests/ImageFilterTest.cpp
[modify] https://crrev.com/d4be7dba460679a03b3957b090e67a832704718b/src/pdf/SkPDFDevice.cpp
[modify] https://crrev.com/d4be7dba460679a03b3957b090e67a832704718b/tests/SpecialImageTest.cpp

Git Watcher via monorail

unread,

Jul 18, 2023, 8:46:06 AM7/18/23

to bu...@skia.org

Comment #47 on issue 14317 by Git Watcher: Remove references to GPU code from src/core
https://bugs.chromium.org/p/skia/issues/detail?id=14317#c47

The following revision refers to this bug:
  

https://skia.googlesource.com/skia/+/8d3e00a1f25fbbebe0dafa40fcc13ea9c32b5bec

commit 8d3e00a1f25fbbebe0dafa40fcc13ea9c32b5bec
Author: Kevin Lubick <kjlu...@google.com>
Date: Tue Jul 18 12:03:10 2023

Allow legacy mesh APIs in CPU-only build too

This will fix an issue with the Android roller.

Change-Id: I05d23673993f78402941472254a79af8fecb168f
Bug: skia:14317
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/725277

Reviewed-by: Brian Osman <brian...@google.com>
Commit-Queue: Kevin Lubick <kjlu...@google.com>

Commit-Queue: Brian Osman <brian...@google.com>
Auto-Submit: Kevin Lubick <kjlu...@google.com>

[modify] https://crrev.com/8d3e00a1f25fbbebe0dafa40fcc13ea9c32b5bec/include/core/SkMesh.h
[modify] https://crrev.com/8d3e00a1f25fbbebe0dafa40fcc13ea9c32b5bec/src/core/SkMesh.cpp

Git Watcher via monorail

unread,

Jul 20, 2023, 1:15:07 PM7/20/23

to bu...@skia.org

Comment #48 on issue 14317 by Git Watcher: Remove references to GPU code from src/core
https://bugs.chromium.org/p/skia/issues/detail?id=14317#c48

The following revision refers to this bug:
  

https://chromium.googlesource.com/chromium/src/+/46368f77cb819ffc014b126b48e11b4780ddbdb3

commit 46368f77cb819ffc014b126b48e11b4780ddbdb3
Author: Kevin Lubick <kjlu...@google.com>
Date: Thu Jul 20 17:14:39 2023

Change calls to SkImage::makeSubset et al

These were changed in http://review.skia.org/671679

Change-Id: Ifc7b9a0df94aa34319104b3d9ff7364a4dc31f9d
Bug: skia:14317
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4705004
Reviewed-by: ccameron chromium <ccam...@chromium.org>
Reviewed-by: Lei Zhang <the...@chromium.org>
Reviewed-by: Justin Novosad <ju...@chromium.org>
Commit-Queue: Kevin Lubick <kjlu...@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1173046}

[modify] https://crrev.com/46368f77cb819ffc014b126b48e11b4780ddbdb3/components/viz/test/fake_skia_output_surface.cc
[modify] https://crrev.com/46368f77cb819ffc014b126b48e11b4780ddbdb3/pdf/paint_manager_unittest.cc
[modify] https://crrev.com/46368f77cb819ffc014b126b48e11b4780ddbdb3/third_party/blink/renderer/platform/graphics/unaccelerated_static_bitmap_image.cc
[modify] https://crrev.com/46368f77cb819ffc014b126b48e11b4780ddbdb3/ui/gfx/color_conversion_sk_filter_cache.cc
[modify] https://crrev.com/46368f77cb819ffc014b126b48e11b4780ddbdb3/third_party/blink/renderer/modules/canvas/canvas2d/canvas_rendering_context_2d_test.cc
[modify] https://crrev.com/46368f77cb819ffc014b126b48e11b4780ddbdb3/cc/tiles/gpu_image_decode_cache.cc
[modify] https://crrev.com/46368f77cb819ffc014b126b48e11b4780ddbdb3/skia/BUILD.gn
[modify] https://crrev.com/46368f77cb819ffc014b126b48e11b4780ddbdb3/components/viz/service/display/software_renderer.cc
[modify] https://crrev.com/46368f77cb819ffc014b126b48e11b4780ddbdb3/cc/paint/paint_image.cc

Git Watcher via monorail

unread,

Jul 20, 2023, 7:28:09 PM7/20/23

to bu...@skia.org

Comment #49 on issue 14317 by Git Watcher: Remove references to GPU code from src/core
https://bugs.chromium.org/p/skia/issues/detail?id=14317#c49

The following revision refers to this bug:
  

https://skia.googlesource.com/skia/+/049f389db75b10a5022f20070dbda4d094e107b3

commit 049f389db75b10a5022f20070dbda4d094e107b3
Author: Kevin Lubick <kjlu...@google.com>
Date: Thu Jul 20 19:30:11 2023

Do not register SDFMaskFilter for flattening

These don't get serialized, as they are created as necessary.

Thus they shouldn't be in any bytes that a user would have
us deserialize.

Change-Id: If44af619ac3ea0596ccf1f02077b29bf327fb185
Bug: skia:14317
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/727256
Reviewed-by: Ben Wagner <bung...@google.com>
Commit-Queue: Kevin Lubick <kjlu...@google.com>

Reviewed-by: Jim Van Verth <jvan...@google.com>

[modify] https://crrev.com/049f389db75b10a5022f20070dbda4d094e107b3/src/text/gpu/SDFMaskFilter.cpp
[modify] https://crrev.com/049f389db75b10a5022f20070dbda4d094e107b3/src/text/gpu/SDFMaskFilter.h
[modify] https://crrev.com/049f389db75b10a5022f20070dbda4d094e107b3/src/core/SkMaskFilter.cpp

Git Watcher via monorail

unread,

Jul 21, 2023, 10:34:12 AM7/21/23

to bu...@skia.org

Comment #50 on issue 14317 by Git Watcher: Remove references to GPU code from src/core
https://bugs.chromium.org/p/skia/issues/detail?id=14317#c50

The following revision refers to this bug:
  

https://skia.googlesource.com/skia/+/e3d13d1b1c42810a5b8cca8cffcf2b502b62321b

commit e3d13d1b1c42810a5b8cca8cffcf2b502b62321b
Author: Kevin Lubick <kjlu...@google.com>
Date: Thu Jul 20 18:15:37 2023

Merge SkGpuBlurUtils into GrBlurUtils

If there are functions that need to be used in Graphite as well,
(e.g. Compute1DLinearGaussianKernel) I suggest making
src/gpu/BlurUtils.h for those.

Change-Id: Ie3b32d5d0a23b89aada516122071f15896ed5fb2
Bug: skia:14317
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/723341
Commit-Queue: Kevin Lubick <kjlu...@google.com>
Reviewed-by: Michael Ludwig <michae...@google.com>

[modify] https://crrev.com/e3d13d1b1c42810a5b8cca8cffcf2b502b62321b/gn/core.gni
[modify] https://crrev.com/e3d13d1b1c42810a5b8cca8cffcf2b502b62321b/src/effects/imagefilters/SkBlurImageFilter.cpp
[delete] https://crrev.com/8388ec4d242c2a3f953dc7dd4f1b45eb90ae8d46/src/core/SkGpuBlurUtils.h
[modify] https://crrev.com/e3d13d1b1c42810a5b8cca8cffcf2b502b62321b/src/core/BUILD.bazel
[modify] https://crrev.com/e3d13d1b1c42810a5b8cca8cffcf2b502b62321b/src/gpu/ganesh/GrBlurUtils.cpp
[modify] https://crrev.com/e3d13d1b1c42810a5b8cca8cffcf2b502b62321b/src/gpu/ganesh/effects/GrGaussianConvolutionFragmentProcessor.cpp
[modify] https://crrev.com/e3d13d1b1c42810a5b8cca8cffcf2b502b62321b/src/gpu/ganesh/Device_drawTexture.cpp
[modify] https://crrev.com/e3d13d1b1c42810a5b8cca8cffcf2b502b62321b/gm/gpu_blur_utils.cpp
[delete] https://crrev.com/8388ec4d242c2a3f953dc7dd4f1b45eb90ae8d46/src/core/SkGpuBlurUtils.cpp
[modify] https://crrev.com/e3d13d1b1c42810a5b8cca8cffcf2b502b62321b/public.bzl
[modify] https://crrev.com/e3d13d1b1c42810a5b8cca8cffcf2b502b62321b/tests/BlurTest.cpp
[modify] https://crrev.com/e3d13d1b1c42810a5b8cca8cffcf2b502b62321b/src/gpu/ganesh/Device.cpp
[modify] https://crrev.com/e3d13d1b1c42810a5b8cca8cffcf2b502b62321b/src/gpu/ganesh/GrBlurUtils.h

Git Watcher via monorail

unread,

Jul 24, 2023, 12:06:11 PM7/24/23

to bu...@skia.org

Comment #51 on issue 14317 by Git Watcher: Remove references to GPU code from src/core
https://bugs.chromium.org/p/skia/issues/detail?id=14317#c51

The following revision refers to this bug:
  

https://skia.googlesource.com/skia/+/7535344085515af70ccdd2a931ac965f58888580

commit 7535344085515af70ccdd2a931ac965f58888580
Author: Kevin Lubick <kjlu...@google.com>
Date: Mon Jul 24 15:02:18 2023

Remove ganesh code from SkImageFilter_Base

Change-Id: I5e7ed806b7467f1df9e3ce4e66175f7a682312f0
Bug: skia:14317
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/728697
Reviewed-by: Michael Ludwig <michae...@google.com>
Commit-Queue: Kevin Lubick <kjlu...@google.com>

[modify] https://crrev.com/7535344085515af70ccdd2a931ac965f58888580/src/core/SkImageFilter_Base.h
[modify] https://crrev.com/7535344085515af70ccdd2a931ac965f58888580/src/effects/imagefilters/SkBlurImageFilter.cpp
[modify] https://crrev.com/7535344085515af70ccdd2a931ac965f58888580/src/effects/imagefilters/SkMatrixConvolutionImageFilter.cpp
[modify] https://crrev.com/7535344085515af70ccdd2a931ac965f58888580/src/gpu/ganesh/image/SkSpecialImage_Ganesh.h
[modify] https://crrev.com/7535344085515af70ccdd2a931ac965f58888580/src/core/SkImageFilter.cpp
[modify] https://crrev.com/7535344085515af70ccdd2a931ac965f58888580/src/gpu/ganesh/image/SkSpecialImage_Ganesh.cpp

Git Watcher via monorail

unread,

Jul 24, 2023, 3:30:09 PM7/24/23

to bu...@skia.org

Comment #52 on issue 14317 by Git Watcher: Remove references to GPU code from src/core
https://bugs.chromium.org/p/skia/issues/detail?id=14317#c52

The following revision refers to this bug:
  

https://skia.googlesource.com/skia/+/524851ba722e9931651a05926fcdf3b178df6769

commit 524851ba722e9931651a05926fcdf3b178df6769
Author: Kevin Lubick <kjlu...@google.com>
Date: Mon Jul 24 17:45:03 2023

Remove legacy SkMesh functions

Client CLs:
 - http://ag/24151403
 - http://cl/549704569

Change-Id: Ib94475992a4f6fb7323f92053c62542812777b9d
Bug: skia:14317
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/728701
Reviewed-by: Brian Osman <brian...@google.com>
Commit-Queue: Kevin Lubick <kjlu...@google.com>

[modify] https://crrev.com/524851ba722e9931651a05926fcdf3b178df6769/include/core/SkMesh.h
[modify] https://crrev.com/524851ba722e9931651a05926fcdf3b178df6769/src/core/SkMesh.cpp

Reply all

Reply to author

Forward