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

Revert "Add GrDisableColorXPFactory::makeXferProcessor()"

Browse Source 
This reverts commit 11157ef97a.

Reason for revert: breaking bots

Original change's description:
> Add GrDisableColorXPFactory::makeXferProcessor()
> 
> This allows us to access the actual XP for working directly with
> pipelines.
> 
> Bug: skia:
> Change-Id: I71e7c2e9d69f464685e28b4f4a85847f0496b864
> Reviewed-on: https://skia-review.googlesource.com/c/skia/+/208345
> Commit-Queue: Chris Dalton <csmartdalton@google.com>
> Reviewed-by: Greg Daniel <egdaniel@google.com>

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

Change-Id: Ia12f17d955702b13f33753b352cb3ae232881175
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: skia:
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/208662
Reviewed-by: Greg Daniel <egdaniel@google.com>
Commit-Queue: Greg Daniel <egdaniel@google.com>
This commit is contained in:
Greg Daniel 2019-04-16 19:19:43 +00:00 committed by Skia Commit-Bot
parent 0a8da21fba
commit e9c375cd3d
2 changed files with 61 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
src/gpu/effects/GrDisableColorXP.cpp
View File

@ -19,23 +19,36 @@
*/
class DisableColorXP : public GrXferProcessor {
public:
DisableColorXP() : INHERITED(kDisableColorXP_ClassID) {}
DisableColorXP()
: INHERITED(kDisableColorXP_ClassID) {}
const char* name() const override { return "Disable Color"; }
GrGLSLXferProcessor* createGLSLInstance() const override;
private:
const char* name() const override { return "Disable Color"; }
bool onIsEqual(const GrXferProcessor& xpBase) const override { return true; }
void onGetGLSLProcessorKey(const GrShaderCaps& caps, GrProcessorKeyBuilder* b) const override {
return; // No key.
void onGetGLSLProcessorKey(const GrShaderCaps& caps, GrProcessorKeyBuilder* b) const override;
void onGetBlendInfo(GrXferProcessor::BlendInfo* blendInfo) const override;
bool onIsEqual(const GrXferProcessor& xpBase) const override {
return true;
}
void onGetBlendInfo(GrXferProcessor::BlendInfo* blendInfo) const override {
blendInfo->fWriteColor = false;
}
GrGLSLXferProcessor* createGLSLInstance() const override;
typedef GrXferProcessor INHERITED;
};
///////////////////////////////////////////////////////////////////////////////
class GLDisableColorXP : public GrGLSLXferProcessor {
public:
GLDisableColorXP(const GrProcessor&) {}
~GLDisableColorXP() override {}
static void GenKey(const GrProcessor&, const GrShaderCaps&, GrProcessorKeyBuilder*) {}
private:
void emitOutputsForBlendState(const EmitArgs& args) override {
if (args.fShaderCaps->mustWriteToFragColor()) {
@ -59,12 +72,26 @@ private:
typedef GrGLSLXferProcessor INHERITED;
};
GrGLSLXferProcessor* DisableColorXP::createGLSLInstance() const {
return new GLDisableColorXP();
///////////////////////////////////////////////////////////////////////////////
void DisableColorXP::onGetGLSLProcessorKey(const GrShaderCaps& caps, GrProcessorKeyBuilder* b) const {
GLDisableColorXP::GenKey(*this, caps, b);
}
GrDisableColorXPFactory::GrDisableColorXPFactory()
: fXferProcessor(new DisableColorXP()) {
GrGLSLXferProcessor* DisableColorXP::createGLSLInstance() const { return new GLDisableColorXP(*this); }
void DisableColorXP::onGetBlendInfo(GrXferProcessor::BlendInfo* blendInfo) const {
blendInfo->fWriteColor = false;
}
///////////////////////////////////////////////////////////////////////////////
sk_sp<const GrXferProcessor> GrDisableColorXPFactory::makeXferProcessor(
const GrProcessorAnalysisColor&,
GrProcessorAnalysisCoverage,
bool hasMixedSamples,
const GrCaps& caps,
GrClampType clampType) const {
return sk_sp<const GrXferProcessor>(new DisableColorXP);
}
GR_DEFINE_XP_FACTORY_TEST(GrDisableColorXPFactory);

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

@ -23,30 +23,24 @@
#endif
class GrDisableColorXPFactory : public GrXPFactory {
public:
static const GrDisableColorXPFactory* Get() {
static const GrDisableColorXPFactory gDisableColorXPFactory;
return &gDisableColorXPFactory;
}
sk_sp<const GrXferProcessor> makeXferProcessor() const { return fXferProcessor; }
static const GrXPFactory* Get();
private:
GrDisableColorXPFactory();
constexpr GrDisableColorXPFactory() {}
AnalysisProperties analysisProperties(
const GrProcessorAnalysisColor&, const GrProcessorAnalysisCoverage&, const GrCaps&,
GrClampType) const override {
AnalysisProperties analysisProperties(const GrProcessorAnalysisColor&,
const GrProcessorAnalysisCoverage&,
const GrCaps&,
GrClampType) const override {
return AnalysisProperties::kCompatibleWithCoverageAsAlpha |
AnalysisProperties::kIgnoresInputColor;
}
sk_sp<const GrXferProcessor> makeXferProcessor(
const GrProcessorAnalysisColor&, GrProcessorAnalysisCoverage, bool hasMixedSamples,
const GrCaps&, GrClampType) const override {
return this->makeXferProcessor();
}
const sk_sp<const GrXferProcessor> fXferProcessor;
sk_sp<const GrXferProcessor> makeXferProcessor(const GrProcessorAnalysisColor&,
GrProcessorAnalysisCoverage,
bool hasMixedSamples,
const GrCaps&,
GrClampType) const override;
GR_DECLARE_XP_FACTORY_TEST
@ -59,4 +53,14 @@ private:
#pragma clang diagnostic pop
#endif
inline const GrXPFactory* GrDisableColorXPFactory::Get() {
// If this is constructed as static constexpr by cl.exe (2015 SP2) the vtable is null.
#ifdef SK_BUILD_FOR_WIN
static const GrDisableColorXPFactory gDisableColorXPFactory;
#else
static constexpr const GrDisableColorXPFactory gDisableColorXPFactory;
#endif
return &gDisableColorXPFactory;
}
#endif