Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(424)

Issue 1316513002: Change SkShader;asFragmentProcessor signature to no longer take skpaint\grcolor* (Closed)

Created:
5 years, 4 months ago by bsalomon
Modified:
5 years, 3 months ago
CC:
reviews_skia.org
Base URL:
https://skia.googlesource.com/skia.git@things
Target Ref:
refs/heads/master
Project:
skia
Visibility:
Public.

Description

Change SkShader;asFragmentProcessor signature to no longer take skpaint\grcolor* Committed: https://skia.googlesource.com/skia/+/ecfdc251be71f3d634e76afdd6375bf55fc061aa Committed: https://skia.googlesource.com/skia/+/c21b09eec91c9e263cb0b88467ea44e348ed4962

Patch Set 1 #

Patch Set 2 : minor #

Patch Set 3 : rebase #

Patch Set 4 : Make asFragmentProcessor return const GrFragmentProcessor* #

Patch Set 5 : restore draw atlas color GM & whitespace fix #

Patch Set 6 : rebase #

Patch Set 7 : fix no-gpu build #

Total comments: 2

Patch Set 8 : nullptr #

Total comments: 44

Patch Set 9 : Address comments, fix roll(?) #

Unified diffs Side-by-side diffs Delta from patch set Stats (+419 lines, -449 lines) Patch
M gm/dcshader.cpp View 1 2 3 4 5 6 7 8 3 chunks +14 lines, -10 lines 0 comments Download
M gyp/gpu.gypi View 1 2 3 4 5 6 7 2 chunks +2 lines, -0 lines 0 comments Download
M include/core/SkShader.h View 1 2 3 4 5 6 7 8 1 chunk +11 lines, -18 lines 0 comments Download
M include/effects/SkPerlinNoiseShader.h View 1 2 3 1 chunk +5 lines, -3 lines 0 comments Download
M include/gpu/GrFragmentProcessor.h View 1 2 3 4 5 6 7 8 2 chunks +4 lines, -1 line 0 comments Download
M include/gpu/GrInvariantOutput.h View 1 2 3 4 5 6 7 8 1 chunk +1 line, -1 line 0 comments Download
M include/gpu/GrProcessorUnitTest.h View 1 2 3 4 5 6 3 chunks +8 lines, -8 lines 0 comments Download
M include/gpu/effects/GrConstColorProcessor.h View 1 2 2 chunks +0 lines, -4 lines 0 comments Download
A include/gpu/effects/GrExtractAlphaFragmentProcessor.h View 1 2 3 1 chunk +45 lines, -0 lines 0 comments Download
M src/core/SkBitmapProcShader.h View 1 2 3 4 5 1 chunk +5 lines, -4 lines 0 comments Download
M src/core/SkBitmapProcShader.cpp View 1 2 3 4 5 4 chunks +16 lines, -25 lines 0 comments Download
M src/core/SkColorShader.h View 1 2 3 1 chunk +5 lines, -3 lines 0 comments Download
M src/core/SkLightingShader.cpp View 1 2 3 4 5 6 7 8 5 chunks +26 lines, -31 lines 0 comments Download
M src/core/SkLocalMatrixShader.h View 1 2 3 1 chunk +4 lines, -17 lines 0 comments Download
M src/core/SkPictureShader.h View 1 2 3 4 5 6 7 8 2 chunks +8 lines, -3 lines 0 comments Download
M src/core/SkPictureShader.cpp View 1 2 3 4 5 6 7 8 1 chunk +8 lines, -15 lines 0 comments Download
M src/core/SkShader.cpp View 1 2 3 4 5 2 chunks +10 lines, -22 lines 0 comments Download
M src/effects/SkAlphaThresholdFilter.cpp View 1 2 3 4 5 1 chunk +1 line, -1 line 0 comments Download
M src/effects/SkArithmeticMode_gpu.cpp View 1 2 3 4 5 2 chunks +2 lines, -2 lines 0 comments Download
M src/effects/SkBlurMaskFilter.cpp View 1 2 3 4 5 2 chunks +2 lines, -2 lines 0 comments Download
M src/effects/SkColorFilters.cpp View 1 2 3 4 5 1 chunk +1 line, -1 line 0 comments Download
M src/effects/SkColorMatrixFilter.cpp View 1 2 3 4 5 1 chunk +1 line, -1 line 0 comments Download
M src/effects/SkDisplacementMapEffect.cpp View 1 2 3 4 5 1 chunk +1 line, -1 line 0 comments Download
M src/effects/SkLightingImageFilter.cpp View 1 2 3 4 5 2 chunks +2 lines, -2 lines 0 comments Download
M src/effects/SkMagnifierImageFilter.cpp View 1 2 3 4 5 6 7 8 1 chunk +1 line, -1 line 0 comments Download
M src/effects/SkMorphologyImageFilter.cpp View 1 2 3 4 5 1 chunk +1 line, -1 line 0 comments Download
M src/effects/SkPerlinNoiseShader.cpp View 1 2 3 4 5 6 7 8 15 chunks +35 lines, -63 lines 0 comments Download
M src/effects/SkTableColorFilter.cpp View 1 2 3 4 5 1 chunk +1 line, -1 line 0 comments Download
M src/effects/gradients/SkLinearGradient.h View 1 2 3 4 5 6 7 8 1 chunk +7 lines, -3 lines 0 comments Download
M src/effects/gradients/SkLinearGradient.cpp View 1 2 3 4 5 6 7 8 4 chunks +16 lines, -26 lines 0 comments Download
M src/effects/gradients/SkRadialGradient.h View 1 2 3 4 5 6 7 8 1 chunk +7 lines, -3 lines 0 comments Download
M src/effects/gradients/SkRadialGradient.cpp View 1 2 3 4 5 6 7 8 4 chunks +16 lines, -28 lines 0 comments Download
M src/effects/gradients/SkSweepGradient.h View 1 2 3 4 5 6 7 8 1 chunk +7 lines, -3 lines 0 comments Download
M src/effects/gradients/SkSweepGradient.cpp View 1 2 3 4 5 6 7 8 4 chunks +18 lines, -27 lines 0 comments Download
M src/effects/gradients/SkTwoPointConicalGradient.h View 1 2 3 4 5 6 7 8 1 chunk +7 lines, -3 lines 0 comments Download
M src/effects/gradients/SkTwoPointConicalGradient.cpp View 1 2 3 4 5 6 7 8 1 chunk +12 lines, -23 lines 0 comments Download
M src/effects/gradients/SkTwoPointConicalGradient_gpu.cpp View 1 2 3 4 5 10 chunks +22 lines, -39 lines 0 comments Download
M src/gpu/GrAAConvexPathRenderer.cpp View 1 2 3 4 5 1 chunk +1 line, -1 line 0 comments Download
M src/gpu/GrDefaultGeoProcFactory.cpp View 1 2 3 4 5 1 chunk +1 line, -1 line 0 comments Download
M src/gpu/GrOvalRenderer.cpp View 1 2 3 4 5 3 chunks +3 lines, -3 lines 0 comments Download
M src/gpu/GrProcessor.cpp View 1 2 3 4 5 6 7 1 chunk +0 lines, -4 lines 0 comments Download
M src/gpu/SkGr.cpp View 1 2 3 4 5 1 chunk +6 lines, -15 lines 0 comments Download
M src/gpu/effects/GrBezierEffect.cpp View 1 2 3 4 5 3 chunks +3 lines, -3 lines 0 comments Download
M src/gpu/effects/GrBicubicEffect.cpp View 1 2 3 1 chunk +1 line, -1 line 0 comments Download
M src/gpu/effects/GrBitmapTextGeoProc.cpp View 1 2 3 4 5 1 chunk +1 line, -1 line 0 comments Download
M src/gpu/effects/GrConfigConversionEffect.cpp View 1 2 3 4 5 1 chunk +1 line, -1 line 0 comments Download
M src/gpu/effects/GrConstColorProcessor.cpp View 1 2 3 1 chunk +1 line, -1 line 0 comments Download
M src/gpu/effects/GrConvexPolyEffect.cpp View 1 2 3 4 5 2 chunks +2 lines, -2 lines 0 comments Download
M src/gpu/effects/GrConvolutionEffect.cpp View 1 2 3 1 chunk +1 line, -1 line 0 comments Download
M src/gpu/effects/GrCoverageSetOpXP.cpp View 1 2 3 4 5 1 chunk +1 line, -1 line 0 comments Download
M src/gpu/effects/GrCustomXfermode.cpp View 1 2 3 4 5 2 chunks +2 lines, -2 lines 0 comments Download
M src/gpu/effects/GrDashingEffect.cpp View 1 2 3 4 5 2 chunks +2 lines, -2 lines 0 comments Download
M src/gpu/effects/GrDisableColorXP.cpp View 1 2 3 1 chunk +1 line, -1 line 0 comments Download
M src/gpu/effects/GrDistanceFieldGeoProc.cpp View 1 2 3 4 5 3 chunks +3 lines, -3 lines 0 comments Download
M src/gpu/effects/GrDitherEffect.cpp View 1 2 3 4 5 6 7 1 chunk +1 line, -1 line 0 comments Download
A src/gpu/effects/GrExtractAlphaFragmentProcessor.cpp View 1 1 chunk +47 lines, -0 lines 0 comments Download
M src/gpu/effects/GrMatrixConvolutionEffect.cpp View 1 2 3 1 chunk +1 line, -1 line 0 comments Download
M src/gpu/effects/GrOvalEffect.cpp View 1 2 3 4 5 2 chunks +2 lines, -2 lines 0 comments Download
M src/gpu/effects/GrPorterDuffXferProcessor.cpp View 1 2 3 4 5 6 7 1 chunk +1 line, -1 line 0 comments Download
M src/gpu/effects/GrRRectEffect.cpp View 1 2 3 4 5 2 chunks +2 lines, -2 lines 0 comments Download
M src/gpu/effects/GrSimpleTextureEffect.cpp View 1 2 3 1 chunk +1 line, -1 line 0 comments Download
M src/gpu/effects/GrTextureDomain.cpp View 1 2 3 1 chunk +1 line, -1 line 0 comments Download
M tests/GLProgramsTest.cpp View 1 2 3 4 5 6 7 1 chunk +1 line, -1 line 0 comments Download

