AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Move GrPathUtils, GrRect, and GrShape into src/gpu/geometry/

Browse Source 
Change-Id: I864d3c2452f3affdc744bf8b11ed3b3e37d6d922
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/216602
Commit-Queue: Michael Ludwig <michaelludwig@google.com>
Reviewed-by: Robert Phillips <robertphillips@google.com>
This commit is contained in:
Michael Ludwig 2019-06-03 16:46:19 -04:00 committed by Skia Commit-Bot
parent 62fd2c32bb
commit 663afe501a
46 changed files with 53 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bench/CubicKLMBench.cpp
View File

@ -8,7 +8,7 @@
#include "bench/Benchmark.h"
#include "src/core/SkGeometry.h"
#include "src/gpu/GrPathUtils.h"
#include "src/gpu/geometry/GrPathUtils.h"
class CubicKLMBench : public Benchmark {
public:

2
gm/beziereffects.cpp
View File

@ -34,7 +34,6 @@
#include "src/gpu/GrMemoryPool.h"
#include "src/gpu/GrOpFlushState.h"
#include "src/gpu/GrPaint.h"
#include "src/gpu/GrPathUtils.h"
#include "src/gpu/GrProcessorAnalysis.h"
#include "src/gpu/GrProcessorSet.h"
#include "src/gpu/GrRecordingContextPriv.h"
@ -43,6 +42,7 @@
#include "src/gpu/GrUserStencilSettings.h"
#include "src/gpu/effects/GrBezierEffect.h"
#include "src/gpu/effects/GrPorterDuffXferProcessor.h"
#include "src/gpu/geometry/GrPathUtils.h"
#include "src/gpu/ops/GrDrawOp.h"
#include "src/gpu/ops/GrMeshDrawOp.h"
#include "src/gpu/ops/GrOp.h"

10
gn/gpu.gni
View File

@ -132,8 +132,6 @@ skia_gpu_sources = [
"$_src/gpu/GrPathRendererChain.h",
"$_src/gpu/GrPathRenderer.cpp",
"$_src/gpu/GrPathRenderer.h",
"$_src/gpu/GrPathUtils.cpp",
"$_src/gpu/GrPathUtils.h",
"$_src/gpu/GrPendingIOResource.h",
"$_src/gpu/GrOnFlushResourceProvider.cpp",
"$_src/gpu/GrOnFlushResourceProvider.h",
@ -155,7 +153,6 @@ skia_gpu_sources = [
"$_src/gpu/GrProxyProvider.h",
"$_src/gpu/GrRecordingContext.cpp",
"$_src/gpu/GrRecordingContextPriv.h",
"$_src/gpu/GrRect.h",
"$_src/gpu/GrRectanizer.h",
"$_src/gpu/GrRectanizer_pow2.cpp",
"$_src/gpu/GrRectanizer_pow2.h",
@ -186,8 +183,6 @@ skia_gpu_sources = [
"$_src/gpu/GrSemaphore.h",
"$_src/gpu/GrShaderCaps.h",
"$_src/gpu/GrShaderCaps.cpp",
"$_src/gpu/GrShape.cpp",
"$_src/gpu/GrShape.h",
"$_src/gpu/GrStencilAttachment.cpp",
"$_src/gpu/GrStencilAttachment.h",
"$_src/gpu/GrStencilClip.h",
@ -346,8 +341,13 @@ skia_gpu_sources = [
"$_src/gpu/effects/GrYUVtoRGBEffect.cpp",
"$_src/gpu/effects/GrYUVtoRGBEffect.h",
"$_src/gpu/geometry/GrPathUtils.cpp",
"$_src/gpu/geometry/GrPathUtils.h",
"$_src/gpu/geometry/GrQuad.cpp",
"$_src/gpu/geometry/GrQuad.h",
"$_src/gpu/geometry/GrRect.h",
"$_src/gpu/geometry/GrShape.cpp",
"$_src/gpu/geometry/GrShape.h",
"$_src/gpu/effects/generated/GrAARectEffect.cpp",
"$_src/gpu/effects/generated/GrAARectEffect.h",

2
samplecode/SampleCCPRGeometry.cpp
View File

@ -18,7 +18,6 @@
#include "src/gpu/GrClip.h"
#include "src/gpu/GrContextPriv.h"
#include "src/gpu/GrMemoryPool.h"
#include "src/gpu/GrPathUtils.h"
#include "src/gpu/GrRenderTargetContext.h"
#include "src/gpu/GrRenderTargetContextPriv.h"
#include "src/gpu/GrResourceProvider.h"
@ -27,6 +26,7 @@
#include "src/gpu/ccpr/GrCCStroker.h"
#include "src/gpu/ccpr/GrGSCoverageProcessor.h"
#include "src/gpu/ccpr/GrVSCoverageProcessor.h"
#include "src/gpu/geometry/GrPathUtils.h"
#include "src/gpu/gl/GrGLGpu.h"
#include "src/gpu/glsl/GrGLSLFragmentProcessor.h"
#include "src/gpu/ops/GrDrawOp.h"

2
src/core/SkBlurMF.cpp
View File

@ -27,13 +27,13 @@
#include "src/gpu/GrRenderTargetContext.h"
#include "src/gpu/GrResourceProvider.h"
#include "src/gpu/GrShaderCaps.h"
#include "src/gpu/GrShape.h"
#include "src/gpu/GrStyle.h"
#include "src/gpu/effects/GrTextureDomain.h"
#include "src/gpu/effects/generated/GrCircleBlurFragmentProcessor.h"
#include "src/gpu/effects/generated/GrRRectBlurEffect.h"
#include "src/gpu/effects/generated/GrRectBlurEffect.h"
#include "src/gpu/effects/generated/GrSimpleTextureEffect.h"
#include "src/gpu/geometry/GrShape.h"
#include "src/gpu/glsl/GrGLSLFragmentProcessor.h"
#include "src/gpu/glsl/GrGLSLFragmentShaderBuilder.h"
#include "src/gpu/glsl/GrGLSLProgramDataManager.h"

2
src/gpu/GrBlurUtils.cpp
View File

@ -15,10 +15,10 @@
#include "src/gpu/GrRecordingContextPriv.h"
#include "src/gpu/GrRenderTargetContext.h"
#include "src/gpu/GrRenderTargetContextPriv.h"
#include "src/gpu/GrShape.h"
#include "src/gpu/GrSoftwarePathRenderer.h"
#include "src/gpu/GrStyle.h"
#include "src/gpu/effects/generated/GrSimpleTextureEffect.h"
#include "src/gpu/geometry/GrShape.h"
#include "include/core/SkPaint.h"
#include "src/core/SkDraw.h"

2
src/gpu/GrClipStackClip.cpp
View File

@ -22,12 +22,12 @@
#include "src/gpu/GrRecordingContextPriv.h"
#include "src/gpu/GrRenderTargetContextPriv.h"
#include "src/gpu/GrSWMaskHelper.h"
#include "src/gpu/GrShape.h"
#include "src/gpu/GrStencilAttachment.h"
#include "src/gpu/GrStyle.h"
#include "src/gpu/effects/GrConvexPolyEffect.h"
#include "src/gpu/effects/GrRRectEffect.h"
#include "src/gpu/effects/GrTextureDomain.h"
#include "src/gpu/geometry/GrShape.h"
typedef SkClipStack::Element Element;
typedef GrReducedClip::InitialState InitialState;

2
src/gpu/GrDistanceFieldGenFromVector.cpp
View File

@ -15,7 +15,7 @@
#include "src/core/SkGeometry.h"
#include "src/core/SkPointPriv.h"
#include "src/core/SkRectPriv.h"
#include "src/gpu/GrPathUtils.h"
#include "src/gpu/geometry/GrPathUtils.h"
/**
* If a scanline (a row of texel) cross from the kRight_SegSide

2
src/gpu/GrGlyph.h
View File

@ -10,7 +10,7 @@
#include "include/gpu/GrTypes.h"
#include "src/gpu/GrDrawOpAtlas.h"
#include "src/gpu/GrRect.h"
#include "src/gpu/geometry/GrRect.h"
#include "include/core/SkPath.h"
#include "include/private/SkChecksum.h"

2
src/gpu/GrPath.cpp
View File

@ -6,7 +6,7 @@
*/
#include "src/gpu/GrPath.h"
#include "src/gpu/GrShape.h"
#include "src/gpu/geometry/GrShape.h"
static inline void write_style_key(uint32_t* key, const GrStyle& style) {
// Pass 1 for the scale since the GPU will apply the style not GrStyle::applyToPath().

2
src/gpu/GrPathRenderer.cpp
View File

@ -11,8 +11,8 @@
#include "src/gpu/GrPathRenderer.h"
#include "src/gpu/GrRecordingContextPriv.h"
#include "src/gpu/GrRenderTargetContext.h"
#include "src/gpu/GrShape.h"
#include "src/gpu/GrUserStencilSettings.h"
#include "src/gpu/geometry/GrShape.h"
#ifdef SK_DEBUG
void GrPathRenderer::StencilPathArgs::validate() const {

2
src/gpu/GrPipeline.h
View File

@ -16,7 +16,6 @@
#include "src/gpu/GrPendingIOResource.h"
#include "src/gpu/GrProcessorSet.h"
#include "src/gpu/GrProgramDesc.h"
#include "src/gpu/GrRect.h"
#include "src/gpu/GrScissorState.h"
#include "src/gpu/GrUserStencilSettings.h"
#include "src/gpu/GrWindowRectsState.h"
@ -24,6 +23,7 @@
#include "src/gpu/effects/GrDisableColorXP.h"
#include "src/gpu/effects/GrPorterDuffXferProcessor.h"
#include "src/gpu/effects/generated/GrSimpleTextureEffect.h"
#include "src/gpu/geometry/GrRect.h"
class GrAppliedClip;
class GrOp;

2
src/gpu/GrReducedClip.cpp
View File

@ -16,7 +16,6 @@
#include "src/gpu/GrReducedClip.h"
#include "src/gpu/GrRenderTargetContext.h"
#include "src/gpu/GrRenderTargetContextPriv.h"
#include "src/gpu/GrShape.h"
#include "src/gpu/GrStencilClip.h"
#include "src/gpu/GrStencilSettings.h"
#include "src/gpu/GrStyle.h"
@ -25,6 +24,7 @@
#include "src/gpu/effects/GrConvexPolyEffect.h"
#include "src/gpu/effects/GrRRectEffect.h"
#include "src/gpu/effects/generated/GrAARectEffect.h"
#include "src/gpu/geometry/GrShape.h"
/**
* There are plenty of optimizations that could be added here. Maybe flips could be folded into

2
src/gpu/GrRenderTargetContext.cpp
View File

@ -35,7 +35,6 @@
#include "src/gpu/GrRecordingContextPriv.h"
#include "src/gpu/GrRenderTargetContextPriv.h"
#include "src/gpu/GrResourceProvider.h"
#include "src/gpu/GrShape.h"
#include "src/gpu/GrStencilAttachment.h"
#include "src/gpu/GrStyle.h"
#include "src/gpu/GrTracing.h"
@ -44,6 +43,7 @@
#include "src/gpu/effects/GrRRectEffect.h"
#include "src/gpu/effects/GrTextureDomain.h"
#include "src/gpu/geometry/GrQuad.h"
#include "src/gpu/geometry/GrShape.h"
#include "src/gpu/ops/GrAtlasTextOp.h"
#include "src/gpu/ops/GrClearOp.h"
#include "src/gpu/ops/GrClearStencilClipOp.h"

2
src/gpu/GrRenderTargetOpList.cpp
View File

@ -15,10 +15,10 @@
#include "src/gpu/GrGpuCommandBuffer.h"
#include "src/gpu/GrMemoryPool.h"
#include "src/gpu/GrRecordingContextPriv.h"
#include "src/gpu/GrRect.h"
#include "src/gpu/GrRenderTargetContext.h"
#include "src/gpu/GrRenderTargetOpList.h"
#include "src/gpu/GrResourceAllocator.h"
#include "src/gpu/geometry/GrRect.h"
#include "src/gpu/ops/GrClearOp.h"
#include "src/gpu/ops/GrCopySurfaceOp.h"

2
src/gpu/GrSWMaskHelper.cpp
View File

@ -12,8 +12,8 @@
#include "src/gpu/GrCaps.h"
#include "src/gpu/GrProxyProvider.h"
#include "src/gpu/GrRecordingContextPriv.h"
#include "src/gpu/GrShape.h"
#include "src/gpu/GrSurfaceContext.h"
#include "src/gpu/geometry/GrShape.h"
/*
* Convert a boolean operation into a transfer mode code

2
src/gpu/GrSoftwarePathRenderer.cpp
View File

@ -21,9 +21,9 @@
#include "src/gpu/GrRecordingContextPriv.h"
#include "src/gpu/GrRenderTargetContextPriv.h"
#include "src/gpu/GrSWMaskHelper.h"
#include "src/gpu/GrShape.h"
#include "src/gpu/GrSoftwarePathRenderer.h"
#include "src/gpu/GrSurfaceContextPriv.h"
#include "src/gpu/geometry/GrShape.h"
#include "src/gpu/ops/GrDrawOp.h"
////////////////////////////////////////////////////////////////////////////////

2
src/gpu/GrTessellator.cpp
View File

@ -8,8 +8,8 @@
#include "src/gpu/GrTessellator.h"
#include "src/gpu/GrDefaultGeoProcFactory.h"
#include "src/gpu/GrPathUtils.h"
#include "src/gpu/GrVertexWriter.h"
#include "src/gpu/geometry/GrPathUtils.h"
#include "include/core/SkPath.h"
#include "src/core/SkArenaAlloc.h"

2
src/gpu/SkGpuDevice.cpp
View File

@ -37,7 +37,6 @@
#include "src/gpu/GrGpu.h"
#include "src/gpu/GrImageTextureMaker.h"
#include "src/gpu/GrRenderTargetContextPriv.h"
#include "src/gpu/GrShape.h"
#include "src/gpu/GrStyle.h"
#include "src/gpu/GrSurfaceProxyPriv.h"
#include "src/gpu/GrTextureAdjuster.h"
@ -45,6 +44,7 @@
#include "src/gpu/SkGr.h"
#include "src/gpu/effects/GrBicubicEffect.h"
#include "src/gpu/effects/GrTextureDomain.h"
#include "src/gpu/geometry/GrShape.h"
#include "src/gpu/text/GrTextTarget.h"
#include "src/image/SkImage_Base.h"
#include "src/image/SkReadPixelsRec.h"

2
src/gpu/SkGpuDevice_drawTexture.cpp
View File

@ -16,7 +16,6 @@
#include "src/gpu/GrColorSpaceXform.h"
#include "src/gpu/GrImageTextureMaker.h"
#include "src/gpu/GrRenderTargetContext.h"
#include "src/gpu/GrShape.h"
#include "src/gpu/GrStyle.h"
#include "src/gpu/GrTextureAdjuster.h"
#include "src/gpu/GrTextureMaker.h"
@ -24,6 +23,7 @@
#include "src/gpu/effects/GrBicubicEffect.h"
#include "src/gpu/effects/GrTextureDomain.h"
#include "src/gpu/effects/generated/GrSimpleTextureEffect.h"
#include "src/gpu/geometry/GrShape.h"
#include "src/image/SkImage_Base.h"
namespace {

2
src/gpu/ccpr/GrCCDrawPathsOp.h
View File

@ -9,9 +9,9 @@
#define GrCCDrawPathsOp_DEFINED
#include "src/core/SkTInternalLList.h"
#include "src/gpu/GrShape.h"
#include "src/gpu/ccpr/GrCCPathCache.h"
#include "src/gpu/ccpr/GrCCSTLList.h"
#include "src/gpu/geometry/GrShape.h"
#include "src/gpu/ops/GrDrawOp.h"
class GrCCAtlas;

2
src/gpu/ccpr/GrCCPathCache.h
View File

@ -11,9 +11,9 @@
#include "include/private/SkTHash.h"
#include "src/core/SkExchange.h"
#include "src/core/SkTInternalLList.h"
#include "src/gpu/GrShape.h"
#include "src/gpu/ccpr/GrCCAtlas.h"
#include "src/gpu/ccpr/GrCCPathProcessor.h"
#include "src/gpu/geometry/GrShape.h"
class GrCCPathCacheEntry;
class GrShape;

2
src/gpu/ccpr/GrCCPerFlushResources.cpp
View File

@ -14,11 +14,11 @@
#include "src/gpu/GrOnFlushResourceProvider.h"
#include "src/gpu/GrRecordingContextPriv.h"
#include "src/gpu/GrRenderTargetContext.h"
#include "src/gpu/GrShape.h"
#include "src/gpu/GrSurfaceContextPriv.h"
#include "src/gpu/ccpr/GrCCPathCache.h"
#include "src/gpu/ccpr/GrGSCoverageProcessor.h"
#include "src/gpu/ccpr/GrVSCoverageProcessor.h"
#include "src/gpu/geometry/GrShape.h"
using FillBatchID = GrCCFiller::BatchID;
using StrokeBatchID = GrCCStroker::BatchID;

2
src/gpu/GrPathUtils.cpp → src/gpu/geometry/GrPathUtils.cpp
View File

@ -5,7 +5,7 @@
* found in the LICENSE file.
*/
#include "src/gpu/GrPathUtils.h"
#include "src/gpu/geometry/GrPathUtils.h"
#include "include/gpu/GrTypes.h"
#include "src/core/SkMathPriv.h"

0
src/gpu/GrPathUtils.h → src/gpu/geometry/GrPathUtils.h
View File

0
src/gpu/GrRect.h → src/gpu/geometry/GrRect.h
View File

2
src/gpu/GrShape.cpp → src/gpu/geometry/GrShape.cpp
View File

@ -5,7 +5,7 @@
* found in the LICENSE file.
*/
#include "src/gpu/GrShape.h"
#include "src/gpu/geometry/GrShape.h"
#include <utility>

0
src/gpu/GrShape.h → src/gpu/geometry/GrShape.h
View File

4
src/gpu/ops/GrAAConvexPathRenderer.cpp
View File

@ -13,11 +13,11 @@
#include "src/gpu/GrCaps.h"
#include "src/gpu/GrDrawOpTest.h"
#include "src/gpu/GrGeometryProcessor.h"
#include "src/gpu/GrPathUtils.h"
#include "src/gpu/GrProcessor.h"
#include "src/gpu/GrRenderTargetContext.h"
#include "src/gpu/GrShape.h"
#include "src/gpu/GrVertexWriter.h"
#include "src/gpu/geometry/GrPathUtils.h"
#include "src/gpu/geometry/GrShape.h"
#include "src/gpu/glsl/GrGLSLFragmentShaderBuilder.h"
#include "src/gpu/glsl/GrGLSLGeometryProcessor.h"
#include "src/gpu/glsl/GrGLSLProgramDataManager.h"

2
src/gpu/ops/GrAAConvexTessellator.cpp
View File

@ -9,7 +9,7 @@
#include "include/core/SkPath.h"
#include "include/core/SkPoint.h"
#include "include/core/SkString.h"
#include "src/gpu/GrPathUtils.h"
#include "src/gpu/geometry/GrPathUtils.h"
#include "src/gpu/ops/GrAAConvexTessellator.h"
// Next steps:

4
src/gpu/ops/GrAAHairLinePathRenderer.cpp
View File

@ -18,12 +18,12 @@
#include "src/gpu/GrDefaultGeoProcFactory.h"
#include "src/gpu/GrDrawOpTest.h"
#include "src/gpu/GrOpFlushState.h"
#include "src/gpu/GrPathUtils.h"
#include "src/gpu/GrProcessor.h"
#include "src/gpu/GrResourceProvider.h"
#include "src/gpu/GrShape.h"
#include "src/gpu/GrStyle.h"
#include "src/gpu/effects/GrBezierEffect.h"
#include "src/gpu/geometry/GrPathUtils.h"
#include "src/gpu/geometry/GrShape.h"
#include "src/gpu/ops/GrAAHairLinePathRenderer.h"
#include "src/gpu/ops/GrMeshDrawOp.h"
#include "src/gpu/ops/GrSimpleMeshDrawOpHelper.h"

4
src/gpu/ops/GrAALinearizingConvexPathRenderer.cpp
View File

@ -14,12 +14,12 @@
#include "src/gpu/GrDrawOpTest.h"
#include "src/gpu/GrGeometryProcessor.h"
#include "src/gpu/GrOpFlushState.h"
#include "src/gpu/GrPathUtils.h"
#include "src/gpu/GrProcessor.h"
#include "src/gpu/GrRenderTargetContext.h"
#include "src/gpu/GrShape.h"
#include "src/gpu/GrStyle.h"
#include "src/gpu/GrVertexWriter.h"
#include "src/gpu/geometry/GrPathUtils.h"
#include "src/gpu/geometry/GrShape.h"
#include "src/gpu/glsl/GrGLSLGeometryProcessor.h"
#include "src/gpu/ops/GrAAConvexTessellator.h"
#include "src/gpu/ops/GrAALinearizingConvexPathRenderer.h"

2
src/gpu/ops/GrDashLinePathRenderer.cpp
View File

@ -8,7 +8,7 @@
#include "include/private/GrAuditTrail.h"
#include "src/gpu/GrGpu.h"
#include "src/gpu/GrRenderTargetContext.h"
#include "src/gpu/GrShape.h"
#include "src/gpu/geometry/GrShape.h"
#include "src/gpu/ops/GrDashLinePathRenderer.h"
#include "src/gpu/ops/GrDashOp.h"
#include "src/gpu/ops/GrMeshDrawOp.h"

4
src/gpu/ops/GrDefaultPathRenderer.cpp
View File

@ -18,11 +18,11 @@
#include "src/gpu/GrFixedClip.h"
#include "src/gpu/GrMesh.h"
#include "src/gpu/GrOpFlushState.h"
#include "src/gpu/GrPathUtils.h"
#include "src/gpu/GrRenderTargetContextPriv.h"
#include "src/gpu/GrShape.h"
#include "src/gpu/GrStyle.h"
#include "src/gpu/GrSurfaceContextPriv.h"
#include "src/gpu/geometry/GrPathUtils.h"
#include "src/gpu/geometry/GrShape.h"
#include "src/gpu/ops/GrMeshDrawOp.h"
#include "src/gpu/ops/GrSimpleMeshDrawOpHelper.h"

2
src/gpu/ops/GrSimpleMeshDrawOpHelper.cpp
View File

@ -7,9 +7,9 @@
#include "src/gpu/GrAppliedClip.h"
#include "src/gpu/GrProcessorSet.h"
#include "src/gpu/GrRect.h"
#include "src/gpu/GrUserStencilSettings.h"
#include "src/gpu/SkGr.h"
#include "src/gpu/geometry/GrRect.h"
#include "src/gpu/ops/GrSimpleMeshDrawOpHelper.h"
GrSimpleMeshDrawOpHelper::GrSimpleMeshDrawOpHelper(const MakeArgs& args, GrAAType aaType,

4
src/gpu/ops/GrSmallPathRenderer.h
View File

@ -11,8 +11,8 @@
#include "src/gpu/GrDrawOpAtlas.h"
#include "src/gpu/GrOnFlushResourceProvider.h"
#include "src/gpu/GrPathRenderer.h"
#include "src/gpu/GrRect.h"
#include "src/gpu/GrShape.h"
#include "src/gpu/geometry/GrRect.h"
#include "src/gpu/geometry/GrShape.h"
#include "src/core/SkOpts.h"
#include "src/core/SkTDynamicHash.h"

2
src/gpu/ops/GrStencilAndCoverPathRenderer.cpp
View File

@ -12,9 +12,9 @@
#include "src/gpu/GrPath.h"
#include "src/gpu/GrRenderTargetContextPriv.h"
#include "src/gpu/GrResourceProvider.h"
#include "src/gpu/GrShape.h"
#include "src/gpu/GrStencilClip.h"
#include "src/gpu/GrStyle.h"
#include "src/gpu/geometry/GrShape.h"
#include "src/gpu/ops/GrDrawPathOp.h"
#include "src/gpu/ops/GrStencilAndCoverPathRenderer.h"
#include "src/gpu/ops/GrStencilPathOp.h"

4
src/gpu/ops/GrTessellatingPathRenderer.cpp
View File

@ -15,12 +15,12 @@
#include "src/gpu/GrDrawOpTest.h"
#include "src/gpu/GrMesh.h"
#include "src/gpu/GrOpFlushState.h"
#include "src/gpu/GrPathUtils.h"
#include "src/gpu/GrResourceCache.h"
#include "src/gpu/GrResourceProvider.h"
#include "src/gpu/GrShape.h"
#include "src/gpu/GrStyle.h"
#include "src/gpu/GrTessellator.h"
#include "src/gpu/geometry/GrPathUtils.h"
#include "src/gpu/geometry/GrShape.h"
#include "src/gpu/ops/GrMeshDrawOp.h"
#include "src/gpu/ops/GrSimpleMeshDrawOpHelper.h"

2
src/gpu/text/GrTextBlob.cpp
View File

@ -11,8 +11,8 @@
#include "src/core/SkPaintPriv.h"
#include "src/gpu/GrBlurUtils.h"
#include "src/gpu/GrClip.h"
#include "src/gpu/GrShape.h"
#include "src/gpu/GrStyle.h"
#include "src/gpu/geometry/GrShape.h"
#include "src/gpu/ops/GrAtlasTextOp.h"
#include "src/gpu/text/GrTextBlob.h"
#include "src/gpu/text/GrTextTarget.h"

2
src/utils/SkShadowTessellator.cpp
View File

@ -16,7 +16,7 @@
#include "src/utils/SkShadowTessellator.h"
#if SK_SUPPORT_GPU
#include "src/gpu/GrPathUtils.h"
#include "src/gpu/geometry/GrPathUtils.h"
#endif

2
src/utils/SkShadowUtils.cpp
View File

@ -25,8 +25,8 @@
#include "src/utils/SkShadowTessellator.h"
#include <new>
#if SK_SUPPORT_GPU
#include "src/gpu/GrShape.h"
#include "src/gpu/effects/generated/GrBlurredEdgeFragmentProcessor.h"
#include "src/gpu/geometry/GrShape.h"
#endif
/**

2
tests/GpuDrawPathTest.cpp
View File

@ -18,7 +18,7 @@
#include "include/effects/SkDashPathEffect.h"
#include "include/gpu/GrContext.h"
#include "src/gpu/GrPath.h"
#include "src/gpu/GrShape.h"
#include "src/gpu/geometry/GrShape.h"
#include "tests/Test.h"
#include <initializer_list>

2
tests/GrCCPRTest.cpp
View File

@ -23,9 +23,9 @@
#include "src/gpu/GrRecordingContextPriv.h"
#include "src/gpu/GrRenderTargetContext.h"
#include "src/gpu/GrRenderTargetContextPriv.h"
#include "src/gpu/GrShape.h"
#include "src/gpu/ccpr/GrCCPathCache.h"
#include "src/gpu/ccpr/GrCoverageCountingPathRenderer.h"
#include "src/gpu/geometry/GrShape.h"
#include "tools/ToolUtils.h"
#include <cmath>

2
tests/GrShapeTest.cpp
View File

@ -12,7 +12,7 @@
#include "include/pathops/SkPathOps.h"
#include "src/core/SkClipOpPriv.h"
#include "src/core/SkRectPriv.h"
#include "src/gpu/GrShape.h"
#include "src/gpu/geometry/GrShape.h"
#include "tests/Test.h"
#include <initializer_list>

2
tests/PathRendererCacheTests.cpp
View File

@ -12,10 +12,10 @@
#include "src/gpu/GrClip.h"
#include "src/gpu/GrContextPriv.h"
#include "src/gpu/GrResourceCache.h"
#include "src/gpu/GrShape.h"
#include "src/gpu/GrSoftwarePathRenderer.h"
#include "src/gpu/GrStyle.h"
#include "src/gpu/effects/GrPorterDuffXferProcessor.h"
#include "src/gpu/geometry/GrShape.h"
#include "src/gpu/ops/GrTessellatingPathRenderer.h"
static SkPath create_concave_path() {

2
tests/TessellatingPathRendererTests.cpp
View File

@ -12,9 +12,9 @@
#include "include/gpu/GrContext.h"
#include "src/gpu/GrClip.h"
#include "src/gpu/GrContextPriv.h"
#include "src/gpu/GrShape.h"
#include "src/gpu/GrStyle.h"
#include "src/gpu/effects/GrPorterDuffXferProcessor.h"
#include "src/gpu/geometry/GrShape.h"
#include "src/gpu/ops/GrTessellatingPathRenderer.h"
#include "src/shaders/SkShaderBase.h"