a5b0b1eb5b
This reverts commit4dd7c1dae1
. Reason for revert: largeovals GM is busted on some configs (Mali400MP2, Adreno405, ANGLE, e.g.) Original change's description: > Reland "Fix blurry edges on large ovals." > > This is a reland ofc7aed036c3
> > Changes the precision for the GrOvalOpFactory shaders to be float rather than half. > In the medium-precision case, adds a scale factor to the shaders to ensure that the > denominator of the distance calculation stays within range. If enough precision isn't > available, falls back to a path renderer. > > Original change's description: > > Fix blurry edges on large ovals. > > > > Changes the precision for the GrOvalOpFactory shaders to be float rather than half. In the > > low-precision case, it falls back to a path renderer for large ovals. > > > > Bug: b/110380864, skia:8873 > > Change-Id: I89e8dd067a2e0cab35b1bb515adaab4a2fb4f222 > > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/201615 > > Commit-Queue: Jim Van Verth <jvanverth@google.com> > > Reviewed-by: Brian Salomon <bsalomon@google.com> > > Bug: b/110380864, skia:8873 > Change-Id: Ic72d819f589ffebf9c5250bb4df4de22ab23f282 > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/202718 > Reviewed-by: Brian Osman <brianosman@google.com> > Reviewed-by: Brian Salomon <bsalomon@google.com> > Commit-Queue: Jim Van Verth <jvanverth@google.com> TBR=jvanverth@google.com,bsalomon@google.com,brianosman@google.com Change-Id: I3467da7e71a0f0dae4349f0f003b55c7db7dbb1d No-Presubmit: true No-Tree-Checks: true No-Try: true Bug: b/110380864, skia:8873 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/203174 Reviewed-by: Jim Van Verth <jvanverth@google.com> Commit-Queue: Jim Van Verth <jvanverth@google.com>
176 lines
5.7 KiB
C++
176 lines
5.7 KiB
C++
/*
|
|
* Copyright 2013 Google Inc.
|
|
*
|
|
* Use of this source code is governed by a BSD-style license that can be
|
|
* found in the LICENSE file.
|
|
*/
|
|
|
|
#include "gm.h"
|
|
#include "SkCanvas.h"
|
|
#include "SkPath.h"
|
|
#include "SkTArray.h"
|
|
|
|
class ConicPathsGM : public skiagm::GM {
|
|
protected:
|
|
|
|
SkString onShortName() override {
|
|
return SkString("conicpaths");
|
|
}
|
|
|
|
SkISize onISize() override {
|
|
return SkISize::Make(920, 960);
|
|
}
|
|
|
|
void onOnceBeforeDraw() override {
|
|
{
|
|
const SkScalar w = SkScalarSqrt(2)/2;
|
|
SkPath* conicCirlce = &fPaths.push_back();
|
|
conicCirlce->moveTo(0, 0);
|
|
conicCirlce->conicTo(0, 50, 50, 50, w);
|
|
conicCirlce->rConicTo(50, 0, 50, -50, w);
|
|
conicCirlce->rConicTo(0, -50, -50, -50, w);
|
|
conicCirlce->rConicTo(-50, 0, -50, 50, w);
|
|
|
|
}
|
|
{
|
|
SkPath* hyperbola = &fPaths.push_back();
|
|
hyperbola->moveTo(0, 0);
|
|
hyperbola->conicTo(0, 100, 100, 100, 2);
|
|
}
|
|
{
|
|
SkPath* thinHyperbola = &fPaths.push_back();
|
|
thinHyperbola->moveTo(0, 0);
|
|
thinHyperbola->conicTo(100, 100, 5, 0, 2);
|
|
}
|
|
{
|
|
SkPath* veryThinHyperbola = &fPaths.push_back();
|
|
veryThinHyperbola->moveTo(0, 0);
|
|
veryThinHyperbola->conicTo(100, 100, 1, 0, 2);
|
|
}
|
|
{
|
|
SkPath* closedHyperbola = &fPaths.push_back();
|
|
closedHyperbola->moveTo(0, 0);
|
|
closedHyperbola->conicTo(100, 100, 0, 0, 2);
|
|
}
|
|
{
|
|
// using 1 as weight defaults to using quadTo
|
|
SkPath* nearParabola = &fPaths.push_back();
|
|
nearParabola->moveTo(0, 0);
|
|
nearParabola->conicTo(0, 100, 100, 100, 0.999f);
|
|
}
|
|
{
|
|
SkPath* thinEllipse = &fPaths.push_back();
|
|
thinEllipse->moveTo(0, 0);
|
|
thinEllipse->conicTo(100, 100, 5, 0, SK_ScalarHalf);
|
|
}
|
|
{
|
|
SkPath* veryThinEllipse = &fPaths.push_back();
|
|
veryThinEllipse->moveTo(0, 0);
|
|
veryThinEllipse->conicTo(100, 100, 1, 0, SK_ScalarHalf);
|
|
}
|
|
{
|
|
SkPath* closedEllipse = &fPaths.push_back();
|
|
closedEllipse->moveTo(0, 0);
|
|
closedEllipse->conicTo(100, 100, 0, 0, SK_ScalarHalf);
|
|
}
|
|
{
|
|
const SkScalar w = SkScalarSqrt(2)/2;
|
|
fGiantCircle.moveTo(2.1e+11f, -1.05e+11f);
|
|
fGiantCircle.conicTo(2.1e+11f, 0, 1.05e+11f, 0, w);
|
|
fGiantCircle.conicTo(0, 0, 0, -1.05e+11f, w);
|
|
fGiantCircle.conicTo(0, -2.1e+11f, 1.05e+11f, -2.1e+11f, w);
|
|
fGiantCircle.conicTo(2.1e+11f, -2.1e+11f, 2.1e+11f, -1.05e+11f, w);
|
|
|
|
}
|
|
}
|
|
|
|
void drawGiantCircle(SkCanvas* canvas) {
|
|
SkPaint paint;
|
|
canvas->drawPath(fGiantCircle, paint);
|
|
}
|
|
|
|
void onDraw(SkCanvas* canvas) override {
|
|
const SkAlpha kAlphaValue[] = { 0xFF, 0x40 };
|
|
|
|
const SkScalar margin = 15;
|
|
canvas->translate(margin, margin);
|
|
|
|
SkPaint paint;
|
|
for (int p = 0; p < fPaths.count(); ++p) {
|
|
canvas->save();
|
|
for (size_t a = 0; a < SK_ARRAY_COUNT(kAlphaValue); ++a) {
|
|
paint.setARGB(kAlphaValue[a], 0, 0, 0);
|
|
for (int aa = 0; aa < 2; ++aa) {
|
|
paint.setAntiAlias(SkToBool(aa));
|
|
for (int fh = 0; fh < 2; ++fh) {
|
|
paint.setStyle(fh ? SkPaint::kStroke_Style : SkPaint::kFill_Style);
|
|
|
|
const SkRect& bounds = fPaths[p].getBounds();
|
|
canvas->save();
|
|
canvas->translate(-bounds.fLeft, -bounds.fTop);
|
|
canvas->drawPath(fPaths[p], paint);
|
|
canvas->restore();
|
|
|
|
canvas->translate(110, 0);
|
|
}
|
|
}
|
|
}
|
|
canvas->restore();
|
|
canvas->translate(0, 110);
|
|
}
|
|
canvas->restore();
|
|
|
|
this->drawGiantCircle(canvas);
|
|
}
|
|
|
|
private:
|
|
SkTArray<SkPath> fPaths;
|
|
SkPath fGiantCircle;
|
|
typedef skiagm::GM INHERITED;
|
|
};
|
|
DEF_GM(return new ConicPathsGM;)
|
|
|
|
//////////////////////////////////////////////////////////////////////////////
|
|
|
|
/* arc should be on top of circle */
|
|
DEF_SIMPLE_GM(arccirclegap, canvas, 250, 250) {
|
|
canvas->translate(50, 100);
|
|
SkPoint c = { 1052.5390625f, 506.8760978034711f };
|
|
SkScalar radius = 1096.702150363923f;
|
|
SkPaint paint;
|
|
paint.setAntiAlias(true);
|
|
paint.setStyle(SkPaint::kStroke_Style);
|
|
canvas->drawCircle(c, radius, paint);
|
|
SkPath path;
|
|
path.moveTo(288.88884710654133f, -280.26680862609f);
|
|
path.arcTo(0, 0, -39.00216443306411f, 400.6058925796476f, radius);
|
|
paint.setColor(0xff007f00);
|
|
canvas->drawPath(path, paint);
|
|
}
|
|
|
|
/* circle should be antialiased */
|
|
DEF_SIMPLE_GM(largecircle, canvas, 250, 250) {
|
|
canvas->translate(50, 100);
|
|
SkPoint c = { 1052.5390625f, 506.8760978034711f };
|
|
SkScalar radius = 1096.702150363923f;
|
|
SkPaint paint;
|
|
paint.setAntiAlias(true);
|
|
paint.setStyle(SkPaint::kStroke_Style);
|
|
canvas->drawCircle(c, radius, paint);
|
|
}
|
|
|
|
DEF_SIMPLE_GM(crbug_640176, canvas, 250, 250) {
|
|
SkPath path;
|
|
path.moveTo(SkBits2Float(0x00000000), SkBits2Float(0x00000000)); // 0, 0
|
|
path.lineTo(SkBits2Float(0x42cfd89a), SkBits2Float(0xc2700000)); // 103.923f, -60
|
|
path.lineTo(SkBits2Float(0x42cfd899), SkBits2Float(0xc2700006)); // 103.923f, -60
|
|
path.conicTo(SkBits2Float(0x42f00000), SkBits2Float(0xc2009d9c),
|
|
SkBits2Float(0x42f00001), SkBits2Float(0x00000000),
|
|
SkBits2Float(0x3f7746ea)); // 120, -32.1539f, 120, 0, 0.965926f
|
|
|
|
SkPaint paint;
|
|
paint.setAntiAlias(true);
|
|
canvas->translate(125, 125);
|
|
canvas->drawPath(path, paint);
|
|
}
|