Bug 1530471 - don't build Skia GPU support r=rhunt
authorLee Salzman <lsalzman@mozilla.com>
Mon, 25 Feb 2019 22:16:10 +0000
changeset 519658 4b820d7d2c139589db88828b73687b380ccd3bb6
parent 519657 9dac1bac38598b3da42bb15e8f74e4072ffa370e
child 519659 62aabc4a65412a9f9689638cdb38584e414cc7e8
push id10862
push userffxbld-merge
push dateMon, 11 Mar 2019 13:01:11 +0000
treeherdermozilla-beta@a2e7f5c935da [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersrhunt
bugs1530471
milestone67.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1530471 - don't build Skia GPU support r=rhunt Depends on D21051 Differential Revision: https://phabricator.services.mozilla.com/D21052
gfx/skia/generate_mozbuild.py
gfx/skia/moz.build
gfx/skia/skia/include/config/SkUserConfig.h
--- a/gfx/skia/generate_mozbuild.py
+++ b/gfx/skia/generate_mozbuild.py
@@ -48,20 +48,16 @@ LOCAL_INCLUDES += [
     'skia/include/gpu',
     'skia/include/pathops',
     'skia/include/ports',
     'skia/include/private',
     'skia/include/utils',
     'skia/include/utils/mac',
     'skia/src/codec',
     'skia/src/core',
-    'skia/src/gpu',
-    'skia/src/gpu/effects',
-    'skia/src/gpu/gl',
-    'skia/src/gpu/glsl',
     'skia/src/image',
     'skia/src/lazy',
     'skia/src/opts',
     'skia/src/sfnt',
     'skia/src/shaders',
     'skia/src/shaders/gradients',
     'skia/src/sksl',
     'skia/src/utils',
@@ -93,19 +89,16 @@ elif CONFIG['CPU_ARCH'] == 'arm' and CON
 elif CONFIG['CPU_ARCH'] == 'aarch64' and CONFIG['CC_TYPE'] in ('clang', 'gcc'):
     SOURCES['skia/src/opts/SkOpts_crc32.cpp'].flags += ['-march=armv8-a+crc']
 
 DEFINES['SKIA_IMPLEMENTATION'] = 1
 
 if CONFIG['MOZ_ENABLE_SKIA_PDF_SFNTLY']:
     DEFINES['SK_PDF_USE_SFNTLY'] = 1
 
-if not CONFIG['MOZ_ENABLE_SKIA_GPU']:
-    DEFINES['SK_SUPPORT_GPU'] = 0
-
 if CONFIG['MOZ_TREE_FREETYPE']:
     DEFINES['SK_CAN_USE_DLOPEN'] = 0
 
 # Suppress warnings in third-party code.
 CXXFLAGS += [
     '-Wno-deprecated-declarations',
     '-Wno-overloaded-virtual',
     '-Wno-shadow',
@@ -167,45 +160,39 @@ def generate_platform_sources():
     'win' : 'win_vc="C:/" win_sdk_version="00.0.00000.0"'
   }
   for plat in platforms:
     args = platform_args.get(plat, '')
     output = subprocess.check_output('cd skia && bin/gn gen out/{0} --args=\'target_os="{0}" {1}\' > /dev/null && bin/gn desc out/{0} :skia sources'.format(plat, args), shell=True)
     if output:
       sources[plat] = parse_sources(output)
 
-  deps = {':effects' : 'common', ':gpu' : 'gpu', ':pdf' : 'pdf'}
+  deps = {':effects' : 'common', ':pdf' : 'pdf'}
   for dep, key in deps.items():
     output = subprocess.check_output('cd skia && bin/gn desc out/linux {} sources'.format(dep), shell=True)
     if output:
       sources[key] = parse_sources(output)
 
   return dict(sources.items() + generate_opt_sources().items())
 
 
 def generate_separated_sources(platform_sources):
   blacklist = [
-    'GrGLMakeNativeInterface',
-    'GrGLCreateNullInterface',
-    'GrGLAssembleInterface',
-    'GrGLTestInterface',
     'skia/src/android/',
     'skia/src/atlastext/',
     'skia/src/c/',
     'skia/src/effects/',
     'skia/src/fonts/',
     'skia/src/ports/SkImageEncoder',
     'skia/src/ports/SkImageGenerator',
-    'skia/src/gpu/vk/',
     'SkBitmapRegion',
     'SkLite',
     'SkLight',
     'SkNormal',
     'codec',
-    'SkWGL',
     'SkMemory_malloc',
     'third_party',
     'Sk3D',
     'SkAnimCodecPlayer',
     'SkCamera',
     'SkCanvasStack',
     'SkCanvasStateUtils',
     'SkFrontBufferedStream',
@@ -231,17 +218,16 @@ def generate_separated_sources(platform_
 
     return False
 
   separated = defaultdict(set, {
     'common': {
       'skia/src/codec/SkMasks.cpp',
       'skia/src/effects/imagefilters/SkBlurImageFilter.cpp',
       'skia/src/effects/SkDashPathEffect.cpp',
-      'skia/src/gpu/gl/GrGLMakeNativeInterface_none.cpp',
       'skia/src/ports/SkDiscardableMemory_none.cpp',
       'skia/src/ports/SkGlobalInitialization_default.cpp',
       'skia/src/ports/SkGlobalInitialization_default_imagefilters.cpp',
       'skia/src/ports/SkMemory_mozalloc.cpp',
       'skia/src/ports/SkImageGenerator_none.cpp',
       'skia/third_party/skcms/skcms.cc',
     },
     'android': {
@@ -255,18 +241,17 @@ def generate_separated_sources(platform_
     'linux': {
       'skia/src/ports/SkFontHost_cairo.cpp',
       'skia/src/ports/SkFontHost_FreeType_common.cpp',
     },
     'intel': set(),
     'arm': set(),
     'arm64': set(),
     'none': set(),
-    'pdf': set(),
-    'gpu': set()
+    'pdf': set()
   })
 
   for plat in platform_sources.keys():
     for value in platform_sources[plat]:
       if isblacklisted(value):
         continue
 
       if value in separated['common']:
@@ -336,28 +321,16 @@ unified_blacklist = [
   'SkBlitter_RGB16.cpp',
   'SkBlitter_Sprite.cpp',
   'SkScan_Antihair.cpp',
   'SkScan_AntiPath.cpp',
   'SkScan_DAAPath.cpp',
   'SkParse.cpp',
   'SkPDFFont.cpp',
   'SkPictureData.cpp',
-  'skia/src/gpu/effects/',
-  'skia/src/gpu/gradients/',
-  'GrResourceCache',
-  'GrResourceProvider',
-  'GrAA',
-  'GrGL',
-  'GrCCPathProcessor',
-  'GrCCStrokeGeometry',
-  'GrMSAAPathRenderer.cpp',
-  'GrNonAAFillRect',
-  'GrPathUtils',
-  'GrShadowRRectOp',
   'SkColorSpace',
   'SkImage_Gpu.cpp',
   'SkPathOpsDebug.cpp',
   'SkParsePath.cpp',
   'SkRecorder.cpp',
   'SkMiniRecorder.cpp',
   'SkXfermode',
   'SkMatrix44.cpp',
@@ -416,19 +389,16 @@ def write_mozbuild(sources):
   f.write(header)
 
   write_sources(f, sources['common'], 0)
   write_cflags(f, sources['common'], opt_whitelist, 'skia_opt_flags', 0)
 
   f.write("if CONFIG['MOZ_ENABLE_SKIA_PDF']:\n")
   write_sources(f, sources['pdf'], 4)
 
-  f.write("if CONFIG['MOZ_ENABLE_SKIA_GPU']:\n")
-  write_sources(f, sources['gpu'], 4)
-
   f.write("if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'android':\n")
   write_sources(f, sources['android'], 4)
 
   f.write("if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('cocoa', 'uikit'):\n")
   write_sources(f, sources['mac'], 4)
 
   f.write("if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gtk3':\n")
   write_sources(f, sources['linux'], 4)
--- a/gfx/skia/moz.build
+++ b/gfx/skia/moz.build
@@ -295,17 +295,16 @@ SOURCES += [
     'skia/src/core/SkScan_Antihair.cpp',
     'skia/src/core/SkScan_AntiPath.cpp',
     'skia/src/core/SkScan_DAAPath.cpp',
     'skia/src/core/SkSpriteBlitter_ARGB32.cpp',
     'skia/src/core/SkSpriteBlitter_RGB565.cpp',
     'skia/src/core/SkVertices.cpp',
     'skia/src/core/SkXfermode.cpp',
     'skia/src/core/SkXfermodeInterpretation.cpp',
-    'skia/src/gpu/gl/GrGLMakeNativeInterface_none.cpp',
     'skia/src/jumper/SkJumper.cpp',
     'skia/src/pathops/SkPathOpsDebug.cpp',
     'skia/src/utils/SkParse.cpp',
     'skia/src/utils/SkParsePath.cpp',
     'skia/third_party/skcms/skcms.cc',
 ]
 SOURCES['skia/src/core/SkBitmapProcState.cpp'].flags += skia_opt_flags
 SOURCES['skia/src/core/SkBitmapProcState_matrixProcs.cpp'].flags += skia_opt_flags
@@ -343,271 +342,16 @@ if CONFIG['MOZ_ENABLE_SKIA_PDF']:
         'skia/src/pdf/SkPDFShader.cpp',
         'skia/src/pdf/SkPDFTag.cpp',
         'skia/src/pdf/SkPDFTypes.cpp',
         'skia/src/pdf/SkPDFUtils.cpp',
     ]
     SOURCES += [
         'skia/src/pdf/SkPDFFont.cpp',
     ]
-if CONFIG['MOZ_ENABLE_SKIA_GPU']:
-    UNIFIED_SOURCES += [
-        'skia/src/gpu/ccpr/GrCCAtlas.cpp',
-        'skia/src/gpu/ccpr/GrCCClipPath.cpp',
-        'skia/src/gpu/ccpr/GrCCClipProcessor.cpp',
-        'skia/src/gpu/ccpr/GrCCConicShader.cpp',
-        'skia/src/gpu/ccpr/GrCCCoverageProcessor.cpp',
-        'skia/src/gpu/ccpr/GrCCCoverageProcessor_GSImpl.cpp',
-        'skia/src/gpu/ccpr/GrCCCoverageProcessor_VSImpl.cpp',
-        'skia/src/gpu/ccpr/GrCCCubicShader.cpp',
-        'skia/src/gpu/ccpr/GrCCDrawPathsOp.cpp',
-        'skia/src/gpu/ccpr/GrCCFiller.cpp',
-        'skia/src/gpu/ccpr/GrCCFillGeometry.cpp',
-        'skia/src/gpu/ccpr/GrCCPathCache.cpp',
-        'skia/src/gpu/ccpr/GrCCPerFlushResources.cpp',
-        'skia/src/gpu/ccpr/GrCCQuadraticShader.cpp',
-        'skia/src/gpu/ccpr/GrCCStroker.cpp',
-        'skia/src/gpu/ccpr/GrCoverageCountingPathRenderer.cpp',
-        'skia/src/gpu/GrAHardwareBufferImageGenerator.cpp',
-        'skia/src/gpu/GrAuditTrail.cpp',
-        'skia/src/gpu/GrBackendSurface.cpp',
-        'skia/src/gpu/GrBackendTextureImageGenerator.cpp',
-        'skia/src/gpu/GrBitmapTextureMaker.cpp',
-        'skia/src/gpu/GrBlurUtils.cpp',
-        'skia/src/gpu/GrBuffer.cpp',
-        'skia/src/gpu/GrBufferAllocPool.cpp',
-        'skia/src/gpu/GrCaps.cpp',
-        'skia/src/gpu/GrClipStackClip.cpp',
-        'skia/src/gpu/GrColorSpaceInfo.cpp',
-        'skia/src/gpu/GrColorSpaceXform.cpp',
-        'skia/src/gpu/GrContext.cpp',
-        'skia/src/gpu/GrDDLContext.cpp',
-        'skia/src/gpu/GrDefaultGeoProcFactory.cpp',
-        'skia/src/gpu/GrDirectContext.cpp',
-        'skia/src/gpu/GrDistanceFieldGenFromVector.cpp',
-        'skia/src/gpu/GrDrawingManager.cpp',
-        'skia/src/gpu/GrDrawOpAtlas.cpp',
-        'skia/src/gpu/GrDrawOpTest.cpp',
-        'skia/src/gpu/GrDriverBugWorkarounds.cpp',
-        'skia/src/gpu/GrFixedClip.cpp',
-        'skia/src/gpu/GrFragmentProcessor.cpp',
-        'skia/src/gpu/GrGpu.cpp',
-        'skia/src/gpu/GrGpuCommandBuffer.cpp',
-        'skia/src/gpu/GrGpuResource.cpp',
-        'skia/src/gpu/GrImageTextureMaker.cpp',
-        'skia/src/gpu/GrMemoryPool.cpp',
-        'skia/src/gpu/GrOnFlushResourceProvider.cpp',
-        'skia/src/gpu/GrOpFlushState.cpp',
-        'skia/src/gpu/GrOpList.cpp',
-        'skia/src/gpu/GrPaint.cpp',
-        'skia/src/gpu/GrPath.cpp',
-        'skia/src/gpu/GrPathProcessor.cpp',
-        'skia/src/gpu/GrPathRenderer.cpp',
-        'skia/src/gpu/GrPathRendererChain.cpp',
-        'skia/src/gpu/GrPathRendering.cpp',
-        'skia/src/gpu/GrPipeline.cpp',
-        'skia/src/gpu/GrPrimitiveProcessor.cpp',
-        'skia/src/gpu/GrProcessor.cpp',
-        'skia/src/gpu/GrProcessorAnalysis.cpp',
-        'skia/src/gpu/GrProcessorSet.cpp',
-        'skia/src/gpu/GrProcessorUnitTest.cpp',
-        'skia/src/gpu/GrProgramDesc.cpp',
-        'skia/src/gpu/GrProxyProvider.cpp',
-        'skia/src/gpu/GrQuad.cpp',
-        'skia/src/gpu/GrRectanizer_pow2.cpp',
-        'skia/src/gpu/GrRectanizer_skyline.cpp',
-        'skia/src/gpu/GrReducedClip.cpp',
-        'skia/src/gpu/GrRenderTarget.cpp',
-        'skia/src/gpu/GrRenderTargetContext.cpp',
-        'skia/src/gpu/GrRenderTargetOpList.cpp',
-        'skia/src/gpu/GrRenderTargetProxy.cpp',
-        'skia/src/gpu/GrResourceAllocator.cpp',
-        'skia/src/gpu/GrShaderCaps.cpp',
-        'skia/src/gpu/GrShaderVar.cpp',
-        'skia/src/gpu/GrShape.cpp',
-        'skia/src/gpu/GrSKSLPrettyPrint.cpp',
-        'skia/src/gpu/GrSoftwarePathRenderer.cpp',
-        'skia/src/gpu/GrStencilAttachment.cpp',
-        'skia/src/gpu/GrStencilSettings.cpp',
-        'skia/src/gpu/GrStyle.cpp',
-        'skia/src/gpu/GrSurface.cpp',
-        'skia/src/gpu/GrSurfaceContext.cpp',
-        'skia/src/gpu/GrSurfaceProxy.cpp',
-        'skia/src/gpu/GrSWMaskHelper.cpp',
-        'skia/src/gpu/GrTessellator.cpp',
-        'skia/src/gpu/GrTestUtils.cpp',
-        'skia/src/gpu/GrTexture.cpp',
-        'skia/src/gpu/GrTextureAdjuster.cpp',
-        'skia/src/gpu/GrTextureContext.cpp',
-        'skia/src/gpu/GrTextureMaker.cpp',
-        'skia/src/gpu/GrTextureOpList.cpp',
-        'skia/src/gpu/GrTextureProducer.cpp',
-        'skia/src/gpu/GrTextureProxy.cpp',
-        'skia/src/gpu/GrTextureRenderTargetProxy.cpp',
-        'skia/src/gpu/GrUninstantiateProxyTracker.cpp',
-        'skia/src/gpu/GrXferProcessor.cpp',
-        'skia/src/gpu/GrYUVProvider.cpp',
-        'skia/src/gpu/mock/GrMockGpu.cpp',
-        'skia/src/gpu/ops/GrAtlasTextOp.cpp',
-        'skia/src/gpu/ops/GrClearOp.cpp',
-        'skia/src/gpu/ops/GrClearStencilClipOp.cpp',
-        'skia/src/gpu/ops/GrCopySurfaceOp.cpp',
-        'skia/src/gpu/ops/GrDashLinePathRenderer.cpp',
-        'skia/src/gpu/ops/GrDashOp.cpp',
-        'skia/src/gpu/ops/GrDebugMarkerOp.cpp',
-        'skia/src/gpu/ops/GrDefaultPathRenderer.cpp',
-        'skia/src/gpu/ops/GrDrawAtlasOp.cpp',
-        'skia/src/gpu/ops/GrDrawPathOp.cpp',
-        'skia/src/gpu/ops/GrDrawVerticesOp.cpp',
-        'skia/src/gpu/ops/GrLatticeOp.cpp',
-        'skia/src/gpu/ops/GrMeshDrawOp.cpp',
-        'skia/src/gpu/ops/GrNonAAStrokeRectOp.cpp',
-        'skia/src/gpu/ops/GrOp.cpp',
-        'skia/src/gpu/ops/GrOvalOpFactory.cpp',
-        'skia/src/gpu/ops/GrRegionOp.cpp',
-        'skia/src/gpu/ops/GrSemaphoreOp.cpp',
-        'skia/src/gpu/ops/GrSimpleMeshDrawOpHelper.cpp',
-        'skia/src/gpu/ops/GrSmallPathRenderer.cpp',
-        'skia/src/gpu/ops/GrStencilAndCoverPathRenderer.cpp',
-        'skia/src/gpu/ops/GrStencilPathOp.cpp',
-        'skia/src/gpu/ops/GrTessellatingPathRenderer.cpp',
-        'skia/src/gpu/ops/GrTextureOp.cpp',
-        'skia/src/gpu/SkGpuDevice.cpp',
-        'skia/src/gpu/SkGpuDevice_drawTexture.cpp',
-        'skia/src/gpu/SkGr.cpp',
-        'skia/src/gpu/text/GrAtlasManager.cpp',
-        'skia/src/gpu/text/GrDistanceFieldAdjustTable.cpp',
-        'skia/src/gpu/text/GrGlyphCache.cpp',
-        'skia/src/gpu/text/GrSDFMaskFilter.cpp',
-        'skia/src/gpu/text/GrTextBlob.cpp',
-        'skia/src/gpu/text/GrTextBlobCache.cpp',
-        'skia/src/gpu/text/GrTextBlobVertexRegenerator.cpp',
-        'skia/src/gpu/text/GrTextContext.cpp',
-        'skia/src/image/SkImage_GpuBase.cpp',
-        'skia/src/image/SkImage_GpuYUVA.cpp',
-        'skia/src/image/SkSurface_Gpu.cpp',
-        'skia/src/sksl/ir/SkSLSetting.cpp',
-        'skia/src/sksl/ir/SkSLSymbolTable.cpp',
-        'skia/src/sksl/ir/SkSLType.cpp',
-        'skia/src/sksl/ir/SkSLVariableReference.cpp',
-        'skia/src/sksl/SkSLCFGGenerator.cpp',
-        'skia/src/sksl/SkSLCompiler.cpp',
-        'skia/src/sksl/SkSLCPPCodeGenerator.cpp',
-        'skia/src/sksl/SkSLCPPUniformCTypes.cpp',
-        'skia/src/sksl/SkSLGLSLCodeGenerator.cpp',
-        'skia/src/sksl/SkSLInterpreter.cpp',
-        'skia/src/sksl/SkSLIRGenerator.cpp',
-        'skia/src/sksl/SkSLJIT.cpp',
-        'skia/src/sksl/SkSLMetalCodeGenerator.cpp',
-        'skia/src/sksl/SkSLParser.cpp',
-        'skia/src/sksl/SkSLPipelineStageCodeGenerator.cpp',
-        'skia/src/sksl/SkSLSPIRVCodeGenerator.cpp',
-        'skia/src/sksl/SkSLString.cpp',
-        'skia/src/sksl/SkSLUtil.cpp',
-    ]
-    SOURCES += [
-        'skia/src/gpu/ccpr/GrCCPathProcessor.cpp',
-        'skia/src/gpu/ccpr/GrCCStrokeGeometry.cpp',
-        'skia/src/gpu/effects/GrAARectEffect.cpp',
-        'skia/src/gpu/effects/GrAlphaThresholdFragmentProcessor.cpp',
-        'skia/src/gpu/effects/GrBezierEffect.cpp',
-        'skia/src/gpu/effects/GrBicubicEffect.cpp',
-        'skia/src/gpu/effects/GrBitmapTextGeoProc.cpp',
-        'skia/src/gpu/effects/GrBlurredEdgeFragmentProcessor.cpp',
-        'skia/src/gpu/effects/GrCircleBlurFragmentProcessor.cpp',
-        'skia/src/gpu/effects/GrCircleEffect.cpp',
-        'skia/src/gpu/effects/GrConfigConversionEffect.cpp',
-        'skia/src/gpu/effects/GrConstColorProcessor.cpp',
-        'skia/src/gpu/effects/GrConvexPolyEffect.cpp',
-        'skia/src/gpu/effects/GrCoverageSetOpXP.cpp',
-        'skia/src/gpu/effects/GrCustomXfermode.cpp',
-        'skia/src/gpu/effects/GrDisableColorXP.cpp',
-        'skia/src/gpu/effects/GrDistanceFieldGeoProc.cpp',
-        'skia/src/gpu/effects/GrEllipseEffect.cpp',
-        'skia/src/gpu/effects/GrGaussianConvolutionFragmentProcessor.cpp',
-        'skia/src/gpu/effects/GrLumaColorFilterEffect.cpp',
-        'skia/src/gpu/effects/GrMagnifierEffect.cpp',
-        'skia/src/gpu/effects/GrMatrixConvolutionEffect.cpp',
-        'skia/src/gpu/effects/GrOvalEffect.cpp',
-        'skia/src/gpu/effects/GrPorterDuffXferProcessor.cpp',
-        'skia/src/gpu/effects/GrPremulInputFragmentProcessor.cpp',
-        'skia/src/gpu/effects/GrRectBlurEffect.cpp',
-        'skia/src/gpu/effects/GrRRectBlurEffect.cpp',
-        'skia/src/gpu/effects/GrRRectEffect.cpp',
-        'skia/src/gpu/effects/GrShadowGeoProc.cpp',
-        'skia/src/gpu/effects/GrSimpleTextureEffect.cpp',
-        'skia/src/gpu/effects/GrSkSLFP.cpp',
-        'skia/src/gpu/effects/GrSRGBEffect.cpp',
-        'skia/src/gpu/effects/GrTextureDomain.cpp',
-        'skia/src/gpu/effects/GrXfermodeFragmentProcessor.cpp',
-        'skia/src/gpu/effects/GrYUVtoRGBEffect.cpp',
-        'skia/src/gpu/gl/builders/GrGLProgramBuilder.cpp',
-        'skia/src/gpu/gl/builders/GrGLShaderStringBuilder.cpp',
-        'skia/src/gpu/gl/GrGLBuffer.cpp',
-        'skia/src/gpu/gl/GrGLCaps.cpp',
-        'skia/src/gpu/gl/GrGLContext.cpp',
-        'skia/src/gpu/gl/GrGLExtensions.cpp',
-        'skia/src/gpu/gl/GrGLGLSL.cpp',
-        'skia/src/gpu/gl/GrGLGpu.cpp',
-        'skia/src/gpu/gl/GrGLGpuCommandBuffer.cpp',
-        'skia/src/gpu/gl/GrGLGpuProgramCache.cpp',
-        'skia/src/gpu/gl/GrGLInterface.cpp',
-        'skia/src/gpu/gl/GrGLPath.cpp',
-        'skia/src/gpu/gl/GrGLPathRendering.cpp',
-        'skia/src/gpu/gl/GrGLProgram.cpp',
-        'skia/src/gpu/gl/GrGLProgramDataManager.cpp',
-        'skia/src/gpu/gl/GrGLRenderTarget.cpp',
-        'skia/src/gpu/gl/GrGLSemaphore.cpp',
-        'skia/src/gpu/gl/GrGLStencilAttachment.cpp',
-        'skia/src/gpu/gl/GrGLTexture.cpp',
-        'skia/src/gpu/gl/GrGLTextureRenderTarget.cpp',
-        'skia/src/gpu/gl/GrGLUniformHandler.cpp',
-        'skia/src/gpu/gl/GrGLUtil.cpp',
-        'skia/src/gpu/gl/GrGLVaryingHandler.cpp',
-        'skia/src/gpu/gl/GrGLVertexArray.cpp',
-        'skia/src/gpu/glsl/GrGLSL.cpp',
-        'skia/src/gpu/glsl/GrGLSLBlend.cpp',
-        'skia/src/gpu/glsl/GrGLSLFragmentProcessor.cpp',
-        'skia/src/gpu/glsl/GrGLSLFragmentShaderBuilder.cpp',
-        'skia/src/gpu/glsl/GrGLSLGeometryProcessor.cpp',
-        'skia/src/gpu/glsl/GrGLSLPrimitiveProcessor.cpp',
-        'skia/src/gpu/glsl/GrGLSLProgramBuilder.cpp',
-        'skia/src/gpu/glsl/GrGLSLProgramDataManager.cpp',
-        'skia/src/gpu/glsl/GrGLSLShaderBuilder.cpp',
-        'skia/src/gpu/glsl/GrGLSLUtil.cpp',
-        'skia/src/gpu/glsl/GrGLSLVarying.cpp',
-        'skia/src/gpu/glsl/GrGLSLVertexGeoBuilder.cpp',
-        'skia/src/gpu/glsl/GrGLSLXferProcessor.cpp',
-        'skia/src/gpu/gradients/GrClampedGradientEffect.cpp',
-        'skia/src/gpu/gradients/GrDualIntervalGradientColorizer.cpp',
-        'skia/src/gpu/gradients/GrGradientBitmapCache.cpp',
-        'skia/src/gpu/gradients/GrGradientShader.cpp',
-        'skia/src/gpu/gradients/GrLinearGradientLayout.cpp',
-        'skia/src/gpu/gradients/GrRadialGradientLayout.cpp',
-        'skia/src/gpu/gradients/GrSingleIntervalGradientColorizer.cpp',
-        'skia/src/gpu/gradients/GrSweepGradientLayout.cpp',
-        'skia/src/gpu/gradients/GrTextureGradientColorizer.cpp',
-        'skia/src/gpu/gradients/GrTiledGradientEffect.cpp',
-        'skia/src/gpu/gradients/GrTwoPointConicalGradientLayout.cpp',
-        'skia/src/gpu/gradients/GrUnrolledBinaryGradientColorizer.cpp',
-        'skia/src/gpu/GrPathUtils.cpp',
-        'skia/src/gpu/GrResourceCache.cpp',
-        'skia/src/gpu/GrResourceProvider.cpp',
-        'skia/src/gpu/ops/GrAAConvexPathRenderer.cpp',
-        'skia/src/gpu/ops/GrAAConvexTessellator.cpp',
-        'skia/src/gpu/ops/GrAAFillRectOp.cpp',
-        'skia/src/gpu/ops/GrAAHairLinePathRenderer.cpp',
-        'skia/src/gpu/ops/GrAALinearizingConvexPathRenderer.cpp',
-        'skia/src/gpu/ops/GrAAStrokeRectOp.cpp',
-        'skia/src/gpu/ops/GrNonAAFillRectOp.cpp',
-        'skia/src/gpu/ops/GrShadowRRectOp.cpp',
-        'skia/src/image/SkImage_Gpu.cpp',
-        'skia/src/sksl/SkSLHCodeGenerator.cpp',
-        'skia/src/sksl/SkSLLexer.cpp',
-    ]
 if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'android':
     UNIFIED_SOURCES += [
         'skia/src/ports/SkDebug_android.cpp',
         'skia/src/ports/SkOSFile_posix.cpp',
         'skia/src/ports/SkOSLibrary_posix.cpp',
         'skia/src/ports/SkTLS_pthread.cpp',
     ]
     SOURCES += [
@@ -728,20 +472,16 @@ LOCAL_INCLUDES += [
     'skia/include/gpu',
     'skia/include/pathops',
     'skia/include/ports',
     'skia/include/private',
     'skia/include/utils',
     'skia/include/utils/mac',
     'skia/src/codec',
     'skia/src/core',
-    'skia/src/gpu',
-    'skia/src/gpu/effects',
-    'skia/src/gpu/gl',
-    'skia/src/gpu/glsl',
     'skia/src/image',
     'skia/src/lazy',
     'skia/src/opts',
     'skia/src/sfnt',
     'skia/src/shaders',
     'skia/src/shaders/gradients',
     'skia/src/sksl',
     'skia/src/utils',
@@ -773,19 +513,16 @@ elif CONFIG['CPU_ARCH'] == 'arm' and CON
 elif CONFIG['CPU_ARCH'] == 'aarch64' and CONFIG['CC_TYPE'] in ('clang', 'gcc'):
     SOURCES['skia/src/opts/SkOpts_crc32.cpp'].flags += ['-march=armv8-a+crc']
 
 DEFINES['SKIA_IMPLEMENTATION'] = 1
 
 if CONFIG['MOZ_ENABLE_SKIA_PDF_SFNTLY']:
     DEFINES['SK_PDF_USE_SFNTLY'] = 1
 
-if not CONFIG['MOZ_ENABLE_SKIA_GPU']:
-    DEFINES['SK_SUPPORT_GPU'] = 0
-
 if CONFIG['MOZ_TREE_FREETYPE']:
     DEFINES['SK_CAN_USE_DLOPEN'] = 0
 
 # Suppress warnings in third-party code.
 CXXFLAGS += [
     '-Wno-deprecated-declarations',
     '-Wno-overloaded-virtual',
     '-Wno-shadow',
--- a/gfx/skia/skia/include/config/SkUserConfig.h
+++ b/gfx/skia/skia/include/config/SkUserConfig.h
@@ -149,17 +149,11 @@
 #    define MOZ_IMPLICIT __attribute__((annotate("moz_implicit")))
 #  else
 #    define MOZ_IMPLICIT
 #  endif
 #endif
 
 #define MOZ_SKIA
 
-#ifndef SK_SUPPORT_GPU
-#  ifdef USE_SKIA_GPU
-#    define SK_SUPPORT_GPU 1
-#  else
-#    define SK_SUPPORT_GPU 0
-#  endif
-#endif
+#define SK_SUPPORT_GPU 0
 
 #endif