| Index: src/gpu/gl/GrGLProgram.h
|
| diff --git a/src/gpu/gl/GrGLProgram.h b/src/gpu/gl/GrGLProgram.h
|
| index ea8be85251c6bcfaf3e98218a80cb981fee41117..36bf8602330e55c9a1fe9f5e12c8aec0fafd29f9 100644
|
| --- a/src/gpu/gl/GrGLProgram.h
|
| +++ b/src/gpu/gl/GrGLProgram.h
|
| @@ -141,7 +141,6 @@
|
| GrGLuint programID,
|
| const UniformInfoArray&,
|
| GrGLInstalledGeoProc* geometryProcessor,
|
| - GrGLInstalledXferProc* xferProcessor,
|
| GrGLInstalledFragProcs* fragmentProcessors);
|
|
|
| // Sets the texture units for samplers.
|
| @@ -181,7 +180,6 @@
|
|
|
| // the installed effects
|
| SkAutoTDelete<GrGLInstalledGeoProc> fGeometryProcessor;
|
| - SkAutoTDelete<GrGLInstalledXferProc> fXferProcessor;
|
| SkAutoTUnref<GrGLInstalledFragProcs> fFragmentProcessors;
|
|
|
| GrProgramDesc fDesc;
|
| @@ -207,7 +205,6 @@
|
| const BuiltinUniformHandles&,
|
| GrGLuint programID,
|
| const UniformInfoArray&,
|
| - GrGLInstalledXferProc* xferProcessor,
|
| GrGLInstalledFragProcs* fragmentProcessors);
|
| virtual void onSetMatrixAndRenderTargetHeight(const GrOptDrawState&);
|
|
|
| @@ -226,7 +223,6 @@
|
| const BuiltinUniformHandles&,
|
| GrGLuint programID,
|
| const UniformInfoArray&,
|
| - GrGLInstalledXferProc* xferProcessor,
|
| GrGLInstalledFragProcs* fragmentProcessors,
|
| const SeparableVaryingInfoArray& separableVaryings);
|
| virtual void didSetData(GrGpu::DrawType) SK_OVERRIDE;
|
| @@ -256,8 +252,7 @@
|
| const BuiltinUniformHandles&,
|
| GrGLuint programID,
|
| const UniformInfoArray&,
|
| - GrGLInstalledXferProc* xp,
|
| - GrGLInstalledFragProcs* fps,
|
| + GrGLInstalledFragProcs* fragmentProcessors,
|
| int texCoordSetCnt);
|
| virtual void didSetData(GrGpu::DrawType) SK_OVERRIDE;
|
| virtual void setTransformData(const GrPendingFragmentStage&,
|
|
|