AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Revert "Use simple buffers instead of vectors"

Browse Source 
This reverts commit b188da121c.

Reason for revert: Patch on a rollback

Original change's description:
> Use simple buffers instead of vectors
> 
> Start using simple buffers, these will be used for
> multiple runs latter on.
> 
> Change-Id: I8dadbed036b7a60d708c49b84bb5e3bb3710f704
> Reviewed-on: https://skia-review.googlesource.com/140578
> Reviewed-by: Mike Klein <mtklein@google.com>
> Commit-Queue: Herb Derby <herb@google.com>

TBR=mtklein@google.com,herb@google.com

Change-Id: I51d9ad9bc0fd7efb93e5db4dc504d8dc31e7cfb4
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Reviewed-on: https://skia-review.googlesource.com/140802
Reviewed-by: Herb Derby <herb@google.com>
Commit-Queue: Herb Derby <herb@google.com>
This commit is contained in:
Herb Derby 2018-07-11 20:03:13 +00:00 committed by Skia Commit-Bot
parent 143cf8e599
commit ba38320804
5 changed files with 35 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/core/SkGlyphCache.cpp
View File

@ -131,9 +131,9 @@ const SkGlyph& SkGlyphCache::getGlyphIDMetrics(uint16_t glyphID, SkFixed x, SkFi
}
void SkGlyphCache::getAdvances(SkSpan<const SkGlyphID> glyphIDs, SkPoint advances[]) {
for (auto glyphID : glyphIDs) {
auto glyph = this->getGlyphIDAdvance(glyphID);
*advances++ = SkPoint::Make(glyph.fAdvanceX, glyph.fAdvanceY);
for (ptrdiff_t i = 0; i < glyphIDs.size(); i++) {
auto glyph = this->getGlyphIDAdvance(glyphIDs[i]);
advances[i] = SkPoint::Make(glyph.fAdvanceX, glyph.fAdvanceY);
}
}

72
src/core/SkGlyphRun.cpp
View File

@ -91,7 +91,7 @@ SkSpan<const SkGlyphID> SkGlyphIDSet::uniquifyGlyphIDs(
// If the following bzero becomes a performance problem, the memory can be marked as
// initialized for valgrind and msan.
// valgrind = VALGRIND_MAKE_MEM_DEFINED(fUniverseToUnique, universeSize * sizeof(SkGlyphID))
// msan = sk_msan_mark_initialized(fUniverseToUnique, universeSize * sizeof(SkGlyphID))
// msan = sk_msan_assert_initialized(fUniverseToUnique, universeSize * sizeof(SkGlyphID))
sk_bzero(fUniverseToUnique, universeSize * sizeof(SkGlyphID));
}
@ -166,12 +166,10 @@ SkGlyphRun* SkGlyphRunBuilder::useGlyphRun() {
void SkGlyphRunBuilder::initialize(size_t totalRunSize) {
fUniqueID = 0;
if (totalRunSize > fMaxTotalRunSize) {
fMaxTotalRunSize = totalRunSize;
fUniqueGlyphIDIndices.reset(fMaxTotalRunSize);
fPositions.reset(fMaxTotalRunSize);
fUniqueGlyphIDs.reset(fMaxTotalRunSize);
}
// Using resize is temporary until simpler buffers are in place.
fDenseIndex.resize(totalRunSize);
fPositions.resize(totalRunSize);
fUniqueGlyphIDs.resize(totalRunSize);
// Be sure to clean up the last run before we reuse it.
fScratchGlyphRun.~SkGlyphRun();
@ -205,7 +203,7 @@ SkSpan<const SkGlyphID> SkGlyphRunBuilder::addDenseAndUnique(
auto typeface = SkPaintPriv::GetTypefaceOrDefault(paint);
auto glyphUniverseSize = typeface->countGlyphs();
uniquifiedGlyphIDs = fGlyphIDSet.uniquifyGlyphIDs(
glyphUniverseSize, glyphIDs, fUniqueGlyphIDs, fUniqueGlyphIDIndices);
glyphUniverseSize, glyphIDs, fUniqueGlyphIDs.data(), fDenseIndex.data());
}
return uniquifiedGlyphIDs;
@ -215,23 +213,21 @@ void SkGlyphRunBuilder::makeGlyphRun(
const SkPaint& runPaint,
SkSpan<const SkGlyphID> glyphIDs,
SkSpan<const SkPoint> positions,
SkSpan<const uint16_t> uniqueGlyphIDIndices,
SkSpan<const SkGlyphID> uniqueGlyphIDs,
SkSpan<const char> text,
SkSpan<const uint32_t> clusters) {
// Ignore empty runs.
if (!glyphIDs.empty()) {
if (!fDenseIndex.empty()) {
SkPaint glyphRunPaint{runPaint};
glyphRunPaint.setTextEncoding(SkPaint::kGlyphID_TextEncoding);
glyphRunPaint.setTextAlign(SkPaint::kLeft_Align);
new ((void*)&fScratchGlyphRun) SkGlyphRun{
std::move(glyphRunPaint),
uniqueGlyphIDIndices,
SkSpan<const uint16_t>{fDenseIndex},
positions,
glyphIDs,
uniqueGlyphIDs,
SkSpan<const SkGlyphID>{fUniqueGlyphIDs},
text,
clusters
};
@ -242,11 +238,9 @@ void SkGlyphRunBuilder::drawText(
const SkPaint& paint, SkSpan<const SkGlyphID> glyphIDs, SkPoint origin,
SkSpan<const char> text, SkSpan<const uint32_t> clusters) {
auto runSize = glyphIDs.size();
auto unqiueGlyphIDs = this->addDenseAndUnique(paint, glyphIDs);
fScratchAdvances.resize(runSize);
fScratchAdvances.resize(fUniqueGlyphIDs.size());
{
auto cache = SkStrikeCache::FindOrCreateStrikeExclusive(paint);
cache->getAdvances(unqiueGlyphIDs, fScratchAdvances.data());
@ -254,9 +248,9 @@ void SkGlyphRunBuilder::drawText(
SkPoint endOfLastGlyph = origin;
for (size_t i = 0; i < runSize; i++) {
for (size_t i = 0; i < fDenseIndex.size(); i++) {
fPositions[i] = endOfLastGlyph;
endOfLastGlyph += fScratchAdvances[fUniqueGlyphIDIndices[i]];
endOfLastGlyph += fScratchAdvances[fDenseIndex[i]];
}
if (paint.getTextAlign() != SkPaint::kLeft_Align) {
@ -264,64 +258,44 @@ void SkGlyphRunBuilder::drawText(
if (paint.getTextAlign() == SkPaint::kCenter_Align) {
len.scale(SK_ScalarHalf);
}
for (auto& pt : SkSpan<SkPoint>{fPositions, runSize}) {
pt -= len;
for (size_t i = 0; i < fDenseIndex.size(); i++) {
fPositions[i] -= len;
}
}
this->makeGlyphRun(
paint,
glyphIDs,
SkSpan<const SkPoint>{fPositions, runSize},
SkSpan<const uint16_t>{fUniqueGlyphIDIndices, runSize},
unqiueGlyphIDs,
text,
clusters);
this->makeGlyphRun(paint, glyphIDs, SkSpan<const SkPoint>{fPositions}, text, clusters);
}
void SkGlyphRunBuilder::drawPosTextH(const SkPaint& paint, SkSpan<const SkGlyphID> glyphIDs,
const SkScalar* xpos, SkScalar constY,
SkSpan<const char> text, SkSpan<const uint32_t> clusters) {
auto runSize = glyphIDs.size();
// The dense indices are not used by the rest of the stack yet.
#ifdef SK_DEBUG
this->addDenseAndUnique(paint, glyphIDs);
#endif
auto posCursor = fPositions.get();
for (auto x : SkSpan<const SkScalar>{xpos, runSize}) {
*posCursor++ = SkPoint::Make(x, constY);
for (size_t i = 0; i < fDenseIndex.size(); i++) {
fPositions[i] = SkPoint::Make(xpos[i], constY);
}
this->makeGlyphRun(
paint,
glyphIDs,
SkSpan<const SkPoint>{fPositions, runSize},
SkSpan<const uint16_t>{},
SkSpan<const SkGlyphID>{},
text,
clusters);
this->makeGlyphRun(paint, glyphIDs, SkSpan<const SkPoint>{fPositions}, text, clusters);
}
void SkGlyphRunBuilder::drawPosText(const SkPaint& paint, SkSpan<const SkGlyphID> glyphIDs,
const SkPoint* pos,
SkSpan<const char> text, SkSpan<const uint32_t> clusters) {
auto runSize = glyphIDs.size();
// The dense indices are not used by the rest of the stack yet.
#ifdef SK_DEBUG
this->addDenseAndUnique(paint, glyphIDs);
#endif
this->makeGlyphRun(
paint,
glyphIDs,
SkSpan<const SkPoint>{pos, runSize},
SkSpan<const uint16_t>{},
SkSpan<const SkGlyphID>{},
text,
clusters);
for (size_t i = 0; i < fDenseIndex.size(); i++) {
fPositions[i] = pos[i];
}
this->makeGlyphRun(paint, glyphIDs, SkSpan<const SkPoint>{fPositions}, text, clusters);
}

19
src/core/SkGlyphRun.h
View File

@ -24,23 +24,23 @@ template <typename T>
class SkSpan {
public:
SkSpan() : fPtr{nullptr}, fSize{0} {}
SkSpan(T* ptr, size_t size) : fPtr{ptr}, fSize{size} { }
SkSpan(T* ptr, ptrdiff_t size) : fPtr{ptr}, fSize{size} { SkASSERT(size >= 0); }
template <typename U>
explicit SkSpan(std::vector<U>& v) : fPtr{v.data()}, fSize{v.size()} {}
explicit SkSpan(std::vector<U>& v) : fPtr{v.data()}, fSize{SkTo<ptrdiff_t>(v.size())} {}
SkSpan(const SkSpan<T>& o) = default;
SkSpan& operator=( const SkSpan& other ) = default;
T& operator [] (size_t i) const { return fPtr[i]; }
T& operator [] (ptrdiff_t i) const { return fPtr[i]; }
T* begin() const { return fPtr; }
T* end() const { return fPtr + fSize; }
const T* cbegin() const { return fPtr; }
const T* cend() const { return fPtr + fSize; }
T* data() const { return fPtr; }
size_t size() const { return fSize; }
ptrdiff_t size() const { return fSize; }
bool empty() const { return fSize == 0; }
private:
T* fPtr;
size_t fSize;
ptrdiff_t fSize;
};
class SkGlyphRun {
@ -120,8 +120,6 @@ private:
const SkPaint& runPaint,
SkSpan<const SkGlyphID> glyphIDs,
SkSpan<const SkPoint> positions,
SkSpan<const uint16_t> uniqueGlyphIDIndices,
SkSpan<const SkGlyphID> uniqueGlyphIDs,
SkSpan<const char> text,
SkSpan<const uint32_t> clusters);
@ -138,10 +136,9 @@ private:
uint64_t fUniqueID{0};
size_t fMaxTotalRunSize{0};
SkAutoTMalloc<uint16_t> fUniqueGlyphIDIndices;
SkAutoTMalloc<SkPoint> fPositions;
SkAutoTMalloc<SkGlyphID> fUniqueGlyphIDs;
std::vector<uint16_t> fDenseIndex;
std::vector<SkPoint> fPositions;
std::vector<SkGlyphID> fUniqueGlyphIDs;
// Used as a temporary for preparing using utfN text. This implies that only one run of
// glyph ids will ever be needed because blobs are already glyph based.

1
src/core/SkStrikeCache.cpp
View File

@ -12,7 +12,6 @@
#include "SkGlyphCache.h"
#include "SkGraphics.h"
#include "SkMutex.h"
#include "SkTemplates.h"
#include "SkTraceMemoryDump.h"
#include "SkTypeface.h"
#include "SkPaintPriv.h"

2
tests/GlyphRunTest.cpp
View File

@ -24,7 +24,7 @@ DEF_TEST(GlyphRunGlyphIDSetBasic, reporter) {
std::vector<SkGlyphID> test{uniqueGlyphIDs.begin(), uniqueGlyphIDs.end()};
std::sort(test.begin(), test.end());
auto newEnd = std::unique(test.begin(), test.end());
REPORTER_ASSERT(reporter, uniqueGlyphIDs.size() == (size_t)(newEnd - test.begin()));
REPORTER_ASSERT(reporter, uniqueGlyphIDs.size() == newEnd - test.begin());
REPORTER_ASSERT(reporter, uniqueGlyphIDs.size() == 4);
{
uint16_t answer[] = {0, 1, 2, 1, 3};