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

Issue 377503004: Make GrDrawState and GrPaint take GrEffect* instead of GrEffectRef*. (Closed)

Created:
6 years, 5 months ago by bsalomon
Modified:
6 years, 5 months ago
Reviewers:
robertphillips
CC:
reviews_skia.org
Base URL:
https://skia.googlesource.com/skia.git@no_ref
Visibility:
Public.

Description

Make GrDrawState and GrPaint take GrEffect* instead of GrEffectRef*. Make Sk-effect virtuals produce GrEffect* rather than GrEffectRef* Make GrEffectRef a typedef for GrEffect. Committed: https://skia.googlesource.com/skia/+/2011fe9cdfa63b83489a146cea6a724cede352c8 Committed: https://skia.googlesource.com/skia/+/97b9ab72cd5ee0cba4692082737266376425f27c

Patch Set 1 #

Total comments: 7

Patch Set 2 : Address review comments #

Patch Set 3 : Fix no-gpu build #

Patch Set 4 : Update YUV effect to reflect these changes. #

Unified diffs Side-by-side diffs Delta from patch set Stats (+140 lines, -277 lines) Patch
M include/core/SkColorFilter.h View 2 chunks +2 lines, -2 lines 0 comments Download
M include/core/SkColorShader.h View 1 chunk +1 line, -1 line 0 comments Download
M include/core/SkImageFilter.h View 2 chunks +2 lines, -2 lines 0 comments Download
M include/core/SkMaskFilter.h View 1 chunk +1 line, -1 line 0 comments Download
M include/core/SkShader.h View 2 chunks +2 lines, -2 lines 0 comments Download
M include/core/SkXfermode.h View 3 chunks +3 lines, -3 lines 0 comments Download
M include/effects/SkColorMatrixFilter.h View 1 chunk +1 line, -1 line 0 comments Download
M include/effects/SkLumaColorFilter.h View 1 chunk +1 line, -1 line 0 comments Download
M include/effects/SkMagnifierImageFilter.h View 1 1 chunk +2 lines, -1 line 0 comments Download
M include/effects/SkMatrixConvolutionImageFilter.h View 1 chunk +1 line, -1 line 0 comments Download
M include/effects/SkPerlinNoiseShader.h View 1 chunk +1 line, -1 line 0 comments Download
M include/gpu/GrBackendEffectFactory.h View 1 chunk +0 lines, -1 line 0 comments Download
M include/gpu/GrEffect.h View 1 8 chunks +25 lines, -135 lines 0 comments Download
M include/gpu/GrEffectStage.h View 1 6 chunks +14 lines, -14 lines 0 comments Download
M include/gpu/GrEffectUnitTest.h View 3 chunks +17 lines, -17 lines 0 comments Download
M include/gpu/GrPaint.h View 2 chunks +4 lines, -4 lines 0 comments Download
M src/core/SkBitmapProcShader.h View 1 chunk +1 line, -1 line 0 comments Download
M src/core/SkBitmapProcShader.cpp View 1 2 1 chunk +1 line, -1 line 0 comments Download
M src/core/SkColorFilter.cpp View 1 chunk +1 line, -1 line 0 comments Download
M src/core/SkImageFilter.cpp View 1 2 2 chunks +2 lines, -3 lines 0 comments Download
M src/core/SkLocalMatrixShader.h View 1 2 2 chunks +2 lines, -2 lines 0 comments Download
M src/core/SkMaskFilter.cpp View 1 chunk +1 line, -1 line 0 comments Download
M src/core/SkPictureShader.h View 1 chunk +1 line, -1 line 0 comments Download
M src/core/SkPictureShader.cpp View 1 2 1 chunk +1 line, -1 line 0 comments Download
M src/core/SkShader.cpp View 1 2 2 chunks +2 lines, -2 lines 0 comments Download
M src/core/SkXfermode.cpp View 1 chunk +2 lines, -2 lines 0 comments Download
M src/core/SkXfermode_proccoeff.h View 1 chunk +1 line, -1 line 0 comments Download
M src/effects/SkAlphaThresholdFilter.cpp View 2 chunks +2 lines, -2 lines 0 comments Download
M src/effects/SkColorFilters.cpp View 2 chunks +2 lines, -2 lines 0 comments Download
M src/effects/SkLumaColorFilter.cpp View 1 chunk +1 line, -1 line 0 comments Download
M src/effects/SkPerlinNoiseShader.cpp View 1 2 2 chunks +2 lines, -2 lines 0 comments Download
M src/effects/SkTableColorFilter.cpp View 1 chunk +1 line, -1 line 0 comments Download
M src/effects/gradients/SkLinearGradient.h View 1 2 1 chunk +1 line, -1 line 0 comments Download
M src/effects/gradients/SkLinearGradient.cpp View 1 2 1 chunk +1 line, -1 line 0 comments Download
M src/effects/gradients/SkRadialGradient.h View 1 2 1 chunk +1 line, -1 line 0 comments Download
M src/effects/gradients/SkRadialGradient.cpp View 1 2 1 chunk +1 line, -1 line 0 comments Download
M src/effects/gradients/SkSweepGradient.h View 1 2 1 chunk +1 line, -1 line 0 comments Download
M src/effects/gradients/SkSweepGradient.cpp View 1 2 1 chunk +1 line, -1 line 0 comments Download
M src/effects/gradients/SkTwoPointConicalGradient.h View 1 chunk +1 line, -1 line 0 comments Download
M src/effects/gradients/SkTwoPointConicalGradient.cpp View 1 2 1 chunk +1 line, -1 line 0 comments Download
M src/effects/gradients/SkTwoPointConicalGradient_gpu.h View 2 chunks +3 lines, -3 lines 0 comments Download
M src/effects/gradients/SkTwoPointRadialGradient.h View 1 2 1 chunk +1 line, -1 line 0 comments Download
M src/effects/gradients/SkTwoPointRadialGradient.cpp View 1 2 1 chunk +1 line, -1 line 0 comments Download
M src/gpu/GrDrawState.h View 2 chunks +6 lines, -10 lines 0 comments Download
M src/gpu/GrEffect.cpp View 1 chunk +1 line, -19 lines 0 comments Download
M src/gpu/GrPaint.cpp View 1 chunk +4 lines, -8 lines 0 comments Download
M src/gpu/effects/GrDashingEffect.h View 1 chunk +2 lines, -2 lines 0 comments Download
M src/gpu/effects/GrDitherEffect.h View 1 chunk +2 lines, -2 lines 0 comments Download
M src/gpu/effects/GrOvalEffect.h View 1 chunk +2 lines, -2 lines 0 comments Download
M src/gpu/effects/GrRRectEffect.h View 2 chunks +2 lines, -2 lines 0 comments Download
M src/gpu/effects/GrYUVtoRGBEffect.h View 1 2 3 1 chunk +2 lines, -2 lines 0 comments Download
M src/gpu/effects/GrYUVtoRGBEffect.cpp View 1 2 3 1 chunk +1 line, -1 line 0 comments Download
M tests/GLProgramsTest.cpp View 2 chunks +4 lines, -4 lines 0 comments Download
M tests/GpuColorFilterTest.cpp View 1 chunk +1 line, -1 line 0 comments Download

