| Index: src/gpu/gl/builders/GrGLProgramBuilder.h
|
| diff --git a/src/gpu/gl/builders/GrGLProgramBuilder.h b/src/gpu/gl/builders/GrGLProgramBuilder.h
|
| index e6180cc36d865cdff66359ca0ccc46dc3d9fe66c..7a4646d03f8847296460546db492bc837c3a943f 100644
|
| --- a/src/gpu/gl/builders/GrGLProgramBuilder.h
|
| +++ b/src/gpu/gl/builders/GrGLProgramBuilder.h
|
| @@ -223,7 +223,6 @@ public:
|
| };
|
|
|
| protected:
|
| - typedef GrProgramDesc::ProcKeyProvider ProcKeyProvider;
|
| typedef GrGLProgramDataManager::UniformInfo UniformInfo;
|
| typedef GrGLProgramDataManager::UniformInfoArray UniformInfoArray;
|
|
|
| @@ -249,17 +248,14 @@ protected:
|
| template <class Proc>
|
| void emitAndInstallProc(const Proc&,
|
| int index,
|
| - const ProcKeyProvider&,
|
| const GrGLSLExpr4& input,
|
| GrGLSLExpr4* output);
|
|
|
| // these emit functions help to keep the createAndEmitProcessors template general
|
| void emitAndInstallProc(const GrPendingFragmentStage&,
|
| - const GrProcessorKey&,
|
| const char* outColor,
|
| const char* inColor);
|
| void emitAndInstallProc(const GrGeometryProcessor&,
|
| - const GrProcessorKey&,
|
| const char* outCoverage,
|
| const char* inCoverage);
|
| void verify(const GrGeometryProcessor&);
|
|
|