| Index: src/gpu/gl/GrGpuGL.h
|
| diff --git a/src/gpu/gl/GrGpuGL.h b/src/gpu/gl/GrGpuGL.h
|
| index 93564fcbc09a5cf815f894bf83b803d2dc7b0b4d..d2a0d9a9ea7ac88b8d48cbd7c98e094940732d16 100644
|
| --- a/src/gpu/gl/GrGpuGL.h
|
| +++ b/src/gpu/gl/GrGpuGL.h
|
| @@ -21,6 +21,7 @@
|
| #include "GrGLVertexBuffer.h"
|
| #include "GrGpu.h"
|
| #include "GrOptDrawState.h"
|
| +#include "GrXferProcessor.h"
|
| #include "SkTypes.h"
|
|
|
| #ifdef SK_DEVELOPER
|
| @@ -177,7 +178,7 @@ private:
|
| size_t* indexOffsetInBytes);
|
|
|
| // Subclasses should call this to flush the blend state.
|
| - void flushBlend(const GrOptDrawState& optState);
|
| + void flushBlend(const GrXferProcessor::BlendInfo& blendInfo);
|
|
|
| bool hasExtension(const char* ext) const { return fGLContext.hasExtension(ext); }
|
|
|
| @@ -224,7 +225,7 @@ private:
|
| };
|
|
|
| void flushDither(bool dither);
|
| - void flushColorWriteDisable(bool disableColorWrites);
|
| + void flushColorWrite(bool writeColor);
|
| void flushDrawFace(GrDrawState::DrawFace face);
|
|
|
| // flushes the scissor. see the note on flushBoundTextureAndParams about
|
|
|