| Index: src/gpu/gl/GrGLProgramDesc.cpp
|
| diff --git a/src/gpu/gl/GrGLProgramDesc.cpp b/src/gpu/gl/GrGLProgramDesc.cpp
|
| index 474f7026e48845fe1816518d5426ce35a06da388..6867a1329b048b59384dfded65f122eee414d05b 100644
|
| --- a/src/gpu/gl/GrGLProgramDesc.cpp
|
| +++ b/src/gpu/gl/GrGLProgramDesc.cpp
|
| @@ -7,7 +7,6 @@
|
| #include "GrGLProgramDesc.h"
|
|
|
| #include "GrGLProcessor.h"
|
| -#include "GrBackendProcessorFactory.h"
|
| #include "GrProcessor.h"
|
| #include "GrGpuGL.h"
|
| #include "GrOptDrawState.h"
|
| @@ -125,7 +124,7 @@ static bool get_meta_key(const GrProcessor& proc,
|
| GrProcessorKeyBuilder* b) {
|
| size_t processorKeySize = b->size();
|
| uint32_t textureKey = gen_texture_key(proc, caps);
|
| - uint32_t classID = proc.getFactory().classID();
|
| + uint32_t classID = proc.classID();
|
|
|
| // Currently we allow 16 bits for each of the above portions of the meta-key. Fail if they
|
| // don't fit.
|
| @@ -167,8 +166,7 @@ bool GrGLProgramDescBuilder::Build(const GrOptDrawState& optState,
|
| if (optState.hasGeometryProcessor()) {
|
| const GrGeometryProcessor& gp = *optState.getGeometryProcessor();
|
| GrProcessorKeyBuilder b(&desc->fKey);
|
| - const GrBackendGeometryProcessorFactory& factory = gp.getFactory();
|
| - factory.getGLProcessorKey(gp, optState.getBatchTracker(), gpu->glCaps(), &b);
|
| + gp.getGLProcessorKey(optState.getBatchTracker(), gpu->glCaps(), &b);
|
| if (!get_meta_key(gp, gpu->glCaps(), 0, gen_attrib_key(gp), &b)) {
|
| desc->fKey.reset();
|
| return false;
|
| @@ -179,8 +177,7 @@ bool GrGLProgramDescBuilder::Build(const GrOptDrawState& optState,
|
| const GrPendingFragmentStage& fps = optState.getFragmentStage(s);
|
| const GrFragmentProcessor& fp = *fps.getProcessor();
|
| GrProcessorKeyBuilder b(&desc->fKey);
|
| - const GrBackendFragmentProcessorFactory& factory = fp.getFactory();
|
| - factory.getGLProcessorKey(fp, gpu->glCaps(), &b);
|
| + fp.getGLProcessorKey(gpu->glCaps(), &b);
|
| if (!get_meta_key(*fps.getProcessor(), gpu->glCaps(),
|
| gen_transform_key(fps, requiresLocalCoordAttrib), 0, &b)) {
|
| desc->fKey.reset();
|
|
|