diff options
Diffstat (limited to 'src/gpu/gl/GrGLProgram.h')
| -rw-r--r-- | src/gpu/gl/GrGLProgram.h | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/gpu/gl/GrGLProgram.h b/src/gpu/gl/GrGLProgram.h index e37d54d124..c623977a91 100644 --- a/src/gpu/gl/GrGLProgram.h +++ b/src/gpu/gl/GrGLProgram.h @@ -159,7 +159,7 @@ protected: // A templated helper to loop over effects, set the transforms(via subclass) and bind textures void setFragmentData(const GrOptDrawState&); - virtual void setTransformData(const GrFragmentStage& effectStage, GrGLInstalledFragProc* pe); + virtual void setTransformData(const GrPendingFragmentStage&, GrGLInstalledFragProc*); void bindTextures(const GrGLInstalledProc*, const GrProcessor&); /* @@ -215,7 +215,7 @@ protected: class GrGLNvprProgram : public GrGLNvprProgramBase { public: - virtual bool hasVertexShader() const SK_OVERRIDE { return true; } + virtual bool hasVertexShader() const SK_OVERRIDE { return true; } private: typedef GrGLNvprProgramBuilder::SeparableVaryingInfo SeparableVaryingInfo; @@ -228,7 +228,8 @@ private: GrGLInstalledFragProcs* fragmentProcessors, const SeparableVaryingInfoArray& separableVaryings); virtual void didSetData(GrGpu::DrawType) SK_OVERRIDE; - virtual void setTransformData(const GrFragmentStage&, GrGLInstalledFragProc*) SK_OVERRIDE; + virtual void setTransformData(const GrPendingFragmentStage&, + GrGLInstalledFragProc*) SK_OVERRIDE; struct Varying { GrGLint fLocation; @@ -256,7 +257,8 @@ private: GrGLInstalledFragProcs* fragmentProcessors, int texCoordSetCnt); virtual void didSetData(GrGpu::DrawType) SK_OVERRIDE; - virtual void setTransformData(const GrFragmentStage&, GrGLInstalledFragProc*) SK_OVERRIDE; + virtual void setTransformData(const GrPendingFragmentStage&, + GrGLInstalledFragProc*) SK_OVERRIDE; int fTexCoordSetCnt; |