| Index: src/gpu/GrOvalRenderer.cpp
|
| diff --git a/src/gpu/GrOvalRenderer.cpp b/src/gpu/GrOvalRenderer.cpp
|
| index c66e12575c83309916403e0111eb756e835112eb..b4690aec1109787d3fd5f8f332e25e581b5738de 100644
|
| --- a/src/gpu/GrOvalRenderer.cpp
|
| +++ b/src/gpu/GrOvalRenderer.cpp
|
| @@ -667,13 +667,12 @@ public:
|
| return string;
|
| }
|
|
|
| - void getInvariantOutputColor(GrInitInvariantOutput* out) const override {
|
| + void computeBatchToXPOverrides(GrInitInvariantOutput* color, GrInitInvariantOutput* coverage,
|
| + bool* usePLSDstRead) const override {
|
| // When this is called on a batch, there is only one geometry bundle
|
| - out->setKnownFourComponents(fGeoData[0].fColor);
|
| - }
|
| -
|
| - void getInvariantOutputCoverage(GrInitInvariantOutput* out) const override {
|
| - out->setUnknownSingleComponent();
|
| + color->setKnownFourComponents(fGeoData[0].fColor);
|
| + coverage->setUnknownSingleComponent();
|
| + *usePLSDstRead = false;
|
| }
|
|
|
| private:
|
| @@ -887,12 +886,12 @@ public:
|
|
|
| const char* name() const override { return "EllipseBatch"; }
|
|
|
| - void getInvariantOutputColor(GrInitInvariantOutput* out) const override {
|
| + void computeBatchToXPOverrides(GrInitInvariantOutput* color, GrInitInvariantOutput* coverage,
|
| + bool* usePLSDstRead) const {
|
| // When this is called on a batch, there is only one geometry bundle
|
| - out->setKnownFourComponents(fGeoData[0].fColor);
|
| - }
|
| - void getInvariantOutputCoverage(GrInitInvariantOutput* out) const override {
|
| - out->setUnknownSingleComponent();
|
| + color->setKnownFourComponents(fGeoData[0].fColor);
|
| + coverage->setUnknownSingleComponent();
|
| + *usePLSDstRead = false;
|
| }
|
|
|
| private:
|
| @@ -1158,12 +1157,12 @@ public:
|
|
|
| const char* name() const override { return "DIEllipseBatch"; }
|
|
|
| - void getInvariantOutputColor(GrInitInvariantOutput* out) const override {
|
| + void computeBatchToXPOverrides(GrInitInvariantOutput* color, GrInitInvariantOutput* coverage,
|
| + bool* usePLSDstRead) const {
|
| // When this is called on a batch, there is only one geometry bundle
|
| - out->setKnownFourComponents(fGeoData[0].fColor);
|
| - }
|
| - void getInvariantOutputCoverage(GrInitInvariantOutput* out) const override {
|
| - out->setUnknownSingleComponent();
|
| + color->setKnownFourComponents(fGeoData[0].fColor);
|
| + coverage->setUnknownSingleComponent();
|
| + *usePLSDstRead = false;
|
| }
|
|
|
| private:
|
| @@ -1513,12 +1512,12 @@ public:
|
|
|
| const char* name() const override { return "RRectCircleBatch"; }
|
|
|
| - void getInvariantOutputColor(GrInitInvariantOutput* out) const override {
|
| + void computeBatchToXPOverrides(GrInitInvariantOutput* color, GrInitInvariantOutput* coverage,
|
| + bool* usePLSDstRead) const {
|
| // When this is called on a batch, there is only one geometry bundle
|
| - out->setKnownFourComponents(fGeoData[0].fColor);
|
| - }
|
| - void getInvariantOutputCoverage(GrInitInvariantOutput* out) const override {
|
| - out->setUnknownSingleComponent();
|
| + color->setKnownFourComponents(fGeoData[0].fColor);
|
| + coverage->setUnknownSingleComponent();
|
| + *usePLSDstRead = false;
|
| }
|
|
|
| private:
|
| @@ -1692,12 +1691,12 @@ public:
|
|
|
| const char* name() const override { return "RRectEllipseRendererBatch"; }
|
|
|
| - void getInvariantOutputColor(GrInitInvariantOutput* out) const override {
|
| + void computeBatchToXPOverrides(GrInitInvariantOutput* color, GrInitInvariantOutput* coverage,
|
| + bool* usePLSDstRead) const {
|
| // When this is called on a batch, there is only one geometry bundle
|
| - out->setKnownFourComponents(fGeoData[0].fColor);
|
| - }
|
| - void getInvariantOutputCoverage(GrInitInvariantOutput* out) const override {
|
| - out->setUnknownSingleComponent();
|
| + color->setKnownFourComponents(fGeoData[0].fColor);
|
| + coverage->setUnknownSingleComponent();
|
| + *usePLSDstRead = false;
|
| }
|
|
|
| private:
|
|
|