f2950b1c45
SkRecord performance is not sensitive to these values, so we can cut some storage. This rearranges the space-remaining logic to use a count of bytes left rather than a pointer to the end, cutting memory usage a little more. An SkVarAlloc used to weigh 20 or 32 bytes which now becomes 16 or 24. I think if I think about it a bit more I can trim off that Block* too, getting us to 12 or 16 bytes. Because we now just always grow by doubling, this CL switches from storing fSmallest to its log base 2. This has the nice effect of never having to worry about it overflowing, and means we can probably squeeze it down into a byte if we want, even 6 bits. BUG=skia: Committed: https://skia.googlesource.com/skia/+/bc415389855888af5a1282ca4b6bee30afa3d69d CQ_EXTRA_TRYBOTS=client.skia:Test-Ubuntu12-ShuttleA-GTX660-x86-Debug-Trybot Review URL: https://codereview.chromium.org/721313002
100 lines
2.5 KiB
C++
100 lines
2.5 KiB
C++
/*
|
|
* Copyright 2014 Google Inc.
|
|
*
|
|
* Use of this source code is governed by a BSD-style license that can be
|
|
* found in the LICENSE file.
|
|
*/
|
|
|
|
#include "Test.h"
|
|
|
|
#include "SkBitmap.h"
|
|
#include "SkImageInfo.h"
|
|
#include "SkShader.h"
|
|
#include "SkRecord.h"
|
|
#include "SkRecords.h"
|
|
|
|
// Sums the area of any DrawRect command it sees.
|
|
class AreaSummer {
|
|
public:
|
|
AreaSummer() : fArea(0) {}
|
|
|
|
template <typename T> void operator()(const T&) { }
|
|
|
|
void operator()(const SkRecords::DrawRect& draw) {
|
|
fArea += (int)(draw.rect.width() * draw.rect.height());
|
|
}
|
|
|
|
int area() const { return fArea; }
|
|
|
|
void apply(const SkRecord& record) {
|
|
for (unsigned i = 0; i < record.count(); i++) {
|
|
record.visit<void>(i, *this);
|
|
}
|
|
}
|
|
|
|
private:
|
|
int fArea;
|
|
};
|
|
|
|
// Scales out the bottom-right corner of any DrawRect command it sees by 2x.
|
|
struct Stretch {
|
|
template <typename T> void operator()(T*) {}
|
|
void operator()(SkRecords::DrawRect* draw) {
|
|
draw->rect.fRight *= 2;
|
|
draw->rect.fBottom *= 2;
|
|
}
|
|
|
|
void apply(SkRecord* record) {
|
|
for (unsigned i = 0; i < record->count(); i++) {
|
|
record->mutate<void>(i, *this);
|
|
}
|
|
}
|
|
};
|
|
|
|
#define APPEND(record, type, ...) SkNEW_PLACEMENT_ARGS(record.append<type>(), type, (__VA_ARGS__))
|
|
|
|
// Basic tests for the low-level SkRecord code.
|
|
DEF_TEST(Record, r) {
|
|
SkRecord record;
|
|
|
|
// Add a simple DrawRect command.
|
|
SkRect rect = SkRect::MakeWH(10, 10);
|
|
SkPaint paint;
|
|
APPEND(record, SkRecords::DrawRect, paint, rect);
|
|
|
|
// Its area should be 100.
|
|
AreaSummer summer;
|
|
summer.apply(record);
|
|
REPORTER_ASSERT(r, summer.area() == 100);
|
|
|
|
// Scale 2x.
|
|
Stretch stretch;
|
|
stretch.apply(&record);
|
|
|
|
// Now its area should be 100 + 400.
|
|
summer.apply(record);
|
|
REPORTER_ASSERT(r, summer.area() == 500);
|
|
}
|
|
|
|
#undef APPEND
|
|
|
|
template <typename T>
|
|
static bool is_aligned(const T* p) {
|
|
return (((uintptr_t)p) & (sizeof(T) - 1)) == 0;
|
|
}
|
|
|
|
DEF_TEST(Record_Alignment, r) {
|
|
SkRecord record;
|
|
REPORTER_ASSERT(r, is_aligned(record.alloc<uint8_t>()));
|
|
REPORTER_ASSERT(r, is_aligned(record.alloc<uint16_t>()));
|
|
REPORTER_ASSERT(r, is_aligned(record.alloc<uint32_t>()));
|
|
REPORTER_ASSERT(r, is_aligned(record.alloc<void*>()));
|
|
|
|
// It's not clear if we care that 8-byte values are aligned on 32-bit machines.
|
|
if (sizeof(void*) == 8) {
|
|
REPORTER_ASSERT(r, is_aligned(record.alloc<double>()));
|
|
REPORTER_ASSERT(r, is_aligned(record.alloc<uint64_t>()));
|
|
}
|
|
}
|
|
|