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

Side by Side Diff: gm/pictureshader.cpp

Issue 260863007: Remove setLocalMatrix calls from picture shader GM. (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: pass the localMatrix... Created 6 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « dm/DMRecordTask.cpp ('k') | include/core/SkShader.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright 2014 Google Inc. 2 * Copyright 2014 Google Inc.
3 * 3 *
4 * Use of this source code is governed by a BSD-style license that can be 4 * Use of this source code is governed by a BSD-style license that can be
5 * found in the LICENSE file. 5 * found in the LICENSE file.
6 */ 6 */
7 7
8 #include "gm.h" 8 #include "gm.h"
9 9
10 #include "SkBitmap.h" 10 #include "SkBitmap.h"
11 #include "SkPaint.h" 11 #include "SkPaint.h"
12 #include "SkPicture.h" 12 #include "SkPicture.h"
13 #include "SkPictureRecorder.h" 13 #include "SkPictureRecorder.h"
14 #include "SkShader.h" 14 #include "SkShader.h"
15 15
16 namespace skiagm {
17
18 static struct { 16 static struct {
19 SkShader::TileMode tmx; 17 SkShader::TileMode tmx;
20 SkShader::TileMode tmy; 18 SkShader::TileMode tmy;
21 } kTileConfigs[] = { 19 } kTileConfigs[] = {
22 { SkShader::kRepeat_TileMode, SkShader::kRepeat_TileMode }, 20 { SkShader::kRepeat_TileMode, SkShader::kRepeat_TileMode },
23 { SkShader::kRepeat_TileMode, SkShader::kClamp_TileMode }, 21 { SkShader::kRepeat_TileMode, SkShader::kClamp_TileMode },
24 { SkShader::kMirror_TileMode, SkShader::kRepeat_TileMode }, 22 { SkShader::kMirror_TileMode, SkShader::kRepeat_TileMode },
25 }; 23 };
26 24
27 class PictureShaderGM : public GM { 25 class PictureShaderGM : public skiagm::GM {
28 public: 26 public:
29
30 PictureShaderGM(SkScalar tileSize, SkScalar sceneSize) 27 PictureShaderGM(SkScalar tileSize, SkScalar sceneSize)
31 : fTileSize(tileSize) 28 : fTileSize(tileSize)
32 , fSceneSize(sceneSize) { 29 , fSceneSize(sceneSize) {
33 30
34 // Build the picture. 31 // Build the picture.
35 SkPictureRecorder recorder; 32 SkPictureRecorder recorder;
36 SkCanvas* pictureCanvas = recorder.beginRecording(SkScalarRoundToInt(til eSize), 33 SkCanvas* pictureCanvas = recorder.beginRecording(SkScalarRoundToInt(til eSize),
37 SkScalarRoundToInt(til eSize), 34 SkScalarRoundToInt(til eSize),
38 NULL, 0); 35 NULL, 0);
39 this->drawTile(pictureCanvas); 36 this->drawTile(pictureCanvas);
40 SkAutoTUnref<SkPicture> p(recorder.endRecording()); 37 fPicture.reset(recorder.endRecording());
41 38
42 // Build a reference bitmap. 39 // Build a reference bitmap.
43 SkBitmap bm; 40 fBitmap.allocN32Pixels(SkScalarRoundToInt(tileSize), SkScalarRoundToInt( tileSize));
44 bm.allocN32Pixels(SkScalarRoundToInt(tileSize), SkScalarRoundToInt(tileS ize)); 41 fBitmap.eraseColor(SK_ColorTRANSPARENT);
45 bm.eraseColor(SK_ColorTRANSPARENT); 42 SkCanvas bitmapCanvas(fBitmap);
46 SkCanvas bitmapCanvas(bm);
47 this->drawTile(&bitmapCanvas); 43 this->drawTile(&bitmapCanvas);
48
49 for (unsigned i = 0; i < SK_ARRAY_COUNT(kTileConfigs); ++i) {
50 fPictureShaders[i].reset(SkShader::CreatePictureShader(p,
51 kTileConfigs[ i].tmx,
52 kTileConfigs[ i].tmy));
53
54 fBitmapShaders[i].reset(SkShader::CreateBitmapShader(bm,
55 kTileConfigs[i] .tmx,
56 kTileConfigs[i] .tmy));
57 }
58 } 44 }
59 45
60 protected: 46 protected:
61 virtual uint32_t onGetFlags() const SK_OVERRIDE { 47 virtual uint32_t onGetFlags() const SK_OVERRIDE {
62 return kSkipTiled_Flag; 48 return kSkipTiled_Flag;
63 } 49 }
64 50
65 virtual SkString onShortName() SK_OVERRIDE { 51 virtual SkString onShortName() SK_OVERRIDE {
66 return SkString("pictureshader"); 52 return SkString("pictureshader");
67 } 53 }
(...skipping 70 matching lines...) Expand 10 before | Expand all | Expand 10 after
138 124
139 SkPaint paint; 125 SkPaint paint;
140 paint.setStyle(SkPaint::kFill_Style); 126 paint.setStyle(SkPaint::kFill_Style);
141 paint.setColor(SK_ColorLTGRAY); 127 paint.setColor(SK_ColorLTGRAY);
142 128
143 canvas->save(); 129 canvas->save();
144 canvas->concat(matrix); 130 canvas->concat(matrix);
145 canvas->drawRect(SkRect::MakeWH(fSceneSize, fSceneSize), paint); 131 canvas->drawRect(SkRect::MakeWH(fSceneSize, fSceneSize), paint);
146 canvas->drawRect(SkRect::MakeXYWH(fSceneSize * 1.1f, 0, fSceneSize, fSce neSize), paint); 132 canvas->drawRect(SkRect::MakeXYWH(fSceneSize * 1.1f, 0, fSceneSize, fSce neSize), paint);
147 133
148 fPictureShaders[tileMode]->setLocalMatrix(localMatrix); 134 SkAutoTUnref<SkShader> pictureShader(SkShader::CreatePictureShader(
149 paint.setShader(fPictureShaders[tileMode].get()); 135 fPicture,
136 kTileConfigs[tileMode].tmx,
137 kTileConfigs[tileMode].tmy,
138 &localMatrix));
139 paint.setShader(pictureShader.get());
150 canvas->drawRect(SkRect::MakeWH(fSceneSize, fSceneSize), paint); 140 canvas->drawRect(SkRect::MakeWH(fSceneSize, fSceneSize), paint);
151 141
152 canvas->translate(fSceneSize * 1.1f, 0); 142 canvas->translate(fSceneSize * 1.1f, 0);
153 143
154 fBitmapShaders[tileMode]->setLocalMatrix(localMatrix); 144 SkAutoTUnref<SkShader> bitmapShader(SkShader::CreateBitmapShader(
155 paint.setShader(fBitmapShaders[tileMode].get()); 145 fBitmap,
146 kTileConfigs[tileMode].tmx,
147 kTileConfigs[tileMode].tmy,
148 &localMatrix));
149 paint.setShader(bitmapShader.get());
156 canvas->drawRect(SkRect::MakeWH(fSceneSize, fSceneSize), paint); 150 canvas->drawRect(SkRect::MakeWH(fSceneSize, fSceneSize), paint);
157 151
158 canvas->restore(); 152 canvas->restore();
159 } 153 }
160 154
161 SkScalar fTileSize; 155 SkScalar fTileSize;
162 SkScalar fSceneSize; 156 SkScalar fSceneSize;
163 157
164 SkAutoTUnref<SkShader> fPictureShaders[SK_ARRAY_COUNT(kTileConfigs)]; 158 SkAutoTUnref<SkPicture> fPicture;
165 SkAutoTUnref<SkShader> fBitmapShaders[SK_ARRAY_COUNT(kTileConfigs)]; 159 SkBitmap fBitmap;
166 160
167 typedef GM INHERITED; 161 typedef GM INHERITED;
168 }; 162 };
169 163
170 DEF_GM( return SkNEW_ARGS(PictureShaderGM, (50, 100)); ) 164 DEF_GM( return SkNEW_ARGS(PictureShaderGM, (50, 100)); )
171 }
OLDNEW
« no previous file with comments | « dm/DMRecordTask.cpp ('k') | include/core/SkShader.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698