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

On gpu, use max(r,g,b) for coverage alpha in LCD and update lcd blend gm.

Browse Source 
BUG=skia:

Review URL: https://codereview.chromium.org/1339213004
This commit is contained in:
egdaniel 2015-09-15 13:13:50 -07:00 committed by Commit bot
parent fb1e2fc8aa
commit 27b6335c71
4 changed files with 45 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
gm/lcdblendmodes.cpp
View File

@ -13,6 +13,7 @@
#include "gm.h" #include "gm.h"
#include "SkCanvas.h" #include "SkCanvas.h"
#include "SkGradientShader.h" #include "SkGradientShader.h"
#include "SkSurface.h"
namespace skiagm { namespace skiagm {
@ -43,21 +44,44 @@ public:
protected: protected:
SkString onShortName() override { SkString onShortName() override {
SkString name("lcdblendmodes"); return SkString("lcdblendmodes");
name.append(sk_tool_utils::major_platform_os_name()); }
return name;
void onOnceBeforeDraw() override {
fCheckerboard.reset(sk_tool_utils::create_checkerboard_shader(SK_ColorBLACK,
SK_ColorWHITE,
4));
} }
SkISize onISize() override { return SkISize::Make(kWidth, kHeight); } SkISize onISize() override { return SkISize::Make(kWidth, kHeight); }
void onDraw(SkCanvas* canvas) override { void onDraw(SkCanvas* canvas) override {
this->drawColumn(canvas, SK_ColorBLACK, SK_ColorWHITE, false); SkPaint p;
canvas->translate(SkIntToScalar(kColWidth), 0); p.setAntiAlias(false);
this->drawColumn(canvas, SK_ColorWHITE, SK_ColorBLACK, false); p.setStyle(SkPaint::kFill_Style);
canvas->translate(SkIntToScalar(kColWidth), 0); p.setShader(fCheckerboard);
this->drawColumn(canvas, SK_ColorGREEN, SK_ColorMAGENTA, false); SkRect r = SkRect::MakeWH(SkIntToScalar(kWidth), SkIntToScalar(kHeight));
canvas->translate(SkIntToScalar(kColWidth), 0); canvas->drawRect(r, p);
this->drawColumn(canvas, SK_ColorCYAN, SK_ColorMAGENTA, true);
SkImageInfo info = SkImageInfo::MakeN32Premul(kWidth, kHeight);
SkAutoTUnref<SkSurface> surface(canvas->newSurface(info));
if (nullptr == surface) {
surface.reset(SkSurface::NewRaster(info));
}
SkCanvas* surfCanvas = surface->getCanvas();
this->drawColumn(surfCanvas, SK_ColorBLACK, SK_ColorWHITE, false);
surfCanvas->translate(SkIntToScalar(kColWidth), 0);
this->drawColumn(surfCanvas, SK_ColorWHITE, SK_ColorBLACK, false);
surfCanvas->translate(SkIntToScalar(kColWidth), 0);
this->drawColumn(surfCanvas, SK_ColorGREEN, SK_ColorMAGENTA, false);
surfCanvas->translate(SkIntToScalar(kColWidth), 0);
this->drawColumn(surfCanvas, SK_ColorCYAN, SK_ColorMAGENTA, true);
SkPaint surfPaint;
SkAutoTUnref<SkXfermode> xfermode(SkXfermode::Create(SkXfermode::kSrcOver_Mode));
surfPaint.setXfermode(xfermode);
surface->draw(canvas, 0, 0, &surfPaint);
} }
void drawColumn(SkCanvas* canvas, SkColor backgroundColor, SkColor textColor, bool useGrad) { void drawColumn(SkCanvas* canvas, SkColor backgroundColor, SkColor textColor, bool useGrad) {
@ -124,6 +148,7 @@ protected:
private: private:
SkScalar fTextHeight; SkScalar fTextHeight;
SkAutoTUnref<SkShader> fCheckerboard;
typedef skiagm::GM INHERITED; typedef skiagm::GM INHERITED;
}; };

4
src/gpu/GrTextContext.cpp
View File

@ -79,11 +79,9 @@ void GrTextContext::drawPosText(GrDrawContext* dc, GrRenderTarget* rt,
} }
bool GrTextContext::ShouldDisableLCD(const SkPaint& paint) { bool GrTextContext::ShouldDisableLCD(const SkPaint& paint) {
if (paint.getShader() || if (!SkXfermode::AsMode(paint.getXfermode(), nullptr) ||
!SkXfermode::AsMode(paint.getXfermode(), nullptr) ||
paint.getMaskFilter() || paint.getMaskFilter() ||
paint.getRasterizer() || paint.getRasterizer() ||
paint.getColorFilter() ||
paint.getPathEffect() || paint.getPathEffect() ||
paint.isFakeBoldText() || paint.isFakeBoldText() ||
paint.getStyle() != SkPaint::kFill_Style) paint.getStyle() != SkPaint::kFill_Style)

6
src/gpu/effects/GrBitmapTextGeoProc.cpp
View File

@ -69,6 +69,12 @@ public:
fsBuilder->codeAppendf("%s = ", args.fOutputCoverage); fsBuilder->codeAppendf("%s = ", args.fOutputCoverage);
fsBuilder->appendTextureLookup(args.fSamplers[0], v.fsIn(), kVec2f_GrSLType); fsBuilder->appendTextureLookup(args.fSamplers[0], v.fsIn(), kVec2f_GrSLType);
fsBuilder->codeAppend(";"); fsBuilder->codeAppend(";");
if (cte.maskFormat() == kA565_GrMaskFormat) {
// set alpha to be max of rgb coverage
fsBuilder->codeAppendf("%s.a = max(max(%s.r, %s.g), %s.b);",
args.fOutputCoverage, args.fOutputCoverage,
args.fOutputCoverage, args.fOutputCoverage);
}
} }
} }

4
src/gpu/effects/GrDistanceFieldGeoProc.cpp
View File

@ -633,8 +633,10 @@ public:
fsBuilder->codeAppend( fsBuilder->codeAppend(
"vec4 val = vec4(smoothstep(vec3(-afwidth), vec3(afwidth), distance), 1.0);"); "vec4 val = vec4(smoothstep(vec3(-afwidth), vec3(afwidth), distance), 1.0);");
// set alpha to be max of rgb coverage
fsBuilder->codeAppend("val.a = max(max(val.r, val.g), val.b);");
fsBuilder->codeAppendf("%s = vec4(val);", args.fOutputCoverage); fsBuilder->codeAppendf("%s = val;", args.fOutputCoverage);
} }
void setData(const GrGLProgramDataManager& pdman, void setData(const GrGLProgramDataManager& pdman,