| Index: src/gpu/gl/GrGLProgram.h
|
| diff --git a/src/gpu/gl/GrGLProgram.h b/src/gpu/gl/GrGLProgram.h
|
| index 4dfeba345c09d36db571549cdbfa36bf54259c9a..7222f5cf6a8f1808635c5051a949c9055f11a53d 100644
|
| --- a/src/gpu/gl/GrGLProgram.h
|
| +++ b/src/gpu/gl/GrGLProgram.h
|
| @@ -34,8 +34,6 @@ class GrPipeline;
|
| */
|
| class GrGLProgram : public SkRefCnt {
|
| public:
|
| -
|
| -
|
| typedef GrGLProgramBuilder::BuiltinUniformHandles BuiltinUniformHandles;
|
|
|
| virtual ~GrGLProgram();
|
| @@ -100,12 +98,14 @@ public:
|
| protected:
|
| typedef GrGLProgramDataManager::UniformHandle UniformHandle;
|
| typedef GrGLProgramDataManager::UniformInfoArray UniformInfoArray;
|
| + typedef GrGLProgramDataManager::SeparableVaryingInfoArray SeparableVaryingInfoArray;
|
|
|
| GrGLProgram(GrGLGpu*,
|
| const GrProgramDesc&,
|
| const BuiltinUniformHandles&,
|
| GrGLuint programID,
|
| const UniformInfoArray&,
|
| + const SeparableVaryingInfoArray&,
|
| GrGLInstalledGeoProc* geometryProcessor,
|
| GrGLInstalledXferProc* xferProcessor,
|
| GrGLInstalledFragProcs* fragmentProcessors,
|
| @@ -119,12 +119,6 @@ protected:
|
| int index,
|
| GrGLInstalledFragProc*);
|
|
|
| - /*
|
| - * Legacy NVPR needs a hook here to flush path tex gen settings.
|
| - * TODO when legacy nvpr is removed, remove this call.
|
| - */
|
| - virtual void didSetData() {}
|
| -
|
| // Helper for setData() that sets the view matrix and loads the render target height uniform
|
| void setRenderTargetState(const GrPrimitiveProcessor&, const GrPipeline&);
|
| virtual void onSetRenderTargetState(const GrPrimitiveProcessor&, const GrPipeline&);
|
|
|