Skip to content

Commit 609ea21

Browse files
reed-at-googleSkia Commit-Bot
reed-at-google
authored and
Skia Commit-Bot
committed
more cleanup after removing volatile from bitmap
Change-Id: I3d7b2f59a5657640c3d60f5a2f6e1277d7593096 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/302038 Reviewed-by: Mike Reed <[email protected]> Commit-Queue: Mike Reed <[email protected]>
1 parent 1434ce1 commit 609ea21

File tree

9 files changed

+27
-76
lines changed

9 files changed

+27
-76
lines changed

‎bench/BitmapBench.cpp

+23-31
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ class BitmapBench : public Benchmark {
2727
const SkColorType fColorType;
2828
const SkAlphaType fAlphaType;
2929
const bool fForceUpdate; //bitmap marked as dirty before each draw. forces bitmap to be updated on device cache
30-
const bool fIsVolatile;
3130
const bool fDoScale;
3231

3332
SkBitmap fBitmap;
@@ -37,11 +36,10 @@ class BitmapBench : public Benchmark {
3736
enum { W = 128 };
3837
enum { H = 128 };
3938
public:
40-
BitmapBench(SkColorType ct, SkAlphaType at, bool forceUpdate, bool isVolatile, bool doScale)
39+
BitmapBench(SkColorType ct, SkAlphaType at, bool forceUpdate, bool doScale)
4140
: fColorType(ct)
4241
, fAlphaType(at)
4342
, fForceUpdate(forceUpdate)
44-
, fIsVolatile(isVolatile)
4543
, fDoScale(doScale)
4644
{}
4745

@@ -57,9 +55,6 @@ class BitmapBench : public Benchmark {
5755
if (fForceUpdate) {
5856
fName.append("_update");
5957
}
60-
if (fIsVolatile) {
61-
fName.append("_volatile");
62-
}
6358

6459
return fName.c_str();
6560
}
@@ -73,7 +68,6 @@ class BitmapBench : public Benchmark {
7368
this->onDrawIntoBitmap(bm);
7469

7570
fBitmap = bm;
76-
// fBitmap.setIsVolatile(fIsVolatile);
7771
}
7872

7973
void onDraw(int loops, SkCanvas* canvas) override {
@@ -146,9 +140,8 @@ class FilterBitmapBench : public BitmapBench {
146140
uint32_t fFlags;
147141
SkString fFullName;
148142
public:
149-
FilterBitmapBench(SkColorType ct, SkAlphaType at,
150-
bool forceUpdate, bool isVolitile, uint32_t flags)
151-
: INHERITED(ct, at, forceUpdate, isVolitile, false)
143+
FilterBitmapBench(SkColorType ct, SkAlphaType at, bool forceUpdate, uint32_t flags)
144+
: INHERITED(ct, at, forceUpdate, false)
152145
, fFlags(flags) {
153146
}
154147

@@ -222,9 +215,8 @@ class SourceAlphaBitmapBench : public BitmapBench {
222215
SkString fFullName;
223216
SourceAlpha fSourceAlpha;
224217
public:
225-
SourceAlphaBitmapBench(SourceAlpha alpha, SkColorType ct,
226-
bool forceUpdate = false, bool bitmapVolatile = false)
227-
: INHERITED(ct, kPremul_SkAlphaType, forceUpdate, bitmapVolatile, false)
218+
SourceAlphaBitmapBench(SourceAlpha alpha, SkColorType ct, bool forceUpdate = false)
219+
: INHERITED(ct, kPremul_SkAlphaType, forceUpdate, false)
228220
, fSourceAlpha(alpha) {
229221
}
230222

@@ -301,31 +293,31 @@ class SourceAlphaBitmapBench : public BitmapBench {
301293
typedef BitmapBench INHERITED;
302294
};
303295

304-
DEF_BENCH( return new BitmapBench(kN32_SkColorType, kPremul_SkAlphaType, false, false, false); )
305-
DEF_BENCH( return new BitmapBench(kN32_SkColorType, kOpaque_SkAlphaType, false, false, false); )
306-
DEF_BENCH( return new BitmapBench(kN32_SkColorType, kOpaque_SkAlphaType, false, false, true); )
307-
DEF_BENCH( return new BitmapBench(kRGB_565_SkColorType, kOpaque_SkAlphaType, false, false, false); )
308-
DEF_BENCH( return new BitmapBench(kN32_SkColorType, kOpaque_SkAlphaType, true, true, false); )
309-
DEF_BENCH( return new BitmapBench(kN32_SkColorType, kOpaque_SkAlphaType, true, false, false); )
296+
DEF_BENCH( return new BitmapBench(kN32_SkColorType, kPremul_SkAlphaType, false, false); )
297+
DEF_BENCH( return new BitmapBench(kN32_SkColorType, kOpaque_SkAlphaType, false, false); )
298+
DEF_BENCH( return new BitmapBench(kN32_SkColorType, kOpaque_SkAlphaType, false, true); )
299+
DEF_BENCH( return new BitmapBench(kRGB_565_SkColorType, kOpaque_SkAlphaType, false, false); )
300+
DEF_BENCH( return new BitmapBench(kN32_SkColorType, kOpaque_SkAlphaType, true, false); )
301+
DEF_BENCH( return new BitmapBench(kN32_SkColorType, kOpaque_SkAlphaType, true, false); )
310302

311303
// scale filter -> S32_opaque_D32_filter_DX_{SSE2,SSSE3} and Fact9 is also for S32_D16_filter_DX_SSE2
312-
DEF_BENCH( return new FilterBitmapBench(kN32_SkColorType, kPremul_SkAlphaType, false, false, kScale_Flag | kBilerp_Flag); )
313-
DEF_BENCH( return new FilterBitmapBench(kN32_SkColorType, kOpaque_SkAlphaType, false, false, kScale_Flag | kBilerp_Flag); )
314-
DEF_BENCH( return new FilterBitmapBench(kN32_SkColorType, kOpaque_SkAlphaType, true, true, kScale_Flag | kBilerp_Flag); )
315-
DEF_BENCH( return new FilterBitmapBench(kN32_SkColorType, kOpaque_SkAlphaType, true, false, kScale_Flag | kBilerp_Flag); )
304+
DEF_BENCH( return new FilterBitmapBench(kN32_SkColorType, kPremul_SkAlphaType, false, kScale_Flag | kBilerp_Flag); )
305+
DEF_BENCH( return new FilterBitmapBench(kN32_SkColorType, kOpaque_SkAlphaType, false, kScale_Flag | kBilerp_Flag); )
306+
DEF_BENCH( return new FilterBitmapBench(kN32_SkColorType, kOpaque_SkAlphaType, true, kScale_Flag | kBilerp_Flag); )
307+
DEF_BENCH( return new FilterBitmapBench(kN32_SkColorType, kOpaque_SkAlphaType, true, kScale_Flag | kBilerp_Flag); )
316308

317309
// The following two cases test the performance regression of b/70172912 .
318-
DEF_BENCH( return new FilterBitmapBench(kRGB_565_SkColorType, kOpaque_SkAlphaType, false, false, kScale_Flag | kBilerp_Flag); )
319-
DEF_BENCH( return new BitmapBench(kRGB_565_SkColorType, kOpaque_SkAlphaType, false, false, true); )
310+
DEF_BENCH( return new FilterBitmapBench(kRGB_565_SkColorType, kOpaque_SkAlphaType, false, kScale_Flag | kBilerp_Flag); )
311+
DEF_BENCH( return new BitmapBench(kRGB_565_SkColorType, kOpaque_SkAlphaType, false, true); )
320312

321313
// scale rotate filter -> S32_opaque_D32_filter_DXDY_{SSE2,SSSE3}
322-
DEF_BENCH( return new FilterBitmapBench(kN32_SkColorType, kPremul_SkAlphaType, false, false, kScale_Flag | kRotate_Flag | kBilerp_Flag); )
323-
DEF_BENCH( return new FilterBitmapBench(kN32_SkColorType, kOpaque_SkAlphaType, false, false, kScale_Flag | kRotate_Flag | kBilerp_Flag); )
324-
DEF_BENCH( return new FilterBitmapBench(kN32_SkColorType, kOpaque_SkAlphaType, true, true, kScale_Flag | kRotate_Flag | kBilerp_Flag); )
325-
DEF_BENCH( return new FilterBitmapBench(kN32_SkColorType, kOpaque_SkAlphaType, true, false, kScale_Flag | kRotate_Flag | kBilerp_Flag); )
314+
DEF_BENCH( return new FilterBitmapBench(kN32_SkColorType, kPremul_SkAlphaType, false, kScale_Flag | kRotate_Flag | kBilerp_Flag); )
315+
DEF_BENCH( return new FilterBitmapBench(kN32_SkColorType, kOpaque_SkAlphaType, false, kScale_Flag | kRotate_Flag | kBilerp_Flag); )
316+
DEF_BENCH( return new FilterBitmapBench(kN32_SkColorType, kOpaque_SkAlphaType, true, kScale_Flag | kRotate_Flag | kBilerp_Flag); )
317+
DEF_BENCH( return new FilterBitmapBench(kN32_SkColorType, kOpaque_SkAlphaType, true, kScale_Flag | kRotate_Flag | kBilerp_Flag); )
326318

327-
DEF_BENCH( return new FilterBitmapBench(kN32_SkColorType, kPremul_SkAlphaType, false, false, kScale_Flag | kBilerp_Flag | kBicubic_Flag); )
328-
DEF_BENCH( return new FilterBitmapBench(kN32_SkColorType, kPremul_SkAlphaType, false, false, kScale_Flag | kRotate_Flag | kBilerp_Flag | kBicubic_Flag); )
319+
DEF_BENCH( return new FilterBitmapBench(kN32_SkColorType, kPremul_SkAlphaType, false, kScale_Flag | kBilerp_Flag | kBicubic_Flag); )
320+
DEF_BENCH( return new FilterBitmapBench(kN32_SkColorType, kPremul_SkAlphaType, false, kScale_Flag | kRotate_Flag | kBilerp_Flag | kBicubic_Flag); )
329321

330322
// source alpha tests -> S32A_Opaque_BlitRow32_{arm,neon}
331323
DEF_BENCH( return new SourceAlphaBitmapBench(SourceAlphaBitmapBench::kOpaque_SourceAlpha, kN32_SkColorType); )

‎docs/examples/Bitmap_isVolatile.cpp

-17
This file was deleted.

‎docs/examples/Bitmap_setIsVolatile.cpp

-19
This file was deleted.

‎include/core/SkBitmap.h

+3
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,9 @@ class SK_API SkBitmap {
4848
public:
4949
class SK_API Allocator;
5050

51+
// temporary, waiting to update call-sites
52+
bool isVolatile() const { return false; }
53+
5154
/** Creates an empty SkBitmap without pixels, with kUnknown_SkColorType,
5255
kUnknown_SkAlphaType, and with a width and height of zero. SkPixelRef origin is
5356
set to (0, 0). SkBitmap is not volatile.

‎samplecode/SampleAAGeometry.cpp

-1
Original file line numberDiff line numberDiff line change
@@ -1315,7 +1315,6 @@ class AAGeometryView : public Sample {
13151315

13161316
static uint8_t* set_up_dist_map(const SkImageInfo& imageInfo, SkBitmap* distMap) {
13171317
distMap->setInfo(imageInfo);
1318-
// distMap->setIsVolatile(true);
13191318
SkAssertResult(distMap->tryAllocPixels());
13201319
SkASSERT((int) distMap->rowBytes() == imageInfo.width());
13211320
return distMap->getAddr8(0, 0);

‎src/core/SkPixmap.cpp

-1
Original file line numberDiff line numberDiff line change
@@ -232,7 +232,6 @@ bool SkPixmap::scalePixels(const SkPixmap& actualDst, SkFilterQuality quality) c
232232
return false;
233233
}
234234
bitmap.setImmutable(); // Don't copy when we create an image.
235-
// bitmap.setIsVolatile(true); // Disable any caching.
236235

237236
SkMatrix scale = SkMatrix::MakeRectToRect(SkRect::Make(src.bounds()),
238237
SkRect::Make(dst.bounds()),

‎src/gpu/GrBitmapTextureMaker.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ GrBitmapTextureMaker::GrBitmapTextureMaker(GrRecordingContext* context,
4646
, fBudgeted(cachePolicy == GrImageTexGenPolicy::kNew_Uncached_Unbudgeted
4747
? SkBudgeted::kNo
4848
: SkBudgeted::kYes) {
49-
if (/*!bitmap.isVolatile() && */ cachePolicy == GrImageTexGenPolicy::kDraw) {
49+
if (cachePolicy == GrImageTexGenPolicy::kDraw) {
5050
SkIPoint origin = bitmap.pixelRefOrigin();
5151
SkIRect subset = SkIRect::MakeXYWH(origin.fX, origin.fY, bitmap.width(),
5252
bitmap.height());

‎tests/BitmapCopyTest.cpp

-4
Original file line numberDiff line numberDiff line change
@@ -91,13 +91,11 @@ DEF_TEST(BitmapCopy_extractSubset, reporter) {
9191
// Extract a subset which has the same width as the original. This
9292
// catches a bug where we cloned the genID incorrectly.
9393
r.setLTRB(0, 1, W, 3);
94-
// bitmap.setIsVolatile(true);
9594
// Relies on old behavior of extractSubset failing if colortype is unknown
9695
if (kUnknown_SkColorType != bitmap.colorType() && bitmap.extractSubset(&subset, r)) {
9796
REPORTER_ASSERT(reporter, subset.width() == W);
9897
REPORTER_ASSERT(reporter, subset.height() == 2);
9998
REPORTER_ASSERT(reporter, subset.alphaType() == bitmap.alphaType());
100-
// REPORTER_ASSERT(reporter, subset.isVolatile() == true);
10199

102100
// Test copying an extracted subset.
103101
for (size_t j = 0; j < SK_ARRAY_COUNT(gPairs); j++) {
@@ -120,10 +118,8 @@ DEF_TEST(BitmapCopy_extractSubset, reporter) {
120118
}
121119

122120
bitmap = srcPremul;
123-
// bitmap.setIsVolatile(false);
124121
if (bitmap.extractSubset(&subset, r)) {
125122
REPORTER_ASSERT(reporter, subset.alphaType() == bitmap.alphaType());
126-
// REPORTER_ASSERT(reporter, subset.isVolatile() == false);
127123
}
128124
}
129125
}

‎tools/fiddle/all_examples.cpp

-2
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,6 @@
5454
#include "../../docs/examples/Bitmap_isImmutable.cpp"
5555
#include "../../docs/examples/Bitmap_isNull.cpp"
5656
#include "../../docs/examples/Bitmap_isOpaque.cpp"
57-
#include "../../docs/examples/Bitmap_isVolatile.cpp"
5857
#include "../../docs/examples/Bitmap_move_SkBitmap.cpp"
5958
#include "../../docs/examples/Bitmap_move_operator.cpp"
6059
#include "../../docs/examples/Bitmap_notifyPixelsChanged.cpp"
@@ -73,7 +72,6 @@
7372
#include "../../docs/examples/Bitmap_setAlphaType.cpp"
7473
#include "../../docs/examples/Bitmap_setImmutable.cpp"
7574
#include "../../docs/examples/Bitmap_setInfo.cpp"
76-
#include "../../docs/examples/Bitmap_setIsVolatile.cpp"
7775
#include "../../docs/examples/Bitmap_setPixelRef.cpp"
7876
#include "../../docs/examples/Bitmap_setPixels.cpp"
7977
#include "../../docs/examples/Bitmap_shiftPerPixel.cpp"

0 commit comments

Comments
 (0)