From d3f1f9e4ecef7cd39964947bfa586440fb586b16 Mon Sep 17 00:00:00 2001 From: Mark Waddingham Date: Fri, 26 May 2017 13:33:39 +0100 Subject: [PATCH] [[ Skia ]] Remove unused GPU files from Skia build This patch makes sure SK_SUPPORT_GPU is 0, and removes all GPU related build files from the gyp. --- libskia/include/config/SkUserConfig.h | 4 +- libskia/libskia.gyp | 523 +------------------------- 2 files changed, 10 insertions(+), 517 deletions(-) diff --git a/libskia/include/config/SkUserConfig.h b/libskia/include/config/SkUserConfig.h index 07294479..4fa1b877 100644 --- a/libskia/include/config/SkUserConfig.h +++ b/libskia/include/config/SkUserConfig.h @@ -47,7 +47,7 @@ here. */ //#define SK_DEBUG -//#define SK_RELEASE +#define SK_RELEASE /* Skia has certain debug-only code that is extremely intensive even for debug builds. This code is useful for diagnosing specific issues, but is not @@ -129,7 +129,7 @@ directories from your include search path when you're not building the GPU backend. Defaults to 1 (build the GPU code). */ -//#define SK_SUPPORT_GPU 1 +#define SK_SUPPORT_GPU 0 /* Skia makes use of histogram logging macros to trace the frequency of * events. By default, Skia provides no-op versions of these macros. diff --git a/libskia/libskia.gyp b/libskia/libskia.gyp index 08423e55..e2de10a0 100644 --- a/libskia/libskia.gyp +++ b/libskia/libskia.gyp @@ -33,7 +33,6 @@ 'include/config', 'include/core', 'include/effects', - 'include/gpu', 'include/images', 'include/pathops', 'include/ports', @@ -52,7 +51,6 @@ 'src/core', 'src/effects', 'src/fonts', - 'src/gpu', 'src/image', 'src/images', 'src/lazy', @@ -62,7 +60,6 @@ 'src/pipe', 'src/ports', 'src/sfnt', - 'src/sksl', 'src/svg', 'src/utils', 'src/views', @@ -352,7 +349,6 @@ 'src/core/SkGlyph.h', 'src/core/SkGlyphCache.h', 'src/core/SkGlyphCache_Globals.h', - 'src/core/SkGpuBlurUtils.h', 'src/core/SkHalf.h', 'src/core/SkImageCacherator.h', 'src/core/SkImageFilterCache.h', @@ -546,7 +542,6 @@ 'src/core/SkGeometry.cpp', 'src/core/SkGlobalInitialization_core.cpp', 'src/core/SkGlyphCache.cpp', - 'src/core/SkGpuBlurUtils.cpp', 'src/core/SkGraphics.cpp', 'src/core/SkHalf.cpp', 'src/core/SkImageCacherator.cpp', @@ -675,22 +670,16 @@ 'src/core/SkXfermodeInterpretation.cpp', 'src/core/SkYUVPlanesCache.cpp', - 'src/effects/GrAlphaThresholdFragmentProcessor.h', - 'src/effects/GrCircleBlurFragmentProcessor.h', - 'src/effects/SkArithmeticMode_gpu.h', 'src/effects/SkArithmeticModePriv.h', 'src/effects/SkBlurMask.h', 'src/effects/SkEmbossMask.h', 'src/effects/SkEmbossMask_Table.h', 'src/effects/SkOverdrawColorFilter.h', - 'src/effects/GrAlphaThresholdFragmentProcessor.cpp', - 'src/effects/GrCircleBlurFragmentProcessor.cpp', 'src/effects/Sk1DPathEffect.cpp', 'src/effects/Sk2DPathEffect.cpp', 'src/effects/SkAlphaThresholdFilter.cpp', 'src/effects/SkArcToPathEffect.cpp', 'src/effects/SkArithmeticMode.cpp', - 'src/effects/SkArithmeticMode_gpu.cpp', 'src/effects/SkBlurDrawLooper.cpp', 'src/effects/SkBlurMask.cpp', 'src/effects/SkBlurMaskFilter.cpp', @@ -741,7 +730,6 @@ 'src/effects/gradients/SkRadialGradient.h', 'src/effects/gradients/SkSweepGradient.h', 'src/effects/gradients/SkTwoPointConicalGradient.h', - 'src/effects/gradients/SkTwoPointConicalGradient_gpu.h', 'src/effects/gradients/Sk4fGradientBase.cpp', 'src/effects/gradients/Sk4fLinearGradient.cpp', 'src/effects/gradients/SkClampRange.cpp', @@ -751,7 +739,6 @@ 'src/effects/gradients/SkRadialGradient.cpp', 'src/effects/gradients/SkSweepGradient.cpp', 'src/effects/gradients/SkTwoPointConicalGradient.cpp', - 'src/effects/gradients/SkTwoPointConicalGradient_gpu.cpp', 'src/fonts/SkGScalerContext.h', 'src/fonts/SkRandomScalerContext.h', @@ -761,422 +748,18 @@ 'src/fonts/SkRandomScalerContext.cpp', 'src/fonts/SkRemotableFontMgr.cpp', 'src/fonts/SkTestScalerContext.cpp', - - 'src/gpu/GrAllocator.h', - 'src/gpu/GrAppliedClip.h', - 'src/gpu/GrAutoLocaleSetter.h', - 'src/gpu/GrBatchAtlas.h', - 'src/gpu/GrBatchFlushState.h', - 'src/gpu/GrBatchTest.h', - 'src/gpu/GrBitmapTextureMaker.h', - 'src/gpu/GrBlurUtils.h', - 'src/gpu/GrBufferAllocPool.h', - 'src/gpu/GrClipStackClip.h', - 'src/gpu/GrContextPriv.h', - 'src/gpu/GrDefaultGeoProcFactory.h', - 'src/gpu/GrDrawingManager.h', - 'src/gpu/GrFixedClip.h', - 'src/gpu/GrGeometryProcessor.h', - 'src/gpu/GrGlyph.h', - 'src/gpu/GrGpu.h', - 'src/gpu/GrGpuCommandBuffer.h', - 'src/gpu/GrGpuFactory.h', - 'src/gpu/GrGpuResourceCacheAccess.h', - 'src/gpu/GrGpuResourcePriv.h', - 'src/gpu/GrImageTextureMaker.h', - 'src/gpu/GrMemoryPool.h', - 'src/gpu/GrMesh.h', - 'src/gpu/GrNonAtomicRef.h', - 'src/gpu/GrOpList.h', - 'src/gpu/GrOvalRenderer.h', - 'src/gpu/GrPath.h', - 'src/gpu/GrPathProcessor.h', - 'src/gpu/GrPathRange.h', - 'src/gpu/GrPathRenderer.h', - 'src/gpu/GrPathRendererChain.h', - 'src/gpu/GrPathRendering.h', - 'src/gpu/GrPathRenderingRenderTargetContext.h', - 'src/gpu/GrPathUtils.h', - 'src/gpu/GrPendingProgramElement.h', - 'src/gpu/GrPipeline.h', - 'src/gpu/GrPipelineBuilder.h', - 'src/gpu/GrPLSGeometryProcessor.h', - 'src/gpu/GrPrimitiveProcessor.h', - 'src/gpu/GrProcOptInfo.h', - 'src/gpu/GrProgramDesc.h', - 'src/gpu/GrQuad.h', - 'src/gpu/GrRect.h', - 'src/gpu/GrRectanizer.h', - 'src/gpu/GrRectanizer_pow2.h', - 'src/gpu/GrRectanizer_skyline.h', - 'src/gpu/GrReducedClip.h', - 'src/gpu/GrRenderTargetContextPriv.h', - 'src/gpu/GrRenderTargetOpList.h', - 'src/gpu/GrRenderTargetPriv.h', - 'src/gpu/GrResourceCache.h', - 'src/gpu/GrResourceHandle.h', - 'src/gpu/GrResourceProvider.h', - 'src/gpu/GrScissorState.h', - 'src/gpu/GrShape.h', - 'src/gpu/GrSoftwarePathRenderer.h', - 'src/gpu/GrStencilAttachment.h', - 'src/gpu/GrStencilSettings.h', - 'src/gpu/GrStyle.h', - 'src/gpu/GrSurfacePriv.h', - 'src/gpu/GrSWMaskHelper.h', - 'src/gpu/GrTessellator.h', - 'src/gpu/GrTextureAdjuster.h', - 'src/gpu/GrTextureMaker.h', - 'src/gpu/GrTextureOpList.h', - 'src/gpu/GrTexturePriv.h', - 'src/gpu/GrTextureProducer.h', - 'src/gpu/GrTextureToYUVPlanes.h', - 'src/gpu/GrTraceMarker.h', - 'src/gpu/GrTracing.h', - 'src/gpu/GrTRecorder.h', - 'src/gpu/GrUserStencilSettings.h', - 'src/gpu/GrWindowRectangles.h', - 'src/gpu/GrWindowRectsState.h', - 'src/gpu/GrYUVProvider.h', - 'src/gpu/SkGpuDevice.h', - 'src/gpu/SkGrPriv.h', - 'src/gpu/GrAuditTrail.cpp', - 'src/gpu/GrBatchAtlas.cpp', - 'src/gpu/GrBatchFlushState.cpp', - 'src/gpu/GrBatchTest.cpp', - 'src/gpu/GrBitmapTextureMaker.cpp', - 'src/gpu/GrBlend.cpp', - 'src/gpu/GrBlurUtils.cpp', - 'src/gpu/GrBuffer.cpp', - 'src/gpu/GrBufferAllocPool.cpp', - 'src/gpu/GrCaps.cpp', - 'src/gpu/GrClipStackClip.cpp', - 'src/gpu/GrColorSpaceXform.cpp', - 'src/gpu/GrContext.cpp', - 'src/gpu/GrCoordTransform.cpp', - 'src/gpu/GrDefaultGeoProcFactory.cpp', - 'src/gpu/GrDrawingManager.cpp', - 'src/gpu/GrFixedClip.cpp', - 'src/gpu/GrFragmentProcessor.cpp', - 'src/gpu/GrGpu.cpp', - 'src/gpu/GrGpuCommandBuffer.cpp', - 'src/gpu/GrGpuFactory.cpp', - 'src/gpu/GrGpuResource.cpp', - 'src/gpu/GrGpuResourceRef.cpp', - 'src/gpu/GrImageTextureMaker.cpp', - 'src/gpu/GrInvariantOutput.cpp', - 'src/gpu/GrMemoryPool.cpp', - 'src/gpu/GrOpList.cpp', - 'src/gpu/GrOvalRenderer.cpp', - 'src/gpu/GrPaint.cpp', - 'src/gpu/GrPath.cpp', - 'src/gpu/GrPathProcessor.cpp', - 'src/gpu/GrPathRange.cpp', - 'src/gpu/GrPathRenderer.cpp', - 'src/gpu/GrPathRendererChain.cpp', - 'src/gpu/GrPathRendering.cpp', - 'src/gpu/GrPathRenderingRenderTargetContext.cpp', - 'src/gpu/GrPathUtils.cpp', - 'src/gpu/GrPipeline.cpp', - 'src/gpu/GrPipelineBuilder.cpp', - 'src/gpu/GrPrimitiveProcessor.cpp', - 'src/gpu/GrProcessor.cpp', - 'src/gpu/GrProcessorUnitTest.cpp', - 'src/gpu/GrProcOptInfo.cpp', - 'src/gpu/GrProgramDesc.cpp', - 'src/gpu/GrProgramElement.cpp', - 'src/gpu/GrRectanizer_pow2.cpp', - 'src/gpu/GrRectanizer_skyline.cpp', - 'src/gpu/GrReducedClip.cpp', - 'src/gpu/GrRenderTarget.cpp', - 'src/gpu/GrRenderTargetContext.cpp', - 'src/gpu/GrRenderTargetOpList.cpp', - 'src/gpu/GrRenderTargetProxy.cpp', - 'src/gpu/GrResourceCache.cpp', - 'src/gpu/GrResourceProvider.cpp', - 'src/gpu/GrShaderCaps.cpp', - 'src/gpu/GrShaderVar.cpp', - 'src/gpu/GrShape.cpp', - 'src/gpu/GrSoftwarePathRenderer.cpp', - 'src/gpu/GrStencilAttachment.cpp', - 'src/gpu/GrStencilSettings.cpp', - 'src/gpu/GrStyle.cpp', - 'src/gpu/GrSurface.cpp', - 'src/gpu/GrSurfaceContext.cpp', - 'src/gpu/GrSurfaceProxy.cpp', - 'src/gpu/GrSWMaskHelper.cpp', - 'src/gpu/GrTessellator.cpp', - 'src/gpu/GrTestUtils.cpp', - 'src/gpu/GrTexture.cpp', - 'src/gpu/GrTextureAdjuster.cpp', - 'src/gpu/GrTextureContext.cpp', - 'src/gpu/GrTextureMaker.cpp', - 'src/gpu/GrTextureOpList.cpp', - 'src/gpu/GrTextureProducer.cpp', - 'src/gpu/GrTextureProvider.cpp', - 'src/gpu/GrTextureProxy.cpp', - 'src/gpu/GrTextureRenderTargetProxy.cpp', - 'src/gpu/GrTextureToYUVPlanes.cpp', - 'src/gpu/GrTraceMarker.cpp', - 'src/gpu/GrXferProcessor.cpp', - 'src/gpu/GrYUVProvider.cpp', - 'src/gpu/SkGpuDevice.cpp', - 'src/gpu/SkGpuDevice_drawTexture.cpp', - 'src/gpu/SkGr.cpp', - - 'src/gpu/batches/GrAAConvexPathRenderer.h', - 'src/gpu/batches/GrAAConvexTessellator.h', - 'src/gpu/batches/GrAADistanceFieldPathRenderer.h', - 'src/gpu/batches/GrAAFillRectBatch.h', - 'src/gpu/batches/GrAAHairLinePathRenderer.h', - 'src/gpu/batches/GrAALinearizingConvexPathRenderer.h', - 'src/gpu/batches/GrAAStrokeRectBatch.h', - 'src/gpu/batches/GrAnalyticRectBatch.h', - 'src/gpu/batches/GrAtlasTextBatch.h', - 'src/gpu/batches/GrClearBatch.h', - 'src/gpu/batches/GrClearStencilClipBatch.h', - 'src/gpu/batches/GrCopySurfaceBatch.h', - 'src/gpu/batches/GrDashLinePathRenderer.h', - 'src/gpu/batches/GrDefaultPathRenderer.h', - 'src/gpu/batches/GrDiscardBatch.h', - 'src/gpu/batches/GrDrawAtlasBatch.h', - 'src/gpu/batches/GrDrawOp.h', - 'src/gpu/batches/GrDrawPathBatch.h', - 'src/gpu/batches/GrDrawVerticesBatch.h', - 'src/gpu/batches/GrMeshDrawOp.h', - 'src/gpu/batches/GrMSAAPathRenderer.h', - 'src/gpu/batches/GrNinePatch.h', - 'src/gpu/batches/GrNonAAFillRectBatch.h', - 'src/gpu/batches/GrNonAAStrokeRectBatch.h', - 'src/gpu/batches/GrOp.h', - 'src/gpu/batches/GrPathStencilSettings.h', - 'src/gpu/batches/GrPLSPathRenderer.h', - 'src/gpu/batches/GrRectBatchFactory.h', - 'src/gpu/batches/GrRegionBatch.h', - 'src/gpu/batches/GrShadowRRectBatch.h', - 'src/gpu/batches/GrStencilAndCoverPathRenderer.h', - 'src/gpu/batches/GrStencilPathBatch.h', - 'src/gpu/batches/GrTessellatingPathRenderer.h', - 'src/gpu/batches/GrTestBatch.h', - 'src/gpu/batches/GrAAConvexPathRenderer.cpp', - 'src/gpu/batches/GrAAConvexTessellator.cpp', - 'src/gpu/batches/GrAADistanceFieldPathRenderer.cpp', - 'src/gpu/batches/GrAAFillRectBatch.cpp', - 'src/gpu/batches/GrAAHairLinePathRenderer.cpp', - 'src/gpu/batches/GrAALinearizingConvexPathRenderer.cpp', - 'src/gpu/batches/GrAAStrokeRectBatch.cpp', - 'src/gpu/batches/GrAnalyticRectBatch.cpp', - 'src/gpu/batches/GrAtlasTextBatch.cpp', - 'src/gpu/batches/GrCopySurfaceBatch.cpp', - 'src/gpu/batches/GrDashLinePathRenderer.cpp', - 'src/gpu/batches/GrDefaultPathRenderer.cpp', - 'src/gpu/batches/GrDrawAtlasBatch.cpp', - 'src/gpu/batches/GrDrawOp.cpp', - 'src/gpu/batches/GrDrawPathBatch.cpp', - 'src/gpu/batches/GrDrawVerticesBatch.cpp', - 'src/gpu/batches/GrMeshDrawOp.cpp', - 'src/gpu/batches/GrMSAAPathRenderer.cpp', - 'src/gpu/batches/GrNinePatch.cpp', - 'src/gpu/batches/GrNonAAFillRectBatch.cpp', - 'src/gpu/batches/GrNonAAFillRectPerspectiveBatch.cpp', - 'src/gpu/batches/GrNonAAStrokeRectBatch.cpp', - 'src/gpu/batches/GrOp.cpp', - 'src/gpu/batches/GrPLSPathRenderer.cpp', - 'src/gpu/batches/GrRectBatchFactory.cpp', - 'src/gpu/batches/GrRegionBatch.cpp', - 'src/gpu/batches/GrShadowRRectBatch.cpp', - 'src/gpu/batches/GrStencilAndCoverPathRenderer.cpp', - 'src/gpu/batches/GrTessellatingPathRenderer.cpp', - - 'src/gpu/effects/Gr1DKernelEffect.h', - 'src/gpu/effects/GrBezierEffect.h', - 'src/gpu/effects/GrBicubicEffect.h', - 'src/gpu/effects/GrBitmapTextGeoProc.h', - 'src/gpu/effects/GrConfigConversionEffect.h', - 'src/gpu/effects/GrConvexPolyEffect.h', - 'src/gpu/effects/GrConvolutionEffect.h', - 'src/gpu/effects/GrDashingEffect.h', - 'src/gpu/effects/GrDisableColorXP.h', - 'src/gpu/effects/GrDistanceFieldGeoProc.h', - 'src/gpu/effects/GrDitherEffect.h', - 'src/gpu/effects/GrGammaEffect.h', - 'src/gpu/effects/GrMatrixConvolutionEffect.h', - 'src/gpu/effects/GrOvalEffect.h', - 'src/gpu/effects/GrRRectEffect.h', - 'src/gpu/effects/GrShadowGeoProc.h', - 'src/gpu/effects/GrSimpleTextureEffect.h', - 'src/gpu/effects/GrSingleTextureEffect.h', - 'src/gpu/effects/GrTextureDomain.h', - 'src/gpu/effects/GrYUVEffect.h', - 'src/gpu/effects/GrBezierEffect.cpp', - 'src/gpu/effects/GrBicubicEffect.cpp', - 'src/gpu/effects/GrBitmapTextGeoProc.cpp', - 'src/gpu/effects/GrConfigConversionEffect.cpp', - 'src/gpu/effects/GrConstColorProcessor.cpp', - 'src/gpu/effects/GrConvexPolyEffect.cpp', - 'src/gpu/effects/GrConvolutionEffect.cpp', - 'src/gpu/effects/GrCoverageSetOpXP.cpp', - 'src/gpu/effects/GrCustomXfermode.cpp', - 'src/gpu/effects/GrDashingEffect.cpp', - 'src/gpu/effects/GrDisableColorXP.cpp', - 'src/gpu/effects/GrDistanceFieldGeoProc.cpp', - 'src/gpu/effects/GrDitherEffect.cpp', - 'src/gpu/effects/GrGammaEffect.cpp', - 'src/gpu/effects/GrMatrixConvolutionEffect.cpp', - 'src/gpu/effects/GrOvalEffect.cpp', - 'src/gpu/effects/GrPorterDuffXferProcessor.cpp', - 'src/gpu/effects/GrRRectEffect.cpp', - 'src/gpu/effects/GrShadowGeoProc.cpp', - 'src/gpu/effects/GrSimpleTextureEffect.cpp', - 'src/gpu/effects/GrSingleTextureEffect.cpp', - 'src/gpu/effects/GrTextureDomain.cpp', - 'src/gpu/effects/GrTextureStripAtlas.cpp', - 'src/gpu/effects/GrXfermodeFragmentProcessor.cpp', - 'src/gpu/effects/GrYUVEffect.cpp', - - 'src/gpu/gl/GrGLBuffer.h', - 'src/gpu/gl/GrGLCaps.h', - 'src/gpu/gl/GrGLContext.h', - 'src/gpu/gl/GrGLDefines.h', - 'src/gpu/gl/GrGLGLSL.h', - 'src/gpu/gl/GrGLGpu.h', - 'src/gpu/gl/GrGLGpuCommandBuffer.h', - 'src/gpu/gl/GrGLIRect.h', - 'src/gpu/gl/GrGLPath.h', - 'src/gpu/gl/GrGLPathRange.h', - 'src/gpu/gl/GrGLPathRendering.h', - 'src/gpu/gl/GrGLProgram.h', - 'src/gpu/gl/GrGLProgramDataManager.h', - 'src/gpu/gl/GrGLRenderTarget.h', - 'src/gpu/gl/GrGLStencilAttachment.h', - 'src/gpu/gl/GrGLTestInterface.h', - 'src/gpu/gl/GrGLTexture.h', - 'src/gpu/gl/GrGLTextureRenderTarget.h', - 'src/gpu/gl/GrGLUniformHandler.h', - 'src/gpu/gl/GrGLUtil.h', - 'src/gpu/gl/GrGLVaryingHandler.h', - 'src/gpu/gl/GrGLVertexArray.h', - 'src/gpu/gl/GrGLAssembleInterface.cpp', - 'src/gpu/gl/GrGLBuffer.cpp', - 'src/gpu/gl/GrGLCaps.cpp', - 'src/gpu/gl/GrGLContext.cpp', - 'src/gpu/gl/GrGLCreateNativeInterface_none.cpp', - 'src/gpu/gl/GrGLCreateNullInterface.cpp', - 'src/gpu/gl/GrGLDefaultInterface_native.cpp', - 'src/gpu/gl/GrGLDefaultInterface_none.cpp', - 'src/gpu/gl/GrGLExtensions.cpp', - 'src/gpu/gl/GrGLGLSL.cpp', - 'src/gpu/gl/GrGLGpu.cpp', - 'src/gpu/gl/GrGLGpuProgramCache.cpp', - 'src/gpu/gl/GrGLInterface.cpp', - 'src/gpu/gl/GrGLPath.cpp', - 'src/gpu/gl/GrGLPathRange.cpp', - 'src/gpu/gl/GrGLPathRendering.cpp', - 'src/gpu/gl/GrGLProgram.cpp', - 'src/gpu/gl/GrGLProgramDataManager.cpp', - 'src/gpu/gl/GrGLRenderTarget.cpp', - 'src/gpu/gl/GrGLStencilAttachment.cpp', - 'src/gpu/gl/GrGLTestInterface.cpp', - 'src/gpu/gl/GrGLTexture.cpp', - 'src/gpu/gl/GrGLTextureRenderTarget.cpp', - 'src/gpu/gl/GrGLUniformHandler.cpp', - 'src/gpu/gl/GrGLUtil.cpp', - 'src/gpu/gl/GrGLVaryingHandler.cpp', - 'src/gpu/gl/GrGLVertexArray.cpp', - - 'src/gpu/gl/android/GrGLCreateNativeInterface_android.cpp', - - 'src/gpu/gl/builders/GrGLProgramBuilder.h', - 'src/gpu/gl/builders/GrGLShaderStringBuilder.h', - 'src/gpu/gl/builders/GrGLProgramBuilder.cpp', - 'src/gpu/gl/builders/GrGLShaderStringBuilder.cpp', - 'src/gpu/gl/builders/GrGLSLPrettyPrint.cpp', - - 'src/gpu/gl/egl/GrGLCreateNativeInterface_egl.cpp', - - 'src/gpu/gl/glfw/GrGLCreateNativeInterface_glfw.cpp', - - 'src/gpu/gl/glx/GrGLCreateNativeInterface_glx.cpp', - - 'src/gpu/gl/iOS/GrGLCreateNativeInterface_iOS.cpp', - - 'src/gpu/gl/mac/GrGLCreateNativeInterface_mac.cpp', - - 'src/gpu/gl/mesa/osmesa_wrapper.h', - - 'src/gpu/gl/win/GrGLCreateNativeInterface_win.cpp', - - 'src/gpu/glsl/GrGLSLBlend.h', - 'src/gpu/glsl/GrGLSLColorSpaceXformHelper.h', - 'src/gpu/glsl/GrGLSLFragmentProcessor.h', - 'src/gpu/glsl/GrGLSLFragmentShaderBuilder.h', - 'src/gpu/glsl/GrGLSLGeometryProcessor.h', - 'src/gpu/glsl/GrGLSLGeometryShaderBuilder.h', - 'src/gpu/glsl/GrGLSLPLSPathRendering.h', - 'src/gpu/glsl/GrGLSLPrimitiveProcessor.h', - 'src/gpu/glsl/GrGLSLProgramBuilder.h', - 'src/gpu/glsl/GrGLSLProgramDataManager.h', - 'src/gpu/glsl/GrGLSLShaderBuilder.h', - 'src/gpu/glsl/GrGLSLUniformHandler.h', - 'src/gpu/glsl/GrGLSLUtil.h', - 'src/gpu/glsl/GrGLSLVarying.h', - 'src/gpu/glsl/GrGLSLVertexShaderBuilder.h', - 'src/gpu/glsl/GrGLSLXferProcessor.h', - 'src/gpu/glsl/GrGLSL.cpp', - 'src/gpu/glsl/GrGLSLBlend.cpp', - 'src/gpu/glsl/GrGLSLFragmentProcessor.cpp', - 'src/gpu/glsl/GrGLSLFragmentShaderBuilder.cpp', - 'src/gpu/glsl/GrGLSLGeometryProcessor.cpp', - 'src/gpu/glsl/GrGLSLGeometryShaderBuilder.cpp', - 'src/gpu/glsl/GrGLSLPrimitiveProcessor.cpp', - 'src/gpu/glsl/GrGLSLProgramBuilder.cpp', - 'src/gpu/glsl/GrGLSLProgramDataManager.cpp', - 'src/gpu/glsl/GrGLSLShaderBuilder.cpp', - 'src/gpu/glsl/GrGLSLUtil.cpp', - 'src/gpu/glsl/GrGLSLVarying.cpp', - 'src/gpu/glsl/GrGLSLVertexShaderBuilder.cpp', - 'src/gpu/glsl/GrGLSLXferProcessor.cpp', - - 'src/gpu/instanced/GLInstancedRendering.h', - 'src/gpu/instanced/InstancedRendering.h', - 'src/gpu/instanced/InstancedRenderingTypes.h', - 'src/gpu/instanced/InstanceProcessor.h', - 'src/gpu/instanced/GLInstancedRendering.cpp', - 'src/gpu/instanced/InstancedRendering.cpp', - 'src/gpu/instanced/InstanceProcessor.cpp', - - 'src/gpu/text/GrAtlasTextBlob.h', - 'src/gpu/text/GrAtlasTextContext.h', - 'src/gpu/text/GrBatchFontCache.h', - 'src/gpu/text/GrDistanceFieldAdjustTable.h', - 'src/gpu/text/GrStencilAndCoverTextContext.h', - 'src/gpu/text/GrTextBlobCache.h', - 'src/gpu/text/GrTextUtils.h', - 'src/gpu/text/GrAtlasTextBlob.cpp', - 'src/gpu/text/GrAtlasTextBlob_regenInBatch.cpp', - 'src/gpu/text/GrAtlasTextContext.cpp', - 'src/gpu/text/GrBatchFontCache.cpp', - 'src/gpu/text/GrDistanceFieldAdjustTable.cpp', - 'src/gpu/text/GrStencilAndCoverTextContext.cpp', - 'src/gpu/text/GrTextBlobCache.cpp', - 'src/gpu/text/GrTextUtils.cpp', - - # todo src/gpu/vk subdir + 'src/image/SkImage_Base.h', - 'src/image/SkImage_Gpu.h', 'src/image/SkImageShader.h', 'src/image/SkImageShaderContext.h', 'src/image/SkReadPixelsRec.h', 'src/image/SkSurface_Base.h', - 'src/image/SkSurface_Gpu.h', 'src/image/SkImage.cpp', 'src/image/SkImage_Generator.cpp', - 'src/image/SkImage_Gpu.cpp', 'src/image/SkImage_Raster.cpp', 'src/image/SkImageShader.cpp', 'src/image/SkSurface.cpp', - 'src/image/SkSurface_Gpu.cpp', 'src/image/SkSurface_Raster.cpp', 'src/images/transform_scanline.h', @@ -1424,81 +1007,7 @@ 'src/sfnt/SkTTCFHeader.h', 'src/sfnt/SkOTTable_name.cpp', 'src/sfnt/SkOTUtils.cpp', - - #'src/sksl/lex.sksl.c', - 'src/sksl/GLSL.std.450.h', - 'src/sksl/SkSLCFGGenerator.h', - 'src/sksl/SkSLCodeGenerator.h', - 'src/sksl/SkSLCompiler.h', - 'src/sksl/SkSLContext.h', - 'src/sksl/SkSLErrorReporter.h', - 'src/sksl/SkSLGLSLCodeGenerator.h', - 'src/sksl/SkSLIRGenerator.h', - 'src/sksl/SkSLMemoryLayout.h', - 'src/sksl/SkSLParser.h', - 'src/sksl/SkSLPosition.h', - 'src/sksl/SkSLSPIRVCodeGenerator.h', - 'src/sksl/SkSLToken.h', - 'src/sksl/SkSLUtil.h', - 'src/sksl/spirv.h', - 'src/sksl/SkSLCFGGenerator.cpp', - 'src/sksl/SkSLCompiler.cpp', - 'src/sksl/SkSLGLSLCodeGenerator.cpp', - 'src/sksl/SkSLIRGenerator.cpp', - 'src/sksl/SkSLMain.cpp', - 'src/sksl/SkSLParser.cpp', - 'src/sksl/SkSLSPIRVCodeGenerator.cpp', - 'src/sksl/SkSLUtil.cpp', - - # TODO: src/sksl/ast - - 'src/sksl/ir/SkSLBinaryExpression.h', - 'src/sksl/ir/SkSLBlock.h', - 'src/sksl/ir/SkSLBoolLiteral.h', - 'src/sksl/ir/SkSLBreakStatement.h', - 'src/sksl/ir/SkSLConstructor.h', - 'src/sksl/ir/SkSLContinueStatement.h', - 'src/sksl/ir/SkSLDiscardStatement.h', - 'src/sksl/ir/SkSLDoStatement.h', - 'src/sksl/ir/SkSLExpression.h', - 'src/sksl/ir/SkSLExpressionStatement.h', - 'src/sksl/ir/SkSLExtension.h', - 'src/sksl/ir/SkSLField.h', - 'src/sksl/ir/SkSLFieldAccess.h', - 'src/sksl/ir/SkSLFloatLiteral.h', - 'src/sksl/ir/SkSLForStatement.h', - 'src/sksl/ir/SkSLFunctionCall.h', - 'src/sksl/ir/SkSLFunctionDeclaration.h', - 'src/sksl/ir/SkSLFunctionReference.h', - 'src/sksl/ir/SkSLIfStatement.h', - 'src/sksl/ir/SkSLIndexExpression.h', - 'src/sksl/ir/SkSLInterfaceBlock.h', - 'src/sksl/ir/SkSLIntLiteral.h', - 'src/sksl/ir/SkSLIRNode.h', - 'src/sksl/ir/SkSLLayout.h', - 'src/sksl/ir/SkSLModifiers.h', - 'src/sksl/ir/SkSLModifiersDeclaration.h', - 'src/sksl/ir/SkSLPostfixExpression.h', - 'src/sksl/ir/SkSLPrefixExpression.h', - 'src/sksl/ir/SkSLProgram.h', - 'src/sksl/ir/SkSLProgramElement.h', - 'src/sksl/ir/SkSLReturnStatement.h', - 'src/sksl/ir/SkSLStatement.h', - 'src/sksl/ir/SkSLSwizzle.h', - 'src/sksl/ir/SkSLSymbol.h', - 'src/sksl/ir/SkSLSymbolTable.h', - 'src/sksl/ir/SkSLTernaryExpression.h', - 'src/sksl/ir/SkSLType.h', - 'src/sksl/ir/SkSLTypeReference.h', - 'src/sksl/ir/SkSLUnresolvedFunction.h', - 'src/sksl/ir/SkSLVarDeclarations.h', - 'src/sksl/ir/SkSLVarDeclarationsStatement.h', - 'src/sksl/ir/SkSLVariable.h', - 'src/sksl/ir/SkSLVariableReference.h', - 'src/sksl/ir/SkSLWhileStatement.h', - 'src/sksl/ir/SkSLSymbolTable.cpp', - 'src/sksl/ir/SkSLType.cpp', - + 'src/svg/SkSVGDevice.h', 'src/svg/SkSVGCanvas.cpp', 'src/svg/SkSVGDevice.cpp', @@ -1618,6 +1127,9 @@ 'SK_SUPPORT_LEGACY_ACCESSBITMAP', 'SK_SUPPORT_LEGACY_CLIP_REGIONOPS', 'SK_SUPPORT_LEGACY_GETDEVICE', + + # Disable GPU support + 'SK_SUPPORT_GPU=0', ], 'all_dependent_settings': @@ -1633,15 +1145,14 @@ 'SK_SUPPORT_LEGACY_ACCESSBITMAP', 'SK_SUPPORT_LEGACY_CLIP_REGIONOPS', 'SK_SUPPORT_LEGACY_GETDEVICE', + + # Disable GPU support + 'SK_SUPPORT_GPU=0', ], }, 'sources!': [ - # Enable OpenGL where we can - #'src/gpu/gl/GrGLDefaultInterface_none.cpp', - 'src/gpu/gl/GrGLDefaultInterface_native.cpp', - # Not relevant to the plaforms we support 'src/ports/SkMemory_mozalloc.cpp', @@ -1652,9 +1163,6 @@ 'sources/': [ - # Disable all OpenGL platform bindings by default - ['exclude', '^src/gpu/gl/(.*/)?GrGLCreateNativeInterface_.*\\.cpp$'], - # Exclude all non-generic optimisations by default ['exclude', 'opts/.+\\.(cpp|S)$'], ['include', 'opts/.+_none\\.cpp$'], @@ -1729,9 +1237,6 @@ 'sources/': [ - # Include the Windows OpenGL binding - #['include', '^src/gpu/gl/win/GrGLCreateNativeInterface_win\\.cpp$'], - # Disable POSIX features ['exclude', '(pthread|posix)\\.cpp$'], @@ -1867,9 +1372,6 @@ 'sources/': [ - # Include the EGL OpenGL binding - #['include', '^src/gpu/gl/egl/GrGLCreateNativeInterface_egl\\.cpp$'], - # Don't build FreeType or FontConfig code ['exclude', 'fontconfig'], ['exclude', 'FontConfig'], @@ -1882,8 +1384,6 @@ { 'sources/': [ - # Include the macOS OpenGL binding - #['include', '^src/gpu/gl/mac/GrGLCreateNativeInterface_mac\\.cpp$'], ], }, ], @@ -1911,9 +1411,6 @@ 'sources/': [ - # Include the Linux OpenGL binding - #['include', '^src/gpu/gl/glx/GrGLCreateNativeInterface_glx\\.cpp$'], - ['exclude', 'SkFontMgr_custom'], ], @@ -1970,9 +1467,6 @@ 'sources/': [ - # Include the Android OpenGL binding - #['include', '^src/gpu/gl/android/GrGLCreateNativeInterface_android\\.cpp$'], - # Don't build FreeType or FontConfig code ['exclude', 'fontconfig'], ['exclude', 'FontConfig'], @@ -1999,7 +1493,6 @@ 'include/core', 'include/device', 'include/effects', - 'include/gpu', 'include/images', 'include/pathops', 'include/pdf',