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

Support pixel antialising in DirectWrite.

Browse Source 
DirectWrite2 supports pixel antialiasing and rendering without hinting.

BUG=skia:5416
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2065833002

TBR=reed
Will move SkTScopedComPtr into src.

Review-Url: https://codereview.chromium.org/2065833002
This commit is contained in:
bungeman 2016-06-16 10:42:23 -07:00 committed by Commit bot
parent c7027ab03f
commit bd770d6195
6 changed files with 152 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
include/utils/win/SkTScopedComPtr.h
View File

@ -37,11 +37,11 @@ private:
T *fPtr;
public:
explicit SkTScopedComPtr(T *ptr = NULL) : fPtr(ptr) { }
explicit SkTScopedComPtr(T *ptr = nullptr) : fPtr(ptr) { }
~SkTScopedComPtr() {
this->reset();
}
T &operator*() const { SkASSERT(fPtr != NULL); return *fPtr; }
T &operator*() const { SkASSERT(fPtr != nullptr); return *fPtr; }
SkBlockComRef<T> *operator->() const {
return static_cast<SkBlockComRef<T>*>(fPtr);
}
@ -51,12 +51,13 @@ public:
* Must only be used on instances currently pointing to NULL,
* and only to initialize the instance.
*/
T **operator&() { SkASSERT(fPtr == NULL); return &fPtr; }
T **operator&() { SkASSERT(fPtr == nullptr); return &fPtr; }
explicit operator bool() const { return fPtr != nullptr; }
T *get() const { return fPtr; }
void reset() {
if (this->fPtr) {
this->fPtr->Release();
this->fPtr = NULL;
this->fPtr = nullptr;
}
}
@ -68,7 +69,7 @@ public:
T* release() {
T* temp = this->fPtr;
this->fPtr = NULL;
this->fPtr = nullptr;
return temp;
}
};

2
src/ports/SkFontMgr_win_dw.cpp
View File

@ -17,12 +17,12 @@
#include "SkTScopedComPtr.h"
#include "SkTypeface.h"
#include "SkTypefaceCache.h"
#include "SkTypeface_win.h"
#include "SkTypeface_win_dw.h"
#include "SkTypes.h"
#include "SkUtils.h"
#include <dwrite.h>
#if SK_HAS_DWRITE_2_H
#include <dwrite_2.h>
#endif

149
src/ports/SkScalerContext_win_dw.cpp
View File