Messages

Total messages: 32 (12 generated)
bsalomon
Not finished and fails some tests but figured I'd pass this along since I'll be ...
5 years, 4 months ago (2015-08-24 21:28:17 UTC) #2
bsalomon
On 2015/08/24 21:28:17, bsalomon wrote: > Not finished and fails some tests but figured I'd ...
5 years, 4 months ago (2015-08-24 21:29:32 UTC) #3
bsalomon
This will temporarily break the blending against vertex colors for drawVertices and drawAtlas. They were ...
5 years, 3 months ago (2015-08-27 16:31:38 UTC) #5
commit-bot: I haz the power
Dry run: CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/patch-status/1316513002/80001 View timeline at https://chromium-cq-status.appspot.com/patch-timeline/1316513002/80001
5 years, 3 months ago (2015-08-27 16:31:55 UTC) #7
commit-bot: I haz the power
Dry run: Try jobs failed on following builders: Build-Ubuntu-GCC-Arm7-Debug-Android-Trybot on client.skia.compile (JOB_FAILED, http://build.chromium.org/p/client.skia.compile/builders/Build-Ubuntu-GCC-Arm7-Debug-Android-Trybot/builds/2933) Build-Ubuntu-GCC-Mips-Debug-Android-Trybot on ...
5 years, 3 months ago (2015-08-27 16:32:46 UTC) #9
commit-bot: I haz the power
Dry run: CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/patch-status/1316513002/100001 View timeline at https://chromium-cq-status.appspot.com/patch-timeline/1316513002/100001
5 years, 3 months ago (2015-08-27 17:32:40 UTC) #11
commit-bot: I haz the power
Dry run: Try jobs failed on following builders: Build-Ubuntu-GCC-Mips-Debug-Android-Trybot on client.skia.compile (JOB_FAILED, http://build.chromium.org/p/client.skia.compile/builders/Build-Ubuntu-GCC-Mips-Debug-Android-Trybot/builds/2172)
5 years, 3 months ago (2015-08-27 17:33:42 UTC) #13
commit-bot: I haz the power
Dry run: CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/patch-status/1316513002/120001 View timeline at https://chromium-cq-status.appspot.com/patch-timeline/1316513002/120001
5 years, 3 months ago (2015-08-27 17:40:31 UTC) #15
commit-bot: I haz the power
Dry run: This issue passed the CQ dry run.
5 years, 3 months ago (2015-08-27 17:45:42 UTC) #17
wangyix
lgtm https://codereview.chromium.org/1316513002/diff/120001/src/core/SkPictureShader.cpp File src/core/SkPictureShader.cpp (right): https://codereview.chromium.org/1316513002/diff/120001/src/core/SkPictureShader.cpp#newcode350 src/core/SkPictureShader.cpp:350: return bitmapShader->asFragmentProcessor(context, viewM, NULL, fq, procDataManager); NULL is ...
5 years, 3 months ago (2015-08-28 15:02:13 UTC) #18
bsalomon
https://codereview.chromium.org/1316513002/diff/120001/src/core/SkPictureShader.cpp File src/core/SkPictureShader.cpp (right): https://codereview.chromium.org/1316513002/diff/120001/src/core/SkPictureShader.cpp#newcode350 src/core/SkPictureShader.cpp:350: return bitmapShader->asFragmentProcessor(context, viewM, NULL, fq, procDataManager); On 2015/08/28 15:02:13, ...
5 years, 3 months ago (2015-08-28 15:08:27 UTC) #19
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/patch-status/1316513002/140001 View timeline at https://chromium-cq-status.appspot.com/patch-timeline/1316513002/140001
5 years, 3 months ago (2015-08-28 16:03:50 UTC) #22
commit-bot: I haz the power
Note for Reviewers: The CQ is waiting for an approval. If you believe that the ...
5 years, 3 months ago (2015-08-28 16:03:52 UTC) #23
robertphillips
lgtm - a few semi-real issues + a lot of nits https://codereview.chromium.org/1316513002/diff/140001/gm/dcshader.cpp File gm/dcshader.cpp (right): ...
5 years, 3 months ago (2015-08-28 21:33:06 UTC) #24
commit-bot: I haz the power
Committed patchset #8 (id:140001) as https://skia.googlesource.com/skia/+/ecfdc251be71f3d634e76afdd6375bf55fc061aa
5 years, 3 months ago (2015-08-28 21:33:52 UTC) #25
rmistry
A revert of this CL (patchset #8 id:140001) has been created in https://codereview.chromium.org/1313573005/ by rmistry@google.com. ...
5 years, 3 months ago (2015-08-29 00:16:20 UTC) #26
bsalomon
On 2015/08/29 00:16:20, rmistry wrote: > A revert of this CL (patchset #8 id:140001) has ...
5 years, 3 months ago (2015-08-29 00:56:54 UTC) #27
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/patch-status/1316513002/160001 View timeline at https://chromium-cq-status.appspot.com/patch-timeline/1316513002/160001
5 years, 3 months ago (2015-08-29 01:41:35 UTC) #30
bsalomon
https://codereview.chromium.org/1316513002/diff/140001/gm/dcshader.cpp File gm/dcshader.cpp (right): https://codereview.chromium.org/1316513002/diff/140001/gm/dcshader.cpp#newcode37 gm/dcshader.cpp:37: const GrFragmentProcessor* asFragmentProcessor(GrContext*, const SkMatrix& viewM, On 2015/08/28 21:33:05, ...
5 years, 3 months ago (2015-08-29 01:42:50 UTC) #31
commit-bot: I haz the power
5 years, 3 months ago (2015-08-29 01:47:00 UTC) #32
Message was sent while issue was closed.
Committed patchset #9 (id:160001) as
https://skia.googlesource.com/skia/+/c21b09eec91c9e263cb0b88467ea44e348ed4962

Powered by Google App Engine
This is Rietveld 408576698