rename GrDrawTargetCaps.h to GrCaps.h and move to include

Review URL: https://codereview.chromium.org/1135113005

gyp/gpu.gypi

@@ -12,6 +12,7 @@
 {
   'variables': {
     'skgpu_sources': [
+      '<(skia_include_path)/gpu/GrCaps.h',
       '<(skia_include_path)/gpu/GrClip.h',
       '<(skia_include_path)/gpu/GrColor.h',
       '<(skia_include_path)/gpu/GrConfig.h',
@@ -99,7 +100,6 @@
       '<(skia_src_path)/gpu/GrDefaultPathRenderer.h',
       '<(skia_src_path)/gpu/GrDrawTarget.cpp',
       '<(skia_src_path)/gpu/GrDrawTarget.h',
-      '<(skia_src_path)/gpu/GrDrawTargetCaps.h',
       '<(skia_src_path)/gpu/GrFontAtlasSizes.h',
       '<(skia_src_path)/gpu/GrFontScaler.cpp',
       '<(skia_src_path)/gpu/GrFontScaler.h',

src/effects/SkArithmeticMode_gpu.h

@@ -12,8 +12,8 @@
 
 #if SK_SUPPORT_GPU
 
+#include "GrCaps.h"
 #include "GrCoordTransform.h"
-#include "GrDrawTargetCaps.h"
 #include "GrFragmentProcessor.h"
 #include "GrTextureAccess.h"
 #include "GrTypes.h"

src/gpu/GrAAConvexPathRenderer.cpp

@@ -12,9 +12,9 @@
 #include "GrBatch.h"
 #include "GrBatchTarget.h"
 #include "GrBatchTest.h"
+#include "GrCaps.h"
 #include "GrContext.h"
 #include "GrDefaultGeoProcFactory.h"
-#include "GrDrawTargetCaps.h"
 #include "GrGeometryProcessor.h"
 #include "GrInvariantOutput.h"
 #include "GrPathUtils.h"

src/gpu/GrAAHairLinePathRenderer.cpp

@@ -10,9 +10,9 @@
 #include "GrBatch.h"
 #include "GrBatchTarget.h"
 #include "GrBatchTest.h"
+#include "GrCaps.h"
 #include "GrContext.h"
 #include "GrDefaultGeoProcFactory.h"
-#include "GrDrawTargetCaps.h"
 #include "GrIndexBuffer.h"
 #include "GrPathUtils.h"
 #include "GrPipelineBuilder.h"

src/gpu/GrBufferAllocPool.cpp

@@ -8,7 +8,7 @@
 
 
 #include "GrBufferAllocPool.h"
-#include "GrDrawTargetCaps.h"
+#include "GrCaps.h"
 #include "GrGpu.h"
 #include "GrIndexBuffer.h"
 #include "GrTypes.h"

src/gpu/GrClipMaskManager.cpp

@@ -9,7 +9,7 @@
 #include "GrAAConvexPathRenderer.h"
 #include "GrAAHairLinePathRenderer.h"
 #include "GrAARectRenderer.h"
-#include "GrDrawTargetCaps.h"
+#include "GrCaps.h"
 #include "GrPaint.h"
 #include "GrPathRenderer.h"
 #include "GrRenderTarget.h"

src/gpu/GrContext.cpp

@@ -14,10 +14,10 @@
 #include "GrBatchFontCache.h"
 #include "GrBatchTarget.h"
 #include "GrBatchTest.h"
+#include "GrCaps.h"
 #include "GrDefaultGeoProcFactory.h"
 #include "GrGpuResource.h"
 #include "GrGpuResourcePriv.h"
-#include "GrDrawTargetCaps.h"
 #include "GrGpu.h"
 #include "GrImmediateDrawTarget.h"
 #include "GrIndexBuffer.h"

src/gpu/GrCoordTransform.cpp

@@ -6,8 +6,8 @@
  */
 
 #include "GrCoordTransform.h"
+#include "GrCaps.h"
 #include "GrContext.h"
-#include "GrDrawTargetCaps.h"
 #include "GrGpu.h"
 
 void GrCoordTransform::reset(GrCoordSet sourceCoords, const SkMatrix& m, const GrTexture* texture,

src/gpu/GrDrawTarget.cpp

@@ -9,8 +9,8 @@
 #include "GrDrawTarget.h"
 
 #include "GrBatch.h"
+#include "GrCaps.h"
 #include "GrContext.h"
-#include "GrDrawTargetCaps.h"
 #include "GrPath.h"
 #include "GrPipeline.h"
 #include "GrMemoryPool.h"

src/gpu/GrGpu.cpp

@@ -9,8 +9,8 @@
 
 #include "GrGpu.h"
 
+#include "GrCaps.h"
 #include "GrContext.h"
-#include "GrDrawTargetCaps.h"
 #include "GrGpuResourcePriv.h"
 #include "GrIndexBuffer.h"
 #include "GrResourceCache.h"

src/gpu/GrPathRendererChain.cpp

@@ -9,9 +9,9 @@
 
 #include "GrPathRendererChain.h"
 
+#include "GrCaps.h"
 #include "GrContext.h"
 #include "GrDefaultPathRenderer.h"
-#include "GrDrawTargetCaps.h"
 #include "GrGpu.h"
 
 GrPathRendererChain::GrPathRendererChain(GrContext* context)

src/gpu/GrPipeline.cpp

@@ -7,8 +7,8 @@
 
 #include "GrPipeline.h"
 
+#include "GrCaps.h"
 #include "GrBatch.h"
-#include "GrDrawTargetCaps.h"
 #include "GrGpu.h"
 #include "GrPipelineBuilder.h"
 #include "GrProcOptInfo.h"

src/gpu/GrPipelineBuilder.h

@@ -9,8 +9,8 @@
 #define GrPipelineBuilder_DEFINED
 
 #include "GrBlend.h"
+#include "GrCaps.h"
 #include "GrClip.h"
-#include "GrDrawTargetCaps.h"
 #include "GrGpuResourceRef.h"
 #include "GrFragmentStage.h"
 #include "GrProcOptInfo.h"

src/gpu/GrSWMaskHelper.cpp

@@ -8,7 +8,7 @@
 #include "GrSWMaskHelper.h"
 
 #include "GrPipelineBuilder.h"
-#include "GrDrawTargetCaps.h"
+#include "GrCaps.h"
 #include "GrGpu.h"
 
 #include "SkData.h"

src/gpu/GrStencilAndCoverPathRenderer.cpp

@@ -8,8 +8,9 @@
 
 
 #include "GrStencilAndCoverPathRenderer.h"
+#include "GrCaps.h"
 #include "GrContext.h"
-#include "GrDrawTargetCaps.h"
+#include "GrGpu.h"
 #include "GrPath.h"
 #include "GrRenderTarget.h"
 #include "GrResourceProvider.h"

src/gpu/GrTexture.cpp

@@ -7,7 +7,7 @@
  */
 
 #include "GrContext.h"
-#include "GrDrawTargetCaps.h"
+#include "GrCaps.h"
 #include "GrGpu.h"
 #include "GrResourceKey.h"
 #include "GrRenderTarget.h"

src/gpu/effects/GrBezierEffect.h

@@ -8,7 +8,7 @@
 #ifndef GrBezierEffect_DEFINED
 #define GrBezierEffect_DEFINED
 
-#include "GrDrawTargetCaps.h"
+#include "GrCaps.h"
 #include "GrProcessor.h"
 #include "GrGeometryProcessor.h"
 #include "GrInvariantOutput.h"

src/gpu/effects/GrConvexPolyEffect.h

@@ -8,7 +8,7 @@
 #ifndef GrConvexPolyEffect_DEFINED
 #define GrConvexPolyEffect_DEFINED
 
-#include "GrDrawTargetCaps.h"
+#include "GrCaps.h"
 #include "GrFragmentProcessor.h"
 #include "GrProcessor.h"
 #include "GrTypesPriv.h"

src/gpu/effects/GrCoverageSetOpXP.cpp

@@ -7,8 +7,8 @@
  */
 
 #include "effects/GrCoverageSetOpXP.h"
+#include "GrCaps.h"
 #include "GrColor.h"
-#include "GrDrawTargetCaps.h"
 #include "GrProcessor.h"
 #include "GrProcOptInfo.h"
 #include "gl/GrGLXferProcessor.h"

src/gpu/effects/GrCustomXfermodePriv.h

@@ -8,8 +8,8 @@
 #ifndef GrCustomXfermodePriv_DEFINED
 #define GrCustomXfermodePriv_DEFINED
 
+#include "GrCaps.h"
 #include "GrCoordTransform.h"
-#include "GrDrawTargetCaps.h"
 #include "GrFragmentProcessor.h"
 #include "GrTextureAccess.h"
 #include "GrXferProcessor.h"

src/gpu/effects/GrDashingEffect.cpp

@@ -10,12 +10,12 @@
 #include "GrBatch.h"
 #include "GrBatchTarget.h"
 #include "GrBatchTest.h"
+#include "GrCaps.h"
 #include "GrGeometryProcessor.h"
 #include "GrContext.h"
 #include "GrCoordTransform.h"
 #include "GrDefaultGeoProcFactory.h"
 #include "GrDrawTarget.h"
-#include "GrDrawTargetCaps.h"
 #include "GrInvariantOutput.h"
 #include "GrProcessor.h"
 #include "GrStrokeInfo.h"

src/gpu/effects/GrPorterDuffXferProcessor.cpp

@@ -8,7 +8,7 @@
 #include "effects/GrPorterDuffXferProcessor.h"
 
 #include "GrBlend.h"
-#include "GrDrawTargetCaps.h"
+#include "GrCaps.h"
 #include "GrProcessor.h"
 #include "GrProcOptInfo.h"
 #include "GrTypes.h"

src/gpu/gl/GrGLCaps.h

@@ -9,7 +9,7 @@
 #ifndef GrGLCaps_DEFINED
 #define GrGLCaps_DEFINED
 
-#include "GrDrawTargetCaps.h"
+#include "GrCaps.h"
 #include "GrGLStencilAttachment.h"
 #include "SkChecksum.h"
 #include "SkTHash.h"

tests/GrDrawTargetTest.cpp

@@ -9,9 +9,9 @@
 #include "Test.h"
 #if SK_SUPPORT_GPU
 
+#include "GrCaps.h"
 #include "GrContext.h"
 #include "GrContextFactory.h"
-#include "GrDrawTargetCaps.h"
 #include "GrGpu.h"
 
 static void test_print(skiatest::Reporter*, const GrCaps* caps) {