Make GrClipMaskManager configure the stencil and scissor on GrGpu
Review URL: http://codereview.appspot.com/6308096/
git-svn-id: http://skia.googlecode.com/svn/trunk@4288 2bbb7eff-a529-9590-31e7-b0007b416f81
diff --git a/src/gpu/GrGpu.cpp b/src/gpu/GrGpu.cpp
index c8c983c..132d2ed 100644
--- a/src/gpu/GrGpu.cpp
+++ b/src/gpu/GrGpu.cpp
@@ -351,34 +351,16 @@
////////////////////////////////////////////////////////////////////////////////
-const GrStencilSettings* GrGpu::GetClipStencilSettings(void) {
- // stencil settings to use when clip is in stencil
- GR_STATIC_CONST_SAME_STENCIL_STRUCT(sClipStencilSettings,
- kKeep_StencilOp,
- kKeep_StencilOp,
- kAlwaysIfInClip_StencilFunc,
- 0x0000,
- 0x0000,
- 0x0000);
- return GR_CONST_STENCIL_SETTINGS_PTR_FROM_STRUCT_PTR(&sClipStencilSettings);
-}
-
-////////////////////////////////////////////////////////////////////////////////
-
bool GrGpu::setupClipAndFlushState(DrawType type) {
- ScissoringSettings scissoringSettings;
-
- if (!fClipMaskManager.createClipMask(fClip, &scissoringSettings)) {
+ if (!fClipMaskManager.setupClipping(fClip)) {
return false;
}
- // Must flush the scissor after graphics state
if (!this->flushGraphicsState(type)) {
return false;
}
- scissoringSettings.setupScissoring(this);
return true;
}