зеркало из https://github.com/mozilla/gecko-dev.git
Bug 939629 - 2/2. Build Skia in unified mode - r=ehsan,gw280
This commit is contained in:
Benoit Jacob
Родитель
b220ea74d4
Коммит
bbaa796dee
|
|
@ -151,57 +151,69 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa':
|
|||
EXPORTS.skia += [
|
||||
'include/ports/SkTypeface_mac.h',
|
||||
]
|
||||
SOURCES += [
|
||||
'src/ports/SkFontHost_mac.cpp',
|
||||
UNIFIED_SOURCES += [
|
||||
'src/ports/SkThread_pthread.cpp',
|
||||
'src/ports/SkTime_Unix.cpp',
|
||||
'src/utils/mac/SkStream_mac.cpp',
|
||||
'src/utils/SkThreadUtils_pthread.cpp',
|
||||
'src/utils/SkThreadUtils_pthread_mach.cpp',
|
||||
]
|
||||
# left out of UNIFIED_SOURCES for now to avoid having to patch skia. Should revisit eventually.
|
||||
SOURCES += [
|
||||
'src/ports/SkFontHost_mac.cpp',
|
||||
]
|
||||
elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows':
|
||||
EXPORTS.skia += [
|
||||
'include/config/sk_stdint.h',
|
||||
'include/ports/SkTypeface_win.h',
|
||||
]
|
||||
SOURCES += [
|
||||
'src/ports/SkFontHost_sandbox_none.cpp',
|
||||
'src/ports/SkFontHost_win.cpp',
|
||||
UNIFIED_SOURCES += [
|
||||
'src/ports/SkThread_win.cpp',
|
||||
'src/ports/SkTime_win.cpp',
|
||||
'src/utils/SkThreadUtils_win.cpp',
|
||||
]
|
||||
# left out of UNIFIED_SOURCES for now to avoid having to patch skia. Should revisit eventually.
|
||||
SOURCES += [
|
||||
'src/ports/SkFontHost_sandbox_none.cpp',
|
||||
'src/ports/SkFontHost_win.cpp',
|
||||
]
|
||||
elif CONFIG['MOZ_WIDGET_GTK']:
|
||||
EXPORTS.skia += [
|
||||
'include/ports/SkTypeface_cairo.h',
|
||||
]
|
||||
SOURCES += [
|
||||
'src/ports/SkFontHost_cairo.cpp',
|
||||
'src/ports/SkFontHost_FreeType_common.cpp',
|
||||
UNIFIED_SOURCES += [
|
||||
'src/ports/SkThread_pthread.cpp',
|
||||
'src/ports/SkTime_Unix.cpp',
|
||||
'src/utils/SkOSFile.cpp',
|
||||
'src/utils/SkThreadUtils_pthread.cpp',
|
||||
]
|
||||
if CONFIG['OS_TARGET'] in ('Linux', 'FreeBSD', 'NetBSD'):
|
||||
SOURCES += [
|
||||
'src/utils/SkThreadUtils_pthread_linux.cpp',
|
||||
]
|
||||
else:
|
||||
SOURCES += [
|
||||
'src/utils/SkThreadUtils_pthread_other.cpp',
|
||||
]
|
||||
elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'qt':
|
||||
# left out of UNIFIED_SOURCES for now to avoid having to patch skia. Should revisit eventually.
|
||||
SOURCES += [
|
||||
'src/ports/SkFontHost_cairo.cpp',
|
||||
'src/ports/SkFontHost_FreeType_common.cpp',
|
||||
]
|
||||
if CONFIG['OS_TARGET'] in ('Linux', 'FreeBSD', 'NetBSD'):
|
||||
UNIFIED_SOURCES += [
|
||||
'src/utils/SkThreadUtils_pthread_linux.cpp',
|
||||
]
|
||||
else:
|
||||
UNIFIED_SOURCES += [
|
||||
'src/utils/SkThreadUtils_pthread_other.cpp',
|
||||
]
|
||||
elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'qt':
|
||||
UNIFIED_SOURCES += [
|
||||
'src/utils/SkOSFile.cpp',
|
||||
]
|
||||
# left out of UNIFIED_SOURCES for now to avoid having to patch skia. Should revisit eventually.
|
||||
SOURCES += [
|
||||
'src/ports/SkFontHost_cairo.cpp',
|
||||
'src/ports/SkFontHost_FreeType_common.cpp',
|
||||
]
|
||||
if CONFIG['OS_TARGET'] == 'Linux':
|
||||
EXPORTS.skia += [
|
||||
'include/ports/SkTypeface_cairo.h',
|
||||
]
|
||||
SOURCES += [
|
||||
UNIFIED_SOURCES += [
|
||||
'src/ports/SkThread_pthread.cpp',
|
||||
'src/ports/SkTime_Unix.cpp',
|
||||
'src/utils/SkThreadUtils_pthread.cpp',
|
||||
|
|
@ -213,13 +225,9 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('android', 'gonk'):
|
|||
EXPORTS.skia += [
|
||||
'include/ports/SkTypeface_cairo.h',
|
||||
]
|
||||
SOURCES += [
|
||||
UNIFIED_SOURCES += [
|
||||
'src/images/SkImageRef_ashmem.cpp',
|
||||
'src/ports/SkDebug_android.cpp',
|
||||
'src/ports/SkFontHost_cairo.cpp',
|
||||
'src/ports/SkFontHost_FreeType.cpp',
|
||||
'src/ports/SkFontHost_FreeType_common.cpp',
|
||||
'src/ports/SkFontHost_linux.cpp',
|
||||
'src/ports/SkThread_pthread.cpp',
|
||||
'src/ports/SkTime_Unix.cpp',
|
||||
'src/utils/android/ashmem.cpp',
|
||||
|
|
@ -227,12 +235,22 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('android', 'gonk'):
|
|||
'src/utils/SkThreadUtils_pthread.cpp',
|
||||
'src/utils/SkThreadUtils_pthread_other.cpp',
|
||||
]
|
||||
else:
|
||||
# left out of UNIFIED_SOURCES for now to avoid having to patch skia. Should revisit eventually.
|
||||
SOURCES += [
|
||||
'src/ports/SkFontHost_cairo.cpp',
|
||||
'src/ports/SkFontHost_FreeType.cpp',
|
||||
'src/ports/SkFontHost_FreeType_common.cpp',
|
||||
'src/ports/SkFontHost_linux.cpp',
|
||||
]
|
||||
else:
|
||||
UNIFIED_SOURCES += [
|
||||
'src/ports/SkDebug_stdio.cpp',
|
||||
]
|
||||
|
||||
if CONFIG['INTEL_ARCHITECTURE']:
|
||||
# We need to build SSE2-enabled files separately so that we're able
|
||||
# to pass -msse2 for them. We won't be able to unify them with the rest,
|
||||
# but we should at least be able to unify them with each other.
|
||||
SOURCES += [
|
||||
'src/opts/opts_check_SSE2.cpp',
|
||||
'src/opts/SkBitmapProcState_opts_SSE2.cpp',
|
||||
|
|
@ -245,20 +263,24 @@ if CONFIG['INTEL_ARCHITECTURE']:
|
|||
'src/opts/SkBitmapProcState_opts_SSSE3.cpp',
|
||||
]
|
||||
elif CONFIG['CPU_ARCH'] == 'arm' and CONFIG['GNU_CC']:
|
||||
SOURCES += [
|
||||
UNIFIED_SOURCES += [
|
||||
'src/opts/opts_check_arm.cpp',
|
||||
'src/opts/SkBitmapProcState_opts_arm.cpp',
|
||||
'src/opts/SkBlitRow_opts_arm.cpp',
|
||||
]
|
||||
SOURCES += [
|
||||
'src/opts/SkBitmapProcState_opts_arm.cpp',
|
||||
]
|
||||
else:
|
||||
SOURCES += [
|
||||
'src/opts/SkBitmapProcState_opts_none.cpp',
|
||||
UNIFIED_SOURCES += [
|
||||
'src/opts/SkBlitRow_opts_none.cpp',
|
||||
'src/opts/SkUtils_opts_none.cpp',
|
||||
]
|
||||
SOURCES += [
|
||||
'src/opts/SkBitmapProcState_opts_none.cpp',
|
||||
]
|
||||
|
||||
if CONFIG['MOZ_ENABLE_SKIA_GPU']:
|
||||
SOURCES += [
|
||||
UNIFIED_SOURCES += [
|
||||
'src/gpu/effects/GrConfigConversionEffect.cpp',
|
||||
'src/gpu/effects/GrConvolutionEffect.cpp',
|
||||
'src/gpu/effects/GrSimpleTextureEffect.cpp',
|
||||
|
|
@ -342,7 +364,7 @@ if CONFIG['MOZ_ENABLE_SKIA_GPU']:
|
|||
'src/gpu/SkGrTexturePixelRef.cpp',
|
||||
]
|
||||
|
||||
SOURCES += [
|
||||
UNIFIED_SOURCES += [
|
||||
'src/core/Sk64.cpp',
|
||||
'src/core/SkAAClip.cpp',
|
||||
'src/core/SkAdvancedTypefaceMetrics.cpp',
|
||||
|
|
@ -356,19 +378,12 @@ SOURCES += [
|
|||
'src/core/SkBitmapHeap.cpp',
|
||||
'src/core/SkBitmapProcShader.cpp',
|
||||
'src/core/SkBitmapProcState.cpp',
|
||||
'src/core/SkBitmapProcState_matrixProcs.cpp',
|
||||
'src/core/SkBitmapSampler.cpp',
|
||||
'src/core/SkBlitMask_D32.cpp',
|
||||
'src/core/SkBlitRow_D16.cpp',
|
||||
'src/core/SkBlitRow_D32.cpp',
|
||||
'src/core/SkBlitRow_D4444.cpp',
|
||||
'src/core/SkBlitter.cpp',
|
||||
'src/core/SkBlitter_4444.cpp',
|
||||
'src/core/SkBlitter_A1.cpp',
|
||||
'src/core/SkBlitter_A8.cpp',
|
||||
'src/core/SkBlitter_ARGB32.cpp',
|
||||
'src/core/SkBlitter_RGB16.cpp',
|
||||
'src/core/SkBlitter_Sprite.cpp',
|
||||
'src/core/SkBuffer.cpp',
|
||||
'src/core/SkCanvas.cpp',
|
||||
'src/core/SkChunkAlloc.cpp',
|
||||
|
|
@ -443,10 +458,6 @@ SOURCES += [
|
|||
'src/core/SkScalar.cpp',
|
||||
'src/core/SkScalerContext.cpp',
|
||||
'src/core/SkScan.cpp',
|
||||
'src/core/SkScan_Antihair.cpp',
|
||||
'src/core/SkScan_AntiPath.cpp',
|
||||
'src/core/SkScan_Hairline.cpp',
|
||||
'src/core/SkScan_Path.cpp',
|
||||
'src/core/SkShader.cpp',
|
||||
'src/core/SkSpriteBlitter_ARGB32.cpp',
|
||||
'src/core/SkSpriteBlitter_RGB16.cpp',
|
||||
|
|
@ -472,8 +483,6 @@ SOURCES += [
|
|||
'src/effects/gradients/SkLinearGradient.cpp',
|
||||
'src/effects/gradients/SkRadialGradient.cpp',
|
||||
'src/effects/gradients/SkSweepGradient.cpp',
|
||||
'src/effects/gradients/SkTwoPointConicalGradient.cpp',
|
||||
'src/effects/gradients/SkTwoPointRadialGradient.cpp',
|
||||
'src/effects/Sk1DPathEffect.cpp',
|
||||
'src/effects/Sk2DPathEffect.cpp',
|
||||
'src/effects/SkAvoidXfermode.cpp',
|
||||
|
|
@ -534,7 +543,6 @@ SOURCES += [
|
|||
'src/utils/SkBase64.cpp',
|
||||
'src/utils/SkBitmapTransformer.cpp',
|
||||
'src/utils/SkBitSet.cpp',
|
||||
'src/utils/SkCondVar.cpp',
|
||||
'src/utils/SkCountdown.cpp',
|
||||
'src/utils/SkDeferredCanvas.cpp',
|
||||
'src/utils/SkPictureUtils.cpp',
|
||||
|
|
@ -542,6 +550,36 @@ SOURCES += [
|
|||
'src/utils/SkThreadPool.cpp',
|
||||
]
|
||||
|
||||
# left out of UNIFIED_SOURCES for now to avoid having to patch skia. Should revisit eventually.
|
||||
SOURCES += [
|
||||
'src/core/SkBitmapProcState_matrixProcs.cpp',
|
||||
'src/core/SkBlitter_4444.cpp',
|
||||
'src/core/SkBlitter_A1.cpp',
|
||||
'src/core/SkBlitter_A8.cpp',
|
||||
'src/core/SkBlitter_ARGB32.cpp',
|
||||
'src/core/SkBlitter_RGB16.cpp',
|
||||
'src/core/SkBlitter_Sprite.cpp',
|
||||
'src/core/SkScan_Antihair.cpp',
|
||||
'src/core/SkScan_AntiPath.cpp',
|
||||
'src/core/SkScan_Hairline.cpp',
|
||||
'src/core/SkScan_Path.cpp',
|
||||
'src/effects/gradients/SkTwoPointConicalGradient.cpp',
|
||||
'src/effects/gradients/SkTwoPointRadialGradient.cpp',
|
||||
]
|
||||
|
||||
# On Windows, SkCondVar needs to be built separately because it relies on
|
||||
# windows.h providing such functions as InitializeConditionVariable.
|
||||
if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows':
|
||||
SOURCES += [
|
||||
'src/utils/SkCondVar.cpp',
|
||||
]
|
||||
else:
|
||||
UNIFIED_SOURCES += [
|
||||
'src/utils/SkCondVar.cpp',
|
||||
]
|
||||
|
||||
|
||||
# left out of UNIFIED_SOURCES for now; that's not C++ anyway, nothing else to unify it with
|
||||
if not CONFIG['INTEL_ARCHITECTURE'] and CONFIG['CPU_ARCH'] == 'arm' and CONFIG['GNU_CC']:
|
||||
SOURCES += [
|
||||
'src/opts/memset.arm.S',
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче