| Index: src/gpu/gl/GrGLProgram.h
|
| diff --git a/src/gpu/gl/GrGLProgram.h b/src/gpu/gl/GrGLProgram.h
|
| index 73a32395a29b501fc29f103d2b7a29ad531bfb51..57736f3ce8e33a11d596c08f20cdbad3efab93f5 100644
|
| --- a/src/gpu/gl/GrGLProgram.h
|
| +++ b/src/gpu/gl/GrGLProgram.h
|
| @@ -155,7 +155,8 @@ public:
|
| * GrGpuGL object to bind the textures required by the GrGLEffects. The color and coverage
|
| * stages come from GrGLProgramDesc::Build().
|
| */
|
| - void setData(GrDrawState::BlendOptFlags,
|
| + void setData(GrGpu::DrawType,
|
| + GrDrawState::BlendOptFlags,
|
| const GrEffectStage* colorStages[],
|
| const GrEffectStage* coverageStages[],
|
| const GrDeviceCoordTexture* dstCopy, // can be NULL
|
| @@ -181,7 +182,7 @@ private:
|
| void setCoverage(const GrDrawState&, GrColor coverage, SharedGLState*);
|
|
|
| // Helper for setData() that sets the view matrix and loads the render target height uniform
|
| - void setMatrixAndRenderTargetHeight(const GrDrawState&);
|
| + void setMatrixAndRenderTargetHeight(GrGpu::DrawType drawType, const GrDrawState&);
|
|
|
| // these reflect the current values of uniforms (GL uniform values travel with program)
|
| MatrixState fMatrixState;
|
|
|