aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/gpu/gl/GrGpuGL.h
diff options
context:
space:
mode:
authorGravatar egdaniel <egdaniel@google.com>2014-09-24 10:30:12 -0700
committerGravatar Commit bot <commit-bot@chromium.org>2014-09-24 10:30:13 -0700
commitd632ea4b9eec5be3f83a9fa4982a30202e1239a7 (patch)
tree3439f8dd1d58997be6918eb9cf4c31f7e6e7f7b2 /src/gpu/gl/GrGpuGL.h
parenteee606c7bf6b343429dcdbf56b6b71bd83575060 (diff)
Use OptDrawState instead of DrawState when flushing state in GrGpuGL
BUG=skia: R=bsalomon@google.com, joshualitt@google.com Author: egdaniel@google.com Review URL: https://codereview.chromium.org/599963002
Diffstat (limited to 'src/gpu/gl/GrGpuGL.h')
-rw-r--r--src/gpu/gl/GrGpuGL.h7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/gpu/gl/GrGpuGL.h b/src/gpu/gl/GrGpuGL.h
index 9dccd1828b..65816b54a8 100644
--- a/src/gpu/gl/GrGpuGL.h
+++ b/src/gpu/gl/GrGpuGL.h
@@ -166,7 +166,8 @@ private:
// The params should be the final coefficients to apply
// (after any blending optimizations or dual source blending considerations
// have been accounted for).
- void flushBlend(bool isLines, GrBlendCoeff srcCoeff, GrBlendCoeff dstCoeff);
+ void flushBlend(const GrOptDrawState& optState, bool isLines,
+ GrBlendCoeff srcCoeff, GrBlendCoeff dstCoeff);
bool hasExtension(const char* ext) const { return fGLContext.hasExtension(ext); }
@@ -216,7 +217,7 @@ private:
};
// flushes dithering, color-mask, and face culling stat
- void flushMiscFixedFunctionState();
+ void flushMiscFixedFunctionState(const GrOptDrawState&);
// flushes the scissor. see the note on flushBoundTextureAndParams about
// flushing the scissor after that function is called.
@@ -236,7 +237,7 @@ private:
void flushRenderTarget(GrGLRenderTarget*, const SkIRect* bounds);
void flushStencil(DrawType);
- void flushAAState(DrawType);
+ void flushAAState(const GrOptDrawState&, DrawType);
bool configToGLFormats(GrPixelConfig config,
bool getSizedInternal,