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

Revert "Implement XP factory dumping"

Browse Source 
This reverts commit 8d8224fcc1.

Reason for revert: Adds public API without documentation breaking bookmaker bot

Original change's description:
> Implement XP factory dumping
> 
> Bug: skia:
> Change-Id: If2e6a20b072d895ca9770268db5006a9400f2e70
> Reviewed-on: https://skia-review.googlesource.com/c/186180
> Reviewed-by: Brian Salomon <bsalomon@google.com>
> Commit-Queue: Chris Dalton <csmartdalton@google.com>

TBR=bsalomon@google.com,csmartdalton@google.com

Change-Id: I66e8508d8760b5a95e7f98597b4907d134122013
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: skia:
Reviewed-on: https://skia-review.googlesource.com/c/186542
Reviewed-by: Derek Sollenberger <djsollen@google.com>
Commit-Queue: Derek Sollenberger <djsollen@google.com>
This commit is contained in:
Derek Sollenberger 2019-01-24 16:30:28 +00:00 committed by Skia Commit-Bot
parent e964c18b98
commit 08c06297bf
7 changed files with 1 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
include/core/SkRegion.h
View File

@ -368,19 +368,6 @@ public:
static const int kOpCnt = kLastOp + 1;
static const char* OpName(Op op) {
switch (op) {
case kDifference_Op: return "kDifference_Op";
case kIntersect_Op: return "kIntersect_Op";
case kUnion_Op: return "kUnion_Op";
case kXOR_Op: return "kXOR_Op";
case kReverseDifference_Op: return "kReverseDifference_Op";
case kReplace_Op: return "kReplace_Op";
}
SK_ABORT("Invalid Op");
return "unknown";
}
/** Replaces SkRegion with the result of SkRegion op rect.
Returns true if replaced SkRegion is not empty.

2
src/gpu/GrProcessorSet.cpp
View File

@ -124,7 +124,7 @@ SkString GrProcessorSet::dumpProcessors() const {
result.append("SrcOver\n");
}
} else {
result.appendf("XP Factory: %s\n", GrXPFactory::GetDescription(this->xpFactory()).c_str());
result.append("XP Factory dumping not implemented.\n");
}
return result;
}

9
src/gpu/GrXferProcessor.h
View File

@ -282,10 +282,6 @@ public:
};
GR_DECL_BITFIELD_CLASS_OPS_FRIENDS(AnalysisProperties);
static SkString GetDescription(const GrXPFactory* xpf) {
return (!xpf) ? SkString("none (src-over)") : xpf->description();
}
static sk_sp<const GrXferProcessor> MakeXferProcessor(const GrXPFactory*,
const GrProcessorAnalysisColor&,
GrProcessorAnalysisCoverage,
@ -301,11 +297,6 @@ protected:
constexpr GrXPFactory() {}
private:
/**
* Human-meaningful string to identify this factory.
*/
virtual SkString description() const = 0;
virtual sk_sp<const GrXferProcessor> makeXferProcessor(const GrProcessorAnalysisColor&,
GrProcessorAnalysisCoverage,
bool hasMixedSamples,

5
src/gpu/effects/GrCoverageSetOpXP.h
View File

@ -34,11 +34,6 @@ public:
private:
constexpr GrCoverageSetOpXPFactory(SkRegion::Op regionOp, bool invertCoverage);
SkString description() const override {
return SkStringPrintf("GrCoverageSetOpXPFactory (%s; invert=%i)",
SkRegion::OpName(fRegionOp), fInvertCoverage);
}
sk_sp<const GrXferProcessor> makeXferProcessor(const GrProcessorAnalysisColor&,
GrProcessorAnalysisCoverage,
bool hasMixedSamples,

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

@ -217,10 +217,6 @@ public:
: fMode(mode), fHWBlendEquation(hw_blend_equation(mode)) {}
private:
SkString description() const override {
return SkStringPrintf("CustomXPFactory (%s)", SkBlendMode_Name(fMode));
}
sk_sp<const GrXferProcessor> makeXferProcessor(const GrProcessorAnalysisColor&,
GrProcessorAnalysisCoverage,
bool hasMixedSamples,

2
src/gpu/effects/GrDisableColorXP.h
View File

@ -28,8 +28,6 @@ public:
private:
constexpr GrDisableColorXPFactory() {}
SkString description() const override { return SkString("GrDisableColorXPFactory"); }
AnalysisProperties analysisProperties(const GrProcessorAnalysisColor&,
const GrProcessorAnalysisCoverage&,
const GrCaps&) const override {

4
src/gpu/effects/GrPorterDuffXferProcessor.h
View File

@ -46,10 +46,6 @@ public:
private:
constexpr GrPorterDuffXPFactory(SkBlendMode);
SkString description() const override {
return SkStringPrintf("GrPorterDuffXPFactory (%s)", SkBlendMode_Name(fBlendMode));
}
sk_sp<const GrXferProcessor> makeXferProcessor(const GrProcessorAnalysisColor&,
GrProcessorAnalysisCoverage,
bool hasMixedSamples,