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

Support wide color in GrLatticeOp

Browse Source 
Like other image drawing, paint color is only used when drawing alpha
images, so I had to add a new GM to trigger the relevant code path.
That GM previously drew wrong (clipped color) in glenarrow, and now
draws correctly (matching enarrow).

Bug: skia:
Change-Id: I12c19c2afba29d5176b3ac60ef840d849107bb17
Reviewed-on: https://skia-review.googlesource.com/c/179987
Reviewed-by: Mike Klein <mtklein@google.com>
Commit-Queue: Brian Osman <brianosman@google.com>
This commit is contained in:
Brian Osman 2018-12-26 12:16:44 -05:00 committed by Skia Commit-Bot
parent 568bec7a1d
commit 0b5370363d
2 changed files with 31 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
gm/lattice.cpp
View File

@ -337,5 +337,25 @@ private:
};
DEF_GM( return new LatticeGM2; )
// Code paths that incorporate the paint color when drawing the lattice (using an alpha image)
DEF_SIMPLE_GM_BG(lattice_alpha, canvas, 120, 120, SK_ColorWHITE) {
auto surface = sk_tool_utils::makeSurface(canvas, SkImageInfo::MakeA8(100, 100));
surface->getCanvas()->clear(0);
surface->getCanvas()->drawCircle(50, 50, 50, SkPaint());
auto image = surface->makeImageSnapshot();
int divs[] = { 20, 40, 60, 80 };
SkCanvas::Lattice lattice;
lattice.fXCount = 4;
lattice.fXDivs = divs;
lattice.fYCount = 4;
lattice.fYDivs = divs;
lattice.fRectTypes = nullptr;
lattice.fColors = nullptr;
lattice.fBounds = nullptr;
SkPaint paint;
paint.setColor(SK_ColorMAGENTA);
canvas->drawImageLattice(image.get(), lattice, SkRect::MakeWH(120, 120), &paint);
}

18
src/gpu/ops/GrLatticeOp.cpp
View File

@ -30,8 +30,10 @@ public:
static sk_sp<GrGeometryProcessor> Make(GrGpu* gpu,
const GrTextureProxy* proxy,
sk_sp<GrColorSpaceXform> csxf,
GrSamplerState::Filter filter) {
return sk_sp<GrGeometryProcessor>(new LatticeGP(gpu, proxy, std::move(csxf), filter));
GrSamplerState::Filter filter,
bool wideColor) {
return sk_sp<GrGeometryProcessor>(
new LatticeGP(gpu, proxy, std::move(csxf), filter, wideColor));
}
const char* name() const override { return "LatticeGP"; }
@ -90,7 +92,7 @@ public:
private:
LatticeGP(GrGpu* gpu, const GrTextureProxy* proxy, sk_sp<GrColorSpaceXform> csxf,
GrSamplerState::Filter filter)
GrSamplerState::Filter filter, bool wideColor)
: INHERITED(kLatticeGP_ClassID), fColorSpaceXform(std::move(csxf)) {
GrSamplerState samplerState = GrSamplerState(GrSamplerState::WrapMode::kClamp,
@ -104,7 +106,7 @@ private:
fInPosition = {"position", kFloat2_GrVertexAttribType, kFloat2_GrSLType};
fInTextureCoords = {"textureCoords", kFloat2_GrVertexAttribType, kFloat2_GrSLType};
fInTextureDomain = {"textureDomain", kFloat4_GrVertexAttribType, kFloat4_GrSLType};
fInColor = {"color", kUByte4_norm_GrVertexAttribType, kHalf4_GrSLType};
fInColor = MakeColorAttribute("color", wideColor);
this->setVertexAttributes(&fInPosition, 4);
}
@ -163,6 +165,7 @@ public:
// setup bounds
this->setTransformedBounds(patch.fDst, viewMatrix, HasAABloat::kNo, IsZeroArea::kNo);
fWideColor = !SkPMColor4fFitsInBytes(color);
}
const char* name() const override { return "NonAALatticeOp"; }
@ -204,7 +207,7 @@ public:
private:
void onPrepareDraws(Target* target) override {
GrGpu* gpu = target->resourceProvider()->priv().gpu();
auto gp = LatticeGP::Make(gpu, fProxy.get(), fColorSpaceXform, fFilter);
auto gp = LatticeGP::Make(gpu, fProxy.get(), fColorSpaceXform, fFilter, fWideColor);
if (!gp) {
SkDebugf("Couldn't create GrGeometryProcessor\n");
return;
@ -233,8 +236,7 @@ private:
for (int i = 0; i < patchCnt; i++) {
const Patch& patch = fPatches[i];
// TODO4F: Preserve float colors
GrColor patchColor = patch.fColor.toBytes_RGBA();
GrVertexColor patchColor(patch.fColor, fWideColor);
// Apply the view matrix here if it is scale-translate. Otherwise, we need to
// wait until we've created the dst rects.
@ -299,6 +301,7 @@ private:
}
fPatches.move_back_n(that->fPatches.count(), that->fPatches.begin());
fWideColor |= that->fWideColor;
return CombineResult::kMerged;
}
@ -314,6 +317,7 @@ private:
sk_sp<GrTextureProxy> fProxy;
sk_sp<GrColorSpaceXform> fColorSpaceXform;
GrSamplerState::Filter fFilter;
bool fWideColor;
typedef GrMeshDrawOp INHERITED;
};