57caa660c0
This reverts commit62563deb6b. Reason for revert: change that affected similar set of GMs reverted, relanding now that this is more easily triagable. Original change's description: > Revert "Make GPU backend triangulate rects such that they are rendered as tri strips rather than tri fans." > > This reverts commitfa2d604a7d. > > Reason for revert: <INSERT REASONING HERE> > > Original change's description: > > Make GPU backend triangulate rects such that they are rendered as tri strips rather than tri fans. > > > > Right now when we turn rects into quads we use a vertex order compatible with a tri fan rather than a tri strip. > > > > I wanted it to be the case that the same code could be used to generate a non-indexed mesh for a single rect or indexed using the quad index buffer when batching. Triangle fanning is not available in all APIS (e.g. is emulated in ANGLE and not supported in Metal) so it seems better to use a triangle strip over a fan in the single rect case. > > > > > > Change-Id: I31eebd794e7328f4b39e3ec3377bf2ec556360ca > > Reviewed-on: https://skia-review.googlesource.com/60081 > > Commit-Queue: Brian Salomon <bsalomon@google.com> > > Reviewed-by: Robert Phillips <robertphillips@google.com> > > TBR=bsalomon@google.com,robertphillips@google.com > > Change-Id: I7c4c23aa418da09c9708b28cce64ab58e282dd3a > No-Presubmit: true > No-Tree-Checks: true > No-Try: true > Reviewed-on: https://skia-review.googlesource.com/60683 > Reviewed-by: Brian Salomon <bsalomon@google.com> > Commit-Queue: Brian Salomon <bsalomon@google.com> TBR=bsalomon@google.com,robertphillips@google.com Change-Id: Iefcd16676a7617d32e89fc84206cd4e88e9a06e1 No-Presubmit: true No-Tree-Checks: true No-Try: true Reviewed-on: https://skia-review.googlesource.com/61160 Reviewed-by: Brian Salomon <bsalomon@google.com> Commit-Queue: Brian Salomon <bsalomon@google.com>
70 lines
1.8 KiB
C
70 lines
1.8 KiB
C
/*
|
|
* Copyright 2015 Google Inc.
|
|
*
|
|
* Use of this source code is governed by a BSD-style license that can be
|
|
* found in the LICENSE file.
|
|
*/
|
|
|
|
#ifndef SkRSXform_DEFINED
|
|
#define SkRSXform_DEFINED
|
|
|
|
#include "SkPoint.h"
|
|
#include "SkSize.h"
|
|
|
|
/**
|
|
* A compressed form of a rotation+scale matrix.
|
|
*
|
|
* [ fSCos -fSSin fTx ]
|
|
* [ fSSin fSCos fTy ]
|
|
* [ 0 0 1 ]
|
|
*/
|
|
struct SkRSXform {
|
|
static SkRSXform Make(SkScalar scos, SkScalar ssin, SkScalar tx, SkScalar ty) {
|
|
SkRSXform xform = { scos, ssin, tx, ty };
|
|
return xform;
|
|
}
|
|
|
|
/*
|
|
* Initialize a new xform based on the scale, rotation (in radians), final tx,ty location
|
|
* and anchor-point ax,ay within the src quad.
|
|
*
|
|
* Note: the anchor point is not normalized (e.g. 0...1) but is in pixels of the src image.
|
|
*/
|
|
static SkRSXform MakeFromRadians(SkScalar scale, SkScalar radians, SkScalar tx, SkScalar ty,
|
|
SkScalar ax, SkScalar ay) {
|
|
const SkScalar s = SkScalarSin(radians) * scale;
|
|
const SkScalar c = SkScalarCos(radians) * scale;
|
|
return Make(c, s, tx + -c * ax + s * ay, ty + -s * ax - c * ay);
|
|
}
|
|
|
|
SkScalar fSCos;
|
|
SkScalar fSSin;
|
|
SkScalar fTx;
|
|
SkScalar fTy;
|
|
|
|
bool rectStaysRect() const {
|
|
return 0 == fSCos || 0 == fSSin;
|
|
}
|
|
|
|
void setIdentity() {
|
|
fSCos = 1;
|
|
fSSin = fTx = fTy = 0;
|
|
}
|
|
|
|
void set(SkScalar scos, SkScalar ssin, SkScalar tx, SkScalar ty) {
|
|
fSCos = scos;
|
|
fSSin = ssin;
|
|
fTx = tx;
|
|
fTy = ty;
|
|
}
|
|
|
|
void toQuad(SkScalar width, SkScalar height, SkPoint quad[4]) const;
|
|
void toQuad(const SkSize& size, SkPoint quad[4]) const {
|
|
this->toQuad(size.width(), size.height(), quad);
|
|
}
|
|
void toTriStrip(SkScalar width, SkScalar height, SkPoint strip[4]) const;
|
|
};
|
|
|
|
#endif
|
|
|