Index: gyp/gpu.gypi |
diff --git a/gyp/gpu.gypi b/gyp/gpu.gypi |
index ce623560cd913ed5c7eeee0f6183113606a98a09..fdb26ba0050d2576f71ab94ca3304ad281bb9ed3 100644 |
--- a/gyp/gpu.gypi |
+++ b/gyp/gpu.gypi |
@@ -55,16 +55,6 @@ |
'<(skia_include_path)/gpu/gl/GrGLInterface.h', |
'<(skia_include_path)/gpu/gl/GrGLSLPrettyPrint.h', |
- '<(skia_src_path)/gpu/GrAAHairLinePathRenderer.cpp', |
- '<(skia_src_path)/gpu/GrAAHairLinePathRenderer.h', |
- '<(skia_src_path)/gpu/GrAAConvexPathRenderer.cpp', |
- '<(skia_src_path)/gpu/GrAAConvexPathRenderer.h', |
- '<(skia_src_path)/gpu/GrAALinearizingConvexPathRenderer.cpp', |
- '<(skia_src_path)/gpu/GrAALinearizingConvexPathRenderer.h', |
- '<(skia_src_path)/gpu/GrAAConvexTessellator.cpp', |
- '<(skia_src_path)/gpu/GrAAConvexTessellator.h', |
- '<(skia_src_path)/gpu/GrAADistanceFieldPathRenderer.cpp', |
- '<(skia_src_path)/gpu/GrAADistanceFieldPathRenderer.h', |
'<(skia_src_path)/gpu/GrAddPathRenderers_default.cpp', |
'<(skia_src_path)/gpu/GrAutoLocaleSetter.h', |
'<(skia_src_path)/gpu/GrAllocator.h', |
@@ -98,8 +88,6 @@ |
'<(skia_src_path)/gpu/GrCommandBuilder.h', |
'<(skia_src_path)/gpu/GrCommandBuilder.cpp', |
'<(skia_src_path)/gpu/GrCoordTransform.cpp', |
- '<(skia_src_path)/gpu/GrDashLinePathRenderer.cpp', |
- '<(skia_src_path)/gpu/GrDashLinePathRenderer.h', |
'<(skia_src_path)/gpu/GrDefaultGeoProcFactory.cpp', |
'<(skia_src_path)/gpu/GrDefaultGeoProcFactory.h', |
'<(skia_src_path)/gpu/GrDefaultPathRenderer.cpp', |
@@ -182,8 +170,6 @@ |
'<(skia_src_path)/gpu/GrResourceProvider.h', |
'<(skia_src_path)/gpu/GrStencil.cpp', |
'<(skia_src_path)/gpu/GrStencil.h', |
- '<(skia_src_path)/gpu/GrStencilAndCoverPathRenderer.cpp', |
- '<(skia_src_path)/gpu/GrStencilAndCoverPathRenderer.h', |
'<(skia_src_path)/gpu/GrStencilAndCoverTextContext.cpp', |
'<(skia_src_path)/gpu/GrStencilAndCoverTextContext.h', |
'<(skia_src_path)/gpu/GrStencilAttachment.cpp', |
@@ -195,8 +181,6 @@ |
'<(skia_src_path)/gpu/GrTraceMarker.cpp', |
'<(skia_src_path)/gpu/GrTraceMarker.h', |
'<(skia_src_path)/gpu/GrTracing.h', |
- '<(skia_src_path)/gpu/GrTessellatingPathRenderer.cpp', |
- '<(skia_src_path)/gpu/GrTessellatingPathRenderer.h', |
'<(skia_src_path)/gpu/GrTestUtils.cpp', |
'<(skia_src_path)/gpu/GrSWMaskHelper.cpp', |
'<(skia_src_path)/gpu/GrSWMaskHelper.h', |
@@ -218,6 +202,16 @@ |
'<(skia_src_path)/gpu/GrXferProcessor.cpp', |
# Batches |
+ '<(skia_src_path)/gpu/batches/GrAAHairLinePathRenderer.cpp', |
+ '<(skia_src_path)/gpu/batches/GrAAHairLinePathRenderer.h', |
+ '<(skia_src_path)/gpu/batches/GrAALinearizingConvexPathRenderer.cpp', |
+ '<(skia_src_path)/gpu/batches/GrAALinearizingConvexPathRenderer.h', |
+ '<(skia_src_path)/gpu/batches/GrAAConvexTessellator.cpp', |
+ '<(skia_src_path)/gpu/batches/GrAAConvexTessellator.h', |
+ '<(skia_src_path)/gpu/batches/GrAADistanceFieldPathRenderer.cpp', |
+ '<(skia_src_path)/gpu/batches/GrAADistanceFieldPathRenderer.h', |
+ '<(skia_src_path)/gpu/batches/GrAAConvexPathRenderer.cpp', |
+ '<(skia_src_path)/gpu/batches/GrAAConvexPathRenderer.h', |
'<(skia_src_path)/gpu/batches/GrAAFillRectBatch.cpp', |
'<(skia_src_path)/gpu/batches/GrAAFillRectBatch.h', |
'<(skia_src_path)/gpu/batches/GrAAStrokeRectBatch.cpp', |
@@ -227,6 +221,8 @@ |
'<(skia_src_path)/gpu/batches/GrClearBatch.h', |
'<(skia_src_path)/gpu/batches/GrCopySurfaceBatch.cpp', |
'<(skia_src_path)/gpu/batches/GrCopySurfaceBatch.h', |
+ '<(skia_src_path)/gpu/batches/GrDashLinePathRenderer.cpp', |
+ '<(skia_src_path)/gpu/batches/GrDashLinePathRenderer.h', |
'<(skia_src_path)/gpu/batches/GrDiscardBatch.h', |
'<(skia_src_path)/gpu/batches/GrDrawBatch.cpp', |
'<(skia_src_path)/gpu/batches/GrDrawBatch.h', |
@@ -241,7 +237,11 @@ |
'<(skia_src_path)/gpu/batches/GrRectBatchFactory.cpp', |
'<(skia_src_path)/gpu/batches/GrStrokeRectBatch.cpp', |
'<(skia_src_path)/gpu/batches/GrStrokeRectBatch.h', |
+ '<(skia_src_path)/gpu/batches/GrStencilAndCoverPathRenderer.cpp', |
+ '<(skia_src_path)/gpu/batches/GrStencilAndCoverPathRenderer.h', |
'<(skia_src_path)/gpu/batches/GrStencilPathBatch.h', |
+ '<(skia_src_path)/gpu/batches/GrTessellatingPathRenderer.cpp', |
+ '<(skia_src_path)/gpu/batches/GrTessellatingPathRenderer.h', |
'<(skia_src_path)/gpu/batches/GrTInstanceBatch.h', |
'<(skia_src_path)/gpu/batches/GrVertexBatch.cpp', |
'<(skia_src_path)/gpu/batches/GrVertexBatch.h', |