| Index: src/gpu/effects/GrDisableColorXP.cpp
|
| diff --git a/src/gpu/effects/GrDisableColorXP.cpp b/src/gpu/effects/GrDisableColorXP.cpp
|
| index 83b6d231194b513c38e639ae43f1fd402550f1d1..93833851921d3c6eadfa77825b635e4cb5317dc8 100644
|
| --- a/src/gpu/effects/GrDisableColorXP.cpp
|
| +++ b/src/gpu/effects/GrDisableColorXP.cpp
|
| @@ -17,10 +17,7 @@
|
|
|
| ~GrGLDisableColorXP() SK_OVERRIDE {}
|
|
|
| - static void GenKey(const GrProcessor&, const GrGLCaps&, GrProcessorKeyBuilder*) {}
|
| -
|
| -private:
|
| - void onEmitCode(const EmitArgs& args) SK_OVERRIDE {
|
| + void emitCode(const EmitArgs& args) SK_OVERRIDE {
|
| // This emit code should be empty. However, on the nexus 6 there is a driver bug where if
|
| // you do not give gl_FragColor a value, the gl context is lost and we end up drawing
|
| // nothing. So this fix just sets the gl_FragColor arbitrarily to 0.
|
| @@ -28,8 +25,11 @@
|
| fsBuilder->codeAppendf("%s = vec4(0);", args.fOutputPrimary);
|
| }
|
|
|
| - void onSetData(const GrGLProgramDataManager&, const GrXferProcessor&) SK_OVERRIDE {}
|
| + void setData(const GrGLProgramDataManager&, const GrXferProcessor&) SK_OVERRIDE {}
|
|
|
| + static void GenKey(const GrProcessor&, const GrGLCaps&, GrProcessorKeyBuilder*) {}
|
| +
|
| +private:
|
| typedef GrGLXferProcessor INHERITED;
|
| };
|
|
|
| @@ -39,7 +39,7 @@
|
| this->initClassID<GrDisableColorXP>();
|
| }
|
|
|
| -void GrDisableColorXP::onGetGLProcessorKey(const GrGLCaps& caps, GrProcessorKeyBuilder* b) const {
|
| +void GrDisableColorXP::getGLProcessorKey(const GrGLCaps& caps, GrProcessorKeyBuilder* b) const {
|
| GrGLDisableColorXP::GenKey(*this, caps, b);
|
| }
|
|
|
| @@ -57,10 +57,8 @@
|
| this->initClassID<GrDisableColorXPFactory>();
|
| }
|
|
|
| -GrXferProcessor*
|
| -GrDisableColorXPFactory::onCreateXferProcessor(const GrProcOptInfo& colorPOI,
|
| - const GrProcOptInfo& covPOI,
|
| - const GrDeviceCoordTexture* dstCopy) const {
|
| +GrXferProcessor* GrDisableColorXPFactory::createXferProcessor(const GrProcOptInfo& colorPOI,
|
| + const GrProcOptInfo& covPOI) const {
|
| return GrDisableColorXP::Create();
|
| }
|
|
|
|
|