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

Issue 1370223002: Revert[4] of add ImageShader, sharing code with its Bitmap cousin (Closed)

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

Description

Revert[4] of add ImageShader, sharing code with its Bitmap cousin Now with GrTextureMaker subclasses to handle npot usage. This reverts commit 476506d070dbc59b158acc1a00c34bff95ab2968. BUG=skia: Committed: https://skia.googlesource.com/skia/+/856e9d921462136da8562f8f122d42e114cd4710

Patch Set 1 #

Patch Set 2 : #

Patch Set 3 : #

Patch Set 4 : #

Total comments: 8
Unified diffs Side-by-side diffs Delta from patch set Stats (+383 lines, -79 lines) Patch
M gyp/core.gypi View 1 1 chunk +2 lines, -0 lines 0 comments Download
M src/core/SkImageCacherator.h View 1 2 2 chunks +5 lines, -0 lines 0 comments Download
M src/core/SkImageCacherator.cpp View 1 2 3 chunks +70 lines, -9 lines 0 comments Download
M src/gpu/GrTextureMaker.h View 1 2 1 chunk +1 line, -0 lines 0 comments Download
M src/gpu/SkGr.cpp View 1 2 9 chunks +40 lines, -28 lines 3 comments Download
M src/gpu/SkGrPriv.h View 1 2 4 chunks +10 lines, -0 lines 1 comment Download
M src/gpu/gl/GrGLGpu.cpp View 1 1 chunk +12 lines, -0 lines 0 comments Download
M src/image/SkImage.cpp View 2 chunks +2 lines, -1 line 0 comments Download
A src/image/SkImageShader.h View 1 chunk +44 lines, -0 lines 0 comments Download
A src/image/SkImageShader.cpp View 1 chunk +144 lines, -0 lines 2 comments Download
M src/image/SkImage_Base.h View 1 chunk +1 line, -4 lines 0 comments Download
M src/image/SkImage_Generator.cpp View 2 chunks +0 lines, -16 lines 0 comments Download
M src/image/SkImage_Gpu.h View 1 chunk +0 lines, -3 lines 0 comments Download
M src/image/SkImage_Gpu.cpp View 1 2 3 chunks +52 lines, -9 lines 2 comments Download
M src/image/SkImage_Raster.cpp View 1 2 chunks +0 lines, -9 lines 0 comments Download

Messages

Total messages: 13 (4 generated)
commit-bot: I haz the power
Dry run: CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/patch-status/1370223002/40001 View timeline at https://chromium-cq-status.appspot.com/patch-timeline/1370223002/40001
5 years, 2 months ago (2015-09-30 18:05:37 UTC) #2
reed1
using GrTextureMaker to safe-guard when we need to tile a npot
5 years, 2 months ago (2015-09-30 18:05:49 UTC) #4
commit-bot: I haz the power
Dry run: This issue passed the CQ dry run.
5 years, 2 months ago (2015-09-30 18:15:04 UTC) #6
reed1
PTAL
5 years, 2 months ago (2015-09-30 18:57:51 UTC) #7
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/patch-status/1370223002/60001 View timeline at https://chromium-cq-status.appspot.com/patch-timeline/1370223002/60001
5 years, 2 months ago (2015-09-30 18:58:15 UTC) #9
commit-bot: I haz the power
Note for Reviewers: The CQ is waiting for an approval. If you believe that the ...
5 years, 2 months ago (2015-09-30 18:58:17 UTC) #10
bsalomon
suggestion, otherwise lgtm https://codereview.chromium.org/1370223002/diff/60001/src/gpu/SkGr.cpp File src/gpu/SkGr.cpp (right): https://codereview.chromium.org/1370223002/diff/60001/src/gpu/SkGr.cpp#newcode48 src/gpu/SkGr.cpp:48: GrTextureParams GrImageUsageToTextureParams(SkImageUsageType usage) { Maybe it's ...
5 years, 2 months ago (2015-09-30 19:21:12 UTC) #11
commit-bot: I haz the power
Committed patchset #4 (id:60001) as https://skia.googlesource.com/skia/+/856e9d921462136da8562f8f122d42e114cd4710
5 years, 2 months ago (2015-09-30 19:21:48 UTC) #12
robertphillips
5 years, 2 months ago (2015-09-30 19:25:56 UTC) #13
Message was sent while issue was closed.
https://codereview.chromium.org/1370223002/diff/60001/src/gpu/SkGr.cpp
File src/gpu/SkGr.cpp (right):

https://codereview.chromium.org/1370223002/diff/60001/src/gpu/SkGr.cpp#newcode43
src/gpu/SkGr.cpp:43: }
isPow2 ?

https://codereview.chromium.org/1370223002/diff/60001/src/gpu/SkGr.cpp#newcode51
src/gpu/SkGr.cpp:51: 
Do we need some assert r.e. the number of image usage types matching the size of
'tiles' and 'filters' ?

https://codereview.chromium.org/1370223002/diff/60001/src/gpu/SkGrPriv.h
File src/gpu/SkGrPriv.h (right):

https://codereview.chromium.org/1370223002/diff/60001/src/gpu/SkGrPriv.h#newc...
src/gpu/SkGrPriv.h:52: *  Given an "unstretched" key, and a stretch rec, produce
a stretched key.
Returns false if the stretched key cannot be created (e.g., the "unstretched"
key wasn't valid).

?

https://codereview.chromium.org/1370223002/diff/60001/src/image/SkImageShader...
File src/image/SkImageShader.cpp (right):

https://codereview.chromium.org/1370223002/diff/60001/src/image/SkImageShader...
src/image/SkImageShader.cpp:80: #include "SkGr.h"
included twice ?

https://codereview.chromium.org/1370223002/diff/60001/src/image/SkImageShader...
src/image/SkImageShader.cpp:113: GrTextureParams::FilterMode textureFilterMode =
This is a surprising indentation ...

https://codereview.chromium.org/1370223002/diff/60001/src/image/SkImage_Gpu.cpp
File src/image/SkImage_Gpu.cpp (right):

https://codereview.chromium.org/1370223002/diff/60001/src/image/SkImage_Gpu.c...
src/image/SkImage_Gpu.cpp:63: 
It seems odd that this has a different domain from GrMakeStretchedKey.

https://codereview.chromium.org/1370223002/diff/60001/src/image/SkImage_Gpu.c...
src/image/SkImage_Gpu.cpp:80: public:
unstretched can't be const ?

Powered by Google App Engine
This is Rietveld 408576698