Messages

Total messages: 17 (0 generated)
bsalomon
https://codereview.chromium.org/377503004/diff/1/include/gpu/GrEffect.h File include/gpu/GrEffect.h (right): https://codereview.chromium.org/377503004/diff/1/include/gpu/GrEffect.h#newcode174 include/gpu/GrEffect.h:174: static GrEffect* CreateEffectRef(GrEffect* effect) { This and AutoEffectRef will ...
6 years, 5 months ago (2014-07-07 19:51:32 UTC) #1
robertphillips
lgtm + nits https://codereview.chromium.org/377503004/diff/1/include/effects/SkMagnifierImageFilter.h File include/effects/SkMagnifierImageFilter.h (right): https://codereview.chromium.org/377503004/diff/1/include/effects/SkMagnifierImageFilter.h#newcode30 include/effects/SkMagnifierImageFilter.h:30: #if SK_SUPPORT_GPU overlength ? https://codereview.chromium.org/377503004/diff/1/include/gpu/GrEffect.h File ...
6 years, 5 months ago (2014-07-07 20:03:51 UTC) #2
bsalomon
https://codereview.chromium.org/377503004/diff/1/include/effects/SkMagnifierImageFilter.h File include/effects/SkMagnifierImageFilter.h (right): https://codereview.chromium.org/377503004/diff/1/include/effects/SkMagnifierImageFilter.h#newcode30 include/effects/SkMagnifierImageFilter.h:30: #if SK_SUPPORT_GPU On 2014/07/07 20:03:51, robertphillips wrote: > overlength ...
6 years, 5 months ago (2014-07-07 21:13:52 UTC) #3
bsalomon
The CQ bit was checked by bsalomon@google.com
6 years, 5 months ago (2014-07-07 21:13:56 UTC) #4
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://skia-tree-status.appspot.com/cq/bsalomon@google.com/377503004/20001
6 years, 5 months ago (2014-07-07 21:15:07 UTC) #5
commit-bot: I haz the power
FYI, CQ is re-trying this CL (attempt #1). The failing builders are: Test-Ubuntu13.10-ShuttleA-NoGPU-x86_64-Debug-Trybot on tryserver.skia ...
6 years, 5 months ago (2014-07-07 21:34:23 UTC) #6
commit-bot: I haz the power
The CQ bit was unchecked by commit-bot@chromium.org
6 years, 5 months ago (2014-07-07 21:36:35 UTC) #7
commit-bot: I haz the power
Try jobs failed on following builders: Test-Ubuntu13.10-ShuttleA-NoGPU-x86_64-Debug-Trybot on tryserver.skia (http://108.170.220.120:10117/builders/Test-Ubuntu13.10-ShuttleA-NoGPU-x86_64-Debug-Trybot/builds/605)
6 years, 5 months ago (2014-07-07 21:36:36 UTC) #8
bsalomon
The CQ bit was checked by bsalomon@google.com
6 years, 5 months ago (2014-07-07 21:42:37 UTC) #9
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://skia-tree-status.appspot.com/cq/bsalomon@google.com/377503004/40001
6 years, 5 months ago (2014-07-07 21:43:22 UTC) #10
commit-bot: I haz the power
Change committed as 2011fe9cdfa63b83489a146cea6a724cede352c8
6 years, 5 months ago (2014-07-07 22:11:35 UTC) #11
reed1
A revert of this CL has been created in https://codereview.chromium.org/372053003/ by reed@google.com. The reason for ...
6 years, 5 months ago (2014-07-07 22:16:40 UTC) #12
sugoi1
On 2014/07/07 22:16:40, reed1 wrote: > A revert of this CL has been created in ...
6 years, 5 months ago (2014-07-08 02:28:30 UTC) #13
bsalomon
On 2014/07/08 02:28:30, sugoi1 wrote: > On 2014/07/07 22:16:40, reed1 wrote: > > A revert ...
6 years, 5 months ago (2014-07-08 13:21:32 UTC) #14
bsalomon
The CQ bit was checked by bsalomon@google.com
6 years, 5 months ago (2014-07-08 13:21:39 UTC) #15
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://skia-tree-status.appspot.com/cq/bsalomon@google.com/377503004/60001
6 years, 5 months ago (2014-07-08 13:22:11 UTC) #16
commit-bot: I haz the power
6 years, 5 months ago (2014-07-08 13:52:41 UTC) #17
Message was sent while issue was closed.
Change committed as 97b9ab72cd5ee0cba4692082737266376425f27c

Powered by Google App Engine
This is Rietveld 408576698