From 329bf4862e9d5e05363c2b071d8ca475a0ef1952 Mon Sep 17 00:00:00 2001 From: joshualitt Date: Wed, 29 Oct 2014 12:31:28 -0700 Subject: BUG=skia: Review URL: https://codereview.chromium.org/683933003 --- src/gpu/GrGpu.cpp | 40 ---------------------------------------- 1 file changed, 40 deletions(-) (limited to 'src/gpu/GrGpu.cpp') diff --git a/src/gpu/GrGpu.cpp b/src/gpu/GrGpu.cpp index e767d07a82..4b1c35ad4e 100644 --- a/src/gpu/GrGpu.cpp +++ b/src/gpu/GrGpu.cpp @@ -36,9 +36,6 @@ GrGpu::GrGpu(GrContext* context) , fVertexPoolUseCnt(0) , fIndexPoolUseCnt(0) , fQuadIndexBuffer(NULL) { - - fClipMaskManager.setGpu(this); - fGeomPoolStateStack.push_back(); #ifdef SK_DEBUG GeometryPoolState& poolState = fGeomPoolStateStack.back(); @@ -250,43 +247,6 @@ void GrGpu::resolveRenderTarget(GrRenderTarget* target) { this->onResolveRenderTarget(target); } -static const GrStencilSettings& winding_path_stencil_settings() { - GR_STATIC_CONST_SAME_STENCIL_STRUCT(gSettings, - kIncClamp_StencilOp, - kIncClamp_StencilOp, - kAlwaysIfInClip_StencilFunc, - 0xFFFF, 0xFFFF, 0xFFFF); - return *GR_CONST_STENCIL_SETTINGS_PTR_FROM_STRUCT_PTR(&gSettings); -} - -static const GrStencilSettings& even_odd_path_stencil_settings() { - GR_STATIC_CONST_SAME_STENCIL_STRUCT(gSettings, - kInvert_StencilOp, - kInvert_StencilOp, - kAlwaysIfInClip_StencilFunc, - 0xFFFF, 0xFFFF, 0xFFFF); - return *GR_CONST_STENCIL_SETTINGS_PTR_FROM_STRUCT_PTR(&gSettings); -} - -void GrGpu::getPathStencilSettingsForFillType(SkPath::FillType fill, GrStencilSettings* outStencilSettings) { - - switch (fill) { - default: - SkFAIL("Unexpected path fill."); - /* fallthrough */; - case SkPath::kWinding_FillType: - case SkPath::kInverseWinding_FillType: - *outStencilSettings = winding_path_stencil_settings(); - break; - case SkPath::kEvenOdd_FillType: - case SkPath::kInverseEvenOdd_FillType: - *outStencilSettings = even_odd_path_stencil_settings(); - break; - } - fClipMaskManager.adjustPathStencilParams(outStencilSettings); -} - - //////////////////////////////////////////////////////////////////////////////// static const int MAX_QUADS = 1 << 12; // max possible: (1 << 14) - 1; -- cgit v1.2.3