Make folder for batches
BUG=skia:
Review URL: https://codereview.chromium.org/1277233002
diff --git a/src/gpu/GrAAConvexPathRenderer.cpp b/src/gpu/GrAAConvexPathRenderer.cpp
index 57fae64..36d8392 100644
--- a/src/gpu/GrAAConvexPathRenderer.cpp
+++ b/src/gpu/GrAAConvexPathRenderer.cpp
@@ -9,7 +9,6 @@
#include "GrAAConvexPathRenderer.h"
#include "GrAAConvexTessellator.h"
-#include "GrBatch.h"
#include "GrBatchTarget.h"
#include "GrBatchTest.h"
#include "GrCaps.h"
@@ -25,6 +24,7 @@
#include "SkPathPriv.h"
#include "SkString.h"
#include "SkTraceEvent.h"
+#include "batches/GrBatch.h"
#include "gl/GrGLProcessor.h"
#include "gl/GrGLGeometryProcessor.h"
#include "gl/builders/GrGLProgramBuilder.h"
diff --git a/src/gpu/GrAADistanceFieldPathRenderer.cpp b/src/gpu/GrAADistanceFieldPathRenderer.cpp
index e58ba13..10981ee 100755
--- a/src/gpu/GrAADistanceFieldPathRenderer.cpp
+++ b/src/gpu/GrAADistanceFieldPathRenderer.cpp
@@ -8,7 +8,6 @@
#include "GrAADistanceFieldPathRenderer.h"
-#include "GrBatch.h"
#include "GrBatchTarget.h"
#include "GrBatchTest.h"
#include "GrContext.h"
@@ -18,6 +17,7 @@
#include "GrSWMaskHelper.h"
#include "GrTexturePriv.h"
#include "GrVertexBuffer.h"
+#include "batches/GrBatch.h"
#include "effects/GrDistanceFieldGeoProc.h"
#include "SkDistanceFieldGen.h"
diff --git a/src/gpu/GrAAHairLinePathRenderer.cpp b/src/gpu/GrAAHairLinePathRenderer.cpp
index af2f03c..71ea2a0 100644
--- a/src/gpu/GrAAHairLinePathRenderer.cpp
+++ b/src/gpu/GrAAHairLinePathRenderer.cpp
@@ -7,7 +7,6 @@
#include "GrAAHairLinePathRenderer.h"
-#include "GrBatch.h"
#include "GrBatchTarget.h"
#include "GrBatchTest.h"
#include "GrCaps.h"
@@ -23,6 +22,8 @@
#include "SkStroke.h"
#include "SkTemplates.h"
+#include "batches/GrBatch.h"
+
#include "effects/GrBezierEffect.h"
#define PREALLOC_PTARRAY(N) SkSTArray<(N),SkPoint, true>
diff --git a/src/gpu/GrAALinearizingConvexPathRenderer.cpp b/src/gpu/GrAALinearizingConvexPathRenderer.cpp
index da90fe0..8d4cd5f 100644
--- a/src/gpu/GrAALinearizingConvexPathRenderer.cpp
+++ b/src/gpu/GrAALinearizingConvexPathRenderer.cpp
@@ -9,7 +9,6 @@
#include "GrAALinearizingConvexPathRenderer.h"
#include "GrAAConvexTessellator.h"
-#include "GrBatch.h"
#include "GrBatchTarget.h"
#include "GrBatchTest.h"
#include "GrContext.h"
@@ -24,6 +23,7 @@
#include "SkString.h"
#include "SkTraceEvent.h"
#include "SkPathPriv.h"
+#include "batches/GrBatch.h"
#include "gl/GrGLProcessor.h"
#include "gl/GrGLGeometryProcessor.h"
#include "gl/builders/GrGLProgramBuilder.h"
diff --git a/src/gpu/GrAARectRenderer.cpp b/src/gpu/GrAARectRenderer.cpp
index 8e21e8b..f1f4fd7 100644
--- a/src/gpu/GrAARectRenderer.cpp
+++ b/src/gpu/GrAARectRenderer.cpp
@@ -6,7 +6,6 @@
*/
#include "GrAARectRenderer.h"
-#include "GrBatch.h"
#include "GrBatchTarget.h"
#include "GrBatchTest.h"
#include "GrContext.h"
@@ -19,6 +18,7 @@
#include "GrTestUtils.h"
#include "GrVertexBuffer.h"
#include "SkColorPriv.h"
+#include "batches/GrBatch.h"
#include "gl/GrGLProcessor.h"
#include "gl/GrGLGeometryProcessor.h"
#include "gl/builders/GrGLProgramBuilder.h"
diff --git a/src/gpu/GrAtlasTextContext.cpp b/src/gpu/GrAtlasTextContext.cpp
index c8c5760..7adcbc1 100644
--- a/src/gpu/GrAtlasTextContext.cpp
+++ b/src/gpu/GrAtlasTextContext.cpp
@@ -6,7 +6,6 @@
*/
#include "GrAtlasTextContext.h"
-#include "GrBatch.h"
#include "GrBatchFontCache.h"
#include "GrBatchTarget.h"
#include "GrBatchTest.h"
@@ -38,6 +37,8 @@
#include "SkTextBlob.h"
#include "SkTextMapStateProc.h"
+#include "batches/GrBatch.h"
+
#include "effects/GrBitmapTextGeoProc.h"
#include "effects/GrDistanceFieldGeoProc.h"
diff --git a/src/gpu/GrContext.cpp b/src/gpu/GrContext.cpp
index 9f83fed..9337a95 100755
--- a/src/gpu/GrContext.cpp
+++ b/src/gpu/GrContext.cpp
@@ -9,7 +9,6 @@
#include "GrContext.h"
#include "GrAARectRenderer.h"
-#include "GrBatch.h"
#include "GrBatchFontCache.h"
#include "GrBatchTarget.h"
#include "GrBatchTest.h"
@@ -48,6 +47,8 @@
#include "SkTLS.h"
#include "SkTraceEvent.h"
+#include "batches/GrBatch.h"
+
#include "effects/GrConfigConversionEffect.h"
#include "effects/GrDashingEffect.h"
#include "effects/GrSingleTextureEffect.h"
diff --git a/src/gpu/GrDefaultPathRenderer.cpp b/src/gpu/GrDefaultPathRenderer.cpp
index d244392..216ea86 100644
--- a/src/gpu/GrDefaultPathRenderer.cpp
+++ b/src/gpu/GrDefaultPathRenderer.cpp
@@ -7,7 +7,6 @@
#include "GrDefaultPathRenderer.h"
-#include "GrBatch.h"
#include "GrBatchTarget.h"
#include "GrBatchTest.h"
#include "GrContext.h"
@@ -21,6 +20,8 @@
#include "SkTLazy.h"
#include "SkTraceEvent.h"
+#include "batches/GrBatch.h"
+
GrDefaultPathRenderer::GrDefaultPathRenderer(bool separateStencilSupport,
bool stencilWrapOpsSupport)
: fSeparateStencil(separateStencilSupport)
diff --git a/src/gpu/GrDrawContext.cpp b/src/gpu/GrDrawContext.cpp
index c3d2548..48ff636 100644
--- a/src/gpu/GrDrawContext.cpp
+++ b/src/gpu/GrDrawContext.cpp
@@ -8,7 +8,6 @@
#include "GrAARectRenderer.h"
#include "GrAtlasTextContext.h"
-#include "GrBatch.h"
#include "GrBatchTest.h"
#include "GrColor.h"
#include "GrDefaultGeoProcFactory.h"
@@ -17,9 +16,11 @@
#include "GrPathRenderer.h"
#include "GrRenderTarget.h"
#include "GrRenderTargetPriv.h"
-#include "GrStrokeRectBatch.h"
#include "GrStencilAndCoverTextContext.h"
+#include "batches/GrBatch.h"
+#include "batches/GrStrokeRectBatch.h"
+
#include "SkGr.h"
#include "SkRSXform.h"
diff --git a/src/gpu/GrDrawTarget.cpp b/src/gpu/GrDrawTarget.cpp
index 9469b3a..ca2d2d9 100644
--- a/src/gpu/GrDrawTarget.cpp
+++ b/src/gpu/GrDrawTarget.cpp
@@ -9,13 +9,11 @@
#include "GrDrawTarget.h"
#include "GrAARectRenderer.h"
-#include "GrBatch.h"
#include "GrCaps.h"
#include "GrGpu.h"
#include "GrPath.h"
#include "GrPipeline.h"
#include "GrMemoryPool.h"
-#include "GrRectBatch.h"
#include "GrRenderTarget.h"
#include "GrResourceProvider.h"
#include "GrRenderTargetPriv.h"
@@ -23,6 +21,9 @@
#include "GrTexture.h"
#include "GrVertexBuffer.h"
+#include "batches/GrBatch.h"
+#include "batches/GrRectBatch.h"
+
#include "SkStrokeRec.h"
////////////////////////////////////////////////////////////////////////////////
diff --git a/src/gpu/GrImmediateDrawTarget.cpp b/src/gpu/GrImmediateDrawTarget.cpp
index f69f86a..1097a79 100644
--- a/src/gpu/GrImmediateDrawTarget.cpp
+++ b/src/gpu/GrImmediateDrawTarget.cpp
@@ -7,13 +7,14 @@
#include "GrImmediateDrawTarget.h"
-#include "GrBatch.h"
#include "GrGpu.h"
#include "GrPipeline.h"
#include "GrRenderTarget.h"
#include "SkRect.h"
#include "SkTypes.h"
+#include "batches/GrBatch.h"
+
GrImmediateDrawTarget::GrImmediateDrawTarget(GrContext* context)
: INHERITED(context)
, fBatchTarget(this->getGpu())
diff --git a/src/gpu/GrOvalRenderer.cpp b/src/gpu/GrOvalRenderer.cpp
index 02009d7..73b8f2d 100644
--- a/src/gpu/GrOvalRenderer.cpp
+++ b/src/gpu/GrOvalRenderer.cpp
@@ -7,7 +7,6 @@
#include "GrOvalRenderer.h"
-#include "GrBatch.h"
#include "GrBatchTarget.h"
#include "GrBatchTest.h"
#include "GrDrawTarget.h"
@@ -20,6 +19,7 @@
#include "SkRRect.h"
#include "SkStrokeRec.h"
#include "SkTLazy.h"
+#include "batches/GrBatch.h"
#include "effects/GrRRectEffect.h"
#include "gl/GrGLProcessor.h"
#include "gl/GrGLGeometryProcessor.h"
diff --git a/src/gpu/GrPipeline.cpp b/src/gpu/GrPipeline.cpp
index fbdd84b..80971da 100644
--- a/src/gpu/GrPipeline.cpp
+++ b/src/gpu/GrPipeline.cpp
@@ -8,12 +8,13 @@
#include "GrPipeline.h"
#include "GrCaps.h"
-#include "GrBatch.h"
#include "GrGpu.h"
#include "GrPipelineBuilder.h"
#include "GrProcOptInfo.h"
#include "GrXferProcessor.h"
+#include "batches/GrBatch.h"
+
GrPipeline::GrPipeline(const GrPipelineBuilder& pipelineBuilder,
const GrProcOptInfo& colorPOI,
const GrProcOptInfo& coveragePOI,
diff --git a/src/gpu/GrPipelineBuilder.cpp b/src/gpu/GrPipelineBuilder.cpp
index 1d37963..f303f53 100644
--- a/src/gpu/GrPipelineBuilder.cpp
+++ b/src/gpu/GrPipelineBuilder.cpp
@@ -7,12 +7,12 @@
#include "GrPipelineBuilder.h"
-#include "GrBatch.h"
#include "GrBlend.h"
#include "GrPaint.h"
#include "GrPipeline.h"
#include "GrProcOptInfo.h"
#include "GrXferProcessor.h"
+#include "batches/GrBatch.h"
#include "effects/GrPorterDuffXferProcessor.h"
GrPipelineBuilder::GrPipelineBuilder()
diff --git a/src/gpu/GrProcOptInfo.cpp b/src/gpu/GrProcOptInfo.cpp
index 53f2e02..17b42b6 100644
--- a/src/gpu/GrProcOptInfo.cpp
+++ b/src/gpu/GrProcOptInfo.cpp
@@ -7,9 +7,10 @@
#include "GrProcOptInfo.h"
-#include "GrBatch.h"
#include "GrGeometryProcessor.h"
+#include "batches/GrBatch.h"
+
void GrProcOptInfo::calcColorWithBatch(const GrBatch* batch,
const GrFragmentStage* stages,
int stageCount) {
diff --git a/src/gpu/GrTargetCommands.h b/src/gpu/GrTargetCommands.h
index 7745018..4de7589 100644
--- a/src/gpu/GrTargetCommands.h
+++ b/src/gpu/GrTargetCommands.h
@@ -8,7 +8,6 @@
#ifndef GrTargetCommands_DEFINED
#define GrTargetCommands_DEFINED
-#include "GrBatch.h"
#include "GrBatchTarget.h"
#include "GrDrawTarget.h"
#include "GrGpu.h"
@@ -19,8 +18,9 @@
#include "SkRect.h"
#include "SkTypes.h"
-class GrBufferedDrawTarget;
+#include "batches/GrBatch.h"
+class GrBufferedDrawTarget;
class GrTargetCommands : ::SkNoncopyable {
public:
diff --git a/src/gpu/GrTessellatingPathRenderer.cpp b/src/gpu/GrTessellatingPathRenderer.cpp
index ebb2390..28a43f1 100644
--- a/src/gpu/GrTessellatingPathRenderer.cpp
+++ b/src/gpu/GrTessellatingPathRenderer.cpp
@@ -7,7 +7,6 @@
#include "GrTessellatingPathRenderer.h"
-#include "GrBatch.h"
#include "GrBatchTarget.h"
#include "GrBatchTest.h"
#include "GrDefaultGeoProcFactory.h"
@@ -18,6 +17,8 @@
#include "SkChunkAlloc.h"
#include "SkGeometry.h"
+#include "batches/GrBatch.h"
+
#include <stdio.h>
/*
diff --git a/src/gpu/GrTestBatch.h b/src/gpu/GrTestBatch.h
index 4bcb7bc..c5758bb 100644
--- a/src/gpu/GrTestBatch.h
+++ b/src/gpu/GrTestBatch.h
@@ -8,9 +8,10 @@
#ifndef GrTestBatch_DEFINED
#define GrTestBatch_DEFINED
-#include "GrBatch.h"
#include "GrVertexBuffer.h"
+#include "batches/GrBatch.h"
+
/*
* A simple batch only for testing purposes which actually doesn't batch at all, but can fit into
* the batch pipeline and generate arbitrary geometry
diff --git a/src/gpu/GrBatch.cpp b/src/gpu/batches/GrBatch.cpp
similarity index 100%
rename from src/gpu/GrBatch.cpp
rename to src/gpu/batches/GrBatch.cpp
diff --git a/src/gpu/GrBatch.h b/src/gpu/batches/GrBatch.h
similarity index 100%
rename from src/gpu/GrBatch.h
rename to src/gpu/batches/GrBatch.h
diff --git a/src/gpu/GrRectBatch.cpp b/src/gpu/batches/GrRectBatch.cpp
similarity index 100%
rename from src/gpu/GrRectBatch.cpp
rename to src/gpu/batches/GrRectBatch.cpp
diff --git a/src/gpu/GrRectBatch.h b/src/gpu/batches/GrRectBatch.h
similarity index 100%
rename from src/gpu/GrRectBatch.h
rename to src/gpu/batches/GrRectBatch.h
diff --git a/src/gpu/GrStrokeRectBatch.cpp b/src/gpu/batches/GrStrokeRectBatch.cpp
similarity index 100%
rename from src/gpu/GrStrokeRectBatch.cpp
rename to src/gpu/batches/GrStrokeRectBatch.cpp
diff --git a/src/gpu/GrStrokeRectBatch.h b/src/gpu/batches/GrStrokeRectBatch.h
similarity index 100%
rename from src/gpu/GrStrokeRectBatch.h
rename to src/gpu/batches/GrStrokeRectBatch.h
diff --git a/src/gpu/effects/GrDashingEffect.cpp b/src/gpu/effects/GrDashingEffect.cpp
index bb20e80..0711cb3 100644
--- a/src/gpu/effects/GrDashingEffect.cpp
+++ b/src/gpu/effects/GrDashingEffect.cpp
@@ -7,7 +7,6 @@
#include "GrDashingEffect.h"
-#include "GrBatch.h"
#include "GrBatchTarget.h"
#include "GrBatchTest.h"
#include "GrCaps.h"
@@ -21,6 +20,7 @@
#include "GrStrokeInfo.h"
#include "GrVertexBuffer.h"
#include "SkGr.h"
+#include "batches/GrBatch.h"
#include "gl/GrGLGeometryProcessor.h"
#include "gl/GrGLFragmentProcessor.h"
#include "gl/builders/GrGLProgramBuilder.h"