commit 080e673b10ac607305f140ddb245e140ccde40c6
author egdaniel <egdaniel@google.com> Mon Dec 22 07:35:52 2014 -0800
committer Commit bot <commit-bot@chromium.org> Mon Dec 22 07:35:52 2014 -0800
tree c8e51428edeeb5fff1075c68a3a408e1f2f0110b
parent ebc11635e40ccf2a34fb1cdbc9dec635cb3d74d8

Add XP to handle the cases where we disable color write.

BUG=skia:

Review URL: https://codereview.chromium.org/787233003

src/gpu/gl/GrGpuGL.h

diff --git a/src/gpu/gl/GrGpuGL.h b/src/gpu/gl/GrGpuGL.h
index 93564fc..d2a0d9a 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 @@
                        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 @@
     };
 
     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