Index: src/gpu/gl/GrGpuGL.h |
diff --git a/src/gpu/gl/GrGpuGL.h b/src/gpu/gl/GrGpuGL.h |
index 4224ba64fdd3f7279c73ece0cbfdc388e5c2bb76..22153492f78e8669464586cee8bb182b1d1fe7cb 100644 |
--- a/src/gpu/gl/GrGpuGL.h |
+++ b/src/gpu/gl/GrGpuGL.h |
@@ -106,7 +106,6 @@ public: |
protected: |
virtual void buildProgramDesc(const GrOptDrawState&, |
- const GrProgramDesc::DescInfo&, |
GrGpu::DrawType, |
GrProgramDesc*) SK_OVERRIDE; |
@@ -155,7 +154,9 @@ private: |
virtual void clearStencil(GrRenderTarget*) SK_OVERRIDE; |
- virtual bool flushGraphicsState(const GrOptDrawState&, DrawType) SK_OVERRIDE; |
+ virtual bool flushGraphicsState(const GrOptDrawState&, |
+ const GrProgramDesc&, |
+ DrawType) SK_OVERRIDE; |
// GrDrawTarget overrides |
virtual void didAddGpuTraceMarker() SK_OVERRIDE; |
@@ -188,7 +189,7 @@ private: |
~ProgramCache(); |
void abandon(); |
- GrGLProgram* getProgram(const GrOptDrawState&, DrawType); |
+ GrGLProgram* getProgram(const GrOptDrawState&, const GrProgramDesc&, DrawType); |
private: |
enum { |