@ -34,6 +34,14 @@
#include <dwrite.h>
#if SK_HAS_DWRITE_1_H
# include <dwrite_1.h>
#else
# pragma message("No dwrite_1.h is available, font metrics may be affected.")
#endif
#if SK_HAS_DWRITE_2_H
# include <dwrite_2.h>
#else
# pragma message("No dwrite_2.h is available, pixel antialiased glyph quality may be affected.")
#endif
/* Note:
@ -212,11 +220,9 @@ SkScalerContext_DW::SkScalerContext_DW(DWriteFontTypeface* typeface,
, fGlyphCount(-1) {
#if SK_HAS_DWRITE_2_H
fTypeface->fFactory->QueryInterface<IDWriteFactory2>(&fFactory2);
SkTScopedComPtr<IDWriteFontFace2> fontFace2;
fTypeface->fDWriteFontFace->QueryInterface<IDWriteFontFace2>(&fontFace2);
fIsColorFont = fFactory2.get() && fontFace2.get() && fontFace2->IsColorFont();
fIsColorFont = fTypeface->fFactory2 &&
fTypeface->fDWriteFontFace2 &&
fTypeface->fDWriteFontFace2->IsColorFont();
#endif
// In general, all glyphs should use CLEARTYPE_NATURAL_SYMMETRIC
@ -324,6 +330,30 @@ SkScalerContext_DW::SkScalerContext_DW(DWriteFontTypeface* typeface,
fMeasuringMode = DWRITE_MEASURING_MODE_NATURAL;
}
// DirectWrite2 allows for grayscale hinting.
#if SK_HAS_DWRITE_2_H
fAntiAliasMode = DWRITE_TEXT_ANTIALIAS_MODE_CLEARTYPE;
#ifndef SK_IGNORE_DW_GRAY_FIX
if (fTypeface->fFactory2 && fTypeface->fDWriteFontFace2 &&
!isLCD(fRec) && !(fRec.fFlags & SkScalerContext::kGenA8FromLCD_Flag))
{
// DWRITE_TEXTURE_ALIASED_1x1 is now misnamed, it must also be used with grayscale.
fTextureType = DWRITE_TEXTURE_ALIASED_1x1;
fAntiAliasMode = DWRITE_TEXT_ANTIALIAS_MODE_GRAYSCALE;
}
#endif
#endif
// DirectWrite2 allows hinting to be disabled.
#if SK_HAS_DWRITE_2_H
fGridFitMode = DWRITE_GRID_FIT_MODE_ENABLED;
if (fTypeface->fFactory2 && fTypeface->fDWriteFontFace2 &&
fRec.getHinting() == SkPaint::kNo_Hinting)
{
fGridFitMode = DWRITE_GRID_FIT_MODE_DISABLED;
}
#endif
if (this->isSubpixel()) {
fTextSizeMeasure = realTextSize;
fMeasuringMode = DWRITE_MEASURING_MODE_NATURAL;
@ -432,16 +462,31 @@ HRESULT SkScalerContext_DW::getBoundingBox(SkGlyph* glyph,
SkTScopedComPtr<IDWriteGlyphRunAnalysis> glyphRunAnalysis;
{
SkAutoExclusive l(DWriteFactoryMutex);
HRM(fTypeface->fFactory->CreateGlyphRunAnalysis(
&run,
1.0f, // pixelsPerDip,
&fXform,
renderingMode,
fMeasuringMode,
0.0f, // baselineOriginX,
0.0f, // baselineOriginY,
&glyphRunAnalysis),
"Could not create glyph run analysis.");
if (fTypeface->fFactory2) {
#if SK_HAS_DWRITE_2_H
HRNM(fTypeface->fFactory2->CreateGlyphRunAnalysis(
&run,
&fXform,
renderingMode,
fMeasuringMode,
fGridFitMode,
fAntiAliasMode,
0.0f, // baselineOriginX,
0.0f, // baselineOriginY,
&glyphRunAnalysis),
"Could not create DW2 glyph run analysis.");
#endif
} else {
HRNM(fTypeface->fFactory->CreateGlyphRunAnalysis(&run,
1.0f, // pixelsPerDip,
&fXform,
renderingMode,
fMeasuringMode,
0.0f, // baselineOriginX,
0.0f, // baselineOriginY,
&glyphRunAnalysis),
"Could not create glyph run analysis.");
}
}
{
Shared l(DWriteFactoryMutex);
@ -498,7 +543,7 @@ bool SkScalerContext_DW::getColorGlyphRun(const SkGlyph& glyph,
run.isSideways = FALSE;
run.glyphOffsets = &offset;
HRESULT hr = fFactory2->TranslateColorGlyphRun(
HRESULT hr = fTypeface->fFactory2->TranslateColorGlyphRun(
0, 0, &run, nullptr, fMeasuringMode, &fXform, 0, colorGlyph);
if (hr == DWRITE_E_NOCOLOR) {
return false;
@ -591,8 +636,6 @@ void SkScalerContext_DW::generateFontMetrics(SkPaint::FontMetrics* metrics) {
metrics->fMaxCharWidth = metrics->fXMax - metrics->fXMin;
return;
}
#else
# pragma message("No dwrite_1.h is available, font metrics may be affected.")
#endif
AutoTDWriteTable<SkOTTableHead> head(fTypeface->fDWriteFontFace.get());
@ -655,6 +698,22 @@ static void bilevel_to_bw(const uint8_t* SK_RESTRICT src, const SkGlyph& glyph)
}
}
template<bool APPLY_PREBLEND>
static void grayscale_to_a8(const uint8_t* SK_RESTRICT src, const SkGlyph& glyph,
const uint8_t* table8) {
const size_t dstRB = glyph.rowBytes();
const U16CPU width = glyph.fWidth;
uint8_t* SK_RESTRICT dst = static_cast<uint8_t*>(glyph.fImage);
for (U16CPU y = 0; y < glyph.fHeight; y++) {
for (U16CPU i = 0; i < width; i++) {
U8CPU a = *(src++);
dst[i] = sk_apply_lut_if<APPLY_PREBLEND>(a, table8);
}
dst = SkTAddOffset<uint8_t>(dst, dstRB);
}
}
template<bool APPLY_PREBLEND>
static void rgb_to_a8(const uint8_t* SK_RESTRICT src, const SkGlyph& glyph, const uint8_t* table8) {
const size_t dstRB = glyph.rowBytes();
@ -668,7 +727,7 @@ static void rgb_to_a8(const uint8_t* SK_RESTRICT src, const SkGlyph& glyph, cons
U8CPU b = *(src++);
dst[i] = sk_apply_lut_if<APPLY_PREBLEND>((r + g + b) / 3, table8);
}
dst = (uint8_t*)((char*)dst + dstRB);
dst = SkTAddOffset<uint8_t>(dst, dstRB);
}
}
@ -693,7 +752,7 @@ static void rgb_to_lcd16(const uint8_t* SK_RESTRICT src, const SkGlyph& glyph,
}
dst[i] = SkPack888ToRGB16(r, g, b);
}
dst = (uint16_t*)((char*)dst + dstRB);
dst = SkTAddOffset<uint16_t>(dst, dstRB);
}
}
@ -702,7 +761,7 @@ const void* SkScalerContext_DW::drawDWMask(const SkGlyph& glyph,
DWRITE_TEXTURE_TYPE textureType)
{
int sizeNeeded = glyph.fWidth * glyph.fHeight;
if (DWRITE_RENDERING_MODE_ALIASED != renderingMode) {
if (DWRITE_TEXTURE_CLEARTYPE_3x1 == textureType) {
sizeNeeded *= 3;
}
if (sizeNeeded > fBits.count()) {
@ -733,19 +792,33 @@ const void* SkScalerContext_DW::drawDWMask(const SkGlyph& glyph,
run.isSideways = FALSE;
run.glyphOffsets = &offset;
{
SkTScopedComPtr<IDWriteGlyphRunAnalysis> glyphRunAnalysis;
{
SkAutoExclusive l(DWriteFactoryMutex);
HRNM(fTypeface->fFactory->CreateGlyphRunAnalysis(&run,
1.0f, // pixelsPerDip,
&fXform,
renderingMode,
fMeasuringMode,
0.0f, // baselineOriginX,
0.0f, // baselineOriginY,
&glyphRunAnalysis),
"Could not create glyph run analysis.");
if (fTypeface->fFactory2) {
#if SK_HAS_DWRITE_2_H
HRNM(fTypeface->fFactory2->CreateGlyphRunAnalysis(&run,
&fXform,
renderingMode,
fMeasuringMode,
fGridFitMode,
fAntiAliasMode,
0.0f, // baselineOriginX,
0.0f, // baselineOriginY,
&glyphRunAnalysis),
"Could not create DW2 glyph run analysis.");
#endif
} else {
HRNM(fTypeface->fFactory->CreateGlyphRunAnalysis(&run,
1.0f, // pixelsPerDip,
&fXform,
renderingMode,
fMeasuringMode,
0.0f, // baselineOriginX,
0.0f, // baselineOriginY,
&glyphRunAnalysis),
"Could not create glyph run analysis.");
}
}
//NOTE: this assumes that the glyph has already been measured
//with an exact same glyph run analysis.
@ -865,10 +938,18 @@ void SkScalerContext_DW::generateImage(const SkGlyph& glyph) {
bilevel_to_bw(src, glyph);
const_cast<SkGlyph&>(glyph).fMaskFormat = SkMask::kBW_Format;
} else if (!isLCD(fRec)) {
if (fPreBlend.isApplicable()) {
rgb_to_a8<true>(src, glyph, fPreBlend.fG);
if (textureType == DWRITE_TEXTURE_ALIASED_1x1) {
if (fPreBlend.isApplicable()) {
grayscale_to_a8<true>(src, glyph, fPreBlend.fG);
} else {
grayscale_to_a8<false>(src, glyph, fPreBlend.fG);
}
} else {
rgb_to_a8<false>(src, glyph, fPreBlend.fG);
if (fPreBlend.isApplicable()) {
rgb_to_a8<true>(src, glyph, fPreBlend.fG);
} else {
rgb_to_a8<false>(src, glyph, fPreBlend.fG);
}
}
} else {
SkASSERT(SkMask::kLCD16_Format == glyph.fMaskFormat);

7
src/ports/SkScalerContext_win_dw.h
View File

@ -15,7 +15,7 @@
#include <dwrite.h>
#if SK_HAS_DWRITE_2_H
#include <dwrite_2.h>
# include <dwrite_2.h>
#endif
class SkGlyph;
@ -76,9 +76,10 @@ private:
DWRITE_TEXTURE_TYPE fTextureType;
DWRITE_MEASURING_MODE fMeasuringMode;
#if SK_HAS_DWRITE_2_H
SkTScopedComPtr<IDWriteFactory2> fFactory2;
bool fIsColorFont;
DWRITE_TEXT_ANTIALIAS_MODE fAntiAliasMode;
DWRITE_GRID_FIT_MODE fGridFitMode;
#endif
bool fIsColorFont;
};
#endif

7
src/ports/SkTypeface_win_dw.cpp
View File

@ -252,6 +252,7 @@ SkScalerContext* DWriteFontTypeface::onCreateScalerContext(const SkScalerContext
void DWriteFontTypeface::onFilterRec(SkScalerContext::Rec* rec) const {
if (rec->fFlags & SkScalerContext::kLCD_Vertical_Flag) {
rec->fMaskFormat = SkMask::kA8_Format;
rec->fFlags |= SkScalerContext::kGenA8FromLCD_Flag;
}
unsigned flagsWeDontSupport = SkScalerContext::kVertical_Flag |
@ -262,8 +263,10 @@ void DWriteFontTypeface::onFilterRec(SkScalerContext::Rec* rec) const {
rec->fFlags &= ~flagsWeDontSupport;
SkPaint::Hinting h = rec->getHinting();
// DirectWrite does not provide for hinting hints.
h = SkPaint::kSlight_Hinting;
// DirectWrite2 allows for hinting to be turned off. Force everything else to normal.
if (h != SkPaint::kNo_Hinting || !fFactory2 || !fDWriteFontFace2) {
h = SkPaint::kNormal_Hinting;
}
rec->setHinting(h);
#if defined(SK_FONT_HOST_USE_SYSTEM_SETTINGS)

21
src/ports/SkTypeface_win_dw.h
View File

@ -20,6 +20,9 @@
#if SK_HAS_DWRITE_1_H
# include <dwrite_1.h>
#endif
#if SK_HAS_DWRITE_2_H
# include <dwrite_2.h>
#endif
class SkFontDescriptor;
struct SkScalerContextRec;
@ -60,11 +63,24 @@ private:
// http://blogs.msdn.com/b/oldnewthing/archive/2004/03/26/96777.aspx
SkASSERT_RELEASE(nullptr == fDWriteFontFace1.get());
}
#endif
#if SK_HAS_DWRITE_2_H
if (!SUCCEEDED(fDWriteFontFace->QueryInterface(&fDWriteFontFace2))) {
SkASSERT_RELEASE(nullptr == fDWriteFontFace2.get());
}
if (!SUCCEEDED(fFactory->QueryInterface(&fFactory2))) {
SkASSERT_RELEASE(nullptr == fFactory2.get());
}
#endif
}
public:
SkTScopedComPtr<IDWriteFactory> fFactory;
#if SK_HAS_DWRITE_2_H
SkTScopedComPtr<IDWriteFactory2> fFactory2;
#else
const decltype(nullptr) fFactory2 = nullptr;
#endif
SkTScopedComPtr<IDWriteFontCollectionLoader> fDWriteFontCollectionLoader;
SkTScopedComPtr<IDWriteFontFileLoader> fDWriteFontFileLoader;
SkTScopedComPtr<IDWriteFontFamily> fDWriteFontFamily;
@ -73,6 +89,11 @@ public:
#if SK_HAS_DWRITE_1_H
SkTScopedComPtr<IDWriteFontFace1> fDWriteFontFace1;
#endif
#if SK_HAS_DWRITE_2_H
SkTScopedComPtr<IDWriteFontFace2> fDWriteFontFace2;
#else
const decltype(nullptr) fDWriteFontFace2 = nullptr;
#endif
static DWriteFontTypeface* Create(IDWriteFactory* factory,
IDWriteFontFace* fontFace,