From 4e0a0628625396bf429872778b0771db963a21ec Mon Sep 17 00:00:00 2001 From: "bsalomon@google.com" Date: Fri, 18 Mar 2011 14:29:44 +0000 Subject: Initial GYP file for skia / gr. Builds SampleApp on Mac, Windows, Linux. Review URL: http://codereview.appspot.com/4282056/ git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@955 2bbb7eff-a529-9590-31e7-b0007b416f81 --- skia.gyp | 1430 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 1430 insertions(+) create mode 100644 skia.gyp diff --git a/skia.gyp b/skia.gyp new file mode 100644 index 0000000..fec90a8 --- /dev/null +++ b/skia.gyp @@ -0,0 +1,1430 @@ +{ + 'target_defaults': { + 'msvs_settings': { + #really need to figure out how to generate debug and release + 'VCLinkerTool': { + 'GenerateDebugInformation': 'true', + }, + 'VCCLCompilerTool': { + 'DebugInformationFormat': '4', + 'Optimization': '0', + }, + }, + 'conditions': [ + [ 'OS == "linux" or OS == "freebsd" or OS == "openbsd" or OS == "solaris"', { + 'include_dirs' : [ + '/usr/include/freetype2', + ], + }], + [ 'OS == "mac"', { + 'defines': [ + 'SK_BUILD_FOR_MAC', + ], + }], + [ 'OS == "win"', { + 'defines': [ + 'SK_BUILD_FOR_WIN32', + ], + },], + ], + 'direct_dependent_settings': { + 'conditions': [ + [ 'OS == "mac"', { + 'defines': [ + 'SK_BUILD_FOR_MAC', + ], + }], + [ 'OS == "win"', { + 'defines': [ + 'SK_BUILD_FOR_WIN32', + ], + },], + ], + }, + }, + 'targets': [ + { + 'target_name': 'skia', + 'type': 'static_library', + 'msvs_guid': 'B7760B5E-BFA8-486B-ACFD-49E3A6DE8E76', + 'sources': [ + '../src/core/ARGB32_Clamp_Bilinear_BitmapShader.h', + '../src/core/Sk64.cpp', + '../src/core/SkAdvancedTypefaceMetrics.cpp', + '../src/core/SkAlphaRuns.cpp', + '../src/core/SkAntiRun.h', + '../src/core/SkBitmap.cpp', + '../src/core/SkBitmapProcShader.cpp', + '../src/core/SkBitmapProcShader.h', + '../src/core/SkBitmapProcState.cpp', + '../src/core/SkBitmapProcState.h', + '../src/core/SkBitmapProcState_matrix.h', + '../src/core/SkBitmapProcState_matrixProcs.cpp', + '../src/core/SkBitmapProcState_sample.h', + '../src/core/SkBitmapSampler.cpp', + '../src/core/SkBitmapSampler.h', + '../src/core/SkBitmapSamplerTemplate.h', + '../src/core/SkBitmapShader16BilerpTemplate.h', + '../src/core/SkBitmapShaderTemplate.h', + '../src/core/SkBitmap_scroll.cpp', + '../src/core/SkBlitBWMaskTemplate.h', + '../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', + '../src/core/SkClipStack.cpp', + '../src/core/SkColor.cpp', + '../src/core/SkColorFilter.cpp', + '../src/core/SkColorTable.cpp', + '../src/core/SkComposeShader.cpp', + '../src/core/SkConcaveToTriangles.cpp', + '../src/core/SkConcaveToTriangles.h', + '../src/core/SkCordic.cpp', + '../src/core/SkCordic.h', + '../src/core/SkCoreBlitters.h', + '../src/core/SkCubicClipper.cpp', + '../src/core/SkCubicClipper.h', + '../src/core/SkDebug.cpp', + '../src/core/SkDeque.cpp', + '../src/core/SkDevice.cpp', + '../src/core/SkDither.cpp', + '../src/core/SkDraw.cpp', + '../src/core/SkDrawProcs.h', + '../src/core/SkEdgeBuilder.cpp', + '../src/core/SkEdgeClipper.cpp', + '../src/core/SkEdge.cpp', + '../src/core/SkEdge.h', + '../src/core/SkFP.h', + '../src/core/SkFilterProc.cpp', + '../src/core/SkFilterProc.h', + '../src/core/SkFlattenable.cpp', + '../src/core/SkFloat.cpp', + '../src/core/SkFloat.h', + '../src/core/SkFloatBits.cpp', + '../src/core/SkGeometry.cpp', + '../src/core/SkGlobals.cpp', + '../src/core/SkGlyphCache.cpp', + '../src/core/SkGlyphCache.h', + '../src/core/SkGraphics.cpp', + '../src/core/SkLineClipper.cpp', + '../src/core/SkMallocPixelRef.cpp', + '../src/core/SkMask.cpp', + '../src/core/SkMaskFilter.cpp', + '../src/core/SkMath.cpp', + '../src/core/SkMatrix.cpp', + '../src/core/SkPackBits.cpp', + '../src/core/SkPaint.cpp', + '../src/core/SkPath.cpp', + '../src/core/SkPathEffect.cpp', + '../src/core/SkPathHeap.cpp', + '../src/core/SkPathHeap.h', + '../src/core/SkPathMeasure.cpp', + '../src/core/SkPicture.cpp', + '../src/core/SkPictureFlat.cpp', + '../src/core/SkPictureFlat.h', + '../src/core/SkPicturePlayback.cpp', + '../src/core/SkPicturePlayback.h', + '../src/core/SkPictureRecord.cpp', + '../src/core/SkPictureRecord.h', + '../src/core/SkPixelRef.cpp', + '../src/core/SkPoint.cpp', + '../src/core/SkProcSpriteBlitter.cpp', + '../src/core/SkPtrRecorder.cpp', + '../src/core/SkQuadClipper.cpp', + '../src/core/SkQuadClipper.h', + '../src/core/SkRasterizer.cpp', + '../src/core/SkRect.cpp', + '../src/core/SkRefDict.cpp', + '../src/core/SkRegion.cpp', + '../src/core/SkRegionPriv.h', + '../src/core/SkRegion_path.cpp', + '../src/core/SkScalar.cpp', + '../src/core/SkScalerContext.cpp', + '../src/core/SkScan.cpp', + '../src/core/SkScanPriv.h', + '../src/core/SkScan_AntiPath.cpp', + '../src/core/SkScan_Antihair.cpp', + '../src/core/SkScan_Hairline.cpp', + '../src/core/SkScan_Path.cpp', + '../src/core/SkShader.cpp', + '../src/core/SkShape.cpp', + '../src/core/SkSpriteBlitter_ARGB32.cpp', + '../src/core/SkSpriteBlitter_RGB16.cpp', + '../src/core/SkSinTable.h', + '../src/core/SkSpriteBlitter.h', + '../src/core/SkSpriteBlitterTemplate.h', + '../src/core/SkStream.cpp', + '../src/core/SkString.cpp', + '../src/core/SkStroke.cpp', + '../src/core/SkStrokerPriv.cpp', + '../src/core/SkStrokerPriv.h', + '../src/core/SkTextFormatParams.h', + '../src/core/SkTSearch.cpp', + '../src/core/SkTSort.h', + '../src/core/SkTemplatesPriv.h', + '../src/core/SkTypeface.cpp', + '../src/core/SkUnPreMultiply.cpp', + '../src/core/SkUtils.cpp', + '../src/core/SkWriter32.cpp', + '../src/core/SkXfermode.cpp', + + '../src/opts/opts_check_SSE2.cpp', + + '../src/ports/SkDebug_stdio.cpp', + '../src/ports/SkFontHost_tables.cpp', + '../src/ports/SkGlobals_global.cpp', + '../src/ports/SkMemory_malloc.cpp', + '../src/ports/SkOSFile_stdio.cpp', + '../src/ports/SkTime_Unix.cpp', + '../src/ports/SkXMLParser_empty.cpp', + '../src/ports/sk_predefined_gamma.h', + + '../include/core/Sk64.h', + '../include/core/SkAdvancedTypefaceMetrics.h', + '../include/core/SkAutoKern.h', + '../include/core/SkBitmap.h', + '../include/core/SkBlitRow.h', + '../include/core/SkBlitter.h', + '../include/core/SkBounder.h', + '../include/core/SkBuffer.h', + '../include/core/SkCanvas.h', + '../include/core/SkChunkAlloc.h', + '../include/core/SkClipStack.h', + '../include/core/SkColor.h', + '../include/core/SkColorFilter.h', + '../include/core/SkColorPriv.h', + '../include/core/SkColorShader.h', + '../include/core/SkComposeShader.h', + '../include/core/SkDeque.h', + '../include/core/SkDescriptor.h', + '../include/core/SkDevice.h', + '../include/core/SkDither.h', + '../include/core/SkDraw.h', + '../include/core/SkDrawFilter.h', + '../include/core/SkDrawLooper.h', + '../include/core/SkEndian.h', + '../include/core/SkFDot6.h', + '../include/core/SkFixed.h', + '../include/core/SkFlattenable.h', + '../include/core/SkFloatBits.h', + '../include/core/SkFloatingPoint.h', + '../include/core/SkFontHost.h', + '../include/core/SkGeometry.h', + '../include/core/SkGlobals.h', + '../include/core/SkGraphics.h', + '../include/core/SkMallocPixelRef.h', + '../include/core/SkMask.h', + '../include/core/SkMaskFilter.h', + '../include/core/SkMath.h', + '../include/core/SkMatrix.h', + '../include/core/SkOSFile.h', + '../include/core/SkPackBits.h', + '../include/core/SkPaint.h', + '../include/core/SkPath.h', + '../include/core/SkPathEffect.h', + '../include/core/SkPathMeasure.h', + '../include/core/SkPerspIter.h', + '../include/core/SkPicture.h', + '../include/core/SkPixelRef.h', + '../include/core/SkPoint.h', + '../include/core/SkPtrRecorder.h', + '../include/core/SkRandom.h', + '../include/core/SkRasterizer.h', + '../include/core/SkReader32.h', + '../include/core/SkRect.h', + '../include/core/SkRefCnt.h', + '../include/core/SkRefDict.h', + '../include/core/SkRegion.h', + '../include/core/SkScalar.h', + '../include/core/SkScalarCompare.h', + '../include/core/SkScalerContext.h', + '../include/core/SkScan.h', + '../include/core/SkShader.h', + '../include/core/SkStream.h', + '../include/core/SkString.h', + '../include/core/SkStroke.h', + '../include/core/SkTDArray.h', + '../include/core/SkTDStack.h', + '../include/core/SkTDict.h', + '../include/core/SkTRegistry.h', + '../include/core/SkTScopedPtr.h', + '../include/core/SkTSearch.h', + '../include/core/SkTemplates.h', + '../include/core/SkThread.h', + '../include/core/SkThread_platform.h', + '../include/core/SkTime.h', + '../include/core/SkTypeface.h', + '../include/core/SkTypes.h', + '../include/core/SkUnPreMultiply.h', + '../include/core/SkUnitMapper.h', + '../include/core/SkUtils.h', + '../include/core/SkWriter32.h', + '../include/core/SkXfermode.h', + ], + 'include_dirs': [ + '../include/config', + '../include/core', + '../include/ports', + '../include/xml', + '../src/core', + ], + 'msvs_disabled_warnings': [4244, 4267,4345, 4390, 4554, 4800], + 'conditions': [ + [ 'OS == "linux" or OS == "freebsd" or OS == "openbsd" or OS == "solaris"', { + 'cflags': [ + '-Wno-unused', + '-Wno-unused-function', + ], + 'sources': [ + '../include/core/SkMMapStream.h', + '../src/core/SkMMapStream.cpp', + '../src/core/SkBlitter_ARGB32_Subpixel.cpp', + '../src/core/SkFontHost.cpp', + '../src/ports/SkThread_pthread.cpp', + '../src/ports/SkTime_Unix.cpp', + '../src/ports/SkFontHost_FreeType_Subpixel.cpp', + '../src/ports/SkFontHost_FreeType.cpp', + '../src/ports/SkFontHost_gamma_none.cpp', + '../src/ports/SkFontHost_linux.cpp', + ], + 'link_settings': { + 'libraries': [ + '-lfreetype', + ], + }, + }], + [ 'OS == "mac"', { + 'include_dirs': [ + '../include/utils/mac', + ], + 'sources': [ + '../include/core/SkMMapStream.h', + '../include/utils/mac/SkCGUtils.h', + + '../src/core/SkMMapStream.cpp', + '../src/ports/SkFontHost_mac_coretext.cpp', + + '../src/ports/SkThread_pthread.cpp', + '../src/ports/SkTime_Unix.cpp', + + '../src/utils/mac/SkCreateCGImageRef.cpp', + ], + }], + [ 'OS == "win"', { + 'include_dirs': [ + 'config/win', + ], + 'sources': [ + '../src/ports/SkFontHost_win.cpp', + '../src/ports/SkThread_win.cpp', + ], + },], + ], + 'direct_dependent_settings': { + 'include_dirs': [ + 'config', + '../include/config', + '../include/core', + 'ext', + ], + }, + 'dependencies': [ + 'skia_opts' + ], + }, + + # Due to an unfortunate intersection of lameness between gcc and gyp, + # we have to build the *_SSE2.cpp files in a separate target. The + # gcc lameness is that, in order to compile SSE2 intrinsics code, it + # must be passed the -msse2 flag. However, with this flag, it may + # emit SSE2 instructions even for scalar code, such as the CPUID + # test used to test for the presence of SSE2. So that, and all other + # code must be compiled *without* -msse2. The gyp lameness is that it + # does not allow file-specific CFLAGS, so we must create this extra + # target for those files to be compiled with -msse2. + # + # This is actually only a problem on 32-bit Linux (all Intel Macs have + # SSE2, Linux x86_64 has SSE2 by definition, and MSC will happily emit + # SSE2 from instrinsics, while generating plain ol' 386 for everything + # else). However, to keep the .gyp file simple and avoid platform-specific + # build breakage, we do this on all platforms. + + # For about the same reason, we need to compile the ARM opts files + # separately as well. + { + 'target_name': 'skia_opts', + 'type': 'static_library', + 'include_dirs': [ + '../include/config', + '../include/core', + '../src/core', + ], + 'conditions': [ + [ '(OS == "linux" or OS == "freebsd" or OS == "openbsd")', { + 'cflags': [ + '-msse2', + ], + }], + ], + 'sources': [ + '../src/opts/SkBitmapProcState_opts_SSE2.cpp', + '../src/opts/SkBlitRow_opts_SSE2.cpp', + '../src/opts/SkUtils_opts_SSE2.cpp', + ], + }, + { + 'target_name': 'effects', + 'type': 'static_library', + 'include_dirs': [ + '../include/config', + '../include/core', + '../include/effects', + ], + 'sources': [ + '../include/effects/Sk1DPathEffect.h', + '../include/effects/Sk2DPathEffect.h', + '../include/effects/SkAvoidXfermode.h', + '../include/effects/SkBlurDrawLooper.h', + '../include/effects/SkBlurMaskFilter.h', + '../include/effects/SkColorMatrix.h', + '../include/effects/SkColorMatrixFilter.h', + '../include/effects/SkCornerPathEffect.h', + '../include/effects/SkDashPathEffect.h', + '../include/effects/SkDiscretePathEffect.h', + '../include/effects/SkDrawExtraPathEffect.h', + '../include/effects/SkEmbossMaskFilter.h', + '../include/effects/SkGradientShader.h', + '../include/effects/SkGroupShape.h', + '../include/effects/SkKernel33MaskFilter.h', + '../include/effects/SkLayerDrawLooper.h', + '../include/effects/SkLayerRasterizer.h', + '../include/effects/SkPaintFlagsDrawFilter.h', + '../include/effects/SkPixelXorXfermode.h', + '../include/effects/SkPorterDuff.h', + '../include/effects/SkRectShape.h', + '../include/effects/SkTableMaskFilter.h', + '../include/effects/SkTransparentShader.h', + + '../src/effects/Sk1DPathEffect.cpp', + '../src/effects/Sk2DPathEffect.cpp', + '../src/effects/SkAvoidXfermode.cpp', + '../src/effects/SkBitmapCache.cpp', + '../src/effects/SkBitmapCache.h', + '../src/effects/SkBlurDrawLooper.cpp', + '../src/effects/SkBlurMask.cpp', + '../src/effects/SkBlurMask.h', + '../src/effects/SkBlurMaskFilter.cpp', + '../src/effects/SkColorFilters.cpp', + '../src/effects/SkColorMatrixFilter.cpp', + '../src/effects/SkCornerPathEffect.cpp', + '../src/effects/SkDashPathEffect.cpp', + '../src/effects/SkDiscretePathEffect.cpp', + '../src/effects/SkEmbossMask.cpp', + '../src/effects/SkEmbossMask.h', + '../src/effects/SkEmbossMask_Table.h', + '../src/effects/SkEmbossMaskFilter.cpp', + '../src/effects/SkGradientShader.cpp', + '../src/effects/SkGroupShape.cpp', + '../src/effects/SkKernel33MaskFilter.cpp', + '../src/effects/SkLayerDrawLooper.cpp', + '../src/effects/SkLayerRasterizer.cpp', + '../src/effects/SkPaintFlagsDrawFilter.cpp', + '../src/effects/SkPixelXorXfermode.cpp', + '../src/effects/SkPorterDuff.cpp', + '../src/effects/SkRadialGradient_Table.h', + '../src/effects/SkRectShape.cpp', + '../src/effects/SkTableMaskFilter.cpp', + '../src/effects/SkTransparentShader.cpp', + ], + 'direct_dependent_settings': { + 'include_dirs': [ + '../include/effects', + ], + }, + }, + { + 'target_name': 'images', + 'type': 'static_library', + 'include_dirs': [ + '../include/config', + '../include/core', + '../include/images', + ], + 'sources': [ + '../include/images/SkFlipPixelRef.h', + '../include/images/SkImageDecoder.h', + '../include/images/SkImageEncoder.h', + '../include/images/SkImageRef.h', + '../include/images/SkImageRef_GlobalPool.h', + '../include/images/SkJpegUtility.h', + '../include/images/SkMovie.h', + '../include/images/SkPageFlipper.h', + + '../src/images/bmpdecoderhelper.cpp', + '../src/images/bmpdecoderhelper.h', + '../src/images/SkBitmap_RLEPixels.h', + '../src/images/SkCreateRLEPixelRef.cpp', + '../src/images/SkFDStream.cpp', + '../src/images/SkFlipPixelRef.cpp', + '../src/images/SkImageDecoder.cpp', + '../src/images/SkImageDecoder_Factory.cpp', + '../src/images/SkImageDecoder_libbmp.cpp', + '../src/images/SkImageDecoder_libgif.cpp', + '../src/images/SkImageDecoder_libico.cpp', + '../src/images/SkImageDecoder_libjpeg.cpp', + '../src/images/SkImageDecoder_libpng.cpp', + '../src/images/SkImageDecoder_libpvjpeg.c', + '../src/images/SkImageDecoder_wbmp.cpp', + '../src/images/SkImageEncoder.cpp', + '../src/images/SkImageEncoder_Factory.cpp', + '../src/images/SkImageRef.cpp', + '../src/images/SkImageRefPool.cpp', + '../src/images/SkImageRefPool.h', + '../src/images/SkImageRef_GlobalPool.cpp', + '../src/images/SkJpegUtility.cpp', + '../src/images/SkMovie.cpp', + '../src/images/SkMovie_gif.cpp', + '../src/images/SkPageFlipper.cpp', + '../src/images/SkScaledBitmapSampler.cpp', + '../src/images/SkScaledBitmapSampler.h', + ], + 'conditions': [ + [ 'OS == "win"', { + 'sources!': [ + '../include/images/SkJpegUtility.h', + + '../src/images/SkFDStream.cpp', + '../src/images/SkImageDecoder_libjpeg.cpp', + '../src/images/SkImageDecoder_libpng.cpp', + '../src/images/SkImageDecoder_libpvjpeg.c', + '../src/images/SkJpegUtility.cpp', + '../src/images/SkMovie_gif.cpp', + ], + },], + [ 'OS == "mac"', { + 'sources!': [ + '../include/images/SkJpegUtility.h', + + '../src/images/SkImageDecoder_libgif.cpp', + '../src/images/SkImageDecoder_libjpeg.cpp', + '../src/images/SkImageDecoder_libpng.cpp', + '../src/images/SkImageDecoder_libpvjpeg.c', + '../src/images/SkJpegUtility.cpp', + '../src/images/SkMovie_gif.cpp', + ], + },], + [ 'OS == "linux" or OS == "freebsd" or OS == "openbsd" or OS == "solaris"', { + 'sources!': [ + '../include/images/SkJpegUtility.h', + + '../src/images/SkImageDecoder_libjpeg.cpp', + '../src/images/SkImageDecoder_libgif.cpp', + '../src/images/SkImageDecoder_libpvjpeg.c', + '../src/images/SkJpegUtility.cpp', + '../src/images/SkMovie_gif.cpp', + ], + }], + + ], + 'direct_dependent_settings': { + 'include_dirs': [ + '../include/images', + ], + }, + }, + { + 'target_name': 'xml', + 'type': 'static_library', + 'include_dirs': [ + '../include/config', + '../include/core', + '../include/xml', + '../include/utils', + ], + 'sources': [ + '../include/xml/SkBML_WXMLParser.h', + '../include/xml/SkBML_XMLParser.h', + '../include/xml/SkDOM.h', + '../include/xml/SkJS.h', + '../include/xml/SkXMLParser.h', + '../include/xml/SkXMLWriter.h', + + '../src/xml/SkBML_Verbs.h', + '../src/xml/SkBML_XMLParser.cpp', + '../src/xml/SkDOM.cpp', + '../src/xml/SkJS.cpp', + '../src/xml/SkJSDisplayable.cpp', + '../src/xml/SkXMLParser.cpp', + '../src/xml/SkXMLPullParser.cpp', + '../src/xml/SkXMLWriter.cpp', + ], + 'sources!': [ + '../src/xml/SkXMLPullParser.cpp', #if 0 around class decl in header + ], + 'conditions': [ + [ 'OS == "win" or OS == "mac" or OS == "linux" or OS == "openbsd" or OS == "solaris"', { + 'sources!': [ + # no jsapi.h by default on system + '../include/xml/SkJS.h', + '../src/xml/SkJS.cpp', + '../src/xml/SkJSDisplayable.cpp', + ], + },], + ], + 'direct_dependent_settings': { + 'include_dirs': [ + '../include/xml', + ], + }, + }, + { + 'target_name': 'utils', + 'type': 'static_library', + 'include_dirs': [ + '../include/config', + '../include/core', + '../include/utils', + '../include/views', + '../include/effects', + '../include/xml', + ], + 'sources': [ + '../include/utils/SkBoundaryPatch.h', + '../include/utils/SkCamera.h', + '../include/utils/SkCubicInterval.h', + '../include/utils/SkCullPoints.h', + '../include/utils/SkDumpCanvas.h', + '../include/utils/SkEGLContext.h', + '../include/utils/SkGLCanvas.h', + '../include/utils/SkInterpolator.h', + '../include/utils/SkLayer.h', + '../include/utils/SkMeshUtils.h', + '../include/utils/SkNinePatch.h', + '../include/utils/SkNWayCanvas.h', + '../include/utils/SkParse.h', + '../include/utils/SkParsePaint.h', + '../include/utils/SkParsePath.h', + '../include/utils/SkProxyCanvas.h', + '../include/utils/SkSfntUtils.h', + '../include/utils/SkTextBox.h', + '../include/utils/SkUnitMappers.h', + + '../src/utils/SkBoundaryPatch.cpp', + '../src/utils/SkCamera.cpp', + '../src/utils/SkColorMatrix.cpp', + '../src/utils/SkCubicInterval.cpp', + '../src/utils/SkCullPoints.cpp', + '../src/utils/SkDumpCanvas.cpp', + '../src/utils/SkEGLContext_none.cpp', + '../src/utils/SkInterpolator.cpp', + '../src/utils/SkLayer.cpp', + '../src/utils/SkMeshUtils.cpp', + '../src/utils/SkNinePatch.cpp', + '../src/utils/SkNWayCanvas.cpp', + '../src/utils/SkOSFile.cpp', + '../src/utils/SkParse.cpp', + '../src/utils/SkParseColor.cpp', + '../src/utils/SkParsePath.cpp', + '../src/utils/SkProxyCanvas.cpp', + '../src/utils/SkSfntUtils.cpp', + '../src/utils/SkUnitMappers.cpp', + ], + 'conditions': [ + [ 'OS == "mac"', { + 'sources': [ + '../include/utils/SkCGUtils.h', + '../src/utils/mac/SkCreateCGImageRef.cpp', + '../src/utils/mac/SkEGLContext_mac.cpp', + ], + },], + ], + 'direct_dependent_settings': { + 'include_dirs': [ + '../include/utils', + ], + }, + }, + { + 'target_name': 'views', + 'type': 'static_library', + 'include_dirs': [ + '../include/config', + '../include/core', + '../include/views', + '../include/xml', + '../include/utils', + '../include/images', + '../include/animator', + '../include/effects', + ], + 'sources': [ + '../include/views/SkApplication.h', + '../include/views/SkBGViewArtist.h', + '../include/views/SkBorderView.h', + '../include/views/SkEvent.h', + '../include/views/SkEventSink.h', + '../include/views/SkImageView.h', + '../include/views/SkKey.h', + '../include/views/SkMetaData.h', + '../include/views/SkOSMenu.h', + '../include/views/SkOSWindow_Mac.h', + '../include/views/SkOSWindow_SDL.h', + '../include/views/SkOSWindow_Unix.h', + '../include/views/SkOSWindow_Win.h', + #'../include/views/SkOSWindow_wxwidgets.h', + '../include/views/SkProgressBarView.h', + '../include/views/SkScrollBarView.h', + '../include/views/SkStackViewLayout.h', + '../include/views/SkSystemEventTypes.h', + '../include/views/SkTouchGesture.h', + '../include/views/SkView.h', + '../include/views/SkViewInflate.h', + '../include/views/SkWidget.h', + '../include/views/SkWidgetViews.h', + '../include/views/SkWindow.h', + + '../src/views/SkBGViewArtist.cpp', + '../src/views/SkBorderView.cpp', + '../src/views/SkEvent.cpp', + '../src/views/SkEventSink.cpp', + '../src/views/SkImageView.cpp', + '../src/views/SkListView.cpp', + '../src/views/SkListWidget.cpp', + '../src/views/SkMetaData.cpp', + '../src/views/SkOSMenu.cpp', + '../src/views/SkParsePaint.cpp', + '../src/views/SkProgressBarView.cpp', + '../src/views/SkProgressView.cpp', + '../src/views/SkScrollBarView.cpp', + '../src/views/SkStackViewLayout.cpp', + '../src/views/SkStaticTextView.cpp', + '../src/views/SkTagList.cpp', + '../src/views/SkTagList.h', + '../src/views/SkTextBox.cpp', + '../src/views/SkTouchGesture.cpp', + '../src/views/SkView.cpp', + '../src/views/SkViewInflate.cpp', + '../src/views/SkViewPriv.cpp', + '../src/views/SkViewPriv.h', + '../src/views/SkWidget.cpp', + '../src/views/SkWidgets.cpp', + '../src/views/SkWidgetViews.cpp', + '../src/views/SkWindow.cpp', + ], + 'sources!' : [ + '../src/views/SkListView.cpp', #depends on missing SkListSource implementation + '../src/views/SkListWidget.cpp', #depends on missing SkListSource implementation + ], + 'conditions': [ + [ 'OS == "win"', { + 'sources': [ + '../src/utils/win/SkOSWindow_Win.cpp', + '../vs/SampleApp/skia_win.cpp', + ], + },], + [ 'OS == "mac"', { + 'sources': [ + '../include/utils/SkCGUtils.h', + #'../src/utils/mac/SkBitmap_Mac.cpp', + '../src/utils/mac/SkCreateCGImageRef.cpp', + '../src/utils/mac/SkEGLContext_mac.cpp', + '../src/utils/mac/skia_mac.cpp', + '../src/utils/mac/SkOSWindow_Mac.cpp', + ], + 'link_settings': { + 'libraries': [ + '$(SDKROOT)/System/Library/Frameworks/Carbon.framework', + '$(SDKROOT)/System/Library/Frameworks/AGL.framework', + ], + }, + },], + [ 'OS == "linux" or OS == "freebsd" or OS == "openbsd" or OS == "solaris"', { + 'include_dirs' : [ + '../include/utils/unix', + ], + 'sources': [ + '../src/utils/unix/keysym2ucs.c', + '../src/utils/unix/SkOSWindow_Unix.cpp', + '../unix_test_app/main.cpp', + ], + }], + ], + 'direct_dependent_settings': { + 'include_dirs': [ + '../include/views', + ], + }, + }, + { + 'target_name': 'skgr', + 'type': 'static_library', + 'include_dirs': [ + '../include/config', + '../include/core', + '../src/core', + '../include/gpu', + '../gpu/include', + ], + 'sources': [ + '../include/gpu/SkGpuCanvas.h', + '../include/gpu/SkGpuDevice.h', + '../include/gpu/SkGpuDeviceFactory.h', + '../include/gpu/SkGr.h', + '../include/gpu/SkGrTexturePixelRef.h', + + '../src/gpu/GrPrintf_skia.cpp', + '../src/gpu/SkGpuCanvas.cpp', + '../src/gpu/SkGpuDevice.cpp', + '../src/gpu/SkGr.cpp', + '../src/gpu/SkGrFontScaler.cpp', + '../src/gpu/SkGrTexturePixelRef.cpp', + ], + 'conditions': [ + [ 'OS == "linux"', { + 'defines': [ + 'GR_LINUX_BUILD=1', + ], + }], + [ 'OS == "mac"', { + 'defines': [ + 'GR_MAC_BUILD=1', + ], + }], + [ 'OS == "win"', { + 'defines': [ + 'GR_WIN32_BUILD=1', + ], + },], + ], + 'direct_dependent_settings': { + 'conditions': [ + [ 'OS == "linux"', { + 'defines': [ + 'GR_LINUX_BUILD=1', + ], + }], + [ 'OS == "mac"', { + 'defines': [ + 'GR_MAC_BUILD=1', + ], + }], + [ 'OS == "win"', { + 'defines': [ + 'GR_WIN32_BUILD=1', + ], + },], + ], + 'include_dirs': [ + '../include/gpu', + ], + }, + }, + { + 'target_name': 'gr', + 'type': 'static_library', + 'include_dirs': [ + '../gpu/include', + ], + 'sources': [ + '../gpu/include/GrAllocator.h', + '../gpu/include/GrAllocPool.h', + '../gpu/include/GrAtlas.h', + '../gpu/include/GrClip.h', + '../gpu/include/GrClipIterator.h', + '../gpu/include/GrColor.h', + '../gpu/include/GrConfig.h', + '../gpu/include/GrContext.h', + '../gpu/include/GrContext_impl.h', + '../gpu/include/GrDrawTarget.h', + '../gpu/include/GrFontScaler.h', + '../gpu/include/GrGeometryBuffer.h', + '../gpu/include/GrGLConfig.h', + '../gpu/include/GrGLConfig_chrome.h', + '../gpu/include/GrGLIndexBuffer.h', + '../gpu/include/GrGLInterface.h', + '../gpu/include/GrGLIRect.h', + '../gpu/include/GrGLPlatformIncludes.h', + '../gpu/include/GrGLTexture.h', + '../gpu/include/GrGLVertexBuffer.h', + '../gpu/include/GrGlyph.h', + '../gpu/include/GrGpu.h', + '../gpu/include/GrGpuVertex.h', + '../gpu/include/GrIndexBuffer.h', + '../gpu/include/GrInOrderDrawBuffer.h', + '../gpu/include/GrInstanceCounter.h', + '../gpu/include/GrIPoint.h', + '../gpu/include/GrKey.h', + '../gpu/include/GrMatrix.h', + '../gpu/include/GrMemory.h', + '../gpu/include/GrMesh.h', + '../gpu/include/GrNoncopyable.h', + '../gpu/include/GrPaint.h', + '../gpu/include/GrPath.h', + '../gpu/include/GrPathIter.h', + '../gpu/include/GrPathSink.h', + '../gpu/include/GrPlotMgr.h', + '../gpu/include/GrPoint.h', + '../gpu/include/GrRandom.h', + '../gpu/include/GrRect.h', + '../gpu/include/GrRectanizer.h', + '../gpu/include/GrRefCnt.h', + '../gpu/include/GrSamplerState.h', + '../gpu/include/GrScalar.h', + '../gpu/include/GrStencil.h', + '../gpu/include/GrStopwatch.h', + '../gpu/include/GrStringBuilder.h', + '../gpu/include/GrTArray.h', + '../gpu/include/GrTBSearch.h', + '../gpu/include/GrTDArray.h', + '../gpu/include/GrTextContext.h', + '../gpu/include/GrTextStrike.h', + '../gpu/include/GrTexture.h', + '../gpu/include/GrTextureCache.h', + '../gpu/include/GrTHashCache.h', + '../gpu/include/GrTLList.h', + '../gpu/include/GrTouchGesture.h', + '../gpu/include/GrTypes.h', + '../gpu/include/GrUserConfig.h', + '../gpu/include/GrVertexBuffer.h', + + '../gpu/src/GrAllocPool.cpp', + '../gpu/src/GrAtlas.cpp', + '../gpu/src/GrBufferAllocPool.cpp', + '../gpu/src/GrBufferAllocPool.h', + '../gpu/src/GrClip.cpp', + '../gpu/src/GrContext.cpp', + '../gpu/src/GrDrawTarget.cpp', + '../gpu/src/GrGLIndexBuffer.cpp', + '../gpu/src/GrGLInterface.cpp', + '../gpu/src/GrGLTexture.cpp', + '../gpu/src/GrGLUtil.cpp', + '../gpu/src/GrGLVertexBuffer.cpp', + '../gpu/src/GrGpu.cpp', + '../gpu/src/GrGpuFactory.cpp', + '../gpu/src/GrGpuGL.cpp', + '../gpu/src/GrGpuGL.h', + '../gpu/src/GrGpuGLFixed.cpp', + '../gpu/src/GrGpuGLFixed.h', + '../gpu/src/GrGpuGLShaders2.cpp', + '../gpu/src/GrGpuGLShaders2.h', + '../gpu/src/GrInOrderDrawBuffer.cpp', + '../gpu/src/GrMatrix.cpp', + '../gpu/src/GrMemory.cpp', + '../gpu/src/GrPath.cpp', + '../gpu/src/GrPathRenderer.cpp', + '../gpu/src/GrPathRenderer.h', + '../gpu/src/GrPrintf_printf.cpp', + '../gpu/src/GrRectanizer.cpp', + '../gpu/src/GrRedBlackTree.h', + '../gpu/src/GrStencil.cpp', + '../gpu/src/GrTextContext.cpp', + '../gpu/src/GrTextStrike.cpp', + '../gpu/src/GrTextStrike_impl.h', + '../gpu/src/GrTextureCache.cpp', + '../gpu/src/gr_unittests.cpp', + ], + 'conditions': [ + [ 'OS == "linux"', { + 'defines': [ + 'GR_LINUX_BUILD=1', + ], + 'link_settings': { + 'libraries': [ + '-lGL', + '-lX11', + ], + }, + }], + [ 'OS == "mac"', { + 'defines': [ + 'GR_MAC_BUILD=1', + ], + 'link_settings': { + 'libraries': [ + '$(SDKROOT)/System/Library/Frameworks/OpenGL.framework', + ], + }, + }], + [ 'OS == "win"', { + 'defines': [ + 'GR_WIN32_BUILD=1', + ], + },], + ], + 'direct_dependent_settings': { + 'conditions': [ + [ 'OS == "linux"', { + 'defines': [ + 'GR_LINUX_BUILD=1', + ], + }], + [ 'OS == "mac"', { + 'defines': [ + 'GR_MAC_BUILD=1', + ], + }], + [ 'OS == "win"', { + 'defines': [ + 'GR_WIN32_BUILD=1', + ], + },], + ], + 'include_dirs': [ + '../gpu/include', + ], + }, + }, + { + 'target_name': 'animator', + 'type': 'static_library', + 'include_dirs': [ + '../include/config', + '../include/core', + '../include/effects', + '../include/animator', + '../include/views', + '../include/xml', + '../include/utils', + '../include/images', + ], + 'sources': [ + '../include/animator/SkAnimator.h', + '../include/animator/SkAnimatorView.h', + + '../src/animator/SkAnimate.h', + '../src/animator/SkAnimateActive.cpp', + '../src/animator/SkAnimateActive.h', + '../src/animator/SkAnimateBase.cpp', + '../src/animator/SkAnimateBase.h', + '../src/animator/SkAnimateField.cpp', + '../src/animator/SkAnimateMaker.cpp', + '../src/animator/SkAnimateMaker.h', + '../src/animator/SkAnimateProperties.h', + '../src/animator/SkAnimateSet.cpp', + '../src/animator/SkAnimateSet.h', + '../src/animator/SkAnimator.cpp', + '../src/animator/SkAnimatorScript.cpp', + '../src/animator/SkAnimatorScript.h', + #'../src/animator/SkAnimatorScript2.cpp', fails on windows + #'../src/animator/SkAnimatorScript2.h', + '../src/animator/SkBase64.cpp', + '../src/animator/SkBase64.h', + '../src/animator/SkBoundable.cpp', + '../src/animator/SkBoundable.h', + '../src/animator/SkBuildCondensedInfo.cpp', + #'../src/animator/SkCondensedDebug.cpp', fails on windows + '../src/animator/SkCondensedRelease.cpp', + '../src/animator/SkDisplayable.cpp', + '../src/animator/SkDisplayable.h', + '../src/animator/SkDisplayAdd.cpp', + '../src/animator/SkDisplayAdd.h', + '../src/animator/SkDisplayApply.cpp', + '../src/animator/SkDisplayApply.h', + '../src/animator/SkDisplayBounds.cpp', + '../src/animator/SkDisplayBounds.h', + '../src/animator/SkDisplayEvent.cpp', + '../src/animator/SkDisplayEvent.h', + '../src/animator/SkDisplayEvents.cpp', + '../src/animator/SkDisplayEvents.h', + '../src/animator/SkDisplayInclude.cpp', + '../src/animator/SkDisplayInclude.h', + '../src/animator/SkDisplayInput.cpp', + '../src/animator/SkDisplayInput.h', + '../src/animator/SkDisplayList.cpp', + '../src/animator/SkDisplayList.h', + '../src/animator/SkDisplayMath.cpp', + '../src/animator/SkDisplayMath.h', + '../src/animator/SkDisplayMovie.cpp', + '../src/animator/SkDisplayMovie.h', + '../src/animator/SkDisplayNumber.cpp', + '../src/animator/SkDisplayNumber.h', + '../src/animator/SkDisplayPost.cpp', + '../src/animator/SkDisplayPost.h', + '../src/animator/SkDisplayRandom.cpp', + '../src/animator/SkDisplayRandom.h', + '../src/animator/SkDisplayScreenplay.cpp', + '../src/animator/SkDisplayScreenplay.h', + '../src/animator/SkDisplayType.cpp', + '../src/animator/SkDisplayType.h', + '../src/animator/SkDisplayTypes.cpp', + '../src/animator/SkDisplayTypes.h', + '../src/animator/SkDisplayXMLParser.cpp', + '../src/animator/SkDisplayXMLParser.h', + '../src/animator/SkDraw3D.cpp', + '../src/animator/SkDraw3D.h', + '../src/animator/SkDrawable.cpp', + '../src/animator/SkDrawable.h', + '../src/animator/SkDrawBitmap.cpp', + '../src/animator/SkDrawBitmap.h', + '../src/animator/SkDrawBlur.cpp', + '../src/animator/SkDrawBlur.h', + '../src/animator/SkDrawClip.cpp', + '../src/animator/SkDrawClip.h', + '../src/animator/SkDrawColor.cpp', + '../src/animator/SkDrawColor.h', + '../src/animator/SkDrawDash.cpp', + '../src/animator/SkDrawDash.h', + '../src/animator/SkDrawDiscrete.cpp', + '../src/animator/SkDrawDiscrete.h', + '../src/animator/SkDrawEmboss.cpp', + '../src/animator/SkDrawEmboss.h', + '../src/animator/SkDrawExtraPathEffect.cpp', + '../src/animator/SkDrawFull.cpp', + '../src/animator/SkDrawFull.h', + '../src/animator/SkDrawGradient.cpp', + '../src/animator/SkDrawGradient.h', + '../src/animator/SkDrawGroup.cpp', + '../src/animator/SkDrawGroup.h', + '../src/animator/SkDrawLine.cpp', + '../src/animator/SkDrawLine.h', + '../src/animator/SkDrawMatrix.cpp', + '../src/animator/SkDrawMatrix.h', + '../src/animator/SkDrawOval.cpp', + '../src/animator/SkDrawOval.h', + '../src/animator/SkDrawPaint.cpp', + '../src/animator/SkDrawPaint.h', + '../src/animator/SkDrawPath.cpp', + '../src/animator/SkDrawPath.h', + '../src/animator/SkDrawPoint.cpp', + '../src/animator/SkDrawPoint.h', + '../src/animator/SkDrawRectangle.cpp', + '../src/animator/SkDrawRectangle.h', + '../src/animator/SkDrawSaveLayer.cpp', + '../src/animator/SkDrawSaveLayer.h', + '../src/animator/SkDrawShader.cpp', + '../src/animator/SkDrawShader.h', + '../src/animator/SkDrawText.cpp', + '../src/animator/SkDrawText.h', + '../src/animator/SkDrawTextBox.cpp', + '../src/animator/SkDrawTextBox.h', + '../src/animator/SkDrawTo.cpp', + '../src/animator/SkDrawTo.h', + '../src/animator/SkDrawTransparentShader.cpp', + '../src/animator/SkDrawTransparentShader.h', + '../src/animator/SkDump.cpp', + '../src/animator/SkDump.h', + '../src/animator/SkExtras.h', + '../src/animator/SkGetCondensedInfo.cpp', + '../src/animator/SkHitClear.cpp', + '../src/animator/SkHitClear.h', + '../src/animator/SkHitTest.cpp', + '../src/animator/SkHitTest.h', + '../src/animator/SkIntArray.h', + '../src/animator/SkMatrixParts.cpp', + '../src/animator/SkMatrixParts.h', + '../src/animator/SkMemberInfo.cpp', + '../src/animator/SkMemberInfo.h', + '../src/animator/SkOpArray.cpp', + '../src/animator/SkOpArray.h', + '../src/animator/SkOperand.h', + '../src/animator/SkOperand2.h', + '../src/animator/SkOperandInterpolator.h', + '../src/animator/SkOperandIterpolator.cpp', + '../src/animator/SkPaintParts.cpp', + '../src/animator/SkPaintParts.h', + '../src/animator/SkParseSVGPath.cpp', + '../src/animator/SkPathParts.cpp', + '../src/animator/SkPathParts.h', + '../src/animator/SkPostParts.cpp', + '../src/animator/SkPostParts.h', + '../src/animator/SkScript.cpp', + '../src/animator/SkScript.h', + '../src/animator/SkScript2.h', + '../src/animator/SkScriptCallBack.h', + '../src/animator/SkScriptDecompile.cpp', + '../src/animator/SkScriptRuntime.cpp', + '../src/animator/SkScriptRuntime.h', + '../src/animator/SkScriptTokenizer.cpp', + '../src/animator/SkSnapshot.cpp', + '../src/animator/SkSnapshot.h', + '../src/animator/SkTDArray_Experimental.h', + '../src/animator/SkTextOnPath.cpp', + '../src/animator/SkTextOnPath.h', + '../src/animator/SkTextToPath.cpp', + '../src/animator/SkTextToPath.h', + '../src/animator/SkTime.cpp', + '../src/animator/SkTypedArray.cpp', + '../src/animator/SkTypedArray.h', + '../src/animator/SkXMLAnimatorWriter.cpp', + '../src/animator/SkXMLAnimatorWriter.h', + ], + 'direct_dependent_settings': { + 'include_dirs': [ + '../include/animator', + ], + }, + }, + + { + 'target_name': 'svg', + 'type': 'static_library', + 'include_dirs': [ + '../include/config', + '../include/core', + '../include/xml', + '../include/utils', + '../include/svg', + ], + 'sources': [ + '../include/svg/SkSVGAttribute.h', + '../include/svg/SkSVGBase.h', + '../include/svg/SkSVGPaintState.h', + '../include/svg/SkSVGParser.h', + '../include/svg/SkSVGTypes.h', + + '../src/svg/SkSVGCircle.cpp', + '../src/svg/SkSVGCircle.h', + '../src/svg/SkSVGClipPath.cpp', + '../src/svg/SkSVGClipPath.h', + '../src/svg/SkSVGDefs.cpp', + '../src/svg/SkSVGDefs.h', + '../src/svg/SkSVGElements.cpp', + '../src/svg/SkSVGElements.h', + '../src/svg/SkSVGEllipse.cpp', + '../src/svg/SkSVGEllipse.h', + '../src/svg/SkSVGFeColorMatrix.cpp', + '../src/svg/SkSVGFeColorMatrix.h', + '../src/svg/SkSVGFilter.cpp', + '../src/svg/SkSVGFilter.h', + '../src/svg/SkSVGG.cpp', + '../src/svg/SkSVGG.h', + '../src/svg/SkSVGGradient.cpp', + '../src/svg/SkSVGGradient.h', + '../src/svg/SkSVGGroup.cpp', + '../src/svg/SkSVGGroup.h', + '../src/svg/SkSVGImage.cpp', + '../src/svg/SkSVGImage.h', + '../src/svg/SkSVGLine.cpp', + '../src/svg/SkSVGLine.h', + '../src/svg/SkSVGLinearGradient.cpp', + '../src/svg/SkSVGLinearGradient.h', + '../src/svg/SkSVGMask.cpp', + '../src/svg/SkSVGMask.h', + '../src/svg/SkSVGMetadata.cpp', + '../src/svg/SkSVGMetadata.h', + '../src/svg/SkSVGPaintState.cpp', + '../src/svg/SkSVGParser.cpp', + '../src/svg/SkSVGPath.cpp', + '../src/svg/SkSVGPath.h', + '../src/svg/SkSVGPolygon.cpp', + '../src/svg/SkSVGPolygon.h', + '../src/svg/SkSVGPolyline.cpp', + '../src/svg/SkSVGPolyline.h', + '../src/svg/SkSVGRadialGradient.cpp', + '../src/svg/SkSVGRadialGradient.h', + '../src/svg/SkSVGRect.cpp', + '../src/svg/SkSVGRect.h', + '../src/svg/SkSVGStop.cpp', + '../src/svg/SkSVGStop.h', + '../src/svg/SkSVGSVG.cpp', + '../src/svg/SkSVGSVG.h', + '../src/svg/SkSVGSymbol.cpp', + '../src/svg/SkSVGSymbol.h', + '../src/svg/SkSVGText.cpp', + '../src/svg/SkSVGText.h', + '../src/svg/SkSVGUse.cpp', + ], + 'sources!' : [ + '../src/svg/SkSVG.cpp', # doesn't compile, maybe this is test code? + ], + 'direct_dependent_settings': { + 'include_dirs': [ + '../include/svg', + ], + }, + }, + + { + 'target_name': 'experimental', + 'type': 'static_library', + 'include_dirs': [ + '../include/config', + '../include/core', + ], + 'sources': [ + '../experimental/SkMatrix44.cpp', + '../experimental/SkMatrix44.h', + '../experimental/SkSetPoly3To3.cpp', + '../experimental/SkSetPoly3To3_A.cpp', + '../experimental/SkSetPoly3To3_D.cpp', + ], + 'sources!': [ + '../experimental/SkMatrix44.cpp', #doesn't compile + '../experimental/SkMatrix44.h', + ], + 'direct_dependent_settings': { + 'include_dirs': [ + '../experimental', + ], + }, + }, + + { + 'target_name': 'SampleApp', + 'type': 'executable', + 'mac_bundle' : 1, + 'include_dirs' : [ + '../src/core', # needed to get SkConcaveToTriangle, maybe this should be moved to include dir? + '../gm', # SampleGM.cpp pulls gm.h + ], + 'sources': [ + # gm files needed for SampleGM.cpp + '../gm/bitmapfilters.cpp', + '../gm/blurs.cpp', + '../gm/complexclip.cpp', + '../gm/filltypes.cpp', + '../gm/gm.h', + '../gm/gradients.cpp', + '../gm/points.cpp', + '../gm/poly2poly.cpp', + '../gm/shadertext.cpp', + '../gm/shadows.cpp', + '../gm/shapes.cpp', + '../gm/tilemodes.cpp', + '../gm/xfermodes.cpp', + + '../samplecode/ClockFaceView.cpp', + '../samplecode/OverView.cpp', + '../samplecode/SampleAll.cpp', + '../samplecode/SampleAnimator.cpp', + '../samplecode/SampleApp.cpp', + '../samplecode/SampleArc.cpp', + '../samplecode/SampleAvoid.cpp', + '../samplecode/SampleBigGradient.cpp', + '../samplecode/SampleBitmapRect.cpp', + '../samplecode/SampleBlur.cpp', + '../samplecode/SampleCamera.cpp', + '../samplecode/SampleCircle.cpp', + '../samplecode/SampleCode.h', + '../samplecode/SampleComplexClip.cpp', + '../samplecode/SampleCull.cpp', + '../samplecode/SampleDecode.cpp', + '../samplecode/SampleDither.cpp', + '../samplecode/SampleDitherBitmap.cpp', + '../samplecode/SampleDrawLooper.cpp', + '../samplecode/SampleEffects.cpp', + '../samplecode/SampleEmboss.cpp', + '../samplecode/SampleEncode.cpp', + '../samplecode/SampleExtractAlpha.cpp', + '../samplecode/SampleFillType.cpp', + '../samplecode/SampleFilter.cpp', + '../samplecode/SampleFilter2.cpp', + '../samplecode/SampleFontCache.cpp', + '../samplecode/SampleFontScalerTest.cpp', + '../samplecode/SampleFuzz.cpp', + '../samplecode/SampleGM.cpp', + '../samplecode/SampleGradients.cpp', + '../samplecode/SampleHairline.cpp', + '../samplecode/SampleImage.cpp', + '../samplecode/SampleImageDir.cpp', + '../samplecode/SampleLayerMask.cpp', + '../samplecode/SampleLayers.cpp', + '../samplecode/SampleLCD.cpp', + '../samplecode/SampleLineClipper.cpp', + '../samplecode/SampleLines.cpp', + '../samplecode/SampleMeasure.cpp', + '../samplecode/SampleMipMap.cpp', + '../samplecode/SampleMovie.cpp', + '../samplecode/SampleNinePatch.cpp', + '../samplecode/SampleOvalTest.cpp', + '../samplecode/SampleOverflow.cpp', + '../samplecode/SamplePageFlip.cpp', + '../samplecode/SamplePatch.cpp', + '../samplecode/SamplePath.cpp', + '../samplecode/SamplePathClip.cpp', + '../samplecode/SamplePathEffects.cpp', + '../samplecode/SamplePicture.cpp', + '../samplecode/SamplePoints.cpp', + '../samplecode/SamplePolyToPoly.cpp', + '../samplecode/SampleRegion.cpp', + '../samplecode/SampleRepeatTile.cpp', + '../samplecode/SampleShaders.cpp', + '../samplecode/SampleShaderText.cpp', + '../samplecode/SampleShapes.cpp', + '../samplecode/SampleSkLayer.cpp', + '../samplecode/SampleSlides.cpp', + '../samplecode/SampleStrokePath.cpp', + '../samplecode/SampleStrokeText.cpp', + '../samplecode/SampleSVG.cpp', + '../samplecode/SampleTests.cpp', + '../samplecode/SampleText.cpp', + '../samplecode/SampleTextAlpha.cpp', + '../samplecode/SampleTextBox.cpp', + '../samplecode/SampleTextEffects.cpp', + '../samplecode/SampleTextOnPath.cpp', + '../samplecode/SampleTiling.cpp', + '../samplecode/SampleTinyBitmap.cpp', + '../samplecode/SampleTriangles.cpp', + '../samplecode/SampleTypeface.cpp', + '../samplecode/SampleUnitMapper.cpp', + '../samplecode/SampleVertices.cpp', + '../samplecode/SampleXfermodes.cpp', + ], + 'sources!': [ + '../samplecode/SampleSkLayer.cpp', #relies on SkMatrix44 which doesn't compile + '../samplecode/SampleTests.cpp', #includes unknown file SkShaderExtras.h + '../samplecode/SampleWarp.cpp', + '../samplecode/SampleFontCache.cpp', + ], + 'dependencies': [ + 'skia', + 'effects', + 'images', + 'views', + 'utils', + 'animator', + 'xml', + 'svg', + 'experimental', + 'gr', + 'skgr', + ], + 'conditions' : [ + [ 'OS == "linux" or OS == "freebsd" or OS == "openbsd" or OS == "solaris"', { + 'sources!': [ + '../samplecode/SampleDecode.cpp', + ], + }], + [ 'OS == "win"', { + 'sources!': [ + # require UNIX functions + '../samplecode/SampleEncode.cpp', + '../samplecode/SamplePageFlip.cpp', + ], + },], + [ 'OS == "mac"', { + 'sources!': [ + '../samplecode/SampleDecode.cpp', + ], + },], + + ], + 'msvs_settings': { + 'VCLinkerTool': { + 'SubSystem': '2', + 'AdditionalDependencies': [ + 'OpenGL32.lib', + 'glew32.lib', + 'usp10.lib', + 'd3d9.lib', + ], + }, + }, + }, + ], +} + +# Local Variables: +# tab-width:2 +# indent-tabs-mode:nil +# End: +# vim: set expandtab tabstop=2 shiftwidth=2: -- cgit v1.2.3 From 23b72aa153f1e8ecfb2535d1e298de33eaa5860f Mon Sep 17 00:00:00 2001 From: "bsalomon@google.com" Date: Mon, 21 Mar 2011 13:34:23 +0000 Subject: Fix line endings on gyp file. Review URL: http://codereview.appspot.com/4281063/ git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@968 2bbb7eff-a529-9590-31e7-b0007b416f81 --- skia.gyp | 2860 +++++++++++++++++++++++++++++++------------------------------- 1 file changed, 1430 insertions(+), 1430 deletions(-) diff --git a/skia.gyp b/skia.gyp index fec90a8..e50122d 100644 --- a/skia.gyp +++ b/skia.gyp @@ -1,1430 +1,1430 @@ -{ - 'target_defaults': { - 'msvs_settings': { - #really need to figure out how to generate debug and release - 'VCLinkerTool': { - 'GenerateDebugInformation': 'true', - }, - 'VCCLCompilerTool': { - 'DebugInformationFormat': '4', - 'Optimization': '0', - }, - }, - 'conditions': [ - [ 'OS == "linux" or OS == "freebsd" or OS == "openbsd" or OS == "solaris"', { - 'include_dirs' : [ - '/usr/include/freetype2', - ], - }], - [ 'OS == "mac"', { - 'defines': [ - 'SK_BUILD_FOR_MAC', - ], - }], - [ 'OS == "win"', { - 'defines': [ - 'SK_BUILD_FOR_WIN32', - ], - },], - ], - 'direct_dependent_settings': { - 'conditions': [ - [ 'OS == "mac"', { - 'defines': [ - 'SK_BUILD_FOR_MAC', - ], - }], - [ 'OS == "win"', { - 'defines': [ - 'SK_BUILD_FOR_WIN32', - ], - },], - ], - }, - }, - 'targets': [ - { - 'target_name': 'skia', - 'type': 'static_library', - 'msvs_guid': 'B7760B5E-BFA8-486B-ACFD-49E3A6DE8E76', - 'sources': [ - '../src/core/ARGB32_Clamp_Bilinear_BitmapShader.h', - '../src/core/Sk64.cpp', - '../src/core/SkAdvancedTypefaceMetrics.cpp', - '../src/core/SkAlphaRuns.cpp', - '../src/core/SkAntiRun.h', - '../src/core/SkBitmap.cpp', - '../src/core/SkBitmapProcShader.cpp', - '../src/core/SkBitmapProcShader.h', - '../src/core/SkBitmapProcState.cpp', - '../src/core/SkBitmapProcState.h', - '../src/core/SkBitmapProcState_matrix.h', - '../src/core/SkBitmapProcState_matrixProcs.cpp', - '../src/core/SkBitmapProcState_sample.h', - '../src/core/SkBitmapSampler.cpp', - '../src/core/SkBitmapSampler.h', - '../src/core/SkBitmapSamplerTemplate.h', - '../src/core/SkBitmapShader16BilerpTemplate.h', - '../src/core/SkBitmapShaderTemplate.h', - '../src/core/SkBitmap_scroll.cpp', - '../src/core/SkBlitBWMaskTemplate.h', - '../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', - '../src/core/SkClipStack.cpp', - '../src/core/SkColor.cpp', - '../src/core/SkColorFilter.cpp', - '../src/core/SkColorTable.cpp', - '../src/core/SkComposeShader.cpp', - '../src/core/SkConcaveToTriangles.cpp', - '../src/core/SkConcaveToTriangles.h', - '../src/core/SkCordic.cpp', - '../src/core/SkCordic.h', - '../src/core/SkCoreBlitters.h', - '../src/core/SkCubicClipper.cpp', - '../src/core/SkCubicClipper.h', - '../src/core/SkDebug.cpp', - '../src/core/SkDeque.cpp', - '../src/core/SkDevice.cpp', - '../src/core/SkDither.cpp', - '../src/core/SkDraw.cpp', - '../src/core/SkDrawProcs.h', - '../src/core/SkEdgeBuilder.cpp', - '../src/core/SkEdgeClipper.cpp', - '../src/core/SkEdge.cpp', - '../src/core/SkEdge.h', - '../src/core/SkFP.h', - '../src/core/SkFilterProc.cpp', - '../src/core/SkFilterProc.h', - '../src/core/SkFlattenable.cpp', - '../src/core/SkFloat.cpp', - '../src/core/SkFloat.h', - '../src/core/SkFloatBits.cpp', - '../src/core/SkGeometry.cpp', - '../src/core/SkGlobals.cpp', - '../src/core/SkGlyphCache.cpp', - '../src/core/SkGlyphCache.h', - '../src/core/SkGraphics.cpp', - '../src/core/SkLineClipper.cpp', - '../src/core/SkMallocPixelRef.cpp', - '../src/core/SkMask.cpp', - '../src/core/SkMaskFilter.cpp', - '../src/core/SkMath.cpp', - '../src/core/SkMatrix.cpp', - '../src/core/SkPackBits.cpp', - '../src/core/SkPaint.cpp', - '../src/core/SkPath.cpp', - '../src/core/SkPathEffect.cpp', - '../src/core/SkPathHeap.cpp', - '../src/core/SkPathHeap.h', - '../src/core/SkPathMeasure.cpp', - '../src/core/SkPicture.cpp', - '../src/core/SkPictureFlat.cpp', - '../src/core/SkPictureFlat.h', - '../src/core/SkPicturePlayback.cpp', - '../src/core/SkPicturePlayback.h', - '../src/core/SkPictureRecord.cpp', - '../src/core/SkPictureRecord.h', - '../src/core/SkPixelRef.cpp', - '../src/core/SkPoint.cpp', - '../src/core/SkProcSpriteBlitter.cpp', - '../src/core/SkPtrRecorder.cpp', - '../src/core/SkQuadClipper.cpp', - '../src/core/SkQuadClipper.h', - '../src/core/SkRasterizer.cpp', - '../src/core/SkRect.cpp', - '../src/core/SkRefDict.cpp', - '../src/core/SkRegion.cpp', - '../src/core/SkRegionPriv.h', - '../src/core/SkRegion_path.cpp', - '../src/core/SkScalar.cpp', - '../src/core/SkScalerContext.cpp', - '../src/core/SkScan.cpp', - '../src/core/SkScanPriv.h', - '../src/core/SkScan_AntiPath.cpp', - '../src/core/SkScan_Antihair.cpp', - '../src/core/SkScan_Hairline.cpp', - '../src/core/SkScan_Path.cpp', - '../src/core/SkShader.cpp', - '../src/core/SkShape.cpp', - '../src/core/SkSpriteBlitter_ARGB32.cpp', - '../src/core/SkSpriteBlitter_RGB16.cpp', - '../src/core/SkSinTable.h', - '../src/core/SkSpriteBlitter.h', - '../src/core/SkSpriteBlitterTemplate.h', - '../src/core/SkStream.cpp', - '../src/core/SkString.cpp', - '../src/core/SkStroke.cpp', - '../src/core/SkStrokerPriv.cpp', - '../src/core/SkStrokerPriv.h', - '../src/core/SkTextFormatParams.h', - '../src/core/SkTSearch.cpp', - '../src/core/SkTSort.h', - '../src/core/SkTemplatesPriv.h', - '../src/core/SkTypeface.cpp', - '../src/core/SkUnPreMultiply.cpp', - '../src/core/SkUtils.cpp', - '../src/core/SkWriter32.cpp', - '../src/core/SkXfermode.cpp', - - '../src/opts/opts_check_SSE2.cpp', - - '../src/ports/SkDebug_stdio.cpp', - '../src/ports/SkFontHost_tables.cpp', - '../src/ports/SkGlobals_global.cpp', - '../src/ports/SkMemory_malloc.cpp', - '../src/ports/SkOSFile_stdio.cpp', - '../src/ports/SkTime_Unix.cpp', - '../src/ports/SkXMLParser_empty.cpp', - '../src/ports/sk_predefined_gamma.h', - - '../include/core/Sk64.h', - '../include/core/SkAdvancedTypefaceMetrics.h', - '../include/core/SkAutoKern.h', - '../include/core/SkBitmap.h', - '../include/core/SkBlitRow.h', - '../include/core/SkBlitter.h', - '../include/core/SkBounder.h', - '../include/core/SkBuffer.h', - '../include/core/SkCanvas.h', - '../include/core/SkChunkAlloc.h', - '../include/core/SkClipStack.h', - '../include/core/SkColor.h', - '../include/core/SkColorFilter.h', - '../include/core/SkColorPriv.h', - '../include/core/SkColorShader.h', - '../include/core/SkComposeShader.h', - '../include/core/SkDeque.h', - '../include/core/SkDescriptor.h', - '../include/core/SkDevice.h', - '../include/core/SkDither.h', - '../include/core/SkDraw.h', - '../include/core/SkDrawFilter.h', - '../include/core/SkDrawLooper.h', - '../include/core/SkEndian.h', - '../include/core/SkFDot6.h', - '../include/core/SkFixed.h', - '../include/core/SkFlattenable.h', - '../include/core/SkFloatBits.h', - '../include/core/SkFloatingPoint.h', - '../include/core/SkFontHost.h', - '../include/core/SkGeometry.h', - '../include/core/SkGlobals.h', - '../include/core/SkGraphics.h', - '../include/core/SkMallocPixelRef.h', - '../include/core/SkMask.h', - '../include/core/SkMaskFilter.h', - '../include/core/SkMath.h', - '../include/core/SkMatrix.h', - '../include/core/SkOSFile.h', - '../include/core/SkPackBits.h', - '../include/core/SkPaint.h', - '../include/core/SkPath.h', - '../include/core/SkPathEffect.h', - '../include/core/SkPathMeasure.h', - '../include/core/SkPerspIter.h', - '../include/core/SkPicture.h', - '../include/core/SkPixelRef.h', - '../include/core/SkPoint.h', - '../include/core/SkPtrRecorder.h', - '../include/core/SkRandom.h', - '../include/core/SkRasterizer.h', - '../include/core/SkReader32.h', - '../include/core/SkRect.h', - '../include/core/SkRefCnt.h', - '../include/core/SkRefDict.h', - '../include/core/SkRegion.h', - '../include/core/SkScalar.h', - '../include/core/SkScalarCompare.h', - '../include/core/SkScalerContext.h', - '../include/core/SkScan.h', - '../include/core/SkShader.h', - '../include/core/SkStream.h', - '../include/core/SkString.h', - '../include/core/SkStroke.h', - '../include/core/SkTDArray.h', - '../include/core/SkTDStack.h', - '../include/core/SkTDict.h', - '../include/core/SkTRegistry.h', - '../include/core/SkTScopedPtr.h', - '../include/core/SkTSearch.h', - '../include/core/SkTemplates.h', - '../include/core/SkThread.h', - '../include/core/SkThread_platform.h', - '../include/core/SkTime.h', - '../include/core/SkTypeface.h', - '../include/core/SkTypes.h', - '../include/core/SkUnPreMultiply.h', - '../include/core/SkUnitMapper.h', - '../include/core/SkUtils.h', - '../include/core/SkWriter32.h', - '../include/core/SkXfermode.h', - ], - 'include_dirs': [ - '../include/config', - '../include/core', - '../include/ports', - '../include/xml', - '../src/core', - ], - 'msvs_disabled_warnings': [4244, 4267,4345, 4390, 4554, 4800], - 'conditions': [ - [ 'OS == "linux" or OS == "freebsd" or OS == "openbsd" or OS == "solaris"', { - 'cflags': [ - '-Wno-unused', - '-Wno-unused-function', - ], - 'sources': [ - '../include/core/SkMMapStream.h', - '../src/core/SkMMapStream.cpp', - '../src/core/SkBlitter_ARGB32_Subpixel.cpp', - '../src/core/SkFontHost.cpp', - '../src/ports/SkThread_pthread.cpp', - '../src/ports/SkTime_Unix.cpp', - '../src/ports/SkFontHost_FreeType_Subpixel.cpp', - '../src/ports/SkFontHost_FreeType.cpp', - '../src/ports/SkFontHost_gamma_none.cpp', - '../src/ports/SkFontHost_linux.cpp', - ], - 'link_settings': { - 'libraries': [ - '-lfreetype', - ], - }, - }], - [ 'OS == "mac"', { - 'include_dirs': [ - '../include/utils/mac', - ], - 'sources': [ - '../include/core/SkMMapStream.h', - '../include/utils/mac/SkCGUtils.h', - - '../src/core/SkMMapStream.cpp', - '../src/ports/SkFontHost_mac_coretext.cpp', - - '../src/ports/SkThread_pthread.cpp', - '../src/ports/SkTime_Unix.cpp', - - '../src/utils/mac/SkCreateCGImageRef.cpp', - ], - }], - [ 'OS == "win"', { - 'include_dirs': [ - 'config/win', - ], - 'sources': [ - '../src/ports/SkFontHost_win.cpp', - '../src/ports/SkThread_win.cpp', - ], - },], - ], - 'direct_dependent_settings': { - 'include_dirs': [ - 'config', - '../include/config', - '../include/core', - 'ext', - ], - }, - 'dependencies': [ - 'skia_opts' - ], - }, - - # Due to an unfortunate intersection of lameness between gcc and gyp, - # we have to build the *_SSE2.cpp files in a separate target. The - # gcc lameness is that, in order to compile SSE2 intrinsics code, it - # must be passed the -msse2 flag. However, with this flag, it may - # emit SSE2 instructions even for scalar code, such as the CPUID - # test used to test for the presence of SSE2. So that, and all other - # code must be compiled *without* -msse2. The gyp lameness is that it - # does not allow file-specific CFLAGS, so we must create this extra - # target for those files to be compiled with -msse2. - # - # This is actually only a problem on 32-bit Linux (all Intel Macs have - # SSE2, Linux x86_64 has SSE2 by definition, and MSC will happily emit - # SSE2 from instrinsics, while generating plain ol' 386 for everything - # else). However, to keep the .gyp file simple and avoid platform-specific - # build breakage, we do this on all platforms. - - # For about the same reason, we need to compile the ARM opts files - # separately as well. - { - 'target_name': 'skia_opts', - 'type': 'static_library', - 'include_dirs': [ - '../include/config', - '../include/core', - '../src/core', - ], - 'conditions': [ - [ '(OS == "linux" or OS == "freebsd" or OS == "openbsd")', { - 'cflags': [ - '-msse2', - ], - }], - ], - 'sources': [ - '../src/opts/SkBitmapProcState_opts_SSE2.cpp', - '../src/opts/SkBlitRow_opts_SSE2.cpp', - '../src/opts/SkUtils_opts_SSE2.cpp', - ], - }, - { - 'target_name': 'effects', - 'type': 'static_library', - 'include_dirs': [ - '../include/config', - '../include/core', - '../include/effects', - ], - 'sources': [ - '../include/effects/Sk1DPathEffect.h', - '../include/effects/Sk2DPathEffect.h', - '../include/effects/SkAvoidXfermode.h', - '../include/effects/SkBlurDrawLooper.h', - '../include/effects/SkBlurMaskFilter.h', - '../include/effects/SkColorMatrix.h', - '../include/effects/SkColorMatrixFilter.h', - '../include/effects/SkCornerPathEffect.h', - '../include/effects/SkDashPathEffect.h', - '../include/effects/SkDiscretePathEffect.h', - '../include/effects/SkDrawExtraPathEffect.h', - '../include/effects/SkEmbossMaskFilter.h', - '../include/effects/SkGradientShader.h', - '../include/effects/SkGroupShape.h', - '../include/effects/SkKernel33MaskFilter.h', - '../include/effects/SkLayerDrawLooper.h', - '../include/effects/SkLayerRasterizer.h', - '../include/effects/SkPaintFlagsDrawFilter.h', - '../include/effects/SkPixelXorXfermode.h', - '../include/effects/SkPorterDuff.h', - '../include/effects/SkRectShape.h', - '../include/effects/SkTableMaskFilter.h', - '../include/effects/SkTransparentShader.h', - - '../src/effects/Sk1DPathEffect.cpp', - '../src/effects/Sk2DPathEffect.cpp', - '../src/effects/SkAvoidXfermode.cpp', - '../src/effects/SkBitmapCache.cpp', - '../src/effects/SkBitmapCache.h', - '../src/effects/SkBlurDrawLooper.cpp', - '../src/effects/SkBlurMask.cpp', - '../src/effects/SkBlurMask.h', - '../src/effects/SkBlurMaskFilter.cpp', - '../src/effects/SkColorFilters.cpp', - '../src/effects/SkColorMatrixFilter.cpp', - '../src/effects/SkCornerPathEffect.cpp', - '../src/effects/SkDashPathEffect.cpp', - '../src/effects/SkDiscretePathEffect.cpp', - '../src/effects/SkEmbossMask.cpp', - '../src/effects/SkEmbossMask.h', - '../src/effects/SkEmbossMask_Table.h', - '../src/effects/SkEmbossMaskFilter.cpp', - '../src/effects/SkGradientShader.cpp', - '../src/effects/SkGroupShape.cpp', - '../src/effects/SkKernel33MaskFilter.cpp', - '../src/effects/SkLayerDrawLooper.cpp', - '../src/effects/SkLayerRasterizer.cpp', - '../src/effects/SkPaintFlagsDrawFilter.cpp', - '../src/effects/SkPixelXorXfermode.cpp', - '../src/effects/SkPorterDuff.cpp', - '../src/effects/SkRadialGradient_Table.h', - '../src/effects/SkRectShape.cpp', - '../src/effects/SkTableMaskFilter.cpp', - '../src/effects/SkTransparentShader.cpp', - ], - 'direct_dependent_settings': { - 'include_dirs': [ - '../include/effects', - ], - }, - }, - { - 'target_name': 'images', - 'type': 'static_library', - 'include_dirs': [ - '../include/config', - '../include/core', - '../include/images', - ], - 'sources': [ - '../include/images/SkFlipPixelRef.h', - '../include/images/SkImageDecoder.h', - '../include/images/SkImageEncoder.h', - '../include/images/SkImageRef.h', - '../include/images/SkImageRef_GlobalPool.h', - '../include/images/SkJpegUtility.h', - '../include/images/SkMovie.h', - '../include/images/SkPageFlipper.h', - - '../src/images/bmpdecoderhelper.cpp', - '../src/images/bmpdecoderhelper.h', - '../src/images/SkBitmap_RLEPixels.h', - '../src/images/SkCreateRLEPixelRef.cpp', - '../src/images/SkFDStream.cpp', - '../src/images/SkFlipPixelRef.cpp', - '../src/images/SkImageDecoder.cpp', - '../src/images/SkImageDecoder_Factory.cpp', - '../src/images/SkImageDecoder_libbmp.cpp', - '../src/images/SkImageDecoder_libgif.cpp', - '../src/images/SkImageDecoder_libico.cpp', - '../src/images/SkImageDecoder_libjpeg.cpp', - '../src/images/SkImageDecoder_libpng.cpp', - '../src/images/SkImageDecoder_libpvjpeg.c', - '../src/images/SkImageDecoder_wbmp.cpp', - '../src/images/SkImageEncoder.cpp', - '../src/images/SkImageEncoder_Factory.cpp', - '../src/images/SkImageRef.cpp', - '../src/images/SkImageRefPool.cpp', - '../src/images/SkImageRefPool.h', - '../src/images/SkImageRef_GlobalPool.cpp', - '../src/images/SkJpegUtility.cpp', - '../src/images/SkMovie.cpp', - '../src/images/SkMovie_gif.cpp', - '../src/images/SkPageFlipper.cpp', - '../src/images/SkScaledBitmapSampler.cpp', - '../src/images/SkScaledBitmapSampler.h', - ], - 'conditions': [ - [ 'OS == "win"', { - 'sources!': [ - '../include/images/SkJpegUtility.h', - - '../src/images/SkFDStream.cpp', - '../src/images/SkImageDecoder_libjpeg.cpp', - '../src/images/SkImageDecoder_libpng.cpp', - '../src/images/SkImageDecoder_libpvjpeg.c', - '../src/images/SkJpegUtility.cpp', - '../src/images/SkMovie_gif.cpp', - ], - },], - [ 'OS == "mac"', { - 'sources!': [ - '../include/images/SkJpegUtility.h', - - '../src/images/SkImageDecoder_libgif.cpp', - '../src/images/SkImageDecoder_libjpeg.cpp', - '../src/images/SkImageDecoder_libpng.cpp', - '../src/images/SkImageDecoder_libpvjpeg.c', - '../src/images/SkJpegUtility.cpp', - '../src/images/SkMovie_gif.cpp', - ], - },], - [ 'OS == "linux" or OS == "freebsd" or OS == "openbsd" or OS == "solaris"', { - 'sources!': [ - '../include/images/SkJpegUtility.h', - - '../src/images/SkImageDecoder_libjpeg.cpp', - '../src/images/SkImageDecoder_libgif.cpp', - '../src/images/SkImageDecoder_libpvjpeg.c', - '../src/images/SkJpegUtility.cpp', - '../src/images/SkMovie_gif.cpp', - ], - }], - - ], - 'direct_dependent_settings': { - 'include_dirs': [ - '../include/images', - ], - }, - }, - { - 'target_name': 'xml', - 'type': 'static_library', - 'include_dirs': [ - '../include/config', - '../include/core', - '../include/xml', - '../include/utils', - ], - 'sources': [ - '../include/xml/SkBML_WXMLParser.h', - '../include/xml/SkBML_XMLParser.h', - '../include/xml/SkDOM.h', - '../include/xml/SkJS.h', - '../include/xml/SkXMLParser.h', - '../include/xml/SkXMLWriter.h', - - '../src/xml/SkBML_Verbs.h', - '../src/xml/SkBML_XMLParser.cpp', - '../src/xml/SkDOM.cpp', - '../src/xml/SkJS.cpp', - '../src/xml/SkJSDisplayable.cpp', - '../src/xml/SkXMLParser.cpp', - '../src/xml/SkXMLPullParser.cpp', - '../src/xml/SkXMLWriter.cpp', - ], - 'sources!': [ - '../src/xml/SkXMLPullParser.cpp', #if 0 around class decl in header - ], - 'conditions': [ - [ 'OS == "win" or OS == "mac" or OS == "linux" or OS == "openbsd" or OS == "solaris"', { - 'sources!': [ - # no jsapi.h by default on system - '../include/xml/SkJS.h', - '../src/xml/SkJS.cpp', - '../src/xml/SkJSDisplayable.cpp', - ], - },], - ], - 'direct_dependent_settings': { - 'include_dirs': [ - '../include/xml', - ], - }, - }, - { - 'target_name': 'utils', - 'type': 'static_library', - 'include_dirs': [ - '../include/config', - '../include/core', - '../include/utils', - '../include/views', - '../include/effects', - '../include/xml', - ], - 'sources': [ - '../include/utils/SkBoundaryPatch.h', - '../include/utils/SkCamera.h', - '../include/utils/SkCubicInterval.h', - '../include/utils/SkCullPoints.h', - '../include/utils/SkDumpCanvas.h', - '../include/utils/SkEGLContext.h', - '../include/utils/SkGLCanvas.h', - '../include/utils/SkInterpolator.h', - '../include/utils/SkLayer.h', - '../include/utils/SkMeshUtils.h', - '../include/utils/SkNinePatch.h', - '../include/utils/SkNWayCanvas.h', - '../include/utils/SkParse.h', - '../include/utils/SkParsePaint.h', - '../include/utils/SkParsePath.h', - '../include/utils/SkProxyCanvas.h', - '../include/utils/SkSfntUtils.h', - '../include/utils/SkTextBox.h', - '../include/utils/SkUnitMappers.h', - - '../src/utils/SkBoundaryPatch.cpp', - '../src/utils/SkCamera.cpp', - '../src/utils/SkColorMatrix.cpp', - '../src/utils/SkCubicInterval.cpp', - '../src/utils/SkCullPoints.cpp', - '../src/utils/SkDumpCanvas.cpp', - '../src/utils/SkEGLContext_none.cpp', - '../src/utils/SkInterpolator.cpp', - '../src/utils/SkLayer.cpp', - '../src/utils/SkMeshUtils.cpp', - '../src/utils/SkNinePatch.cpp', - '../src/utils/SkNWayCanvas.cpp', - '../src/utils/SkOSFile.cpp', - '../src/utils/SkParse.cpp', - '../src/utils/SkParseColor.cpp', - '../src/utils/SkParsePath.cpp', - '../src/utils/SkProxyCanvas.cpp', - '../src/utils/SkSfntUtils.cpp', - '../src/utils/SkUnitMappers.cpp', - ], - 'conditions': [ - [ 'OS == "mac"', { - 'sources': [ - '../include/utils/SkCGUtils.h', - '../src/utils/mac/SkCreateCGImageRef.cpp', - '../src/utils/mac/SkEGLContext_mac.cpp', - ], - },], - ], - 'direct_dependent_settings': { - 'include_dirs': [ - '../include/utils', - ], - }, - }, - { - 'target_name': 'views', - 'type': 'static_library', - 'include_dirs': [ - '../include/config', - '../include/core', - '../include/views', - '../include/xml', - '../include/utils', - '../include/images', - '../include/animator', - '../include/effects', - ], - 'sources': [ - '../include/views/SkApplication.h', - '../include/views/SkBGViewArtist.h', - '../include/views/SkBorderView.h', - '../include/views/SkEvent.h', - '../include/views/SkEventSink.h', - '../include/views/SkImageView.h', - '../include/views/SkKey.h', - '../include/views/SkMetaData.h', - '../include/views/SkOSMenu.h', - '../include/views/SkOSWindow_Mac.h', - '../include/views/SkOSWindow_SDL.h', - '../include/views/SkOSWindow_Unix.h', - '../include/views/SkOSWindow_Win.h', - #'../include/views/SkOSWindow_wxwidgets.h', - '../include/views/SkProgressBarView.h', - '../include/views/SkScrollBarView.h', - '../include/views/SkStackViewLayout.h', - '../include/views/SkSystemEventTypes.h', - '../include/views/SkTouchGesture.h', - '../include/views/SkView.h', - '../include/views/SkViewInflate.h', - '../include/views/SkWidget.h', - '../include/views/SkWidgetViews.h', - '../include/views/SkWindow.h', - - '../src/views/SkBGViewArtist.cpp', - '../src/views/SkBorderView.cpp', - '../src/views/SkEvent.cpp', - '../src/views/SkEventSink.cpp', - '../src/views/SkImageView.cpp', - '../src/views/SkListView.cpp', - '../src/views/SkListWidget.cpp', - '../src/views/SkMetaData.cpp', - '../src/views/SkOSMenu.cpp', - '../src/views/SkParsePaint.cpp', - '../src/views/SkProgressBarView.cpp', - '../src/views/SkProgressView.cpp', - '../src/views/SkScrollBarView.cpp', - '../src/views/SkStackViewLayout.cpp', - '../src/views/SkStaticTextView.cpp', - '../src/views/SkTagList.cpp', - '../src/views/SkTagList.h', - '../src/views/SkTextBox.cpp', - '../src/views/SkTouchGesture.cpp', - '../src/views/SkView.cpp', - '../src/views/SkViewInflate.cpp', - '../src/views/SkViewPriv.cpp', - '../src/views/SkViewPriv.h', - '../src/views/SkWidget.cpp', - '../src/views/SkWidgets.cpp', - '../src/views/SkWidgetViews.cpp', - '../src/views/SkWindow.cpp', - ], - 'sources!' : [ - '../src/views/SkListView.cpp', #depends on missing SkListSource implementation - '../src/views/SkListWidget.cpp', #depends on missing SkListSource implementation - ], - 'conditions': [ - [ 'OS == "win"', { - 'sources': [ - '../src/utils/win/SkOSWindow_Win.cpp', - '../vs/SampleApp/skia_win.cpp', - ], - },], - [ 'OS == "mac"', { - 'sources': [ - '../include/utils/SkCGUtils.h', - #'../src/utils/mac/SkBitmap_Mac.cpp', - '../src/utils/mac/SkCreateCGImageRef.cpp', - '../src/utils/mac/SkEGLContext_mac.cpp', - '../src/utils/mac/skia_mac.cpp', - '../src/utils/mac/SkOSWindow_Mac.cpp', - ], - 'link_settings': { - 'libraries': [ - '$(SDKROOT)/System/Library/Frameworks/Carbon.framework', - '$(SDKROOT)/System/Library/Frameworks/AGL.framework', - ], - }, - },], - [ 'OS == "linux" or OS == "freebsd" or OS == "openbsd" or OS == "solaris"', { - 'include_dirs' : [ - '../include/utils/unix', - ], - 'sources': [ - '../src/utils/unix/keysym2ucs.c', - '../src/utils/unix/SkOSWindow_Unix.cpp', - '../unix_test_app/main.cpp', - ], - }], - ], - 'direct_dependent_settings': { - 'include_dirs': [ - '../include/views', - ], - }, - }, - { - 'target_name': 'skgr', - 'type': 'static_library', - 'include_dirs': [ - '../include/config', - '../include/core', - '../src/core', - '../include/gpu', - '../gpu/include', - ], - 'sources': [ - '../include/gpu/SkGpuCanvas.h', - '../include/gpu/SkGpuDevice.h', - '../include/gpu/SkGpuDeviceFactory.h', - '../include/gpu/SkGr.h', - '../include/gpu/SkGrTexturePixelRef.h', - - '../src/gpu/GrPrintf_skia.cpp', - '../src/gpu/SkGpuCanvas.cpp', - '../src/gpu/SkGpuDevice.cpp', - '../src/gpu/SkGr.cpp', - '../src/gpu/SkGrFontScaler.cpp', - '../src/gpu/SkGrTexturePixelRef.cpp', - ], - 'conditions': [ - [ 'OS == "linux"', { - 'defines': [ - 'GR_LINUX_BUILD=1', - ], - }], - [ 'OS == "mac"', { - 'defines': [ - 'GR_MAC_BUILD=1', - ], - }], - [ 'OS == "win"', { - 'defines': [ - 'GR_WIN32_BUILD=1', - ], - },], - ], - 'direct_dependent_settings': { - 'conditions': [ - [ 'OS == "linux"', { - 'defines': [ - 'GR_LINUX_BUILD=1', - ], - }], - [ 'OS == "mac"', { - 'defines': [ - 'GR_MAC_BUILD=1', - ], - }], - [ 'OS == "win"', { - 'defines': [ - 'GR_WIN32_BUILD=1', - ], - },], - ], - 'include_dirs': [ - '../include/gpu', - ], - }, - }, - { - 'target_name': 'gr', - 'type': 'static_library', - 'include_dirs': [ - '../gpu/include', - ], - 'sources': [ - '../gpu/include/GrAllocator.h', - '../gpu/include/GrAllocPool.h', - '../gpu/include/GrAtlas.h', - '../gpu/include/GrClip.h', - '../gpu/include/GrClipIterator.h', - '../gpu/include/GrColor.h', - '../gpu/include/GrConfig.h', - '../gpu/include/GrContext.h', - '../gpu/include/GrContext_impl.h', - '../gpu/include/GrDrawTarget.h', - '../gpu/include/GrFontScaler.h', - '../gpu/include/GrGeometryBuffer.h', - '../gpu/include/GrGLConfig.h', - '../gpu/include/GrGLConfig_chrome.h', - '../gpu/include/GrGLIndexBuffer.h', - '../gpu/include/GrGLInterface.h', - '../gpu/include/GrGLIRect.h', - '../gpu/include/GrGLPlatformIncludes.h', - '../gpu/include/GrGLTexture.h', - '../gpu/include/GrGLVertexBuffer.h', - '../gpu/include/GrGlyph.h', - '../gpu/include/GrGpu.h', - '../gpu/include/GrGpuVertex.h', - '../gpu/include/GrIndexBuffer.h', - '../gpu/include/GrInOrderDrawBuffer.h', - '../gpu/include/GrInstanceCounter.h', - '../gpu/include/GrIPoint.h', - '../gpu/include/GrKey.h', - '../gpu/include/GrMatrix.h', - '../gpu/include/GrMemory.h', - '../gpu/include/GrMesh.h', - '../gpu/include/GrNoncopyable.h', - '../gpu/include/GrPaint.h', - '../gpu/include/GrPath.h', - '../gpu/include/GrPathIter.h', - '../gpu/include/GrPathSink.h', - '../gpu/include/GrPlotMgr.h', - '../gpu/include/GrPoint.h', - '../gpu/include/GrRandom.h', - '../gpu/include/GrRect.h', - '../gpu/include/GrRectanizer.h', - '../gpu/include/GrRefCnt.h', - '../gpu/include/GrSamplerState.h', - '../gpu/include/GrScalar.h', - '../gpu/include/GrStencil.h', - '../gpu/include/GrStopwatch.h', - '../gpu/include/GrStringBuilder.h', - '../gpu/include/GrTArray.h', - '../gpu/include/GrTBSearch.h', - '../gpu/include/GrTDArray.h', - '../gpu/include/GrTextContext.h', - '../gpu/include/GrTextStrike.h', - '../gpu/include/GrTexture.h', - '../gpu/include/GrTextureCache.h', - '../gpu/include/GrTHashCache.h', - '../gpu/include/GrTLList.h', - '../gpu/include/GrTouchGesture.h', - '../gpu/include/GrTypes.h', - '../gpu/include/GrUserConfig.h', - '../gpu/include/GrVertexBuffer.h', - - '../gpu/src/GrAllocPool.cpp', - '../gpu/src/GrAtlas.cpp', - '../gpu/src/GrBufferAllocPool.cpp', - '../gpu/src/GrBufferAllocPool.h', - '../gpu/src/GrClip.cpp', - '../gpu/src/GrContext.cpp', - '../gpu/src/GrDrawTarget.cpp', - '../gpu/src/GrGLIndexBuffer.cpp', - '../gpu/src/GrGLInterface.cpp', - '../gpu/src/GrGLTexture.cpp', - '../gpu/src/GrGLUtil.cpp', - '../gpu/src/GrGLVertexBuffer.cpp', - '../gpu/src/GrGpu.cpp', - '../gpu/src/GrGpuFactory.cpp', - '../gpu/src/GrGpuGL.cpp', - '../gpu/src/GrGpuGL.h', - '../gpu/src/GrGpuGLFixed.cpp', - '../gpu/src/GrGpuGLFixed.h', - '../gpu/src/GrGpuGLShaders2.cpp', - '../gpu/src/GrGpuGLShaders2.h', - '../gpu/src/GrInOrderDrawBuffer.cpp', - '../gpu/src/GrMatrix.cpp', - '../gpu/src/GrMemory.cpp', - '../gpu/src/GrPath.cpp', - '../gpu/src/GrPathRenderer.cpp', - '../gpu/src/GrPathRenderer.h', - '../gpu/src/GrPrintf_printf.cpp', - '../gpu/src/GrRectanizer.cpp', - '../gpu/src/GrRedBlackTree.h', - '../gpu/src/GrStencil.cpp', - '../gpu/src/GrTextContext.cpp', - '../gpu/src/GrTextStrike.cpp', - '../gpu/src/GrTextStrike_impl.h', - '../gpu/src/GrTextureCache.cpp', - '../gpu/src/gr_unittests.cpp', - ], - 'conditions': [ - [ 'OS == "linux"', { - 'defines': [ - 'GR_LINUX_BUILD=1', - ], - 'link_settings': { - 'libraries': [ - '-lGL', - '-lX11', - ], - }, - }], - [ 'OS == "mac"', { - 'defines': [ - 'GR_MAC_BUILD=1', - ], - 'link_settings': { - 'libraries': [ - '$(SDKROOT)/System/Library/Frameworks/OpenGL.framework', - ], - }, - }], - [ 'OS == "win"', { - 'defines': [ - 'GR_WIN32_BUILD=1', - ], - },], - ], - 'direct_dependent_settings': { - 'conditions': [ - [ 'OS == "linux"', { - 'defines': [ - 'GR_LINUX_BUILD=1', - ], - }], - [ 'OS == "mac"', { - 'defines': [ - 'GR_MAC_BUILD=1', - ], - }], - [ 'OS == "win"', { - 'defines': [ - 'GR_WIN32_BUILD=1', - ], - },], - ], - 'include_dirs': [ - '../gpu/include', - ], - }, - }, - { - 'target_name': 'animator', - 'type': 'static_library', - 'include_dirs': [ - '../include/config', - '../include/core', - '../include/effects', - '../include/animator', - '../include/views', - '../include/xml', - '../include/utils', - '../include/images', - ], - 'sources': [ - '../include/animator/SkAnimator.h', - '../include/animator/SkAnimatorView.h', - - '../src/animator/SkAnimate.h', - '../src/animator/SkAnimateActive.cpp', - '../src/animator/SkAnimateActive.h', - '../src/animator/SkAnimateBase.cpp', - '../src/animator/SkAnimateBase.h', - '../src/animator/SkAnimateField.cpp', - '../src/animator/SkAnimateMaker.cpp', - '../src/animator/SkAnimateMaker.h', - '../src/animator/SkAnimateProperties.h', - '../src/animator/SkAnimateSet.cpp', - '../src/animator/SkAnimateSet.h', - '../src/animator/SkAnimator.cpp', - '../src/animator/SkAnimatorScript.cpp', - '../src/animator/SkAnimatorScript.h', - #'../src/animator/SkAnimatorScript2.cpp', fails on windows - #'../src/animator/SkAnimatorScript2.h', - '../src/animator/SkBase64.cpp', - '../src/animator/SkBase64.h', - '../src/animator/SkBoundable.cpp', - '../src/animator/SkBoundable.h', - '../src/animator/SkBuildCondensedInfo.cpp', - #'../src/animator/SkCondensedDebug.cpp', fails on windows - '../src/animator/SkCondensedRelease.cpp', - '../src/animator/SkDisplayable.cpp', - '../src/animator/SkDisplayable.h', - '../src/animator/SkDisplayAdd.cpp', - '../src/animator/SkDisplayAdd.h', - '../src/animator/SkDisplayApply.cpp', - '../src/animator/SkDisplayApply.h', - '../src/animator/SkDisplayBounds.cpp', - '../src/animator/SkDisplayBounds.h', - '../src/animator/SkDisplayEvent.cpp', - '../src/animator/SkDisplayEvent.h', - '../src/animator/SkDisplayEvents.cpp', - '../src/animator/SkDisplayEvents.h', - '../src/animator/SkDisplayInclude.cpp', - '../src/animator/SkDisplayInclude.h', - '../src/animator/SkDisplayInput.cpp', - '../src/animator/SkDisplayInput.h', - '../src/animator/SkDisplayList.cpp', - '../src/animator/SkDisplayList.h', - '../src/animator/SkDisplayMath.cpp', - '../src/animator/SkDisplayMath.h', - '../src/animator/SkDisplayMovie.cpp', - '../src/animator/SkDisplayMovie.h', - '../src/animator/SkDisplayNumber.cpp', - '../src/animator/SkDisplayNumber.h', - '../src/animator/SkDisplayPost.cpp', - '../src/animator/SkDisplayPost.h', - '../src/animator/SkDisplayRandom.cpp', - '../src/animator/SkDisplayRandom.h', - '../src/animator/SkDisplayScreenplay.cpp', - '../src/animator/SkDisplayScreenplay.h', - '../src/animator/SkDisplayType.cpp', - '../src/animator/SkDisplayType.h', - '../src/animator/SkDisplayTypes.cpp', - '../src/animator/SkDisplayTypes.h', - '../src/animator/SkDisplayXMLParser.cpp', - '../src/animator/SkDisplayXMLParser.h', - '../src/animator/SkDraw3D.cpp', - '../src/animator/SkDraw3D.h', - '../src/animator/SkDrawable.cpp', - '../src/animator/SkDrawable.h', - '../src/animator/SkDrawBitmap.cpp', - '../src/animator/SkDrawBitmap.h', - '../src/animator/SkDrawBlur.cpp', - '../src/animator/SkDrawBlur.h', - '../src/animator/SkDrawClip.cpp', - '../src/animator/SkDrawClip.h', - '../src/animator/SkDrawColor.cpp', - '../src/animator/SkDrawColor.h', - '../src/animator/SkDrawDash.cpp', - '../src/animator/SkDrawDash.h', - '../src/animator/SkDrawDiscrete.cpp', - '../src/animator/SkDrawDiscrete.h', - '../src/animator/SkDrawEmboss.cpp', - '../src/animator/SkDrawEmboss.h', - '../src/animator/SkDrawExtraPathEffect.cpp', - '../src/animator/SkDrawFull.cpp', - '../src/animator/SkDrawFull.h', - '../src/animator/SkDrawGradient.cpp', - '../src/animator/SkDrawGradient.h', - '../src/animator/SkDrawGroup.cpp', - '../src/animator/SkDrawGroup.h', - '../src/animator/SkDrawLine.cpp', - '../src/animator/SkDrawLine.h', - '../src/animator/SkDrawMatrix.cpp', - '../src/animator/SkDrawMatrix.h', - '../src/animator/SkDrawOval.cpp', - '../src/animator/SkDrawOval.h', - '../src/animator/SkDrawPaint.cpp', - '../src/animator/SkDrawPaint.h', - '../src/animator/SkDrawPath.cpp', - '../src/animator/SkDrawPath.h', - '../src/animator/SkDrawPoint.cpp', - '../src/animator/SkDrawPoint.h', - '../src/animator/SkDrawRectangle.cpp', - '../src/animator/SkDrawRectangle.h', - '../src/animator/SkDrawSaveLayer.cpp', - '../src/animator/SkDrawSaveLayer.h', - '../src/animator/SkDrawShader.cpp', - '../src/animator/SkDrawShader.h', - '../src/animator/SkDrawText.cpp', - '../src/animator/SkDrawText.h', - '../src/animator/SkDrawTextBox.cpp', - '../src/animator/SkDrawTextBox.h', - '../src/animator/SkDrawTo.cpp', - '../src/animator/SkDrawTo.h', - '../src/animator/SkDrawTransparentShader.cpp', - '../src/animator/SkDrawTransparentShader.h', - '../src/animator/SkDump.cpp', - '../src/animator/SkDump.h', - '../src/animator/SkExtras.h', - '../src/animator/SkGetCondensedInfo.cpp', - '../src/animator/SkHitClear.cpp', - '../src/animator/SkHitClear.h', - '../src/animator/SkHitTest.cpp', - '../src/animator/SkHitTest.h', - '../src/animator/SkIntArray.h', - '../src/animator/SkMatrixParts.cpp', - '../src/animator/SkMatrixParts.h', - '../src/animator/SkMemberInfo.cpp', - '../src/animator/SkMemberInfo.h', - '../src/animator/SkOpArray.cpp', - '../src/animator/SkOpArray.h', - '../src/animator/SkOperand.h', - '../src/animator/SkOperand2.h', - '../src/animator/SkOperandInterpolator.h', - '../src/animator/SkOperandIterpolator.cpp', - '../src/animator/SkPaintParts.cpp', - '../src/animator/SkPaintParts.h', - '../src/animator/SkParseSVGPath.cpp', - '../src/animator/SkPathParts.cpp', - '../src/animator/SkPathParts.h', - '../src/animator/SkPostParts.cpp', - '../src/animator/SkPostParts.h', - '../src/animator/SkScript.cpp', - '../src/animator/SkScript.h', - '../src/animator/SkScript2.h', - '../src/animator/SkScriptCallBack.h', - '../src/animator/SkScriptDecompile.cpp', - '../src/animator/SkScriptRuntime.cpp', - '../src/animator/SkScriptRuntime.h', - '../src/animator/SkScriptTokenizer.cpp', - '../src/animator/SkSnapshot.cpp', - '../src/animator/SkSnapshot.h', - '../src/animator/SkTDArray_Experimental.h', - '../src/animator/SkTextOnPath.cpp', - '../src/animator/SkTextOnPath.h', - '../src/animator/SkTextToPath.cpp', - '../src/animator/SkTextToPath.h', - '../src/animator/SkTime.cpp', - '../src/animator/SkTypedArray.cpp', - '../src/animator/SkTypedArray.h', - '../src/animator/SkXMLAnimatorWriter.cpp', - '../src/animator/SkXMLAnimatorWriter.h', - ], - 'direct_dependent_settings': { - 'include_dirs': [ - '../include/animator', - ], - }, - }, - - { - 'target_name': 'svg', - 'type': 'static_library', - 'include_dirs': [ - '../include/config', - '../include/core', - '../include/xml', - '../include/utils', - '../include/svg', - ], - 'sources': [ - '../include/svg/SkSVGAttribute.h', - '../include/svg/SkSVGBase.h', - '../include/svg/SkSVGPaintState.h', - '../include/svg/SkSVGParser.h', - '../include/svg/SkSVGTypes.h', - - '../src/svg/SkSVGCircle.cpp', - '../src/svg/SkSVGCircle.h', - '../src/svg/SkSVGClipPath.cpp', - '../src/svg/SkSVGClipPath.h', - '../src/svg/SkSVGDefs.cpp', - '../src/svg/SkSVGDefs.h', - '../src/svg/SkSVGElements.cpp', - '../src/svg/SkSVGElements.h', - '../src/svg/SkSVGEllipse.cpp', - '../src/svg/SkSVGEllipse.h', - '../src/svg/SkSVGFeColorMatrix.cpp', - '../src/svg/SkSVGFeColorMatrix.h', - '../src/svg/SkSVGFilter.cpp', - '../src/svg/SkSVGFilter.h', - '../src/svg/SkSVGG.cpp', - '../src/svg/SkSVGG.h', - '../src/svg/SkSVGGradient.cpp', - '../src/svg/SkSVGGradient.h', - '../src/svg/SkSVGGroup.cpp', - '../src/svg/SkSVGGroup.h', - '../src/svg/SkSVGImage.cpp', - '../src/svg/SkSVGImage.h', - '../src/svg/SkSVGLine.cpp', - '../src/svg/SkSVGLine.h', - '../src/svg/SkSVGLinearGradient.cpp', - '../src/svg/SkSVGLinearGradient.h', - '../src/svg/SkSVGMask.cpp', - '../src/svg/SkSVGMask.h', - '../src/svg/SkSVGMetadata.cpp', - '../src/svg/SkSVGMetadata.h', - '../src/svg/SkSVGPaintState.cpp', - '../src/svg/SkSVGParser.cpp', - '../src/svg/SkSVGPath.cpp', - '../src/svg/SkSVGPath.h', - '../src/svg/SkSVGPolygon.cpp', - '../src/svg/SkSVGPolygon.h', - '../src/svg/SkSVGPolyline.cpp', - '../src/svg/SkSVGPolyline.h', - '../src/svg/SkSVGRadialGradient.cpp', - '../src/svg/SkSVGRadialGradient.h', - '../src/svg/SkSVGRect.cpp', - '../src/svg/SkSVGRect.h', - '../src/svg/SkSVGStop.cpp', - '../src/svg/SkSVGStop.h', - '../src/svg/SkSVGSVG.cpp', - '../src/svg/SkSVGSVG.h', - '../src/svg/SkSVGSymbol.cpp', - '../src/svg/SkSVGSymbol.h', - '../src/svg/SkSVGText.cpp', - '../src/svg/SkSVGText.h', - '../src/svg/SkSVGUse.cpp', - ], - 'sources!' : [ - '../src/svg/SkSVG.cpp', # doesn't compile, maybe this is test code? - ], - 'direct_dependent_settings': { - 'include_dirs': [ - '../include/svg', - ], - }, - }, - - { - 'target_name': 'experimental', - 'type': 'static_library', - 'include_dirs': [ - '../include/config', - '../include/core', - ], - 'sources': [ - '../experimental/SkMatrix44.cpp', - '../experimental/SkMatrix44.h', - '../experimental/SkSetPoly3To3.cpp', - '../experimental/SkSetPoly3To3_A.cpp', - '../experimental/SkSetPoly3To3_D.cpp', - ], - 'sources!': [ - '../experimental/SkMatrix44.cpp', #doesn't compile - '../experimental/SkMatrix44.h', - ], - 'direct_dependent_settings': { - 'include_dirs': [ - '../experimental', - ], - }, - }, - - { - 'target_name': 'SampleApp', - 'type': 'executable', - 'mac_bundle' : 1, - 'include_dirs' : [ - '../src/core', # needed to get SkConcaveToTriangle, maybe this should be moved to include dir? - '../gm', # SampleGM.cpp pulls gm.h - ], - 'sources': [ - # gm files needed for SampleGM.cpp - '../gm/bitmapfilters.cpp', - '../gm/blurs.cpp', - '../gm/complexclip.cpp', - '../gm/filltypes.cpp', - '../gm/gm.h', - '../gm/gradients.cpp', - '../gm/points.cpp', - '../gm/poly2poly.cpp', - '../gm/shadertext.cpp', - '../gm/shadows.cpp', - '../gm/shapes.cpp', - '../gm/tilemodes.cpp', - '../gm/xfermodes.cpp', - - '../samplecode/ClockFaceView.cpp', - '../samplecode/OverView.cpp', - '../samplecode/SampleAll.cpp', - '../samplecode/SampleAnimator.cpp', - '../samplecode/SampleApp.cpp', - '../samplecode/SampleArc.cpp', - '../samplecode/SampleAvoid.cpp', - '../samplecode/SampleBigGradient.cpp', - '../samplecode/SampleBitmapRect.cpp', - '../samplecode/SampleBlur.cpp', - '../samplecode/SampleCamera.cpp', - '../samplecode/SampleCircle.cpp', - '../samplecode/SampleCode.h', - '../samplecode/SampleComplexClip.cpp', - '../samplecode/SampleCull.cpp', - '../samplecode/SampleDecode.cpp', - '../samplecode/SampleDither.cpp', - '../samplecode/SampleDitherBitmap.cpp', - '../samplecode/SampleDrawLooper.cpp', - '../samplecode/SampleEffects.cpp', - '../samplecode/SampleEmboss.cpp', - '../samplecode/SampleEncode.cpp', - '../samplecode/SampleExtractAlpha.cpp', - '../samplecode/SampleFillType.cpp', - '../samplecode/SampleFilter.cpp', - '../samplecode/SampleFilter2.cpp', - '../samplecode/SampleFontCache.cpp', - '../samplecode/SampleFontScalerTest.cpp', - '../samplecode/SampleFuzz.cpp', - '../samplecode/SampleGM.cpp', - '../samplecode/SampleGradients.cpp', - '../samplecode/SampleHairline.cpp', - '../samplecode/SampleImage.cpp', - '../samplecode/SampleImageDir.cpp', - '../samplecode/SampleLayerMask.cpp', - '../samplecode/SampleLayers.cpp', - '../samplecode/SampleLCD.cpp', - '../samplecode/SampleLineClipper.cpp', - '../samplecode/SampleLines.cpp', - '../samplecode/SampleMeasure.cpp', - '../samplecode/SampleMipMap.cpp', - '../samplecode/SampleMovie.cpp', - '../samplecode/SampleNinePatch.cpp', - '../samplecode/SampleOvalTest.cpp', - '../samplecode/SampleOverflow.cpp', - '../samplecode/SamplePageFlip.cpp', - '../samplecode/SamplePatch.cpp', - '../samplecode/SamplePath.cpp', - '../samplecode/SamplePathClip.cpp', - '../samplecode/SamplePathEffects.cpp', - '../samplecode/SamplePicture.cpp', - '../samplecode/SamplePoints.cpp', - '../samplecode/SamplePolyToPoly.cpp', - '../samplecode/SampleRegion.cpp', - '../samplecode/SampleRepeatTile.cpp', - '../samplecode/SampleShaders.cpp', - '../samplecode/SampleShaderText.cpp', - '../samplecode/SampleShapes.cpp', - '../samplecode/SampleSkLayer.cpp', - '../samplecode/SampleSlides.cpp', - '../samplecode/SampleStrokePath.cpp', - '../samplecode/SampleStrokeText.cpp', - '../samplecode/SampleSVG.cpp', - '../samplecode/SampleTests.cpp', - '../samplecode/SampleText.cpp', - '../samplecode/SampleTextAlpha.cpp', - '../samplecode/SampleTextBox.cpp', - '../samplecode/SampleTextEffects.cpp', - '../samplecode/SampleTextOnPath.cpp', - '../samplecode/SampleTiling.cpp', - '../samplecode/SampleTinyBitmap.cpp', - '../samplecode/SampleTriangles.cpp', - '../samplecode/SampleTypeface.cpp', - '../samplecode/SampleUnitMapper.cpp', - '../samplecode/SampleVertices.cpp', - '../samplecode/SampleXfermodes.cpp', - ], - 'sources!': [ - '../samplecode/SampleSkLayer.cpp', #relies on SkMatrix44 which doesn't compile - '../samplecode/SampleTests.cpp', #includes unknown file SkShaderExtras.h - '../samplecode/SampleWarp.cpp', - '../samplecode/SampleFontCache.cpp', - ], - 'dependencies': [ - 'skia', - 'effects', - 'images', - 'views', - 'utils', - 'animator', - 'xml', - 'svg', - 'experimental', - 'gr', - 'skgr', - ], - 'conditions' : [ - [ 'OS == "linux" or OS == "freebsd" or OS == "openbsd" or OS == "solaris"', { - 'sources!': [ - '../samplecode/SampleDecode.cpp', - ], - }], - [ 'OS == "win"', { - 'sources!': [ - # require UNIX functions - '../samplecode/SampleEncode.cpp', - '../samplecode/SamplePageFlip.cpp', - ], - },], - [ 'OS == "mac"', { - 'sources!': [ - '../samplecode/SampleDecode.cpp', - ], - },], - - ], - 'msvs_settings': { - 'VCLinkerTool': { - 'SubSystem': '2', - 'AdditionalDependencies': [ - 'OpenGL32.lib', - 'glew32.lib', - 'usp10.lib', - 'd3d9.lib', - ], - }, - }, - }, - ], -} - -# Local Variables: -# tab-width:2 -# indent-tabs-mode:nil -# End: -# vim: set expandtab tabstop=2 shiftwidth=2: +{ + 'target_defaults': { + 'msvs_settings': { + #really need to figure out how to generate debug and release + 'VCLinkerTool': { + 'GenerateDebugInformation': 'true', + }, + 'VCCLCompilerTool': { + 'DebugInformationFormat': '4', + 'Optimization': '0', + }, + }, + 'conditions': [ + [ 'OS == "linux" or OS == "freebsd" or OS == "openbsd" or OS == "solaris"', { + 'include_dirs' : [ + '/usr/include/freetype2', + ], + }], + [ 'OS == "mac"', { + 'defines': [ + 'SK_BUILD_FOR_MAC', + ], + }], + [ 'OS == "win"', { + 'defines': [ + 'SK_BUILD_FOR_WIN32', + ], + },], + ], + 'direct_dependent_settings': { + 'conditions': [ + [ 'OS == "mac"', { + 'defines': [ + 'SK_BUILD_FOR_MAC', + ], + }], + [ 'OS == "win"', { + 'defines': [ + 'SK_BUILD_FOR_WIN32', + ], + },], + ], + }, + }, + 'targets': [ + { + 'target_name': 'skia', + 'type': 'static_library', + 'msvs_guid': 'B7760B5E-BFA8-486B-ACFD-49E3A6DE8E76', + 'sources': [ + '../src/core/ARGB32_Clamp_Bilinear_BitmapShader.h', + '../src/core/Sk64.cpp', + '../src/core/SkAdvancedTypefaceMetrics.cpp', + '../src/core/SkAlphaRuns.cpp', + '../src/core/SkAntiRun.h', + '../src/core/SkBitmap.cpp', + '../src/core/SkBitmapProcShader.cpp', + '../src/core/SkBitmapProcShader.h', + '../src/core/SkBitmapProcState.cpp', + '../src/core/SkBitmapProcState.h', + '../src/core/SkBitmapProcState_matrix.h', + '../src/core/SkBitmapProcState_matrixProcs.cpp', + '../src/core/SkBitmapProcState_sample.h', + '../src/core/SkBitmapSampler.cpp', + '../src/core/SkBitmapSampler.h', + '../src/core/SkBitmapSamplerTemplate.h', + '../src/core/SkBitmapShader16BilerpTemplate.h', + '../src/core/SkBitmapShaderTemplate.h', + '../src/core/SkBitmap_scroll.cpp', + '../src/core/SkBlitBWMaskTemplate.h', + '../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', + '../src/core/SkClipStack.cpp', + '../src/core/SkColor.cpp', + '../src/core/SkColorFilter.cpp', + '../src/core/SkColorTable.cpp', + '../src/core/SkComposeShader.cpp', + '../src/core/SkConcaveToTriangles.cpp', + '../src/core/SkConcaveToTriangles.h', + '../src/core/SkCordic.cpp', + '../src/core/SkCordic.h', + '../src/core/SkCoreBlitters.h', + '../src/core/SkCubicClipper.cpp', + '../src/core/SkCubicClipper.h', + '../src/core/SkDebug.cpp', + '../src/core/SkDeque.cpp', + '../src/core/SkDevice.cpp', + '../src/core/SkDither.cpp', + '../src/core/SkDraw.cpp', + '../src/core/SkDrawProcs.h', + '../src/core/SkEdgeBuilder.cpp', + '../src/core/SkEdgeClipper.cpp', + '../src/core/SkEdge.cpp', + '../src/core/SkEdge.h', + '../src/core/SkFP.h', + '../src/core/SkFilterProc.cpp', + '../src/core/SkFilterProc.h', + '../src/core/SkFlattenable.cpp', + '../src/core/SkFloat.cpp', + '../src/core/SkFloat.h', + '../src/core/SkFloatBits.cpp', + '../src/core/SkGeometry.cpp', + '../src/core/SkGlobals.cpp', + '../src/core/SkGlyphCache.cpp', + '../src/core/SkGlyphCache.h', + '../src/core/SkGraphics.cpp', + '../src/core/SkLineClipper.cpp', + '../src/core/SkMallocPixelRef.cpp', + '../src/core/SkMask.cpp', + '../src/core/SkMaskFilter.cpp', + '../src/core/SkMath.cpp', + '../src/core/SkMatrix.cpp', + '../src/core/SkPackBits.cpp', + '../src/core/SkPaint.cpp', + '../src/core/SkPath.cpp', + '../src/core/SkPathEffect.cpp', + '../src/core/SkPathHeap.cpp', + '../src/core/SkPathHeap.h', + '../src/core/SkPathMeasure.cpp', + '../src/core/SkPicture.cpp', + '../src/core/SkPictureFlat.cpp', + '../src/core/SkPictureFlat.h', + '../src/core/SkPicturePlayback.cpp', + '../src/core/SkPicturePlayback.h', + '../src/core/SkPictureRecord.cpp', + '../src/core/SkPictureRecord.h', + '../src/core/SkPixelRef.cpp', + '../src/core/SkPoint.cpp', + '../src/core/SkProcSpriteBlitter.cpp', + '../src/core/SkPtrRecorder.cpp', + '../src/core/SkQuadClipper.cpp', + '../src/core/SkQuadClipper.h', + '../src/core/SkRasterizer.cpp', + '../src/core/SkRect.cpp', + '../src/core/SkRefDict.cpp', + '../src/core/SkRegion.cpp', + '../src/core/SkRegionPriv.h', + '../src/core/SkRegion_path.cpp', + '../src/core/SkScalar.cpp', + '../src/core/SkScalerContext.cpp', + '../src/core/SkScan.cpp', + '../src/core/SkScanPriv.h', + '../src/core/SkScan_AntiPath.cpp', + '../src/core/SkScan_Antihair.cpp', + '../src/core/SkScan_Hairline.cpp', + '../src/core/SkScan_Path.cpp', + '../src/core/SkShader.cpp', + '../src/core/SkShape.cpp', + '../src/core/SkSpriteBlitter_ARGB32.cpp', + '../src/core/SkSpriteBlitter_RGB16.cpp', + '../src/core/SkSinTable.h', + '../src/core/SkSpriteBlitter.h', + '../src/core/SkSpriteBlitterTemplate.h', + '../src/core/SkStream.cpp', + '../src/core/SkString.cpp', + '../src/core/SkStroke.cpp', + '../src/core/SkStrokerPriv.cpp', + '../src/core/SkStrokerPriv.h', + '../src/core/SkTextFormatParams.h', + '../src/core/SkTSearch.cpp', + '../src/core/SkTSort.h', + '../src/core/SkTemplatesPriv.h', + '../src/core/SkTypeface.cpp', + '../src/core/SkUnPreMultiply.cpp', + '../src/core/SkUtils.cpp', + '../src/core/SkWriter32.cpp', + '../src/core/SkXfermode.cpp', + + '../src/opts/opts_check_SSE2.cpp', + + '../src/ports/SkDebug_stdio.cpp', + '../src/ports/SkFontHost_tables.cpp', + '../src/ports/SkGlobals_global.cpp', + '../src/ports/SkMemory_malloc.cpp', + '../src/ports/SkOSFile_stdio.cpp', + '../src/ports/SkTime_Unix.cpp', + '../src/ports/SkXMLParser_empty.cpp', + '../src/ports/sk_predefined_gamma.h', + + '../include/core/Sk64.h', + '../include/core/SkAdvancedTypefaceMetrics.h', + '../include/core/SkAutoKern.h', + '../include/core/SkBitmap.h', + '../include/core/SkBlitRow.h', + '../include/core/SkBlitter.h', + '../include/core/SkBounder.h', + '../include/core/SkBuffer.h', + '../include/core/SkCanvas.h', + '../include/core/SkChunkAlloc.h', + '../include/core/SkClipStack.h', + '../include/core/SkColor.h', + '../include/core/SkColorFilter.h', + '../include/core/SkColorPriv.h', + '../include/core/SkColorShader.h', + '../include/core/SkComposeShader.h', + '../include/core/SkDeque.h', + '../include/core/SkDescriptor.h', + '../include/core/SkDevice.h', + '../include/core/SkDither.h', + '../include/core/SkDraw.h', + '../include/core/SkDrawFilter.h', + '../include/core/SkDrawLooper.h', + '../include/core/SkEndian.h', + '../include/core/SkFDot6.h', + '../include/core/SkFixed.h', + '../include/core/SkFlattenable.h', + '../include/core/SkFloatBits.h', + '../include/core/SkFloatingPoint.h', + '../include/core/SkFontHost.h', + '../include/core/SkGeometry.h', + '../include/core/SkGlobals.h', + '../include/core/SkGraphics.h', + '../include/core/SkMallocPixelRef.h', + '../include/core/SkMask.h', + '../include/core/SkMaskFilter.h', + '../include/core/SkMath.h', + '../include/core/SkMatrix.h', + '../include/core/SkOSFile.h', + '../include/core/SkPackBits.h', + '../include/core/SkPaint.h', + '../include/core/SkPath.h', + '../include/core/SkPathEffect.h', + '../include/core/SkPathMeasure.h', + '../include/core/SkPerspIter.h', + '../include/core/SkPicture.h', + '../include/core/SkPixelRef.h', + '../include/core/SkPoint.h', + '../include/core/SkPtrRecorder.h', + '../include/core/SkRandom.h', + '../include/core/SkRasterizer.h', + '../include/core/SkReader32.h', + '../include/core/SkRect.h', + '../include/core/SkRefCnt.h', + '../include/core/SkRefDict.h', + '../include/core/SkRegion.h', + '../include/core/SkScalar.h', + '../include/core/SkScalarCompare.h', + '../include/core/SkScalerContext.h', + '../include/core/SkScan.h', + '../include/core/SkShader.h', + '../include/core/SkStream.h', + '../include/core/SkString.h', + '../include/core/SkStroke.h', + '../include/core/SkTDArray.h', + '../include/core/SkTDStack.h', + '../include/core/SkTDict.h', + '../include/core/SkTRegistry.h', + '../include/core/SkTScopedPtr.h', + '../include/core/SkTSearch.h', + '../include/core/SkTemplates.h', + '../include/core/SkThread.h', + '../include/core/SkThread_platform.h', + '../include/core/SkTime.h', + '../include/core/SkTypeface.h', + '../include/core/SkTypes.h', + '../include/core/SkUnPreMultiply.h', + '../include/core/SkUnitMapper.h', + '../include/core/SkUtils.h', + '../include/core/SkWriter32.h', + '../include/core/SkXfermode.h', + ], + 'include_dirs': [ + '../include/config', + '../include/core', + '../include/ports', + '../include/xml', + '../src/core', + ], + 'msvs_disabled_warnings': [4244, 4267,4345, 4390, 4554, 4800], + 'conditions': [ + [ 'OS == "linux" or OS == "freebsd" or OS == "openbsd" or OS == "solaris"', { + 'cflags': [ + '-Wno-unused', + '-Wno-unused-function', + ], + 'sources': [ + '../include/core/SkMMapStream.h', + '../src/core/SkMMapStream.cpp', + '../src/core/SkBlitter_ARGB32_Subpixel.cpp', + '../src/core/SkFontHost.cpp', + '../src/ports/SkThread_pthread.cpp', + '../src/ports/SkTime_Unix.cpp', + '../src/ports/SkFontHost_FreeType_Subpixel.cpp', + '../src/ports/SkFontHost_FreeType.cpp', + '../src/ports/SkFontHost_gamma_none.cpp', + '../src/ports/SkFontHost_linux.cpp', + ], + 'link_settings': { + 'libraries': [ + '-lfreetype', + ], + }, + }], + [ 'OS == "mac"', { + 'include_dirs': [ + '../include/utils/mac', + ], + 'sources': [ + '../include/core/SkMMapStream.h', + '../include/utils/mac/SkCGUtils.h', + + '../src/core/SkMMapStream.cpp', + '../src/ports/SkFontHost_mac_coretext.cpp', + + '../src/ports/SkThread_pthread.cpp', + '../src/ports/SkTime_Unix.cpp', + + '../src/utils/mac/SkCreateCGImageRef.cpp', + ], + }], + [ 'OS == "win"', { + 'include_dirs': [ + 'config/win', + ], + 'sources': [ + '../src/ports/SkFontHost_win.cpp', + '../src/ports/SkThread_win.cpp', + ], + },], + ], + 'direct_dependent_settings': { + 'include_dirs': [ + 'config', + '../include/config', + '../include/core', + 'ext', + ], + }, + 'dependencies': [ + 'skia_opts' + ], + }, + + # Due to an unfortunate intersection of lameness between gcc and gyp, + # we have to build the *_SSE2.cpp files in a separate target. The + # gcc lameness is that, in order to compile SSE2 intrinsics code, it + # must be passed the -msse2 flag. However, with this flag, it may + # emit SSE2 instructions even for scalar code, such as the CPUID + # test used to test for the presence of SSE2. So that, and all other + # code must be compiled *without* -msse2. The gyp lameness is that it + # does not allow file-specific CFLAGS, so we must create this extra + # target for those files to be compiled with -msse2. + # + # This is actually only a problem on 32-bit Linux (all Intel Macs have + # SSE2, Linux x86_64 has SSE2 by definition, and MSC will happily emit + # SSE2 from instrinsics, while generating plain ol' 386 for everything + # else). However, to keep the .gyp file simple and avoid platform-specific + # build breakage, we do this on all platforms. + + # For about the same reason, we need to compile the ARM opts files + # separately as well. + { + 'target_name': 'skia_opts', + 'type': 'static_library', + 'include_dirs': [ + '../include/config', + '../include/core', + '../src/core', + ], + 'conditions': [ + [ '(OS == "linux" or OS == "freebsd" or OS == "openbsd")', { + 'cflags': [ + '-msse2', + ], + }], + ], + 'sources': [ + '../src/opts/SkBitmapProcState_opts_SSE2.cpp', + '../src/opts/SkBlitRow_opts_SSE2.cpp', + '../src/opts/SkUtils_opts_SSE2.cpp', + ], + }, + { + 'target_name': 'effects', + 'type': 'static_library', + 'include_dirs': [ + '../include/config', + '../include/core', + '../include/effects', + ], + 'sources': [ + '../include/effects/Sk1DPathEffect.h', + '../include/effects/Sk2DPathEffect.h', + '../include/effects/SkAvoidXfermode.h', + '../include/effects/SkBlurDrawLooper.h', + '../include/effects/SkBlurMaskFilter.h', + '../include/effects/SkColorMatrix.h', + '../include/effects/SkColorMatrixFilter.h', + '../include/effects/SkCornerPathEffect.h', + '../include/effects/SkDashPathEffect.h', + '../include/effects/SkDiscretePathEffect.h', + '../include/effects/SkDrawExtraPathEffect.h', + '../include/effects/SkEmbossMaskFilter.h', + '../include/effects/SkGradientShader.h', + '../include/effects/SkGroupShape.h', + '../include/effects/SkKernel33MaskFilter.h', + '../include/effects/SkLayerDrawLooper.h', + '../include/effects/SkLayerRasterizer.h', + '../include/effects/SkPaintFlagsDrawFilter.h', + '../include/effects/SkPixelXorXfermode.h', + '../include/effects/SkPorterDuff.h', + '../include/effects/SkRectShape.h', + '../include/effects/SkTableMaskFilter.h', + '../include/effects/SkTransparentShader.h', + + '../src/effects/Sk1DPathEffect.cpp', + '../src/effects/Sk2DPathEffect.cpp', + '../src/effects/SkAvoidXfermode.cpp', + '../src/effects/SkBitmapCache.cpp', + '../src/effects/SkBitmapCache.h', + '../src/effects/SkBlurDrawLooper.cpp', + '../src/effects/SkBlurMask.cpp', + '../src/effects/SkBlurMask.h', + '../src/effects/SkBlurMaskFilter.cpp', + '../src/effects/SkColorFilters.cpp', + '../src/effects/SkColorMatrixFilter.cpp', + '../src/effects/SkCornerPathEffect.cpp', + '../src/effects/SkDashPathEffect.cpp', + '../src/effects/SkDiscretePathEffect.cpp', + '../src/effects/SkEmbossMask.cpp', + '../src/effects/SkEmbossMask.h', + '../src/effects/SkEmbossMask_Table.h', + '../src/effects/SkEmbossMaskFilter.cpp', + '../src/effects/SkGradientShader.cpp', + '../src/effects/SkGroupShape.cpp', + '../src/effects/SkKernel33MaskFilter.cpp', + '../src/effects/SkLayerDrawLooper.cpp', + '../src/effects/SkLayerRasterizer.cpp', + '../src/effects/SkPaintFlagsDrawFilter.cpp', + '../src/effects/SkPixelXorXfermode.cpp', + '../src/effects/SkPorterDuff.cpp', + '../src/effects/SkRadialGradient_Table.h', + '../src/effects/SkRectShape.cpp', + '../src/effects/SkTableMaskFilter.cpp', + '../src/effects/SkTransparentShader.cpp', + ], + 'direct_dependent_settings': { + 'include_dirs': [ + '../include/effects', + ], + }, + }, + { + 'target_name': 'images', + 'type': 'static_library', + 'include_dirs': [ + '../include/config', + '../include/core', + '../include/images', + ], + 'sources': [ + '../include/images/SkFlipPixelRef.h', + '../include/images/SkImageDecoder.h', + '../include/images/SkImageEncoder.h', + '../include/images/SkImageRef.h', + '../include/images/SkImageRef_GlobalPool.h', + '../include/images/SkJpegUtility.h', + '../include/images/SkMovie.h', + '../include/images/SkPageFlipper.h', + + '../src/images/bmpdecoderhelper.cpp', + '../src/images/bmpdecoderhelper.h', + '../src/images/SkBitmap_RLEPixels.h', + '../src/images/SkCreateRLEPixelRef.cpp', + '../src/images/SkFDStream.cpp', + '../src/images/SkFlipPixelRef.cpp', + '../src/images/SkImageDecoder.cpp', + '../src/images/SkImageDecoder_Factory.cpp', + '../src/images/SkImageDecoder_libbmp.cpp', + '../src/images/SkImageDecoder_libgif.cpp', + '../src/images/SkImageDecoder_libico.cpp', + '../src/images/SkImageDecoder_libjpeg.cpp', + '../src/images/SkImageDecoder_libpng.cpp', + '../src/images/SkImageDecoder_libpvjpeg.c', + '../src/images/SkImageDecoder_wbmp.cpp', + '../src/images/SkImageEncoder.cpp', + '../src/images/SkImageEncoder_Factory.cpp', + '../src/images/SkImageRef.cpp', + '../src/images/SkImageRefPool.cpp', + '../src/images/SkImageRefPool.h', + '../src/images/SkImageRef_GlobalPool.cpp', + '../src/images/SkJpegUtility.cpp', + '../src/images/SkMovie.cpp', + '../src/images/SkMovie_gif.cpp', + '../src/images/SkPageFlipper.cpp', + '../src/images/SkScaledBitmapSampler.cpp', + '../src/images/SkScaledBitmapSampler.h', + ], + 'conditions': [ + [ 'OS == "win"', { + 'sources!': [ + '../include/images/SkJpegUtility.h', + + '../src/images/SkFDStream.cpp', + '../src/images/SkImageDecoder_libjpeg.cpp', + '../src/images/SkImageDecoder_libpng.cpp', + '../src/images/SkImageDecoder_libpvjpeg.c', + '../src/images/SkJpegUtility.cpp', + '../src/images/SkMovie_gif.cpp', + ], + },], + [ 'OS == "mac"', { + 'sources!': [ + '../include/images/SkJpegUtility.h', + + '../src/images/SkImageDecoder_libgif.cpp', + '../src/images/SkImageDecoder_libjpeg.cpp', + '../src/images/SkImageDecoder_libpng.cpp', + '../src/images/SkImageDecoder_libpvjpeg.c', + '../src/images/SkJpegUtility.cpp', + '../src/images/SkMovie_gif.cpp', + ], + },], + [ 'OS == "linux" or OS == "freebsd" or OS == "openbsd" or OS == "solaris"', { + 'sources!': [ + '../include/images/SkJpegUtility.h', + + '../src/images/SkImageDecoder_libjpeg.cpp', + '../src/images/SkImageDecoder_libgif.cpp', + '../src/images/SkImageDecoder_libpvjpeg.c', + '../src/images/SkJpegUtility.cpp', + '../src/images/SkMovie_gif.cpp', + ], + }], + + ], + 'direct_dependent_settings': { + 'include_dirs': [ + '../include/images', + ], + }, + }, + { + 'target_name': 'xml', + 'type': 'static_library', + 'include_dirs': [ + '../include/config', + '../include/core', + '../include/xml', + '../include/utils', + ], + 'sources': [ + '../include/xml/SkBML_WXMLParser.h', + '../include/xml/SkBML_XMLParser.h', + '../include/xml/SkDOM.h', + '../include/xml/SkJS.h', + '../include/xml/SkXMLParser.h', + '../include/xml/SkXMLWriter.h', + + '../src/xml/SkBML_Verbs.h', + '../src/xml/SkBML_XMLParser.cpp', + '../src/xml/SkDOM.cpp', + '../src/xml/SkJS.cpp', + '../src/xml/SkJSDisplayable.cpp', + '../src/xml/SkXMLParser.cpp', + '../src/xml/SkXMLPullParser.cpp', + '../src/xml/SkXMLWriter.cpp', + ], + 'sources!': [ + '../src/xml/SkXMLPullParser.cpp', #if 0 around class decl in header + ], + 'conditions': [ + [ 'OS == "win" or OS == "mac" or OS == "linux" or OS == "openbsd" or OS == "solaris"', { + 'sources!': [ + # no jsapi.h by default on system + '../include/xml/SkJS.h', + '../src/xml/SkJS.cpp', + '../src/xml/SkJSDisplayable.cpp', + ], + },], + ], + 'direct_dependent_settings': { + 'include_dirs': [ + '../include/xml', + ], + }, + }, + { + 'target_name': 'utils', + 'type': 'static_library', + 'include_dirs': [ + '../include/config', + '../include/core', + '../include/utils', + '../include/views', + '../include/effects', + '../include/xml', + ], + 'sources': [ + '../include/utils/SkBoundaryPatch.h', + '../include/utils/SkCamera.h', + '../include/utils/SkCubicInterval.h', + '../include/utils/SkCullPoints.h', + '../include/utils/SkDumpCanvas.h', + '../include/utils/SkEGLContext.h', + '../include/utils/SkGLCanvas.h', + '../include/utils/SkInterpolator.h', + '../include/utils/SkLayer.h', + '../include/utils/SkMeshUtils.h', + '../include/utils/SkNinePatch.h', + '../include/utils/SkNWayCanvas.h', + '../include/utils/SkParse.h', + '../include/utils/SkParsePaint.h', + '../include/utils/SkParsePath.h', + '../include/utils/SkProxyCanvas.h', + '../include/utils/SkSfntUtils.h', + '../include/utils/SkTextBox.h', + '../include/utils/SkUnitMappers.h', + + '../src/utils/SkBoundaryPatch.cpp', + '../src/utils/SkCamera.cpp', + '../src/utils/SkColorMatrix.cpp', + '../src/utils/SkCubicInterval.cpp', + '../src/utils/SkCullPoints.cpp', + '../src/utils/SkDumpCanvas.cpp', + '../src/utils/SkEGLContext_none.cpp', + '../src/utils/SkInterpolator.cpp', + '../src/utils/SkLayer.cpp', + '../src/utils/SkMeshUtils.cpp', + '../src/utils/SkNinePatch.cpp', + '../src/utils/SkNWayCanvas.cpp', + '../src/utils/SkOSFile.cpp', + '../src/utils/SkParse.cpp', + '../src/utils/SkParseColor.cpp', + '../src/utils/SkParsePath.cpp', + '../src/utils/SkProxyCanvas.cpp', + '../src/utils/SkSfntUtils.cpp', + '../src/utils/SkUnitMappers.cpp', + ], + 'conditions': [ + [ 'OS == "mac"', { + 'sources': [ + '../include/utils/SkCGUtils.h', + '../src/utils/mac/SkCreateCGImageRef.cpp', + '../src/utils/mac/SkEGLContext_mac.cpp', + ], + },], + ], + 'direct_dependent_settings': { + 'include_dirs': [ + '../include/utils', + ], + }, + }, + { + 'target_name': 'views', + 'type': 'static_library', + 'include_dirs': [ + '../include/config', + '../include/core', + '../include/views', + '../include/xml', + '../include/utils', + '../include/images', + '../include/animator', + '../include/effects', + ], + 'sources': [ + '../include/views/SkApplication.h', + '../include/views/SkBGViewArtist.h', + '../include/views/SkBorderView.h', + '../include/views/SkEvent.h', + '../include/views/SkEventSink.h', + '../include/views/SkImageView.h', + '../include/views/SkKey.h', + '../include/views/SkMetaData.h', + '../include/views/SkOSMenu.h', + '../include/views/SkOSWindow_Mac.h', + '../include/views/SkOSWindow_SDL.h', + '../include/views/SkOSWindow_Unix.h', + '../include/views/SkOSWindow_Win.h', + #'../include/views/SkOSWindow_wxwidgets.h', + '../include/views/SkProgressBarView.h', + '../include/views/SkScrollBarView.h', + '../include/views/SkStackViewLayout.h', + '../include/views/SkSystemEventTypes.h', + '../include/views/SkTouchGesture.h', + '../include/views/SkView.h', + '../include/views/SkViewInflate.h', + '../include/views/SkWidget.h', + '../include/views/SkWidgetViews.h', + '../include/views/SkWindow.h', + + '../src/views/SkBGViewArtist.cpp', + '../src/views/SkBorderView.cpp', + '../src/views/SkEvent.cpp', + '../src/views/SkEventSink.cpp', + '../src/views/SkImageView.cpp', + '../src/views/SkListView.cpp', + '../src/views/SkListWidget.cpp', + '../src/views/SkMetaData.cpp', + '../src/views/SkOSMenu.cpp', + '../src/views/SkParsePaint.cpp', + '../src/views/SkProgressBarView.cpp', + '../src/views/SkProgressView.cpp', + '../src/views/SkScrollBarView.cpp', + '../src/views/SkStackViewLayout.cpp', + '../src/views/SkStaticTextView.cpp', + '../src/views/SkTagList.cpp', + '../src/views/SkTagList.h', + '../src/views/SkTextBox.cpp', + '../src/views/SkTouchGesture.cpp', + '../src/views/SkView.cpp', + '../src/views/SkViewInflate.cpp', + '../src/views/SkViewPriv.cpp', + '../src/views/SkViewPriv.h', + '../src/views/SkWidget.cpp', + '../src/views/SkWidgets.cpp', + '../src/views/SkWidgetViews.cpp', + '../src/views/SkWindow.cpp', + ], + 'sources!' : [ + '../src/views/SkListView.cpp', #depends on missing SkListSource implementation + '../src/views/SkListWidget.cpp', #depends on missing SkListSource implementation + ], + 'conditions': [ + [ 'OS == "win"', { + 'sources': [ + '../src/utils/win/SkOSWindow_Win.cpp', + '../vs/SampleApp/skia_win.cpp', + ], + },], + [ 'OS == "mac"', { + 'sources': [ + '../include/utils/SkCGUtils.h', + #'../src/utils/mac/SkBitmap_Mac.cpp', + '../src/utils/mac/SkCreateCGImageRef.cpp', + '../src/utils/mac/SkEGLContext_mac.cpp', + '../src/utils/mac/skia_mac.cpp', + '../src/utils/mac/SkOSWindow_Mac.cpp', + ], + 'link_settings': { + 'libraries': [ + '$(SDKROOT)/System/Library/Frameworks/Carbon.framework', + '$(SDKROOT)/System/Library/Frameworks/AGL.framework', + ], + }, + },], + [ 'OS == "linux" or OS == "freebsd" or OS == "openbsd" or OS == "solaris"', { + 'include_dirs' : [ + '../include/utils/unix', + ], + 'sources': [ + '../src/utils/unix/keysym2ucs.c', + '../src/utils/unix/SkOSWindow_Unix.cpp', + '../unix_test_app/main.cpp', + ], + }], + ], + 'direct_dependent_settings': { + 'include_dirs': [ + '../include/views', + ], + }, + }, + { + 'target_name': 'skgr', + 'type': 'static_library', + 'include_dirs': [ + '../include/config', + '../include/core', + '../src/core', + '../include/gpu', + '../gpu/include', + ], + 'sources': [ + '../include/gpu/SkGpuCanvas.h', + '../include/gpu/SkGpuDevice.h', + '../include/gpu/SkGpuDeviceFactory.h', + '../include/gpu/SkGr.h', + '../include/gpu/SkGrTexturePixelRef.h', + + '../src/gpu/GrPrintf_skia.cpp', + '../src/gpu/SkGpuCanvas.cpp', + '../src/gpu/SkGpuDevice.cpp', + '../src/gpu/SkGr.cpp', + '../src/gpu/SkGrFontScaler.cpp', + '../src/gpu/SkGrTexturePixelRef.cpp', + ], + 'conditions': [ + [ 'OS == "linux"', { + 'defines': [ + 'GR_LINUX_BUILD=1', + ], + }], + [ 'OS == "mac"', { + 'defines': [ + 'GR_MAC_BUILD=1', + ], + }], + [ 'OS == "win"', { + 'defines': [ + 'GR_WIN32_BUILD=1', + ], + },], + ], + 'direct_dependent_settings': { + 'conditions': [ + [ 'OS == "linux"', { + 'defines': [ + 'GR_LINUX_BUILD=1', + ], + }], + [ 'OS == "mac"', { + 'defines': [ + 'GR_MAC_BUILD=1', + ], + }], + [ 'OS == "win"', { + 'defines': [ + 'GR_WIN32_BUILD=1', + ], + },], + ], + 'include_dirs': [ + '../include/gpu', + ], + }, + }, + { + 'target_name': 'gr', + 'type': 'static_library', + 'include_dirs': [ + '../gpu/include', + ], + 'sources': [ + '../gpu/include/GrAllocator.h', + '../gpu/include/GrAllocPool.h', + '../gpu/include/GrAtlas.h', + '../gpu/include/GrClip.h', + '../gpu/include/GrClipIterator.h', + '../gpu/include/GrColor.h', + '../gpu/include/GrConfig.h', + '../gpu/include/GrContext.h', + '../gpu/include/GrContext_impl.h', + '../gpu/include/GrDrawTarget.h', + '../gpu/include/GrFontScaler.h', + '../gpu/include/GrGeometryBuffer.h', + '../gpu/include/GrGLConfig.h', + '../gpu/include/GrGLConfig_chrome.h', + '../gpu/include/GrGLIndexBuffer.h', + '../gpu/include/GrGLInterface.h', + '../gpu/include/GrGLIRect.h', + '../gpu/include/GrGLPlatformIncludes.h', + '../gpu/include/GrGLTexture.h', + '../gpu/include/GrGLVertexBuffer.h', + '../gpu/include/GrGlyph.h', + '../gpu/include/GrGpu.h', + '../gpu/include/GrGpuVertex.h', + '../gpu/include/GrIndexBuffer.h', + '../gpu/include/GrInOrderDrawBuffer.h', + '../gpu/include/GrInstanceCounter.h', + '../gpu/include/GrIPoint.h', + '../gpu/include/GrKey.h', + '../gpu/include/GrMatrix.h', + '../gpu/include/GrMemory.h', + '../gpu/include/GrMesh.h', + '../gpu/include/GrNoncopyable.h', + '../gpu/include/GrPaint.h', + '../gpu/include/GrPath.h', + '../gpu/include/GrPathIter.h', + '../gpu/include/GrPathSink.h', + '../gpu/include/GrPlotMgr.h', + '../gpu/include/GrPoint.h', + '../gpu/include/GrRandom.h', + '../gpu/include/GrRect.h', + '../gpu/include/GrRectanizer.h', + '../gpu/include/GrRefCnt.h', + '../gpu/include/GrSamplerState.h', + '../gpu/include/GrScalar.h', + '../gpu/include/GrStencil.h', + '../gpu/include/GrStopwatch.h', + '../gpu/include/GrStringBuilder.h', + '../gpu/include/GrTArray.h', + '../gpu/include/GrTBSearch.h', + '../gpu/include/GrTDArray.h', + '../gpu/include/GrTextContext.h', + '../gpu/include/GrTextStrike.h', + '../gpu/include/GrTexture.h', + '../gpu/include/GrTextureCache.h', + '../gpu/include/GrTHashCache.h', + '../gpu/include/GrTLList.h', + '../gpu/include/GrTouchGesture.h', + '../gpu/include/GrTypes.h', + '../gpu/include/GrUserConfig.h', + '../gpu/include/GrVertexBuffer.h', + + '../gpu/src/GrAllocPool.cpp', + '../gpu/src/GrAtlas.cpp', + '../gpu/src/GrBufferAllocPool.cpp', + '../gpu/src/GrBufferAllocPool.h', + '../gpu/src/GrClip.cpp', + '../gpu/src/GrContext.cpp', + '../gpu/src/GrDrawTarget.cpp', + '../gpu/src/GrGLIndexBuffer.cpp', + '../gpu/src/GrGLInterface.cpp', + '../gpu/src/GrGLTexture.cpp', + '../gpu/src/GrGLUtil.cpp', + '../gpu/src/GrGLVertexBuffer.cpp', + '../gpu/src/GrGpu.cpp', + '../gpu/src/GrGpuFactory.cpp', + '../gpu/src/GrGpuGL.cpp', + '../gpu/src/GrGpuGL.h', + '../gpu/src/GrGpuGLFixed.cpp', + '../gpu/src/GrGpuGLFixed.h', + '../gpu/src/GrGpuGLShaders2.cpp', + '../gpu/src/GrGpuGLShaders2.h', + '../gpu/src/GrInOrderDrawBuffer.cpp', + '../gpu/src/GrMatrix.cpp', + '../gpu/src/GrMemory.cpp', + '../gpu/src/GrPath.cpp', + '../gpu/src/GrPathRenderer.cpp', + '../gpu/src/GrPathRenderer.h', + '../gpu/src/GrPrintf_printf.cpp', + '../gpu/src/GrRectanizer.cpp', + '../gpu/src/GrRedBlackTree.h', + '../gpu/src/GrStencil.cpp', + '../gpu/src/GrTextContext.cpp', + '../gpu/src/GrTextStrike.cpp', + '../gpu/src/GrTextStrike_impl.h', + '../gpu/src/GrTextureCache.cpp', + '../gpu/src/gr_unittests.cpp', + ], + 'conditions': [ + [ 'OS == "linux"', { + 'defines': [ + 'GR_LINUX_BUILD=1', + ], + 'link_settings': { + 'libraries': [ + '-lGL', + '-lX11', + ], + }, + }], + [ 'OS == "mac"', { + 'defines': [ + 'GR_MAC_BUILD=1', + ], + 'link_settings': { + 'libraries': [ + '$(SDKROOT)/System/Library/Frameworks/OpenGL.framework', + ], + }, + }], + [ 'OS == "win"', { + 'defines': [ + 'GR_WIN32_BUILD=1', + ], + },], + ], + 'direct_dependent_settings': { + 'conditions': [ + [ 'OS == "linux"', { + 'defines': [ + 'GR_LINUX_BUILD=1', + ], + }], + [ 'OS == "mac"', { + 'defines': [ + 'GR_MAC_BUILD=1', + ], + }], + [ 'OS == "win"', { + 'defines': [ + 'GR_WIN32_BUILD=1', + ], + },], + ], + 'include_dirs': [ + '../gpu/include', + ], + }, + }, + { + 'target_name': 'animator', + 'type': 'static_library', + 'include_dirs': [ + '../include/config', + '../include/core', + '../include/effects', + '../include/animator', + '../include/views', + '../include/xml', + '../include/utils', + '../include/images', + ], + 'sources': [ + '../include/animator/SkAnimator.h', + '../include/animator/SkAnimatorView.h', + + '../src/animator/SkAnimate.h', + '../src/animator/SkAnimateActive.cpp', + '../src/animator/SkAnimateActive.h', + '../src/animator/SkAnimateBase.cpp', + '../src/animator/SkAnimateBase.h', + '../src/animator/SkAnimateField.cpp', + '../src/animator/SkAnimateMaker.cpp', + '../src/animator/SkAnimateMaker.h', + '../src/animator/SkAnimateProperties.h', + '../src/animator/SkAnimateSet.cpp', + '../src/animator/SkAnimateSet.h', + '../src/animator/SkAnimator.cpp', + '../src/animator/SkAnimatorScript.cpp', + '../src/animator/SkAnimatorScript.h', + #'../src/animator/SkAnimatorScript2.cpp', fails on windows + #'../src/animator/SkAnimatorScript2.h', + '../src/animator/SkBase64.cpp', + '../src/animator/SkBase64.h', + '../src/animator/SkBoundable.cpp', + '../src/animator/SkBoundable.h', + '../src/animator/SkBuildCondensedInfo.cpp', + #'../src/animator/SkCondensedDebug.cpp', fails on windows + '../src/animator/SkCondensedRelease.cpp', + '../src/animator/SkDisplayable.cpp', + '../src/animator/SkDisplayable.h', + '../src/animator/SkDisplayAdd.cpp', + '../src/animator/SkDisplayAdd.h', + '../src/animator/SkDisplayApply.cpp', + '../src/animator/SkDisplayApply.h', + '../src/animator/SkDisplayBounds.cpp', + '../src/animator/SkDisplayBounds.h', + '../src/animator/SkDisplayEvent.cpp', + '../src/animator/SkDisplayEvent.h', + '../src/animator/SkDisplayEvents.cpp', + '../src/animator/SkDisplayEvents.h', + '../src/animator/SkDisplayInclude.cpp', + '../src/animator/SkDisplayInclude.h', + '../src/animator/SkDisplayInput.cpp', + '../src/animator/SkDisplayInput.h', + '../src/animator/SkDisplayList.cpp', + '../src/animator/SkDisplayList.h', + '../src/animator/SkDisplayMath.cpp', + '../src/animator/SkDisplayMath.h', + '../src/animator/SkDisplayMovie.cpp', + '../src/animator/SkDisplayMovie.h', + '../src/animator/SkDisplayNumber.cpp', + '../src/animator/SkDisplayNumber.h', + '../src/animator/SkDisplayPost.cpp', + '../src/animator/SkDisplayPost.h', + '../src/animator/SkDisplayRandom.cpp', + '../src/animator/SkDisplayRandom.h', + '../src/animator/SkDisplayScreenplay.cpp', + '../src/animator/SkDisplayScreenplay.h', + '../src/animator/SkDisplayType.cpp', + '../src/animator/SkDisplayType.h', + '../src/animator/SkDisplayTypes.cpp', + '../src/animator/SkDisplayTypes.h', + '../src/animator/SkDisplayXMLParser.cpp', + '../src/animator/SkDisplayXMLParser.h', + '../src/animator/SkDraw3D.cpp', + '../src/animator/SkDraw3D.h', + '../src/animator/SkDrawable.cpp', + '../src/animator/SkDrawable.h', + '../src/animator/SkDrawBitmap.cpp', + '../src/animator/SkDrawBitmap.h', + '../src/animator/SkDrawBlur.cpp', + '../src/animator/SkDrawBlur.h', + '../src/animator/SkDrawClip.cpp', + '../src/animator/SkDrawClip.h', + '../src/animator/SkDrawColor.cpp', + '../src/animator/SkDrawColor.h', + '../src/animator/SkDrawDash.cpp', + '../src/animator/SkDrawDash.h', + '../src/animator/SkDrawDiscrete.cpp', + '../src/animator/SkDrawDiscrete.h', + '../src/animator/SkDrawEmboss.cpp', + '../src/animator/SkDrawEmboss.h', + '../src/animator/SkDrawExtraPathEffect.cpp', + '../src/animator/SkDrawFull.cpp', + '../src/animator/SkDrawFull.h', + '../src/animator/SkDrawGradient.cpp', + '../src/animator/SkDrawGradient.h', + '../src/animator/SkDrawGroup.cpp', + '../src/animator/SkDrawGroup.h', + '../src/animator/SkDrawLine.cpp', + '../src/animator/SkDrawLine.h', + '../src/animator/SkDrawMatrix.cpp', + '../src/animator/SkDrawMatrix.h', + '../src/animator/SkDrawOval.cpp', + '../src/animator/SkDrawOval.h', + '../src/animator/SkDrawPaint.cpp', + '../src/animator/SkDrawPaint.h', + '../src/animator/SkDrawPath.cpp', + '../src/animator/SkDrawPath.h', + '../src/animator/SkDrawPoint.cpp', + '../src/animator/SkDrawPoint.h', + '../src/animator/SkDrawRectangle.cpp', + '../src/animator/SkDrawRectangle.h', + '../src/animator/SkDrawSaveLayer.cpp', + '../src/animator/SkDrawSaveLayer.h', + '../src/animator/SkDrawShader.cpp', + '../src/animator/SkDrawShader.h', + '../src/animator/SkDrawText.cpp', + '../src/animator/SkDrawText.h', + '../src/animator/SkDrawTextBox.cpp', + '../src/animator/SkDrawTextBox.h', + '../src/animator/SkDrawTo.cpp', + '../src/animator/SkDrawTo.h', + '../src/animator/SkDrawTransparentShader.cpp', + '../src/animator/SkDrawTransparentShader.h', + '../src/animator/SkDump.cpp', + '../src/animator/SkDump.h', + '../src/animator/SkExtras.h', + '../src/animator/SkGetCondensedInfo.cpp', + '../src/animator/SkHitClear.cpp', + '../src/animator/SkHitClear.h', + '../src/animator/SkHitTest.cpp', + '../src/animator/SkHitTest.h', + '../src/animator/SkIntArray.h', + '../src/animator/SkMatrixParts.cpp', + '../src/animator/SkMatrixParts.h', + '../src/animator/SkMemberInfo.cpp', + '../src/animator/SkMemberInfo.h', + '../src/animator/SkOpArray.cpp', + '../src/animator/SkOpArray.h', + '../src/animator/SkOperand.h', + '../src/animator/SkOperand2.h', + '../src/animator/SkOperandInterpolator.h', + '../src/animator/SkOperandIterpolator.cpp', + '../src/animator/SkPaintParts.cpp', + '../src/animator/SkPaintParts.h', + '../src/animator/SkParseSVGPath.cpp', + '../src/animator/SkPathParts.cpp', + '../src/animator/SkPathParts.h', + '../src/animator/SkPostParts.cpp', + '../src/animator/SkPostParts.h', + '../src/animator/SkScript.cpp', + '../src/animator/SkScript.h', + '../src/animator/SkScript2.h', + '../src/animator/SkScriptCallBack.h', + '../src/animator/SkScriptDecompile.cpp', + '../src/animator/SkScriptRuntime.cpp', + '../src/animator/SkScriptRuntime.h', + '../src/animator/SkScriptTokenizer.cpp', + '../src/animator/SkSnapshot.cpp', + '../src/animator/SkSnapshot.h', + '../src/animator/SkTDArray_Experimental.h', + '../src/animator/SkTextOnPath.cpp', + '../src/animator/SkTextOnPath.h', + '../src/animator/SkTextToPath.cpp', + '../src/animator/SkTextToPath.h', + '../src/animator/SkTime.cpp', + '../src/animator/SkTypedArray.cpp', + '../src/animator/SkTypedArray.h', + '../src/animator/SkXMLAnimatorWriter.cpp', + '../src/animator/SkXMLAnimatorWriter.h', + ], + 'direct_dependent_settings': { + 'include_dirs': [ + '../include/animator', + ], + }, + }, + + { + 'target_name': 'svg', + 'type': 'static_library', + 'include_dirs': [ + '../include/config', + '../include/core', + '../include/xml', + '../include/utils', + '../include/svg', + ], + 'sources': [ + '../include/svg/SkSVGAttribute.h', + '../include/svg/SkSVGBase.h', + '../include/svg/SkSVGPaintState.h', + '../include/svg/SkSVGParser.h', + '../include/svg/SkSVGTypes.h', + + '../src/svg/SkSVGCircle.cpp', + '../src/svg/SkSVGCircle.h', + '../src/svg/SkSVGClipPath.cpp', + '../src/svg/SkSVGClipPath.h', + '../src/svg/SkSVGDefs.cpp', + '../src/svg/SkSVGDefs.h', + '../src/svg/SkSVGElements.cpp', + '../src/svg/SkSVGElements.h', + '../src/svg/SkSVGEllipse.cpp', + '../src/svg/SkSVGEllipse.h', + '../src/svg/SkSVGFeColorMatrix.cpp', + '../src/svg/SkSVGFeColorMatrix.h', + '../src/svg/SkSVGFilter.cpp', + '../src/svg/SkSVGFilter.h', + '../src/svg/SkSVGG.cpp', + '../src/svg/SkSVGG.h', + '../src/svg/SkSVGGradient.cpp', + '../src/svg/SkSVGGradient.h', + '../src/svg/SkSVGGroup.cpp', + '../src/svg/SkSVGGroup.h', + '../src/svg/SkSVGImage.cpp', + '../src/svg/SkSVGImage.h', + '../src/svg/SkSVGLine.cpp', + '../src/svg/SkSVGLine.h', + '../src/svg/SkSVGLinearGradient.cpp', + '../src/svg/SkSVGLinearGradient.h', + '../src/svg/SkSVGMask.cpp', + '../src/svg/SkSVGMask.h', + '../src/svg/SkSVGMetadata.cpp', + '../src/svg/SkSVGMetadata.h', + '../src/svg/SkSVGPaintState.cpp', + '../src/svg/SkSVGParser.cpp', + '../src/svg/SkSVGPath.cpp', + '../src/svg/SkSVGPath.h', + '../src/svg/SkSVGPolygon.cpp', + '../src/svg/SkSVGPolygon.h', + '../src/svg/SkSVGPolyline.cpp', + '../src/svg/SkSVGPolyline.h', + '../src/svg/SkSVGRadialGradient.cpp', + '../src/svg/SkSVGRadialGradient.h', + '../src/svg/SkSVGRect.cpp', + '../src/svg/SkSVGRect.h', + '../src/svg/SkSVGStop.cpp', + '../src/svg/SkSVGStop.h', + '../src/svg/SkSVGSVG.cpp', + '../src/svg/SkSVGSVG.h', + '../src/svg/SkSVGSymbol.cpp', + '../src/svg/SkSVGSymbol.h', + '../src/svg/SkSVGText.cpp', + '../src/svg/SkSVGText.h', + '../src/svg/SkSVGUse.cpp', + ], + 'sources!' : [ + '../src/svg/SkSVG.cpp', # doesn't compile, maybe this is test code? + ], + 'direct_dependent_settings': { + 'include_dirs': [ + '../include/svg', + ], + }, + }, + + { + 'target_name': 'experimental', + 'type': 'static_library', + 'include_dirs': [ + '../include/config', + '../include/core', + ], + 'sources': [ + '../experimental/SkMatrix44.cpp', + '../experimental/SkMatrix44.h', + '../experimental/SkSetPoly3To3.cpp', + '../experimental/SkSetPoly3To3_A.cpp', + '../experimental/SkSetPoly3To3_D.cpp', + ], + 'sources!': [ + '../experimental/SkMatrix44.cpp', #doesn't compile + '../experimental/SkMatrix44.h', + ], + 'direct_dependent_settings': { + 'include_dirs': [ + '../experimental', + ], + }, + }, + + { + 'target_name': 'SampleApp', + 'type': 'executable', + 'mac_bundle' : 1, + 'include_dirs' : [ + '../src/core', # needed to get SkConcaveToTriangle, maybe this should be moved to include dir? + '../gm', # SampleGM.cpp pulls gm.h + ], + 'sources': [ + # gm files needed for SampleGM.cpp + '../gm/bitmapfilters.cpp', + '../gm/blurs.cpp', + '../gm/complexclip.cpp', + '../gm/filltypes.cpp', + '../gm/gm.h', + '../gm/gradients.cpp', + '../gm/points.cpp', + '../gm/poly2poly.cpp', + '../gm/shadertext.cpp', + '../gm/shadows.cpp', + '../gm/shapes.cpp', + '../gm/tilemodes.cpp', + '../gm/xfermodes.cpp', + + '../samplecode/ClockFaceView.cpp', + '../samplecode/OverView.cpp', + '../samplecode/SampleAll.cpp', + '../samplecode/SampleAnimator.cpp', + '../samplecode/SampleApp.cpp', + '../samplecode/SampleArc.cpp', + '../samplecode/SampleAvoid.cpp', + '../samplecode/SampleBigGradient.cpp', + '../samplecode/SampleBitmapRect.cpp', + '../samplecode/SampleBlur.cpp', + '../samplecode/SampleCamera.cpp', + '../samplecode/SampleCircle.cpp', + '../samplecode/SampleCode.h', + '../samplecode/SampleComplexClip.cpp', + '../samplecode/SampleCull.cpp', + '../samplecode/SampleDecode.cpp', + '../samplecode/SampleDither.cpp', + '../samplecode/SampleDitherBitmap.cpp', + '../samplecode/SampleDrawLooper.cpp', + '../samplecode/SampleEffects.cpp', + '../samplecode/SampleEmboss.cpp', + '../samplecode/SampleEncode.cpp', + '../samplecode/SampleExtractAlpha.cpp', + '../samplecode/SampleFillType.cpp', + '../samplecode/SampleFilter.cpp', + '../samplecode/SampleFilter2.cpp', + '../samplecode/SampleFontCache.cpp', + '../samplecode/SampleFontScalerTest.cpp', + '../samplecode/SampleFuzz.cpp', + '../samplecode/SampleGM.cpp', + '../samplecode/SampleGradients.cpp', + '../samplecode/SampleHairline.cpp', + '../samplecode/SampleImage.cpp', + '../samplecode/SampleImageDir.cpp', + '../samplecode/SampleLayerMask.cpp', + '../samplecode/SampleLayers.cpp', + '../samplecode/SampleLCD.cpp', + '../samplecode/SampleLineClipper.cpp', + '../samplecode/SampleLines.cpp', + '../samplecode/SampleMeasure.cpp', + '../samplecode/SampleMipMap.cpp', + '../samplecode/SampleMovie.cpp', + '../samplecode/SampleNinePatch.cpp', + '../samplecode/SampleOvalTest.cpp', + '../samplecode/SampleOverflow.cpp', + '../samplecode/SamplePageFlip.cpp', + '../samplecode/SamplePatch.cpp', + '../samplecode/SamplePath.cpp', + '../samplecode/SamplePathClip.cpp', + '../samplecode/SamplePathEffects.cpp', + '../samplecode/SamplePicture.cpp', + '../samplecode/SamplePoints.cpp', + '../samplecode/SamplePolyToPoly.cpp', + '../samplecode/SampleRegion.cpp', + '../samplecode/SampleRepeatTile.cpp', + '../samplecode/SampleShaders.cpp', + '../samplecode/SampleShaderText.cpp', + '../samplecode/SampleShapes.cpp', + '../samplecode/SampleSkLayer.cpp', + '../samplecode/SampleSlides.cpp', + '../samplecode/SampleStrokePath.cpp', + '../samplecode/SampleStrokeText.cpp', + '../samplecode/SampleSVG.cpp', + '../samplecode/SampleTests.cpp', + '../samplecode/SampleText.cpp', + '../samplecode/SampleTextAlpha.cpp', + '../samplecode/SampleTextBox.cpp', + '../samplecode/SampleTextEffects.cpp', + '../samplecode/SampleTextOnPath.cpp', + '../samplecode/SampleTiling.cpp', + '../samplecode/SampleTinyBitmap.cpp', + '../samplecode/SampleTriangles.cpp', + '../samplecode/SampleTypeface.cpp', + '../samplecode/SampleUnitMapper.cpp', + '../samplecode/SampleVertices.cpp', + '../samplecode/SampleXfermodes.cpp', + ], + 'sources!': [ + '../samplecode/SampleSkLayer.cpp', #relies on SkMatrix44 which doesn't compile + '../samplecode/SampleTests.cpp', #includes unknown file SkShaderExtras.h + '../samplecode/SampleWarp.cpp', + '../samplecode/SampleFontCache.cpp', + ], + 'dependencies': [ + 'skia', + 'effects', + 'images', + 'views', + 'utils', + 'animator', + 'xml', + 'svg', + 'experimental', + 'gr', + 'skgr', + ], + 'conditions' : [ + [ 'OS == "linux" or OS == "freebsd" or OS == "openbsd" or OS == "solaris"', { + 'sources!': [ + '../samplecode/SampleDecode.cpp', + ], + }], + [ 'OS == "win"', { + 'sources!': [ + # require UNIX functions + '../samplecode/SampleEncode.cpp', + '../samplecode/SamplePageFlip.cpp', + ], + },], + [ 'OS == "mac"', { + 'sources!': [ + '../samplecode/SampleDecode.cpp', + ], + },], + + ], + 'msvs_settings': { + 'VCLinkerTool': { + 'SubSystem': '2', + 'AdditionalDependencies': [ + 'OpenGL32.lib', + 'glew32.lib', + 'usp10.lib', + 'd3d9.lib', + ], + }, + }, + }, + ], +} + +# Local Variables: +# tab-width:2 +# indent-tabs-mode:nil +# End: +# vim: set expandtab tabstop=2 shiftwidth=2: -- cgit v1.2.3 From f5b6054a6f61cd2a5e1e9826544a2bcbe8b7f50d Mon Sep 17 00:00:00 2001 From: "bsalomon@google.com" Date: Mon, 21 Mar 2011 19:51:57 +0000 Subject: Add GR_DLL builds to Ganesh (minimal exports for Chrome multi-dll for now). Review URL: http://codereview.appspot.com/4301044/ git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@970 2bbb7eff-a529-9590-31e7-b0007b416f81 --- skia.gyp | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/skia.gyp b/skia.gyp index e50122d..53ea83b 100644 --- a/skia.gyp +++ b/skia.gyp @@ -300,7 +300,7 @@ 'libraries': [ '-lfreetype', ], - }, + }, }], [ 'OS == "mac"', { 'include_dirs': [ @@ -932,6 +932,9 @@ '../gpu/src/GrTextureCache.cpp', '../gpu/src/gr_unittests.cpp', ], + 'defines': [ + 'GR_IMPLEMENTATION=1', + ], 'conditions': [ [ 'OS == "linux"', { 'defines': [ @@ -942,7 +945,7 @@ '-lGL', '-lX11', ], - }, + }, }], [ 'OS == "mac"', { 'defines': [ @@ -952,7 +955,7 @@ 'libraries': [ '$(SDKROOT)/System/Library/Frameworks/OpenGL.framework', ], - }, + }, }], [ 'OS == "win"', { 'defines': [ @@ -1015,7 +1018,7 @@ '../src/animator/SkAnimatorScript.cpp', '../src/animator/SkAnimatorScript.h', #'../src/animator/SkAnimatorScript2.cpp', fails on windows - #'../src/animator/SkAnimatorScript2.h', + #'../src/animator/SkAnimatorScript2.h', '../src/animator/SkBase64.cpp', '../src/animator/SkBase64.h', '../src/animator/SkBoundable.cpp', -- cgit v1.2.3 From 3e4b2ec2ac1fd9ad3c425652e8c10bcb94082962 Mon Sep 17 00:00:00 2001 From: "bsalomon@google.com" Date: Fri, 25 Mar 2011 12:31:16 +0000 Subject: Add way to determine at link time what path renderer will be used. Added mechanism for a custom path renderer to punt and fallback to default path renderer git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@1005 2bbb7eff-a529-9590-31e7-b0007b416f81 --- skia.gyp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/skia.gyp b/skia.gyp index 53ea83b..20b5fae 100644 --- a/skia.gyp +++ b/skia.gyp @@ -870,6 +870,7 @@ '../gpu/include/GrPaint.h', '../gpu/include/GrPath.h', '../gpu/include/GrPathIter.h', + '../gpu/include/GrPathRenderer.h', '../gpu/include/GrPathSink.h', '../gpu/include/GrPlotMgr.h', '../gpu/include/GrPoint.h', @@ -902,6 +903,7 @@ '../gpu/src/GrBufferAllocPool.h', '../gpu/src/GrClip.cpp', '../gpu/src/GrContext.cpp', + '../gpu/src/GrCreatePathRenderer_none.cpp', '../gpu/src/GrDrawTarget.cpp', '../gpu/src/GrGLIndexBuffer.cpp', '../gpu/src/GrGLInterface.cpp', @@ -921,7 +923,6 @@ '../gpu/src/GrMemory.cpp', '../gpu/src/GrPath.cpp', '../gpu/src/GrPathRenderer.cpp', - '../gpu/src/GrPathRenderer.h', '../gpu/src/GrPrintf_printf.cpp', '../gpu/src/GrRectanizer.cpp', '../gpu/src/GrRedBlackTree.h', -- cgit v1.2.3 From 25910718133c5cf9569ccd71e05de5d94bfab77d Mon Sep 17 00:00:00 2001 From: "senorblanco@chromium.org" Date: Fri, 25 Mar 2011 17:41:34 +0000 Subject: Add the GLU tesselator source files to third_party. Add a libtess static library build target to the .gyp file (not required by any executable yet). Fix some build errors with SampleApp on Linux and Win32. Add a gyp_skia python script which invokes gyp with the correct arguments, and is recursively callable by the Makefile when skia.gyp is changed. Review URL: http://codereview.appspot.com/4280069/ git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@1007 2bbb7eff-a529-9590-31e7-b0007b416f81 --- gyp_skia | 76 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ skia.gyp | 44 +++++++++++++++++++++++++++++++++++-- 2 files changed, 118 insertions(+), 2 deletions(-) create mode 100755 gyp_skia diff --git a/gyp_skia b/gyp_skia new file mode 100755 index 0000000..45d037d --- /dev/null +++ b/gyp_skia @@ -0,0 +1,76 @@ +#!/usr/bin/python +# +# Copyright (C) 2011 The Android Open Source Project +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +# This script is a wrapper which invokes gyp with the correct --depth argument, +# and supports the automatic regeneration of build files if skia.gyp is +# changed (Linux-only). + +import glob +import os +import shlex +import sys + +script_dir = os.path.dirname(__file__) + +# This assumes that your gyp checkout is placed in the same root directory +# as your skia checkout. +gyp_dir = os.path.normpath(os.path.join(script_dir, os.pardir, os.pardir)) + +sys.path.append(os.path.join(gyp_dir, 'gyp', 'pylib')) +import gyp + +def additional_include_files(args=[]): + # Determine the include files specified on the command line. + # This doesn't cover all the different option formats you can use, + # but it's mainly intended to avoid duplicating flags on the automatic + # makefile regeneration which only uses this format. + specified_includes = set() + for arg in args: + if arg.startswith('-I') and len(arg) > 2: + specified_includes.add(os.path.realpath(arg[2:])) + + result = [] + def AddInclude(path): + if os.path.realpath(path) not in specified_includes: + result.append(path) + + return result + +if __name__ == '__main__': + args = sys.argv[1:] + + # This could give false positives since it doesn't actually do real option + # parsing. Oh well. + gyp_file_specified = False + for arg in args: + if arg.endswith('.gyp'): + gyp_file_specified = True + break + + # If we didn't get a file, then fall back to assuming 'skia.gyp' from the + # same directory as the script. + if not gyp_file_specified: + args.append(os.path.join(script_dir, 'skia.gyp')) + + args.extend(['-I' + i for i in additional_include_files(args)]) + + args.extend(['--depth']) + args.extend([os.path.abspath(script_dir)]) + print 'Updating projects from gyp files...' + sys.stdout.flush() + + # Off we go... + sys.exit(gyp.main(args)) diff --git a/skia.gyp b/skia.gyp index 20b5fae..d4bb4d0 100644 --- a/skia.gyp +++ b/skia.gyp @@ -299,6 +299,7 @@ 'link_settings': { 'libraries': [ '-lfreetype', + '-lpthread', ], }, }], @@ -728,7 +729,7 @@ [ 'OS == "win"', { 'sources': [ '../src/utils/win/SkOSWindow_Win.cpp', - '../vs/SampleApp/skia_win.cpp', + '../src/utils/win/skia_win.cpp', ], },], [ 'OS == "mac"', { @@ -1417,13 +1418,52 @@ 'SubSystem': '2', 'AdditionalDependencies': [ 'OpenGL32.lib', - 'glew32.lib', 'usp10.lib', 'd3d9.lib', ], }, }, }, + { + 'target_name': 'libtess', + 'type': 'static_library', + 'include_dirs': [ + '../third_party/glu', + ], + 'sources': [ + '../third_party/glu/internal_glu.h', + '../third_party/glu/gluos.h', + '../third_party/glu/libtess/dict-list.h', + '../third_party/glu/libtess/dict.c', + '../third_party/glu/libtess/dict.h', + '../third_party/glu/libtess/geom.c', + '../third_party/glu/libtess/geom.h', + '../third_party/glu/libtess/memalloc.c', + '../third_party/glu/libtess/memalloc.h', + '../third_party/glu/libtess/mesh.c', + '../third_party/glu/libtess/mesh.h', + '../third_party/glu/libtess/normal.c', + '../third_party/glu/libtess/normal.h', + '../third_party/glu/libtess/priorityq-heap.c', + '../third_party/glu/libtess/priorityq-heap.h', + '../third_party/glu/libtess/priorityq-sort.h', + '../third_party/glu/libtess/priorityq.c', + '../third_party/glu/libtess/priorityq.h', + '../third_party/glu/libtess/render.c', + '../third_party/glu/libtess/render.h', + '../third_party/glu/libtess/sweep.c', + '../third_party/glu/libtess/sweep.h', + '../third_party/glu/libtess/tess.c', + '../third_party/glu/libtess/tess.h', + '../third_party/glu/libtess/tessmono.c', + '../third_party/glu/libtess/tessmono.h', + ], + 'direct_dependent_settings': { + 'include_dirs': [ + '../third_party/glu', + ], + }, + }, ], } -- cgit v1.2.3 From 4f77713cc9d57a03af57d785c81bb036cb321826 Mon Sep 17 00:00:00 2001 From: "senorblanco@chromium.org" Date: Mon, 28 Mar 2011 20:47:09 +0000 Subject: This CL implements a tesselated path renderer, using GLU's libtess. All of the fill modes except hairline are supported. Note that the path renderer is not enabled by default; to enable it, replace "GrCreatePathRenderer_none.cpp" with "GrCreatePathRenderer_tesselated.cpp" in skia.gyp, and run gyp_skia, and build. This change also contains a number of build fixes for Win32 (for building SampleApp on VS2008) and Mac (for my ancient Mac Pro which supports GL_EXT_framebuffer_object but not GL_ARB_framebuffer_object). Also, priorityq-heap.c was removed from the SampleApp build, since it's #included by priorityq.c (weird, I know). NB: When this change is rolled into chrome, some modifications to chromium's skia.gyp will be necessary. Review URL: http://codereview.appspot.com/4289072/ git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@1012 2bbb7eff-a529-9590-31e7-b0007b416f81 --- skia.gyp | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/skia.gyp b/skia.gyp index d4bb4d0..012c6a8 100644 --- a/skia.gyp +++ b/skia.gyp @@ -24,6 +24,7 @@ [ 'OS == "win"', { 'defines': [ 'SK_BUILD_FOR_WIN32', + 'SK_IGNORE_STDINT_DOT_H', ], },], ], @@ -835,6 +836,9 @@ 'include_dirs': [ '../gpu/include', ], + #'dependencies': [ + # 'libtess', + #], 'sources': [ '../gpu/include/GrAllocator.h', '../gpu/include/GrAllocPool.h', @@ -873,6 +877,7 @@ '../gpu/include/GrPathIter.h', '../gpu/include/GrPathRenderer.h', '../gpu/include/GrPathSink.h', + '../gpu/include/GrPathUtils.h', '../gpu/include/GrPlotMgr.h', '../gpu/include/GrPoint.h', '../gpu/include/GrRandom.h', @@ -887,6 +892,7 @@ '../gpu/include/GrTArray.h', '../gpu/include/GrTBSearch.h', '../gpu/include/GrTDArray.h', + #'../gpu/include/GrTesselatedPathRenderer.h', '../gpu/include/GrTextContext.h', '../gpu/include/GrTextStrike.h', '../gpu/include/GrTexture.h', @@ -924,10 +930,12 @@ '../gpu/src/GrMemory.cpp', '../gpu/src/GrPath.cpp', '../gpu/src/GrPathRenderer.cpp', + '../gpu/src/GrPathUtils.cpp', '../gpu/src/GrPrintf_printf.cpp', '../gpu/src/GrRectanizer.cpp', '../gpu/src/GrRedBlackTree.h', '../gpu/src/GrStencil.cpp', + #'../gpu/src/GrTesselatedPathRenderer.cpp', '../gpu/src/GrTextContext.cpp', '../gpu/src/GrTextStrike.cpp', '../gpu/src/GrTextStrike_impl.h', @@ -1444,7 +1452,6 @@ '../third_party/glu/libtess/mesh.h', '../third_party/glu/libtess/normal.c', '../third_party/glu/libtess/normal.h', - '../third_party/glu/libtess/priorityq-heap.c', '../third_party/glu/libtess/priorityq-heap.h', '../third_party/glu/libtess/priorityq-sort.h', '../third_party/glu/libtess/priorityq.c', -- cgit v1.2.3 From b403d0f76be87f152ce7829488d6e3b10f2e7c61 Mon Sep 17 00:00:00 2001 From: "reed@google.com" Date: Wed, 30 Mar 2011 17:10:42 +0000 Subject: move SkMetaData into core git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@1018 2bbb7eff-a529-9590-31e7-b0007b416f81 --- skia.gyp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/skia.gyp b/skia.gyp index 012c6a8..b46cd82 100644 --- a/skia.gyp +++ b/skia.gyp @@ -122,6 +122,7 @@ '../src/core/SkMaskFilter.cpp', '../src/core/SkMath.cpp', '../src/core/SkMatrix.cpp', + '../src/core/SkMetaData.cpp', '../src/core/SkPackBits.cpp', '../src/core/SkPaint.cpp', '../src/core/SkPath.cpp', @@ -227,6 +228,7 @@ '../include/core/SkMaskFilter.h', '../include/core/SkMath.h', '../include/core/SkMatrix.h', + '../include/core/SkMetaData.h', '../include/core/SkOSFile.h', '../include/core/SkPackBits.h', '../include/core/SkPaint.h', -- cgit v1.2.3 From 501a73dabf1f34266aa0e0632044bd4a46767a2b Mon Sep 17 00:00:00 2001 From: "bsalomon@google.com" Date: Wed, 30 Mar 2011 21:26:44 +0000 Subject: Add GrResource base class for ibs, texs, vbs, etc. Add lostContext() to GrContext. Review URL: http://codereview.appspot.com/4328044/ git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@1026 2bbb7eff-a529-9590-31e7-b0007b416f81 --- skia.gyp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/skia.gyp b/skia.gyp index b46cd82..a9c4600 100644 --- a/skia.gyp +++ b/skia.gyp @@ -886,6 +886,7 @@ '../gpu/include/GrRect.h', '../gpu/include/GrRectanizer.h', '../gpu/include/GrRefCnt.h', + '../gpu/include/GrResource.h', '../gpu/include/GrSamplerState.h', '../gpu/include/GrScalar.h', '../gpu/include/GrStencil.h', @@ -936,6 +937,7 @@ '../gpu/src/GrPrintf_printf.cpp', '../gpu/src/GrRectanizer.cpp', '../gpu/src/GrRedBlackTree.h', + '../gpu/src/GrResource.cpp', '../gpu/src/GrStencil.cpp', #'../gpu/src/GrTesselatedPathRenderer.cpp', '../gpu/src/GrTextContext.cpp', -- cgit v1.2.3 From a8e866149464107db4ed8fc6fc3dad68a4f9bb4d Mon Sep 17 00:00:00 2001 From: "bsalomon@google.com" Date: Wed, 30 Mar 2011 22:04:53 +0000 Subject: Add pdf to skia.gyp and checkin a snap of GYP. Review URL: http://codereview.appspot.com/4307050/ git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@1029 2bbb7eff-a529-9590-31e7-b0007b416f81 --- gyp_skia | 4 +--- skia.gyp | 43 +++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 42 insertions(+), 5 deletions(-) diff --git a/gyp_skia b/gyp_skia index 45d037d..909c266 100755 --- a/gyp_skia +++ b/gyp_skia @@ -25,9 +25,7 @@ import sys script_dir = os.path.dirname(__file__) -# This assumes that your gyp checkout is placed in the same root directory -# as your skia checkout. -gyp_dir = os.path.normpath(os.path.join(script_dir, os.pardir, os.pardir)) +gyp_dir = os.path.normpath(os.path.join(script_dir, os.pardir, 'third_party')) sys.path.append(os.path.join(gyp_dir, 'gyp', 'pylib')) import gyp diff --git a/skia.gyp b/skia.gyp index a9c4600..52d3977 100644 --- a/skia.gyp +++ b/skia.gyp @@ -590,6 +590,47 @@ ], }, }, + { + 'target_name': 'pdf', + 'type': 'static_library', + 'include_dirs': [ + '../include/config', + '../include/core', + '../include/pdf', + ], + 'sources': [ + '../include/pdf/SkPDFCatalog.h', + '../include/pdf/SkPDFDevice.h', + '../include/pdf/SkPDFDocument.h', + '../include/pdf/SkPDFFont.h', + '../include/pdf/SkPDFFormXObject.h', + '../include/pdf/SkPDFGraphicState.h', + '../include/pdf/SkPDFImage.h', + '../include/pdf/SkPDFPage.h', + '../include/pdf/SkPDFShader.h', + '../include/pdf/SkPDFStream.h', + '../include/pdf/SkPDFTypes.h', + '../include/pdf/SkPDFUtils.h', + + '../src/pdf/SkPDFCatalog.cpp', + '../src/pdf/SkPDFDevice.cpp', + '../src/pdf/SkPDFDocument.cpp', + '../src/pdf/SkPDFFont.cpp', + '../src/pdf/SkPDFFormXObject.cpp', + '../src/pdf/SkPDFGraphicState.cpp', + '../src/pdf/SkPDFImage.cpp', + '../src/pdf/SkPDFPage.cpp', + '../src/pdf/SkPDFShader.cpp', + '../src/pdf/SkPDFStream.cpp', + '../src/pdf/SkPDFTypes.cpp', + '../src/pdf/SkPDFUtils.cpp', + ], + 'direct_dependent_settings': { + 'include_dirs': [ + '../include/pdf', + ], + }, + }, { 'target_name': 'utils', 'type': 'static_library', @@ -678,7 +719,6 @@ '../include/views/SkEventSink.h', '../include/views/SkImageView.h', '../include/views/SkKey.h', - '../include/views/SkMetaData.h', '../include/views/SkOSMenu.h', '../include/views/SkOSWindow_Mac.h', '../include/views/SkOSWindow_SDL.h', @@ -703,7 +743,6 @@ '../src/views/SkImageView.cpp', '../src/views/SkListView.cpp', '../src/views/SkListWidget.cpp', - '../src/views/SkMetaData.cpp', '../src/views/SkOSMenu.cpp', '../src/views/SkParsePaint.cpp', '../src/views/SkProgressBarView.cpp', -- cgit v1.2.3 From c2fd1ca865494213bd4d2ebe951e2fd260447e52 Mon Sep 17 00:00:00 2001 From: "junov@google.com" Date: Thu, 31 Mar 2011 21:26:24 +0000 Subject: Refactoring the GrGpuGLShaders2 into 2 classes: GrGpuGLShaders and GrGLProgram. The change also contains stubs and placeholders for GrEffect (work in progress), which will extend shader and rendering capabilities in Ganesh. The hash keys for the program cache table have been modified to be able to accomodate variable-length keys, which will be required for GrEffect support. Code review: http://codereview.appspot.com/4309045/ git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@1031 2bbb7eff-a529-9590-31e7-b0007b416f81 --- skia.gyp | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/skia.gyp b/skia.gyp index 52d3977..9b712e9 100644 --- a/skia.gyp +++ b/skia.gyp @@ -948,14 +948,18 @@ '../gpu/src/GrAllocPool.cpp', '../gpu/src/GrAtlas.cpp', + '../gpu/src/GrBinHashKey.h', '../gpu/src/GrBufferAllocPool.cpp', '../gpu/src/GrBufferAllocPool.h', '../gpu/src/GrClip.cpp', '../gpu/src/GrContext.cpp', '../gpu/src/GrCreatePathRenderer_none.cpp', '../gpu/src/GrDrawTarget.cpp', + '../gpu/src/GrGLEffect.h', '../gpu/src/GrGLIndexBuffer.cpp', '../gpu/src/GrGLInterface.cpp', + '../gpu/src/GrGLProgram.cpp', + '../gpu/src/GrGLProgram.h', '../gpu/src/GrGLTexture.cpp', '../gpu/src/GrGLUtil.cpp', '../gpu/src/GrGLVertexBuffer.cpp', @@ -965,6 +969,8 @@ '../gpu/src/GrGpuGL.h', '../gpu/src/GrGpuGLFixed.cpp', '../gpu/src/GrGpuGLFixed.h', + '../gpu/src/GrGpuGLShaders.cpp', + '../gpu/src/GrGpuGLShaders.h', '../gpu/src/GrGpuGLShaders2.cpp', '../gpu/src/GrGpuGLShaders2.h', '../gpu/src/GrInOrderDrawBuffer.cpp', -- cgit v1.2.3 From e7c086095a4c58ed0f00ec73539f95281f8de202 Mon Sep 17 00:00:00 2001 From: "ctguil@chromium.org" Date: Thu, 31 Mar 2011 23:17:05 +0000 Subject: Add src/core include for pdf project. Review URL: http://codereview.appspot.com/4331053 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@1032 2bbb7eff-a529-9590-31e7-b0007b416f81 --- skia.gyp | 1 + 1 file changed, 1 insertion(+) diff --git a/skia.gyp b/skia.gyp index 9b712e9..850cb96 100644 --- a/skia.gyp +++ b/skia.gyp @@ -597,6 +597,7 @@ '../include/config', '../include/core', '../include/pdf', + '../src/core', # needed to get SkGlyphCache.h and SkTextFormatParams.h ], 'sources': [ '../include/pdf/SkPDFCatalog.h', -- cgit v1.2.3 From 07a445b02ffcfdf0fe3515c0c6c1d200518e894b Mon Sep 17 00:00:00 2001 From: "bsalomon@google.com" Date: Mon, 4 Apr 2011 17:13:52 +0000 Subject: Remove dependence on platform GL headers. Remove code that attempts to infer GL function pointers on various platforms. Instead add platform-specific implementations for Windows and Mac. (GLX coming) Review URL: http://codereview.appspot.com/4354048/ git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@1045 2bbb7eff-a529-9590-31e7-b0007b416f81 --- skia.gyp | 27 +++++++++++++++++++++++++-- 1 file changed, 25 insertions(+), 2 deletions(-) diff --git a/skia.gyp b/skia.gyp index 850cb96..123a34d 100644 --- a/skia.gyp +++ b/skia.gyp @@ -507,6 +507,7 @@ '../include/images/SkJpegUtility.h', '../src/images/SkFDStream.cpp', + '../src/images/SkImageDecoder_libgif.cpp', '../src/images/SkImageDecoder_libjpeg.cpp', '../src/images/SkImageDecoder_libpng.cpp', '../src/images/SkImageDecoder_libpvjpeg.c', @@ -899,7 +900,6 @@ '../gpu/include/GrGLIndexBuffer.h', '../gpu/include/GrGLInterface.h', '../gpu/include/GrGLIRect.h', - '../gpu/include/GrGLPlatformIncludes.h', '../gpu/include/GrGLTexture.h', '../gpu/include/GrGLVertexBuffer.h', '../gpu/include/GrGlyph.h', @@ -919,7 +919,6 @@ '../gpu/include/GrPathIter.h', '../gpu/include/GrPathRenderer.h', '../gpu/include/GrPathSink.h', - '../gpu/include/GrPathUtils.h', '../gpu/include/GrPlotMgr.h', '../gpu/include/GrPoint.h', '../gpu/include/GrRandom.h', @@ -957,6 +956,7 @@ '../gpu/src/GrCreatePathRenderer_none.cpp', '../gpu/src/GrDrawTarget.cpp', '../gpu/src/GrGLEffect.h', + '../gpu/src/GrGLDefaultInterface_none.cpp', '../gpu/src/GrGLIndexBuffer.cpp', '../gpu/src/GrGLInterface.cpp', '../gpu/src/GrGLProgram.cpp', @@ -980,6 +980,7 @@ '../gpu/src/GrPath.cpp', '../gpu/src/GrPathRenderer.cpp', '../gpu/src/GrPathUtils.cpp', + '../gpu/src/GrPathUtils.h', '../gpu/src/GrPrintf_printf.cpp', '../gpu/src/GrRectanizer.cpp', '../gpu/src/GrRedBlackTree.h', @@ -991,6 +992,10 @@ '../gpu/src/GrTextStrike_impl.h', '../gpu/src/GrTextureCache.cpp', '../gpu/src/gr_unittests.cpp', + + '../gpu/src/mac/GrGLDefaultInterface_mac.cpp', + + '../gpu/src/win/GrGLDefaultInterface_win.cpp', ], 'defines': [ 'GR_IMPLEMENTATION=1', @@ -1016,12 +1021,29 @@ '$(SDKROOT)/System/Library/Frameworks/OpenGL.framework', ], }, + 'sources!': [ + '../gpu/src/GrGLDefaultInterface_none.cpp', + ], }], [ 'OS == "win"', { 'defines': [ 'GR_WIN32_BUILD=1', + 'GR_GL_FUNCTION_TYPE=__stdcall', + ], + 'sources!': [ + '../gpu/src/GrGLDefaultInterface_none.cpp', ], },], + [ 'OS != "win"', { + 'sources!': [ + '../gpu/src/win/GrGLDefaultInterface_win.cpp', + ], + }], + [ 'OS != "mac"', { + 'sources!': [ + '../gpu/src/mac/GrGLDefaultInterface_mac.cpp', + ], + }], ], 'direct_dependent_settings': { 'conditions': [ @@ -1038,6 +1060,7 @@ [ 'OS == "win"', { 'defines': [ 'GR_WIN32_BUILD=1', + 'GR_GL_FUNCTION_TYPE=__stdcall', ], },], ], -- cgit v1.2.3 From 11e1e5ec668266a165548efa1c7c37a921d836ed Mon Sep 17 00:00:00 2001 From: "bsalomon@google.com" Date: Tue, 5 Apr 2011 17:08:27 +0000 Subject: Adds read pixels to GrTexture and GrRenderTarget Adds SkGrRenderTargetPixelRef for SkBitmaps that are backed by RTs that aren't textures. Adds onReadPixels implementations for SkGr pixel ref types git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@1056 2bbb7eff-a529-9590-31e7-b0007b416f81 --- skia.gyp | 1 + 1 file changed, 1 insertion(+) diff --git a/skia.gyp b/skia.gyp index 123a34d..bd19c04 100644 --- a/skia.gyp +++ b/skia.gyp @@ -990,6 +990,7 @@ '../gpu/src/GrTextContext.cpp', '../gpu/src/GrTextStrike.cpp', '../gpu/src/GrTextStrike_impl.h', + '../gpu/src/GrTexture.cpp', '../gpu/src/GrTextureCache.cpp', '../gpu/src/gr_unittests.cpp', -- cgit v1.2.3 From 6b19c9d381b1d9c9f30fdc6b8b7df9296dbd7e0b Mon Sep 17 00:00:00 2001 From: "senorblanco@chromium.org" Date: Mon, 11 Apr 2011 15:59:47 +0000 Subject: This patch provides the include file common.gypi (cargo culted from another project) which implements basic support for Debug and Release targets in the gyp-generated project files. All configurations build on all platforms with the exception of Windows/Release, which seems to have compile errors not resolved here. Review URL: http://codereview.appspot.com/4391042/ git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@1101 2bbb7eff-a529-9590-31e7-b0007b416f81 --- common.gypi | 94 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ gyp_skia | 3 ++ 2 files changed, 97 insertions(+) create mode 100644 common.gypi diff --git a/common.gypi b/common.gypi new file mode 100644 index 0000000..aadaffb --- /dev/null +++ b/common.gypi @@ -0,0 +1,94 @@ +# Copyright (C) 2011 The Android Open Source Project +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +{ + 'conditions' : [ + ['OS == "win"', + { + 'target_defaults': { + 'msvs_cygwin_shell': 0, + 'msvs_settings': { + 'VCCLCompilerTool': { + 'WarningLevel': '1', + 'WarnAsError': 'false', + 'DebugInformationFormat': '3', + 'AdditionalOptions': '/MP', + }, + }, + 'configurations': { + 'Debug': { + 'msvs_settings': { + 'VCCLCompilerTool': { + 'Optimization': '0', # 0 = /Od + 'PreprocessorDefinitions': ['_DEBUG'], + 'RuntimeLibrary': '3', # 3 = /MDd (debug DLL) + }, + 'VCLinkerTool': { + 'GenerateDebugInformation': 'true', + }, + }, + }, + 'Release': { + 'msvs_settings': { + 'VCCLCompilerTool': { + 'Optimization': '2', # 2 = /Os + 'PreprocessorDefinitions': ['NDEBUG'], + 'RuntimeLibrary': '2', # 2 = /MD (nondebug DLL) + }, + 'VCLinkerTool': { + 'GenerateDebugInformation': 'false', + }, + }, + }, + }, + }, + }, + ], + ['OS == "linux"', + { + 'target_defaults': { + 'configurations': { + 'Debug': { + 'cflags': ['-g'] + }, + 'Release': { + 'cflags': ['-O2'] + }, + }, + }, + }, + ], + ['OS == "mac"', + { + 'target_defaults': { + 'configurations': { + 'Debug': { + 'cflags': ['-g'] + }, + 'Release': { + 'cflags': ['-O2'] + }, + }, + }, + 'xcode_settings': { + 'SYMROOT': '<(DEPTH)/xcodebuild', + }, + }, + ], + ], +} +# Local Variables: +# tab-width:2 +# indent-tabs-mode:nil +# End: +# vim: set expandtab tabstop=2 shiftwidth=2: diff --git a/gyp_skia b/gyp_skia index 909c266..72b4879 100755 --- a/gyp_skia +++ b/gyp_skia @@ -45,6 +45,9 @@ def additional_include_files(args=[]): if os.path.realpath(path) not in specified_includes: result.append(path) + # Always include common.gypi + AddInclude(os.path.join(script_dir, 'common.gypi')) + return result if __name__ == '__main__': -- cgit v1.2.3 From aac8a9fe01f8c93a68c6bb81787c44f064e23728 Mon Sep 17 00:00:00 2001 From: Scroggo Date: Fri, 15 Apr 2011 14:48:08 +0000 Subject: http://codereview.appspot.com/4373057/ git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@1135 2bbb7eff-a529-9590-31e7-b0007b416f81 --- skia.gyp | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/skia.gyp b/skia.gyp index bd19c04..c6267b8 100644 --- a/skia.gyp +++ b/skia.gyp @@ -997,6 +997,8 @@ '../gpu/src/mac/GrGLDefaultInterface_mac.cpp', '../gpu/src/win/GrGLDefaultInterface_win.cpp', + + '../gpu/src/unix/GrGLDefaultInterface_unix.cpp', ], 'defines': [ 'GR_IMPLEMENTATION=1', @@ -1006,6 +1008,9 @@ 'defines': [ 'GR_LINUX_BUILD=1', ], + 'sources!': [ + '../gpu/src/GrGLDefaultInterface_none.cpp', + ], 'link_settings': { 'libraries': [ '-lGL', @@ -1045,6 +1050,11 @@ '../gpu/src/mac/GrGLDefaultInterface_mac.cpp', ], }], + [ 'OS != "linux"', { + 'sources!': [ + '../gpu/src/unix/GrGLDefaultInterface_unix.cpp', + ], + }], ], 'direct_dependent_settings': { 'conditions': [ -- cgit v1.2.3 From bd539aa1b143844276b29ad426814cda28b88e67 Mon Sep 17 00:00:00 2001 From: "bsalomon@google.com" Date: Tue, 19 Apr 2011 13:44:20 +0000 Subject: Add SkClampRange files to gyp git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@1150 2bbb7eff-a529-9590-31e7-b0007b416f81 --- skia.gyp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/skia.gyp b/skia.gyp index c6267b8..322f87c 100644 --- a/skia.gyp +++ b/skia.gyp @@ -82,6 +82,7 @@ '../src/core/SkBuffer.cpp', '../src/core/SkCanvas.cpp', '../src/core/SkChunkAlloc.cpp', + '../src/core/SkClampRange.cpp', '../src/core/SkClipStack.cpp', '../src/core/SkColor.cpp', '../src/core/SkColorFilter.cpp', @@ -200,6 +201,7 @@ '../include/core/SkBuffer.h', '../include/core/SkCanvas.h', '../include/core/SkChunkAlloc.h', + '../include/core/SkClampRange.h', '../include/core/SkClipStack.h', '../include/core/SkColor.h', '../include/core/SkColorFilter.h', -- cgit v1.2.3 From cff7d8f15fec84e7e8f5c0eb46f21011ba8182e0 Mon Sep 17 00:00:00 2001 From: "bsalomon@google.com" Date: Mon, 25 Apr 2011 12:43:45 +0000 Subject: Move alpha-ramp AA to GrContext, detect cases when AA is applied via other methods (smooth lines, MSAA) or rect falls on integer coords and skip the alpha ramp path. Use pre-fab index buffer for alpha-ramped fill rects and stroke rects. Review URL: http://codereview.appspot.com/4449047/ git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@1169 2bbb7eff-a529-9590-31e7-b0007b416f81 --- skia.gyp | 1 + 1 file changed, 1 insertion(+) diff --git a/skia.gyp b/skia.gyp index 322f87c..94ba3cf 100644 --- a/skia.gyp +++ b/skia.gyp @@ -1444,6 +1444,7 @@ '../samplecode/SamplePicture.cpp', '../samplecode/SamplePoints.cpp', '../samplecode/SamplePolyToPoly.cpp', + '../samplecode/SampleAARects.cpp', '../samplecode/SampleRegion.cpp', '../samplecode/SampleRepeatTile.cpp', '../samplecode/SampleShaders.cpp', -- cgit v1.2.3 From a455dce53f55a6d78b49155fefa9dacb554e413d Mon Sep 17 00:00:00 2001 From: "bsalomon@google.com" Date: Thu, 28 Apr 2011 21:04:06 +0000 Subject: Make gyp file define GR/SK debug/release flags. Remove file that breaks release build. git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@1211 2bbb7eff-a529-9590-31e7-b0007b416f81 --- skia.gyp | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/skia.gyp b/skia.gyp index 94ba3cf..3d1f2e1 100644 --- a/skia.gyp +++ b/skia.gyp @@ -1,13 +1,17 @@ { 'target_defaults': { - 'msvs_settings': { - #really need to figure out how to generate debug and release - 'VCLinkerTool': { - 'GenerateDebugInformation': 'true', + 'configurations': { + 'Debug': { + 'defines': [ + 'SK_DEBUG', + 'GR_DEBUG=1', + ], }, - 'VCCLCompilerTool': { - 'DebugInformationFormat': '4', - 'Optimization': '0', + 'Release': { + 'defines': [ + 'SK_RELEASE', + 'GR_RELEASE=1', + ], }, }, 'conditions': [ @@ -1121,7 +1125,7 @@ '../src/animator/SkBoundable.h', '../src/animator/SkBuildCondensedInfo.cpp', #'../src/animator/SkCondensedDebug.cpp', fails on windows - '../src/animator/SkCondensedRelease.cpp', + #'../src/animator/SkCondensedRelease.cpp', '../src/animator/SkDisplayable.cpp', '../src/animator/SkDisplayable.h', '../src/animator/SkDisplayAdd.cpp', -- cgit v1.2.3 From d37c7a7c0919f8f56fcc66de215a71dc8bff503f Mon Sep 17 00:00:00 2001 From: "bsalomon@google.com" Date: Mon, 2 May 2011 20:46:48 +0000 Subject: update gyp file to build new files git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@1225 2bbb7eff-a529-9590-31e7-b0007b416f81 --- skia.gyp | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/skia.gyp b/skia.gyp index 3d1f2e1..85b11f7 100644 --- a/skia.gyp +++ b/skia.gyp @@ -179,6 +179,8 @@ '../src/core/SkTSort.h', '../src/core/SkTemplatesPriv.h', '../src/core/SkTypeface.cpp', + '../src/core/SkTypefaceCache.cpp', + '../src/core/SkTypefaceCache.h', '../src/core/SkUnPreMultiply.cpp', '../src/core/SkUtils.cpp', '../src/core/SkWriter32.cpp', @@ -187,6 +189,8 @@ '../src/opts/opts_check_SSE2.cpp', '../src/ports/SkDebug_stdio.cpp', + '../src/ports/SkDebug_win.cpp', + '../src/ports/SkFontHost_tables.cpp', '../src/ports/SkGlobals_global.cpp', '../src/ports/SkMemory_malloc.cpp', @@ -337,6 +341,14 @@ '../src/ports/SkFontHost_win.cpp', '../src/ports/SkThread_win.cpp', ], + 'sources!': [ + '../src/ports/SkDebug_stdio.cpp', + ], + },], + [ 'OS != "win"', { + 'sources!': [ + '../src/ports/SkDebug_win.cpp', + ], },], ], 'direct_dependent_settings': { -- cgit v1.2.3 From dd84b666de7ee633e90b45bf1d9743b0a4424379 Mon Sep 17 00:00:00 2001 From: "senorblanco@chromium.org" Date: Wed, 4 May 2011 18:59:38 +0000 Subject: Fix SampleApp raster path on Linux to use SK_SAMPLES_FOR_X, so pixel components are in the right order (RGBA vs BGRA). Review URL: http://codereview.appspot.com/4474043/ git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@1246 2bbb7eff-a529-9590-31e7-b0007b416f81 --- skia.gyp | 37 +++++++++++++++++++++---------------- 1 file changed, 21 insertions(+), 16 deletions(-) diff --git a/skia.gyp b/skia.gyp index 85b11f7..816801c 100644 --- a/skia.gyp +++ b/skia.gyp @@ -30,7 +30,12 @@ 'SK_BUILD_FOR_WIN32', 'SK_IGNORE_STDINT_DOT_H', ], - },], + }], + [ 'OS == "linux"', { + 'defines': [ + 'SK_SAMPLES_FOR_X', + ], + }], ], 'direct_dependent_settings': { 'conditions': [ @@ -43,7 +48,7 @@ 'defines': [ 'SK_BUILD_FOR_WIN32', ], - },], + }], ], }, }, @@ -344,12 +349,12 @@ 'sources!': [ '../src/ports/SkDebug_stdio.cpp', ], - },], + }], [ 'OS != "win"', { 'sources!': [ '../src/ports/SkDebug_win.cpp', ], - },], + }], ], 'direct_dependent_settings': { 'include_dirs': [ @@ -532,7 +537,7 @@ '../src/images/SkJpegUtility.cpp', '../src/images/SkMovie_gif.cpp', ], - },], + }], [ 'OS == "mac"', { 'sources!': [ '../include/images/SkJpegUtility.h', @@ -544,7 +549,7 @@ '../src/images/SkJpegUtility.cpp', '../src/images/SkMovie_gif.cpp', ], - },], + }], [ 'OS == "linux" or OS == "freebsd" or OS == "openbsd" or OS == "solaris"', { 'sources!': [ '../include/images/SkJpegUtility.h', @@ -601,7 +606,7 @@ '../src/xml/SkJS.cpp', '../src/xml/SkJSDisplayable.cpp', ], - },], + }], ], 'direct_dependent_settings': { 'include_dirs': [ @@ -710,7 +715,7 @@ '../src/utils/mac/SkCreateCGImageRef.cpp', '../src/utils/mac/SkEGLContext_mac.cpp', ], - },], + }], ], 'direct_dependent_settings': { 'include_dirs': [ @@ -793,7 +798,7 @@ '../src/utils/win/SkOSWindow_Win.cpp', '../src/utils/win/skia_win.cpp', ], - },], + }], [ 'OS == "mac"', { 'sources': [ '../include/utils/SkCGUtils.h', @@ -809,7 +814,7 @@ '$(SDKROOT)/System/Library/Frameworks/AGL.framework', ], }, - },], + }], [ 'OS == "linux" or OS == "freebsd" or OS == "openbsd" or OS == "solaris"', { 'include_dirs' : [ '../include/utils/unix', @@ -866,7 +871,7 @@ 'defines': [ 'GR_WIN32_BUILD=1', ], - },], + }], ], 'direct_dependent_settings': { 'conditions': [ @@ -884,7 +889,7 @@ 'defines': [ 'GR_WIN32_BUILD=1', ], - },], + }], ], 'include_dirs': [ '../include/gpu', @@ -1057,7 +1062,7 @@ 'sources!': [ '../gpu/src/GrGLDefaultInterface_none.cpp', ], - },], + }], [ 'OS != "win"', { 'sources!': [ '../gpu/src/win/GrGLDefaultInterface_win.cpp', @@ -1091,7 +1096,7 @@ 'GR_WIN32_BUILD=1', 'GR_GL_FUNCTION_TYPE=__stdcall', ], - },], + }], ], 'include_dirs': [ '../gpu/include', @@ -1516,12 +1521,12 @@ '../samplecode/SampleEncode.cpp', '../samplecode/SamplePageFlip.cpp', ], - },], + }], [ 'OS == "mac"', { 'sources!': [ '../samplecode/SampleDecode.cpp', ], - },], + }], ], 'msvs_settings': { -- cgit v1.2.3 From 9c81b3260ab3c2cb26a744a8d8e4ed5ae0414dae Mon Sep 17 00:00:00 2001 From: "bsalomon@google.com" Date: Wed, 4 May 2011 20:18:04 +0000 Subject: Remove GrPrintf_printf from gyp (should be using GrPrintf_skia that is already included in the skgr lib to direct GrPrintf to SkDebugf). git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@1248 2bbb7eff-a529-9590-31e7-b0007b416f81 --- skia.gyp | 1 - 1 file changed, 1 deletion(-) diff --git a/skia.gyp b/skia.gyp index 816801c..b2b43cc 100644 --- a/skia.gyp +++ b/skia.gyp @@ -1004,7 +1004,6 @@ '../gpu/src/GrPathRenderer.cpp', '../gpu/src/GrPathUtils.cpp', '../gpu/src/GrPathUtils.h', - '../gpu/src/GrPrintf_printf.cpp', '../gpu/src/GrRectanizer.cpp', '../gpu/src/GrRedBlackTree.h', '../gpu/src/GrResource.cpp', -- cgit v1.2.3 From f864893eaa0c450687f008587bb1c300ab21211b Mon Sep 17 00:00:00 2001 From: "bsalomon@google.com" Date: Fri, 6 May 2011 13:53:47 +0000 Subject: Replace GrStringBuilder with SkString. First step in cleaning up the shader generator. Slight performance hit when creating a new shader (<10% of total shader gen time on my Windows box is spent in building our string before handing it to GL). Much of this can be recovered by better usage pattern of SkString in coming revisions. Review URL: http://codereview.appspot.com/4465053/ git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@1266 2bbb7eff-a529-9590-31e7-b0007b416f81 --- skia.gyp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/skia.gyp b/skia.gyp index b2b43cc..8f228c9 100644 --- a/skia.gyp +++ b/skia.gyp @@ -901,6 +901,8 @@ 'type': 'static_library', 'include_dirs': [ '../gpu/include', + '../include/core', + '../include/config', ], #'dependencies': [ # 'libtess', @@ -995,8 +997,6 @@ '../gpu/src/GrGpuGLFixed.h', '../gpu/src/GrGpuGLShaders.cpp', '../gpu/src/GrGpuGLShaders.h', - '../gpu/src/GrGpuGLShaders2.cpp', - '../gpu/src/GrGpuGLShaders2.h', '../gpu/src/GrInOrderDrawBuffer.cpp', '../gpu/src/GrMatrix.cpp', '../gpu/src/GrMemory.cpp', -- cgit v1.2.3 From 54492ce9c6f6fa14aadf644488319ebe005b73cd Mon Sep 17 00:00:00 2001 From: Scroggo Date: Wed, 11 May 2011 14:05:25 +0000 Subject: Add color filters to gpu path. git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@1297 2bbb7eff-a529-9590-31e7-b0007b416f81 --- skia.gyp | 1 + 1 file changed, 1 insertion(+) diff --git a/skia.gyp b/skia.gyp index 8f228c9..c37d567 100644 --- a/skia.gyp +++ b/skia.gyp @@ -1424,6 +1424,7 @@ '../samplecode/SampleCamera.cpp', '../samplecode/SampleCircle.cpp', '../samplecode/SampleCode.h', + '../samplecode/SampleColorFilter.cpp', '../samplecode/SampleComplexClip.cpp', '../samplecode/SampleCull.cpp', '../samplecode/SampleDecode.cpp', -- cgit v1.2.3 From c9e5cceb9427dfff8ba4068a9d6c90e1027d360b Mon Sep 17 00:00:00 2001 From: "senorblanco@chromium.org" Date: Thu, 12 May 2011 15:49:15 +0000 Subject: Edge antialiasing for convex shapes in Ganesh This patch implements edge antialiasing for convex shapes, using the fragment shader to compare against the edge equations for each triangle. Currently, it only works for flat shaded primitives (i.e., it was not integrated into the "active stages" path). The skia.gyp changes cause this code to be compiled into SampleApp, but do not enable the tesselated path by default. Notes: the SkOSWindow_Unix.cpp change is to silence a valgrind warning about memcpy() with overlapping regions. The GrBinHashKey change is to avoid running a two-pass hash (GrProgramDesc is now 52 bytes or so, exceeding the 32 byte default size). Review URL: http://codereview.appspot.com/4519054/ git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@1314 2bbb7eff-a529-9590-31e7-b0007b416f81 --- skia.gyp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/skia.gyp b/skia.gyp index c37d567..7247828 100644 --- a/skia.gyp +++ b/skia.gyp @@ -904,9 +904,9 @@ '../include/core', '../include/config', ], - #'dependencies': [ - # 'libtess', - #], + 'dependencies': [ + 'libtess', + ], 'sources': [ '../gpu/include/GrAllocator.h', '../gpu/include/GrAllocPool.h', @@ -959,7 +959,7 @@ '../gpu/include/GrTArray.h', '../gpu/include/GrTBSearch.h', '../gpu/include/GrTDArray.h', - #'../gpu/include/GrTesselatedPathRenderer.h', + '../gpu/include/GrTesselatedPathRenderer.h', '../gpu/include/GrTextContext.h', '../gpu/include/GrTextStrike.h', '../gpu/include/GrTexture.h', @@ -1008,7 +1008,7 @@ '../gpu/src/GrRedBlackTree.h', '../gpu/src/GrResource.cpp', '../gpu/src/GrStencil.cpp', - #'../gpu/src/GrTesselatedPathRenderer.cpp', + '../gpu/src/GrTesselatedPathRenderer.cpp', '../gpu/src/GrTextContext.cpp', '../gpu/src/GrTextStrike.cpp', '../gpu/src/GrTextStrike_impl.h', -- cgit v1.2.3 From 8bf93fcdef7a08ebf514688b97b7fb670fc9c081 Mon Sep 17 00:00:00 2001 From: "junov@google.com" Date: Mon, 16 May 2011 18:32:07 +0000 Subject: Fixed color bleeding issue when drawing a sub region of a bitmap with filtering enabled. Problem was resolved by adding the notion of a custom texture domain in generated shaders, when necessary. git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@1337 2bbb7eff-a529-9590-31e7-b0007b416f81 --- skia.gyp | 1 + 1 file changed, 1 insertion(+) diff --git a/skia.gyp b/skia.gyp index 7247828..ca0754a 100644 --- a/skia.gyp +++ b/skia.gyp @@ -1403,6 +1403,7 @@ '../gm/filltypes.cpp', '../gm/gm.h', '../gm/gradients.cpp', + '../gm/nocolorbleed.cpp', '../gm/points.cpp', '../gm/poly2poly.cpp', '../gm/shadertext.cpp', -- cgit v1.2.3 From 0e0dc31936aed6fc202121dac39f4ac4da6b71c8 Mon Sep 17 00:00:00 2001 From: "reed@google.com" Date: Mon, 16 May 2011 19:15:16 +0000 Subject: remove dead files git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@1338 2bbb7eff-a529-9590-31e7-b0007b416f81 --- skia.gyp | 2 -- 1 file changed, 2 deletions(-) diff --git a/skia.gyp b/skia.gyp index ca0754a..f8d025d 100644 --- a/skia.gyp +++ b/skia.gyp @@ -941,7 +941,6 @@ '../gpu/include/GrNoncopyable.h', '../gpu/include/GrPaint.h', '../gpu/include/GrPath.h', - '../gpu/include/GrPathIter.h', '../gpu/include/GrPathRenderer.h', '../gpu/include/GrPathSink.h', '../gpu/include/GrPlotMgr.h', @@ -1000,7 +999,6 @@ '../gpu/src/GrInOrderDrawBuffer.cpp', '../gpu/src/GrMatrix.cpp', '../gpu/src/GrMemory.cpp', - '../gpu/src/GrPath.cpp', '../gpu/src/GrPathRenderer.cpp', '../gpu/src/GrPathUtils.cpp', '../gpu/src/GrPathUtils.h', -- cgit v1.2.3 From db04f92df5f71f76bf611239c18de994127d5e4e Mon Sep 17 00:00:00 2001 From: "junov@google.com" Date: Tue, 17 May 2011 15:47:10 +0000 Subject: Adding a test to sampleapp for texture domain git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@1347 2bbb7eff-a529-9590-31e7-b0007b416f81 --- skia.gyp | 1 + 1 file changed, 1 insertion(+) diff --git a/skia.gyp b/skia.gyp index f8d025d..6c982da 100644 --- a/skia.gyp +++ b/skia.gyp @@ -1481,6 +1481,7 @@ '../samplecode/SampleTextBox.cpp', '../samplecode/SampleTextEffects.cpp', '../samplecode/SampleTextOnPath.cpp', + '../samplecode/SampleTextureDomian.cpp', '../samplecode/SampleTiling.cpp', '../samplecode/SampleTinyBitmap.cpp', '../samplecode/SampleTriangles.cpp', -- cgit v1.2.3 From 3ece729c129bf31dc46ee22fbd043ff5d88468ac Mon Sep 17 00:00:00 2001 From: "junov@google.com" Date: Tue, 17 May 2011 16:00:46 +0000 Subject: Fixed typo in skia.gyp -This line, and those below, will be ignored-- M gyp/skia.gyp git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@1349 2bbb7eff-a529-9590-31e7-b0007b416f81 --- skia.gyp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/skia.gyp b/skia.gyp index 6c982da..571c151 100644 --- a/skia.gyp +++ b/skia.gyp @@ -1481,7 +1481,7 @@ '../samplecode/SampleTextBox.cpp', '../samplecode/SampleTextEffects.cpp', '../samplecode/SampleTextOnPath.cpp', - '../samplecode/SampleTextureDomian.cpp', + '../samplecode/SampleTextureDomain.cpp', '../samplecode/SampleTiling.cpp', '../samplecode/SampleTinyBitmap.cpp', '../samplecode/SampleTriangles.cpp', -- cgit v1.2.3 From 129089fbd31e3c307da58de60734be8c9820bc9b Mon Sep 17 00:00:00 2001 From: "junov@google.com" Date: Tue, 17 May 2011 17:01:17 +0000 Subject: Removing remnants of GrGLEffect. Bug: http://code.google.com/p/skia/issues/detail?id=264 Code review: http://codereview.appspot.com/4517073/ git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@1350 2bbb7eff-a529-9590-31e7-b0007b416f81 --- skia.gyp | 1 - 1 file changed, 1 deletion(-) diff --git a/skia.gyp b/skia.gyp index 571c151..e999479 100644 --- a/skia.gyp +++ b/skia.gyp @@ -979,7 +979,6 @@ '../gpu/src/GrContext.cpp', '../gpu/src/GrCreatePathRenderer_none.cpp', '../gpu/src/GrDrawTarget.cpp', - '../gpu/src/GrGLEffect.h', '../gpu/src/GrGLDefaultInterface_none.cpp', '../gpu/src/GrGLIndexBuffer.cpp', '../gpu/src/GrGLInterface.cpp', -- cgit v1.2.3 From e762c1deeceff070d7a3c68920399b9b67bc5497 Mon Sep 17 00:00:00 2001 From: "bsalomon@google.com" Date: Thu, 19 May 2011 14:39:57 +0000 Subject: Fix windows build (missing SkFontHost.cpp) git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@1377 2bbb7eff-a529-9590-31e7-b0007b416f81 --- skia.gyp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/skia.gyp b/skia.gyp index e999479..209da7b 100644 --- a/skia.gyp +++ b/skia.gyp @@ -121,6 +121,7 @@ '../src/core/SkFloat.cpp', '../src/core/SkFloat.h', '../src/core/SkFloatBits.cpp', + '../src/core/SkFontHost.cpp', '../src/core/SkGeometry.cpp', '../src/core/SkGlobals.cpp', '../src/core/SkGlyphCache.cpp', @@ -306,7 +307,6 @@ '../include/core/SkMMapStream.h', '../src/core/SkMMapStream.cpp', '../src/core/SkBlitter_ARGB32_Subpixel.cpp', - '../src/core/SkFontHost.cpp', '../src/ports/SkThread_pthread.cpp', '../src/ports/SkTime_Unix.cpp', '../src/ports/SkFontHost_FreeType_Subpixel.cpp', -- cgit v1.2.3 From 845331b941018f69ad3c901099d53cb3d693029a Mon Sep 17 00:00:00 2001 From: "bungeman@google.com" Date: Thu, 19 May 2011 18:04:48 +0000 Subject: Add unix and mesa GL files to gyp. http://codereview.appspot.com/4545055/ git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@1383 2bbb7eff-a529-9590-31e7-b0007b416f81 --- skia.gyp | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/skia.gyp b/skia.gyp index 209da7b..ca3f1bc 100644 --- a/skia.gyp +++ b/skia.gyp @@ -707,6 +707,11 @@ '../src/utils/SkProxyCanvas.cpp', '../src/utils/SkSfntUtils.cpp', '../src/utils/SkUnitMappers.cpp', + + '../src/utils/mac/SkEGLContext_Mesa.cpp', + ], + 'sources!': [ + '../src/utils/mac/SkEGLContext_Mesa.cpp', ], 'conditions': [ [ 'OS == "mac"', { @@ -716,6 +721,11 @@ '../src/utils/mac/SkEGLContext_mac.cpp', ], }], + [ 'OS == "linux" or OS == "freebsd" or OS == "openbsd" or OS == "solaris"', { + 'sources': [ + '../src/utils/unix/SkEGLContext_Unix.cpp', + ], + }], ], 'direct_dependent_settings': { 'include_dirs': [ @@ -1018,6 +1028,11 @@ '../gpu/src/win/GrGLDefaultInterface_win.cpp', '../gpu/src/unix/GrGLDefaultInterface_unix.cpp', + + '../gpu/src/mesa/GrGLDefaultInterface_mesa.cpp', + ], + 'sources!': [ + '../gpu/src/mesa/GrGLDefaultInterface_mesa.cpp', ], 'defines': [ 'GR_IMPLEMENTATION=1', -- cgit v1.2.3 From aabea0bfa7e5fc9cfb1b8b097079f36ae4cb2896 Mon Sep 17 00:00:00 2001 From: "bungeman@google.com" Date: Thu, 19 May 2011 19:02:20 +0000 Subject: Add build for unix to gyp. git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@1385 2bbb7eff-a529-9590-31e7-b0007b416f81 --- skia.gyp | 1 + 1 file changed, 1 insertion(+) diff --git a/skia.gyp b/skia.gyp index ca3f1bc..4b0b6ae 100644 --- a/skia.gyp +++ b/skia.gyp @@ -34,6 +34,7 @@ [ 'OS == "linux"', { 'defines': [ 'SK_SAMPLES_FOR_X', + 'SK_BUILD_FOR_UNIX', ], }], ], -- cgit v1.2.3 From 69c4163d1f27c5bb715884141f28b06f2cd781d7 Mon Sep 17 00:00:00 2001 From: "senorblanco@chromium.org" Date: Thu, 19 May 2011 19:58:58 +0000 Subject: The plain Makefile was using -Wall, but the gyp build wasn't. This CL turns on -Wall -Wextra and -Wno-unused in common.gypi. This revealed a lot of warnings (and some actual bugs), all of which I fixed here. This is pretty mindless stuff for the most part (order of intialization, missing initializers, && within ||, etc), but will allow us to build cleanly with -Wall and -Wextra (and -Werror, if we so choose). I put defaults into switches that were missing cases. I could put in the actual missing enums instead if that's desired. I could also assert on missing enums instead of break, if that's desired. I wasn't sure how to test the stuff in "animator", so that should be looked at a bit more closely. Review URL: http://codereview.appspot.com/4547055/ git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@1386 2bbb7eff-a529-9590-31e7-b0007b416f81 --- common.gypi | 1 + 1 file changed, 1 insertion(+) diff --git a/common.gypi b/common.gypi index aadaffb..78482a0 100644 --- a/common.gypi +++ b/common.gypi @@ -65,6 +65,7 @@ 'cflags': ['-O2'] }, }, + 'cflags': [ '-Wall', '-Wextra', '-Wno-unused' ] }, }, ], -- cgit v1.2.3 From e4ed9bbc40cbc148f0ed4409b81c8c2428370e16 Mon Sep 17 00:00:00 2001 From: "bsalomon@google.com" Date: Fri, 20 May 2011 14:13:56 +0000 Subject: Add dual source blending support for proper blending with coverage. Review URL: http://codereview.appspot.com/4535088/ git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@1390 2bbb7eff-a529-9590-31e7-b0007b416f81 --- skia.gyp | 1 + 1 file changed, 1 insertion(+) diff --git a/skia.gyp b/skia.gyp index 4b0b6ae..7bafbf7 100644 --- a/skia.gyp +++ b/skia.gyp @@ -1504,6 +1504,7 @@ '../samplecode/SampleUnitMapper.cpp', '../samplecode/SampleVertices.cpp', '../samplecode/SampleXfermodes.cpp', + '../samplecode/SampleXfermodesBlur.cpp', ], 'sources!': [ '../samplecode/SampleSkLayer.cpp', #relies on SkMatrix44 which doesn't compile -- cgit v1.2.3 From 4211f85556b37fa0d42e18428271bb9ae18e0cc7 Mon Sep 17 00:00:00 2001 From: "epoger@google.com" Date: Tue, 31 May 2011 13:50:51 +0000 Subject: split skia.gyp into separate gypfile for each source dir see http://codereview.appspot.com/4527084/ Now, to build out/Debug/SampleApp on Linux, do the following: cd trunk/gyp rm -rf Makefile *mk *.Makefile out ./gyp_skia -fmake --ignore-environment "--toplevel-dir=$PWD" \ -Icommon.gypi "--depth=$PWD" SampleApp.gyp make git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@1446 2bbb7eff-a529-9590-31e7-b0007b416f81 --- SampleApp.gyp | 169 +++++++ animator.gyp | 193 ++++++++ effects.gyp | 83 ++++ experimental.gyp | 37 ++ gpu.gyp | 285 +++++++++++ images.gyp | 104 ++++ libtess.gyp | 52 ++ opts.gyp | 52 ++ pdf.gyp | 55 +++ skia.gyp | 1285 +------------------------------------------------- svg.gyp | 91 ++++ target_defaults.gypi | 62 +++ utils.gyp | 90 ++++ views.gyp | 122 +++++ xml.gyp | 58 +++ 15 files changed, 1457 insertions(+), 1281 deletions(-) create mode 100644 SampleApp.gyp create mode 100644 animator.gyp create mode 100644 effects.gyp create mode 100644 experimental.gyp create mode 100644 gpu.gyp create mode 100644 images.gyp create mode 100644 libtess.gyp create mode 100644 opts.gyp create mode 100644 pdf.gyp create mode 100644 svg.gyp create mode 100644 target_defaults.gypi create mode 100644 utils.gyp create mode 100644 views.gyp create mode 100644 xml.gyp diff --git a/SampleApp.gyp b/SampleApp.gyp new file mode 100644 index 0000000..24f9963 --- /dev/null +++ b/SampleApp.gyp @@ -0,0 +1,169 @@ +{ + 'includes': [ + 'target_defaults.gypi', + ], + 'targets': [ + { + 'target_name': 'SampleApp', + 'type': 'executable', + 'mac_bundle' : 1, + 'include_dirs' : [ + '../src/core', # needed to get SkConcaveToTriangle, maybe this should be moved to include dir? + '../gm', # SampleGM.cpp pulls gm.h + ], + 'sources': [ + # gm files needed for SampleGM.cpp + '../gm/bitmapfilters.cpp', + '../gm/blurs.cpp', + '../gm/complexclip.cpp', + '../gm/filltypes.cpp', + '../gm/gm.h', + '../gm/gradients.cpp', + '../gm/nocolorbleed.cpp', + '../gm/points.cpp', + '../gm/poly2poly.cpp', + '../gm/shadertext.cpp', + '../gm/shadows.cpp', + '../gm/shapes.cpp', + '../gm/tilemodes.cpp', + '../gm/xfermodes.cpp', + + '../samplecode/ClockFaceView.cpp', + '../samplecode/OverView.cpp', + '../samplecode/SampleAll.cpp', + '../samplecode/SampleAnimator.cpp', + '../samplecode/SampleApp.cpp', + '../samplecode/SampleArc.cpp', + '../samplecode/SampleAvoid.cpp', + '../samplecode/SampleBigGradient.cpp', + '../samplecode/SampleBitmapRect.cpp', + '../samplecode/SampleBlur.cpp', + '../samplecode/SampleCamera.cpp', + '../samplecode/SampleCircle.cpp', + '../samplecode/SampleCode.h', + '../samplecode/SampleColorFilter.cpp', + '../samplecode/SampleComplexClip.cpp', + '../samplecode/SampleCull.cpp', + '../samplecode/SampleDecode.cpp', + '../samplecode/SampleDither.cpp', + '../samplecode/SampleDitherBitmap.cpp', + '../samplecode/SampleDrawLooper.cpp', + '../samplecode/SampleEffects.cpp', + '../samplecode/SampleEmboss.cpp', + '../samplecode/SampleEncode.cpp', + '../samplecode/SampleExtractAlpha.cpp', + '../samplecode/SampleFillType.cpp', + '../samplecode/SampleFilter.cpp', + '../samplecode/SampleFilter2.cpp', + '../samplecode/SampleFontCache.cpp', + '../samplecode/SampleFontScalerTest.cpp', + '../samplecode/SampleFuzz.cpp', + '../samplecode/SampleGM.cpp', + '../samplecode/SampleGradients.cpp', + '../samplecode/SampleHairline.cpp', + '../samplecode/SampleImage.cpp', + '../samplecode/SampleImageDir.cpp', + '../samplecode/SampleLayerMask.cpp', + '../samplecode/SampleLayers.cpp', + '../samplecode/SampleLCD.cpp', + '../samplecode/SampleLineClipper.cpp', + '../samplecode/SampleLines.cpp', + '../samplecode/SampleMeasure.cpp', + '../samplecode/SampleMipMap.cpp', + '../samplecode/SampleMovie.cpp', + '../samplecode/SampleNinePatch.cpp', + '../samplecode/SampleOvalTest.cpp', + '../samplecode/SampleOverflow.cpp', + '../samplecode/SamplePageFlip.cpp', + '../samplecode/SamplePatch.cpp', + '../samplecode/SamplePath.cpp', + '../samplecode/SamplePathClip.cpp', + '../samplecode/SamplePathEffects.cpp', + '../samplecode/SamplePicture.cpp', + '../samplecode/SamplePoints.cpp', + '../samplecode/SamplePolyToPoly.cpp', + '../samplecode/SampleAARects.cpp', + '../samplecode/SampleRegion.cpp', + '../samplecode/SampleRepeatTile.cpp', + '../samplecode/SampleShaders.cpp', + '../samplecode/SampleShaderText.cpp', + '../samplecode/SampleShapes.cpp', + '../samplecode/SampleSkLayer.cpp', + '../samplecode/SampleSlides.cpp', + '../samplecode/SampleStrokePath.cpp', + '../samplecode/SampleStrokeText.cpp', + '../samplecode/SampleSVG.cpp', + '../samplecode/SampleTests.cpp', + '../samplecode/SampleText.cpp', + '../samplecode/SampleTextAlpha.cpp', + '../samplecode/SampleTextBox.cpp', + '../samplecode/SampleTextEffects.cpp', + '../samplecode/SampleTextOnPath.cpp', + '../samplecode/SampleTextureDomain.cpp', + '../samplecode/SampleTiling.cpp', + '../samplecode/SampleTinyBitmap.cpp', + '../samplecode/SampleTriangles.cpp', + '../samplecode/SampleTypeface.cpp', + '../samplecode/SampleUnitMapper.cpp', + '../samplecode/SampleVertices.cpp', + '../samplecode/SampleXfermodes.cpp', + '../samplecode/SampleXfermodesBlur.cpp', + ], + 'sources!': [ + '../samplecode/SampleSkLayer.cpp', #relies on SkMatrix44 which doesn't compile + '../samplecode/SampleTests.cpp', #includes unknown file SkShaderExtras.h + '../samplecode/SampleWarp.cpp', + '../samplecode/SampleFontCache.cpp', + ], + 'dependencies': [ + 'skia.gyp:skia', + 'effects.gyp:effects', + 'images.gyp:images', + 'views.gyp:views', + 'utils.gyp:utils', + 'animator.gyp:animator', + 'xml.gyp:xml', + 'svg.gyp:svg', + 'experimental.gyp:experimental', + 'gpu.gyp:gr', + 'gpu.gyp:skgr', + ], + 'conditions' : [ + [ 'OS == "linux" or OS == "freebsd" or OS == "openbsd" or OS == "solaris"', { + 'sources!': [ + '../samplecode/SampleDecode.cpp', + ], + }], + [ 'OS == "win"', { + 'sources!': [ + # require UNIX functions + '../samplecode/SampleEncode.cpp', + '../samplecode/SamplePageFlip.cpp', + ], + }], + [ 'OS == "mac"', { + 'sources!': [ + '../samplecode/SampleDecode.cpp', + ], + }], + + ], + 'msvs_settings': { + 'VCLinkerTool': { + 'SubSystem': '2', + 'AdditionalDependencies': [ + 'OpenGL32.lib', + 'usp10.lib', + 'd3d9.lib', + ], + }, + }, + }, + ], +} + +# Local Variables: +# tab-width:2 +# indent-tabs-mode:nil +# End: +# vim: set expandtab tabstop=2 shiftwidth=2: diff --git a/animator.gyp b/animator.gyp new file mode 100644 index 0000000..d0d54aa --- /dev/null +++ b/animator.gyp @@ -0,0 +1,193 @@ +{ + 'includes': [ + 'target_defaults.gypi', + ], + 'targets': [ + { + 'target_name': 'animator', + 'type': 'static_library', + 'include_dirs': [ + '../include/config', + '../include/core', + '../include/effects', + '../include/animator', + '../include/views', + '../include/xml', + '../include/utils', + '../include/images', + ], + 'sources': [ + '../include/animator/SkAnimator.h', + '../include/animator/SkAnimatorView.h', + + '../src/animator/SkAnimate.h', + '../src/animator/SkAnimateActive.cpp', + '../src/animator/SkAnimateActive.h', + '../src/animator/SkAnimateBase.cpp', + '../src/animator/SkAnimateBase.h', + '../src/animator/SkAnimateField.cpp', + '../src/animator/SkAnimateMaker.cpp', + '../src/animator/SkAnimateMaker.h', + '../src/animator/SkAnimateProperties.h', + '../src/animator/SkAnimateSet.cpp', + '../src/animator/SkAnimateSet.h', + '../src/animator/SkAnimator.cpp', + '../src/animator/SkAnimatorScript.cpp', + '../src/animator/SkAnimatorScript.h', + #'../src/animator/SkAnimatorScript2.cpp', fails on windows + #'../src/animator/SkAnimatorScript2.h', + '../src/animator/SkBase64.cpp', + '../src/animator/SkBase64.h', + '../src/animator/SkBoundable.cpp', + '../src/animator/SkBoundable.h', + '../src/animator/SkBuildCondensedInfo.cpp', + #'../src/animator/SkCondensedDebug.cpp', fails on windows + #'../src/animator/SkCondensedRelease.cpp', + '../src/animator/SkDisplayable.cpp', + '../src/animator/SkDisplayable.h', + '../src/animator/SkDisplayAdd.cpp', + '../src/animator/SkDisplayAdd.h', + '../src/animator/SkDisplayApply.cpp', + '../src/animator/SkDisplayApply.h', + '../src/animator/SkDisplayBounds.cpp', + '../src/animator/SkDisplayBounds.h', + '../src/animator/SkDisplayEvent.cpp', + '../src/animator/SkDisplayEvent.h', + '../src/animator/SkDisplayEvents.cpp', + '../src/animator/SkDisplayEvents.h', + '../src/animator/SkDisplayInclude.cpp', + '../src/animator/SkDisplayInclude.h', + '../src/animator/SkDisplayInput.cpp', + '../src/animator/SkDisplayInput.h', + '../src/animator/SkDisplayList.cpp', + '../src/animator/SkDisplayList.h', + '../src/animator/SkDisplayMath.cpp', + '../src/animator/SkDisplayMath.h', + '../src/animator/SkDisplayMovie.cpp', + '../src/animator/SkDisplayMovie.h', + '../src/animator/SkDisplayNumber.cpp', + '../src/animator/SkDisplayNumber.h', + '../src/animator/SkDisplayPost.cpp', + '../src/animator/SkDisplayPost.h', + '../src/animator/SkDisplayRandom.cpp', + '../src/animator/SkDisplayRandom.h', + '../src/animator/SkDisplayScreenplay.cpp', + '../src/animator/SkDisplayScreenplay.h', + '../src/animator/SkDisplayType.cpp', + '../src/animator/SkDisplayType.h', + '../src/animator/SkDisplayTypes.cpp', + '../src/animator/SkDisplayTypes.h', + '../src/animator/SkDisplayXMLParser.cpp', + '../src/animator/SkDisplayXMLParser.h', + '../src/animator/SkDraw3D.cpp', + '../src/animator/SkDraw3D.h', + '../src/animator/SkDrawable.cpp', + '../src/animator/SkDrawable.h', + '../src/animator/SkDrawBitmap.cpp', + '../src/animator/SkDrawBitmap.h', + '../src/animator/SkDrawBlur.cpp', + '../src/animator/SkDrawBlur.h', + '../src/animator/SkDrawClip.cpp', + '../src/animator/SkDrawClip.h', + '../src/animator/SkDrawColor.cpp', + '../src/animator/SkDrawColor.h', + '../src/animator/SkDrawDash.cpp', + '../src/animator/SkDrawDash.h', + '../src/animator/SkDrawDiscrete.cpp', + '../src/animator/SkDrawDiscrete.h', + '../src/animator/SkDrawEmboss.cpp', + '../src/animator/SkDrawEmboss.h', + '../src/animator/SkDrawExtraPathEffect.cpp', + '../src/animator/SkDrawFull.cpp', + '../src/animator/SkDrawFull.h', + '../src/animator/SkDrawGradient.cpp', + '../src/animator/SkDrawGradient.h', + '../src/animator/SkDrawGroup.cpp', + '../src/animator/SkDrawGroup.h', + '../src/animator/SkDrawLine.cpp', + '../src/animator/SkDrawLine.h', + '../src/animator/SkDrawMatrix.cpp', + '../src/animator/SkDrawMatrix.h', + '../src/animator/SkDrawOval.cpp', + '../src/animator/SkDrawOval.h', + '../src/animator/SkDrawPaint.cpp', + '../src/animator/SkDrawPaint.h', + '../src/animator/SkDrawPath.cpp', + '../src/animator/SkDrawPath.h', + '../src/animator/SkDrawPoint.cpp', + '../src/animator/SkDrawPoint.h', + '../src/animator/SkDrawRectangle.cpp', + '../src/animator/SkDrawRectangle.h', + '../src/animator/SkDrawSaveLayer.cpp', + '../src/animator/SkDrawSaveLayer.h', + '../src/animator/SkDrawShader.cpp', + '../src/animator/SkDrawShader.h', + '../src/animator/SkDrawText.cpp', + '../src/animator/SkDrawText.h', + '../src/animator/SkDrawTextBox.cpp', + '../src/animator/SkDrawTextBox.h', + '../src/animator/SkDrawTo.cpp', + '../src/animator/SkDrawTo.h', + '../src/animator/SkDrawTransparentShader.cpp', + '../src/animator/SkDrawTransparentShader.h', + '../src/animator/SkDump.cpp', + '../src/animator/SkDump.h', + '../src/animator/SkExtras.h', + '../src/animator/SkGetCondensedInfo.cpp', + '../src/animator/SkHitClear.cpp', + '../src/animator/SkHitClear.h', + '../src/animator/SkHitTest.cpp', + '../src/animator/SkHitTest.h', + '../src/animator/SkIntArray.h', + '../src/animator/SkMatrixParts.cpp', + '../src/animator/SkMatrixParts.h', + '../src/animator/SkMemberInfo.cpp', + '../src/animator/SkMemberInfo.h', + '../src/animator/SkOpArray.cpp', + '../src/animator/SkOpArray.h', + '../src/animator/SkOperand.h', + '../src/animator/SkOperand2.h', + '../src/animator/SkOperandInterpolator.h', + '../src/animator/SkOperandIterpolator.cpp', + '../src/animator/SkPaintParts.cpp', + '../src/animator/SkPaintParts.h', + '../src/animator/SkParseSVGPath.cpp', + '../src/animator/SkPathParts.cpp', + '../src/animator/SkPathParts.h', + '../src/animator/SkPostParts.cpp', + '../src/animator/SkPostParts.h', + '../src/animator/SkScript.cpp', + '../src/animator/SkScript.h', + '../src/animator/SkScript2.h', + '../src/animator/SkScriptCallBack.h', + '../src/animator/SkScriptDecompile.cpp', + '../src/animator/SkScriptRuntime.cpp', + '../src/animator/SkScriptRuntime.h', + '../src/animator/SkScriptTokenizer.cpp', + '../src/animator/SkSnapshot.cpp', + '../src/animator/SkSnapshot.h', + '../src/animator/SkTDArray_Experimental.h', + '../src/animator/SkTextOnPath.cpp', + '../src/animator/SkTextOnPath.h', + '../src/animator/SkTextToPath.cpp', + '../src/animator/SkTextToPath.h', + '../src/animator/SkTime.cpp', + '../src/animator/SkTypedArray.cpp', + '../src/animator/SkTypedArray.h', + '../src/animator/SkXMLAnimatorWriter.cpp', + '../src/animator/SkXMLAnimatorWriter.h', + ], + 'direct_dependent_settings': { + 'include_dirs': [ + '../include/animator', + ], + }, + }, + ], +} + +# Local Variables: +# tab-width:2 +# indent-tabs-mode:nil +# End: +# vim: set expandtab tabstop=2 shiftwidth=2: diff --git a/effects.gyp b/effects.gyp new file mode 100644 index 0000000..6db77b5 --- /dev/null +++ b/effects.gyp @@ -0,0 +1,83 @@ +{ + 'includes': [ + 'target_defaults.gypi', + ], + 'targets': [ + { + 'target_name': 'effects', + 'type': 'static_library', + 'include_dirs': [ + '../include/config', + '../include/core', + '../include/effects', + ], + 'sources': [ + '../include/effects/Sk1DPathEffect.h', + '../include/effects/Sk2DPathEffect.h', + '../include/effects/SkAvoidXfermode.h', + '../include/effects/SkBlurDrawLooper.h', + '../include/effects/SkBlurMaskFilter.h', + '../include/effects/SkColorMatrix.h', + '../include/effects/SkColorMatrixFilter.h', + '../include/effects/SkCornerPathEffect.h', + '../include/effects/SkDashPathEffect.h', + '../include/effects/SkDiscretePathEffect.h', + '../include/effects/SkDrawExtraPathEffect.h', + '../include/effects/SkEmbossMaskFilter.h', + '../include/effects/SkGradientShader.h', + '../include/effects/SkGroupShape.h', + '../include/effects/SkKernel33MaskFilter.h', + '../include/effects/SkLayerDrawLooper.h', + '../include/effects/SkLayerRasterizer.h', + '../include/effects/SkPaintFlagsDrawFilter.h', + '../include/effects/SkPixelXorXfermode.h', + '../include/effects/SkPorterDuff.h', + '../include/effects/SkRectShape.h', + '../include/effects/SkTableMaskFilter.h', + '../include/effects/SkTransparentShader.h', + + '../src/effects/Sk1DPathEffect.cpp', + '../src/effects/Sk2DPathEffect.cpp', + '../src/effects/SkAvoidXfermode.cpp', + '../src/effects/SkBitmapCache.cpp', + '../src/effects/SkBitmapCache.h', + '../src/effects/SkBlurDrawLooper.cpp', + '../src/effects/SkBlurMask.cpp', + '../src/effects/SkBlurMask.h', + '../src/effects/SkBlurMaskFilter.cpp', + '../src/effects/SkColorFilters.cpp', + '../src/effects/SkColorMatrixFilter.cpp', + '../src/effects/SkCornerPathEffect.cpp', + '../src/effects/SkDashPathEffect.cpp', + '../src/effects/SkDiscretePathEffect.cpp', + '../src/effects/SkEmbossMask.cpp', + '../src/effects/SkEmbossMask.h', + '../src/effects/SkEmbossMask_Table.h', + '../src/effects/SkEmbossMaskFilter.cpp', + '../src/effects/SkGradientShader.cpp', + '../src/effects/SkGroupShape.cpp', + '../src/effects/SkKernel33MaskFilter.cpp', + '../src/effects/SkLayerDrawLooper.cpp', + '../src/effects/SkLayerRasterizer.cpp', + '../src/effects/SkPaintFlagsDrawFilter.cpp', + '../src/effects/SkPixelXorXfermode.cpp', + '../src/effects/SkPorterDuff.cpp', + '../src/effects/SkRadialGradient_Table.h', + '../src/effects/SkRectShape.cpp', + '../src/effects/SkTableMaskFilter.cpp', + '../src/effects/SkTransparentShader.cpp', + ], + 'direct_dependent_settings': { + 'include_dirs': [ + '../include/effects', + ], + }, + }, + ], +} + +# Local Variables: +# tab-width:2 +# indent-tabs-mode:nil +# End: +# vim: set expandtab tabstop=2 shiftwidth=2: diff --git a/experimental.gyp b/experimental.gyp new file mode 100644 index 0000000..50e60e8 --- /dev/null +++ b/experimental.gyp @@ -0,0 +1,37 @@ +{ + 'includes': [ + 'target_defaults.gypi', + ], + 'targets': [ + { + 'target_name': 'experimental', + 'type': 'static_library', + 'include_dirs': [ + '../include/config', + '../include/core', + ], + 'sources': [ + '../experimental/SkMatrix44.cpp', + '../experimental/SkMatrix44.h', + '../experimental/SkSetPoly3To3.cpp', + '../experimental/SkSetPoly3To3_A.cpp', + '../experimental/SkSetPoly3To3_D.cpp', + ], + 'sources!': [ + '../experimental/SkMatrix44.cpp', #doesn't compile + '../experimental/SkMatrix44.h', + ], + 'direct_dependent_settings': { + 'include_dirs': [ + '../experimental', + ], + }, + }, + ], +} + +# Local Variables: +# tab-width:2 +# indent-tabs-mode:nil +# End: +# vim: set expandtab tabstop=2 shiftwidth=2: diff --git a/gpu.gyp b/gpu.gyp new file mode 100644 index 0000000..bbfa460 --- /dev/null +++ b/gpu.gyp @@ -0,0 +1,285 @@ +{ + 'includes': [ + 'target_defaults.gypi', + ], + 'targets': [ + { + 'target_name': 'skgr', + 'type': 'static_library', + 'include_dirs': [ + '../include/config', + '../include/core', + '../src/core', + '../include/gpu', + '../gpu/include', + ], + 'sources': [ + '../include/gpu/SkGpuCanvas.h', + '../include/gpu/SkGpuDevice.h', + '../include/gpu/SkGpuDeviceFactory.h', + '../include/gpu/SkGr.h', + '../include/gpu/SkGrTexturePixelRef.h', + + '../src/gpu/GrPrintf_skia.cpp', + '../src/gpu/SkGpuCanvas.cpp', + '../src/gpu/SkGpuDevice.cpp', + '../src/gpu/SkGr.cpp', + '../src/gpu/SkGrFontScaler.cpp', + '../src/gpu/SkGrTexturePixelRef.cpp', + ], + 'conditions': [ + [ 'OS == "linux"', { + 'defines': [ + 'GR_LINUX_BUILD=1', + ], + }], + [ 'OS == "mac"', { + 'defines': [ + 'GR_MAC_BUILD=1', + ], + }], + [ 'OS == "win"', { + 'defines': [ + 'GR_WIN32_BUILD=1', + ], + }], + ], + 'direct_dependent_settings': { + 'conditions': [ + [ 'OS == "linux"', { + 'defines': [ + 'GR_LINUX_BUILD=1', + ], + }], + [ 'OS == "mac"', { + 'defines': [ + 'GR_MAC_BUILD=1', + ], + }], + [ 'OS == "win"', { + 'defines': [ + 'GR_WIN32_BUILD=1', + ], + }], + ], + 'include_dirs': [ + '../include/gpu', + ], + }, + }, + { + 'target_name': 'gr', + 'type': 'static_library', + 'include_dirs': [ + '../gpu/include', + '../include/core', + '../include/config', + ], + 'dependencies': [ + 'libtess.gyp:libtess', + ], + 'sources': [ + '../gpu/include/GrAllocator.h', + '../gpu/include/GrAllocPool.h', + '../gpu/include/GrAtlas.h', + '../gpu/include/GrClip.h', + '../gpu/include/GrClipIterator.h', + '../gpu/include/GrColor.h', + '../gpu/include/GrConfig.h', + '../gpu/include/GrContext.h', + '../gpu/include/GrContext_impl.h', + '../gpu/include/GrDrawTarget.h', + '../gpu/include/GrFontScaler.h', + '../gpu/include/GrGeometryBuffer.h', + '../gpu/include/GrGLConfig.h', + '../gpu/include/GrGLConfig_chrome.h', + '../gpu/include/GrGLIndexBuffer.h', + '../gpu/include/GrGLInterface.h', + '../gpu/include/GrGLIRect.h', + '../gpu/include/GrGLTexture.h', + '../gpu/include/GrGLVertexBuffer.h', + '../gpu/include/GrGlyph.h', + '../gpu/include/GrGpu.h', + '../gpu/include/GrGpuVertex.h', + '../gpu/include/GrIndexBuffer.h', + '../gpu/include/GrInOrderDrawBuffer.h', + '../gpu/include/GrInstanceCounter.h', + '../gpu/include/GrIPoint.h', + '../gpu/include/GrKey.h', + '../gpu/include/GrMatrix.h', + '../gpu/include/GrMemory.h', + '../gpu/include/GrMesh.h', + '../gpu/include/GrNoncopyable.h', + '../gpu/include/GrPaint.h', + '../gpu/include/GrPath.h', + '../gpu/include/GrPathRenderer.h', + '../gpu/include/GrPathSink.h', + '../gpu/include/GrPlotMgr.h', + '../gpu/include/GrPoint.h', + '../gpu/include/GrRandom.h', + '../gpu/include/GrRect.h', + '../gpu/include/GrRectanizer.h', + '../gpu/include/GrRefCnt.h', + '../gpu/include/GrResource.h', + '../gpu/include/GrSamplerState.h', + '../gpu/include/GrScalar.h', + '../gpu/include/GrStencil.h', + '../gpu/include/GrStopwatch.h', + '../gpu/include/GrStringBuilder.h', + '../gpu/include/GrTArray.h', + '../gpu/include/GrTBSearch.h', + '../gpu/include/GrTDArray.h', + '../gpu/include/GrTesselatedPathRenderer.h', + '../gpu/include/GrTextContext.h', + '../gpu/include/GrTextStrike.h', + '../gpu/include/GrTexture.h', + '../gpu/include/GrTextureCache.h', + '../gpu/include/GrTHashCache.h', + '../gpu/include/GrTLList.h', + '../gpu/include/GrTouchGesture.h', + '../gpu/include/GrTypes.h', + '../gpu/include/GrUserConfig.h', + '../gpu/include/GrVertexBuffer.h', + + '../gpu/src/GrAllocPool.cpp', + '../gpu/src/GrAtlas.cpp', + '../gpu/src/GrBinHashKey.h', + '../gpu/src/GrBufferAllocPool.cpp', + '../gpu/src/GrBufferAllocPool.h', + '../gpu/src/GrClip.cpp', + '../gpu/src/GrContext.cpp', + '../gpu/src/GrCreatePathRenderer_none.cpp', + '../gpu/src/GrDrawTarget.cpp', + '../gpu/src/GrGLDefaultInterface_none.cpp', + '../gpu/src/GrGLIndexBuffer.cpp', + '../gpu/src/GrGLInterface.cpp', + '../gpu/src/GrGLProgram.cpp', + '../gpu/src/GrGLProgram.h', + '../gpu/src/GrGLTexture.cpp', + '../gpu/src/GrGLUtil.cpp', + '../gpu/src/GrGLVertexBuffer.cpp', + '../gpu/src/GrGpu.cpp', + '../gpu/src/GrGpuFactory.cpp', + '../gpu/src/GrGpuGL.cpp', + '../gpu/src/GrGpuGL.h', + '../gpu/src/GrGpuGLFixed.cpp', + '../gpu/src/GrGpuGLFixed.h', + '../gpu/src/GrGpuGLShaders.cpp', + '../gpu/src/GrGpuGLShaders.h', + '../gpu/src/GrInOrderDrawBuffer.cpp', + '../gpu/src/GrMatrix.cpp', + '../gpu/src/GrMemory.cpp', + '../gpu/src/GrPathRenderer.cpp', + '../gpu/src/GrPathUtils.cpp', + '../gpu/src/GrPathUtils.h', + '../gpu/src/GrRectanizer.cpp', + '../gpu/src/GrRedBlackTree.h', + '../gpu/src/GrResource.cpp', + '../gpu/src/GrStencil.cpp', + '../gpu/src/GrTesselatedPathRenderer.cpp', + '../gpu/src/GrTextContext.cpp', + '../gpu/src/GrTextStrike.cpp', + '../gpu/src/GrTextStrike_impl.h', + '../gpu/src/GrTexture.cpp', + '../gpu/src/GrTextureCache.cpp', + '../gpu/src/gr_unittests.cpp', + + '../gpu/src/mac/GrGLDefaultInterface_mac.cpp', + + '../gpu/src/win/GrGLDefaultInterface_win.cpp', + + '../gpu/src/unix/GrGLDefaultInterface_unix.cpp', + + '../gpu/src/mesa/GrGLDefaultInterface_mesa.cpp', + ], + 'sources!': [ + '../gpu/src/mesa/GrGLDefaultInterface_mesa.cpp', + ], + 'defines': [ + 'GR_IMPLEMENTATION=1', + ], + 'conditions': [ + [ 'OS == "linux"', { + 'defines': [ + 'GR_LINUX_BUILD=1', + ], + 'sources!': [ + '../gpu/src/GrGLDefaultInterface_none.cpp', + ], + 'link_settings': { + 'libraries': [ + '-lGL', + '-lX11', + ], + }, + }], + [ 'OS == "mac"', { + 'defines': [ + 'GR_MAC_BUILD=1', + ], + 'link_settings': { + 'libraries': [ + '$(SDKROOT)/System/Library/Frameworks/OpenGL.framework', + ], + }, + 'sources!': [ + '../gpu/src/GrGLDefaultInterface_none.cpp', + ], + }], + [ 'OS == "win"', { + 'defines': [ + 'GR_WIN32_BUILD=1', + 'GR_GL_FUNCTION_TYPE=__stdcall', + ], + 'sources!': [ + '../gpu/src/GrGLDefaultInterface_none.cpp', + ], + }], + [ 'OS != "win"', { + 'sources!': [ + '../gpu/src/win/GrGLDefaultInterface_win.cpp', + ], + }], + [ 'OS != "mac"', { + 'sources!': [ + '../gpu/src/mac/GrGLDefaultInterface_mac.cpp', + ], + }], + [ 'OS != "linux"', { + 'sources!': [ + '../gpu/src/unix/GrGLDefaultInterface_unix.cpp', + ], + }], + ], + 'direct_dependent_settings': { + 'conditions': [ + [ 'OS == "linux"', { + 'defines': [ + 'GR_LINUX_BUILD=1', + ], + }], + [ 'OS == "mac"', { + 'defines': [ + 'GR_MAC_BUILD=1', + ], + }], + [ 'OS == "win"', { + 'defines': [ + 'GR_WIN32_BUILD=1', + 'GR_GL_FUNCTION_TYPE=__stdcall', + ], + }], + ], + 'include_dirs': [ + '../gpu/include', + ], + }, + }, + ], +} + +# Local Variables: +# tab-width:2 +# indent-tabs-mode:nil +# End: +# vim: set expandtab tabstop=2 shiftwidth=2: diff --git a/images.gyp b/images.gyp new file mode 100644 index 0000000..dd91501 --- /dev/null +++ b/images.gyp @@ -0,0 +1,104 @@ +{ + 'includes': [ + 'target_defaults.gypi', + ], + 'targets': [ + { + 'target_name': 'images', + 'type': 'static_library', + 'include_dirs': [ + '../include/config', + '../include/core', + '../include/images', + ], + 'sources': [ + '../include/images/SkFlipPixelRef.h', + '../include/images/SkImageDecoder.h', + '../include/images/SkImageEncoder.h', + '../include/images/SkImageRef.h', + '../include/images/SkImageRef_GlobalPool.h', + '../include/images/SkJpegUtility.h', + '../include/images/SkMovie.h', + '../include/images/SkPageFlipper.h', + + '../src/images/bmpdecoderhelper.cpp', + '../src/images/bmpdecoderhelper.h', + '../src/images/SkBitmap_RLEPixels.h', + '../src/images/SkCreateRLEPixelRef.cpp', + '../src/images/SkFDStream.cpp', + '../src/images/SkFlipPixelRef.cpp', + '../src/images/SkImageDecoder.cpp', + '../src/images/SkImageDecoder_Factory.cpp', + '../src/images/SkImageDecoder_libbmp.cpp', + '../src/images/SkImageDecoder_libgif.cpp', + '../src/images/SkImageDecoder_libico.cpp', + '../src/images/SkImageDecoder_libjpeg.cpp', + '../src/images/SkImageDecoder_libpng.cpp', + '../src/images/SkImageDecoder_libpvjpeg.c', + '../src/images/SkImageDecoder_wbmp.cpp', + '../src/images/SkImageEncoder.cpp', + '../src/images/SkImageEncoder_Factory.cpp', + '../src/images/SkImageRef.cpp', + '../src/images/SkImageRefPool.cpp', + '../src/images/SkImageRefPool.h', + '../src/images/SkImageRef_GlobalPool.cpp', + '../src/images/SkJpegUtility.cpp', + '../src/images/SkMovie.cpp', + '../src/images/SkMovie_gif.cpp', + '../src/images/SkPageFlipper.cpp', + '../src/images/SkScaledBitmapSampler.cpp', + '../src/images/SkScaledBitmapSampler.h', + ], + 'conditions': [ + [ 'OS == "win"', { + 'sources!': [ + '../include/images/SkJpegUtility.h', + + '../src/images/SkFDStream.cpp', + '../src/images/SkImageDecoder_libgif.cpp', + '../src/images/SkImageDecoder_libjpeg.cpp', + '../src/images/SkImageDecoder_libpng.cpp', + '../src/images/SkImageDecoder_libpvjpeg.c', + '../src/images/SkJpegUtility.cpp', + '../src/images/SkMovie_gif.cpp', + ], + }], + [ 'OS == "mac"', { + 'sources!': [ + '../include/images/SkJpegUtility.h', + + '../src/images/SkImageDecoder_libgif.cpp', + '../src/images/SkImageDecoder_libjpeg.cpp', + '../src/images/SkImageDecoder_libpng.cpp', + '../src/images/SkImageDecoder_libpvjpeg.c', + '../src/images/SkJpegUtility.cpp', + '../src/images/SkMovie_gif.cpp', + ], + }], + [ 'OS == "linux" or OS == "freebsd" or OS == "openbsd" or OS == "solaris"', { + 'sources!': [ + '../include/images/SkJpegUtility.h', + + '../src/images/SkImageDecoder_libjpeg.cpp', + '../src/images/SkImageDecoder_libgif.cpp', + '../src/images/SkImageDecoder_libpvjpeg.c', + '../src/images/SkJpegUtility.cpp', + '../src/images/SkMovie_gif.cpp', + ], + }], + + ], + 'direct_dependent_settings': { + 'include_dirs': [ + '../include/images', + ], + }, + }, + ], +} + +# Local Variables: +# tab-width:2 +# indent-tabs-mode:nil +# End: +# vim: set expandtab tabstop=2 shiftwidth=2: diff --git a/libtess.gyp b/libtess.gyp new file mode 100644 index 0000000..69e9ffd --- /dev/null +++ b/libtess.gyp @@ -0,0 +1,52 @@ +{ + 'includes': [ + 'target_defaults.gypi', + ], + 'targets': [ + { + 'target_name': 'libtess', + 'type': 'static_library', + 'include_dirs': [ + '../third_party/glu', + ], + 'sources': [ + '../third_party/glu/internal_glu.h', + '../third_party/glu/gluos.h', + '../third_party/glu/libtess/dict-list.h', + '../third_party/glu/libtess/dict.c', + '../third_party/glu/libtess/dict.h', + '../third_party/glu/libtess/geom.c', + '../third_party/glu/libtess/geom.h', + '../third_party/glu/libtess/memalloc.c', + '../third_party/glu/libtess/memalloc.h', + '../third_party/glu/libtess/mesh.c', + '../third_party/glu/libtess/mesh.h', + '../third_party/glu/libtess/normal.c', + '../third_party/glu/libtess/normal.h', + '../third_party/glu/libtess/priorityq-heap.h', + '../third_party/glu/libtess/priorityq-sort.h', + '../third_party/glu/libtess/priorityq.c', + '../third_party/glu/libtess/priorityq.h', + '../third_party/glu/libtess/render.c', + '../third_party/glu/libtess/render.h', + '../third_party/glu/libtess/sweep.c', + '../third_party/glu/libtess/sweep.h', + '../third_party/glu/libtess/tess.c', + '../third_party/glu/libtess/tess.h', + '../third_party/glu/libtess/tessmono.c', + '../third_party/glu/libtess/tessmono.h', + ], + 'direct_dependent_settings': { + 'include_dirs': [ + '../third_party/glu', + ], + }, + }, + ], +} + +# Local Variables: +# tab-width:2 +# indent-tabs-mode:nil +# End: +# vim: set expandtab tabstop=2 shiftwidth=2: diff --git a/opts.gyp b/opts.gyp new file mode 100644 index 0000000..a93bf44 --- /dev/null +++ b/opts.gyp @@ -0,0 +1,52 @@ +{ + 'includes': [ + 'target_defaults.gypi', + ], + 'targets': [ + # Due to an unfortunate intersection of lameness between gcc and gyp, + # we have to build the *_SSE2.cpp files in a separate target. The + # gcc lameness is that, in order to compile SSE2 intrinsics code, it + # must be passed the -msse2 flag. However, with this flag, it may + # emit SSE2 instructions even for scalar code, such as the CPUID + # test used to test for the presence of SSE2. So that, and all other + # code must be compiled *without* -msse2. The gyp lameness is that it + # does not allow file-specific CFLAGS, so we must create this extra + # target for those files to be compiled with -msse2. + # + # This is actually only a problem on 32-bit Linux (all Intel Macs have + # SSE2, Linux x86_64 has SSE2 by definition, and MSC will happily emit + # SSE2 from instrinsics, while generating plain ol' 386 for everything + # else). However, to keep the .gyp file simple and avoid platform-specific + # build breakage, we do this on all platforms. + + # For about the same reason, we need to compile the ARM opts files + # separately as well. + { + 'target_name': 'opts', + 'type': 'static_library', + 'include_dirs': [ + '../include/config', + '../include/core', + '../src/core', + ], + 'conditions': [ + [ '(OS == "linux" or OS == "freebsd" or OS == "openbsd")', { + 'cflags': [ + '-msse2', + ], + }], + ], + 'sources': [ + '../src/opts/SkBitmapProcState_opts_SSE2.cpp', + '../src/opts/SkBlitRow_opts_SSE2.cpp', + '../src/opts/SkUtils_opts_SSE2.cpp', + ], + }, + ], +} + +# Local Variables: +# tab-width:2 +# indent-tabs-mode:nil +# End: +# vim: set expandtab tabstop=2 shiftwidth=2: diff --git a/pdf.gyp b/pdf.gyp new file mode 100644 index 0000000..1ad3e05 --- /dev/null +++ b/pdf.gyp @@ -0,0 +1,55 @@ +{ + 'includes': [ + 'target_defaults.gypi', + ], + 'targets': [ + { + 'target_name': 'pdf', + 'type': 'static_library', + 'include_dirs': [ + '../include/config', + '../include/core', + '../include/pdf', + '../src/core', # needed to get SkGlyphCache.h and SkTextFormatParams.h + ], + 'sources': [ + '../include/pdf/SkPDFCatalog.h', + '../include/pdf/SkPDFDevice.h', + '../include/pdf/SkPDFDocument.h', + '../include/pdf/SkPDFFont.h', + '../include/pdf/SkPDFFormXObject.h', + '../include/pdf/SkPDFGraphicState.h', + '../include/pdf/SkPDFImage.h', + '../include/pdf/SkPDFPage.h', + '../include/pdf/SkPDFShader.h', + '../include/pdf/SkPDFStream.h', + '../include/pdf/SkPDFTypes.h', + '../include/pdf/SkPDFUtils.h', + + '../src/pdf/SkPDFCatalog.cpp', + '../src/pdf/SkPDFDevice.cpp', + '../src/pdf/SkPDFDocument.cpp', + '../src/pdf/SkPDFFont.cpp', + '../src/pdf/SkPDFFormXObject.cpp', + '../src/pdf/SkPDFGraphicState.cpp', + '../src/pdf/SkPDFImage.cpp', + '../src/pdf/SkPDFPage.cpp', + '../src/pdf/SkPDFShader.cpp', + '../src/pdf/SkPDFStream.cpp', + '../src/pdf/SkPDFTypes.cpp', + '../src/pdf/SkPDFUtils.cpp', + ], + 'direct_dependent_settings': { + 'include_dirs': [ + '../include/pdf', + ], + }, + }, + ], +} + +# Local Variables: +# tab-width:2 +# indent-tabs-mode:nil +# End: +# vim: set expandtab tabstop=2 shiftwidth=2: diff --git a/skia.gyp b/skia.gyp index 7bafbf7..c3cc4b4 100644 --- a/skia.gyp +++ b/skia.gyp @@ -1,58 +1,7 @@ { - 'target_defaults': { - 'configurations': { - 'Debug': { - 'defines': [ - 'SK_DEBUG', - 'GR_DEBUG=1', - ], - }, - 'Release': { - 'defines': [ - 'SK_RELEASE', - 'GR_RELEASE=1', - ], - }, - }, - 'conditions': [ - [ 'OS == "linux" or OS == "freebsd" or OS == "openbsd" or OS == "solaris"', { - 'include_dirs' : [ - '/usr/include/freetype2', - ], - }], - [ 'OS == "mac"', { - 'defines': [ - 'SK_BUILD_FOR_MAC', - ], - }], - [ 'OS == "win"', { - 'defines': [ - 'SK_BUILD_FOR_WIN32', - 'SK_IGNORE_STDINT_DOT_H', - ], - }], - [ 'OS == "linux"', { - 'defines': [ - 'SK_SAMPLES_FOR_X', - 'SK_BUILD_FOR_UNIX', - ], - }], - ], - 'direct_dependent_settings': { - 'conditions': [ - [ 'OS == "mac"', { - 'defines': [ - 'SK_BUILD_FOR_MAC', - ], - }], - [ 'OS == "win"', { - 'defines': [ - 'SK_BUILD_FOR_WIN32', - ], - }], - ], - }, - }, + 'includes': [ + 'target_defaults.gypi', + ], 'targets': [ { 'target_name': 'skia', @@ -366,1235 +315,9 @@ ], }, 'dependencies': [ - 'skia_opts' - ], - }, - - # Due to an unfortunate intersection of lameness between gcc and gyp, - # we have to build the *_SSE2.cpp files in a separate target. The - # gcc lameness is that, in order to compile SSE2 intrinsics code, it - # must be passed the -msse2 flag. However, with this flag, it may - # emit SSE2 instructions even for scalar code, such as the CPUID - # test used to test for the presence of SSE2. So that, and all other - # code must be compiled *without* -msse2. The gyp lameness is that it - # does not allow file-specific CFLAGS, so we must create this extra - # target for those files to be compiled with -msse2. - # - # This is actually only a problem on 32-bit Linux (all Intel Macs have - # SSE2, Linux x86_64 has SSE2 by definition, and MSC will happily emit - # SSE2 from instrinsics, while generating plain ol' 386 for everything - # else). However, to keep the .gyp file simple and avoid platform-specific - # build breakage, we do this on all platforms. - - # For about the same reason, we need to compile the ARM opts files - # separately as well. - { - 'target_name': 'skia_opts', - 'type': 'static_library', - 'include_dirs': [ - '../include/config', - '../include/core', - '../src/core', - ], - 'conditions': [ - [ '(OS == "linux" or OS == "freebsd" or OS == "openbsd")', { - 'cflags': [ - '-msse2', - ], - }], - ], - 'sources': [ - '../src/opts/SkBitmapProcState_opts_SSE2.cpp', - '../src/opts/SkBlitRow_opts_SSE2.cpp', - '../src/opts/SkUtils_opts_SSE2.cpp', + 'opts.gyp:opts' ], }, - { - 'target_name': 'effects', - 'type': 'static_library', - 'include_dirs': [ - '../include/config', - '../include/core', - '../include/effects', - ], - 'sources': [ - '../include/effects/Sk1DPathEffect.h', - '../include/effects/Sk2DPathEffect.h', - '../include/effects/SkAvoidXfermode.h', - '../include/effects/SkBlurDrawLooper.h', - '../include/effects/SkBlurMaskFilter.h', - '../include/effects/SkColorMatrix.h', - '../include/effects/SkColorMatrixFilter.h', - '../include/effects/SkCornerPathEffect.h', - '../include/effects/SkDashPathEffect.h', - '../include/effects/SkDiscretePathEffect.h', - '../include/effects/SkDrawExtraPathEffect.h', - '../include/effects/SkEmbossMaskFilter.h', - '../include/effects/SkGradientShader.h', - '../include/effects/SkGroupShape.h', - '../include/effects/SkKernel33MaskFilter.h', - '../include/effects/SkLayerDrawLooper.h', - '../include/effects/SkLayerRasterizer.h', - '../include/effects/SkPaintFlagsDrawFilter.h', - '../include/effects/SkPixelXorXfermode.h', - '../include/effects/SkPorterDuff.h', - '../include/effects/SkRectShape.h', - '../include/effects/SkTableMaskFilter.h', - '../include/effects/SkTransparentShader.h', - - '../src/effects/Sk1DPathEffect.cpp', - '../src/effects/Sk2DPathEffect.cpp', - '../src/effects/SkAvoidXfermode.cpp', - '../src/effects/SkBitmapCache.cpp', - '../src/effects/SkBitmapCache.h', - '../src/effects/SkBlurDrawLooper.cpp', - '../src/effects/SkBlurMask.cpp', - '../src/effects/SkBlurMask.h', - '../src/effects/SkBlurMaskFilter.cpp', - '../src/effects/SkColorFilters.cpp', - '../src/effects/SkColorMatrixFilter.cpp', - '../src/effects/SkCornerPathEffect.cpp', - '../src/effects/SkDashPathEffect.cpp', - '../src/effects/SkDiscretePathEffect.cpp', - '../src/effects/SkEmbossMask.cpp', - '../src/effects/SkEmbossMask.h', - '../src/effects/SkEmbossMask_Table.h', - '../src/effects/SkEmbossMaskFilter.cpp', - '../src/effects/SkGradientShader.cpp', - '../src/effects/SkGroupShape.cpp', - '../src/effects/SkKernel33MaskFilter.cpp', - '../src/effects/SkLayerDrawLooper.cpp', - '../src/effects/SkLayerRasterizer.cpp', - '../src/effects/SkPaintFlagsDrawFilter.cpp', - '../src/effects/SkPixelXorXfermode.cpp', - '../src/effects/SkPorterDuff.cpp', - '../src/effects/SkRadialGradient_Table.h', - '../src/effects/SkRectShape.cpp', - '../src/effects/SkTableMaskFilter.cpp', - '../src/effects/SkTransparentShader.cpp', - ], - 'direct_dependent_settings': { - 'include_dirs': [ - '../include/effects', - ], - }, - }, - { - 'target_name': 'images', - 'type': 'static_library', - 'include_dirs': [ - '../include/config', - '../include/core', - '../include/images', - ], - 'sources': [ - '../include/images/SkFlipPixelRef.h', - '../include/images/SkImageDecoder.h', - '../include/images/SkImageEncoder.h', - '../include/images/SkImageRef.h', - '../include/images/SkImageRef_GlobalPool.h', - '../include/images/SkJpegUtility.h', - '../include/images/SkMovie.h', - '../include/images/SkPageFlipper.h', - - '../src/images/bmpdecoderhelper.cpp', - '../src/images/bmpdecoderhelper.h', - '../src/images/SkBitmap_RLEPixels.h', - '../src/images/SkCreateRLEPixelRef.cpp', - '../src/images/SkFDStream.cpp', - '../src/images/SkFlipPixelRef.cpp', - '../src/images/SkImageDecoder.cpp', - '../src/images/SkImageDecoder_Factory.cpp', - '../src/images/SkImageDecoder_libbmp.cpp', - '../src/images/SkImageDecoder_libgif.cpp', - '../src/images/SkImageDecoder_libico.cpp', - '../src/images/SkImageDecoder_libjpeg.cpp', - '../src/images/SkImageDecoder_libpng.cpp', - '../src/images/SkImageDecoder_libpvjpeg.c', - '../src/images/SkImageDecoder_wbmp.cpp', - '../src/images/SkImageEncoder.cpp', - '../src/images/SkImageEncoder_Factory.cpp', - '../src/images/SkImageRef.cpp', - '../src/images/SkImageRefPool.cpp', - '../src/images/SkImageRefPool.h', - '../src/images/SkImageRef_GlobalPool.cpp', - '../src/images/SkJpegUtility.cpp', - '../src/images/SkMovie.cpp', - '../src/images/SkMovie_gif.cpp', - '../src/images/SkPageFlipper.cpp', - '../src/images/SkScaledBitmapSampler.cpp', - '../src/images/SkScaledBitmapSampler.h', - ], - 'conditions': [ - [ 'OS == "win"', { - 'sources!': [ - '../include/images/SkJpegUtility.h', - - '../src/images/SkFDStream.cpp', - '../src/images/SkImageDecoder_libgif.cpp', - '../src/images/SkImageDecoder_libjpeg.cpp', - '../src/images/SkImageDecoder_libpng.cpp', - '../src/images/SkImageDecoder_libpvjpeg.c', - '../src/images/SkJpegUtility.cpp', - '../src/images/SkMovie_gif.cpp', - ], - }], - [ 'OS == "mac"', { - 'sources!': [ - '../include/images/SkJpegUtility.h', - - '../src/images/SkImageDecoder_libgif.cpp', - '../src/images/SkImageDecoder_libjpeg.cpp', - '../src/images/SkImageDecoder_libpng.cpp', - '../src/images/SkImageDecoder_libpvjpeg.c', - '../src/images/SkJpegUtility.cpp', - '../src/images/SkMovie_gif.cpp', - ], - }], - [ 'OS == "linux" or OS == "freebsd" or OS == "openbsd" or OS == "solaris"', { - 'sources!': [ - '../include/images/SkJpegUtility.h', - - '../src/images/SkImageDecoder_libjpeg.cpp', - '../src/images/SkImageDecoder_libgif.cpp', - '../src/images/SkImageDecoder_libpvjpeg.c', - '../src/images/SkJpegUtility.cpp', - '../src/images/SkMovie_gif.cpp', - ], - }], - - ], - 'direct_dependent_settings': { - 'include_dirs': [ - '../include/images', - ], - }, - }, - { - 'target_name': 'xml', - 'type': 'static_library', - 'include_dirs': [ - '../include/config', - '../include/core', - '../include/xml', - '../include/utils', - ], - 'sources': [ - '../include/xml/SkBML_WXMLParser.h', - '../include/xml/SkBML_XMLParser.h', - '../include/xml/SkDOM.h', - '../include/xml/SkJS.h', - '../include/xml/SkXMLParser.h', - '../include/xml/SkXMLWriter.h', - - '../src/xml/SkBML_Verbs.h', - '../src/xml/SkBML_XMLParser.cpp', - '../src/xml/SkDOM.cpp', - '../src/xml/SkJS.cpp', - '../src/xml/SkJSDisplayable.cpp', - '../src/xml/SkXMLParser.cpp', - '../src/xml/SkXMLPullParser.cpp', - '../src/xml/SkXMLWriter.cpp', - ], - 'sources!': [ - '../src/xml/SkXMLPullParser.cpp', #if 0 around class decl in header - ], - 'conditions': [ - [ 'OS == "win" or OS == "mac" or OS == "linux" or OS == "openbsd" or OS == "solaris"', { - 'sources!': [ - # no jsapi.h by default on system - '../include/xml/SkJS.h', - '../src/xml/SkJS.cpp', - '../src/xml/SkJSDisplayable.cpp', - ], - }], - ], - 'direct_dependent_settings': { - 'include_dirs': [ - '../include/xml', - ], - }, - }, - { - 'target_name': 'pdf', - 'type': 'static_library', - 'include_dirs': [ - '../include/config', - '../include/core', - '../include/pdf', - '../src/core', # needed to get SkGlyphCache.h and SkTextFormatParams.h - ], - 'sources': [ - '../include/pdf/SkPDFCatalog.h', - '../include/pdf/SkPDFDevice.h', - '../include/pdf/SkPDFDocument.h', - '../include/pdf/SkPDFFont.h', - '../include/pdf/SkPDFFormXObject.h', - '../include/pdf/SkPDFGraphicState.h', - '../include/pdf/SkPDFImage.h', - '../include/pdf/SkPDFPage.h', - '../include/pdf/SkPDFShader.h', - '../include/pdf/SkPDFStream.h', - '../include/pdf/SkPDFTypes.h', - '../include/pdf/SkPDFUtils.h', - - '../src/pdf/SkPDFCatalog.cpp', - '../src/pdf/SkPDFDevice.cpp', - '../src/pdf/SkPDFDocument.cpp', - '../src/pdf/SkPDFFont.cpp', - '../src/pdf/SkPDFFormXObject.cpp', - '../src/pdf/SkPDFGraphicState.cpp', - '../src/pdf/SkPDFImage.cpp', - '../src/pdf/SkPDFPage.cpp', - '../src/pdf/SkPDFShader.cpp', - '../src/pdf/SkPDFStream.cpp', - '../src/pdf/SkPDFTypes.cpp', - '../src/pdf/SkPDFUtils.cpp', - ], - 'direct_dependent_settings': { - 'include_dirs': [ - '../include/pdf', - ], - }, - }, - { - 'target_name': 'utils', - 'type': 'static_library', - 'include_dirs': [ - '../include/config', - '../include/core', - '../include/utils', - '../include/views', - '../include/effects', - '../include/xml', - ], - 'sources': [ - '../include/utils/SkBoundaryPatch.h', - '../include/utils/SkCamera.h', - '../include/utils/SkCubicInterval.h', - '../include/utils/SkCullPoints.h', - '../include/utils/SkDumpCanvas.h', - '../include/utils/SkEGLContext.h', - '../include/utils/SkGLCanvas.h', - '../include/utils/SkInterpolator.h', - '../include/utils/SkLayer.h', - '../include/utils/SkMeshUtils.h', - '../include/utils/SkNinePatch.h', - '../include/utils/SkNWayCanvas.h', - '../include/utils/SkParse.h', - '../include/utils/SkParsePaint.h', - '../include/utils/SkParsePath.h', - '../include/utils/SkProxyCanvas.h', - '../include/utils/SkSfntUtils.h', - '../include/utils/SkTextBox.h', - '../include/utils/SkUnitMappers.h', - - '../src/utils/SkBoundaryPatch.cpp', - '../src/utils/SkCamera.cpp', - '../src/utils/SkColorMatrix.cpp', - '../src/utils/SkCubicInterval.cpp', - '../src/utils/SkCullPoints.cpp', - '../src/utils/SkDumpCanvas.cpp', - '../src/utils/SkEGLContext_none.cpp', - '../src/utils/SkInterpolator.cpp', - '../src/utils/SkLayer.cpp', - '../src/utils/SkMeshUtils.cpp', - '../src/utils/SkNinePatch.cpp', - '../src/utils/SkNWayCanvas.cpp', - '../src/utils/SkOSFile.cpp', - '../src/utils/SkParse.cpp', - '../src/utils/SkParseColor.cpp', - '../src/utils/SkParsePath.cpp', - '../src/utils/SkProxyCanvas.cpp', - '../src/utils/SkSfntUtils.cpp', - '../src/utils/SkUnitMappers.cpp', - - '../src/utils/mac/SkEGLContext_Mesa.cpp', - ], - 'sources!': [ - '../src/utils/mac/SkEGLContext_Mesa.cpp', - ], - 'conditions': [ - [ 'OS == "mac"', { - 'sources': [ - '../include/utils/SkCGUtils.h', - '../src/utils/mac/SkCreateCGImageRef.cpp', - '../src/utils/mac/SkEGLContext_mac.cpp', - ], - }], - [ 'OS == "linux" or OS == "freebsd" or OS == "openbsd" or OS == "solaris"', { - 'sources': [ - '../src/utils/unix/SkEGLContext_Unix.cpp', - ], - }], - ], - 'direct_dependent_settings': { - 'include_dirs': [ - '../include/utils', - ], - }, - }, - { - 'target_name': 'views', - 'type': 'static_library', - 'include_dirs': [ - '../include/config', - '../include/core', - '../include/views', - '../include/xml', - '../include/utils', - '../include/images', - '../include/animator', - '../include/effects', - ], - 'sources': [ - '../include/views/SkApplication.h', - '../include/views/SkBGViewArtist.h', - '../include/views/SkBorderView.h', - '../include/views/SkEvent.h', - '../include/views/SkEventSink.h', - '../include/views/SkImageView.h', - '../include/views/SkKey.h', - '../include/views/SkOSMenu.h', - '../include/views/SkOSWindow_Mac.h', - '../include/views/SkOSWindow_SDL.h', - '../include/views/SkOSWindow_Unix.h', - '../include/views/SkOSWindow_Win.h', - #'../include/views/SkOSWindow_wxwidgets.h', - '../include/views/SkProgressBarView.h', - '../include/views/SkScrollBarView.h', - '../include/views/SkStackViewLayout.h', - '../include/views/SkSystemEventTypes.h', - '../include/views/SkTouchGesture.h', - '../include/views/SkView.h', - '../include/views/SkViewInflate.h', - '../include/views/SkWidget.h', - '../include/views/SkWidgetViews.h', - '../include/views/SkWindow.h', - - '../src/views/SkBGViewArtist.cpp', - '../src/views/SkBorderView.cpp', - '../src/views/SkEvent.cpp', - '../src/views/SkEventSink.cpp', - '../src/views/SkImageView.cpp', - '../src/views/SkListView.cpp', - '../src/views/SkListWidget.cpp', - '../src/views/SkOSMenu.cpp', - '../src/views/SkParsePaint.cpp', - '../src/views/SkProgressBarView.cpp', - '../src/views/SkProgressView.cpp', - '../src/views/SkScrollBarView.cpp', - '../src/views/SkStackViewLayout.cpp', - '../src/views/SkStaticTextView.cpp', - '../src/views/SkTagList.cpp', - '../src/views/SkTagList.h', - '../src/views/SkTextBox.cpp', - '../src/views/SkTouchGesture.cpp', - '../src/views/SkView.cpp', - '../src/views/SkViewInflate.cpp', - '../src/views/SkViewPriv.cpp', - '../src/views/SkViewPriv.h', - '../src/views/SkWidget.cpp', - '../src/views/SkWidgets.cpp', - '../src/views/SkWidgetViews.cpp', - '../src/views/SkWindow.cpp', - ], - 'sources!' : [ - '../src/views/SkListView.cpp', #depends on missing SkListSource implementation - '../src/views/SkListWidget.cpp', #depends on missing SkListSource implementation - ], - 'conditions': [ - [ 'OS == "win"', { - 'sources': [ - '../src/utils/win/SkOSWindow_Win.cpp', - '../src/utils/win/skia_win.cpp', - ], - }], - [ 'OS == "mac"', { - 'sources': [ - '../include/utils/SkCGUtils.h', - #'../src/utils/mac/SkBitmap_Mac.cpp', - '../src/utils/mac/SkCreateCGImageRef.cpp', - '../src/utils/mac/SkEGLContext_mac.cpp', - '../src/utils/mac/skia_mac.cpp', - '../src/utils/mac/SkOSWindow_Mac.cpp', - ], - 'link_settings': { - 'libraries': [ - '$(SDKROOT)/System/Library/Frameworks/Carbon.framework', - '$(SDKROOT)/System/Library/Frameworks/AGL.framework', - ], - }, - }], - [ 'OS == "linux" or OS == "freebsd" or OS == "openbsd" or OS == "solaris"', { - 'include_dirs' : [ - '../include/utils/unix', - ], - 'sources': [ - '../src/utils/unix/keysym2ucs.c', - '../src/utils/unix/SkOSWindow_Unix.cpp', - '../unix_test_app/main.cpp', - ], - }], - ], - 'direct_dependent_settings': { - 'include_dirs': [ - '../include/views', - ], - }, - }, - { - 'target_name': 'skgr', - 'type': 'static_library', - 'include_dirs': [ - '../include/config', - '../include/core', - '../src/core', - '../include/gpu', - '../gpu/include', - ], - 'sources': [ - '../include/gpu/SkGpuCanvas.h', - '../include/gpu/SkGpuDevice.h', - '../include/gpu/SkGpuDeviceFactory.h', - '../include/gpu/SkGr.h', - '../include/gpu/SkGrTexturePixelRef.h', - - '../src/gpu/GrPrintf_skia.cpp', - '../src/gpu/SkGpuCanvas.cpp', - '../src/gpu/SkGpuDevice.cpp', - '../src/gpu/SkGr.cpp', - '../src/gpu/SkGrFontScaler.cpp', - '../src/gpu/SkGrTexturePixelRef.cpp', - ], - 'conditions': [ - [ 'OS == "linux"', { - 'defines': [ - 'GR_LINUX_BUILD=1', - ], - }], - [ 'OS == "mac"', { - 'defines': [ - 'GR_MAC_BUILD=1', - ], - }], - [ 'OS == "win"', { - 'defines': [ - 'GR_WIN32_BUILD=1', - ], - }], - ], - 'direct_dependent_settings': { - 'conditions': [ - [ 'OS == "linux"', { - 'defines': [ - 'GR_LINUX_BUILD=1', - ], - }], - [ 'OS == "mac"', { - 'defines': [ - 'GR_MAC_BUILD=1', - ], - }], - [ 'OS == "win"', { - 'defines': [ - 'GR_WIN32_BUILD=1', - ], - }], - ], - 'include_dirs': [ - '../include/gpu', - ], - }, - }, - { - 'target_name': 'gr', - 'type': 'static_library', - 'include_dirs': [ - '../gpu/include', - '../include/core', - '../include/config', - ], - 'dependencies': [ - 'libtess', - ], - 'sources': [ - '../gpu/include/GrAllocator.h', - '../gpu/include/GrAllocPool.h', - '../gpu/include/GrAtlas.h', - '../gpu/include/GrClip.h', - '../gpu/include/GrClipIterator.h', - '../gpu/include/GrColor.h', - '../gpu/include/GrConfig.h', - '../gpu/include/GrContext.h', - '../gpu/include/GrContext_impl.h', - '../gpu/include/GrDrawTarget.h', - '../gpu/include/GrFontScaler.h', - '../gpu/include/GrGeometryBuffer.h', - '../gpu/include/GrGLConfig.h', - '../gpu/include/GrGLConfig_chrome.h', - '../gpu/include/GrGLIndexBuffer.h', - '../gpu/include/GrGLInterface.h', - '../gpu/include/GrGLIRect.h', - '../gpu/include/GrGLTexture.h', - '../gpu/include/GrGLVertexBuffer.h', - '../gpu/include/GrGlyph.h', - '../gpu/include/GrGpu.h', - '../gpu/include/GrGpuVertex.h', - '../gpu/include/GrIndexBuffer.h', - '../gpu/include/GrInOrderDrawBuffer.h', - '../gpu/include/GrInstanceCounter.h', - '../gpu/include/GrIPoint.h', - '../gpu/include/GrKey.h', - '../gpu/include/GrMatrix.h', - '../gpu/include/GrMemory.h', - '../gpu/include/GrMesh.h', - '../gpu/include/GrNoncopyable.h', - '../gpu/include/GrPaint.h', - '../gpu/include/GrPath.h', - '../gpu/include/GrPathRenderer.h', - '../gpu/include/GrPathSink.h', - '../gpu/include/GrPlotMgr.h', - '../gpu/include/GrPoint.h', - '../gpu/include/GrRandom.h', - '../gpu/include/GrRect.h', - '../gpu/include/GrRectanizer.h', - '../gpu/include/GrRefCnt.h', - '../gpu/include/GrResource.h', - '../gpu/include/GrSamplerState.h', - '../gpu/include/GrScalar.h', - '../gpu/include/GrStencil.h', - '../gpu/include/GrStopwatch.h', - '../gpu/include/GrStringBuilder.h', - '../gpu/include/GrTArray.h', - '../gpu/include/GrTBSearch.h', - '../gpu/include/GrTDArray.h', - '../gpu/include/GrTesselatedPathRenderer.h', - '../gpu/include/GrTextContext.h', - '../gpu/include/GrTextStrike.h', - '../gpu/include/GrTexture.h', - '../gpu/include/GrTextureCache.h', - '../gpu/include/GrTHashCache.h', - '../gpu/include/GrTLList.h', - '../gpu/include/GrTouchGesture.h', - '../gpu/include/GrTypes.h', - '../gpu/include/GrUserConfig.h', - '../gpu/include/GrVertexBuffer.h', - - '../gpu/src/GrAllocPool.cpp', - '../gpu/src/GrAtlas.cpp', - '../gpu/src/GrBinHashKey.h', - '../gpu/src/GrBufferAllocPool.cpp', - '../gpu/src/GrBufferAllocPool.h', - '../gpu/src/GrClip.cpp', - '../gpu/src/GrContext.cpp', - '../gpu/src/GrCreatePathRenderer_none.cpp', - '../gpu/src/GrDrawTarget.cpp', - '../gpu/src/GrGLDefaultInterface_none.cpp', - '../gpu/src/GrGLIndexBuffer.cpp', - '../gpu/src/GrGLInterface.cpp', - '../gpu/src/GrGLProgram.cpp', - '../gpu/src/GrGLProgram.h', - '../gpu/src/GrGLTexture.cpp', - '../gpu/src/GrGLUtil.cpp', - '../gpu/src/GrGLVertexBuffer.cpp', - '../gpu/src/GrGpu.cpp', - '../gpu/src/GrGpuFactory.cpp', - '../gpu/src/GrGpuGL.cpp', - '../gpu/src/GrGpuGL.h', - '../gpu/src/GrGpuGLFixed.cpp', - '../gpu/src/GrGpuGLFixed.h', - '../gpu/src/GrGpuGLShaders.cpp', - '../gpu/src/GrGpuGLShaders.h', - '../gpu/src/GrInOrderDrawBuffer.cpp', - '../gpu/src/GrMatrix.cpp', - '../gpu/src/GrMemory.cpp', - '../gpu/src/GrPathRenderer.cpp', - '../gpu/src/GrPathUtils.cpp', - '../gpu/src/GrPathUtils.h', - '../gpu/src/GrRectanizer.cpp', - '../gpu/src/GrRedBlackTree.h', - '../gpu/src/GrResource.cpp', - '../gpu/src/GrStencil.cpp', - '../gpu/src/GrTesselatedPathRenderer.cpp', - '../gpu/src/GrTextContext.cpp', - '../gpu/src/GrTextStrike.cpp', - '../gpu/src/GrTextStrike_impl.h', - '../gpu/src/GrTexture.cpp', - '../gpu/src/GrTextureCache.cpp', - '../gpu/src/gr_unittests.cpp', - - '../gpu/src/mac/GrGLDefaultInterface_mac.cpp', - - '../gpu/src/win/GrGLDefaultInterface_win.cpp', - - '../gpu/src/unix/GrGLDefaultInterface_unix.cpp', - - '../gpu/src/mesa/GrGLDefaultInterface_mesa.cpp', - ], - 'sources!': [ - '../gpu/src/mesa/GrGLDefaultInterface_mesa.cpp', - ], - 'defines': [ - 'GR_IMPLEMENTATION=1', - ], - 'conditions': [ - [ 'OS == "linux"', { - 'defines': [ - 'GR_LINUX_BUILD=1', - ], - 'sources!': [ - '../gpu/src/GrGLDefaultInterface_none.cpp', - ], - 'link_settings': { - 'libraries': [ - '-lGL', - '-lX11', - ], - }, - }], - [ 'OS == "mac"', { - 'defines': [ - 'GR_MAC_BUILD=1', - ], - 'link_settings': { - 'libraries': [ - '$(SDKROOT)/System/Library/Frameworks/OpenGL.framework', - ], - }, - 'sources!': [ - '../gpu/src/GrGLDefaultInterface_none.cpp', - ], - }], - [ 'OS == "win"', { - 'defines': [ - 'GR_WIN32_BUILD=1', - 'GR_GL_FUNCTION_TYPE=__stdcall', - ], - 'sources!': [ - '../gpu/src/GrGLDefaultInterface_none.cpp', - ], - }], - [ 'OS != "win"', { - 'sources!': [ - '../gpu/src/win/GrGLDefaultInterface_win.cpp', - ], - }], - [ 'OS != "mac"', { - 'sources!': [ - '../gpu/src/mac/GrGLDefaultInterface_mac.cpp', - ], - }], - [ 'OS != "linux"', { - 'sources!': [ - '../gpu/src/unix/GrGLDefaultInterface_unix.cpp', - ], - }], - ], - 'direct_dependent_settings': { - 'conditions': [ - [ 'OS == "linux"', { - 'defines': [ - 'GR_LINUX_BUILD=1', - ], - }], - [ 'OS == "mac"', { - 'defines': [ - 'GR_MAC_BUILD=1', - ], - }], - [ 'OS == "win"', { - 'defines': [ - 'GR_WIN32_BUILD=1', - 'GR_GL_FUNCTION_TYPE=__stdcall', - ], - }], - ], - 'include_dirs': [ - '../gpu/include', - ], - }, - }, - { - 'target_name': 'animator', - 'type': 'static_library', - 'include_dirs': [ - '../include/config', - '../include/core', - '../include/effects', - '../include/animator', - '../include/views', - '../include/xml', - '../include/utils', - '../include/images', - ], - 'sources': [ - '../include/animator/SkAnimator.h', - '../include/animator/SkAnimatorView.h', - - '../src/animator/SkAnimate.h', - '../src/animator/SkAnimateActive.cpp', - '../src/animator/SkAnimateActive.h', - '../src/animator/SkAnimateBase.cpp', - '../src/animator/SkAnimateBase.h', - '../src/animator/SkAnimateField.cpp', - '../src/animator/SkAnimateMaker.cpp', - '../src/animator/SkAnimateMaker.h', - '../src/animator/SkAnimateProperties.h', - '../src/animator/SkAnimateSet.cpp', - '../src/animator/SkAnimateSet.h', - '../src/animator/SkAnimator.cpp', - '../src/animator/SkAnimatorScript.cpp', - '../src/animator/SkAnimatorScript.h', - #'../src/animator/SkAnimatorScript2.cpp', fails on windows - #'../src/animator/SkAnimatorScript2.h', - '../src/animator/SkBase64.cpp', - '../src/animator/SkBase64.h', - '../src/animator/SkBoundable.cpp', - '../src/animator/SkBoundable.h', - '../src/animator/SkBuildCondensedInfo.cpp', - #'../src/animator/SkCondensedDebug.cpp', fails on windows - #'../src/animator/SkCondensedRelease.cpp', - '../src/animator/SkDisplayable.cpp', - '../src/animator/SkDisplayable.h', - '../src/animator/SkDisplayAdd.cpp', - '../src/animator/SkDisplayAdd.h', - '../src/animator/SkDisplayApply.cpp', - '../src/animator/SkDisplayApply.h', - '../src/animator/SkDisplayBounds.cpp', - '../src/animator/SkDisplayBounds.h', - '../src/animator/SkDisplayEvent.cpp', - '../src/animator/SkDisplayEvent.h', - '../src/animator/SkDisplayEvents.cpp', - '../src/animator/SkDisplayEvents.h', - '../src/animator/SkDisplayInclude.cpp', - '../src/animator/SkDisplayInclude.h', - '../src/animator/SkDisplayInput.cpp', - '../src/animator/SkDisplayInput.h', - '../src/animator/SkDisplayList.cpp', - '../src/animator/SkDisplayList.h', - '../src/animator/SkDisplayMath.cpp', - '../src/animator/SkDisplayMath.h', - '../src/animator/SkDisplayMovie.cpp', - '../src/animator/SkDisplayMovie.h', - '../src/animator/SkDisplayNumber.cpp', - '../src/animator/SkDisplayNumber.h', - '../src/animator/SkDisplayPost.cpp', - '../src/animator/SkDisplayPost.h', - '../src/animator/SkDisplayRandom.cpp', - '../src/animator/SkDisplayRandom.h', - '../src/animator/SkDisplayScreenplay.cpp', - '../src/animator/SkDisplayScreenplay.h', - '../src/animator/SkDisplayType.cpp', - '../src/animator/SkDisplayType.h', - '../src/animator/SkDisplayTypes.cpp', - '../src/animator/SkDisplayTypes.h', - '../src/animator/SkDisplayXMLParser.cpp', - '../src/animator/SkDisplayXMLParser.h', - '../src/animator/SkDraw3D.cpp', - '../src/animator/SkDraw3D.h', - '../src/animator/SkDrawable.cpp', - '../src/animator/SkDrawable.h', - '../src/animator/SkDrawBitmap.cpp', - '../src/animator/SkDrawBitmap.h', - '../src/animator/SkDrawBlur.cpp', - '../src/animator/SkDrawBlur.h', - '../src/animator/SkDrawClip.cpp', - '../src/animator/SkDrawClip.h', - '../src/animator/SkDrawColor.cpp', - '../src/animator/SkDrawColor.h', - '../src/animator/SkDrawDash.cpp', - '../src/animator/SkDrawDash.h', - '../src/animator/SkDrawDiscrete.cpp', - '../src/animator/SkDrawDiscrete.h', - '../src/animator/SkDrawEmboss.cpp', - '../src/animator/SkDrawEmboss.h', - '../src/animator/SkDrawExtraPathEffect.cpp', - '../src/animator/SkDrawFull.cpp', - '../src/animator/SkDrawFull.h', - '../src/animator/SkDrawGradient.cpp', - '../src/animator/SkDrawGradient.h', - '../src/animator/SkDrawGroup.cpp', - '../src/animator/SkDrawGroup.h', - '../src/animator/SkDrawLine.cpp', - '../src/animator/SkDrawLine.h', - '../src/animator/SkDrawMatrix.cpp', - '../src/animator/SkDrawMatrix.h', - '../src/animator/SkDrawOval.cpp', - '../src/animator/SkDrawOval.h', - '../src/animator/SkDrawPaint.cpp', - '../src/animator/SkDrawPaint.h', - '../src/animator/SkDrawPath.cpp', - '../src/animator/SkDrawPath.h', - '../src/animator/SkDrawPoint.cpp', - '../src/animator/SkDrawPoint.h', - '../src/animator/SkDrawRectangle.cpp', - '../src/animator/SkDrawRectangle.h', - '../src/animator/SkDrawSaveLayer.cpp', - '../src/animator/SkDrawSaveLayer.h', - '../src/animator/SkDrawShader.cpp', - '../src/animator/SkDrawShader.h', - '../src/animator/SkDrawText.cpp', - '../src/animator/SkDrawText.h', - '../src/animator/SkDrawTextBox.cpp', - '../src/animator/SkDrawTextBox.h', - '../src/animator/SkDrawTo.cpp', - '../src/animator/SkDrawTo.h', - '../src/animator/SkDrawTransparentShader.cpp', - '../src/animator/SkDrawTransparentShader.h', - '../src/animator/SkDump.cpp', - '../src/animator/SkDump.h', - '../src/animator/SkExtras.h', - '../src/animator/SkGetCondensedInfo.cpp', - '../src/animator/SkHitClear.cpp', - '../src/animator/SkHitClear.h', - '../src/animator/SkHitTest.cpp', - '../src/animator/SkHitTest.h', - '../src/animator/SkIntArray.h', - '../src/animator/SkMatrixParts.cpp', - '../src/animator/SkMatrixParts.h', - '../src/animator/SkMemberInfo.cpp', - '../src/animator/SkMemberInfo.h', - '../src/animator/SkOpArray.cpp', - '../src/animator/SkOpArray.h', - '../src/animator/SkOperand.h', - '../src/animator/SkOperand2.h', - '../src/animator/SkOperandInterpolator.h', - '../src/animator/SkOperandIterpolator.cpp', - '../src/animator/SkPaintParts.cpp', - '../src/animator/SkPaintParts.h', - '../src/animator/SkParseSVGPath.cpp', - '../src/animator/SkPathParts.cpp', - '../src/animator/SkPathParts.h', - '../src/animator/SkPostParts.cpp', - '../src/animator/SkPostParts.h', - '../src/animator/SkScript.cpp', - '../src/animator/SkScript.h', - '../src/animator/SkScript2.h', - '../src/animator/SkScriptCallBack.h', - '../src/animator/SkScriptDecompile.cpp', - '../src/animator/SkScriptRuntime.cpp', - '../src/animator/SkScriptRuntime.h', - '../src/animator/SkScriptTokenizer.cpp', - '../src/animator/SkSnapshot.cpp', - '../src/animator/SkSnapshot.h', - '../src/animator/SkTDArray_Experimental.h', - '../src/animator/SkTextOnPath.cpp', - '../src/animator/SkTextOnPath.h', - '../src/animator/SkTextToPath.cpp', - '../src/animator/SkTextToPath.h', - '../src/animator/SkTime.cpp', - '../src/animator/SkTypedArray.cpp', - '../src/animator/SkTypedArray.h', - '../src/animator/SkXMLAnimatorWriter.cpp', - '../src/animator/SkXMLAnimatorWriter.h', - ], - 'direct_dependent_settings': { - 'include_dirs': [ - '../include/animator', - ], - }, - }, - - { - 'target_name': 'svg', - 'type': 'static_library', - 'include_dirs': [ - '../include/config', - '../include/core', - '../include/xml', - '../include/utils', - '../include/svg', - ], - 'sources': [ - '../include/svg/SkSVGAttribute.h', - '../include/svg/SkSVGBase.h', - '../include/svg/SkSVGPaintState.h', - '../include/svg/SkSVGParser.h', - '../include/svg/SkSVGTypes.h', - - '../src/svg/SkSVGCircle.cpp', - '../src/svg/SkSVGCircle.h', - '../src/svg/SkSVGClipPath.cpp', - '../src/svg/SkSVGClipPath.h', - '../src/svg/SkSVGDefs.cpp', - '../src/svg/SkSVGDefs.h', - '../src/svg/SkSVGElements.cpp', - '../src/svg/SkSVGElements.h', - '../src/svg/SkSVGEllipse.cpp', - '../src/svg/SkSVGEllipse.h', - '../src/svg/SkSVGFeColorMatrix.cpp', - '../src/svg/SkSVGFeColorMatrix.h', - '../src/svg/SkSVGFilter.cpp', - '../src/svg/SkSVGFilter.h', - '../src/svg/SkSVGG.cpp', - '../src/svg/SkSVGG.h', - '../src/svg/SkSVGGradient.cpp', - '../src/svg/SkSVGGradient.h', - '../src/svg/SkSVGGroup.cpp', - '../src/svg/SkSVGGroup.h', - '../src/svg/SkSVGImage.cpp', - '../src/svg/SkSVGImage.h', - '../src/svg/SkSVGLine.cpp', - '../src/svg/SkSVGLine.h', - '../src/svg/SkSVGLinearGradient.cpp', - '../src/svg/SkSVGLinearGradient.h', - '../src/svg/SkSVGMask.cpp', - '../src/svg/SkSVGMask.h', - '../src/svg/SkSVGMetadata.cpp', - '../src/svg/SkSVGMetadata.h', - '../src/svg/SkSVGPaintState.cpp', - '../src/svg/SkSVGParser.cpp', - '../src/svg/SkSVGPath.cpp', - '../src/svg/SkSVGPath.h', - '../src/svg/SkSVGPolygon.cpp', - '../src/svg/SkSVGPolygon.h', - '../src/svg/SkSVGPolyline.cpp', - '../src/svg/SkSVGPolyline.h', - '../src/svg/SkSVGRadialGradient.cpp', - '../src/svg/SkSVGRadialGradient.h', - '../src/svg/SkSVGRect.cpp', - '../src/svg/SkSVGRect.h', - '../src/svg/SkSVGStop.cpp', - '../src/svg/SkSVGStop.h', - '../src/svg/SkSVGSVG.cpp', - '../src/svg/SkSVGSVG.h', - '../src/svg/SkSVGSymbol.cpp', - '../src/svg/SkSVGSymbol.h', - '../src/svg/SkSVGText.cpp', - '../src/svg/SkSVGText.h', - '../src/svg/SkSVGUse.cpp', - ], - 'sources!' : [ - '../src/svg/SkSVG.cpp', # doesn't compile, maybe this is test code? - ], - 'direct_dependent_settings': { - 'include_dirs': [ - '../include/svg', - ], - }, - }, - - { - 'target_name': 'experimental', - 'type': 'static_library', - 'include_dirs': [ - '../include/config', - '../include/core', - ], - 'sources': [ - '../experimental/SkMatrix44.cpp', - '../experimental/SkMatrix44.h', - '../experimental/SkSetPoly3To3.cpp', - '../experimental/SkSetPoly3To3_A.cpp', - '../experimental/SkSetPoly3To3_D.cpp', - ], - 'sources!': [ - '../experimental/SkMatrix44.cpp', #doesn't compile - '../experimental/SkMatrix44.h', - ], - 'direct_dependent_settings': { - 'include_dirs': [ - '../experimental', - ], - }, - }, - - { - 'target_name': 'SampleApp', - 'type': 'executable', - 'mac_bundle' : 1, - 'include_dirs' : [ - '../src/core', # needed to get SkConcaveToTriangle, maybe this should be moved to include dir? - '../gm', # SampleGM.cpp pulls gm.h - ], - 'sources': [ - # gm files needed for SampleGM.cpp - '../gm/bitmapfilters.cpp', - '../gm/blurs.cpp', - '../gm/complexclip.cpp', - '../gm/filltypes.cpp', - '../gm/gm.h', - '../gm/gradients.cpp', - '../gm/nocolorbleed.cpp', - '../gm/points.cpp', - '../gm/poly2poly.cpp', - '../gm/shadertext.cpp', - '../gm/shadows.cpp', - '../gm/shapes.cpp', - '../gm/tilemodes.cpp', - '../gm/xfermodes.cpp', - - '../samplecode/ClockFaceView.cpp', - '../samplecode/OverView.cpp', - '../samplecode/SampleAll.cpp', - '../samplecode/SampleAnimator.cpp', - '../samplecode/SampleApp.cpp', - '../samplecode/SampleArc.cpp', - '../samplecode/SampleAvoid.cpp', - '../samplecode/SampleBigGradient.cpp', - '../samplecode/SampleBitmapRect.cpp', - '../samplecode/SampleBlur.cpp', - '../samplecode/SampleCamera.cpp', - '../samplecode/SampleCircle.cpp', - '../samplecode/SampleCode.h', - '../samplecode/SampleColorFilter.cpp', - '../samplecode/SampleComplexClip.cpp', - '../samplecode/SampleCull.cpp', - '../samplecode/SampleDecode.cpp', - '../samplecode/SampleDither.cpp', - '../samplecode/SampleDitherBitmap.cpp', - '../samplecode/SampleDrawLooper.cpp', - '../samplecode/SampleEffects.cpp', - '../samplecode/SampleEmboss.cpp', - '../samplecode/SampleEncode.cpp', - '../samplecode/SampleExtractAlpha.cpp', - '../samplecode/SampleFillType.cpp', - '../samplecode/SampleFilter.cpp', - '../samplecode/SampleFilter2.cpp', - '../samplecode/SampleFontCache.cpp', - '../samplecode/SampleFontScalerTest.cpp', - '../samplecode/SampleFuzz.cpp', - '../samplecode/SampleGM.cpp', - '../samplecode/SampleGradients.cpp', - '../samplecode/SampleHairline.cpp', - '../samplecode/SampleImage.cpp', - '../samplecode/SampleImageDir.cpp', - '../samplecode/SampleLayerMask.cpp', - '../samplecode/SampleLayers.cpp', - '../samplecode/SampleLCD.cpp', - '../samplecode/SampleLineClipper.cpp', - '../samplecode/SampleLines.cpp', - '../samplecode/SampleMeasure.cpp', - '../samplecode/SampleMipMap.cpp', - '../samplecode/SampleMovie.cpp', - '../samplecode/SampleNinePatch.cpp', - '../samplecode/SampleOvalTest.cpp', - '../samplecode/SampleOverflow.cpp', - '../samplecode/SamplePageFlip.cpp', - '../samplecode/SamplePatch.cpp', - '../samplecode/SamplePath.cpp', - '../samplecode/SamplePathClip.cpp', - '../samplecode/SamplePathEffects.cpp', - '../samplecode/SamplePicture.cpp', - '../samplecode/SamplePoints.cpp', - '../samplecode/SamplePolyToPoly.cpp', - '../samplecode/SampleAARects.cpp', - '../samplecode/SampleRegion.cpp', - '../samplecode/SampleRepeatTile.cpp', - '../samplecode/SampleShaders.cpp', - '../samplecode/SampleShaderText.cpp', - '../samplecode/SampleShapes.cpp', - '../samplecode/SampleSkLayer.cpp', - '../samplecode/SampleSlides.cpp', - '../samplecode/SampleStrokePath.cpp', - '../samplecode/SampleStrokeText.cpp', - '../samplecode/SampleSVG.cpp', - '../samplecode/SampleTests.cpp', - '../samplecode/SampleText.cpp', - '../samplecode/SampleTextAlpha.cpp', - '../samplecode/SampleTextBox.cpp', - '../samplecode/SampleTextEffects.cpp', - '../samplecode/SampleTextOnPath.cpp', - '../samplecode/SampleTextureDomain.cpp', - '../samplecode/SampleTiling.cpp', - '../samplecode/SampleTinyBitmap.cpp', - '../samplecode/SampleTriangles.cpp', - '../samplecode/SampleTypeface.cpp', - '../samplecode/SampleUnitMapper.cpp', - '../samplecode/SampleVertices.cpp', - '../samplecode/SampleXfermodes.cpp', - '../samplecode/SampleXfermodesBlur.cpp', - ], - 'sources!': [ - '../samplecode/SampleSkLayer.cpp', #relies on SkMatrix44 which doesn't compile - '../samplecode/SampleTests.cpp', #includes unknown file SkShaderExtras.h - '../samplecode/SampleWarp.cpp', - '../samplecode/SampleFontCache.cpp', - ], - 'dependencies': [ - 'skia', - 'effects', - 'images', - 'views', - 'utils', - 'animator', - 'xml', - 'svg', - 'experimental', - 'gr', - 'skgr', - ], - 'conditions' : [ - [ 'OS == "linux" or OS == "freebsd" or OS == "openbsd" or OS == "solaris"', { - 'sources!': [ - '../samplecode/SampleDecode.cpp', - ], - }], - [ 'OS == "win"', { - 'sources!': [ - # require UNIX functions - '../samplecode/SampleEncode.cpp', - '../samplecode/SamplePageFlip.cpp', - ], - }], - [ 'OS == "mac"', { - 'sources!': [ - '../samplecode/SampleDecode.cpp', - ], - }], - - ], - 'msvs_settings': { - 'VCLinkerTool': { - 'SubSystem': '2', - 'AdditionalDependencies': [ - 'OpenGL32.lib', - 'usp10.lib', - 'd3d9.lib', - ], - }, - }, - }, - { - 'target_name': 'libtess', - 'type': 'static_library', - 'include_dirs': [ - '../third_party/glu', - ], - 'sources': [ - '../third_party/glu/internal_glu.h', - '../third_party/glu/gluos.h', - '../third_party/glu/libtess/dict-list.h', - '../third_party/glu/libtess/dict.c', - '../third_party/glu/libtess/dict.h', - '../third_party/glu/libtess/geom.c', - '../third_party/glu/libtess/geom.h', - '../third_party/glu/libtess/memalloc.c', - '../third_party/glu/libtess/memalloc.h', - '../third_party/glu/libtess/mesh.c', - '../third_party/glu/libtess/mesh.h', - '../third_party/glu/libtess/normal.c', - '../third_party/glu/libtess/normal.h', - '../third_party/glu/libtess/priorityq-heap.h', - '../third_party/glu/libtess/priorityq-sort.h', - '../third_party/glu/libtess/priorityq.c', - '../third_party/glu/libtess/priorityq.h', - '../third_party/glu/libtess/render.c', - '../third_party/glu/libtess/render.h', - '../third_party/glu/libtess/sweep.c', - '../third_party/glu/libtess/sweep.h', - '../third_party/glu/libtess/tess.c', - '../third_party/glu/libtess/tess.h', - '../third_party/glu/libtess/tessmono.c', - '../third_party/glu/libtess/tessmono.h', - ], - 'direct_dependent_settings': { - 'include_dirs': [ - '../third_party/glu', - ], - }, - }, ], } diff --git a/svg.gyp b/svg.gyp new file mode 100644 index 0000000..273ddec --- /dev/null +++ b/svg.gyp @@ -0,0 +1,91 @@ +{ + 'includes': [ + 'target_defaults.gypi', + ], + 'targets': [ + { + 'target_name': 'svg', + 'type': 'static_library', + 'include_dirs': [ + '../include/config', + '../include/core', + '../include/xml', + '../include/utils', + '../include/svg', + ], + 'sources': [ + '../include/svg/SkSVGAttribute.h', + '../include/svg/SkSVGBase.h', + '../include/svg/SkSVGPaintState.h', + '../include/svg/SkSVGParser.h', + '../include/svg/SkSVGTypes.h', + + '../src/svg/SkSVGCircle.cpp', + '../src/svg/SkSVGCircle.h', + '../src/svg/SkSVGClipPath.cpp', + '../src/svg/SkSVGClipPath.h', + '../src/svg/SkSVGDefs.cpp', + '../src/svg/SkSVGDefs.h', + '../src/svg/SkSVGElements.cpp', + '../src/svg/SkSVGElements.h', + '../src/svg/SkSVGEllipse.cpp', + '../src/svg/SkSVGEllipse.h', + '../src/svg/SkSVGFeColorMatrix.cpp', + '../src/svg/SkSVGFeColorMatrix.h', + '../src/svg/SkSVGFilter.cpp', + '../src/svg/SkSVGFilter.h', + '../src/svg/SkSVGG.cpp', + '../src/svg/SkSVGG.h', + '../src/svg/SkSVGGradient.cpp', + '../src/svg/SkSVGGradient.h', + '../src/svg/SkSVGGroup.cpp', + '../src/svg/SkSVGGroup.h', + '../src/svg/SkSVGImage.cpp', + '../src/svg/SkSVGImage.h', + '../src/svg/SkSVGLine.cpp', + '../src/svg/SkSVGLine.h', + '../src/svg/SkSVGLinearGradient.cpp', + '../src/svg/SkSVGLinearGradient.h', + '../src/svg/SkSVGMask.cpp', + '../src/svg/SkSVGMask.h', + '../src/svg/SkSVGMetadata.cpp', + '../src/svg/SkSVGMetadata.h', + '../src/svg/SkSVGPaintState.cpp', + '../src/svg/SkSVGParser.cpp', + '../src/svg/SkSVGPath.cpp', + '../src/svg/SkSVGPath.h', + '../src/svg/SkSVGPolygon.cpp', + '../src/svg/SkSVGPolygon.h', + '../src/svg/SkSVGPolyline.cpp', + '../src/svg/SkSVGPolyline.h', + '../src/svg/SkSVGRadialGradient.cpp', + '../src/svg/SkSVGRadialGradient.h', + '../src/svg/SkSVGRect.cpp', + '../src/svg/SkSVGRect.h', + '../src/svg/SkSVGStop.cpp', + '../src/svg/SkSVGStop.h', + '../src/svg/SkSVGSVG.cpp', + '../src/svg/SkSVGSVG.h', + '../src/svg/SkSVGSymbol.cpp', + '../src/svg/SkSVGSymbol.h', + '../src/svg/SkSVGText.cpp', + '../src/svg/SkSVGText.h', + '../src/svg/SkSVGUse.cpp', + ], + 'sources!' : [ + '../src/svg/SkSVG.cpp', # doesn't compile, maybe this is test code? + ], + 'direct_dependent_settings': { + 'include_dirs': [ + '../include/svg', + ], + }, + }, + ], +} + +# Local Variables: +# tab-width:2 +# indent-tabs-mode:nil +# End: +# vim: set expandtab tabstop=2 shiftwidth=2: diff --git a/target_defaults.gypi b/target_defaults.gypi new file mode 100644 index 0000000..c7cca18 --- /dev/null +++ b/target_defaults.gypi @@ -0,0 +1,62 @@ +{ + 'target_defaults': { + 'configurations': { + 'Debug': { + 'defines': [ + 'SK_DEBUG', + 'GR_DEBUG=1', + ], + }, + 'Release': { + 'defines': [ + 'SK_RELEASE', + 'GR_RELEASE=1', + ], + }, + }, + 'conditions': [ + [ 'OS == "linux" or OS == "freebsd" or OS == "openbsd" or OS == "solaris"', { + 'include_dirs' : [ + '/usr/include/freetype2', + ], + }], + [ 'OS == "mac"', { + 'defines': [ + 'SK_BUILD_FOR_MAC', + ], + }], + [ 'OS == "win"', { + 'defines': [ + 'SK_BUILD_FOR_WIN32', + 'SK_IGNORE_STDINT_DOT_H', + ], + }], + [ 'OS == "linux"', { + 'defines': [ + 'SK_SAMPLES_FOR_X', + 'SK_BUILD_FOR_UNIX', + ], + }], + ], + 'direct_dependent_settings': { + 'conditions': [ + [ 'OS == "mac"', { + 'defines': [ + 'SK_BUILD_FOR_MAC', + ], + }], + [ 'OS == "win"', { + 'defines': [ + 'SK_BUILD_FOR_WIN32', + ], + }], + ], + }, + }, +} + +# Local Variables: +# tab-width:2 +# indent-tabs-mode:nil +# End: +# vim: set expandtab tabstop=2 shiftwidth=2: diff --git a/utils.gyp b/utils.gyp new file mode 100644 index 0000000..6356d73 --- /dev/null +++ b/utils.gyp @@ -0,0 +1,90 @@ +{ + 'includes': [ + 'target_defaults.gypi', + ], + 'targets': [ + { + 'target_name': 'utils', + 'type': 'static_library', + 'include_dirs': [ + '../include/config', + '../include/core', + '../include/utils', + '../include/views', + '../include/effects', + '../include/xml', + ], + 'sources': [ + '../include/utils/SkBoundaryPatch.h', + '../include/utils/SkCamera.h', + '../include/utils/SkCubicInterval.h', + '../include/utils/SkCullPoints.h', + '../include/utils/SkDumpCanvas.h', + '../include/utils/SkEGLContext.h', + '../include/utils/SkGLCanvas.h', + '../include/utils/SkInterpolator.h', + '../include/utils/SkLayer.h', + '../include/utils/SkMeshUtils.h', + '../include/utils/SkNinePatch.h', + '../include/utils/SkNWayCanvas.h', + '../include/utils/SkParse.h', + '../include/utils/SkParsePaint.h', + '../include/utils/SkParsePath.h', + '../include/utils/SkProxyCanvas.h', + '../include/utils/SkSfntUtils.h', + '../include/utils/SkTextBox.h', + '../include/utils/SkUnitMappers.h', + + '../src/utils/SkBoundaryPatch.cpp', + '../src/utils/SkCamera.cpp', + '../src/utils/SkColorMatrix.cpp', + '../src/utils/SkCubicInterval.cpp', + '../src/utils/SkCullPoints.cpp', + '../src/utils/SkDumpCanvas.cpp', + '../src/utils/SkEGLContext_none.cpp', + '../src/utils/SkInterpolator.cpp', + '../src/utils/SkLayer.cpp', + '../src/utils/SkMeshUtils.cpp', + '../src/utils/SkNinePatch.cpp', + '../src/utils/SkNWayCanvas.cpp', + '../src/utils/SkOSFile.cpp', + '../src/utils/SkParse.cpp', + '../src/utils/SkParseColor.cpp', + '../src/utils/SkParsePath.cpp', + '../src/utils/SkProxyCanvas.cpp', + '../src/utils/SkSfntUtils.cpp', + '../src/utils/SkUnitMappers.cpp', + + '../src/utils/mac/SkEGLContext_Mesa.cpp', + ], + 'sources!': [ + '../src/utils/mac/SkEGLContext_Mesa.cpp', + ], + 'conditions': [ + [ 'OS == "mac"', { + 'sources': [ + '../include/utils/SkCGUtils.h', + '../src/utils/mac/SkCreateCGImageRef.cpp', + '../src/utils/mac/SkEGLContext_mac.cpp', + ], + }], + [ 'OS == "linux" or OS == "freebsd" or OS == "openbsd" or OS == "solaris"', { + 'sources': [ + '../src/utils/unix/SkEGLContext_Unix.cpp', + ], + }], + ], + 'direct_dependent_settings': { + 'include_dirs': [ + '../include/utils', + ], + }, + }, + ], +} + +# Local Variables: +# tab-width:2 +# indent-tabs-mode:nil +# End: +# vim: set expandtab tabstop=2 shiftwidth=2: diff --git a/views.gyp b/views.gyp new file mode 100644 index 0000000..7c95a76 --- /dev/null +++ b/views.gyp @@ -0,0 +1,122 @@ +{ + 'includes': [ + 'target_defaults.gypi', + ], + 'targets': [ + { + 'target_name': 'views', + 'type': 'static_library', + 'include_dirs': [ + '../include/config', + '../include/core', + '../include/views', + '../include/xml', + '../include/utils', + '../include/images', + '../include/animator', + '../include/effects', + ], + 'sources': [ + '../include/views/SkApplication.h', + '../include/views/SkBGViewArtist.h', + '../include/views/SkBorderView.h', + '../include/views/SkEvent.h', + '../include/views/SkEventSink.h', + '../include/views/SkImageView.h', + '../include/views/SkKey.h', + '../include/views/SkOSMenu.h', + '../include/views/SkOSWindow_Mac.h', + '../include/views/SkOSWindow_SDL.h', + '../include/views/SkOSWindow_Unix.h', + '../include/views/SkOSWindow_Win.h', + #'../include/views/SkOSWindow_wxwidgets.h', + '../include/views/SkProgressBarView.h', + '../include/views/SkScrollBarView.h', + '../include/views/SkStackViewLayout.h', + '../include/views/SkSystemEventTypes.h', + '../include/views/SkTouchGesture.h', + '../include/views/SkView.h', + '../include/views/SkViewInflate.h', + '../include/views/SkWidget.h', + '../include/views/SkWidgetViews.h', + '../include/views/SkWindow.h', + + '../src/views/SkBGViewArtist.cpp', + '../src/views/SkBorderView.cpp', + '../src/views/SkEvent.cpp', + '../src/views/SkEventSink.cpp', + '../src/views/SkImageView.cpp', + '../src/views/SkListView.cpp', + '../src/views/SkListWidget.cpp', + '../src/views/SkOSMenu.cpp', + '../src/views/SkParsePaint.cpp', + '../src/views/SkProgressBarView.cpp', + '../src/views/SkProgressView.cpp', + '../src/views/SkScrollBarView.cpp', + '../src/views/SkStackViewLayout.cpp', + '../src/views/SkStaticTextView.cpp', + '../src/views/SkTagList.cpp', + '../src/views/SkTagList.h', + '../src/views/SkTextBox.cpp', + '../src/views/SkTouchGesture.cpp', + '../src/views/SkView.cpp', + '../src/views/SkViewInflate.cpp', + '../src/views/SkViewPriv.cpp', + '../src/views/SkViewPriv.h', + '../src/views/SkWidget.cpp', + '../src/views/SkWidgets.cpp', + '../src/views/SkWidgetViews.cpp', + '../src/views/SkWindow.cpp', + ], + 'sources!' : [ + '../src/views/SkListView.cpp', #depends on missing SkListSource implementation + '../src/views/SkListWidget.cpp', #depends on missing SkListSource implementation + ], + 'conditions': [ + [ 'OS == "win"', { + 'sources': [ + '../src/utils/win/SkOSWindow_Win.cpp', + '../src/utils/win/skia_win.cpp', + ], + }], + [ 'OS == "mac"', { + 'sources': [ + '../include/utils/SkCGUtils.h', + #'../src/utils/mac/SkBitmap_Mac.cpp', + '../src/utils/mac/SkCreateCGImageRef.cpp', + '../src/utils/mac/SkEGLContext_mac.cpp', + '../src/utils/mac/skia_mac.cpp', + '../src/utils/mac/SkOSWindow_Mac.cpp', + ], + 'link_settings': { + 'libraries': [ + '$(SDKROOT)/System/Library/Frameworks/Carbon.framework', + '$(SDKROOT)/System/Library/Frameworks/AGL.framework', + ], + }, + }], + [ 'OS == "linux" or OS == "freebsd" or OS == "openbsd" or OS == "solaris"', { + 'include_dirs' : [ + '../include/utils/unix', + ], + 'sources': [ + '../src/utils/unix/keysym2ucs.c', + '../src/utils/unix/SkOSWindow_Unix.cpp', + '../unix_test_app/main.cpp', + ], + }], + ], + 'direct_dependent_settings': { + 'include_dirs': [ + '../include/views', + ], + }, + }, + ], +} + +# Local Variables: +# tab-width:2 +# indent-tabs-mode:nil +# End: +# vim: set expandtab tabstop=2 shiftwidth=2: diff --git a/xml.gyp b/xml.gyp new file mode 100644 index 0000000..8e825ad --- /dev/null +++ b/xml.gyp @@ -0,0 +1,58 @@ +{ + 'includes': [ + 'target_defaults.gypi', + ], + 'targets': [ + { + 'target_name': 'xml', + 'type': 'static_library', + 'include_dirs': [ + '../include/config', + '../include/core', + '../include/xml', + '../include/utils', + ], + 'sources': [ + '../include/xml/SkBML_WXMLParser.h', + '../include/xml/SkBML_XMLParser.h', + '../include/xml/SkDOM.h', + '../include/xml/SkJS.h', + '../include/xml/SkXMLParser.h', + '../include/xml/SkXMLWriter.h', + + '../src/xml/SkBML_Verbs.h', + '../src/xml/SkBML_XMLParser.cpp', + '../src/xml/SkDOM.cpp', + '../src/xml/SkJS.cpp', + '../src/xml/SkJSDisplayable.cpp', + '../src/xml/SkXMLParser.cpp', + '../src/xml/SkXMLPullParser.cpp', + '../src/xml/SkXMLWriter.cpp', + ], + 'sources!': [ + '../src/xml/SkXMLPullParser.cpp', #if 0 around class decl in header + ], + 'conditions': [ + [ 'OS == "win" or OS == "mac" or OS == "linux" or OS == "openbsd" or OS == "solaris"', { + 'sources!': [ + # no jsapi.h by default on system + '../include/xml/SkJS.h', + '../src/xml/SkJS.cpp', + '../src/xml/SkJSDisplayable.cpp', + ], + }], + ], + 'direct_dependent_settings': { + 'include_dirs': [ + '../include/xml', + ], + }, + }, + ], +} + +# Local Variables: +# tab-width:2 +# indent-tabs-mode:nil +# End: +# vim: set expandtab tabstop=2 shiftwidth=2: -- cgit v1.2.3 From c576e190d44b0724103c218067fa968313d178d8 Mon Sep 17 00:00:00 2001 From: "epoger@google.com" Date: Tue, 31 May 2011 19:02:37 +0000 Subject: make this work again: ./gyp_skia && make SampleApp see http://codereview.appspot.com/4517123/ git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@1454 2bbb7eff-a529-9590-31e7-b0007b416f81 --- SampleApp.gyp | 2 +- all.gyp | 18 ++++ core.gyp | 329 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ gyp_skia | 6 +- skia.gyp | 328 --------------------------------------------------------- 5 files changed, 351 insertions(+), 332 deletions(-) create mode 100644 all.gyp create mode 100644 core.gyp delete mode 100644 skia.gyp diff --git a/SampleApp.gyp b/SampleApp.gyp index 24f9963..221e1da 100644 --- a/SampleApp.gyp +++ b/SampleApp.gyp @@ -116,7 +116,7 @@ '../samplecode/SampleFontCache.cpp', ], 'dependencies': [ - 'skia.gyp:skia', + 'core.gyp:core', 'effects.gyp:effects', 'images.gyp:images', 'views.gyp:views', diff --git a/all.gyp b/all.gyp new file mode 100644 index 0000000..58c0419 --- /dev/null +++ b/all.gyp @@ -0,0 +1,18 @@ +# Creates a Makefile that is capable of building all executable targets. +{ + 'targets': [ + { + 'target_name': 'all', + 'type': 'none', + 'dependencies': [ + 'SampleApp.gyp:SampleApp' + ], + }, + ], +} + +# Local Variables: +# tab-width:2 +# indent-tabs-mode:nil +# End: +# vim: set expandtab tabstop=2 shiftwidth=2: diff --git a/core.gyp b/core.gyp new file mode 100644 index 0000000..43630d7 --- /dev/null +++ b/core.gyp @@ -0,0 +1,329 @@ +# Core Skia library code. +{ + 'includes': [ + 'target_defaults.gypi', + ], + 'targets': [ + { + 'target_name': 'core', + 'type': 'static_library', + 'msvs_guid': 'B7760B5E-BFA8-486B-ACFD-49E3A6DE8E76', + 'sources': [ + '../src/core/ARGB32_Clamp_Bilinear_BitmapShader.h', + '../src/core/Sk64.cpp', + '../src/core/SkAdvancedTypefaceMetrics.cpp', + '../src/core/SkAlphaRuns.cpp', + '../src/core/SkAntiRun.h', + '../src/core/SkBitmap.cpp', + '../src/core/SkBitmapProcShader.cpp', + '../src/core/SkBitmapProcShader.h', + '../src/core/SkBitmapProcState.cpp', + '../src/core/SkBitmapProcState.h', + '../src/core/SkBitmapProcState_matrix.h', + '../src/core/SkBitmapProcState_matrixProcs.cpp', + '../src/core/SkBitmapProcState_sample.h', + '../src/core/SkBitmapSampler.cpp', + '../src/core/SkBitmapSampler.h', + '../src/core/SkBitmapSamplerTemplate.h', + '../src/core/SkBitmapShader16BilerpTemplate.h', + '../src/core/SkBitmapShaderTemplate.h', + '../src/core/SkBitmap_scroll.cpp', + '../src/core/SkBlitBWMaskTemplate.h', + '../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', + '../src/core/SkClampRange.cpp', + '../src/core/SkClipStack.cpp', + '../src/core/SkColor.cpp', + '../src/core/SkColorFilter.cpp', + '../src/core/SkColorTable.cpp', + '../src/core/SkComposeShader.cpp', + '../src/core/SkConcaveToTriangles.cpp', + '../src/core/SkConcaveToTriangles.h', + '../src/core/SkCordic.cpp', + '../src/core/SkCordic.h', + '../src/core/SkCoreBlitters.h', + '../src/core/SkCubicClipper.cpp', + '../src/core/SkCubicClipper.h', + '../src/core/SkDebug.cpp', + '../src/core/SkDeque.cpp', + '../src/core/SkDevice.cpp', + '../src/core/SkDither.cpp', + '../src/core/SkDraw.cpp', + '../src/core/SkDrawProcs.h', + '../src/core/SkEdgeBuilder.cpp', + '../src/core/SkEdgeClipper.cpp', + '../src/core/SkEdge.cpp', + '../src/core/SkEdge.h', + '../src/core/SkFP.h', + '../src/core/SkFilterProc.cpp', + '../src/core/SkFilterProc.h', + '../src/core/SkFlattenable.cpp', + '../src/core/SkFloat.cpp', + '../src/core/SkFloat.h', + '../src/core/SkFloatBits.cpp', + '../src/core/SkFontHost.cpp', + '../src/core/SkGeometry.cpp', + '../src/core/SkGlobals.cpp', + '../src/core/SkGlyphCache.cpp', + '../src/core/SkGlyphCache.h', + '../src/core/SkGraphics.cpp', + '../src/core/SkLineClipper.cpp', + '../src/core/SkMallocPixelRef.cpp', + '../src/core/SkMask.cpp', + '../src/core/SkMaskFilter.cpp', + '../src/core/SkMath.cpp', + '../src/core/SkMatrix.cpp', + '../src/core/SkMetaData.cpp', + '../src/core/SkPackBits.cpp', + '../src/core/SkPaint.cpp', + '../src/core/SkPath.cpp', + '../src/core/SkPathEffect.cpp', + '../src/core/SkPathHeap.cpp', + '../src/core/SkPathHeap.h', + '../src/core/SkPathMeasure.cpp', + '../src/core/SkPicture.cpp', + '../src/core/SkPictureFlat.cpp', + '../src/core/SkPictureFlat.h', + '../src/core/SkPicturePlayback.cpp', + '../src/core/SkPicturePlayback.h', + '../src/core/SkPictureRecord.cpp', + '../src/core/SkPictureRecord.h', + '../src/core/SkPixelRef.cpp', + '../src/core/SkPoint.cpp', + '../src/core/SkProcSpriteBlitter.cpp', + '../src/core/SkPtrRecorder.cpp', + '../src/core/SkQuadClipper.cpp', + '../src/core/SkQuadClipper.h', + '../src/core/SkRasterizer.cpp', + '../src/core/SkRect.cpp', + '../src/core/SkRefDict.cpp', + '../src/core/SkRegion.cpp', + '../src/core/SkRegionPriv.h', + '../src/core/SkRegion_path.cpp', + '../src/core/SkScalar.cpp', + '../src/core/SkScalerContext.cpp', + '../src/core/SkScan.cpp', + '../src/core/SkScanPriv.h', + '../src/core/SkScan_AntiPath.cpp', + '../src/core/SkScan_Antihair.cpp', + '../src/core/SkScan_Hairline.cpp', + '../src/core/SkScan_Path.cpp', + '../src/core/SkShader.cpp', + '../src/core/SkShape.cpp', + '../src/core/SkSpriteBlitter_ARGB32.cpp', + '../src/core/SkSpriteBlitter_RGB16.cpp', + '../src/core/SkSinTable.h', + '../src/core/SkSpriteBlitter.h', + '../src/core/SkSpriteBlitterTemplate.h', + '../src/core/SkStream.cpp', + '../src/core/SkString.cpp', + '../src/core/SkStroke.cpp', + '../src/core/SkStrokerPriv.cpp', + '../src/core/SkStrokerPriv.h', + '../src/core/SkTextFormatParams.h', + '../src/core/SkTSearch.cpp', + '../src/core/SkTSort.h', + '../src/core/SkTemplatesPriv.h', + '../src/core/SkTypeface.cpp', + '../src/core/SkTypefaceCache.cpp', + '../src/core/SkTypefaceCache.h', + '../src/core/SkUnPreMultiply.cpp', + '../src/core/SkUtils.cpp', + '../src/core/SkWriter32.cpp', + '../src/core/SkXfermode.cpp', + + '../src/opts/opts_check_SSE2.cpp', + + '../src/ports/SkDebug_stdio.cpp', + '../src/ports/SkDebug_win.cpp', + + '../src/ports/SkFontHost_tables.cpp', + '../src/ports/SkGlobals_global.cpp', + '../src/ports/SkMemory_malloc.cpp', + '../src/ports/SkOSFile_stdio.cpp', + '../src/ports/SkTime_Unix.cpp', + '../src/ports/SkXMLParser_empty.cpp', + '../src/ports/sk_predefined_gamma.h', + + '../include/core/Sk64.h', + '../include/core/SkAdvancedTypefaceMetrics.h', + '../include/core/SkAutoKern.h', + '../include/core/SkBitmap.h', + '../include/core/SkBlitRow.h', + '../include/core/SkBlitter.h', + '../include/core/SkBounder.h', + '../include/core/SkBuffer.h', + '../include/core/SkCanvas.h', + '../include/core/SkChunkAlloc.h', + '../include/core/SkClampRange.h', + '../include/core/SkClipStack.h', + '../include/core/SkColor.h', + '../include/core/SkColorFilter.h', + '../include/core/SkColorPriv.h', + '../include/core/SkColorShader.h', + '../include/core/SkComposeShader.h', + '../include/core/SkDeque.h', + '../include/core/SkDescriptor.h', + '../include/core/SkDevice.h', + '../include/core/SkDither.h', + '../include/core/SkDraw.h', + '../include/core/SkDrawFilter.h', + '../include/core/SkDrawLooper.h', + '../include/core/SkEndian.h', + '../include/core/SkFDot6.h', + '../include/core/SkFixed.h', + '../include/core/SkFlattenable.h', + '../include/core/SkFloatBits.h', + '../include/core/SkFloatingPoint.h', + '../include/core/SkFontHost.h', + '../include/core/SkGeometry.h', + '../include/core/SkGlobals.h', + '../include/core/SkGraphics.h', + '../include/core/SkMallocPixelRef.h', + '../include/core/SkMask.h', + '../include/core/SkMaskFilter.h', + '../include/core/SkMath.h', + '../include/core/SkMatrix.h', + '../include/core/SkMetaData.h', + '../include/core/SkOSFile.h', + '../include/core/SkPackBits.h', + '../include/core/SkPaint.h', + '../include/core/SkPath.h', + '../include/core/SkPathEffect.h', + '../include/core/SkPathMeasure.h', + '../include/core/SkPerspIter.h', + '../include/core/SkPicture.h', + '../include/core/SkPixelRef.h', + '../include/core/SkPoint.h', + '../include/core/SkPtrRecorder.h', + '../include/core/SkRandom.h', + '../include/core/SkRasterizer.h', + '../include/core/SkReader32.h', + '../include/core/SkRect.h', + '../include/core/SkRefCnt.h', + '../include/core/SkRefDict.h', + '../include/core/SkRegion.h', + '../include/core/SkScalar.h', + '../include/core/SkScalarCompare.h', + '../include/core/SkScalerContext.h', + '../include/core/SkScan.h', + '../include/core/SkShader.h', + '../include/core/SkStream.h', + '../include/core/SkString.h', + '../include/core/SkStroke.h', + '../include/core/SkTDArray.h', + '../include/core/SkTDStack.h', + '../include/core/SkTDict.h', + '../include/core/SkTRegistry.h', + '../include/core/SkTScopedPtr.h', + '../include/core/SkTSearch.h', + '../include/core/SkTemplates.h', + '../include/core/SkThread.h', + '../include/core/SkThread_platform.h', + '../include/core/SkTime.h', + '../include/core/SkTypeface.h', + '../include/core/SkTypes.h', + '../include/core/SkUnPreMultiply.h', + '../include/core/SkUnitMapper.h', + '../include/core/SkUtils.h', + '../include/core/SkWriter32.h', + '../include/core/SkXfermode.h', + ], + 'include_dirs': [ + '../include/config', + '../include/core', + '../include/ports', + '../include/xml', + '../src/core', + ], + 'msvs_disabled_warnings': [4244, 4267,4345, 4390, 4554, 4800], + 'conditions': [ + [ 'OS == "linux" or OS == "freebsd" or OS == "openbsd" or OS == "solaris"', { + 'cflags': [ + '-Wno-unused', + '-Wno-unused-function', + ], + 'sources': [ + '../include/core/SkMMapStream.h', + '../src/core/SkMMapStream.cpp', + '../src/core/SkBlitter_ARGB32_Subpixel.cpp', + '../src/ports/SkThread_pthread.cpp', + '../src/ports/SkTime_Unix.cpp', + '../src/ports/SkFontHost_FreeType_Subpixel.cpp', + '../src/ports/SkFontHost_FreeType.cpp', + '../src/ports/SkFontHost_gamma_none.cpp', + '../src/ports/SkFontHost_linux.cpp', + ], + 'link_settings': { + 'libraries': [ + '-lfreetype', + '-lpthread', + ], + }, + }], + [ 'OS == "mac"', { + 'include_dirs': [ + '../include/utils/mac', + ], + 'sources': [ + '../include/core/SkMMapStream.h', + '../include/utils/mac/SkCGUtils.h', + + '../src/core/SkMMapStream.cpp', + '../src/ports/SkFontHost_mac_coretext.cpp', + + '../src/ports/SkThread_pthread.cpp', + '../src/ports/SkTime_Unix.cpp', + + '../src/utils/mac/SkCreateCGImageRef.cpp', + ], + }], + [ 'OS == "win"', { + 'include_dirs': [ + 'config/win', + ], + 'sources': [ + '../src/ports/SkFontHost_win.cpp', + '../src/ports/SkThread_win.cpp', + ], + 'sources!': [ + '../src/ports/SkDebug_stdio.cpp', + ], + }], + [ 'OS != "win"', { + 'sources!': [ + '../src/ports/SkDebug_win.cpp', + ], + }], + ], + 'direct_dependent_settings': { + 'include_dirs': [ + 'config', + '../include/config', + '../include/core', + 'ext', + ], + }, + 'dependencies': [ + 'opts.gyp:opts' + ], + }, + ], +} + +# Local Variables: +# tab-width:2 +# indent-tabs-mode:nil +# End: +# vim: set expandtab tabstop=2 shiftwidth=2: diff --git a/gyp_skia b/gyp_skia index 72b4879..f22b363 100755 --- a/gyp_skia +++ b/gyp_skia @@ -15,7 +15,7 @@ # limitations under the License. # This script is a wrapper which invokes gyp with the correct --depth argument, -# and supports the automatic regeneration of build files if skia.gyp is +# and supports the automatic regeneration of build files if all.gyp is # changed (Linux-only). import glob @@ -61,10 +61,10 @@ if __name__ == '__main__': gyp_file_specified = True break - # If we didn't get a file, then fall back to assuming 'skia.gyp' from the + # If we didn't get a file, then fall back to assuming 'all.gyp' from the # same directory as the script. if not gyp_file_specified: - args.append(os.path.join(script_dir, 'skia.gyp')) + args.append(os.path.join(script_dir, 'all.gyp')) args.extend(['-I' + i for i in additional_include_files(args)]) diff --git a/skia.gyp b/skia.gyp deleted file mode 100644 index c3cc4b4..0000000 --- a/skia.gyp +++ /dev/null @@ -1,328 +0,0 @@ -{ - 'includes': [ - 'target_defaults.gypi', - ], - 'targets': [ - { - 'target_name': 'skia', - 'type': 'static_library', - 'msvs_guid': 'B7760B5E-BFA8-486B-ACFD-49E3A6DE8E76', - 'sources': [ - '../src/core/ARGB32_Clamp_Bilinear_BitmapShader.h', - '../src/core/Sk64.cpp', - '../src/core/SkAdvancedTypefaceMetrics.cpp', - '../src/core/SkAlphaRuns.cpp', - '../src/core/SkAntiRun.h', - '../src/core/SkBitmap.cpp', - '../src/core/SkBitmapProcShader.cpp', - '../src/core/SkBitmapProcShader.h', - '../src/core/SkBitmapProcState.cpp', - '../src/core/SkBitmapProcState.h', - '../src/core/SkBitmapProcState_matrix.h', - '../src/core/SkBitmapProcState_matrixProcs.cpp', - '../src/core/SkBitmapProcState_sample.h', - '../src/core/SkBitmapSampler.cpp', - '../src/core/SkBitmapSampler.h', - '../src/core/SkBitmapSamplerTemplate.h', - '../src/core/SkBitmapShader16BilerpTemplate.h', - '../src/core/SkBitmapShaderTemplate.h', - '../src/core/SkBitmap_scroll.cpp', - '../src/core/SkBlitBWMaskTemplate.h', - '../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', - '../src/core/SkClampRange.cpp', - '../src/core/SkClipStack.cpp', - '../src/core/SkColor.cpp', - '../src/core/SkColorFilter.cpp', - '../src/core/SkColorTable.cpp', - '../src/core/SkComposeShader.cpp', - '../src/core/SkConcaveToTriangles.cpp', - '../src/core/SkConcaveToTriangles.h', - '../src/core/SkCordic.cpp', - '../src/core/SkCordic.h', - '../src/core/SkCoreBlitters.h', - '../src/core/SkCubicClipper.cpp', - '../src/core/SkCubicClipper.h', - '../src/core/SkDebug.cpp', - '../src/core/SkDeque.cpp', - '../src/core/SkDevice.cpp', - '../src/core/SkDither.cpp', - '../src/core/SkDraw.cpp', - '../src/core/SkDrawProcs.h', - '../src/core/SkEdgeBuilder.cpp', - '../src/core/SkEdgeClipper.cpp', - '../src/core/SkEdge.cpp', - '../src/core/SkEdge.h', - '../src/core/SkFP.h', - '../src/core/SkFilterProc.cpp', - '../src/core/SkFilterProc.h', - '../src/core/SkFlattenable.cpp', - '../src/core/SkFloat.cpp', - '../src/core/SkFloat.h', - '../src/core/SkFloatBits.cpp', - '../src/core/SkFontHost.cpp', - '../src/core/SkGeometry.cpp', - '../src/core/SkGlobals.cpp', - '../src/core/SkGlyphCache.cpp', - '../src/core/SkGlyphCache.h', - '../src/core/SkGraphics.cpp', - '../src/core/SkLineClipper.cpp', - '../src/core/SkMallocPixelRef.cpp', - '../src/core/SkMask.cpp', - '../src/core/SkMaskFilter.cpp', - '../src/core/SkMath.cpp', - '../src/core/SkMatrix.cpp', - '../src/core/SkMetaData.cpp', - '../src/core/SkPackBits.cpp', - '../src/core/SkPaint.cpp', - '../src/core/SkPath.cpp', - '../src/core/SkPathEffect.cpp', - '../src/core/SkPathHeap.cpp', - '../src/core/SkPathHeap.h', - '../src/core/SkPathMeasure.cpp', - '../src/core/SkPicture.cpp', - '../src/core/SkPictureFlat.cpp', - '../src/core/SkPictureFlat.h', - '../src/core/SkPicturePlayback.cpp', - '../src/core/SkPicturePlayback.h', - '../src/core/SkPictureRecord.cpp', - '../src/core/SkPictureRecord.h', - '../src/core/SkPixelRef.cpp', - '../src/core/SkPoint.cpp', - '../src/core/SkProcSpriteBlitter.cpp', - '../src/core/SkPtrRecorder.cpp', - '../src/core/SkQuadClipper.cpp', - '../src/core/SkQuadClipper.h', - '../src/core/SkRasterizer.cpp', - '../src/core/SkRect.cpp', - '../src/core/SkRefDict.cpp', - '../src/core/SkRegion.cpp', - '../src/core/SkRegionPriv.h', - '../src/core/SkRegion_path.cpp', - '../src/core/SkScalar.cpp', - '../src/core/SkScalerContext.cpp', - '../src/core/SkScan.cpp', - '../src/core/SkScanPriv.h', - '../src/core/SkScan_AntiPath.cpp', - '../src/core/SkScan_Antihair.cpp', - '../src/core/SkScan_Hairline.cpp', - '../src/core/SkScan_Path.cpp', - '../src/core/SkShader.cpp', - '../src/core/SkShape.cpp', - '../src/core/SkSpriteBlitter_ARGB32.cpp', - '../src/core/SkSpriteBlitter_RGB16.cpp', - '../src/core/SkSinTable.h', - '../src/core/SkSpriteBlitter.h', - '../src/core/SkSpriteBlitterTemplate.h', - '../src/core/SkStream.cpp', - '../src/core/SkString.cpp', - '../src/core/SkStroke.cpp', - '../src/core/SkStrokerPriv.cpp', - '../src/core/SkStrokerPriv.h', - '../src/core/SkTextFormatParams.h', - '../src/core/SkTSearch.cpp', - '../src/core/SkTSort.h', - '../src/core/SkTemplatesPriv.h', - '../src/core/SkTypeface.cpp', - '../src/core/SkTypefaceCache.cpp', - '../src/core/SkTypefaceCache.h', - '../src/core/SkUnPreMultiply.cpp', - '../src/core/SkUtils.cpp', - '../src/core/SkWriter32.cpp', - '../src/core/SkXfermode.cpp', - - '../src/opts/opts_check_SSE2.cpp', - - '../src/ports/SkDebug_stdio.cpp', - '../src/ports/SkDebug_win.cpp', - - '../src/ports/SkFontHost_tables.cpp', - '../src/ports/SkGlobals_global.cpp', - '../src/ports/SkMemory_malloc.cpp', - '../src/ports/SkOSFile_stdio.cpp', - '../src/ports/SkTime_Unix.cpp', - '../src/ports/SkXMLParser_empty.cpp', - '../src/ports/sk_predefined_gamma.h', - - '../include/core/Sk64.h', - '../include/core/SkAdvancedTypefaceMetrics.h', - '../include/core/SkAutoKern.h', - '../include/core/SkBitmap.h', - '../include/core/SkBlitRow.h', - '../include/core/SkBlitter.h', - '../include/core/SkBounder.h', - '../include/core/SkBuffer.h', - '../include/core/SkCanvas.h', - '../include/core/SkChunkAlloc.h', - '../include/core/SkClampRange.h', - '../include/core/SkClipStack.h', - '../include/core/SkColor.h', - '../include/core/SkColorFilter.h', - '../include/core/SkColorPriv.h', - '../include/core/SkColorShader.h', - '../include/core/SkComposeShader.h', - '../include/core/SkDeque.h', - '../include/core/SkDescriptor.h', - '../include/core/SkDevice.h', - '../include/core/SkDither.h', - '../include/core/SkDraw.h', - '../include/core/SkDrawFilter.h', - '../include/core/SkDrawLooper.h', - '../include/core/SkEndian.h', - '../include/core/SkFDot6.h', - '../include/core/SkFixed.h', - '../include/core/SkFlattenable.h', - '../include/core/SkFloatBits.h', - '../include/core/SkFloatingPoint.h', - '../include/core/SkFontHost.h', - '../include/core/SkGeometry.h', - '../include/core/SkGlobals.h', - '../include/core/SkGraphics.h', - '../include/core/SkMallocPixelRef.h', - '../include/core/SkMask.h', - '../include/core/SkMaskFilter.h', - '../include/core/SkMath.h', - '../include/core/SkMatrix.h', - '../include/core/SkMetaData.h', - '../include/core/SkOSFile.h', - '../include/core/SkPackBits.h', - '../include/core/SkPaint.h', - '../include/core/SkPath.h', - '../include/core/SkPathEffect.h', - '../include/core/SkPathMeasure.h', - '../include/core/SkPerspIter.h', - '../include/core/SkPicture.h', - '../include/core/SkPixelRef.h', - '../include/core/SkPoint.h', - '../include/core/SkPtrRecorder.h', - '../include/core/SkRandom.h', - '../include/core/SkRasterizer.h', - '../include/core/SkReader32.h', - '../include/core/SkRect.h', - '../include/core/SkRefCnt.h', - '../include/core/SkRefDict.h', - '../include/core/SkRegion.h', - '../include/core/SkScalar.h', - '../include/core/SkScalarCompare.h', - '../include/core/SkScalerContext.h', - '../include/core/SkScan.h', - '../include/core/SkShader.h', - '../include/core/SkStream.h', - '../include/core/SkString.h', - '../include/core/SkStroke.h', - '../include/core/SkTDArray.h', - '../include/core/SkTDStack.h', - '../include/core/SkTDict.h', - '../include/core/SkTRegistry.h', - '../include/core/SkTScopedPtr.h', - '../include/core/SkTSearch.h', - '../include/core/SkTemplates.h', - '../include/core/SkThread.h', - '../include/core/SkThread_platform.h', - '../include/core/SkTime.h', - '../include/core/SkTypeface.h', - '../include/core/SkTypes.h', - '../include/core/SkUnPreMultiply.h', - '../include/core/SkUnitMapper.h', - '../include/core/SkUtils.h', - '../include/core/SkWriter32.h', - '../include/core/SkXfermode.h', - ], - 'include_dirs': [ - '../include/config', - '../include/core', - '../include/ports', - '../include/xml', - '../src/core', - ], - 'msvs_disabled_warnings': [4244, 4267,4345, 4390, 4554, 4800], - 'conditions': [ - [ 'OS == "linux" or OS == "freebsd" or OS == "openbsd" or OS == "solaris"', { - 'cflags': [ - '-Wno-unused', - '-Wno-unused-function', - ], - 'sources': [ - '../include/core/SkMMapStream.h', - '../src/core/SkMMapStream.cpp', - '../src/core/SkBlitter_ARGB32_Subpixel.cpp', - '../src/ports/SkThread_pthread.cpp', - '../src/ports/SkTime_Unix.cpp', - '../src/ports/SkFontHost_FreeType_Subpixel.cpp', - '../src/ports/SkFontHost_FreeType.cpp', - '../src/ports/SkFontHost_gamma_none.cpp', - '../src/ports/SkFontHost_linux.cpp', - ], - 'link_settings': { - 'libraries': [ - '-lfreetype', - '-lpthread', - ], - }, - }], - [ 'OS == "mac"', { - 'include_dirs': [ - '../include/utils/mac', - ], - 'sources': [ - '../include/core/SkMMapStream.h', - '../include/utils/mac/SkCGUtils.h', - - '../src/core/SkMMapStream.cpp', - '../src/ports/SkFontHost_mac_coretext.cpp', - - '../src/ports/SkThread_pthread.cpp', - '../src/ports/SkTime_Unix.cpp', - - '../src/utils/mac/SkCreateCGImageRef.cpp', - ], - }], - [ 'OS == "win"', { - 'include_dirs': [ - 'config/win', - ], - 'sources': [ - '../src/ports/SkFontHost_win.cpp', - '../src/ports/SkThread_win.cpp', - ], - 'sources!': [ - '../src/ports/SkDebug_stdio.cpp', - ], - }], - [ 'OS != "win"', { - 'sources!': [ - '../src/ports/SkDebug_win.cpp', - ], - }], - ], - 'direct_dependent_settings': { - 'include_dirs': [ - 'config', - '../include/config', - '../include/core', - 'ext', - ], - }, - 'dependencies': [ - 'opts.gyp:opts' - ], - }, - ], -} - -# Local Variables: -# tab-width:2 -# indent-tabs-mode:nil -# End: -# vim: set expandtab tabstop=2 shiftwidth=2: -- cgit v1.2.3 From 2952f1ebfac4861b54cc724d43fe8be6ac9843a3 Mon Sep 17 00:00:00 2001 From: "bungeman@google.com" Date: Tue, 31 May 2011 21:21:54 +0000 Subject: Add gyp for bench and make run on Windows. http://codereview.appspot.com/4528112/ git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@1458 2bbb7eff-a529-9590-31e7-b0007b416f81 --- bench.gyp | 56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ core.gyp | 2 ++ 2 files changed, 58 insertions(+) create mode 100644 bench.gyp diff --git a/bench.gyp b/bench.gyp new file mode 100644 index 0000000..35f3266 --- /dev/null +++ b/bench.gyp @@ -0,0 +1,56 @@ +{ + 'includes': [ + 'target_defaults.gypi', + ], + 'targets': [ + { + 'target_name': 'bench', + 'type': 'executable', + 'mac_bundle' : 1, + 'include_dirs': [ + '../include/effects', + '../include/utils', + '../include/images', + ], + 'sources': [ + '../bench/benchmain.cpp', + + '../bench/SkBenchmark.h', + '../bench/SkBenchmark.cpp', + + '../bench/BitmapBench.cpp', + '../bench/DecodeBench.cpp', + '../bench/FPSBench.cpp', + '../bench/GradientBench.cpp', + '../bench/PathBench.cpp', + '../bench/RectBench.cpp', + '../bench/RepeatTileBench.cpp', + '../bench/TextBench.cpp', + ], + 'dependencies': [ + 'core.gyp:core', + 'effects.gyp:effects', + 'images.gyp:images', + 'utils.gyp:utils', + 'gpu.gyp:gr', + 'gpu.gyp:skgr', + ], + 'msvs_settings': { + 'VCLinkerTool': { + 'SubSystem': '1', + 'EntryPointSymbol': 'mainCRTStartup', + 'AdditionalDependencies': [ + 'OpenGL32.lib', + 'usp10.lib', + ], + }, + }, + }, + ], +} + +# Local Variables: +# tab-width:2 +# indent-tabs-mode:nil +# End: +# vim: set expandtab tabstop=2 shiftwidth=2: \ No newline at end of file diff --git a/core.gyp b/core.gyp index 43630d7..68f960d 100644 --- a/core.gyp +++ b/core.gyp @@ -153,6 +153,7 @@ '../src/ports/SkMemory_malloc.cpp', '../src/ports/SkOSFile_stdio.cpp', '../src/ports/SkTime_Unix.cpp', + '../src/ports/SkTime_win.cpp', '../src/ports/SkXMLParser_empty.cpp', '../src/ports/sk_predefined_gamma.h', @@ -304,6 +305,7 @@ [ 'OS != "win"', { 'sources!': [ '../src/ports/SkDebug_win.cpp', + '../src/ports/SkTime_win.cpp', ], }], ], -- cgit v1.2.3 From 9f5fbe5fb38664435084a90c9498c4d036a8a225 Mon Sep 17 00:00:00 2001 From: "bungeman@google.com" Date: Wed, 1 Jun 2011 13:23:29 +0000 Subject: Add gyp for bench and make run on Windows. (2) http://codereview.appspot.com/4528112/ git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@1461 2bbb7eff-a529-9590-31e7-b0007b416f81 --- bench.gyp | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/bench.gyp b/bench.gyp index 35f3266..db1bcb1 100644 --- a/bench.gyp +++ b/bench.gyp @@ -6,12 +6,6 @@ { 'target_name': 'bench', 'type': 'executable', - 'mac_bundle' : 1, - 'include_dirs': [ - '../include/effects', - '../include/utils', - '../include/images', - ], 'sources': [ '../bench/benchmain.cpp', @@ -30,15 +24,20 @@ 'dependencies': [ 'core.gyp:core', 'effects.gyp:effects', - 'images.gyp:images', - 'utils.gyp:utils', 'gpu.gyp:gr', 'gpu.gyp:skgr', + 'images.gyp:images', + 'utils.gyp:utils', ], 'msvs_settings': { 'VCLinkerTool': { + #Allows for creation / output to console. + #Console (/SUBSYSTEM:CONSOLE) 'SubSystem': '1', + + #Console app, use main/wmain 'EntryPointSymbol': 'mainCRTStartup', + 'AdditionalDependencies': [ 'OpenGL32.lib', 'usp10.lib', -- cgit v1.2.3 From e07b9e1d452e4ff2adec8e12ac9e92ce881c124e Mon Sep 17 00:00:00 2001 From: "bungeman@google.com" Date: Wed, 1 Jun 2011 16:14:01 +0000 Subject: Make gyp VC project debug configuration /DEBUG. git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@1465 2bbb7eff-a529-9590-31e7-b0007b416f81 --- target_defaults.gypi | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/target_defaults.gypi b/target_defaults.gypi index c7cca18..5c512fb 100644 --- a/target_defaults.gypi +++ b/target_defaults.gypi @@ -6,6 +6,11 @@ 'SK_DEBUG', 'GR_DEBUG=1', ], + 'msvs_settings': { + 'VCLinkerTool': { + 'GenerateDebugInformation': 'true', + }, + }, }, 'Release': { 'defines': [ -- cgit v1.2.3 From 68f8c76b7790d4a0a1c1288ed17f9c598fdef276 Mon Sep 17 00:00:00 2001 From: "bungeman@google.com" Date: Wed, 1 Jun 2011 16:15:43 +0000 Subject: Fixup utils.gyp. git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@1466 2bbb7eff-a529-9590-31e7-b0007b416f81 --- utils.gyp | 42 +++++++++++++++++++++++++++++++++++------- 1 file changed, 35 insertions(+), 7 deletions(-) diff --git a/utils.gyp b/utils.gyp index 6356d73..2e5308b 100644 --- a/utils.gyp +++ b/utils.gyp @@ -55,22 +55,50 @@ '../src/utils/SkSfntUtils.cpp', '../src/utils/SkUnitMappers.cpp', - '../src/utils/mac/SkEGLContext_Mesa.cpp', + '../include/utils/mac/SkCGUtils.h', + '../src/utils/mac/SkBitmap_Mac.cpp', + '../src/utils/mac/SkCreateCGImageRef.cpp', + '../src/utils/mac/SkEGLContext_mac.cpp', + '../src/utils/mac/skia_mac.cpp', + '../src/utils/mac/SkOSWindow_Mac.cpp', + + '../src/utils/mesa/SkEGLContext_Mesa.cpp', + + '../src/utils/SDL/SkOSWindow_SDL.cpp', + + '../src/utils/unix/keysym2ucs.c', + '../src/utils/unix/SkEGLContext_Unix.cpp', + '../src/utils/unix/SkOSWindow_Unix.cpp', + + '../src/utils/win/skia_win.cpp', + '../src/utils/win/SkOSWindow_Win.cpp', ], 'sources!': [ - '../src/utils/mac/SkEGLContext_Mesa.cpp', + '../src/utils/mesa/SkEGLContext_Mesa.cpp', + '../src/utils/SDL/SkOSWindow_SDL.cpp', ], 'conditions': [ - [ 'OS == "mac"', { - 'sources': [ - '../include/utils/SkCGUtils.h', + [ 'OS != "mac"', { + 'sources!': [ + '../include/utils/mac/SkCGUtils.h', + '../src/utils/mac/SkBitmap_Mac.cpp', '../src/utils/mac/SkCreateCGImageRef.cpp', '../src/utils/mac/SkEGLContext_mac.cpp', + '../src/utils/mac/skia_mac.cpp', + '../src/utils/mac/SkOSWindow_Mac.cpp', ], }], - [ 'OS == "linux" or OS == "freebsd" or OS == "openbsd" or OS == "solaris"', { - 'sources': [ + [ 'OS != "linux" and OS != "freebsd" and OS != "openbsd" and OS != "solaris"', { + 'sources!': [ + '../src/utils/unix/keysym2ucs.c', '../src/utils/unix/SkEGLContext_Unix.cpp', + '../src/utils/unix/SkOSWindow_Unix.cpp', + ], + }], + [ 'OS != "win"', { + 'sources!': [ + '../src/utils/win/skia_win.cpp', + '../src/utils/win/SkOSWindow_Win.cpp', ], }], ], -- cgit v1.2.3 From 11b83571eb4429a073e3f828ccf05efacd122ac1 Mon Sep 17 00:00:00 2001 From: "senorblanco@chromium.org" Date: Wed, 1 Jun 2011 18:28:22 +0000 Subject: Clean up the gyp files to reflect some files that were removed and/or renamed. Review URL: http://codereview.appspot.com/4536098/ git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@1470 2bbb7eff-a529-9590-31e7-b0007b416f81 --- SampleApp.gyp | 1 - images.gyp | 3 ++- libtess.gyp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/SampleApp.gyp b/SampleApp.gyp index 221e1da..f0446d9 100644 --- a/SampleApp.gyp +++ b/SampleApp.gyp @@ -92,7 +92,6 @@ '../samplecode/SampleSlides.cpp', '../samplecode/SampleStrokePath.cpp', '../samplecode/SampleStrokeText.cpp', - '../samplecode/SampleSVG.cpp', '../samplecode/SampleTests.cpp', '../samplecode/SampleText.cpp', '../samplecode/SampleTextAlpha.cpp', diff --git a/images.gyp b/images.gyp index dd91501..ba3d603 100644 --- a/images.gyp +++ b/images.gyp @@ -34,7 +34,8 @@ '../src/images/SkImageDecoder_libico.cpp', '../src/images/SkImageDecoder_libjpeg.cpp', '../src/images/SkImageDecoder_libpng.cpp', - '../src/images/SkImageDecoder_libpvjpeg.c', + # This file wasn't being compiled, and seems to have bitrotted. + #'../src/images/SkImageDecoder_libpvjpeg.cpp', '../src/images/SkImageDecoder_wbmp.cpp', '../src/images/SkImageEncoder.cpp', '../src/images/SkImageEncoder_Factory.cpp', diff --git a/libtess.gyp b/libtess.gyp index 69e9ffd..6ea27d8 100644 --- a/libtess.gyp +++ b/libtess.gyp @@ -10,7 +10,7 @@ '../third_party/glu', ], 'sources': [ - '../third_party/glu/internal_glu.h', + '../third_party/glu/sk_glu.h', '../third_party/glu/gluos.h', '../third_party/glu/libtess/dict-list.h', '../third_party/glu/libtess/dict.c', -- cgit v1.2.3 From 12e89813deff26682144c34e629c369d4fab408e Mon Sep 17 00:00:00 2001 From: "senorblanco@chromium.org" Date: Wed, 1 Jun 2011 20:55:45 +0000 Subject: Add a missing include path for the linux build of utils.gyp. Remove the Linux utils files from the build of views.a, since they're already being compiled into utils.a, since it was causing unnecessary rebuilds (the same could probably be done for linux and mac). Remove the commented-out SkImageDecoder_libpvjpeg.cpp, which has been removed from SVN. http://codereview.appspot.com/4532105/ git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@1476 2bbb7eff-a529-9590-31e7-b0007b416f81 --- images.gyp | 2 -- utils.gyp | 4 ++++ views.gyp | 5 ----- 3 files changed, 4 insertions(+), 7 deletions(-) diff --git a/images.gyp b/images.gyp index ba3d603..4e49f12 100644 --- a/images.gyp +++ b/images.gyp @@ -34,8 +34,6 @@ '../src/images/SkImageDecoder_libico.cpp', '../src/images/SkImageDecoder_libjpeg.cpp', '../src/images/SkImageDecoder_libpng.cpp', - # This file wasn't being compiled, and seems to have bitrotted. - #'../src/images/SkImageDecoder_libpvjpeg.cpp', '../src/images/SkImageDecoder_wbmp.cpp', '../src/images/SkImageEncoder.cpp', '../src/images/SkImageEncoder_Factory.cpp', diff --git a/utils.gyp b/utils.gyp index 2e5308b..edc314e 100644 --- a/utils.gyp +++ b/utils.gyp @@ -10,6 +10,7 @@ '../include/config', '../include/core', '../include/utils', + '../include/utils/unix', '../include/views', '../include/effects', '../include/xml', @@ -94,6 +95,9 @@ '../src/utils/unix/SkEGLContext_Unix.cpp', '../src/utils/unix/SkOSWindow_Unix.cpp', ], + 'include_dirs!': [ + '../include/utils/unix', + ], }], [ 'OS != "win"', { 'sources!': [ diff --git a/views.gyp b/views.gyp index 7c95a76..4e9b19f 100644 --- a/views.gyp +++ b/views.gyp @@ -96,12 +96,7 @@ }, }], [ 'OS == "linux" or OS == "freebsd" or OS == "openbsd" or OS == "solaris"', { - 'include_dirs' : [ - '../include/utils/unix', - ], 'sources': [ - '../src/utils/unix/keysym2ucs.c', - '../src/utils/unix/SkOSWindow_Unix.cpp', '../unix_test_app/main.cpp', ], }], -- cgit v1.2.3 From ce8a1f37f56a013878720cc17c26e80b41e8d9dd Mon Sep 17 00:00:00 2001 From: "epoger@google.com" Date: Thu, 2 Jun 2011 14:38:23 +0000 Subject: create GYP files for these targets: tests, gm, skhello, skimage, skdiff see http://codereview.appspot.com/4536096/ git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@1479 2bbb7eff-a529-9590-31e7-b0007b416f81 --- all.gyp | 11 +++++- apptype_console.gypi | 27 +++++++++++++++ bench.gyp | 26 ++++++-------- core.gyp | 2 ++ gm.gyp | 52 ++++++++++++++++++++++++++++ images.gyp | 11 ++++++ tests.gyp | 95 ++++++++++++++++++++++++++++++++++++++++++++++++++++ tools.gyp | 67 ++++++++++++++++++++++++++++++++++++ 8 files changed, 274 insertions(+), 17 deletions(-) create mode 100644 apptype_console.gypi create mode 100644 gm.gyp create mode 100644 tests.gyp create mode 100644 tools.gyp diff --git a/all.gyp b/all.gyp index 58c0419..e2f745a 100644 --- a/all.gyp +++ b/all.gyp @@ -1,11 +1,20 @@ # Creates a Makefile that is capable of building all executable targets. +# +# To build on Linux: +# ./gyp_skia && make all +# +# Building on other platforms not tested yet. +# { 'targets': [ { 'target_name': 'all', 'type': 'none', 'dependencies': [ - 'SampleApp.gyp:SampleApp' + 'gm.gyp:gm', + 'SampleApp.gyp:SampleApp', + 'tests.gyp:tests', + 'tools.gyp:tools', ], }, ], diff --git a/apptype_console.gypi b/apptype_console.gypi new file mode 100644 index 0000000..b686fa7 --- /dev/null +++ b/apptype_console.gypi @@ -0,0 +1,27 @@ +# target_defaults used for executable targets that generate a console app +{ + 'target_defaults': { + 'mac_bundle' : 1, + 'msvs_settings': { + 'VCLinkerTool': { + #Allows for creation / output to console. + #Console (/SUBSYSTEM:CONSOLE) + 'SubSystem': '1', + + #Console app, use main/wmain + 'EntryPointSymbol': 'mainCRTStartup', + + 'AdditionalDependencies': [ + 'OpenGL32.lib', + 'usp10.lib', + ], + }, + }, + }, +} + +# Local Variables: +# tab-width:2 +# indent-tabs-mode:nil +# End: +# vim: set expandtab tabstop=2 shiftwidth=2: diff --git a/bench.gyp b/bench.gyp index db1bcb1..6054c23 100644 --- a/bench.gyp +++ b/bench.gyp @@ -1,5 +1,14 @@ +# GYP file to build performance testbench. +# +# To build and run on Linux: +# ./gyp_skia bench.gyp && make +# out/Debug/bench -repeat 2 +# +# Building on other platforms not tested yet. +# { 'includes': [ + 'apptype_console.gypi', 'target_defaults.gypi', ], 'targets': [ @@ -29,21 +38,6 @@ 'images.gyp:images', 'utils.gyp:utils', ], - 'msvs_settings': { - 'VCLinkerTool': { - #Allows for creation / output to console. - #Console (/SUBSYSTEM:CONSOLE) - 'SubSystem': '1', - - #Console app, use main/wmain - 'EntryPointSymbol': 'mainCRTStartup', - - 'AdditionalDependencies': [ - 'OpenGL32.lib', - 'usp10.lib', - ], - }, - }, }, ], } @@ -52,4 +46,4 @@ # tab-width:2 # indent-tabs-mode:nil # End: -# vim: set expandtab tabstop=2 shiftwidth=2: \ No newline at end of file +# vim: set expandtab tabstop=2 shiftwidth=2: diff --git a/core.gyp b/core.gyp index 68f960d..3c207a9 100644 --- a/core.gyp +++ b/core.gyp @@ -68,6 +68,7 @@ '../src/core/SkFP.h', '../src/core/SkFilterProc.cpp', '../src/core/SkFilterProc.h', + '../src/core/SkFlate.cpp', '../src/core/SkFlattenable.cpp', '../src/core/SkFloat.cpp', '../src/core/SkFloat.h', @@ -184,6 +185,7 @@ '../include/core/SkEndian.h', '../include/core/SkFDot6.h', '../include/core/SkFixed.h', + '../include/core/SkFlate.h', '../include/core/SkFlattenable.h', '../include/core/SkFloatBits.h', '../include/core/SkFloatingPoint.h', diff --git a/gm.gyp b/gm.gyp new file mode 100644 index 0000000..a53edb1 --- /dev/null +++ b/gm.gyp @@ -0,0 +1,52 @@ +# GYP file to build the "gm" (golden master) executable. +# +# To build and run on Linux: +# ./gyp_skia gm.gyp && make +# out/Debug/gm -r ../gm/base-linux +# +# Building on other platforms not tested yet. +# +{ + 'includes': [ + 'apptype_console.gypi', + 'target_defaults.gypi', + ], + 'targets': [ + { + 'target_name': 'gm', + 'type': 'executable', + 'sources': [ + '../gm/bitmapfilters.cpp', + '../gm/blurs.cpp', + '../gm/filltypes.cpp', + '../gm/gradients.cpp', + '../gm/nocolorbleed.cpp', + '../gm/pathfill.cpp', + '../gm/points.cpp', + '../gm/poly2poly.cpp', + '../gm/shadows.cpp', + '../gm/shapes.cpp', + '../gm/strokerects.cpp', + '../gm/tilemodes.cpp', + '../gm/xfermodes.cpp', + '../gm/shadertext.cpp', + '../gm/complexclip.cpp', + '../gm/gmmain.cpp', + ], + 'dependencies': [ + 'core.gyp:core', + 'effects.gyp:effects', + 'gpu.gyp:gr', + 'gpu.gyp:skgr', + 'images.gyp:images', + 'utils.gyp:utils', + ], + }, + ], +} + +# Local Variables: +# tab-width:2 +# indent-tabs-mode:nil +# End: +# vim: set expandtab tabstop=2 shiftwidth=2: diff --git a/images.gyp b/images.gyp index 4e49f12..fef7aae 100644 --- a/images.gyp +++ b/images.gyp @@ -84,6 +84,17 @@ '../src/images/SkJpegUtility.cpp', '../src/images/SkMovie_gif.cpp', ], + 'link_settings': { + # Any targets that depend on this target should link in libpng and + # our code that calls it. + # See http://code.google.com/p/gyp/wiki/InputFormatReference#Dependent_Settings + 'sources': [ + '../src/images/SkImageDecoder_libpng.cpp', + ], + 'libraries': [ + '-lpng', + ], + }, }], ], diff --git a/tests.gyp b/tests.gyp new file mode 100644 index 0000000..2756b90 --- /dev/null +++ b/tests.gyp @@ -0,0 +1,95 @@ +# GYP file to build unit tests. +# +# To build and run on Linux: +# ./gyp_skia tests.gyp && make +# out/Debug/tests +# +# To build on Linux with skia_pdf_support disabled: +# ./gyp_skia tests.gyp -Dskia_pdf_support=false && make +# +# Building on other platforms not tested yet. +# +{ + 'includes': [ + 'apptype_console.gypi', + 'target_defaults.gypi', + ], + 'variables': { + 'skia_pdf_support%': 'true', + }, + 'targets': [ + { + 'target_name': 'tests', + 'type': 'executable', + 'include_dirs' : [ + '../include/pdf', + '../src/core', + ], + 'sources': [ + '../tests/BitmapCopyTest.cpp', + '../tests/BitmapGetColorTest.cpp', + '../tests/BlitRowTest.cpp', + '../tests/ClampRangeTest.cpp', + '../tests/ClipCubicTest.cpp', + '../tests/ClipStackTest.cpp', + '../tests/ClipperTest.cpp', + '../tests/ColorFilterTest.cpp', + '../tests/ColorTest.cpp', + '../tests/DequeTest.cpp', + '../tests/DrawBitmapRectTest.cpp', + '../tests/FillPathTest.cpp', + '../tests/FlateTest.cpp', + '../tests/GeometryTest.cpp', + '../tests/InfRectTest.cpp', + '../tests/MathTest.cpp', + '../tests/MatrixTest.cpp', + '../tests/MetaDataTest.cpp', + '../tests/PackBitsTest.cpp', + '../tests/PaintTest.cpp', + '../tests/ParsePathTest.cpp', + '../tests/PathMeasureTest.cpp', + '../tests/PathTest.cpp', + '../tests/PDFPrimitivesTest.cpp', + '../tests/Reader32Test.cpp', + '../tests/RefDictTest.cpp', + '../tests/RegionTest.cpp', + '../tests/Sk64Test.cpp', + '../tests/skia_test.cpp', + '../tests/SortTest.cpp', + '../tests/SrcOverTest.cpp', + '../tests/StreamTest.cpp', + '../tests/StringTest.cpp', + '../tests/Test.cpp', + '../tests/TestSize.cpp', + '../tests/UtilsTest.cpp', + '../tests/Writer32Test.cpp', + '../tests/XfermodeTest.cpp', + ], + 'dependencies': [ + 'core.gyp:core', + 'effects.gyp:effects', + 'images.gyp:images', + 'utils.gyp:utils', + ], + 'conditions': [ + [ 'skia_pdf_support == "true"', + { # if skia_pdf_support is TRUE, depend on pdf.gyp... + 'dependencies': [ + 'pdf.gyp:pdf', + ], + }, { # else, we don't need PDFPrimitivesTest.cpp after all. + 'sources!': [ + '../tests/PDFPrimitivesTest.cpp', + ], + } + ], + ], + }, + ], +} + +# Local Variables: +# tab-width:2 +# indent-tabs-mode:nil +# End: +# vim: set expandtab tabstop=2 shiftwidth=2: diff --git a/tools.gyp b/tools.gyp new file mode 100644 index 0000000..939b32a --- /dev/null +++ b/tools.gyp @@ -0,0 +1,67 @@ +# GYP file to build various tools. +# +# To build on Linux: +# ./gyp_skia tools.gyp && make tools +# +# Building on other platforms not tested yet. +# +{ + 'includes': [ + 'apptype_console.gypi', + 'target_defaults.gypi', + ], + 'targets': [ + { + # Build all executable targets defined below. + 'target_name': 'tools', + 'type': 'none', + 'dependencies': [ + 'skdiff', + 'skhello', + 'skimage', + ], + }, + { + 'target_name': 'skdiff', + 'type': 'executable', + 'sources': [ + '../tools/skdiff_main.cpp', + ], + 'dependencies': [ + 'core.gyp:core', + 'images.gyp:images', + 'utils.gyp:utils', + ], + }, + { + 'target_name': 'skhello', + 'type': 'executable', + 'sources': [ + '../tools/skhello.cpp', + ], + 'dependencies': [ + 'core.gyp:core', + 'images.gyp:images', + 'utils.gyp:utils', + ], + }, + { + 'target_name': 'skimage', + 'type': 'executable', + 'sources': [ + '../tools/skimage_main.cpp', + ], + 'dependencies': [ + 'core.gyp:core', + 'images.gyp:images', + 'utils.gyp:utils', + ], + }, + ], +} + +# Local Variables: +# tab-width:2 +# indent-tabs-mode:nil +# End: +# vim: set expandtab tabstop=2 shiftwidth=2: -- cgit v1.2.3 From 653d8e2dc648f4998a45f515254cdd3ee45679b7 Mon Sep 17 00:00:00 2001 From: "bungeman@google.com" Date: Thu, 2 Jun 2011 15:38:06 +0000 Subject: Add EGL context for Windows. http://codereview.appspot.com/4517133/ git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@1481 2bbb7eff-a529-9590-31e7-b0007b416f81 --- utils.gyp | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/utils.gyp b/utils.gyp index edc314e..02c5da1 100644 --- a/utils.gyp +++ b/utils.gyp @@ -72,6 +72,7 @@ '../src/utils/unix/SkOSWindow_Unix.cpp', '../src/utils/win/skia_win.cpp', + '../src/utils/win/SkEGLContext_Win.cpp', '../src/utils/win/SkOSWindow_Win.cpp', ], 'sources!': [ @@ -89,6 +90,11 @@ '../src/utils/mac/SkOSWindow_Mac.cpp', ], }], + [ 'OS == "mac"', { + 'sources!': [ + '../src/utils/SkEGLContext_none.cpp', + ], + }], [ 'OS != "linux" and OS != "freebsd" and OS != "openbsd" and OS != "solaris"', { 'sources!': [ '../src/utils/unix/keysym2ucs.c', @@ -99,12 +105,23 @@ '../include/utils/unix', ], }], + [ 'OS == "linux" or OS == "freebsd" or OS == "openbsd" or OS == "solaris"', { + 'sources!': [ + '../src/utils/SkEGLContext_none.cpp', + ], + }], [ 'OS != "win"', { 'sources!': [ '../src/utils/win/skia_win.cpp', + '../src/utils/win/SkEGLContext_Win.cpp', '../src/utils/win/SkOSWindow_Win.cpp', ], }], + [ 'OS == "win"', { + 'sources!': [ + '../src/utils/SkEGLContext_none.cpp', + ], + }], ], 'direct_dependent_settings': { 'include_dirs': [ -- cgit v1.2.3 From 6177859d1080bba43fc51879f14b4abfd6b3c8a4 Mon Sep 17 00:00:00 2001 From: "epoger@google.com" Date: Thu, 2 Jun 2011 19:52:14 +0000 Subject: fix gyp-generated xcode project files for SampleApp and other targets see http://codereview.appspot.com/4515181/ git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@1482 2bbb7eff-a529-9590-31e7-b0007b416f81 --- core.gyp | 6 ++++++ utils.gyp | 6 ++++-- views.gyp | 6 +++++- 3 files changed, 15 insertions(+), 3 deletions(-) diff --git a/core.gyp b/core.gyp index 3c207a9..c0d8944 100644 --- a/core.gyp +++ b/core.gyp @@ -289,8 +289,14 @@ '../src/ports/SkThread_pthread.cpp', '../src/ports/SkTime_Unix.cpp', + # TODO(epoger): why are we building this here? '../src/utils/mac/SkCreateCGImageRef.cpp', ], + 'link_settings': { + 'libraries': [ + '$(SDKROOT)/System/Library/Frameworks/Carbon.framework', + ], + }, }], [ 'OS == "win"', { 'include_dirs': [ diff --git a/utils.gyp b/utils.gyp index 02c5da1..bde4368 100644 --- a/utils.gyp +++ b/utils.gyp @@ -10,6 +10,7 @@ '../include/config', '../include/core', '../include/utils', + '../include/utils/mac', '../include/utils/unix', '../include/views', '../include/effects', @@ -57,7 +58,6 @@ '../src/utils/SkUnitMappers.cpp', '../include/utils/mac/SkCGUtils.h', - '../src/utils/mac/SkBitmap_Mac.cpp', '../src/utils/mac/SkCreateCGImageRef.cpp', '../src/utils/mac/SkEGLContext_mac.cpp', '../src/utils/mac/skia_mac.cpp', @@ -83,12 +83,14 @@ [ 'OS != "mac"', { 'sources!': [ '../include/utils/mac/SkCGUtils.h', - '../src/utils/mac/SkBitmap_Mac.cpp', '../src/utils/mac/SkCreateCGImageRef.cpp', '../src/utils/mac/SkEGLContext_mac.cpp', '../src/utils/mac/skia_mac.cpp', '../src/utils/mac/SkOSWindow_Mac.cpp', ], + 'include_dirs!': [ + '../include/utils/mac', + ], }], [ 'OS == "mac"', { 'sources!': [ diff --git a/views.gyp b/views.gyp index 4e9b19f..02059a4 100644 --- a/views.gyp +++ b/views.gyp @@ -80,14 +80,18 @@ ], }], [ 'OS == "mac"', { + # TODO(epoger): why are we building these here instead of inheriting + # them from utils.gyp? 'sources': [ '../include/utils/SkCGUtils.h', - #'../src/utils/mac/SkBitmap_Mac.cpp', '../src/utils/mac/SkCreateCGImageRef.cpp', '../src/utils/mac/SkEGLContext_mac.cpp', '../src/utils/mac/skia_mac.cpp', '../src/utils/mac/SkOSWindow_Mac.cpp', ], + 'include_dirs': [ + '../include/utils/mac', + ], 'link_settings': { 'libraries': [ '$(SDKROOT)/System/Library/Frameworks/Carbon.framework', -- cgit v1.2.3 From bd60eead51bd6c2d154654deda15fa1b4ed1e646 Mon Sep 17 00:00:00 2001 From: "bungeman@google.com" Date: Fri, 3 Jun 2011 15:48:17 +0000 Subject: Turn off optimization on VC debug builds. http://codereview.appspot.com/4568052/ git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@1488 2bbb7eff-a529-9590-31e7-b0007b416f81 --- target_defaults.gypi | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/target_defaults.gypi b/target_defaults.gypi index 5c512fb..cb54367 100644 --- a/target_defaults.gypi +++ b/target_defaults.gypi @@ -9,7 +9,14 @@ 'msvs_settings': { 'VCLinkerTool': { 'GenerateDebugInformation': 'true', - }, + }, + 'VCCLCompilerTool': { + #0 Disabled (/Od) + #1 Minimize Size (/O1) + #2 Maximize Speed (/O2) + #3 Full Optimization (/Ox) + 'Optimization': '0', + }, }, }, 'Release': { -- cgit v1.2.3 From ef7b598c0f7ced6ce72c8a6afcfc0798f008690d Mon Sep 17 00:00:00 2001 From: "epoger@google.com" Date: Fri, 3 Jun 2011 17:21:21 +0000 Subject: fix bench and gm targets on Linux see http://codereview.appspot.com/4530104 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@1490 2bbb7eff-a529-9590-31e7-b0007b416f81 --- all.gyp | 1 + utils.gyp | 6 ++++++ 2 files changed, 7 insertions(+) diff --git a/all.gyp b/all.gyp index e2f745a..ec61e59 100644 --- a/all.gyp +++ b/all.gyp @@ -11,6 +11,7 @@ 'target_name': 'all', 'type': 'none', 'dependencies': [ + 'bench.gyp:bench', 'gm.gyp:gm', 'SampleApp.gyp:SampleApp', 'tests.gyp:tests', diff --git a/utils.gyp b/utils.gyp index bde4368..c0db053 100644 --- a/utils.gyp +++ b/utils.gyp @@ -111,6 +111,12 @@ 'sources!': [ '../src/utils/SkEGLContext_none.cpp', ], + 'link_settings': { + 'libraries': [ + '-lGL', + '-lGLU', + ], + }, }], [ 'OS != "win"', { 'sources!': [ -- cgit v1.2.3 From 7406ef6ed37b0d776516f872d53d7b65492397dc Mon Sep 17 00:00:00 2001 From: "epoger@google.com" Date: Fri, 3 Jun 2011 17:52:12 +0000 Subject: fix gm build on Mac see http://codereview.appspot.com/4571044/ git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@1494 2bbb7eff-a529-9590-31e7-b0007b416f81 --- utils.gyp | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/utils.gyp b/utils.gyp index c0db053..59c5bb5 100644 --- a/utils.gyp +++ b/utils.gyp @@ -96,6 +96,11 @@ 'sources!': [ '../src/utils/SkEGLContext_none.cpp', ], + 'link_settings': { + 'libraries': [ + '$(SDKROOT)/System/Library/Frameworks/AGL.framework', + ], + }, }], [ 'OS != "linux" and OS != "freebsd" and OS != "openbsd" and OS != "solaris"', { 'sources!': [ -- cgit v1.2.3 From 913b3b73a3e4a4dd824cafcabe4eec5da82951e0 Mon Sep 17 00:00:00 2001 From: "epoger@google.com" Date: Fri, 3 Jun 2011 21:33:03 +0000 Subject: Make gyp_skia script use third_party/externals/gyp instead of the deprecated third_party/gyp git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@1506 2bbb7eff-a529-9590-31e7-b0007b416f81 --- gyp_skia | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gyp_skia b/gyp_skia index f22b363..bbdb3a7 100755 --- a/gyp_skia +++ b/gyp_skia @@ -27,7 +27,7 @@ script_dir = os.path.dirname(__file__) gyp_dir = os.path.normpath(os.path.join(script_dir, os.pardir, 'third_party')) -sys.path.append(os.path.join(gyp_dir, 'gyp', 'pylib')) +sys.path.append(os.path.join(gyp_dir, 'externals', 'gyp', 'pylib')) import gyp def additional_include_files(args=[]): -- cgit v1.2.3 From 5feaf52d38fcd08453dfa8c9a3271ae9926ce152 Mon Sep 17 00:00:00 2001 From: "epoger@google.com" Date: Tue, 7 Jun 2011 14:48:41 +0000 Subject: Some final cleanups leading up to The Official Switch to Gyp see http://codereview.appspot.com/4580043 1. Create a single public skia.gyp file that all outside projects (Chrome, Android, etc.) should depend on from now on. I haven't yet created targets suitable for those projects to use, but this is where we should add them. 2. Make gyp generate its Makefiles within out/ directory, rather than polluting directories under source control. 3. Modify trunk/Makefile to automatically run gyp_skia and then call the generated Makefile, to ease developer transition. git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@1526 2bbb7eff-a529-9590-31e7-b0007b416f81 --- all.gyp | 13 +++++++++++++ gyp_skia | 13 +++++++++++++ 2 files changed, 26 insertions(+) diff --git a/all.gyp b/all.gyp index ec61e59..37844bb 100644 --- a/all.gyp +++ b/all.gyp @@ -5,6 +5,19 @@ # # Building on other platforms not tested yet. # + +# +# +# +# +# +# THIS IS DEPRECATED IN FAVOR OF trunk/skia.gyp !!! +# Questions? Contact epoger@google.com +# +# +# +# + { 'targets': [ { diff --git a/gyp_skia b/gyp_skia index bbdb3a7..58fab82 100755 --- a/gyp_skia +++ b/gyp_skia @@ -17,6 +17,19 @@ # This script is a wrapper which invokes gyp with the correct --depth argument, # and supports the automatic regeneration of build files if all.gyp is # changed (Linux-only). +# + +# +# +# +# +# +# THIS IS DEPRECATED IN FAVOR OF trunk/gyp_skia !!! +# Questions? Contact epoger@google.com +# +# +# +# import glob import os -- cgit v1.2.3 From fb5cb0802c17c6be9a4a15deaf0e8805f144f312 Mon Sep 17 00:00:00 2001 From: "bungeman@google.com" Date: Tue, 7 Jun 2011 19:16:02 +0000 Subject: Higher resolution timers for bench. http://codereview.appspot.com/4548090/ git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@1534 2bbb7eff-a529-9590-31e7-b0007b416f81 --- bench.gyp | 52 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 52 insertions(+) diff --git a/bench.gyp b/bench.gyp index 6054c23..01aea2e 100644 --- a/bench.gyp +++ b/bench.gyp @@ -17,6 +17,18 @@ 'type': 'executable', 'sources': [ '../bench/benchmain.cpp', + '../bench/BenchTimer.h', + '../bench/BenchTimer.cpp', + '../bench/BenchSysTimer_mach.h', + '../bench/BenchSysTimer_mach.cpp', + '../bench/BenchSysTimer_posix.h', + '../bench/BenchSysTimer_posix.cpp', + '../bench/BenchSysTimer_windows.h', + '../bench/BenchSysTimer_windows.cpp', + '../bench/BenchGpuTimer_gl.h', + '../bench/BenchGpuTimer_gl.cpp', + '../bench/BenchGpuTimer_none.h', + '../bench/BenchGpuTimer_none.cpp', '../bench/SkBenchmark.h', '../bench/SkBenchmark.cpp', @@ -38,6 +50,46 @@ 'images.gyp:images', 'utils.gyp:utils', ], + 'conditions': [ + [ 'OS != "mac"', { + 'sources!': [ + '../bench/BenchSysTimer_mach.h', + '../bench/BenchSysTimer_mach.cpp', + ], + }], + [ 'OS not in ["linux", "freebsd", "openbsd", "solaris"]', { + 'sources!': [ + '../bench/BenchSysTimer_posix.h', + '../bench/BenchSysTimer_posix.cpp', + ], + }], + [ 'OS in ["linux", "freebsd", "openbsd", "solaris"]', { + 'link_settings': { + 'libraries': [ + '-lrt', + ], + }, + }], + [ 'OS != "win"', { + 'sources!': [ + '../bench/BenchSysTimer_windows.h', + '../bench/BenchSysTimer_windows.cpp', + ], + }], + + [ 'OS in ["win", "mac", "linux", "freebsd", "openbsd", "solaris"]', { + 'sources!': [ + '../bench/BenchGpuTimer_none.h', + '../bench/BenchGpuTimer_none.cpp', + ], + }], + [ 'OS not in ["win", "mac", "linux", "freebsd", "openbsd", "solaris"]', { + 'sources!': [ + '../bench/BenchGpuTimer_gl.h', + '../bench/BenchGpuTimer_gl.cpp', + ], + }], + ], }, ], } -- cgit v1.2.3 From 1f569cd57a4cb76319999a076529b2dbbda1cedf Mon Sep 17 00:00:00 2001 From: "epoger@google.com" Date: Wed, 8 Jun 2011 15:34:21 +0000 Subject: revert to manually imported gyp source (from SVN externals) git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@1541 2bbb7eff-a529-9590-31e7-b0007b416f81 --- gyp_skia | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gyp_skia b/gyp_skia index 58fab82..b71757b 100755 --- a/gyp_skia +++ b/gyp_skia @@ -40,7 +40,7 @@ script_dir = os.path.dirname(__file__) gyp_dir = os.path.normpath(os.path.join(script_dir, os.pardir, 'third_party')) -sys.path.append(os.path.join(gyp_dir, 'externals', 'gyp', 'pylib')) +sys.path.append(os.path.join(gyp_dir, 'gyp', 'pylib')) import gyp def additional_include_files(args=[]): -- cgit v1.2.3 From e723d0c337edd4e4d232f5069cf86f6c823c6ffb Mon Sep 17 00:00:00 2001 From: "epoger@google.com" Date: Wed, 8 Jun 2011 20:55:53 +0000 Subject: add skia_scalar switch to gyp script git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@1550 2bbb7eff-a529-9590-31e7-b0007b416f81 --- target_defaults.gypi | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/target_defaults.gypi b/target_defaults.gypi index cb54367..d5cf05f 100644 --- a/target_defaults.gypi +++ b/target_defaults.gypi @@ -1,5 +1,8 @@ { 'target_defaults': { + 'variables': { + 'skia_scalar%': 'float', + }, 'configurations': { 'Debug': { 'defines': [ @@ -27,6 +30,17 @@ }, }, 'conditions': [ + [ 'skia_scalar == "float"', + { + 'defines': [ + 'SK_SCALAR_IS_FLOAT', + ], + }, { # else, skia_scalar != "float" + 'defines': [ + 'SK_SCALAR_IS_FIXED', + ], + } + ], [ 'OS == "linux" or OS == "freebsd" or OS == "openbsd" or OS == "solaris"', { 'include_dirs' : [ '/usr/include/freetype2', -- cgit v1.2.3 From c40c4cc90ef489af24b3f9df9ac47432396a846e Mon Sep 17 00:00:00 2001 From: "epoger@google.com" Date: Thu, 9 Jun 2011 17:37:59 +0000 Subject: Remove SkTableMaskFilter.cpp from gyp build, because it was breaking for skia_scalar=fixed (and it was not being exercised by the old Makefile anyway) git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@1555 2bbb7eff-a529-9590-31e7-b0007b416f81 --- effects.gyp | 2 -- 1 file changed, 2 deletions(-) diff --git a/effects.gyp b/effects.gyp index 6db77b5..b6c253f 100644 --- a/effects.gyp +++ b/effects.gyp @@ -33,7 +33,6 @@ '../include/effects/SkPixelXorXfermode.h', '../include/effects/SkPorterDuff.h', '../include/effects/SkRectShape.h', - '../include/effects/SkTableMaskFilter.h', '../include/effects/SkTransparentShader.h', '../src/effects/Sk1DPathEffect.cpp', @@ -64,7 +63,6 @@ '../src/effects/SkPorterDuff.cpp', '../src/effects/SkRadialGradient_Table.h', '../src/effects/SkRectShape.cpp', - '../src/effects/SkTableMaskFilter.cpp', '../src/effects/SkTransparentShader.cpp', ], 'direct_dependent_settings': { -- cgit v1.2.3 From f4bb23ab8895317336d91761632833cd4ee5280f Mon Sep 17 00:00:00 2001 From: "epoger@google.com" Date: Thu, 9 Jun 2011 18:51:41 +0000 Subject: Define SK_CAN_USE_FLOAT in gyp build, just like Makefile build git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@1557 2bbb7eff-a529-9590-31e7-b0007b416f81 --- target_defaults.gypi | 3 +++ 1 file changed, 3 insertions(+) diff --git a/target_defaults.gypi b/target_defaults.gypi index d5cf05f..bc08e18 100644 --- a/target_defaults.gypi +++ b/target_defaults.gypi @@ -1,5 +1,8 @@ { 'target_defaults': { + 'defines': [ + 'SK_CAN_USE_FLOAT', + ], 'variables': { 'skia_scalar%': 'float', }, -- cgit v1.2.3 From f0403e0c92ffc2885b0e58273ca00826c0ec2337 Mon Sep 17 00:00:00 2001 From: "reed@google.com" Date: Thu, 9 Jun 2011 19:13:41 +0000 Subject: update SkMatrix44 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@1559 2bbb7eff-a529-9590-31e7-b0007b416f81 --- experimental.gyp | 4 ---- tests.gyp | 2 ++ 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/experimental.gyp b/experimental.gyp index 50e60e8..12921ba 100644 --- a/experimental.gyp +++ b/experimental.gyp @@ -17,10 +17,6 @@ '../experimental/SkSetPoly3To3_A.cpp', '../experimental/SkSetPoly3To3_D.cpp', ], - 'sources!': [ - '../experimental/SkMatrix44.cpp', #doesn't compile - '../experimental/SkMatrix44.h', - ], 'direct_dependent_settings': { 'include_dirs': [ '../experimental', diff --git a/tests.gyp b/tests.gyp index 2756b90..300bb5d 100644 --- a/tests.gyp +++ b/tests.gyp @@ -43,6 +43,7 @@ '../tests/InfRectTest.cpp', '../tests/MathTest.cpp', '../tests/MatrixTest.cpp', + '../tests/Matrix44Test.cpp', '../tests/MetaDataTest.cpp', '../tests/PackBitsTest.cpp', '../tests/PaintTest.cpp', @@ -68,6 +69,7 @@ 'dependencies': [ 'core.gyp:core', 'effects.gyp:effects', + 'experimental.gyp:experimental', 'images.gyp:images', 'utils.gyp:utils', ], -- cgit v1.2.3 From 4198395d53151b8e4c36178731f7689c4af9577b Mon Sep 17 00:00:00 2001 From: "reed@google.com" Date: Mon, 13 Jun 2011 14:58:44 +0000 Subject: move SkMatrix44 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@1565 2bbb7eff-a529-9590-31e7-b0007b416f81 --- experimental.gyp | 2 -- utils.gyp | 2 ++ 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/experimental.gyp b/experimental.gyp index 12921ba..171f4c8 100644 --- a/experimental.gyp +++ b/experimental.gyp @@ -11,8 +11,6 @@ '../include/core', ], 'sources': [ - '../experimental/SkMatrix44.cpp', - '../experimental/SkMatrix44.h', '../experimental/SkSetPoly3To3.cpp', '../experimental/SkSetPoly3To3_A.cpp', '../experimental/SkSetPoly3To3_D.cpp', diff --git a/utils.gyp b/utils.gyp index 59c5bb5..8845d9a 100644 --- a/utils.gyp +++ b/utils.gyp @@ -26,6 +26,7 @@ '../include/utils/SkGLCanvas.h', '../include/utils/SkInterpolator.h', '../include/utils/SkLayer.h', + '../include/utils/SkMatrix44.h', '../include/utils/SkMeshUtils.h', '../include/utils/SkNinePatch.h', '../include/utils/SkNWayCanvas.h', @@ -46,6 +47,7 @@ '../src/utils/SkEGLContext_none.cpp', '../src/utils/SkInterpolator.cpp', '../src/utils/SkLayer.cpp', + '../src/utils/SkMatrix44.cpp', '../src/utils/SkMeshUtils.cpp', '../src/utils/SkNinePatch.cpp', '../src/utils/SkNWayCanvas.cpp', -- cgit v1.2.3 From ad29b270e241c8b18a4873449fcfcf6b39c78ed9 Mon Sep 17 00:00:00 2001 From: "reed@google.com" Date: Tue, 14 Jun 2011 19:18:26 +0000 Subject: add SkDataRef (for future use) git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@1588 2bbb7eff-a529-9590-31e7-b0007b416f81 --- core.gyp | 1 + tests.gyp | 1 + 2 files changed, 2 insertions(+) diff --git a/core.gyp b/core.gyp index c0d8944..b5bc962 100644 --- a/core.gyp +++ b/core.gyp @@ -55,6 +55,7 @@ '../src/core/SkCoreBlitters.h', '../src/core/SkCubicClipper.cpp', '../src/core/SkCubicClipper.h', + '../src/core/SkDataRef.cpp', '../src/core/SkDebug.cpp', '../src/core/SkDeque.cpp', '../src/core/SkDevice.cpp', diff --git a/tests.gyp b/tests.gyp index 300bb5d..1888a21 100644 --- a/tests.gyp +++ b/tests.gyp @@ -35,6 +35,7 @@ '../tests/ClipperTest.cpp', '../tests/ColorFilterTest.cpp', '../tests/ColorTest.cpp', + '../tests/DataRefTest.cpp', '../tests/DequeTest.cpp', '../tests/DrawBitmapRectTest.cpp', '../tests/FillPathTest.cpp', -- cgit v1.2.3 From 77ed156d9927fa55ed053fb6cf57481a036930ba Mon Sep 17 00:00:00 2001 From: "epoger@google.com" Date: Wed, 15 Jun 2011 13:45:10 +0000 Subject: add libpng source to repo and make Unix build use it http://codereview.appspot.com/4572067 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@1591 2bbb7eff-a529-9590-31e7-b0007b416f81 --- images.gyp | 14 ++++++++------ libpng.gyp | 48 ++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 56 insertions(+), 6 deletions(-) create mode 100644 libpng.gyp diff --git a/images.gyp b/images.gyp index fef7aae..7f2c8a4 100644 --- a/images.gyp +++ b/images.gyp @@ -84,17 +84,19 @@ '../src/images/SkJpegUtility.cpp', '../src/images/SkMovie_gif.cpp', ], + # libpng stuff: + # Any targets that depend on this target should link in libpng and + # our code that calls it. + # See http://code.google.com/p/gyp/wiki/InputFormatReference#Dependent_Settings + 'dependencies' : [ + 'libpng.gyp:libpng', + ], 'link_settings': { - # Any targets that depend on this target should link in libpng and - # our code that calls it. - # See http://code.google.com/p/gyp/wiki/InputFormatReference#Dependent_Settings 'sources': [ '../src/images/SkImageDecoder_libpng.cpp', ], - 'libraries': [ - '-lpng', - ], }, + # end libpng stuff }], ], diff --git a/libpng.gyp b/libpng.gyp new file mode 100644 index 0000000..07e89df --- /dev/null +++ b/libpng.gyp @@ -0,0 +1,48 @@ +# Gyp config to build libpng as needed for Skia. +{ + 'targets': [ + { + 'target_name': 'libpng', + 'type': 'static_library', + 'include_dirs': [ + '../third_party/libpng', + ], + 'sources': [ + '../third_party/libpng/png.h', + '../third_party/libpng/pngconf.h', + '../third_party/libpng/pngdebug.h', + '../third_party/libpng/pnginfo.h', + '../third_party/libpng/pnglibconf.h', + '../third_party/libpng/pngpriv.h', + '../third_party/libpng/pngstruct.h', + + '../third_party/libpng/png.c', + '../third_party/libpng/pngerror.c', + '../third_party/libpng/pngget.c', + '../third_party/libpng/pngmem.c', + '../third_party/libpng/pngpread.c', + '../third_party/libpng/pngread.c', + '../third_party/libpng/pngrio.c', + '../third_party/libpng/pngrtran.c', + '../third_party/libpng/pngrutil.c', + '../third_party/libpng/pngset.c', + '../third_party/libpng/pngtrans.c', + '../third_party/libpng/pngwio.c', + '../third_party/libpng/pngwrite.c', + '../third_party/libpng/pngwtran.c', + '../third_party/libpng/pngwutil.c', + ], + 'all_dependent_settings': { + 'include_dirs': [ + '../third_party/libpng', + ], + }, + }, + ], +} + +# Local Variables: +# tab-width:2 +# indent-tabs-mode:nil +# End: +# vim: set expandtab tabstop=2 shiftwidth=2: -- cgit v1.2.3 From af20cf164b1f669af3c2c644fdd3185b00028144 Mon Sep 17 00:00:00 2001 From: "epoger@google.com" Date: Wed, 15 Jun 2011 16:05:37 +0000 Subject: fix gm on Mac, and Linux buildbot build, by adding zlib source to third_party http://codereview.appspot.com/4620047/ I will try to find a better way to keep all this working (remove zlib and libpng from third_party) git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@1595 2bbb7eff-a529-9590-31e7-b0007b416f81 --- images.gyp | 14 +++++++++++++- libpng.gyp | 3 +++ zlib.gyp | 53 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 69 insertions(+), 1 deletion(-) create mode 100644 zlib.gyp diff --git a/images.gyp b/images.gyp index 7f2c8a4..705f7a3 100644 --- a/images.gyp +++ b/images.gyp @@ -68,11 +68,23 @@ '../src/images/SkImageDecoder_libgif.cpp', '../src/images/SkImageDecoder_libjpeg.cpp', - '../src/images/SkImageDecoder_libpng.cpp', '../src/images/SkImageDecoder_libpvjpeg.c', '../src/images/SkJpegUtility.cpp', '../src/images/SkMovie_gif.cpp', ], + # libpng stuff: + # Any targets that depend on this target should link in libpng and + # our code that calls it. + # See http://code.google.com/p/gyp/wiki/InputFormatReference#Dependent_Settings + 'dependencies' : [ + 'libpng.gyp:libpng', + ], + 'link_settings': { + 'sources': [ + '../src/images/SkImageDecoder_libpng.cpp', + ], + }, + # end libpng stuff }], [ 'OS == "linux" or OS == "freebsd" or OS == "openbsd" or OS == "solaris"', { 'sources!': [ diff --git a/libpng.gyp b/libpng.gyp index 07e89df..2998baa 100644 --- a/libpng.gyp +++ b/libpng.gyp @@ -4,6 +4,9 @@ { 'target_name': 'libpng', 'type': 'static_library', + 'dependencies': [ + 'zlib.gyp:zlib', + ], 'include_dirs': [ '../third_party/libpng', ], diff --git a/zlib.gyp b/zlib.gyp new file mode 100644 index 0000000..3e1fd0a --- /dev/null +++ b/zlib.gyp @@ -0,0 +1,53 @@ +# Gyp config to build zlib as needed for Skia. +{ + 'targets': [ + { + 'target_name': 'zlib', + 'type': 'static_library', + 'include_dirs': [ + '../third_party/zlib', + ], + 'sources': [ + '../third_party/zlib/crc32.h', + '../third_party/zlib/deflate.h', + '../third_party/zlib/gzguts.h', + '../third_party/zlib/inffast.h', + '../third_party/zlib/inffixed.h', + '../third_party/zlib/inflate.h', + '../third_party/zlib/inftrees.h', + '../third_party/zlib/trees.h', + '../third_party/zlib/zconf.h', + '../third_party/zlib/zlib.h', + '../third_party/zlib/zutil.h', + + '../third_party/zlib/adler32.c', + '../third_party/zlib/compress.c', + '../third_party/zlib/crc32.c', + '../third_party/zlib/deflate.c', + '../third_party/zlib/gzclose.c', + '../third_party/zlib/gzlib.c', + '../third_party/zlib/gzread.c', + '../third_party/zlib/gzwrite.c', + '../third_party/zlib/infback.c', + '../third_party/zlib/inffast.c', + '../third_party/zlib/inflate.c', + '../third_party/zlib/inftrees.c', + '../third_party/zlib/minigzip.c', + '../third_party/zlib/trees.c', + '../third_party/zlib/uncompr.c', + '../third_party/zlib/zutil.c', + ], + 'all_dependent_settings': { + 'include_dirs': [ + '../third_party/zlib', + ], + }, + }, + ], +} + +# Local Variables: +# tab-width:2 +# indent-tabs-mode:nil +# End: +# vim: set expandtab tabstop=2 shiftwidth=2: -- cgit v1.2.3 From 6559b6accb67adde2023ba5679bcfcfd9dd62daa Mon Sep 17 00:00:00 2001 From: "reed@google.com" Date: Wed, 15 Jun 2011 17:33:29 +0000 Subject: change GC imagedecoder to use the same colorspace between image and context, so we get reproducible, unchanged, values. use GC imagedecoder in gyp for mac git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@1599 2bbb7eff-a529-9590-31e7-b0007b416f81 --- images.gyp | 22 +++++++++------------- 1 file changed, 9 insertions(+), 13 deletions(-) diff --git a/images.gyp b/images.gyp index 705f7a3..7aacd9a 100644 --- a/images.gyp +++ b/images.gyp @@ -63,28 +63,24 @@ ], }], [ 'OS == "mac"', { + 'include_dirs': [ + '../include/utils/mac', + ], + 'sources': [ + '../src/ports/SkImageDecoder_CG.cpp' + ], 'sources!': [ '../include/images/SkJpegUtility.h', + '../src/images/SkImageEncoder_Factory.cpp', + '../src/images/SkImageDecoder_Factory.cpp', + '../src/images/SkImageDecoder_libpng.cpp', '../src/images/SkImageDecoder_libgif.cpp', '../src/images/SkImageDecoder_libjpeg.cpp', '../src/images/SkImageDecoder_libpvjpeg.c', '../src/images/SkJpegUtility.cpp', '../src/images/SkMovie_gif.cpp', ], - # libpng stuff: - # Any targets that depend on this target should link in libpng and - # our code that calls it. - # See http://code.google.com/p/gyp/wiki/InputFormatReference#Dependent_Settings - 'dependencies' : [ - 'libpng.gyp:libpng', - ], - 'link_settings': { - 'sources': [ - '../src/images/SkImageDecoder_libpng.cpp', - ], - }, - # end libpng stuff }], [ 'OS == "linux" or OS == "freebsd" or OS == "openbsd" or OS == "solaris"', { 'sources!': [ -- cgit v1.2.3 From 734d4206602182c1bf3e0f388207a3b331544e54 Mon Sep 17 00:00:00 2001 From: "senorblanco@chromium.org" Date: Wed, 15 Jun 2011 17:52:09 +0000 Subject: Implement edge AA for concave polys in the tesselated path renderer. Review URL: http://codereview.appspot.com/4571072/ git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@1600 2bbb7eff-a529-9590-31e7-b0007b416f81 --- SampleApp.gyp | 1 + 1 file changed, 1 insertion(+) diff --git a/SampleApp.gyp b/SampleApp.gyp index f0446d9..04e07d6 100644 --- a/SampleApp.gyp +++ b/SampleApp.gyp @@ -43,6 +43,7 @@ '../samplecode/SampleCode.h', '../samplecode/SampleColorFilter.cpp', '../samplecode/SampleComplexClip.cpp', + '../samplecode/SampleConcavePaths.cpp', '../samplecode/SampleCull.cpp', '../samplecode/SampleDecode.cpp', '../samplecode/SampleDither.cpp', -- cgit v1.2.3 From 5548d3d944da855722178d6c1b3e8cb8c9daea74 Mon Sep 17 00:00:00 2001 From: "epoger@google.com" Date: Wed, 15 Jun 2011 18:04:58 +0000 Subject: Implement SkPoint::Normalize() for SK_SCALAR_IS_FIXED and add performance warning to its declaration http://codereview.appspot.com/4582043/ git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@1602 2bbb7eff-a529-9590-31e7-b0007b416f81 --- core.gyp | 12 ++++++++++++ tests.gyp | 1 + 2 files changed, 13 insertions(+) diff --git a/core.gyp b/core.gyp index b5bc962..9017a4f 100644 --- a/core.gyp +++ b/core.gyp @@ -330,6 +330,18 @@ 'opts.gyp:opts' ], }, + { + 'target_name': 'core_tests', + 'type': 'static_library', + 'all_dependent_settings': { + 'sources': [ + '../tests/core/PointTest.cpp', + ], + 'include_dirs': [ + '../tests', + ], + }, + }, ], } diff --git a/tests.gyp b/tests.gyp index 1888a21..fa2e179 100644 --- a/tests.gyp +++ b/tests.gyp @@ -69,6 +69,7 @@ ], 'dependencies': [ 'core.gyp:core', + 'core.gyp:core_tests', 'effects.gyp:effects', 'experimental.gyp:experimental', 'images.gyp:images', -- cgit v1.2.3 From aef60727be531617472bf2766e457baba975540e Mon Sep 17 00:00:00 2001 From: "epoger@google.com" Date: Wed, 15 Jun 2011 18:20:41 +0000 Subject: fix all_dependent_settings gyp bug (affected Mac only) git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@1603 2bbb7eff-a529-9590-31e7-b0007b416f81 --- core.gyp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core.gyp b/core.gyp index 9017a4f..90d3400 100644 --- a/core.gyp +++ b/core.gyp @@ -333,7 +333,7 @@ { 'target_name': 'core_tests', 'type': 'static_library', - 'all_dependent_settings': { + 'direct_dependent_settings': { 'sources': [ '../tests/core/PointTest.cpp', ], -- cgit v1.2.3 From 0827bb3d8df632f72cb9f60c8bb0a0a66b9a2d0c Mon Sep 17 00:00:00 2001 From: "epoger@google.com" Date: Wed, 15 Jun 2011 18:49:21 +0000 Subject: Move PointTest.cpp out of tests/core into tests/ ; the other arrangement was "clever" but was causing build problems. git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@1604 2bbb7eff-a529-9590-31e7-b0007b416f81 --- core.gyp | 12 ------------ tests.gyp | 2 +- 2 files changed, 1 insertion(+), 13 deletions(-) diff --git a/core.gyp b/core.gyp index 90d3400..b5bc962 100644 --- a/core.gyp +++ b/core.gyp @@ -330,18 +330,6 @@ 'opts.gyp:opts' ], }, - { - 'target_name': 'core_tests', - 'type': 'static_library', - 'direct_dependent_settings': { - 'sources': [ - '../tests/core/PointTest.cpp', - ], - 'include_dirs': [ - '../tests', - ], - }, - }, ], } diff --git a/tests.gyp b/tests.gyp index fa2e179..1823b43 100644 --- a/tests.gyp +++ b/tests.gyp @@ -52,6 +52,7 @@ '../tests/PathMeasureTest.cpp', '../tests/PathTest.cpp', '../tests/PDFPrimitivesTest.cpp', + '../tests/PointTest.cpp', '../tests/Reader32Test.cpp', '../tests/RefDictTest.cpp', '../tests/RegionTest.cpp', @@ -69,7 +70,6 @@ ], 'dependencies': [ 'core.gyp:core', - 'core.gyp:core_tests', 'effects.gyp:effects', 'experimental.gyp:experimental', 'images.gyp:images', -- cgit v1.2.3 From c16081177cf4aead3b1a335afe779def9fabb0a2 Mon Sep 17 00:00:00 2001 From: "epoger@google.com" Date: Wed, 15 Jun 2011 19:35:50 +0000 Subject: remove trunk/gyp/gyp_skia (it was replaced a while back by trunk/gyp_skia) git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@1605 2bbb7eff-a529-9590-31e7-b0007b416f81 --- gyp_skia | 90 ---------------------------------------------------------------- 1 file changed, 90 deletions(-) delete mode 100755 gyp_skia diff --git a/gyp_skia b/gyp_skia deleted file mode 100755 index b71757b..0000000 --- a/gyp_skia +++ /dev/null @@ -1,90 +0,0 @@ -#!/usr/bin/python -# -# Copyright (C) 2011 The Android Open Source Project -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -# This script is a wrapper which invokes gyp with the correct --depth argument, -# and supports the automatic regeneration of build files if all.gyp is -# changed (Linux-only). -# - -# -# -# -# -# -# THIS IS DEPRECATED IN FAVOR OF trunk/gyp_skia !!! -# Questions? Contact epoger@google.com -# -# -# -# - -import glob -import os -import shlex -import sys - -script_dir = os.path.dirname(__file__) - -gyp_dir = os.path.normpath(os.path.join(script_dir, os.pardir, 'third_party')) - -sys.path.append(os.path.join(gyp_dir, 'gyp', 'pylib')) -import gyp - -def additional_include_files(args=[]): - # Determine the include files specified on the command line. - # This doesn't cover all the different option formats you can use, - # but it's mainly intended to avoid duplicating flags on the automatic - # makefile regeneration which only uses this format. - specified_includes = set() - for arg in args: - if arg.startswith('-I') and len(arg) > 2: - specified_includes.add(os.path.realpath(arg[2:])) - - result = [] - def AddInclude(path): - if os.path.realpath(path) not in specified_includes: - result.append(path) - - # Always include common.gypi - AddInclude(os.path.join(script_dir, 'common.gypi')) - - return result - -if __name__ == '__main__': - args = sys.argv[1:] - - # This could give false positives since it doesn't actually do real option - # parsing. Oh well. - gyp_file_specified = False - for arg in args: - if arg.endswith('.gyp'): - gyp_file_specified = True - break - - # If we didn't get a file, then fall back to assuming 'all.gyp' from the - # same directory as the script. - if not gyp_file_specified: - args.append(os.path.join(script_dir, 'all.gyp')) - - args.extend(['-I' + i for i in additional_include_files(args)]) - - args.extend(['--depth']) - args.extend([os.path.abspath(script_dir)]) - print 'Updating projects from gyp files...' - sys.stdout.flush() - - # Off we go... - sys.exit(gyp.main(args)) -- cgit v1.2.3 From 9ac05818a7a59b6f41bf72843e698d011963e90b Mon Sep 17 00:00:00 2001 From: "bungeman@google.com" Date: Wed, 15 Jun 2011 22:00:58 +0000 Subject: Put Matirx and Scalar benches into gyp. The Matrix and Scalar benches were in the old Makefile, but did not make it into gyp. git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@1608 2bbb7eff-a529-9590-31e7-b0007b416f81 --- bench.gyp | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/bench.gyp b/bench.gyp index 01aea2e..d5a4fcf 100644 --- a/bench.gyp +++ b/bench.gyp @@ -37,9 +37,11 @@ '../bench/DecodeBench.cpp', '../bench/FPSBench.cpp', '../bench/GradientBench.cpp', + '../bench/MatrixBench.cpp', '../bench/PathBench.cpp', '../bench/RectBench.cpp', '../bench/RepeatTileBench.cpp', + '../bench/ScalarBench.cpp', '../bench/TextBench.cpp', ], 'dependencies': [ @@ -62,8 +64,7 @@ '../bench/BenchSysTimer_posix.h', '../bench/BenchSysTimer_posix.cpp', ], - }], - [ 'OS in ["linux", "freebsd", "openbsd", "solaris"]', { + },{ 'link_settings': { 'libraries': [ '-lrt', @@ -76,14 +77,12 @@ '../bench/BenchSysTimer_windows.cpp', ], }], - [ 'OS in ["win", "mac", "linux", "freebsd", "openbsd", "solaris"]', { 'sources!': [ '../bench/BenchGpuTimer_none.h', '../bench/BenchGpuTimer_none.cpp', ], - }], - [ 'OS not in ["win", "mac", "linux", "freebsd", "openbsd", "solaris"]', { + },{ 'sources!': [ '../bench/BenchGpuTimer_gl.h', '../bench/BenchGpuTimer_gl.cpp', -- cgit v1.2.3 From 184de296b584ee5c831deffd26513e22bd10d862 Mon Sep 17 00:00:00 2001 From: "epoger@google.com" Date: Thu, 16 Jun 2011 12:27:14 +0000 Subject: remove libpng and zlib from third_party http://codereview.appspot.com/4571077 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@1609 2bbb7eff-a529-9590-31e7-b0007b416f81 --- images.gyp | 6 +++--- libpng.gyp | 51 --------------------------------------------------- zlib.gyp | 53 ----------------------------------------------------- 3 files changed, 3 insertions(+), 107 deletions(-) delete mode 100644 libpng.gyp delete mode 100644 zlib.gyp diff --git a/images.gyp b/images.gyp index 7aacd9a..e052f1e 100644 --- a/images.gyp +++ b/images.gyp @@ -96,13 +96,13 @@ # Any targets that depend on this target should link in libpng and # our code that calls it. # See http://code.google.com/p/gyp/wiki/InputFormatReference#Dependent_Settings - 'dependencies' : [ - 'libpng.gyp:libpng', - ], 'link_settings': { 'sources': [ '../src/images/SkImageDecoder_libpng.cpp', ], + 'libraries': [ + '-lpng', + ], }, # end libpng stuff }], diff --git a/libpng.gyp b/libpng.gyp deleted file mode 100644 index 2998baa..0000000 --- a/libpng.gyp +++ /dev/null @@ -1,51 +0,0 @@ -# Gyp config to build libpng as needed for Skia. -{ - 'targets': [ - { - 'target_name': 'libpng', - 'type': 'static_library', - 'dependencies': [ - 'zlib.gyp:zlib', - ], - 'include_dirs': [ - '../third_party/libpng', - ], - 'sources': [ - '../third_party/libpng/png.h', - '../third_party/libpng/pngconf.h', - '../third_party/libpng/pngdebug.h', - '../third_party/libpng/pnginfo.h', - '../third_party/libpng/pnglibconf.h', - '../third_party/libpng/pngpriv.h', - '../third_party/libpng/pngstruct.h', - - '../third_party/libpng/png.c', - '../third_party/libpng/pngerror.c', - '../third_party/libpng/pngget.c', - '../third_party/libpng/pngmem.c', - '../third_party/libpng/pngpread.c', - '../third_party/libpng/pngread.c', - '../third_party/libpng/pngrio.c', - '../third_party/libpng/pngrtran.c', - '../third_party/libpng/pngrutil.c', - '../third_party/libpng/pngset.c', - '../third_party/libpng/pngtrans.c', - '../third_party/libpng/pngwio.c', - '../third_party/libpng/pngwrite.c', - '../third_party/libpng/pngwtran.c', - '../third_party/libpng/pngwutil.c', - ], - 'all_dependent_settings': { - 'include_dirs': [ - '../third_party/libpng', - ], - }, - }, - ], -} - -# Local Variables: -# tab-width:2 -# indent-tabs-mode:nil -# End: -# vim: set expandtab tabstop=2 shiftwidth=2: diff --git a/zlib.gyp b/zlib.gyp deleted file mode 100644 index 3e1fd0a..0000000 --- a/zlib.gyp +++ /dev/null @@ -1,53 +0,0 @@ -# Gyp config to build zlib as needed for Skia. -{ - 'targets': [ - { - 'target_name': 'zlib', - 'type': 'static_library', - 'include_dirs': [ - '../third_party/zlib', - ], - 'sources': [ - '../third_party/zlib/crc32.h', - '../third_party/zlib/deflate.h', - '../third_party/zlib/gzguts.h', - '../third_party/zlib/inffast.h', - '../third_party/zlib/inffixed.h', - '../third_party/zlib/inflate.h', - '../third_party/zlib/inftrees.h', - '../third_party/zlib/trees.h', - '../third_party/zlib/zconf.h', - '../third_party/zlib/zlib.h', - '../third_party/zlib/zutil.h', - - '../third_party/zlib/adler32.c', - '../third_party/zlib/compress.c', - '../third_party/zlib/crc32.c', - '../third_party/zlib/deflate.c', - '../third_party/zlib/gzclose.c', - '../third_party/zlib/gzlib.c', - '../third_party/zlib/gzread.c', - '../third_party/zlib/gzwrite.c', - '../third_party/zlib/infback.c', - '../third_party/zlib/inffast.c', - '../third_party/zlib/inflate.c', - '../third_party/zlib/inftrees.c', - '../third_party/zlib/minigzip.c', - '../third_party/zlib/trees.c', - '../third_party/zlib/uncompr.c', - '../third_party/zlib/zutil.c', - ], - 'all_dependent_settings': { - 'include_dirs': [ - '../third_party/zlib', - ], - }, - }, - ], -} - -# Local Variables: -# tab-width:2 -# indent-tabs-mode:nil -# End: -# vim: set expandtab tabstop=2 shiftwidth=2: -- cgit v1.2.3 From d207cdc9bd2589538a0a618a7373b78d614bf3eb Mon Sep 17 00:00:00 2001 From: "yangsu@google.com" Date: Fri, 17 Jun 2011 15:00:44 +0000 Subject: Gyp files for Cocoa Debugger and Simple Cocoa App http://codereview.appspot.com/4632045/ git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@1632 2bbb7eff-a529-9590-31e7-b0007b416f81 --- CocoaDebuggerApp.gyp | 79 ++++++++++++++++++++++++++++++++++++++++++++++++++++ SimpleCocoaApp.gyp | 66 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 145 insertions(+) create mode 100644 CocoaDebuggerApp.gyp create mode 100644 SimpleCocoaApp.gyp diff --git a/CocoaDebuggerApp.gyp b/CocoaDebuggerApp.gyp new file mode 100644 index 0000000..904563c --- /dev/null +++ b/CocoaDebuggerApp.gyp @@ -0,0 +1,79 @@ +{ + 'includes': [ + 'target_defaults.gypi', + ], + 'targets': [ + { + 'target_name': 'CocoaDebuggerApp', + 'type': 'executable', + 'mac_bundle' : 1, + + 'include_dirs' : [ + '../include/pipe', + '../experimental/CocoaDebugger', + '../experimental/SimpleCocoaApp', + ], + 'sources': [ + '../experimental/CocoaDebugger/SkCommandListView.cpp', + '../experimental/CocoaDebugger/SkContentView.cpp', + '../experimental/CocoaDebugger/SkDebugDumper.cpp', + '../experimental/CocoaDebugger/SkDumpCanvasM.cpp', + '../experimental/CocoaDebugger/SkInfoPanelView.cpp', + '../src/pipe/SkGPipeRead.cpp', + ], + 'dependencies': [ + 'core.gyp:core', + 'effects.gyp:effects', + 'opts.gyp:opts', + 'utils.gyp:utils', + 'views.gyp:views', + 'xml.gyp:xml', + ], + 'conditions' : [ + # Only supports Mac currently + ['OS == "mac"', { + 'sources': [ + '../experimental/CocoaDebugger/CocoaDebugger-Info.plist', + '../experimental/CocoaDebugger/CocoaDebugger_Prefix.pch', + '../experimental/CocoaDebugger/CocoaDebuggerAppDelegate.mm', + '../experimental/CocoaDebugger/main.m', + '../experimental/CocoaDebugger/SkDebugger.mm', + '../experimental/CocoaDebugger/SkMenuController.mm', + '../experimental/SimpleCocoaApp/SkNSView.mm', + '../experimental/SimpleCocoaApp/SkNSWindow.mm', + '../include/utils/mac/SkCGUtils.h', + '../src/utils/mac/SkCreateCGImageRef.cpp', + ], + 'link_settings': { + 'libraries': [ + '$(SDKROOT)/System/Library/Frameworks/Cocoa.framework', + '$(SDKROOT)/System/Library/Frameworks/AppKit.framework', + '$(SDKROOT)/System/Library/Frameworks/Foundation.framework', + '$(SDKROOT)/System/Library/Frameworks/OpenGL.framework', + ], + 'libraries!': [ + # Currently skia mac apps rely on Carbon and AGL for UI. Future + # apps should use Cocoa instead and dependencies on Carbon and AGL + # should eventually be removed + '$(SDKROOT)/System/Library/Frameworks/Carbon.framework', + '$(SDKROOT)/System/Library/Frameworks/AGL.framework', + ], + }, + 'xcode_settings' : { + 'INFOPLIST_FILE' : '../experimental/CocoaDebugger/CocoaDebugger-Info.plist', + }, + 'mac_bundle_resources' : [ + '../experimental/CocoaDebugger/English.lproj/InfoPlist.strings', + '../experimental/CocoaDebugger/English.lproj/MainMenu.xib', + ], + }], + ], + }, + ], +} + +# Local Variables: +# tab-width:2 +# indent-tabs-mode:nil +# End: +# vim: set expandtab tabstop=2 shiftwidth=2: diff --git a/SimpleCocoaApp.gyp b/SimpleCocoaApp.gyp new file mode 100644 index 0000000..68caa05 --- /dev/null +++ b/SimpleCocoaApp.gyp @@ -0,0 +1,66 @@ +{ + 'includes': [ + 'target_defaults.gypi', + ], + 'targets': [ + { + 'target_name': 'SimpleCocoaApp', + 'type': 'executable', + 'mac_bundle' : 1, + 'include_dirs' : [ + '../experimental/SimpleCocoaApp/', + ], + 'sources': [ + '../experimental/SimpleCocoaApp/main.m', + '../experimental/SimpleCocoaApp/SampleWindow.mm', + '../experimental/SimpleCocoaApp/SimpleCocoaApp-Info.plist', + '../experimental/SimpleCocoaApp/SimpleCocoaApp_Prefix.pch', + '../experimental/SimpleCocoaApp/SimpleCocoaAppDelegate.mm', + '../experimental/SimpleCocoaApp/SkNSView.mm', + '../experimental/SimpleCocoaApp/SkNSWindow.mm', + ], + 'dependencies': [ + 'core.gyp:core', + 'opts.gyp:opts', + 'utils.gyp:utils', + 'views.gyp:views', + 'xml.gyp:xml', + ], + 'conditions' : [ + # Only supports Mac currently + [ 'OS == "mac"', { + 'sources': [ + '../include/utils/mac/SkCGUtils.h', + '../src/utils/mac/SkCreateCGImageRef.cpp', + ], + 'link_settings': { + 'libraries': [ + '$(SDKROOT)/System/Library/Frameworks/Cocoa.framework', + '$(SDKROOT)/System/Library/Frameworks/AppKit.framework', + ], + 'libraries!': [ + # Currently skia mac apps rely on Carbon and AGL for UI. Future + # apps should use Cocoa instead and dependencies on Carbon and AGL + # should eventually be removed + '$(SDKROOT)/System/Library/Frameworks/Carbon.framework', + '$(SDKROOT)/System/Library/Frameworks/AGL.framework', + ], + }, + 'xcode_settings' : { + 'INFOPLIST_FILE' : '../experimental/SimpleCocoaApp/SimpleCocoaApp-Info.plist', + }, + 'mac_bundle_resources' : [ + '../experimental/SimpleCocoaApp/English.lproj/InfoPlist.strings', + '../experimental/SimpleCocoaApp/English.lproj/MainMenu.xib', + ], + }], + ], + }, + ], +} + +# Local Variables: +# tab-width:2 +# indent-tabs-mode:nil +# End: +# vim: set expandtab tabstop=2 shiftwidth=2: -- cgit v1.2.3 From cf1692a638a2bba7f345e5bf9986c570e6f1f305 Mon Sep 17 00:00:00 2001 From: "yangsu@google.com" Date: Fri, 17 Jun 2011 15:04:40 +0000 Subject: Added dependencies for SkPipe in SampleApp Fixed SkGPipeWrite to reflect changes in SkDevice git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@1633 2bbb7eff-a529-9590-31e7-b0007b416f81 --- SampleApp.gyp | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/SampleApp.gyp b/SampleApp.gyp index 04e07d6..b0df3a7 100644 --- a/SampleApp.gyp +++ b/SampleApp.gyp @@ -10,6 +10,7 @@ 'include_dirs' : [ '../src/core', # needed to get SkConcaveToTriangle, maybe this should be moved to include dir? '../gm', # SampleGM.cpp pulls gm.h + '../include/pipe', # To pull in SkGPipe.h for pipe reader/writer ], 'sources': [ # gm files needed for SampleGM.cpp @@ -108,6 +109,10 @@ '../samplecode/SampleVertices.cpp', '../samplecode/SampleXfermodes.cpp', '../samplecode/SampleXfermodesBlur.cpp', + + # Dependecies for the pipe code in SampleApp + '../src/pipe/SkGPipeRead.cpp', + '../src/pipe/SkGPipeWrite.cpp', ], 'sources!': [ '../samplecode/SampleSkLayer.cpp', #relies on SkMatrix44 which doesn't compile -- cgit v1.2.3 From 2f3d5a53cf136c6509c34f1616e411b4ca5e8a64 Mon Sep 17 00:00:00 2001 From: Scroggo Date: Fri, 17 Jun 2011 15:17:07 +0000 Subject: Remove redundant GrTouchGesture. Switch its only user to SkTouchGesture. Review at http://codereview.appspot.com/4636045/ git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@1636 2bbb7eff-a529-9590-31e7-b0007b416f81 --- gpu.gyp | 1 - 1 file changed, 1 deletion(-) diff --git a/gpu.gyp b/gpu.gyp index bbfa460..ccd3c7d 100644 --- a/gpu.gyp +++ b/gpu.gyp @@ -136,7 +136,6 @@ '../gpu/include/GrTextureCache.h', '../gpu/include/GrTHashCache.h', '../gpu/include/GrTLList.h', - '../gpu/include/GrTouchGesture.h', '../gpu/include/GrTypes.h', '../gpu/include/GrUserConfig.h', '../gpu/include/GrVertexBuffer.h', -- cgit v1.2.3 From 65e11a0a27f3feb3d5cd54c4c4086c26ad16164e Mon Sep 17 00:00:00 2001 From: "yangsu@google.com" Date: Fri, 17 Jun 2011 18:31:01 +0000 Subject: Added FileReaderApp to experimental and it's corresponding gyp file git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@1641 2bbb7eff-a529-9590-31e7-b0007b416f81 --- FileReaderApp.gyp | 77 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 77 insertions(+) create mode 100644 FileReaderApp.gyp diff --git a/FileReaderApp.gyp b/FileReaderApp.gyp new file mode 100644 index 0000000..2ada993 --- /dev/null +++ b/FileReaderApp.gyp @@ -0,0 +1,77 @@ +{ + 'includes': [ + 'target_defaults.gypi', + ], + 'targets': [ + { + 'target_name': 'FileReaderApp', + 'type': 'executable', + 'mac_bundle' : 1, + + 'include_dirs' : [ + '../include/pipe', + '../experimental/FileReaderApp', + '../experimental/SimpleCocoaApp', + ], + 'sources': [ + '../experimental/FileReaderApp/ReaderView.cpp', + '../src/pipe/SkGPipeRead.cpp', + ], + 'sources!': [ + '../src/utils/mac/SkOSWindow_Mac.cpp', + ], + 'dependencies': [ + 'core.gyp:core', + 'effects.gyp:effects', + 'opts.gyp:opts', + 'utils.gyp:utils', + 'views.gyp:views', + 'xml.gyp:xml', + ], + 'conditions' : [ + # Only supports Mac currently + ['OS == "mac"', { + 'sources': [ + '../experimental/SimpleCocoaApp/SkNSWindow.mm', + '../experimental/SimpleCocoaApp/SkNSView.mm', + '../experimental/FileReaderApp/FileReaderApp-Info.plist', + '../experimental/FileReaderApp/FileReaderAppDelegate.mm', + '../experimental/FileReaderApp/FileReaderApp_Prefix.pch', + '../experimental/FileReaderApp/FileReaderWindow.mm', + '../experimental/FileReaderApp/main.m', + '../include/utils/mac/SkCGUtils.h', + '../src/utils/mac/SkCreateCGImageRef.cpp', + ], + 'link_settings': { + 'libraries': [ + '$(SDKROOT)/System/Library/Frameworks/Cocoa.framework', + '$(SDKROOT)/System/Library/Frameworks/AppKit.framework', + '$(SDKROOT)/System/Library/Frameworks/Foundation.framework', + '$(SDKROOT)/System/Library/Frameworks/OpenGL.framework', + ], + 'libraries!': [ + # Currently skia mac apps rely on Carbon and AGL for UI. Future + # apps should use Cocoa instead and dependencies on Carbon and AGL + # should eventually be removed + '$(SDKROOT)/System/Library/Frameworks/Carbon.framework', + '$(SDKROOT)/System/Library/Frameworks/AGL.framework', + ], + }, + 'xcode_settings' : { + 'INFOPLIST_FILE' : '../experimental/FileReaderApp/FileReaderApp-Info.plist', + }, + 'mac_bundle_resources' : [ + '../experimental/FileReaderApp/English.lproj/InfoPlist.strings', + '../experimental/FileReaderApp/English.lproj/MainMenu.xib', + ], + }], + ], + }, + ], +} + +# Local Variables: +# tab-width:2 +# indent-tabs-mode:nil +# End: +# vim: set expandtab tabstop=2 shiftwidth=2: -- cgit v1.2.3 From be680fe056b69dd8f408767fda932074b15a985d Mon Sep 17 00:00:00 2001 From: "mike@reedtribe.org" Date: Sat, 18 Jun 2011 01:56:44 +0000 Subject: add strokes.cpp git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@1647 2bbb7eff-a529-9590-31e7-b0007b416f81 --- gm.gyp | 1 + 1 file changed, 1 insertion(+) diff --git a/gm.gyp b/gm.gyp index a53edb1..bc006cb 100644 --- a/gm.gyp +++ b/gm.gyp @@ -27,6 +27,7 @@ '../gm/shadows.cpp', '../gm/shapes.cpp', '../gm/strokerects.cpp', + '../gm/strokes.cpp', '../gm/tilemodes.cpp', '../gm/xfermodes.cpp', '../gm/shadertext.cpp', -- cgit v1.2.3 From d7e95ea192916dea35a5fab443e5a3f0caad0039 Mon Sep 17 00:00:00 2001 From: "senorblanco@chromium.org" Date: Mon, 20 Jun 2011 19:46:42 +0000 Subject: Remove some files from views.gyp that already being compiled into utils.gyp (already done for Linux, this change does the same for Mac and Win). Review URL: http://codereview.appspot.com/4575044/ git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@1654 2bbb7eff-a529-9590-31e7-b0007b416f81 --- core.gyp | 3 --- images.gyp | 3 --- views.gyp | 18 ------------------ 3 files changed, 24 deletions(-) diff --git a/core.gyp b/core.gyp index b5bc962..ba63485 100644 --- a/core.gyp +++ b/core.gyp @@ -289,9 +289,6 @@ '../src/ports/SkThread_pthread.cpp', '../src/ports/SkTime_Unix.cpp', - - # TODO(epoger): why are we building this here? - '../src/utils/mac/SkCreateCGImageRef.cpp', ], 'link_settings': { 'libraries': [ diff --git a/images.gyp b/images.gyp index e052f1e..ba05a07 100644 --- a/images.gyp +++ b/images.gyp @@ -97,9 +97,6 @@ # our code that calls it. # See http://code.google.com/p/gyp/wiki/InputFormatReference#Dependent_Settings 'link_settings': { - 'sources': [ - '../src/images/SkImageDecoder_libpng.cpp', - ], 'libraries': [ '-lpng', ], diff --git a/views.gyp b/views.gyp index 02059a4..6ba42bf 100644 --- a/views.gyp +++ b/views.gyp @@ -73,25 +73,7 @@ '../src/views/SkListWidget.cpp', #depends on missing SkListSource implementation ], 'conditions': [ - [ 'OS == "win"', { - 'sources': [ - '../src/utils/win/SkOSWindow_Win.cpp', - '../src/utils/win/skia_win.cpp', - ], - }], [ 'OS == "mac"', { - # TODO(epoger): why are we building these here instead of inheriting - # them from utils.gyp? - 'sources': [ - '../include/utils/SkCGUtils.h', - '../src/utils/mac/SkCreateCGImageRef.cpp', - '../src/utils/mac/SkEGLContext_mac.cpp', - '../src/utils/mac/skia_mac.cpp', - '../src/utils/mac/SkOSWindow_Mac.cpp', - ], - 'include_dirs': [ - '../include/utils/mac', - ], 'link_settings': { 'libraries': [ '$(SDKROOT)/System/Library/Frameworks/Carbon.framework', -- cgit v1.2.3 From 6f3102878424a264052d8db5e2ea6a5d7208dfe2 Mon Sep 17 00:00:00 2001 From: "senorblanco@chromium.org" Date: Mon, 20 Jun 2011 19:56:53 +0000 Subject: Revert the changes to gyp/images.gyp in r1654, as apparently they're necessary for gm to build correctly. git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@1655 2bbb7eff-a529-9590-31e7-b0007b416f81 --- images.gyp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/images.gyp b/images.gyp index ba05a07..e052f1e 100644 --- a/images.gyp +++ b/images.gyp @@ -97,6 +97,9 @@ # our code that calls it. # See http://code.google.com/p/gyp/wiki/InputFormatReference#Dependent_Settings 'link_settings': { + 'sources': [ + '../src/images/SkImageDecoder_libpng.cpp', + ], 'libraries': [ '-lpng', ], -- cgit v1.2.3 From 082ab1edf864a60592d6b7ad7b5b31b2b1f2d241 Mon Sep 17 00:00:00 2001 From: "yangsu@google.com" Date: Tue, 21 Jun 2011 13:09:32 +0000 Subject: Changed mac specific files to use ApplicationServices rather than Carbon http://codereview.appspot.com/4644053/ git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@1658 2bbb7eff-a529-9590-31e7-b0007b416f81 --- core.gyp | 1 + 1 file changed, 1 insertion(+) diff --git a/core.gyp b/core.gyp index ba63485..e9b019f 100644 --- a/core.gyp +++ b/core.gyp @@ -293,6 +293,7 @@ 'link_settings': { 'libraries': [ '$(SDKROOT)/System/Library/Frameworks/Carbon.framework', + '$(SDKROOT)/System/Library/Frameworks/ApplicationServices.framework', ], }, }], -- cgit v1.2.3 From 5135d6d6c4153e79c417cd4a0193623882be00d0 Mon Sep 17 00:00:00 2001 From: Scroggo Date: Tue, 21 Jun 2011 14:44:57 +0000 Subject: Add a way to save to PDF in SampleApp on Android and elsewhere. In Android, add the PDF file to downloads, so it can be opened. Reviewed at http://codereview.appspot.com/4638052/ git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@1659 2bbb7eff-a529-9590-31e7-b0007b416f81 --- SampleApp.gyp | 1 + 1 file changed, 1 insertion(+) diff --git a/SampleApp.gyp b/SampleApp.gyp index b0df3a7..50baa62 100644 --- a/SampleApp.gyp +++ b/SampleApp.gyp @@ -132,6 +132,7 @@ 'experimental.gyp:experimental', 'gpu.gyp:gr', 'gpu.gyp:skgr', + 'pdf.gyp:pdf', ], 'conditions' : [ [ 'OS == "linux" or OS == "freebsd" or OS == "openbsd" or OS == "solaris"', { -- cgit v1.2.3 From 49e667d841e73aecc72712af95743fb15e3bd3ad Mon Sep 17 00:00:00 2001 From: "bungeman@google.com" Date: Wed, 22 Jun 2011 20:42:34 +0000 Subject: Add image encoder/decoder for Windows. http://codereview.appspot.com/4634078/ git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@1676 2bbb7eff-a529-9590-31e7-b0007b416f81 --- images.gyp | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/images.gyp b/images.gyp index e052f1e..8f0a06b 100644 --- a/images.gyp +++ b/images.gyp @@ -1,4 +1,4 @@ -{ +{ 'includes': [ 'target_defaults.gypi', ], @@ -47,6 +47,9 @@ '../src/images/SkPageFlipper.cpp', '../src/images/SkScaledBitmapSampler.cpp', '../src/images/SkScaledBitmapSampler.h', + + '../src/ports/SkImageDecoder_CG.cpp', + '../src/ports/SkImageDecoder_WIC.cpp', ], 'conditions': [ [ 'OS == "win"', { @@ -54,33 +57,40 @@ '../include/images/SkJpegUtility.h', '../src/images/SkFDStream.cpp', + '../src/images/SkImageDecoder_Factory.cpp', '../src/images/SkImageDecoder_libgif.cpp', '../src/images/SkImageDecoder_libjpeg.cpp', '../src/images/SkImageDecoder_libpng.cpp', '../src/images/SkImageDecoder_libpvjpeg.c', + '../src/images/SkImageEncoder_Factory.cpp', '../src/images/SkJpegUtility.cpp', '../src/images/SkMovie_gif.cpp', ], + },{ #else if OS != win + 'sources!': [ + '../src/ports/SkImageDecoder_WIC.cpp', + ], }], [ 'OS == "mac"', { 'include_dirs': [ '../include/utils/mac', ], - 'sources': [ - '../src/ports/SkImageDecoder_CG.cpp' - ], 'sources!': [ '../include/images/SkJpegUtility.h', - '../src/images/SkImageEncoder_Factory.cpp', '../src/images/SkImageDecoder_Factory.cpp', '../src/images/SkImageDecoder_libpng.cpp', '../src/images/SkImageDecoder_libgif.cpp', '../src/images/SkImageDecoder_libjpeg.cpp', '../src/images/SkImageDecoder_libpvjpeg.c', + '../src/images/SkImageEncoder_Factory.cpp', '../src/images/SkJpegUtility.cpp', '../src/images/SkMovie_gif.cpp', ], + },{ #else if OS != mac + 'sources!': [ + '../src/ports/SkImageDecoder_CG.cpp', + ], }], [ 'OS == "linux" or OS == "freebsd" or OS == "openbsd" or OS == "solaris"', { 'sources!': [ -- cgit v1.2.3 From f64f83e5ee04cc7cc8b9314b8c3dd9aef762afb6 Mon Sep 17 00:00:00 2001 From: "epoger@google.com" Date: Thu, 23 Jun 2011 19:34:50 +0000 Subject: Allow override of skia_scalar gyp variable using GYP_DEFINES http://codereview.appspot.com/4631061/ git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@1689 2bbb7eff-a529-9590-31e7-b0007b416f81 --- target_defaults.gypi | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/target_defaults.gypi b/target_defaults.gypi index bc08e18..865f8a3 100644 --- a/target_defaults.gypi +++ b/target_defaults.gypi @@ -3,9 +3,13 @@ 'defines': [ 'SK_CAN_USE_FLOAT', ], + 'variables': { 'skia_scalar%': 'float', }, + # Allow override in GYP_DEFINES environment variable. + 'skia_scalar%': '<(skia_scalar)', + 'configurations': { 'Debug': { 'defines': [ -- cgit v1.2.3 From 4f1876b3b834181779d2467c5c239cbf69e63bcc Mon Sep 17 00:00:00 2001 From: "bungeman@google.com" Date: Thu, 23 Jun 2011 21:43:52 +0000 Subject: Wrap SkStreams in IStreams instead of copying data around. http://codereview.appspot.com/4630062/ git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@1694 2bbb7eff-a529-9590-31e7-b0007b416f81 --- images.gyp | 3 +++ utils.gyp | 67 +++++++++++++++++++++++++++++++++++++++++--------------------- 2 files changed, 47 insertions(+), 23 deletions(-) diff --git a/images.gyp b/images.gyp index 8f0a06b..dad4361 100644 --- a/images.gyp +++ b/images.gyp @@ -6,6 +6,9 @@ { 'target_name': 'images', 'type': 'static_library', + 'dependencies': [ + 'utils.gyp:utils', + ], 'include_dirs': [ '../include/config', '../include/core', diff --git a/utils.gyp b/utils.gyp index 8845d9a..9a3683f 100644 --- a/utils.gyp +++ b/utils.gyp @@ -12,6 +12,7 @@ '../include/utils', '../include/utils/mac', '../include/utils/unix', + '../include/utils/win', '../include/views', '../include/effects', '../include/xml', @@ -59,22 +60,32 @@ '../src/utils/SkSfntUtils.cpp', '../src/utils/SkUnitMappers.cpp', + #mac '../include/utils/mac/SkCGUtils.h', '../src/utils/mac/SkCreateCGImageRef.cpp', '../src/utils/mac/SkEGLContext_mac.cpp', '../src/utils/mac/skia_mac.cpp', '../src/utils/mac/SkOSWindow_Mac.cpp', + #mesa '../src/utils/mesa/SkEGLContext_Mesa.cpp', + #sdl '../src/utils/SDL/SkOSWindow_SDL.cpp', + #*nix '../src/utils/unix/keysym2ucs.c', '../src/utils/unix/SkEGLContext_Unix.cpp', '../src/utils/unix/SkOSWindow_Unix.cpp', + #windows + '../include/utils/win/SkAutoCoInitialize.h', + '../include/utils/win/SkIStream.h', + '../include/utils/win/SkTScopedComPtr.h', + '../src/utils/win/SkAutoCoInitialize.cpp', '../src/utils/win/skia_win.cpp', '../src/utils/win/SkEGLContext_Win.cpp', + '../src/utils/win/SkIStream.cpp', '../src/utils/win/SkOSWindow_Win.cpp', ], 'sources!': [ @@ -82,7 +93,19 @@ '../src/utils/SDL/SkOSWindow_SDL.cpp', ], 'conditions': [ - [ 'OS != "mac"', { + [ 'OS == "mac"', { + 'sources!': [ + '../src/utils/SkEGLContext_none.cpp', + ], + 'link_settings': { + 'libraries': [ + '$(SDKROOT)/System/Library/Frameworks/AGL.framework', + ], + }, + },{ #else if 'OS != "mac"' + 'include_dirs!': [ + '../include/utils/mac', + ], 'sources!': [ '../include/utils/mac/SkCGUtils.h', '../src/utils/mac/SkCreateCGImageRef.cpp', @@ -90,53 +113,51 @@ '../src/utils/mac/skia_mac.cpp', '../src/utils/mac/SkOSWindow_Mac.cpp', ], - 'include_dirs!': [ - '../include/utils/mac', - ], }], - [ 'OS == "mac"', { + [ 'OS in ["linux", "freebsd", "openbsd", "solaris"]', { 'sources!': [ '../src/utils/SkEGLContext_none.cpp', ], 'link_settings': { 'libraries': [ - '$(SDKROOT)/System/Library/Frameworks/AGL.framework', + '-lGL', + '-lGLU', ], }, - }], - [ 'OS != "linux" and OS != "freebsd" and OS != "openbsd" and OS != "solaris"', { + },{ #else if 'OS not in ["linux", "freebsd", "openbsd", "solaris"]' + 'include_dirs!': [ + '../include/utils/unix', + ], 'sources!': [ '../src/utils/unix/keysym2ucs.c', '../src/utils/unix/SkEGLContext_Unix.cpp', '../src/utils/unix/SkOSWindow_Unix.cpp', ], - 'include_dirs!': [ - '../include/utils/unix', - ], }], - [ 'OS == "linux" or OS == "freebsd" or OS == "openbsd" or OS == "solaris"', { + [ 'OS == "win"', { 'sources!': [ '../src/utils/SkEGLContext_none.cpp', ], - 'link_settings': { - 'libraries': [ - '-lGL', - '-lGLU', + 'direct_dependent_settings': { + 'include_dirs': [ + '../include/utils/win', ], }, - }], - [ 'OS != "win"', { + },{ #else if 'OS != "win"' + 'include_dirs!': [ + '../include/utils/win', + ], 'sources!': [ + '../include/utils/win/SkAutoCoInitialize.h', + '../include/utils/win/SkIStream.h', + '../include/utils/win/SkTScopedComPtr.h', + '../src/utils/win/SkAutoCoInitialize.cpp', '../src/utils/win/skia_win.cpp', '../src/utils/win/SkEGLContext_Win.cpp', + '../src/utils/win/SkIStream.cpp', '../src/utils/win/SkOSWindow_Win.cpp', ], }], - [ 'OS == "win"', { - 'sources!': [ - '../src/utils/SkEGLContext_none.cpp', - ], - }], ], 'direct_dependent_settings': { 'include_dirs': [ -- cgit v1.2.3 From a3199b2340bc8bc55642573b5c8a4855553aab4b Mon Sep 17 00:00:00 2001 From: "reed@google.com" Date: Fri, 24 Jun 2011 13:07:31 +0000 Subject: rename public SkDataRef to SkData rename animator's internal SkData to SkDataInput git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@1697 2bbb7eff-a529-9590-31e7-b0007b416f81 --- core.gyp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/core.gyp b/core.gyp index e9b019f..c02d1f5 100644 --- a/core.gyp +++ b/core.gyp @@ -55,7 +55,7 @@ '../src/core/SkCoreBlitters.h', '../src/core/SkCubicClipper.cpp', '../src/core/SkCubicClipper.h', - '../src/core/SkDataRef.cpp', + '../src/core/SkData.cpp', '../src/core/SkDebug.cpp', '../src/core/SkDeque.cpp', '../src/core/SkDevice.cpp', @@ -176,6 +176,7 @@ '../include/core/SkColorPriv.h', '../include/core/SkColorShader.h', '../include/core/SkComposeShader.h', + '../include/core/SkData.h', '../include/core/SkDeque.h', '../include/core/SkDescriptor.h', '../include/core/SkDevice.h', -- cgit v1.2.3 From 5ec66ff03203ea82a0bfe2f3309da1de5e2f028b Mon Sep 17 00:00:00 2001 From: "bungeman@google.com" Date: Fri, 24 Jun 2011 13:58:17 +0000 Subject: Make images properly depend on utils. http://codereview.appspot.com/4629068/ git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@1699 2bbb7eff-a529-9590-31e7-b0007b416f81 --- images.gyp | 3 --- utils.gyp | 5 +++++ 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/images.gyp b/images.gyp index dad4361..3608375 100644 --- a/images.gyp +++ b/images.gyp @@ -75,9 +75,6 @@ ], }], [ 'OS == "mac"', { - 'include_dirs': [ - '../include/utils/mac', - ], 'sources!': [ '../include/images/SkJpegUtility.h', diff --git a/utils.gyp b/utils.gyp index 9a3683f..f0dcda9 100644 --- a/utils.gyp +++ b/utils.gyp @@ -102,6 +102,11 @@ '$(SDKROOT)/System/Library/Frameworks/AGL.framework', ], }, + 'direct_dependent_settings': { + 'include_dirs': [ + '../include/utils/mac', + ], + }, },{ #else if 'OS != "mac"' 'include_dirs!': [ '../include/utils/mac', -- cgit v1.2.3 From 137f40b305c02a24d6590fa6ef603b2d83a8aa0e Mon Sep 17 00:00:00 2001 From: "tomhudson@google.com" Date: Fri, 24 Jun 2011 15:43:24 +0000 Subject: Experimental framework for fast quadratic subdivision density computation code. Lets us test multiple implementations of the code that determines how many points to divide a quadratic into and guarantee that estimates are within a factor of two of the conservative computation. git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@1701 2bbb7eff-a529-9590-31e7-b0007b416f81 --- tests.gyp | 1 + 1 file changed, 1 insertion(+) diff --git a/tests.gyp b/tests.gyp index 1823b43..b44c977 100644 --- a/tests.gyp +++ b/tests.gyp @@ -49,6 +49,7 @@ '../tests/PackBitsTest.cpp', '../tests/PaintTest.cpp', '../tests/ParsePathTest.cpp', + '../tests/PathCoverageTest.cpp', '../tests/PathMeasureTest.cpp', '../tests/PathTest.cpp', '../tests/PDFPrimitivesTest.cpp', -- cgit v1.2.3 From d677bbdd09cd886c25387878157e315a2e7e5f82 Mon Sep 17 00:00:00 2001 From: "epoger@google.com" Date: Fri, 24 Jun 2011 19:09:09 +0000 Subject: Alternate approach to enabling PDF in gm (gyp changes) http://codereview.appspot.com/4631067 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@1713 2bbb7eff-a529-9590-31e7-b0007b416f81 --- gm.gyp | 8 +------- pdf.gyp | 5 +++++ tests.gyp | 28 +--------------------------- 3 files changed, 7 insertions(+), 34 deletions(-) diff --git a/gm.gyp b/gm.gyp index bc006cb..10b8592 100644 --- a/gm.gyp +++ b/gm.gyp @@ -1,11 +1,4 @@ # GYP file to build the "gm" (golden master) executable. -# -# To build and run on Linux: -# ./gyp_skia gm.gyp && make -# out/Debug/gm -r ../gm/base-linux -# -# Building on other platforms not tested yet. -# { 'includes': [ 'apptype_console.gypi', @@ -40,6 +33,7 @@ 'gpu.gyp:gr', 'gpu.gyp:skgr', 'images.gyp:images', + 'pdf.gyp:pdf', 'utils.gyp:utils', ], }, diff --git a/pdf.gyp b/pdf.gyp index 1ad3e05..59aba08 100644 --- a/pdf.gyp +++ b/pdf.gyp @@ -39,7 +39,12 @@ '../src/pdf/SkPDFTypes.cpp', '../src/pdf/SkPDFUtils.cpp', ], + # This section makes all targets that depend on this target + # #define SK_SUPPORT_PDF and have access to the pdf header files. 'direct_dependent_settings': { + 'defines': [ + 'SK_SUPPORT_PDF', + ], 'include_dirs': [ '../include/pdf', ], diff --git a/tests.gyp b/tests.gyp index b44c977..d78a65a 100644 --- a/tests.gyp +++ b/tests.gyp @@ -1,28 +1,14 @@ # GYP file to build unit tests. -# -# To build and run on Linux: -# ./gyp_skia tests.gyp && make -# out/Debug/tests -# -# To build on Linux with skia_pdf_support disabled: -# ./gyp_skia tests.gyp -Dskia_pdf_support=false && make -# -# Building on other platforms not tested yet. -# { 'includes': [ 'apptype_console.gypi', 'target_defaults.gypi', ], - 'variables': { - 'skia_pdf_support%': 'true', - }, 'targets': [ { 'target_name': 'tests', 'type': 'executable', 'include_dirs' : [ - '../include/pdf', '../src/core', ], 'sources': [ @@ -74,21 +60,9 @@ 'effects.gyp:effects', 'experimental.gyp:experimental', 'images.gyp:images', + 'pdf.gyp:pdf', 'utils.gyp:utils', ], - 'conditions': [ - [ 'skia_pdf_support == "true"', - { # if skia_pdf_support is TRUE, depend on pdf.gyp... - 'dependencies': [ - 'pdf.gyp:pdf', - ], - }, { # else, we don't need PDFPrimitivesTest.cpp after all. - 'sources!': [ - '../tests/PDFPrimitivesTest.cpp', - ], - } - ], - ], }, ], } -- cgit v1.2.3 From 926763b2b3bfda471a362bc64e60d1ea71d5d2a9 Mon Sep 17 00:00:00 2001 From: "vandebo@chromium.org" Date: Fri, 24 Jun 2011 23:13:47 +0000 Subject: Add a zlib target that the pdf target can depend on. - make drawTextOnPath (now used by shadertext) a non fatal NOT_IMPLEMENTED on PDF. Review URL: http://codereview.appspot.com/4631071 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@1722 2bbb7eff-a529-9590-31e7-b0007b416f81 --- core.gyp | 2 -- pdf.gyp | 3 +++ zlib.gyp | 40 ++++++++++++++++++++++++++++++++++++++++ 3 files changed, 43 insertions(+), 2 deletions(-) create mode 100644 zlib.gyp diff --git a/core.gyp b/core.gyp index c02d1f5..4cc0252 100644 --- a/core.gyp +++ b/core.gyp @@ -69,7 +69,6 @@ '../src/core/SkFP.h', '../src/core/SkFilterProc.cpp', '../src/core/SkFilterProc.h', - '../src/core/SkFlate.cpp', '../src/core/SkFlattenable.cpp', '../src/core/SkFloat.cpp', '../src/core/SkFloat.h', @@ -187,7 +186,6 @@ '../include/core/SkEndian.h', '../include/core/SkFDot6.h', '../include/core/SkFixed.h', - '../include/core/SkFlate.h', '../include/core/SkFlattenable.h', '../include/core/SkFloatBits.h', '../include/core/SkFloatingPoint.h', diff --git a/pdf.gyp b/pdf.gyp index 59aba08..eb1dea0 100644 --- a/pdf.gyp +++ b/pdf.gyp @@ -49,6 +49,9 @@ '../include/pdf', ], }, + 'dependencies': [ + 'zlib.gyp:zlib', + ], }, ], } diff --git a/zlib.gyp b/zlib.gyp new file mode 100644 index 0000000..d47a13e --- /dev/null +++ b/zlib.gyp @@ -0,0 +1,40 @@ +{ + 'includes': [ + 'target_defaults.gypi', + ], + 'targets': [ + { + 'target_name': 'zlib', + 'type': 'static_library', + 'include_dirs': [ + '../include/config', + '../include/core', + ], + 'sources': [ + '../include/core/SkFlate.h', + + '../src/core/SkFlate.cpp', + ], + 'conditions': [ + [ 'OS == "mac"', { + 'link_settings': { + 'libraries': [ + '$(SDKROOT)/usr/lib/libz.dylib', + ], + }, + 'defines': [ 'SK_ZLIB_INCLUDE=', ], + }], + [ 'OS == "linux"', { + 'link_settings': { 'libraries': [ '-lz', ], }, + 'defines': [ 'SK_ZLIB_INCLUDE=', ], + }], + ], + }, + ], +} + +# Local Variables: +# tab-width:2 +# indent-tabs-mode:nil +# End: +# vim: set expandtab tabstop=2 shiftwidth=2: -- cgit v1.2.3 From 10529d16ddc83e2a76b5cdb24a99d4857d27b8ad Mon Sep 17 00:00:00 2001 From: "reed@google.com" Date: Mon, 27 Jun 2011 16:44:46 +0000 Subject: remove obsolete text codepaths git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@1725 2bbb7eff-a529-9590-31e7-b0007b416f81 --- core.gyp | 2 -- 1 file changed, 2 deletions(-) diff --git a/core.gyp b/core.gyp index 4cc0252..ee64446 100644 --- a/core.gyp +++ b/core.gyp @@ -260,10 +260,8 @@ 'sources': [ '../include/core/SkMMapStream.h', '../src/core/SkMMapStream.cpp', - '../src/core/SkBlitter_ARGB32_Subpixel.cpp', '../src/ports/SkThread_pthread.cpp', '../src/ports/SkTime_Unix.cpp', - '../src/ports/SkFontHost_FreeType_Subpixel.cpp', '../src/ports/SkFontHost_FreeType.cpp', '../src/ports/SkFontHost_gamma_none.cpp', '../src/ports/SkFontHost_linux.cpp', -- cgit v1.2.3 From 3f3508aa4acd2b7ea04001a51ac8961eecce6947 Mon Sep 17 00:00:00 2001 From: "epoger@google.com" Date: Tue, 28 Jun 2011 16:20:27 +0000 Subject: Create new lcdtext page within gm http://codereview.appspot.com/4654071 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@1736 2bbb7eff-a529-9590-31e7-b0007b416f81 --- gm.gyp | 1 + 1 file changed, 1 insertion(+) diff --git a/gm.gyp b/gm.gyp index 10b8592..2d66891 100644 --- a/gm.gyp +++ b/gm.gyp @@ -13,6 +13,7 @@ '../gm/blurs.cpp', '../gm/filltypes.cpp', '../gm/gradients.cpp', + '../gm/lcdtext.cpp', '../gm/nocolorbleed.cpp', '../gm/pathfill.cpp', '../gm/points.cpp', -- cgit v1.2.3 From ad5dcd046baf4322b8d259d58ac7e13e5ee8e827 Mon Sep 17 00:00:00 2001 From: "tomhudson@google.com" Date: Thu, 30 Jun 2011 19:37:01 +0000 Subject: Enable WebKit/Chromium style logging for Skia. New macros called in Ganesh functions; by default are compiled away, in example code resolve to printout, and are compatible with WebKit/Chromium event logging and GPU profiler. git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@1770 2bbb7eff-a529-9590-31e7-b0007b416f81 --- core.gyp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/core.gyp b/core.gyp index ee64446..aa4877e 100644 --- a/core.gyp +++ b/core.gyp @@ -140,6 +140,7 @@ '../src/core/SkTypefaceCache.cpp', '../src/core/SkTypefaceCache.h', '../src/core/SkUnPreMultiply.cpp', + '../src/core/SkUserTrace.h', '../src/core/SkUtils.cpp', '../src/core/SkWriter32.cpp', '../src/core/SkXfermode.cpp', @@ -235,6 +236,7 @@ '../include/core/SkThread.h', '../include/core/SkThread_platform.h', '../include/core/SkTime.h', + '../include/core/SkTrace.h', '../include/core/SkTypeface.h', '../include/core/SkTypes.h', '../include/core/SkUnPreMultiply.h', -- cgit v1.2.3 From 88a7961d5bfdf05a95eb3e216461748955555b15 Mon Sep 17 00:00:00 2001 From: "bsalomon@google.com" Date: Thu, 30 Jun 2011 21:32:31 +0000 Subject: Remove GrAuto*Malloc, replace with SkAuto*Malloc Review URL: http://codereview.appspot.com/4629088 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@1774 2bbb7eff-a529-9590-31e7-b0007b416f81 --- gpu.gyp | 1 - 1 file changed, 1 deletion(-) diff --git a/gpu.gyp b/gpu.gyp index ccd3c7d..dc157c5 100644 --- a/gpu.gyp +++ b/gpu.gyp @@ -107,7 +107,6 @@ '../gpu/include/GrIPoint.h', '../gpu/include/GrKey.h', '../gpu/include/GrMatrix.h', - '../gpu/include/GrMemory.h', '../gpu/include/GrMesh.h', '../gpu/include/GrNoncopyable.h', '../gpu/include/GrPaint.h', -- cgit v1.2.3 From 27b9aa07b3f847211402967a28ef5ef96e710240 Mon Sep 17 00:00:00 2001 From: "epoger@google.com" Date: Fri, 1 Jul 2011 17:16:26 +0000 Subject: combine target_defaults.gypi into common.gypi http://codereview.appspot.com/4654080 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@1780 2bbb7eff-a529-9590-31e7-b0007b416f81 --- CocoaDebuggerApp.gyp | 2 +- FileReaderApp.gyp | 2 +- SampleApp.gyp | 6 ++-- SimpleCocoaApp.gyp | 2 +- animator.gyp | 2 +- apptype_console.gypi | 5 --- bench.gyp | 2 +- common.gypi | 98 +++++++++++++++++++++++++++++++++++++++++----------- core.gyp | 2 +- effects.gyp | 2 +- experimental.gyp | 2 +- gm.gyp | 2 +- gpu.gyp | 2 +- images.gyp | 2 +- libtess.gyp | 2 +- opts.gyp | 2 +- pdf.gyp | 2 +- svg.gyp | 2 +- target_defaults.gypi | 95 -------------------------------------------------- tests.gyp | 2 +- tools.gyp | 2 +- utils.gyp | 2 +- views.gyp | 2 +- xml.gyp | 2 +- zlib.gyp | 2 +- 25 files changed, 100 insertions(+), 146 deletions(-) delete mode 100644 target_defaults.gypi diff --git a/CocoaDebuggerApp.gyp b/CocoaDebuggerApp.gyp index 904563c..1960a67 100644 --- a/CocoaDebuggerApp.gyp +++ b/CocoaDebuggerApp.gyp @@ -1,6 +1,6 @@ { 'includes': [ - 'target_defaults.gypi', + 'common.gypi', ], 'targets': [ { diff --git a/FileReaderApp.gyp b/FileReaderApp.gyp index 2ada993..2db992f 100644 --- a/FileReaderApp.gyp +++ b/FileReaderApp.gyp @@ -1,6 +1,6 @@ { 'includes': [ - 'target_defaults.gypi', + 'common.gypi', ], 'targets': [ { diff --git a/SampleApp.gyp b/SampleApp.gyp index 50baa62..4e01526 100644 --- a/SampleApp.gyp +++ b/SampleApp.gyp @@ -1,6 +1,6 @@ { 'includes': [ - 'target_defaults.gypi', + 'common.gypi', ], 'targets': [ { @@ -158,9 +158,7 @@ 'VCLinkerTool': { 'SubSystem': '2', 'AdditionalDependencies': [ - 'OpenGL32.lib', - 'usp10.lib', - 'd3d9.lib', + 'd3d9.lib', ], }, }, diff --git a/SimpleCocoaApp.gyp b/SimpleCocoaApp.gyp index 68caa05..9f415e4 100644 --- a/SimpleCocoaApp.gyp +++ b/SimpleCocoaApp.gyp @@ -1,6 +1,6 @@ { 'includes': [ - 'target_defaults.gypi', + 'common.gypi', ], 'targets': [ { diff --git a/animator.gyp b/animator.gyp index d0d54aa..fc61e71 100644 --- a/animator.gyp +++ b/animator.gyp @@ -1,6 +1,6 @@ { 'includes': [ - 'target_defaults.gypi', + 'common.gypi', ], 'targets': [ { diff --git a/apptype_console.gypi b/apptype_console.gypi index b686fa7..8980ce8 100644 --- a/apptype_console.gypi +++ b/apptype_console.gypi @@ -10,11 +10,6 @@ #Console app, use main/wmain 'EntryPointSymbol': 'mainCRTStartup', - - 'AdditionalDependencies': [ - 'OpenGL32.lib', - 'usp10.lib', - ], }, }, }, diff --git a/bench.gyp b/bench.gyp index d5a4fcf..11f0461 100644 --- a/bench.gyp +++ b/bench.gyp @@ -9,7 +9,7 @@ { 'includes': [ 'apptype_console.gypi', - 'target_defaults.gypi', + 'common.gypi', ], 'targets': [ { diff --git a/common.gypi b/common.gypi index 78482a0..d1f23d5 100644 --- a/common.gypi +++ b/common.gypi @@ -12,10 +12,51 @@ # See the License for the specific language governing permissions and # limitations under the License. { - 'conditions' : [ - ['OS == "win"', - { - 'target_defaults': { + 'target_defaults': { + + # Define variables, and allow for override in GYP_DEFINES environment var. + 'variables': { + 'skia_scalar%': 'float', + }, + 'skia_scalar%': '<(skia_scalar)', + + 'configurations': { + 'Debug': { + 'defines': [ + 'SK_DEBUG', + 'GR_DEBUG=1', + ], + }, + 'Release': { + 'defines': [ + 'SK_RELEASE', + 'GR_RELEASE=1', + ], + }, + }, + + 'conditions' : [ + + [ 'skia_scalar == "float"', + { + 'defines': [ + 'SK_SCALAR_IS_FLOAT', + 'SK_CAN_USE_FLOAT', + ], + }, { # else, skia_scalar != "float" + 'defines': [ + 'SK_SCALAR_IS_FIXED', + 'SK_CAN_USE_FLOAT', # we can still use floats along the way + ], + } + ], + + ['OS == "win"', + { + 'defines': [ + 'SK_BUILD_FOR_WIN32', + 'SK_IGNORE_STDINT_DOT_H', + ], 'msvs_cygwin_shell': 0, 'msvs_settings': { 'VCCLCompilerTool': { @@ -24,6 +65,12 @@ 'DebugInformationFormat': '3', 'AdditionalOptions': '/MP', }, + 'VCLinkerTool': { + 'AdditionalDependencies': [ + 'OpenGL32.lib', + 'usp10.lib', + ], + }, }, 'configurations': { 'Debug': { @@ -52,11 +99,14 @@ }, }, }, - }, - ], - ['OS == "linux"', - { - 'target_defaults': { + ], + + ['OS == "linux" or OS == "freebsd" or OS == "openbsd" or OS == "solaris"', + { + 'defines': [ + 'SK_SAMPLES_FOR_X', + 'SK_BUILD_FOR_UNIX', + ], 'configurations': { 'Debug': { 'cflags': ['-g'] @@ -65,13 +115,18 @@ 'cflags': ['-O2'] }, }, - 'cflags': [ '-Wall', '-Wextra', '-Wno-unused' ] + 'cflags': [ '-Wall', '-Wextra', '-Wno-unused' ], + 'include_dirs' : [ + '/usr/include/freetype2', + ], }, - }, - ], - ['OS == "mac"', - { - 'target_defaults': { + ], + + ['OS == "mac"', + { + 'defines': [ + 'SK_BUILD_FOR_MAC', + ], 'configurations': { 'Debug': { 'cflags': ['-g'] @@ -80,13 +135,14 @@ 'cflags': ['-O2'] }, }, + 'xcode_settings': { + 'SYMROOT': '<(DEPTH)/xcodebuild', + }, }, - 'xcode_settings': { - 'SYMROOT': '<(DEPTH)/xcodebuild', - }, - }, - ], - ], + ], + + ], # end 'conditions' + }, # end 'target_defaults' } # Local Variables: # tab-width:2 diff --git a/core.gyp b/core.gyp index aa4877e..34d05c3 100644 --- a/core.gyp +++ b/core.gyp @@ -1,7 +1,7 @@ # Core Skia library code. { 'includes': [ - 'target_defaults.gypi', + 'common.gypi', ], 'targets': [ { diff --git a/effects.gyp b/effects.gyp index b6c253f..3b67838 100644 --- a/effects.gyp +++ b/effects.gyp @@ -1,6 +1,6 @@ { 'includes': [ - 'target_defaults.gypi', + 'common.gypi', ], 'targets': [ { diff --git a/experimental.gyp b/experimental.gyp index 171f4c8..c5b8c5e 100644 --- a/experimental.gyp +++ b/experimental.gyp @@ -1,6 +1,6 @@ { 'includes': [ - 'target_defaults.gypi', + 'common.gypi', ], 'targets': [ { diff --git a/gm.gyp b/gm.gyp index 2d66891..1219995 100644 --- a/gm.gyp +++ b/gm.gyp @@ -2,7 +2,7 @@ { 'includes': [ 'apptype_console.gypi', - 'target_defaults.gypi', + 'common.gypi', ], 'targets': [ { diff --git a/gpu.gyp b/gpu.gyp index dc157c5..787e0fc 100644 --- a/gpu.gyp +++ b/gpu.gyp @@ -1,6 +1,6 @@ { 'includes': [ - 'target_defaults.gypi', + 'common.gypi', ], 'targets': [ { diff --git a/images.gyp b/images.gyp index 3608375..9627d3f 100644 --- a/images.gyp +++ b/images.gyp @@ -1,6 +1,6 @@ { 'includes': [ - 'target_defaults.gypi', + 'common.gypi', ], 'targets': [ { diff --git a/libtess.gyp b/libtess.gyp index 6ea27d8..4a776c3 100644 --- a/libtess.gyp +++ b/libtess.gyp @@ -1,6 +1,6 @@ { 'includes': [ - 'target_defaults.gypi', + 'common.gypi', ], 'targets': [ { diff --git a/opts.gyp b/opts.gyp index a93bf44..42fb8ae 100644 --- a/opts.gyp +++ b/opts.gyp @@ -1,6 +1,6 @@ { 'includes': [ - 'target_defaults.gypi', + 'common.gypi', ], 'targets': [ # Due to an unfortunate intersection of lameness between gcc and gyp, diff --git a/pdf.gyp b/pdf.gyp index eb1dea0..3957e48 100644 --- a/pdf.gyp +++ b/pdf.gyp @@ -1,6 +1,6 @@ { 'includes': [ - 'target_defaults.gypi', + 'common.gypi', ], 'targets': [ { diff --git a/svg.gyp b/svg.gyp index 273ddec..c72b99f 100644 --- a/svg.gyp +++ b/svg.gyp @@ -1,6 +1,6 @@ { 'includes': [ - 'target_defaults.gypi', + 'common.gypi', ], 'targets': [ { diff --git a/target_defaults.gypi b/target_defaults.gypi deleted file mode 100644 index 865f8a3..0000000 --- a/target_defaults.gypi +++ /dev/null @@ -1,95 +0,0 @@ -{ - 'target_defaults': { - 'defines': [ - 'SK_CAN_USE_FLOAT', - ], - - 'variables': { - 'skia_scalar%': 'float', - }, - # Allow override in GYP_DEFINES environment variable. - 'skia_scalar%': '<(skia_scalar)', - - 'configurations': { - 'Debug': { - 'defines': [ - 'SK_DEBUG', - 'GR_DEBUG=1', - ], - 'msvs_settings': { - 'VCLinkerTool': { - 'GenerateDebugInformation': 'true', - }, - 'VCCLCompilerTool': { - #0 Disabled (/Od) - #1 Minimize Size (/O1) - #2 Maximize Speed (/O2) - #3 Full Optimization (/Ox) - 'Optimization': '0', - }, - }, - }, - 'Release': { - 'defines': [ - 'SK_RELEASE', - 'GR_RELEASE=1', - ], - }, - }, - 'conditions': [ - [ 'skia_scalar == "float"', - { - 'defines': [ - 'SK_SCALAR_IS_FLOAT', - ], - }, { # else, skia_scalar != "float" - 'defines': [ - 'SK_SCALAR_IS_FIXED', - ], - } - ], - [ 'OS == "linux" or OS == "freebsd" or OS == "openbsd" or OS == "solaris"', { - 'include_dirs' : [ - '/usr/include/freetype2', - ], - }], - [ 'OS == "mac"', { - 'defines': [ - 'SK_BUILD_FOR_MAC', - ], - }], - [ 'OS == "win"', { - 'defines': [ - 'SK_BUILD_FOR_WIN32', - 'SK_IGNORE_STDINT_DOT_H', - ], - }], - [ 'OS == "linux"', { - 'defines': [ - 'SK_SAMPLES_FOR_X', - 'SK_BUILD_FOR_UNIX', - ], - }], - ], - 'direct_dependent_settings': { - 'conditions': [ - [ 'OS == "mac"', { - 'defines': [ - 'SK_BUILD_FOR_MAC', - ], - }], - [ 'OS == "win"', { - 'defines': [ - 'SK_BUILD_FOR_WIN32', - ], - }], - ], - }, - }, -} - -# Local Variables: -# tab-width:2 -# indent-tabs-mode:nil -# End: -# vim: set expandtab tabstop=2 shiftwidth=2: diff --git a/tests.gyp b/tests.gyp index d78a65a..d4cafd2 100644 --- a/tests.gyp +++ b/tests.gyp @@ -2,7 +2,7 @@ { 'includes': [ 'apptype_console.gypi', - 'target_defaults.gypi', + 'common.gypi', ], 'targets': [ { diff --git a/tools.gyp b/tools.gyp index 939b32a..e0c04b4 100644 --- a/tools.gyp +++ b/tools.gyp @@ -8,7 +8,7 @@ { 'includes': [ 'apptype_console.gypi', - 'target_defaults.gypi', + 'common.gypi', ], 'targets': [ { diff --git a/utils.gyp b/utils.gyp index f0dcda9..950f803 100644 --- a/utils.gyp +++ b/utils.gyp @@ -1,6 +1,6 @@ { 'includes': [ - 'target_defaults.gypi', + 'common.gypi', ], 'targets': [ { diff --git a/views.gyp b/views.gyp index 6ba42bf..4afa2af 100644 --- a/views.gyp +++ b/views.gyp @@ -1,6 +1,6 @@ { 'includes': [ - 'target_defaults.gypi', + 'common.gypi', ], 'targets': [ { diff --git a/xml.gyp b/xml.gyp index 8e825ad..464a2a5 100644 --- a/xml.gyp +++ b/xml.gyp @@ -1,6 +1,6 @@ { 'includes': [ - 'target_defaults.gypi', + 'common.gypi', ], 'targets': [ { diff --git a/zlib.gyp b/zlib.gyp index d47a13e..44a8d2a 100644 --- a/zlib.gyp +++ b/zlib.gyp @@ -1,6 +1,6 @@ { 'includes': [ - 'target_defaults.gypi', + 'common.gypi', ], 'targets': [ { -- cgit v1.2.3 From 9518584daf848c80cc24b508e389017ff1bdf20d Mon Sep 17 00:00:00 2001 From: "epoger@google.com" Date: Fri, 1 Jul 2011 20:20:07 +0000 Subject: Create new 'skia_os' variable to replace use of 'OS' in most places. http://codereview.appspot.com/4627085 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@1782 2bbb7eff-a529-9590-31e7-b0007b416f81 --- CocoaDebuggerApp.gyp | 2 +- FileReaderApp.gyp | 2 +- SampleApp.gyp | 6 +++--- SimpleCocoaApp.gyp | 2 +- bench.gyp | 14 ++++---------- common.gypi | 28 ++++++++++++++++++++++------ core.gyp | 8 ++++---- gpu.gyp | 30 +++++++++++++++--------------- images.gyp | 10 +++++----- opts.gyp | 2 +- utils.gyp | 12 ++++++------ views.gyp | 4 ++-- xml.gyp | 2 +- zlib.gyp | 4 ++-- 14 files changed, 68 insertions(+), 58 deletions(-) diff --git a/CocoaDebuggerApp.gyp b/CocoaDebuggerApp.gyp index 1960a67..e53dfbb 100644 --- a/CocoaDebuggerApp.gyp +++ b/CocoaDebuggerApp.gyp @@ -31,7 +31,7 @@ ], 'conditions' : [ # Only supports Mac currently - ['OS == "mac"', { + ['skia_os == "mac"', { 'sources': [ '../experimental/CocoaDebugger/CocoaDebugger-Info.plist', '../experimental/CocoaDebugger/CocoaDebugger_Prefix.pch', diff --git a/FileReaderApp.gyp b/FileReaderApp.gyp index 2db992f..0e2c48f 100644 --- a/FileReaderApp.gyp +++ b/FileReaderApp.gyp @@ -30,7 +30,7 @@ ], 'conditions' : [ # Only supports Mac currently - ['OS == "mac"', { + ['skia_os == "mac"', { 'sources': [ '../experimental/SimpleCocoaApp/SkNSWindow.mm', '../experimental/SimpleCocoaApp/SkNSView.mm', diff --git a/SampleApp.gyp b/SampleApp.gyp index 4e01526..0c4c04c 100644 --- a/SampleApp.gyp +++ b/SampleApp.gyp @@ -135,19 +135,19 @@ 'pdf.gyp:pdf', ], 'conditions' : [ - [ 'OS == "linux" or OS == "freebsd" or OS == "openbsd" or OS == "solaris"', { + [ 'skia_os in ["linux", "freebsd", "openbsd", "solaris"]', { 'sources!': [ '../samplecode/SampleDecode.cpp', ], }], - [ 'OS == "win"', { + [ 'skia_os == "win"', { 'sources!': [ # require UNIX functions '../samplecode/SampleEncode.cpp', '../samplecode/SamplePageFlip.cpp', ], }], - [ 'OS == "mac"', { + [ 'skia_os == "mac"', { 'sources!': [ '../samplecode/SampleDecode.cpp', ], diff --git a/SimpleCocoaApp.gyp b/SimpleCocoaApp.gyp index 9f415e4..ead9fe4 100644 --- a/SimpleCocoaApp.gyp +++ b/SimpleCocoaApp.gyp @@ -28,7 +28,7 @@ ], 'conditions' : [ # Only supports Mac currently - [ 'OS == "mac"', { + [ 'skia_os == "mac"', { 'sources': [ '../include/utils/mac/SkCGUtils.h', '../src/utils/mac/SkCreateCGImageRef.cpp', diff --git a/bench.gyp b/bench.gyp index 11f0461..c57b51e 100644 --- a/bench.gyp +++ b/bench.gyp @@ -1,11 +1,5 @@ # GYP file to build performance testbench. # -# To build and run on Linux: -# ./gyp_skia bench.gyp && make -# out/Debug/bench -repeat 2 -# -# Building on other platforms not tested yet. -# { 'includes': [ 'apptype_console.gypi', @@ -53,13 +47,13 @@ 'utils.gyp:utils', ], 'conditions': [ - [ 'OS != "mac"', { + [ 'skia_os != "mac"', { 'sources!': [ '../bench/BenchSysTimer_mach.h', '../bench/BenchSysTimer_mach.cpp', ], }], - [ 'OS not in ["linux", "freebsd", "openbsd", "solaris"]', { + [ 'skia_os not in ["linux", "freebsd", "openbsd", "solaris"]', { 'sources!': [ '../bench/BenchSysTimer_posix.h', '../bench/BenchSysTimer_posix.cpp', @@ -71,13 +65,13 @@ ], }, }], - [ 'OS != "win"', { + [ 'skia_os != "win"', { 'sources!': [ '../bench/BenchSysTimer_windows.h', '../bench/BenchSysTimer_windows.cpp', ], }], - [ 'OS in ["win", "mac", "linux", "freebsd", "openbsd", "solaris"]', { + [ 'skia_os in ["win", "mac", "linux", "freebsd", "openbsd", "solaris"]', { 'sources!': [ '../bench/BenchGpuTimer_none.h', '../bench/BenchGpuTimer_none.cpp', diff --git a/common.gypi b/common.gypi index d1f23d5..a9b0b53 100644 --- a/common.gypi +++ b/common.gypi @@ -12,13 +12,29 @@ # See the License for the specific language governing permissions and # limitations under the License. { + # Define all variables, allowing for override in GYP_DEFINES. + # + # One such variable is 'skia_os', which we use instead of 'OS' throughout + # our gyp files. We set it automatically based on 'OS', but allow the + # user to override it via GYP_DEFINES if they like. + 'variables': { + 'skia_scalar%': 'float', + 'skia_os%': '<(OS)', + }, + 'skia_scalar%': '<(skia_scalar)', + 'skia_os': '<(skia_os)', + 'target_defaults': { - # Define variables, and allow for override in GYP_DEFINES environment var. + # Validate the 'skia_os' setting against 'OS', because only certain + # combinations work. You should only override 'skia_os' for certain + # situations, like building for iOS on a Mac. 'variables': { - 'skia_scalar%': 'float', + 'conditions': [ + ['skia_os != OS and not (skia_os == "ios" and OS == "mac")', + {'error': '', ], }], - [ 'OS == "linux"', { + [ 'skia_os in ["linux", "freebsd", "openbsd", "solaris"]', { 'link_settings': { 'libraries': [ '-lz', ], }, 'defines': [ 'SK_ZLIB_INCLUDE=', ], }], -- cgit v1.2.3 From 234df45d278822af106d9dd33438226026cab238 Mon Sep 17 00:00:00 2001 From: "epoger@google.com" Date: Fri, 1 Jul 2011 21:01:32 +0000 Subject: merge of SkiOSSampleApp into SampleApp, still a work in progress http://codereview.appspot.com/4636078/ git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@1785 2bbb7eff-a529-9590-31e7-b0007b416f81 --- SampleApp.gyp | 44 +++++++++++++++++++++++++++++++++++++++++++- common.gypi | 19 +++++++++++++++++++ core.gyp | 26 ++++++++++++++++++++++++++ 3 files changed, 88 insertions(+), 1 deletion(-) diff --git a/SampleApp.gyp b/SampleApp.gyp index 0c4c04c..a0c98a8 100644 --- a/SampleApp.gyp +++ b/SampleApp.gyp @@ -1,3 +1,4 @@ + { 'includes': [ 'common.gypi', @@ -110,7 +111,7 @@ '../samplecode/SampleXfermodes.cpp', '../samplecode/SampleXfermodesBlur.cpp', - # Dependecies for the pipe code in SampleApp + # Dependencies for the pipe code in SampleApp '../src/pipe/SkGPipeRead.cpp', '../src/pipe/SkGPipeWrite.cpp', ], @@ -152,6 +153,47 @@ '../samplecode/SampleDecode.cpp', ], }], + [ 'skia_os == "ios"', { + # TODO: This doesn't build properly yet, but it's getting there. + 'sources!': [ + '../samplecode/SampleDecode.cpp', + ], + 'sources': [ + '../experimental/iOSSampleApp/SkIOSNotifier.mm', + '../experimental/iOSSampleApp/SkTime_iOS.mm', + '../experimental/iOSSampleApp/SkUIDetailViewController.mm', + '../experimental/iOSSampleApp/SkUIRootViewController.mm', + '../experimental/iOSSampleApp/SkUIView_shell.mm', + + '../experimental/iOSSampleApp/iOSSampleApp_Prefix.pch', + '../experimental/iOSSampleApp/Shared/main.m', + '../experimental/iOSSampleApp/iPad/AppDelegate_iPad.mm', + '../experimental/iOSSampleApp/iPad/SkUISplitViewController.mm', + '../experimental/iOSSampleApp/iPhone/AppDelegate_iPhone.mm', + '../experimental/iOSSampleApp/iPhone/SkUINavigationController.mm', + + '../src/utils/ios/SkOSWindow_iOS.mm', + '../src/utils/ios/SkImageDecoder_iOS.mm', + '../src/utils/ios/SkStream_NSData.mm', + '../src/utils/ios/SkOSFile_iOS.mm', + + '../src/utils/mac/SkCreateCGImageRef.cpp', + '../experimental/iOSSampleApp/SkiOSSampleApp-Debug.xcconfig', + '../experimental/iOSSampleApp/SkiOSSampleApp-Release.xcconfig', + ], + 'include_dirs' : [ + '../experimental/iOSSampleApp', + '../experimental/iOSSampleApp/iPad', + '../experimental/iOSSampleApp/iPhone', + '../include/utils/ios', + '../../gpu/include', + ], + 'xcode_config_file': '../experimental/iOSSampleApp/SkiOSSampleApp-Base.xcconfig', + 'mac_bundle_resources' : [ + '../experimental/iOSSampleApp/iPad/MainWindow_iPad.xib', + '../experimental/iOSSampleApp/iPhone/MainWindow_iPhone.xib', + ], + }], ], 'msvs_settings': { diff --git a/common.gypi b/common.gypi index a9b0b53..6991908 100644 --- a/common.gypi +++ b/common.gypi @@ -157,6 +157,25 @@ }, ], + ['skia_os == "ios"', + { + 'defines': [ + 'SK_BUILD_FOR_IOS', + ], + 'configurations': { + 'Debug': { + 'cflags': ['-g'] + }, + 'Release': { + 'cflags': ['-O2'] + }, + }, + 'xcode_settings': { + 'SYMROOT': '<(DEPTH)/xcodebuild', + }, + }, + ], + ], # end 'conditions' }, # end 'target_defaults' } diff --git a/core.gyp b/core.gyp index 51d3066..55819c4 100644 --- a/core.gyp +++ b/core.gyp @@ -296,6 +296,32 @@ ], }, }], + [ 'skia_os == "ios"', { + 'include_dirs': [ + '../include/utils/ios', + ], + 'sources': [ + '../include/core/SkMMapStream.h', + '../include/utils/mac/SkCGUtils.h', + + '../src/core/SkMMapStream.cpp', + '../src/ports/SkFontHost_mac_coretext.cpp', + + '../src/ports/SkThread_pthread.cpp', + '../src/ports/SkTime_Unix.cpp', + ], + 'link_settings': { + 'libraries': [ + '/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS4.3.sdk/System/Library/Frameworks/CoreFoundation.framework', + '/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS4.3.sdk/System/Library/Frameworks/CoreGraphics.framework', + '/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS4.3.sdk/System/Library/Frameworks/CoreText.framework', + '/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS4.3.sdk/System/Library/Frameworks/UIKit.framework', + '/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS4.3.sdk/System/Library/Frameworks/Foundation.framework', + '/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS4.3.sdk/System/Library/Frameworks/QuartzCore.framework', + '/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS4.3.sdk/System/Library/Frameworks/OpenGLES.framework', + ], + }, + }], [ 'skia_os == "win"', { 'include_dirs': [ 'config/win', -- cgit v1.2.3 From 5ea13999f22427cfa6dbb6a4bdcf36dbaab63d72 Mon Sep 17 00:00:00 2001 From: "vandebo@chromium.org" Date: Sat, 2 Jul 2011 01:26:37 +0000 Subject: A bit set class. Will be used for font subsetting. Committed on behalf of arthurhsu@chromium.org with a few final nits. Original CL: http://codereview.appspot.com/4627077 Review URL: http://codereview.appspot.com/4657070 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@1788 2bbb7eff-a529-9590-31e7-b0007b416f81 --- pdf.gyp | 2 ++ tests.gyp | 1 + 2 files changed, 3 insertions(+) diff --git a/pdf.gyp b/pdf.gyp index 3957e48..f0c3937 100644 --- a/pdf.gyp +++ b/pdf.gyp @@ -13,6 +13,7 @@ '../src/core', # needed to get SkGlyphCache.h and SkTextFormatParams.h ], 'sources': [ + '../include/pdf/SkBitSet.h', '../include/pdf/SkPDFCatalog.h', '../include/pdf/SkPDFDevice.h', '../include/pdf/SkPDFDocument.h', @@ -26,6 +27,7 @@ '../include/pdf/SkPDFTypes.h', '../include/pdf/SkPDFUtils.h', + '../src/pdf/SkBitSet.cpp', '../src/pdf/SkPDFCatalog.cpp', '../src/pdf/SkPDFDevice.cpp', '../src/pdf/SkPDFDocument.cpp', diff --git a/tests.gyp b/tests.gyp index d4cafd2..95dc9c5 100644 --- a/tests.gyp +++ b/tests.gyp @@ -14,6 +14,7 @@ 'sources': [ '../tests/BitmapCopyTest.cpp', '../tests/BitmapGetColorTest.cpp', + '../tests/BitSetTest.cpp', '../tests/BlitRowTest.cpp', '../tests/ClampRangeTest.cpp', '../tests/ClipCubicTest.cpp', -- cgit v1.2.3 From f667ed2093f7d435d2d06fcfa808cc1235b7f2c3 Mon Sep 17 00:00:00 2001 From: "reed@google.com" Date: Thu, 7 Jul 2011 13:43:38 +0000 Subject: add asABlur() to maskfilters, so devices like gpu and pdf can query them. git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@1816 2bbb7eff-a529-9590-31e7-b0007b416f81 --- tests.gyp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tests.gyp b/tests.gyp index 95dc9c5..9bde66f 100644 --- a/tests.gyp +++ b/tests.gyp @@ -14,8 +14,9 @@ 'sources': [ '../tests/BitmapCopyTest.cpp', '../tests/BitmapGetColorTest.cpp', - '../tests/BitSetTest.cpp', + '../tests/BitSetTest.cpp', '../tests/BlitRowTest.cpp', + '../tests/BlurTest.cpp', '../tests/ClampRangeTest.cpp', '../tests/ClipCubicTest.cpp', '../tests/ClipStackTest.cpp', -- cgit v1.2.3 From 97d4ba0150c817391dde5c0ab08f2efb1ea3efbe Mon Sep 17 00:00:00 2001 From: "bsalomon@google.com" Date: Thu, 7 Jul 2011 14:38:03 +0000 Subject: Fix div by zero in GPU degenerate radials (and add sample and gm baselines) Review URL: http://codereview.appspot.com/4675062/ git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@1817 2bbb7eff-a529-9590-31e7-b0007b416f81 --- SampleApp.gyp | 1 + 1 file changed, 1 insertion(+) diff --git a/SampleApp.gyp b/SampleApp.gyp index a0c98a8..084ae71 100644 --- a/SampleApp.gyp +++ b/SampleApp.gyp @@ -48,6 +48,7 @@ '../samplecode/SampleConcavePaths.cpp', '../samplecode/SampleCull.cpp', '../samplecode/SampleDecode.cpp', + '../samplecode/SampleDegenerateTwoPtRadials.cpp', '../samplecode/SampleDither.cpp', '../samplecode/SampleDitherBitmap.cpp', '../samplecode/SampleDrawLooper.cpp', -- cgit v1.2.3 From 22714083cff1e3f5c22c756e68dbfd09cf525a6c Mon Sep 17 00:00:00 2001 From: "bsalomon@google.com" Date: Fri, 8 Jul 2011 16:10:53 +0000 Subject: little bit of gyp cleanup (fixes windows build of sktime_unix) Review URL: http://codereview.appspot.com/4685045/ git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@1826 2bbb7eff-a529-9590-31e7-b0007b416f81 --- core.gyp | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/core.gyp b/core.gyp index 55819c4..27b6259 100644 --- a/core.gyp +++ b/core.gyp @@ -149,6 +149,8 @@ '../src/ports/SkDebug_stdio.cpp', '../src/ports/SkDebug_win.cpp', + '../src/ports/SkFontHost_win.cpp', + '../src/ports/SkThread_win.cpp', '../src/ports/SkFontHost_tables.cpp', '../src/ports/SkGlobals_global.cpp', @@ -263,7 +265,6 @@ '../include/core/SkMMapStream.h', '../src/core/SkMMapStream.cpp', '../src/ports/SkThread_pthread.cpp', - '../src/ports/SkTime_Unix.cpp', '../src/ports/SkFontHost_FreeType.cpp', '../src/ports/SkFontHost_gamma_none.cpp', '../src/ports/SkFontHost_linux.cpp', @@ -287,7 +288,6 @@ '../src/ports/SkFontHost_mac_coretext.cpp', '../src/ports/SkThread_pthread.cpp', - '../src/ports/SkTime_Unix.cpp', ], 'link_settings': { 'libraries': [ @@ -308,7 +308,6 @@ '../src/ports/SkFontHost_mac_coretext.cpp', '../src/ports/SkThread_pthread.cpp', - '../src/ports/SkTime_Unix.cpp', ], 'link_settings': { 'libraries': [ @@ -326,17 +325,15 @@ 'include_dirs': [ 'config/win', ], - 'sources': [ - '../src/ports/SkFontHost_win.cpp', - '../src/ports/SkThread_win.cpp', - ], - 'sources!': [ + 'sources!': [ # these are used everywhere but windows '../src/ports/SkDebug_stdio.cpp', + '../src/ports/SkTime_Unix.cpp', ], - }], - [ 'skia_os != "win"', { + }, { # else !win 'sources!': [ '../src/ports/SkDebug_win.cpp', + '../src/ports/SkFontHost_win.cpp', + '../src/ports/SkThread_win.cpp', '../src/ports/SkTime_win.cpp', ], }], -- cgit v1.2.3 From 9026f90161b5412ec47545d3228574c60da0a410 Mon Sep 17 00:00:00 2001 From: "reed@google.com" Date: Fri, 8 Jul 2011 20:12:55 +0000 Subject: add sample for 2ptradial where we divide by zero git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@1832 2bbb7eff-a529-9590-31e7-b0007b416f81 --- SampleApp.gyp | 1 + 1 file changed, 1 insertion(+) diff --git a/SampleApp.gyp b/SampleApp.gyp index 084ae71..20cde14 100644 --- a/SampleApp.gyp +++ b/SampleApp.gyp @@ -32,6 +32,7 @@ '../samplecode/ClockFaceView.cpp', '../samplecode/OverView.cpp', + '../samplecode/Sample2PtRadial.cpp', '../samplecode/SampleAll.cpp', '../samplecode/SampleAnimator.cpp', '../samplecode/SampleApp.cpp', -- cgit v1.2.3 From ec6ad3db68553236b0004507cf21be580e36b87e Mon Sep 17 00:00:00 2001 From: "reed@google.com" Date: Thu, 14 Jul 2011 19:03:58 +0000 Subject: add bench for building blurs git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@1865 2bbb7eff-a529-9590-31e7-b0007b416f81 --- bench.gyp | 1 + 1 file changed, 1 insertion(+) diff --git a/bench.gyp b/bench.gyp index c57b51e..715a364 100644 --- a/bench.gyp +++ b/bench.gyp @@ -28,6 +28,7 @@ '../bench/SkBenchmark.cpp', '../bench/BitmapBench.cpp', + '../bench/BlurBench.cpp', '../bench/DecodeBench.cpp', '../bench/FPSBench.cpp', '../bench/GradientBench.cpp', -- cgit v1.2.3 From 33a433d5050bbc098502860fc8466295cbe456c7 Mon Sep 17 00:00:00 2001 From: "senorblanco@chromium.org" Date: Fri, 15 Jul 2011 14:28:16 +0000 Subject: More GPU blur fixes. - clamp the max. radius to 128, as the software path does - use a more accurate radius-to-sigma conversion (0.6 instead of 0.6666) - make SampleBlur derive from SampleView, not SkView, so benchmark mode ('f') works - implement a new BigBlur sample to test large radii Review URL: http://codereview.appspot.com/4726043 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@1871 2bbb7eff-a529-9590-31e7-b0007b416f81 --- SampleApp.gyp | 1 + 1 file changed, 1 insertion(+) diff --git a/SampleApp.gyp b/SampleApp.gyp index 20cde14..4c73857 100644 --- a/SampleApp.gyp +++ b/SampleApp.gyp @@ -38,6 +38,7 @@ '../samplecode/SampleApp.cpp', '../samplecode/SampleArc.cpp', '../samplecode/SampleAvoid.cpp', + '../samplecode/SampleBigBlur.cpp', '../samplecode/SampleBigGradient.cpp', '../samplecode/SampleBitmapRect.cpp', '../samplecode/SampleBlur.cpp', -- cgit v1.2.3 From 5aa8195a988df57f9868c791cba6dee91cfe5764 Mon Sep 17 00:00:00 2001 From: "bsalomon@google.com" Date: Mon, 18 Jul 2011 15:25:04 +0000 Subject: flip Y in uploads to bottom-up textures (and add gm test) Review URL: http://codereview.appspot.com/4756043/ git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@1882 2bbb7eff-a529-9590-31e7-b0007b416f81 --- gm.gyp | 1 + 1 file changed, 1 insertion(+) diff --git a/gm.gyp b/gm.gyp index 1219995..4ecbb47 100644 --- a/gm.gyp +++ b/gm.gyp @@ -22,6 +22,7 @@ '../gm/shapes.cpp', '../gm/strokerects.cpp', '../gm/strokes.cpp', + '../gm/texdata.cpp', '../gm/tilemodes.cpp', '../gm/xfermodes.cpp', '../gm/shadertext.cpp', -- cgit v1.2.3 From 01c4429b609cf075c8f346504401dc68d1c841ac Mon Sep 17 00:00:00 2001 From: "bsalomon@google.com" Date: Mon, 18 Jul 2011 21:19:31 +0000 Subject: Add tinybitmap gm and windows baselines. Review URL: http://codereview.appspot.com/4674048/ git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@1888 2bbb7eff-a529-9590-31e7-b0007b416f81 --- gm.gyp | 1 + 1 file changed, 1 insertion(+) diff --git a/gm.gyp b/gm.gyp index 4ecbb47..63e4fa0 100644 --- a/gm.gyp +++ b/gm.gyp @@ -24,6 +24,7 @@ '../gm/strokes.cpp', '../gm/texdata.cpp', '../gm/tilemodes.cpp', + '../gm/tinybitmap.cpp', '../gm/xfermodes.cpp', '../gm/shadertext.cpp', '../gm/complexclip.cpp', -- cgit v1.2.3 From f5de5914df53f773c67fd962d1765bd1c7afb1f4 Mon Sep 17 00:00:00 2001 From: "epoger@google.com" Date: Fri, 22 Jul 2011 14:41:26 +0000 Subject: Add debug symbols to Windows static libraries As requested in http://code.google.com/p/skia/issues/detail?id=320 Review URL: http://codereview.appspot.com/4805050 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@1940 2bbb7eff-a529-9590-31e7-b0007b416f81 --- common.gypi | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/common.gypi b/common.gypi index 6991908..1c925ba 100644 --- a/common.gypi +++ b/common.gypi @@ -92,9 +92,10 @@ 'Debug': { 'msvs_settings': { 'VCCLCompilerTool': { - 'Optimization': '0', # 0 = /Od + 'DebugInformationFormat': '1', # debugOldStyleInfo (/Z7) + 'Optimization': '0', # optimizeDisabled (/Od) 'PreprocessorDefinitions': ['_DEBUG'], - 'RuntimeLibrary': '3', # 3 = /MDd (debug DLL) + 'RuntimeLibrary': '3', # rtMultiThreadedDebugDLL (/MDd) }, 'VCLinkerTool': { 'GenerateDebugInformation': 'true', @@ -104,9 +105,10 @@ 'Release': { 'msvs_settings': { 'VCCLCompilerTool': { - 'Optimization': '2', # 2 = /Os + 'DebugInformationFormat': '0', # debugDisabled + 'Optimization': '2', # optimizeMaxSpeed (/O2) 'PreprocessorDefinitions': ['NDEBUG'], - 'RuntimeLibrary': '2', # 2 = /MD (nondebug DLL) + 'RuntimeLibrary': '2', # rtMultiThreadedDLL (/MD) }, 'VCLinkerTool': { 'GenerateDebugInformation': 'false', -- cgit v1.2.3 From 35fa94f6286f2df8b26eef8ec0fc08aea7a50c31 Mon Sep 17 00:00:00 2001 From: "vandebo@chromium.org" Date: Sat, 23 Jul 2011 20:22:53 +0000 Subject: [PDF] Refactor SkPDFFont to enable font/cmap subsetting. Patch from Arthur Hsu, original CL: http://codereview.appspot.com/4633050/ Review URL: http://codereview.appspot.com/4811049 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@1943 2bbb7eff-a529-9590-31e7-b0007b416f81 --- pdf.gyp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pdf.gyp b/pdf.gyp index f0c3937..f0c6b47 100644 --- a/pdf.gyp +++ b/pdf.gyp @@ -27,11 +27,12 @@ '../include/pdf/SkPDFTypes.h', '../include/pdf/SkPDFUtils.h', - '../src/pdf/SkBitSet.cpp', + '../src/pdf/SkBitSet.cpp', '../src/pdf/SkPDFCatalog.cpp', '../src/pdf/SkPDFDevice.cpp', '../src/pdf/SkPDFDocument.cpp', '../src/pdf/SkPDFFont.cpp', + '../src/pdf/SkPDFFontImpl.h', '../src/pdf/SkPDFFormXObject.cpp', '../src/pdf/SkPDFGraphicState.cpp', '../src/pdf/SkPDFImage.cpp', -- cgit v1.2.3 From a9dfb4bdfae25de50f5b4173cbb87a28c6720387 Mon Sep 17 00:00:00 2001 From: "vandebo@chromium.org" Date: Sat, 23 Jul 2011 21:13:30 +0000 Subject: Revert "[PDF] Refactor SkPDFFont to enable font/cmap subsetting." The PDF xref table is corrupt with this change. Revert until we figure it out. Review URL: http://codereview.appspot.com/4803049 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@1944 2bbb7eff-a529-9590-31e7-b0007b416f81 --- pdf.gyp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pdf.gyp b/pdf.gyp index f0c6b47..f0c3937 100644 --- a/pdf.gyp +++ b/pdf.gyp @@ -27,12 +27,11 @@ '../include/pdf/SkPDFTypes.h', '../include/pdf/SkPDFUtils.h', - '../src/pdf/SkBitSet.cpp', + '../src/pdf/SkBitSet.cpp', '../src/pdf/SkPDFCatalog.cpp', '../src/pdf/SkPDFDevice.cpp', '../src/pdf/SkPDFDocument.cpp', '../src/pdf/SkPDFFont.cpp', - '../src/pdf/SkPDFFontImpl.h', '../src/pdf/SkPDFFormXObject.cpp', '../src/pdf/SkPDFGraphicState.cpp', '../src/pdf/SkPDFImage.cpp', -- cgit v1.2.3 From 895f63f7da9fd204ef973bac5156bfd753d81e65 Mon Sep 17 00:00:00 2001 From: "epoger@google.com" Date: Mon, 25 Jul 2011 16:27:59 +0000 Subject: Exit SkBitmap::scrollRect() early if width <= 0 As suggested in email from saintlou@google.com Review URL: http://codereview.appspot.com/4806047 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@1948 2bbb7eff-a529-9590-31e7-b0007b416f81 --- gm.gyp | 1 + 1 file changed, 1 insertion(+) diff --git a/gm.gyp b/gm.gyp index 63e4fa0..180e81f 100644 --- a/gm.gyp +++ b/gm.gyp @@ -10,6 +10,7 @@ 'type': 'executable', 'sources': [ '../gm/bitmapfilters.cpp', + '../gm/bitmapscroll.cpp', '../gm/blurs.cpp', '../gm/filltypes.cpp', '../gm/gradients.cpp', -- cgit v1.2.3 From 2b9d36b1d83de79fe9c738547ced6b6066a8ea4b Mon Sep 17 00:00:00 2001 From: "vandebo@chromium.org" Date: Mon, 25 Jul 2011 22:34:12 +0000 Subject: [PDF] Refactor SkPDFFont to enable font/cmap subsetting. Patch from Arthur Hsu, original CL: http://codereview.appspot.com/4633050/ Committed: http://code.google.com/p/skia/source/detail?r=1943 Reverted: http://code.google.com/p/skia/source/detail?r=1944 Review URL: http://codereview.appspot.com/4811049 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@1956 2bbb7eff-a529-9590-31e7-b0007b416f81 --- pdf.gyp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pdf.gyp b/pdf.gyp index f0c3937..f0c6b47 100644 --- a/pdf.gyp +++ b/pdf.gyp @@ -27,11 +27,12 @@ '../include/pdf/SkPDFTypes.h', '../include/pdf/SkPDFUtils.h', - '../src/pdf/SkBitSet.cpp', + '../src/pdf/SkBitSet.cpp', '../src/pdf/SkPDFCatalog.cpp', '../src/pdf/SkPDFDevice.cpp', '../src/pdf/SkPDFDocument.cpp', '../src/pdf/SkPDFFont.cpp', + '../src/pdf/SkPDFFontImpl.h', '../src/pdf/SkPDFFormXObject.cpp', '../src/pdf/SkPDFGraphicState.cpp', '../src/pdf/SkPDFImage.cpp', -- cgit v1.2.3 From 24066b23dcd2f08934a819acab2ebcef94980f1a Mon Sep 17 00:00:00 2001 From: "bsalomon@google.com" Date: Tue, 26 Jul 2011 20:45:30 +0000 Subject: Make GrTextureCache into a generic GrResource cache. Also some GrContext texture interface cleanup. http://codereview.appspot.com/4815055/ git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@1965 2bbb7eff-a529-9590-31e7-b0007b416f81 --- gpu.gyp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gpu.gyp b/gpu.gyp index 04231c1..1b5e138 100644 --- a/gpu.gyp +++ b/gpu.gyp @@ -132,7 +132,6 @@ '../gpu/include/GrTextContext.h', '../gpu/include/GrTextStrike.h', '../gpu/include/GrTexture.h', - '../gpu/include/GrTextureCache.h', '../gpu/include/GrTHashCache.h', '../gpu/include/GrTLList.h', '../gpu/include/GrTypes.h', @@ -173,13 +172,14 @@ '../gpu/src/GrRectanizer.cpp', '../gpu/src/GrRedBlackTree.h', '../gpu/src/GrResource.cpp', + '../gpu/src/GrResourceCache.cpp', + '../gpu/src/GrResourceCache.h', '../gpu/src/GrStencil.cpp', '../gpu/src/GrTesselatedPathRenderer.cpp', '../gpu/src/GrTextContext.cpp', '../gpu/src/GrTextStrike.cpp', '../gpu/src/GrTextStrike_impl.h', '../gpu/src/GrTexture.cpp', - '../gpu/src/GrTextureCache.cpp', '../gpu/src/gr_unittests.cpp', '../gpu/src/mac/GrGLDefaultInterface_mac.cpp', -- cgit v1.2.3 From f0736d5ff15391b63ee5caae28ffdfe0ae96b4ca Mon Sep 17 00:00:00 2001 From: "junov@google.com" Date: Thu, 28 Jul 2011 13:34:31 +0000 Subject: This new test provides a test case for http://code.google.com/p/skia/issues/detail?id=332 REVIEW=http://codereview.appspot.com/4808058/ git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@1979 2bbb7eff-a529-9590-31e7-b0007b416f81 --- SampleApp.gyp | 1 + 1 file changed, 1 insertion(+) diff --git a/SampleApp.gyp b/SampleApp.gyp index 4c73857..6d83a0c 100644 --- a/SampleApp.gyp +++ b/SampleApp.gyp @@ -53,6 +53,7 @@ '../samplecode/SampleDegenerateTwoPtRadials.cpp', '../samplecode/SampleDither.cpp', '../samplecode/SampleDitherBitmap.cpp', + '../samplecode/SampleDrawBitmap.cpp', '../samplecode/SampleDrawLooper.cpp', '../samplecode/SampleEffects.cpp', '../samplecode/SampleEmboss.cpp', -- cgit v1.2.3 From cb1809d4ddc85fd3bf94b051d482b1e8a6016a26 Mon Sep 17 00:00:00 2001 From: "epoger@google.com" Date: Thu, 28 Jul 2011 14:24:55 +0000 Subject: Manually update copyright notices in files that defied the automated process used in http://codereview.appspot.com/4816058/ ('Automatic update of all copyright notices to reflect new license terms.') Note that the following files have been left alone, because they name copyright holders outside of Google. Please let me know if we need to update these files: experimental/CiCarbonSampleMain.c src/opts/memset16_neon.S src/opts/memset32_neon.S src/opts/opts_check_arm.cpp src/ports/SkDebug_brew.cpp src/ports/SkMemory_brew.cpp src/ports/SkOSFile_brew.cpp Review URL: http://codereview.appspot.com/4806054 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@1981 2bbb7eff-a529-9590-31e7-b0007b416f81 --- common.gypi | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/common.gypi b/common.gypi index 1c925ba..6bba0f2 100644 --- a/common.gypi +++ b/common.gypi @@ -1,16 +1,7 @@ -# Copyright (C) 2011 The Android Open Source Project +# Copyright 2011 The Android Open Source Project # -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE file. { # Define all variables, allowing for override in GYP_DEFINES. # -- cgit v1.2.3 From c5bdfdbb35e48dbef672fcea2fa243ba52d8c546 Mon Sep 17 00:00:00 2001 From: "bungeman@google.com" Date: Thu, 28 Jul 2011 16:51:20 +0000 Subject: Include required for placement new in SkTLazy. Also, add SkTLazy to gyp and remove old includes. git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@1984 2bbb7eff-a529-9590-31e7-b0007b416f81 --- core.gyp | 1 + 1 file changed, 1 insertion(+) diff --git a/core.gyp b/core.gyp index 27b6259..7d38974 100644 --- a/core.gyp +++ b/core.gyp @@ -238,6 +238,7 @@ '../include/core/SkThread.h', '../include/core/SkThread_platform.h', '../include/core/SkTime.h', + '../include/core/SkTLazy.h', '../include/core/SkTrace.h', '../include/core/SkTypeface.h', '../include/core/SkTypes.h', -- cgit v1.2.3 From 5263ca66a55ac673455788b968dda00501ed4239 Mon Sep 17 00:00:00 2001 From: "bsalomon@google.com" Date: Fri, 29 Jul 2011 13:39:53 +0000 Subject: Move GL headers out of public include dir Review URL: http://codereview.appspot.com/4837041/ git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@1992 2bbb7eff-a529-9590-31e7-b0007b416f81 --- gpu.gyp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/gpu.gyp b/gpu.gyp index 1b5e138..1d08174 100644 --- a/gpu.gyp +++ b/gpu.gyp @@ -93,11 +93,7 @@ '../gpu/include/GrGeometryBuffer.h', '../gpu/include/GrGLConfig.h', '../gpu/include/GrGLConfig_chrome.h', - '../gpu/include/GrGLIndexBuffer.h', '../gpu/include/GrGLInterface.h', - '../gpu/include/GrGLIRect.h', - '../gpu/include/GrGLTexture.h', - '../gpu/include/GrGLVertexBuffer.h', '../gpu/include/GrGlyph.h', '../gpu/include/GrGpu.h', '../gpu/include/GrGpuVertex.h', @@ -149,12 +145,16 @@ '../gpu/src/GrDrawTarget.cpp', '../gpu/src/GrGLDefaultInterface_none.cpp', '../gpu/src/GrGLIndexBuffer.cpp', + '../gpu/src/GrGLIndexBuffer.h', '../gpu/src/GrGLInterface.cpp', + '../gpu/src/GrGLIRect.h', '../gpu/src/GrGLProgram.cpp', '../gpu/src/GrGLProgram.h', '../gpu/src/GrGLTexture.cpp', + '../gpu/src/GrGLTexture.h', '../gpu/src/GrGLUtil.cpp', '../gpu/src/GrGLVertexBuffer.cpp', + '../gpu/src/GrGLVertexBuffer.h', '../gpu/src/GrGpu.cpp', '../gpu/src/GrGpuFactory.cpp', '../gpu/src/GrGpuGL.cpp', -- cgit v1.2.3 From af87e7dbd7fea2f315d4e5444396f941863b826d Mon Sep 17 00:00:00 2001 From: "epoger@google.com" Date: Fri, 29 Jul 2011 13:46:56 +0000 Subject: disable optimization in Mac debug build git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@1994 2bbb7eff-a529-9590-31e7-b0007b416f81 --- common.gypi | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/common.gypi b/common.gypi index 6bba0f2..f1f1e97 100644 --- a/common.gypi +++ b/common.gypi @@ -138,10 +138,9 @@ ], 'configurations': { 'Debug': { - 'cflags': ['-g'] - }, - 'Release': { - 'cflags': ['-O2'] + 'xcode_settings': { + 'GCC_OPTIMIZATION_LEVEL': '0', + }, }, }, 'xcode_settings': { @@ -157,10 +156,9 @@ ], 'configurations': { 'Debug': { - 'cflags': ['-g'] - }, - 'Release': { - 'cflags': ['-O2'] + 'xcode_settings': { + 'GCC_OPTIMIZATION_LEVEL': '0', + }, }, }, 'xcode_settings': { -- cgit v1.2.3 From ac48ef5b131f6d5e404a5c22b7aab3542201fbc9 Mon Sep 17 00:00:00 2001 From: "bsalomon@google.com" Date: Fri, 29 Jul 2011 15:13:20 +0000 Subject: move render target decls / defs to their own headers / srcs Review URL: http://codereview.appspot.com/4806058/ git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@1995 2bbb7eff-a529-9590-31e7-b0007b416f81 --- gpu.gyp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/gpu.gyp b/gpu.gyp index 1d08174..b87ad5a 100644 --- a/gpu.gyp +++ b/gpu.gyp @@ -115,6 +115,7 @@ '../gpu/include/GrRect.h', '../gpu/include/GrRectanizer.h', '../gpu/include/GrRefCnt.h', + '../gpu/include/GrRenderTarget.h', '../gpu/include/GrResource.h', '../gpu/include/GrSamplerState.h', '../gpu/include/GrScalar.h', @@ -150,6 +151,8 @@ '../gpu/src/GrGLIRect.h', '../gpu/src/GrGLProgram.cpp', '../gpu/src/GrGLProgram.h', + '../gpu/src/GrGLRenderTarget.cpp', + '../gpu/src/GrGLRenderTarget.h', '../gpu/src/GrGLTexture.cpp', '../gpu/src/GrGLTexture.h', '../gpu/src/GrGLUtil.cpp', @@ -171,6 +174,7 @@ '../gpu/src/GrPathUtils.h', '../gpu/src/GrRectanizer.cpp', '../gpu/src/GrRedBlackTree.h', + '../gpu/src/GrRenderTarget.cpp', '../gpu/src/GrResource.cpp', '../gpu/src/GrResourceCache.cpp', '../gpu/src/GrResourceCache.h', -- cgit v1.2.3 From 464e52b082ef31471ea9d2821c19acad2c5f032c Mon Sep 17 00:00:00 2001 From: "bsalomon@google.com" Date: Fri, 29 Jul 2011 20:29:05 +0000 Subject: cleanup GrGLTexture / GrGLRenderTarget cons. Make GrRenderTarget aware of its msaa sample count. Review URL: http://codereview.appspot.com/4833045/ git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@1996 2bbb7eff-a529-9590-31e7-b0007b416f81 --- gpu.gyp | 1 + 1 file changed, 1 insertion(+) diff --git a/gpu.gyp b/gpu.gyp index b87ad5a..f25e158 100644 --- a/gpu.gyp +++ b/gpu.gyp @@ -199,6 +199,7 @@ ], 'defines': [ 'GR_IMPLEMENTATION=1', + 'GR_USE_PLATFORM_CREATE_SAMPLE_COUNT=1', ], 'conditions': [ [ 'skia_os == "linux"', { -- cgit v1.2.3 From e06cdaf09a6621a0c5b9803c414cbbcd946b0fd5 Mon Sep 17 00:00:00 2001 From: "yangsu@google.com" Date: Mon, 1 Aug 2011 17:07:12 +0000 Subject: Cocoa SampleApp files http://codereview.appspot.com/4843041/ http://codereview.appspot.com/4832044/ http://codereview.appspot.com/4826061/ git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@2012 2bbb7eff-a529-9590-31e7-b0007b416f81 --- CocoaSampleApp.gyp | 251 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 251 insertions(+) create mode 100644 CocoaSampleApp.gyp diff --git a/CocoaSampleApp.gyp b/CocoaSampleApp.gyp new file mode 100644 index 0000000..90711a8 --- /dev/null +++ b/CocoaSampleApp.gyp @@ -0,0 +1,251 @@ + +{ + 'includes': [ + 'common.gypi', + ], + 'targets': [ + { + 'target_name': 'CocoaSampleApp', + 'type': 'executable', + 'mac_bundle' : 1, + 'include_dirs' : [ + '../src/core', # needed to get SkConcaveToTriangle, maybe this should be moved to include dir? + '../gm', # SampleGM.cpp pulls gm.h + '../include/pipe', # To pull in SkGPipe.h for pipe reader/writer + ], + 'sources': [ + # gm files needed for SampleGM.cpp + '../gm/bitmapfilters.cpp', + '../gm/blurs.cpp', + '../gm/complexclip.cpp', + '../gm/filltypes.cpp', + '../gm/gm.h', + '../gm/gradients.cpp', + '../gm/nocolorbleed.cpp', + '../gm/points.cpp', + '../gm/poly2poly.cpp', + '../gm/shadertext.cpp', + '../gm/shadows.cpp', + '../gm/shapes.cpp', + '../gm/tilemodes.cpp', + '../gm/xfermodes.cpp', + + '../samplecode/ClockFaceView.cpp', + '../samplecode/OverView.cpp', + '../samplecode/Sample2PtRadial.cpp', + '../samplecode/SampleAll.cpp', + '../samplecode/SampleAnimator.cpp', + '../samplecode/SampleApp.cpp', + '../samplecode/SampleArc.cpp', + '../samplecode/SampleAvoid.cpp', + '../samplecode/SampleBigBlur.cpp', + '../samplecode/SampleBigGradient.cpp', + '../samplecode/SampleBitmapRect.cpp', + '../samplecode/SampleBlur.cpp', + '../samplecode/SampleCamera.cpp', + '../samplecode/SampleCircle.cpp', + '../samplecode/SampleCode.h', + '../samplecode/SampleColorFilter.cpp', + '../samplecode/SampleComplexClip.cpp', + '../samplecode/SampleConcavePaths.cpp', + '../samplecode/SampleCull.cpp', + '../samplecode/SampleDecode.cpp', + '../samplecode/SampleDegenerateTwoPtRadials.cpp', + '../samplecode/SampleDither.cpp', + '../samplecode/SampleDitherBitmap.cpp', + '../samplecode/SampleDrawLooper.cpp', + '../samplecode/SampleEffects.cpp', + '../samplecode/SampleEmboss.cpp', + '../samplecode/SampleEncode.cpp', + '../samplecode/SampleExtractAlpha.cpp', + '../samplecode/SampleFillType.cpp', + '../samplecode/SampleFilter.cpp', + '../samplecode/SampleFilter2.cpp', + '../samplecode/SampleFontCache.cpp', + '../samplecode/SampleFontScalerTest.cpp', + '../samplecode/SampleFuzz.cpp', + '../samplecode/SampleGM.cpp', + '../samplecode/SampleGradients.cpp', + '../samplecode/SampleHairline.cpp', + '../samplecode/SampleImage.cpp', + '../samplecode/SampleImageDir.cpp', + '../samplecode/SampleLayerMask.cpp', + '../samplecode/SampleLayers.cpp', + '../samplecode/SampleLCD.cpp', + '../samplecode/SampleLineClipper.cpp', + '../samplecode/SampleLines.cpp', + '../samplecode/SampleMeasure.cpp', + '../samplecode/SampleMipMap.cpp', + '../samplecode/SampleMovie.cpp', + '../samplecode/SampleNinePatch.cpp', + '../samplecode/SampleOvalTest.cpp', + '../samplecode/SampleOverflow.cpp', + '../samplecode/SamplePageFlip.cpp', + '../samplecode/SamplePatch.cpp', + '../samplecode/SamplePath.cpp', + '../samplecode/SamplePathClip.cpp', + '../samplecode/SamplePathEffects.cpp', + '../samplecode/SamplePicture.cpp', + '../samplecode/SamplePoints.cpp', + '../samplecode/SamplePolyToPoly.cpp', + '../samplecode/SampleAARects.cpp', + '../samplecode/SampleRegion.cpp', + '../samplecode/SampleRepeatTile.cpp', + '../samplecode/SampleShaders.cpp', + '../samplecode/SampleShaderText.cpp', + '../samplecode/SampleShapes.cpp', + '../samplecode/SampleSkLayer.cpp', + '../samplecode/SampleSlides.cpp', + '../samplecode/SampleStrokePath.cpp', + '../samplecode/SampleStrokeText.cpp', + '../samplecode/SampleTests.cpp', + '../samplecode/SampleText.cpp', + '../samplecode/SampleTextAlpha.cpp', + '../samplecode/SampleTextBox.cpp', + '../samplecode/SampleTextEffects.cpp', + '../samplecode/SampleTextOnPath.cpp', + '../samplecode/SampleTextureDomain.cpp', + '../samplecode/SampleTiling.cpp', + '../samplecode/SampleTinyBitmap.cpp', + '../samplecode/SampleTriangles.cpp', + '../samplecode/SampleTypeface.cpp', + '../samplecode/SampleUnitMapper.cpp', + '../samplecode/SampleVertices.cpp', + '../samplecode/SampleXfermodes.cpp', + '../samplecode/SampleXfermodesBlur.cpp', + + # Dependencies for the pipe code in SampleApp + '../src/pipe/SkGPipeRead.cpp', + '../src/pipe/SkGPipeWrite.cpp', + ], + 'sources!': [ + '../samplecode/SampleSkLayer.cpp', #relies on SkMatrix44 which doesn't compile + '../samplecode/SampleTests.cpp', #includes unknown file SkShaderExtras.h + '../samplecode/SampleWarp.cpp', + '../samplecode/SampleFontCache.cpp', + ], + 'dependencies': [ + 'core.gyp:core', + 'effects.gyp:effects', + 'images.gyp:images', + 'views.gyp:views', + 'utils.gyp:utils', + 'animator.gyp:animator', + 'xml.gyp:xml', + 'svg.gyp:svg', + 'experimental.gyp:experimental', + 'gpu.gyp:gr', + 'gpu.gyp:skgr', + 'pdf.gyp:pdf', + ], + 'conditions' : [ + [ 'skia_os in ["linux", "freebsd", "openbsd", "solaris"]', { + 'sources!': [ + '../samplecode/SampleDecode.cpp', + ], + }], + [ 'skia_os == "win"', { + 'sources!': [ + # require UNIX functions + '../samplecode/SampleEncode.cpp', + '../samplecode/SamplePageFlip.cpp', + ], + }], + [ 'skia_os == "mac"', { + 'sources!': [ + '../samplecode/SampleDecode.cpp', + ], + 'sources': [ + '../experimental/CocoaSampleApp/main.m', + '../experimental/CocoaSampleApp/SampleApp-Info.plist', + '../experimental/CocoaSampleApp/SampleApp.xib', + '../experimental/CocoaSampleApp/SampleAppDelegate.h', + '../experimental/CocoaSampleApp/SampleAppDelegate.mm', + '../experimental/CocoaSampleApp/SkNSView.h', + '../experimental/CocoaSampleApp/SkNSView.mm', + '../experimental/CocoaSampleApp/SkOSWindow_Mac.h', + '../experimental/CocoaSampleApp/SkOSWindow_Mac.mm', + '../experimental/CocoaSampleApp/SkOptionsTableView.h', + '../experimental/CocoaSampleApp/SkOptionsTableView.mm', + '../experimental/CocoaSampleApp/SkTextFieldCell.h', + '../experimental/CocoaSampleApp/SkTextFieldCell.m', + '../experimental/SkSockets.h', + '../experimental/SkSockets.cpp', + '../experimental/SkEventNotifier.h', + '../experimental/SkEventNotifier.mm', + ], + 'link_settings': { + 'libraries': [ + '$(SDKROOT)/System/Library/Frameworks/Cocoa.framework', + '$(SDKROOT)/System/Library/Frameworks/Foundation.framework', + '$(SDKROOT)/System/Library/Frameworks/QuartzCore.framework', + '$(SDKROOT)/System/Library/Frameworks/OpenGL.framework', + ], + }, + 'xcode_settings' : { + 'INFOPLIST_FILE' : '../experimental/CocoaSampleApp/SampleApp-Info.plist', + }, + 'mac_bundle_resources' : [ + '../experimental/CocoaSampleApp/SampleApp.xib', + ], + }], + [ 'skia_os == "ios"', { + # TODO: This doesn't build properly yet, but it's getting there. + 'sources!': [ + '../samplecode/SampleDecode.cpp', + ], + 'sources': [ + '../experimental/iOSSampleApp/SkIOSNotifier.mm', + '../experimental/iOSSampleApp/SkTime_iOS.mm', + '../experimental/iOSSampleApp/SkUIDetailViewController.mm', + '../experimental/iOSSampleApp/SkUIRootViewController.mm', + '../experimental/iOSSampleApp/SkUIView_shell.mm', + + '../experimental/iOSSampleApp/iOSSampleApp_Prefix.pch', + '../experimental/iOSSampleApp/Shared/main.m', + '../experimental/iOSSampleApp/iPad/AppDelegate_iPad.mm', + '../experimental/iOSSampleApp/iPad/SkUISplitViewController.mm', + '../experimental/iOSSampleApp/iPhone/AppDelegate_iPhone.mm', + '../experimental/iOSSampleApp/iPhone/SkUINavigationController.mm', + + '../src/utils/ios/SkOSWindow_iOS.mm', + '../src/utils/ios/SkImageDecoder_iOS.mm', + '../src/utils/ios/SkStream_NSData.mm', + '../src/utils/ios/SkOSFile_iOS.mm', + + '../src/utils/mac/SkCreateCGImageRef.cpp', + '../experimental/iOSSampleApp/SkiOSSampleApp-Debug.xcconfig', + '../experimental/iOSSampleApp/SkiOSSampleApp-Release.xcconfig', + ], + 'include_dirs' : [ + '../experimental/iOSSampleApp', + '../experimental/iOSSampleApp/iPad', + '../experimental/iOSSampleApp/iPhone', + '../include/utils/ios', + '../../gpu/include', + ], + 'xcode_config_file': '../experimental/iOSSampleApp/SkiOSSampleApp-Base.xcconfig', + 'mac_bundle_resources' : [ + '../experimental/iOSSampleApp/iPad/MainWindow_iPad.xib', + '../experimental/iOSSampleApp/iPhone/MainWindow_iPhone.xib', + ], + }], + + ], + 'msvs_settings': { + 'VCLinkerTool': { + 'SubSystem': '2', + 'AdditionalDependencies': [ + 'd3d9.lib', + ], + }, + }, + }, + ], +} + +# Local Variables: +# tab-width:2 +# indent-tabs-mode:nil +# End: +# vim: set expandtab tabstop=2 shiftwidth=2: -- cgit v1.2.3 From 23e7f09aabe300078c21a01c9899612a6d7dddbf Mon Sep 17 00:00:00 2001 From: "bsalomon@google.com" Date: Tue, 2 Aug 2011 14:07:52 +0000 Subject: Create a separate GrStencilBuffer class apart from GrRenderTarget. Review URL: http://codereview.appspot.com/4837046/ git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@2026 2bbb7eff-a529-9590-31e7-b0007b416f81 --- gpu.gyp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/gpu.gyp b/gpu.gyp index f25e158..f96e39c 100644 --- a/gpu.gyp +++ b/gpu.gyp @@ -153,6 +153,7 @@ '../gpu/src/GrGLProgram.h', '../gpu/src/GrGLRenderTarget.cpp', '../gpu/src/GrGLRenderTarget.h', + '../gpu/src/GrGLStencilBuffer.h', '../gpu/src/GrGLTexture.cpp', '../gpu/src/GrGLTexture.h', '../gpu/src/GrGLUtil.cpp', @@ -179,6 +180,7 @@ '../gpu/src/GrResourceCache.cpp', '../gpu/src/GrResourceCache.h', '../gpu/src/GrStencil.cpp', + '../gpu/src/GrStencilBuffer.h', '../gpu/src/GrTesselatedPathRenderer.cpp', '../gpu/src/GrTextContext.cpp', '../gpu/src/GrTextStrike.cpp', -- cgit v1.2.3 From cccde487ecc29d1d69a70dbf8fda419b3c204fbd Mon Sep 17 00:00:00 2001 From: "bsalomon@google.com" Date: Tue, 2 Aug 2011 14:19:11 +0000 Subject: Revert r2026 due to bot failures git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@2027 2bbb7eff-a529-9590-31e7-b0007b416f81 --- gpu.gyp | 2 -- 1 file changed, 2 deletions(-) diff --git a/gpu.gyp b/gpu.gyp index f96e39c..f25e158 100644 --- a/gpu.gyp +++ b/gpu.gyp @@ -153,7 +153,6 @@ '../gpu/src/GrGLProgram.h', '../gpu/src/GrGLRenderTarget.cpp', '../gpu/src/GrGLRenderTarget.h', - '../gpu/src/GrGLStencilBuffer.h', '../gpu/src/GrGLTexture.cpp', '../gpu/src/GrGLTexture.h', '../gpu/src/GrGLUtil.cpp', @@ -180,7 +179,6 @@ '../gpu/src/GrResourceCache.cpp', '../gpu/src/GrResourceCache.h', '../gpu/src/GrStencil.cpp', - '../gpu/src/GrStencilBuffer.h', '../gpu/src/GrTesselatedPathRenderer.cpp', '../gpu/src/GrTextContext.cpp', '../gpu/src/GrTextStrike.cpp', -- cgit v1.2.3 From 56e833a0b45dad1bbf72e1975bd9f0f90ab58b04 Mon Sep 17 00:00:00 2001 From: "yangsu@google.com" Date: Tue, 2 Aug 2011 16:35:00 +0000 Subject: Moved references of SkOSWindow_mac.cpp and skia_main.cpp out of utils to SampleApp.gyp git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@2031 2bbb7eff-a529-9590-31e7-b0007b416f81 --- SampleApp.gyp | 4 ++++ utils.gyp | 2 -- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/SampleApp.gyp b/SampleApp.gyp index 6d83a0c..fc18d07 100644 --- a/SampleApp.gyp +++ b/SampleApp.gyp @@ -156,6 +156,10 @@ 'sources!': [ '../samplecode/SampleDecode.cpp', ], + 'sources': [ + '../src/utils/mac/skia_mac.cpp', + '../src/utils/mac/SkOSWindow_Mac.cpp', + ], }], [ 'skia_os == "ios"', { # TODO: This doesn't build properly yet, but it's getting there. diff --git a/utils.gyp b/utils.gyp index e768a7e..7f03425 100644 --- a/utils.gyp +++ b/utils.gyp @@ -64,8 +64,6 @@ '../include/utils/mac/SkCGUtils.h', '../src/utils/mac/SkCreateCGImageRef.cpp', '../src/utils/mac/SkEGLContext_mac.cpp', - '../src/utils/mac/skia_mac.cpp', - '../src/utils/mac/SkOSWindow_Mac.cpp', #mesa '../src/utils/mesa/SkEGLContext_Mesa.cpp', -- cgit v1.2.3 From efbc79954e0d026ca4dfd2138e826663ac8645da Mon Sep 17 00:00:00 2001 From: "bsalomon@google.com" Date: Wed, 3 Aug 2011 15:18:33 +0000 Subject: Add GrStencilBuffer as a separate resource type from render target This is a resubmission of the changes in r2026 with fixes for FBO completeness issues. Review URL: http://codereview.appspot.com/4837046/ git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@2035 2bbb7eff-a529-9590-31e7-b0007b416f81 --- gpu.gyp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/gpu.gyp b/gpu.gyp index f25e158..f96e39c 100644 --- a/gpu.gyp +++ b/gpu.gyp @@ -153,6 +153,7 @@ '../gpu/src/GrGLProgram.h', '../gpu/src/GrGLRenderTarget.cpp', '../gpu/src/GrGLRenderTarget.h', + '../gpu/src/GrGLStencilBuffer.h', '../gpu/src/GrGLTexture.cpp', '../gpu/src/GrGLTexture.h', '../gpu/src/GrGLUtil.cpp', @@ -179,6 +180,7 @@ '../gpu/src/GrResourceCache.cpp', '../gpu/src/GrResourceCache.h', '../gpu/src/GrStencil.cpp', + '../gpu/src/GrStencilBuffer.h', '../gpu/src/GrTesselatedPathRenderer.cpp', '../gpu/src/GrTextContext.cpp', '../gpu/src/GrTextStrike.cpp', -- cgit v1.2.3 From 483c25f5ad76cd2ab067dcf80fd769f01aed08b2 Mon Sep 17 00:00:00 2001 From: "yangsu@google.com" Date: Mon, 8 Aug 2011 15:12:05 +0000 Subject: iOS/Cocoa SampleApp, Drawingboard, and Networking updates http://codereview.appspot.com/4843041/ http://codereview.appspot.com/4826061/ http://codereview.appspot.com/4832044/ http://codereview.appspot.com/4798055/ git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@2058 2bbb7eff-a529-9590-31e7-b0007b416f81 --- CocoaSampleApp.gyp | 71 +++++++++++++++++++----------------------------------- 1 file changed, 25 insertions(+), 46 deletions(-) diff --git a/CocoaSampleApp.gyp b/CocoaSampleApp.gyp index 90711a8..8286f8c 100644 --- a/CocoaSampleApp.gyp +++ b/CocoaSampleApp.gyp @@ -53,6 +53,7 @@ '../samplecode/SampleDegenerateTwoPtRadials.cpp', '../samplecode/SampleDither.cpp', '../samplecode/SampleDitherBitmap.cpp', + '../samplecode/SampleDrawBitmap.cpp', '../samplecode/SampleDrawLooper.cpp', '../samplecode/SampleEffects.cpp', '../samplecode/SampleEmboss.cpp', @@ -117,6 +118,24 @@ # Dependencies for the pipe code in SampleApp '../src/pipe/SkGPipeRead.cpp', '../src/pipe/SkGPipeWrite.cpp', + + # DrawingBoard + '../experimental/DrawingBoard/SkColorPalette.h', + '../experimental/DrawingBoard/SkColorPalette.cpp', + '../experimental/DrawingBoard/SkNetPipeController.h', + '../experimental/DrawingBoard/SkNetPipeController.cpp', + '../experimental/DrawingBoard/SampleDrawingClient.cpp', + '../experimental/DrawingBoard/SampleDrawingServer.cpp', + + # Networking + '../experimental/Networking/SampleNetPipeReader.cpp', + '../experimental/Networking/SkSockets.cpp', + '../experimental/Networking/SkSockets.h', + + # Transition + '../src/utils/SkInterpolator.cpp', + '../include/utils/SkInterpolator.h', + '../samplecode/TransitionView.cpp', ], 'sources!': [ '../samplecode/SampleSkLayer.cpp', #relies on SkMatrix44 which doesn't compile @@ -163,14 +182,12 @@ '../experimental/CocoaSampleApp/SampleAppDelegate.mm', '../experimental/CocoaSampleApp/SkNSView.h', '../experimental/CocoaSampleApp/SkNSView.mm', - '../experimental/CocoaSampleApp/SkOSWindow_Mac.h', - '../experimental/CocoaSampleApp/SkOSWindow_Mac.mm', '../experimental/CocoaSampleApp/SkOptionsTableView.h', '../experimental/CocoaSampleApp/SkOptionsTableView.mm', + '../experimental/CocoaSampleApp/SkOSWindow_Mac.h', + '../experimental/CocoaSampleApp/SkOSWindow_Mac.mm', '../experimental/CocoaSampleApp/SkTextFieldCell.h', '../experimental/CocoaSampleApp/SkTextFieldCell.m', - '../experimental/SkSockets.h', - '../experimental/SkSockets.cpp', '../experimental/SkEventNotifier.h', '../experimental/SkEventNotifier.mm', ], @@ -181,6 +198,10 @@ '$(SDKROOT)/System/Library/Frameworks/QuartzCore.framework', '$(SDKROOT)/System/Library/Frameworks/OpenGL.framework', ], + 'libraries!': [ + '$(SDKROOT)/System/Library/Frameworks/Carbon.framework', + '$(SDKROOT)/System/Library/Frameworks/AGL.framework', + ], }, 'xcode_settings' : { 'INFOPLIST_FILE' : '../experimental/CocoaSampleApp/SampleApp-Info.plist', @@ -189,48 +210,6 @@ '../experimental/CocoaSampleApp/SampleApp.xib', ], }], - [ 'skia_os == "ios"', { - # TODO: This doesn't build properly yet, but it's getting there. - 'sources!': [ - '../samplecode/SampleDecode.cpp', - ], - 'sources': [ - '../experimental/iOSSampleApp/SkIOSNotifier.mm', - '../experimental/iOSSampleApp/SkTime_iOS.mm', - '../experimental/iOSSampleApp/SkUIDetailViewController.mm', - '../experimental/iOSSampleApp/SkUIRootViewController.mm', - '../experimental/iOSSampleApp/SkUIView_shell.mm', - - '../experimental/iOSSampleApp/iOSSampleApp_Prefix.pch', - '../experimental/iOSSampleApp/Shared/main.m', - '../experimental/iOSSampleApp/iPad/AppDelegate_iPad.mm', - '../experimental/iOSSampleApp/iPad/SkUISplitViewController.mm', - '../experimental/iOSSampleApp/iPhone/AppDelegate_iPhone.mm', - '../experimental/iOSSampleApp/iPhone/SkUINavigationController.mm', - - '../src/utils/ios/SkOSWindow_iOS.mm', - '../src/utils/ios/SkImageDecoder_iOS.mm', - '../src/utils/ios/SkStream_NSData.mm', - '../src/utils/ios/SkOSFile_iOS.mm', - - '../src/utils/mac/SkCreateCGImageRef.cpp', - '../experimental/iOSSampleApp/SkiOSSampleApp-Debug.xcconfig', - '../experimental/iOSSampleApp/SkiOSSampleApp-Release.xcconfig', - ], - 'include_dirs' : [ - '../experimental/iOSSampleApp', - '../experimental/iOSSampleApp/iPad', - '../experimental/iOSSampleApp/iPhone', - '../include/utils/ios', - '../../gpu/include', - ], - 'xcode_config_file': '../experimental/iOSSampleApp/SkiOSSampleApp-Base.xcconfig', - 'mac_bundle_resources' : [ - '../experimental/iOSSampleApp/iPad/MainWindow_iPad.xib', - '../experimental/iOSSampleApp/iPhone/MainWindow_iPhone.xib', - ], - }], - ], 'msvs_settings': { 'VCLinkerTool': { -- cgit v1.2.3 From 9f3d025617261a4dd2559f9ea8ccf1dea45fab4f Mon Sep 17 00:00:00 2001 From: "yangsu@google.com" Date: Mon, 8 Aug 2011 15:37:23 +0000 Subject: Added transitions and net pipe to SampleApp, updated gyp files http://codereview.appspot.com/4839047/ http://codereview.appspot.com/4801080/ git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@2059 2bbb7eff-a529-9590-31e7-b0007b416f81 --- CocoaSampleApp.gyp | 6 +----- SampleApp.gyp | 5 +++++ 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/CocoaSampleApp.gyp b/CocoaSampleApp.gyp index 8286f8c..d55f220 100644 --- a/CocoaSampleApp.gyp +++ b/CocoaSampleApp.gyp @@ -114,6 +114,7 @@ '../samplecode/SampleVertices.cpp', '../samplecode/SampleXfermodes.cpp', '../samplecode/SampleXfermodesBlur.cpp', + '../samplecode/TransitionView.cpp', # Dependencies for the pipe code in SampleApp '../src/pipe/SkGPipeRead.cpp', @@ -131,11 +132,6 @@ '../experimental/Networking/SampleNetPipeReader.cpp', '../experimental/Networking/SkSockets.cpp', '../experimental/Networking/SkSockets.h', - - # Transition - '../src/utils/SkInterpolator.cpp', - '../include/utils/SkInterpolator.h', - '../samplecode/TransitionView.cpp', ], 'sources!': [ '../samplecode/SampleSkLayer.cpp', #relies on SkMatrix44 which doesn't compile diff --git a/SampleApp.gyp b/SampleApp.gyp index fc18d07..6079112 100644 --- a/SampleApp.gyp +++ b/SampleApp.gyp @@ -114,10 +114,15 @@ '../samplecode/SampleVertices.cpp', '../samplecode/SampleXfermodes.cpp', '../samplecode/SampleXfermodesBlur.cpp', + '../samplecode/TransitionView.cpp', # Dependencies for the pipe code in SampleApp '../src/pipe/SkGPipeRead.cpp', '../src/pipe/SkGPipeWrite.cpp', + + # Network Pipe Dependencies + '../experimental/Networking/SkSockets.cpp', + '../experimental/Networking/SkSockets.h', ], 'sources!': [ '../samplecode/SampleSkLayer.cpp', #relies on SkMatrix44 which doesn't compile -- cgit v1.2.3 From e11e6c1548ece77316aea89cb3561d818ca12139 Mon Sep 17 00:00:00 2001 From: "yangsu@google.com" Date: Mon, 8 Aug 2011 16:02:51 +0000 Subject: Removed networking dependencies from SampleApp, Pipe now off by default git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@2060 2bbb7eff-a529-9590-31e7-b0007b416f81 --- SampleApp.gyp | 4 ---- 1 file changed, 4 deletions(-) diff --git a/SampleApp.gyp b/SampleApp.gyp index 6079112..23e81ba 100644 --- a/SampleApp.gyp +++ b/SampleApp.gyp @@ -119,10 +119,6 @@ # Dependencies for the pipe code in SampleApp '../src/pipe/SkGPipeRead.cpp', '../src/pipe/SkGPipeWrite.cpp', - - # Network Pipe Dependencies - '../experimental/Networking/SkSockets.cpp', - '../experimental/Networking/SkSockets.h', ], 'sources!': [ '../samplecode/SampleSkLayer.cpp', #relies on SkMatrix44 which doesn't compile -- cgit v1.2.3 From bb03603d4a376c0a4dc32b692f4cdf4332bef260 Mon Sep 17 00:00:00 2001 From: "bsalomon@google.com" Date: Mon, 8 Aug 2011 17:01:14 +0000 Subject: Use a single stencil buffer for a given width,height,samplecount Review URL: http://codereview.appspot.com/4854044/ git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@2061 2bbb7eff-a529-9590-31e7-b0007b416f81 --- gpu.gyp | 1 + 1 file changed, 1 insertion(+) diff --git a/gpu.gyp b/gpu.gyp index f96e39c..718628f 100644 --- a/gpu.gyp +++ b/gpu.gyp @@ -180,6 +180,7 @@ '../gpu/src/GrResourceCache.cpp', '../gpu/src/GrResourceCache.h', '../gpu/src/GrStencil.cpp', + '../gpu/src/GrStencilBuffer.cpp', '../gpu/src/GrStencilBuffer.h', '../gpu/src/GrTesselatedPathRenderer.cpp', '../gpu/src/GrTextContext.cpp', -- cgit v1.2.3 From ce0e77be2a1f6e217714fd3606a1a1ba2259eeae Mon Sep 17 00:00:00 2001 From: "yangsu@google.com" Date: Mon, 8 Aug 2011 18:38:58 +0000 Subject: CocoaSampleApp no longer depends on SkOSWindow_Mac.h ./gyp_skia now builds CocoaSampleApp on Mac http://codereview.appspot.com/4810084/ git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@2063 2bbb7eff-a529-9590-31e7-b0007b416f81 --- CocoaSampleApp.gyp | 11 ++++++++--- SampleApp.gyp | 4 ++++ 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/CocoaSampleApp.gyp b/CocoaSampleApp.gyp index d55f220..17cda68 100644 --- a/CocoaSampleApp.gyp +++ b/CocoaSampleApp.gyp @@ -1,4 +1,3 @@ - { 'includes': [ 'common.gypi', @@ -180,12 +179,14 @@ '../experimental/CocoaSampleApp/SkNSView.mm', '../experimental/CocoaSampleApp/SkOptionsTableView.h', '../experimental/CocoaSampleApp/SkOptionsTableView.mm', - '../experimental/CocoaSampleApp/SkOSWindow_Mac.h', - '../experimental/CocoaSampleApp/SkOSWindow_Mac.mm', '../experimental/CocoaSampleApp/SkTextFieldCell.h', '../experimental/CocoaSampleApp/SkTextFieldCell.m', '../experimental/SkEventNotifier.h', '../experimental/SkEventNotifier.mm', + + # Cocoa versions of SkOSWindow for Mac + '../include/views/SkOSWindow_Mac_Cocoa.h', + '../src/utils/mac/SkOSWindow_Mac_Cocoa.mm', ], 'link_settings': { 'libraries': [ @@ -201,6 +202,10 @@ }, 'xcode_settings' : { 'INFOPLIST_FILE' : '../experimental/CocoaSampleApp/SampleApp-Info.plist', + + # Define the compiler flag using the following line to use Cocoa + # To be removed when SampleApp is ready to move to Cocoa + 'GCC_PREPROCESSOR_DEFINITIONS' : 'Sk_MAC_COCOA', }, 'mac_bundle_resources' : [ '../experimental/CocoaSampleApp/SampleApp.xib', diff --git a/SampleApp.gyp b/SampleApp.gyp index 23e81ba..2dbafa8 100644 --- a/SampleApp.gyp +++ b/SampleApp.gyp @@ -161,6 +161,10 @@ '../src/utils/mac/skia_mac.cpp', '../src/utils/mac/SkOSWindow_Mac.cpp', ], + 'dependencies': [ + # Build Cocoa version of SampleApp + 'CocoaSampleApp.gyp:CocoaSampleApp', + ], }], [ 'skia_os == "ios"', { # TODO: This doesn't build properly yet, but it's getting there. -- cgit v1.2.3 From a17e7a162b7c783b81a16ee8e3c9a5968081827c Mon Sep 17 00:00:00 2001 From: "yangsu@google.com" Date: Mon, 8 Aug 2011 19:34:16 +0000 Subject: Fixed Compiler flag error in CocoaSampleApp.gyp git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@2065 2bbb7eff-a529-9590-31e7-b0007b416f81 --- CocoaSampleApp.gyp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/CocoaSampleApp.gyp b/CocoaSampleApp.gyp index 17cda68..8dccce5 100644 --- a/CocoaSampleApp.gyp +++ b/CocoaSampleApp.gyp @@ -166,6 +166,10 @@ ], }], [ 'skia_os == "mac"', { + 'defines': [ + # To be removed when SampleApp is ready to move to Cocoa completely + 'Sk_MAC_COCOA', + ], 'sources!': [ '../samplecode/SampleDecode.cpp', ], @@ -202,10 +206,6 @@ }, 'xcode_settings' : { 'INFOPLIST_FILE' : '../experimental/CocoaSampleApp/SampleApp-Info.plist', - - # Define the compiler flag using the following line to use Cocoa - # To be removed when SampleApp is ready to move to Cocoa - 'GCC_PREPROCESSOR_DEFINITIONS' : 'Sk_MAC_COCOA', }, 'mac_bundle_resources' : [ '../experimental/CocoaSampleApp/SampleApp.xib', -- cgit v1.2.3 From 9496d5c88e2b3404f4c1ad889b31a9af7aac5b56 Mon Sep 17 00:00:00 2001 From: "vandebo@chromium.org" Date: Mon, 8 Aug 2011 22:33:05 +0000 Subject: Use bfrange to shrink ToUnicode table. Patch from Arthur Hsu. Original CL: http://codereview.appspot.com/4844043/ BUG=258 Review URL: http://codereview.appspot.com/4808083 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@2075 2bbb7eff-a529-9590-31e7-b0007b416f81 --- tests.gyp | 1 + 1 file changed, 1 insertion(+) diff --git a/tests.gyp b/tests.gyp index 9bde66f..25fffd1 100644 --- a/tests.gyp +++ b/tests.gyp @@ -53,6 +53,7 @@ '../tests/StringTest.cpp', '../tests/Test.cpp', '../tests/TestSize.cpp', + '../tests/ToUnicode.cpp', '../tests/UtilsTest.cpp', '../tests/Writer32Test.cpp', '../tests/XfermodeTest.cpp', -- cgit v1.2.3 From 603e83355ca822f0cb0dc60a6483d433339aee63 Mon Sep 17 00:00:00 2001 From: "yangsu@google.com" Date: Fri, 12 Aug 2011 14:27:47 +0000 Subject: Added Debugger to Sample App, off by default Removed CocoaDebugger from experimental Slight changes to SkOSMenu Bug fixes for NetPipeReader and DrawingBoard git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@2102 2bbb7eff-a529-9590-31e7-b0007b416f81 --- CocoaDebuggerApp.gyp | 79 -------------------------- CocoaSampleApp.gyp | 152 +++++++++++++++++++++++++++------------------------ SimpleCocoaApp.gyp | 8 ++- 3 files changed, 86 insertions(+), 153 deletions(-) delete mode 100644 CocoaDebuggerApp.gyp diff --git a/CocoaDebuggerApp.gyp b/CocoaDebuggerApp.gyp deleted file mode 100644 index e53dfbb..0000000 --- a/CocoaDebuggerApp.gyp +++ /dev/null @@ -1,79 +0,0 @@ -{ - 'includes': [ - 'common.gypi', - ], - 'targets': [ - { - 'target_name': 'CocoaDebuggerApp', - 'type': 'executable', - 'mac_bundle' : 1, - - 'include_dirs' : [ - '../include/pipe', - '../experimental/CocoaDebugger', - '../experimental/SimpleCocoaApp', - ], - 'sources': [ - '../experimental/CocoaDebugger/SkCommandListView.cpp', - '../experimental/CocoaDebugger/SkContentView.cpp', - '../experimental/CocoaDebugger/SkDebugDumper.cpp', - '../experimental/CocoaDebugger/SkDumpCanvasM.cpp', - '../experimental/CocoaDebugger/SkInfoPanelView.cpp', - '../src/pipe/SkGPipeRead.cpp', - ], - 'dependencies': [ - 'core.gyp:core', - 'effects.gyp:effects', - 'opts.gyp:opts', - 'utils.gyp:utils', - 'views.gyp:views', - 'xml.gyp:xml', - ], - 'conditions' : [ - # Only supports Mac currently - ['skia_os == "mac"', { - 'sources': [ - '../experimental/CocoaDebugger/CocoaDebugger-Info.plist', - '../experimental/CocoaDebugger/CocoaDebugger_Prefix.pch', - '../experimental/CocoaDebugger/CocoaDebuggerAppDelegate.mm', - '../experimental/CocoaDebugger/main.m', - '../experimental/CocoaDebugger/SkDebugger.mm', - '../experimental/CocoaDebugger/SkMenuController.mm', - '../experimental/SimpleCocoaApp/SkNSView.mm', - '../experimental/SimpleCocoaApp/SkNSWindow.mm', - '../include/utils/mac/SkCGUtils.h', - '../src/utils/mac/SkCreateCGImageRef.cpp', - ], - 'link_settings': { - 'libraries': [ - '$(SDKROOT)/System/Library/Frameworks/Cocoa.framework', - '$(SDKROOT)/System/Library/Frameworks/AppKit.framework', - '$(SDKROOT)/System/Library/Frameworks/Foundation.framework', - '$(SDKROOT)/System/Library/Frameworks/OpenGL.framework', - ], - 'libraries!': [ - # Currently skia mac apps rely on Carbon and AGL for UI. Future - # apps should use Cocoa instead and dependencies on Carbon and AGL - # should eventually be removed - '$(SDKROOT)/System/Library/Frameworks/Carbon.framework', - '$(SDKROOT)/System/Library/Frameworks/AGL.framework', - ], - }, - 'xcode_settings' : { - 'INFOPLIST_FILE' : '../experimental/CocoaDebugger/CocoaDebugger-Info.plist', - }, - 'mac_bundle_resources' : [ - '../experimental/CocoaDebugger/English.lproj/InfoPlist.strings', - '../experimental/CocoaDebugger/English.lproj/MainMenu.xib', - ], - }], - ], - }, - ], -} - -# Local Variables: -# tab-width:2 -# indent-tabs-mode:nil -# End: -# vim: set expandtab tabstop=2 shiftwidth=2: diff --git a/CocoaSampleApp.gyp b/CocoaSampleApp.gyp index 8dccce5..27846e1 100644 --- a/CocoaSampleApp.gyp +++ b/CocoaSampleApp.gyp @@ -14,104 +14,104 @@ ], 'sources': [ # gm files needed for SampleGM.cpp - '../gm/bitmapfilters.cpp', - '../gm/blurs.cpp', - '../gm/complexclip.cpp', - '../gm/filltypes.cpp', - '../gm/gm.h', - '../gm/gradients.cpp', - '../gm/nocolorbleed.cpp', - '../gm/points.cpp', - '../gm/poly2poly.cpp', - '../gm/shadertext.cpp', - '../gm/shadows.cpp', - '../gm/shapes.cpp', - '../gm/tilemodes.cpp', - '../gm/xfermodes.cpp', + #'../gm/bitmapfilters.cpp', + #'../gm/blurs.cpp', + #'../gm/complexclip.cpp', + #'../gm/filltypes.cpp', + #'../gm/gm.h', + #'../gm/gradients.cpp', + #'../gm/nocolorbleed.cpp', + #'../gm/points.cpp', + #'../gm/poly2poly.cpp', + #'../gm/shadertext.cpp', + #'../gm/shadows.cpp', + #'../gm/shapes.cpp', + #'../gm/tilemodes.cpp', + #'../gm/xfermodes.cpp', - '../samplecode/ClockFaceView.cpp', + #'../samplecode/ClockFaceView.cpp', '../samplecode/OverView.cpp', - '../samplecode/Sample2PtRadial.cpp', - '../samplecode/SampleAll.cpp', - '../samplecode/SampleAnimator.cpp', + #'../samplecode/Sample2PtRadial.cpp', + #'../samplecode/SampleAll.cpp', + #'../samplecode/SampleAnimator.cpp', '../samplecode/SampleApp.cpp', '../samplecode/SampleArc.cpp', '../samplecode/SampleAvoid.cpp', - '../samplecode/SampleBigBlur.cpp', - '../samplecode/SampleBigGradient.cpp', - '../samplecode/SampleBitmapRect.cpp', + #'../samplecode/SampleBigBlur.cpp', + #'../samplecode/SampleBigGradient.cpp', + #'../samplecode/SampleBitmapRect.cpp', '../samplecode/SampleBlur.cpp', - '../samplecode/SampleCamera.cpp', - '../samplecode/SampleCircle.cpp', + #'../samplecode/SampleCamera.cpp', + #'../samplecode/SampleCircle.cpp', '../samplecode/SampleCode.h', - '../samplecode/SampleColorFilter.cpp', + #'../samplecode/SampleColorFilter.cpp', '../samplecode/SampleComplexClip.cpp', - '../samplecode/SampleConcavePaths.cpp', + #'../samplecode/SampleConcavePaths.cpp', '../samplecode/SampleCull.cpp', - '../samplecode/SampleDecode.cpp', + #'../samplecode/SampleDecode.cpp', '../samplecode/SampleDegenerateTwoPtRadials.cpp', - '../samplecode/SampleDither.cpp', - '../samplecode/SampleDitherBitmap.cpp', - '../samplecode/SampleDrawBitmap.cpp', - '../samplecode/SampleDrawLooper.cpp', - '../samplecode/SampleEffects.cpp', - '../samplecode/SampleEmboss.cpp', - '../samplecode/SampleEncode.cpp', - '../samplecode/SampleExtractAlpha.cpp', + #'../samplecode/SampleDither.cpp', + #'../samplecode/SampleDitherBitmap.cpp', + #'../samplecode/SampleDrawBitmap.cpp', + #'../samplecode/SampleDrawLooper.cpp', + #'../samplecode/SampleEffects.cpp', + #'../samplecode/SampleEmboss.cpp', + #'../samplecode/SampleEncode.cpp', + #'../samplecode/SampleExtractAlpha.cpp', '../samplecode/SampleFillType.cpp', - '../samplecode/SampleFilter.cpp', - '../samplecode/SampleFilter2.cpp', - '../samplecode/SampleFontCache.cpp', - '../samplecode/SampleFontScalerTest.cpp', - '../samplecode/SampleFuzz.cpp', - '../samplecode/SampleGM.cpp', - '../samplecode/SampleGradients.cpp', - '../samplecode/SampleHairline.cpp', - '../samplecode/SampleImage.cpp', - '../samplecode/SampleImageDir.cpp', - '../samplecode/SampleLayerMask.cpp', - '../samplecode/SampleLayers.cpp', + #'../samplecode/SampleFilter.cpp', + #'../samplecode/SampleFilter2.cpp', + #'../samplecode/SampleFontCache.cpp', + #'../samplecode/SampleFontScalerTest.cpp', + #'../samplecode/SampleFuzz.cpp', + #'../samplecode/SampleGM.cpp', + #'../samplecode/SampleGradients.cpp', + #'../samplecode/SampleHairline.cpp', + #'../samplecode/SampleImage.cpp', + #'../samplecode/SampleImageDir.cpp', + #'../samplecode/SampleLayerMask.cpp', + #'../samplecode/SampleLayers.cpp', '../samplecode/SampleLCD.cpp', '../samplecode/SampleLineClipper.cpp', - '../samplecode/SampleLines.cpp', - '../samplecode/SampleMeasure.cpp', - '../samplecode/SampleMipMap.cpp', - '../samplecode/SampleMovie.cpp', - '../samplecode/SampleNinePatch.cpp', - '../samplecode/SampleOvalTest.cpp', - '../samplecode/SampleOverflow.cpp', - '../samplecode/SamplePageFlip.cpp', - '../samplecode/SamplePatch.cpp', + #'../samplecode/SampleLines.cpp', + #'../samplecode/SampleMeasure.cpp', + #'../samplecode/SampleMipMap.cpp', + #'../samplecode/SampleMovie.cpp', + #'../samplecode/SampleNinePatch.cpp', + #'../samplecode/SampleOvalTest.cpp', + #'../samplecode/SampleOverflow.cpp', + #'../samplecode/SamplePageFlip.cpp', + #'../samplecode/SamplePatch.cpp', '../samplecode/SamplePath.cpp', '../samplecode/SamplePathClip.cpp', '../samplecode/SamplePathEffects.cpp', '../samplecode/SamplePicture.cpp', '../samplecode/SamplePoints.cpp', '../samplecode/SamplePolyToPoly.cpp', - '../samplecode/SampleAARects.cpp', + ##'../samplecode/SampleAARects.cpp', '../samplecode/SampleRegion.cpp', - '../samplecode/SampleRepeatTile.cpp', - '../samplecode/SampleShaders.cpp', - '../samplecode/SampleShaderText.cpp', - '../samplecode/SampleShapes.cpp', - '../samplecode/SampleSkLayer.cpp', + #'../samplecode/SampleRepeatTile.cpp', + #'../samplecode/SampleShaders.cpp', + #'../samplecode/SampleShaderText.cpp', + #'../samplecode/SampleShapes.cpp', + #'../samplecode/SampleSkLayer.cpp', '../samplecode/SampleSlides.cpp', - '../samplecode/SampleStrokePath.cpp', - '../samplecode/SampleStrokeText.cpp', - '../samplecode/SampleTests.cpp', - '../samplecode/SampleText.cpp', - '../samplecode/SampleTextAlpha.cpp', + #'../samplecode/SampleStrokePath.cpp', + #'../samplecode/SampleStrokeText.cpp', + #'../samplecode/SampleTests.cpp', + #'../samplecode/SampleText.cpp', + #'../samplecode/SampleTextAlpha.cpp', '../samplecode/SampleTextBox.cpp', '../samplecode/SampleTextEffects.cpp', '../samplecode/SampleTextOnPath.cpp', - '../samplecode/SampleTextureDomain.cpp', - '../samplecode/SampleTiling.cpp', - '../samplecode/SampleTinyBitmap.cpp', + #'../samplecode/SampleTextureDomain.cpp', + #'../samplecode/SampleTiling.cpp', + #'../samplecode/SampleTinyBitmap.cpp', '../samplecode/SampleTriangles.cpp', '../samplecode/SampleTypeface.cpp', '../samplecode/SampleUnitMapper.cpp', - '../samplecode/SampleVertices.cpp', - '../samplecode/SampleXfermodes.cpp', + #'../samplecode/SampleVertices.cpp', + #'../samplecode/SampleXfermodes.cpp', '../samplecode/SampleXfermodesBlur.cpp', '../samplecode/TransitionView.cpp', @@ -124,13 +124,21 @@ '../experimental/DrawingBoard/SkColorPalette.cpp', '../experimental/DrawingBoard/SkNetPipeController.h', '../experimental/DrawingBoard/SkNetPipeController.cpp', - '../experimental/DrawingBoard/SampleDrawingClient.cpp', + #'../experimental/DrawingBoard/SampleDrawingClient.cpp', '../experimental/DrawingBoard/SampleDrawingServer.cpp', # Networking '../experimental/Networking/SampleNetPipeReader.cpp', '../experimental/Networking/SkSockets.cpp', '../experimental/Networking/SkSockets.h', + + # Debugger + '../experimental/Debugger/DebuggerViews.h', + '../experimental/Debugger/DebuggerContentView.cpp', + '../experimental/Debugger/DebuggerCommandsView.cpp', + '../experimental/Debugger/DebuggerStateView.cpp', + '../experimental/Debugger/SkDebugDumper.cpp', + '../experimental/Debugger/SkDebugDumper.h', ], 'sources!': [ '../samplecode/SampleSkLayer.cpp', #relies on SkMatrix44 which doesn't compile diff --git a/SimpleCocoaApp.gyp b/SimpleCocoaApp.gyp index ead9fe4..1725f12 100644 --- a/SimpleCocoaApp.gyp +++ b/SimpleCocoaApp.gyp @@ -12,12 +12,16 @@ ], 'sources': [ '../experimental/SimpleCocoaApp/main.m', + '../experimental/SimpleCocoaApp/SampleWindow.h', '../experimental/SimpleCocoaApp/SampleWindow.mm', - '../experimental/SimpleCocoaApp/SimpleCocoaApp-Info.plist', - '../experimental/SimpleCocoaApp/SimpleCocoaApp_Prefix.pch', + '../experimental/SimpleCocoaApp/SimpleCocoaAppDelegate.h', '../experimental/SimpleCocoaApp/SimpleCocoaAppDelegate.mm', + '../experimental/SimpleCocoaApp/SkNSView.h', '../experimental/SimpleCocoaApp/SkNSView.mm', + '../experimental/SimpleCocoaApp/SkNSWindow.h', '../experimental/SimpleCocoaApp/SkNSWindow.mm', + '../experimental/SimpleCocoaApp/SimpleCocoaApp-Info.plist', + '../experimental/SimpleCocoaApp/SimpleCocoaApp_Prefix.pch', ], 'dependencies': [ 'core.gyp:core', -- cgit v1.2.3 From 08a2cb0f47dca6ad3a4a3679023324d9b4636598 Mon Sep 17 00:00:00 2001 From: "yangsu@google.com" Date: Fri, 12 Aug 2011 15:04:12 +0000 Subject: Included dependencies for networked pipe and debugger in SampleApp git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@2105 2bbb7eff-a529-9590-31e7-b0007b416f81 --- SampleApp.gyp | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/SampleApp.gyp b/SampleApp.gyp index 2dbafa8..026fc43 100644 --- a/SampleApp.gyp +++ b/SampleApp.gyp @@ -119,6 +119,18 @@ # Dependencies for the pipe code in SampleApp '../src/pipe/SkGPipeRead.cpp', '../src/pipe/SkGPipeWrite.cpp', + + # Networking dependencies + '../experimental/Networking/SkSockets.cpp', + '../experimental/Networking/SkSockets.h', + + # Debugger dependencies + '../experimental/Debugger/DebuggerViews.h', + '../experimental/Debugger/DebuggerContentView.cpp', + '../experimental/Debugger/DebuggerCommandsView.cpp', + '../experimental/Debugger/DebuggerStateView.cpp', + '../experimental/Debugger/SkDebugDumper.cpp', + '../experimental/Debugger/SkDebugDumper.h', ], 'sources!': [ '../samplecode/SampleSkLayer.cpp', #relies on SkMatrix44 which doesn't compile -- cgit v1.2.3 From c6503327e293c146cd67b40e4108287346b32ca0 Mon Sep 17 00:00:00 2001 From: "yangsu@google.com" Date: Fri, 12 Aug 2011 15:18:25 +0000 Subject: Removed networking dependencies from SampleApp that caused errors Fixed error in Debugger git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@2106 2bbb7eff-a529-9590-31e7-b0007b416f81 --- SampleApp.gyp | 4 ---- 1 file changed, 4 deletions(-) diff --git a/SampleApp.gyp b/SampleApp.gyp index 026fc43..4d061e6 100644 --- a/SampleApp.gyp +++ b/SampleApp.gyp @@ -120,10 +120,6 @@ '../src/pipe/SkGPipeRead.cpp', '../src/pipe/SkGPipeWrite.cpp', - # Networking dependencies - '../experimental/Networking/SkSockets.cpp', - '../experimental/Networking/SkSockets.h', - # Debugger dependencies '../experimental/Debugger/DebuggerViews.h', '../experimental/Debugger/DebuggerContentView.cpp', -- cgit v1.2.3 From 03661c52478377c148d1f59baafbd65c7aa53546 Mon Sep 17 00:00:00 2001 From: "yangsu@google.com" Date: Fri, 12 Aug 2011 16:06:24 +0000 Subject: Added samplecode as an include directory for SampleApp.gyp git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@2107 2bbb7eff-a529-9590-31e7-b0007b416f81 --- SampleApp.gyp | 1 + 1 file changed, 1 insertion(+) diff --git a/SampleApp.gyp b/SampleApp.gyp index 4d061e6..d51c76c 100644 --- a/SampleApp.gyp +++ b/SampleApp.gyp @@ -12,6 +12,7 @@ '../src/core', # needed to get SkConcaveToTriangle, maybe this should be moved to include dir? '../gm', # SampleGM.cpp pulls gm.h '../include/pipe', # To pull in SkGPipe.h for pipe reader/writer + '../samplecode', # To pull SampleApp.h and SampleCode.h ], 'sources': [ # gm files needed for SampleGM.cpp -- cgit v1.2.3 From 367c82d04f01dbe6e4bb5d95e1a57ee36656bc19 Mon Sep 17 00:00:00 2001 From: "epoger@google.com" Date: Mon, 15 Aug 2011 19:22:39 +0000 Subject: Stop packaging command-line Mac tools as a bundle. Review URL: http://codereview.appspot.com/4894046 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@2113 2bbb7eff-a529-9590-31e7-b0007b416f81 --- apptype_console.gypi | 1 - 1 file changed, 1 deletion(-) diff --git a/apptype_console.gypi b/apptype_console.gypi index 8980ce8..f2f6e1c 100644 --- a/apptype_console.gypi +++ b/apptype_console.gypi @@ -1,7 +1,6 @@ # target_defaults used for executable targets that generate a console app { 'target_defaults': { - 'mac_bundle' : 1, 'msvs_settings': { 'VCLinkerTool': { #Allows for creation / output to console. -- cgit v1.2.3 From 11b47b3a7e3b283514e69f95a473b8fe9b960bb7 Mon Sep 17 00:00:00 2001 From: "bsalomon@google.com" Date: Tue, 16 Aug 2011 15:09:46 +0000 Subject: Move some gpu headers out of the public include dir Review URL: http://codereview.appspot.com/4902045/ git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@2119 2bbb7eff-a529-9590-31e7-b0007b416f81 --- gpu.gyp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/gpu.gyp b/gpu.gyp index 718628f..3cee3e6 100644 --- a/gpu.gyp +++ b/gpu.gyp @@ -90,15 +90,11 @@ '../gpu/include/GrContext_impl.h', '../gpu/include/GrDrawTarget.h', '../gpu/include/GrFontScaler.h', - '../gpu/include/GrGeometryBuffer.h', '../gpu/include/GrGLConfig.h', '../gpu/include/GrGLConfig_chrome.h', '../gpu/include/GrGLInterface.h', '../gpu/include/GrGlyph.h', - '../gpu/include/GrGpu.h', '../gpu/include/GrGpuVertex.h', - '../gpu/include/GrIndexBuffer.h', - '../gpu/include/GrInOrderDrawBuffer.h', '../gpu/include/GrInstanceCounter.h', '../gpu/include/GrIPoint.h', '../gpu/include/GrKey.h', @@ -133,7 +129,6 @@ '../gpu/include/GrTLList.h', '../gpu/include/GrTypes.h', '../gpu/include/GrUserConfig.h', - '../gpu/include/GrVertexBuffer.h', '../gpu/src/GrAllocPool.cpp', '../gpu/src/GrAtlas.cpp', @@ -144,6 +139,7 @@ '../gpu/src/GrContext.cpp', '../gpu/src/GrCreatePathRenderer_none.cpp', '../gpu/src/GrDrawTarget.cpp', + '../gpu/src/GrGeometryBuffer.h', '../gpu/src/GrGLDefaultInterface_none.cpp', '../gpu/src/GrGLIndexBuffer.cpp', '../gpu/src/GrGLIndexBuffer.h', @@ -160,6 +156,7 @@ '../gpu/src/GrGLVertexBuffer.cpp', '../gpu/src/GrGLVertexBuffer.h', '../gpu/src/GrGpu.cpp', + '../gpu/src/GrGpu.h', '../gpu/src/GrGpuFactory.cpp', '../gpu/src/GrGpuGL.cpp', '../gpu/src/GrGpuGL.h', @@ -167,7 +164,9 @@ '../gpu/src/GrGpuGLFixed.h', '../gpu/src/GrGpuGLShaders.cpp', '../gpu/src/GrGpuGLShaders.h', + '../gpu/src/GrIndexBuffer.h', '../gpu/src/GrInOrderDrawBuffer.cpp', + '../gpu/src/GrInOrderDrawBuffer.h', '../gpu/src/GrMatrix.cpp', '../gpu/src/GrMemory.cpp', '../gpu/src/GrPathRenderer.cpp', @@ -187,6 +186,7 @@ '../gpu/src/GrTextStrike.cpp', '../gpu/src/GrTextStrike_impl.h', '../gpu/src/GrTexture.cpp', + '../gpu/src/GrVertexBuffer.h', '../gpu/src/gr_unittests.cpp', '../gpu/src/mac/GrGLDefaultInterface_mac.cpp', -- cgit v1.2.3 From 7d39ed01b6b9ec89d7c9a26a7292957d395c2957 Mon Sep 17 00:00:00 2001 From: "bsalomon@google.com" Date: Tue, 16 Aug 2011 15:45:58 +0000 Subject: Make program unit test run clean and add it to tests program Review URL: http://codereview.appspot.com/4898049/ git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@2121 2bbb7eff-a529-9590-31e7-b0007b416f81 --- core.gyp | 1 + tests.gyp | 7 ++++++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/core.gyp b/core.gyp index 7d38974..aa2a199 100644 --- a/core.gyp +++ b/core.gyp @@ -133,6 +133,7 @@ '../src/core/SkStrokerPriv.cpp', '../src/core/SkStrokerPriv.h', '../src/core/SkTextFormatParams.h', + '../src/core/SkTLazy.h', '../src/core/SkTSearch.cpp', '../src/core/SkTSort.h', '../src/core/SkTemplatesPriv.h', diff --git a/tests.gyp b/tests.gyp index 25fffd1..93b1149 100644 --- a/tests.gyp +++ b/tests.gyp @@ -10,6 +10,7 @@ 'type': 'executable', 'include_dirs' : [ '../src/core', + '../gpu/src', ], 'sources': [ '../tests/BitmapCopyTest.cpp', @@ -29,6 +30,7 @@ '../tests/FillPathTest.cpp', '../tests/FlateTest.cpp', '../tests/GeometryTest.cpp', + '../tests/GLProgramsTest.cpp', '../tests/InfRectTest.cpp', '../tests/MathTest.cpp', '../tests/MatrixTest.cpp', @@ -52,8 +54,9 @@ '../tests/StreamTest.cpp', '../tests/StringTest.cpp', '../tests/Test.cpp', + '../tests/Test.h', '../tests/TestSize.cpp', - '../tests/ToUnicode.cpp', + '../tests/ToUnicode.cpp', '../tests/UtilsTest.cpp', '../tests/Writer32Test.cpp', '../tests/XfermodeTest.cpp', @@ -62,6 +65,8 @@ 'core.gyp:core', 'effects.gyp:effects', 'experimental.gyp:experimental', + 'gpu.gyp:gr', + 'gpu.gyp:skgr', 'images.gyp:images', 'pdf.gyp:pdf', 'utils.gyp:utils', -- cgit v1.2.3 From 13639bf10a596e136c50145da7c497dc68b1f0ad Mon Sep 17 00:00:00 2001 From: "bsalomon@google.com" Date: Tue, 16 Aug 2011 19:20:44 +0000 Subject: Remove GrContext::drawCustomVertices Review URL: http://codereview.appspot.com/4910042/ git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@2124 2bbb7eff-a529-9590-31e7-b0007b416f81 --- gpu.gyp | 1 - 1 file changed, 1 deletion(-) diff --git a/gpu.gyp b/gpu.gyp index 3cee3e6..5869dca 100644 --- a/gpu.gyp +++ b/gpu.gyp @@ -87,7 +87,6 @@ '../gpu/include/GrColor.h', '../gpu/include/GrConfig.h', '../gpu/include/GrContext.h', - '../gpu/include/GrContext_impl.h', '../gpu/include/GrDrawTarget.h', '../gpu/include/GrFontScaler.h', '../gpu/include/GrGLConfig.h', -- cgit v1.2.3 From 290c8d02fcb0a27a2b41f7622140792ecb3d0813 Mon Sep 17 00:00:00 2001 From: "bsalomon@google.com" Date: Tue, 16 Aug 2011 20:38:11 +0000 Subject: Make GrDrawTarget.h and GrPathRenderer.h be private headers Review URL: http://codereview.appspot.com/4894050/ git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@2125 2bbb7eff-a529-9590-31e7-b0007b416f81 --- gpu.gyp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gpu.gyp b/gpu.gyp index 5869dca..158a532 100644 --- a/gpu.gyp +++ b/gpu.gyp @@ -87,7 +87,6 @@ '../gpu/include/GrColor.h', '../gpu/include/GrConfig.h', '../gpu/include/GrContext.h', - '../gpu/include/GrDrawTarget.h', '../gpu/include/GrFontScaler.h', '../gpu/include/GrGLConfig.h', '../gpu/include/GrGLConfig_chrome.h', @@ -102,7 +101,6 @@ '../gpu/include/GrNoncopyable.h', '../gpu/include/GrPaint.h', '../gpu/include/GrPath.h', - '../gpu/include/GrPathRenderer.h', '../gpu/include/GrPathSink.h', '../gpu/include/GrPlotMgr.h', '../gpu/include/GrPoint.h', @@ -138,6 +136,7 @@ '../gpu/src/GrContext.cpp', '../gpu/src/GrCreatePathRenderer_none.cpp', '../gpu/src/GrDrawTarget.cpp', + '../gpu/src/GrDrawTarget.h', '../gpu/src/GrGeometryBuffer.h', '../gpu/src/GrGLDefaultInterface_none.cpp', '../gpu/src/GrGLIndexBuffer.cpp', @@ -169,6 +168,7 @@ '../gpu/src/GrMatrix.cpp', '../gpu/src/GrMemory.cpp', '../gpu/src/GrPathRenderer.cpp', + '../gpu/src/GrPathRenderer.h', '../gpu/src/GrPathUtils.cpp', '../gpu/src/GrPathUtils.h', '../gpu/src/GrRectanizer.cpp', -- cgit v1.2.3 From 76a4b05eb207968a9c8fc6a8bb99e6d8cf5145e4 Mon Sep 17 00:00:00 2001 From: "vandebo@chromium.org" Date: Tue, 16 Aug 2011 23:20:31 +0000 Subject: Revert "Make GrDrawTarget.h and GrPathRenderer.h be private headers" This reverts commit r2125 Looks like GrPathRenderer.h is used from gpu/include/GrTesselatedPathRenderer.h There also seems to be a dependency tracking problem, because r2125 didn't go red, but the next revision did. Review URL: http://codereview.appspot.com/4896048 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@2127 2bbb7eff-a529-9590-31e7-b0007b416f81 --- gpu.gyp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gpu.gyp b/gpu.gyp index 158a532..5869dca 100644 --- a/gpu.gyp +++ b/gpu.gyp @@ -87,6 +87,7 @@ '../gpu/include/GrColor.h', '../gpu/include/GrConfig.h', '../gpu/include/GrContext.h', + '../gpu/include/GrDrawTarget.h', '../gpu/include/GrFontScaler.h', '../gpu/include/GrGLConfig.h', '../gpu/include/GrGLConfig_chrome.h', @@ -101,6 +102,7 @@ '../gpu/include/GrNoncopyable.h', '../gpu/include/GrPaint.h', '../gpu/include/GrPath.h', + '../gpu/include/GrPathRenderer.h', '../gpu/include/GrPathSink.h', '../gpu/include/GrPlotMgr.h', '../gpu/include/GrPoint.h', @@ -136,7 +138,6 @@ '../gpu/src/GrContext.cpp', '../gpu/src/GrCreatePathRenderer_none.cpp', '../gpu/src/GrDrawTarget.cpp', - '../gpu/src/GrDrawTarget.h', '../gpu/src/GrGeometryBuffer.h', '../gpu/src/GrGLDefaultInterface_none.cpp', '../gpu/src/GrGLIndexBuffer.cpp', @@ -168,7 +169,6 @@ '../gpu/src/GrMatrix.cpp', '../gpu/src/GrMemory.cpp', '../gpu/src/GrPathRenderer.cpp', - '../gpu/src/GrPathRenderer.h', '../gpu/src/GrPathUtils.cpp', '../gpu/src/GrPathUtils.h', '../gpu/src/GrRectanizer.cpp', -- cgit v1.2.3 From df2c78051fb1669755a696bff1973b5c59d2940d Mon Sep 17 00:00:00 2001 From: "bsalomon@google.com" Date: Wed, 17 Aug 2011 13:42:46 +0000 Subject: Fixed r2125. Identical change but also moves GrTesselatedPathRenderer.h to src dir. Verbal SGTM from Tom who reviewed the original version at: http://codereview.appspot.com/4894050/ git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@2129 2bbb7eff-a529-9590-31e7-b0007b416f81 --- gpu.gyp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gpu.gyp b/gpu.gyp index 5869dca..11e39a7 100644 --- a/gpu.gyp +++ b/gpu.gyp @@ -87,7 +87,6 @@ '../gpu/include/GrColor.h', '../gpu/include/GrConfig.h', '../gpu/include/GrContext.h', - '../gpu/include/GrDrawTarget.h', '../gpu/include/GrFontScaler.h', '../gpu/include/GrGLConfig.h', '../gpu/include/GrGLConfig_chrome.h', @@ -102,7 +101,6 @@ '../gpu/include/GrNoncopyable.h', '../gpu/include/GrPaint.h', '../gpu/include/GrPath.h', - '../gpu/include/GrPathRenderer.h', '../gpu/include/GrPathSink.h', '../gpu/include/GrPlotMgr.h', '../gpu/include/GrPoint.h', @@ -120,7 +118,6 @@ '../gpu/include/GrTArray.h', '../gpu/include/GrTBSearch.h', '../gpu/include/GrTDArray.h', - '../gpu/include/GrTesselatedPathRenderer.h', '../gpu/include/GrTextContext.h', '../gpu/include/GrTextStrike.h', '../gpu/include/GrTexture.h', @@ -138,6 +135,7 @@ '../gpu/src/GrContext.cpp', '../gpu/src/GrCreatePathRenderer_none.cpp', '../gpu/src/GrDrawTarget.cpp', + '../gpu/src/GrDrawTarget.h', '../gpu/src/GrGeometryBuffer.h', '../gpu/src/GrGLDefaultInterface_none.cpp', '../gpu/src/GrGLIndexBuffer.cpp', @@ -169,6 +167,7 @@ '../gpu/src/GrMatrix.cpp', '../gpu/src/GrMemory.cpp', '../gpu/src/GrPathRenderer.cpp', + '../gpu/src/GrPathRenderer.h', '../gpu/src/GrPathUtils.cpp', '../gpu/src/GrPathUtils.h', '../gpu/src/GrRectanizer.cpp', @@ -181,6 +180,7 @@ '../gpu/src/GrStencilBuffer.cpp', '../gpu/src/GrStencilBuffer.h', '../gpu/src/GrTesselatedPathRenderer.cpp', + '../gpu/src/GrTesselatedPathRenderer.h', '../gpu/src/GrTextContext.cpp', '../gpu/src/GrTextStrike.cpp', '../gpu/src/GrTextStrike_impl.h', -- cgit v1.2.3 From 8c797a7ff575247d5231cf0bb01af06aa46021cb Mon Sep 17 00:00:00 2001 From: "bsalomon@google.com" Date: Fri, 19 Aug 2011 13:28:54 +0000 Subject: Make GrGLInterface a per-GrContext refcounted object rather than a global Review URL: http://codereview.appspot.com/4901046/ git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@2140 2bbb7eff-a529-9590-31e7-b0007b416f81 --- gpu.gyp | 1 + 1 file changed, 1 insertion(+) diff --git a/gpu.gyp b/gpu.gyp index 11e39a7..7330cf3 100644 --- a/gpu.gyp +++ b/gpu.gyp @@ -146,6 +146,7 @@ '../gpu/src/GrGLProgram.h', '../gpu/src/GrGLRenderTarget.cpp', '../gpu/src/GrGLRenderTarget.h', + '../gpu/src/GrGLStencilBuffer.cpp', '../gpu/src/GrGLStencilBuffer.h', '../gpu/src/GrGLTexture.cpp', '../gpu/src/GrGLTexture.h', -- cgit v1.2.3 From af29b95d9fa8f74cb7aec00b8ee61cded34ea810 Mon Sep 17 00:00:00 2001 From: "bsalomon@google.com" Date: Fri, 19 Aug 2011 15:42:31 +0000 Subject: Use a prioritized list of path renderers in Gr. http://codereview.appspot.com/4867058 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@2143 2bbb7eff-a529-9590-31e7-b0007b416f81 --- gpu.gyp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/gpu.gyp b/gpu.gyp index 7330cf3..b7fa1c8 100644 --- a/gpu.gyp +++ b/gpu.gyp @@ -126,6 +126,7 @@ '../gpu/include/GrTypes.h', '../gpu/include/GrUserConfig.h', + '../gpu/src/GrAddPathRenderers_none.cpp', '../gpu/src/GrAllocPool.cpp', '../gpu/src/GrAtlas.cpp', '../gpu/src/GrBinHashKey.h', @@ -133,7 +134,8 @@ '../gpu/src/GrBufferAllocPool.h', '../gpu/src/GrClip.cpp', '../gpu/src/GrContext.cpp', - '../gpu/src/GrCreatePathRenderer_none.cpp', + '../gpu/src/GrDefaultPathRenderer.cpp', + '../gpu/src/GrDefaultPathRenderer.h', '../gpu/src/GrDrawTarget.cpp', '../gpu/src/GrDrawTarget.h', '../gpu/src/GrGeometryBuffer.h', @@ -167,6 +169,8 @@ '../gpu/src/GrInOrderDrawBuffer.h', '../gpu/src/GrMatrix.cpp', '../gpu/src/GrMemory.cpp', + '../gpu/src/GrPathRendererChain.cpp', + '../gpu/src/GrPathRendererChain.h', '../gpu/src/GrPathRenderer.cpp', '../gpu/src/GrPathRenderer.h', '../gpu/src/GrPathUtils.cpp', -- cgit v1.2.3 From e16efb34d23db90253029631de86e985e35ce8e0 Mon Sep 17 00:00:00 2001 From: "reed@google.com" Date: Wed, 24 Aug 2011 13:14:47 +0000 Subject: add more samples git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@2168 2bbb7eff-a529-9590-31e7-b0007b416f81 --- CocoaSampleApp.gyp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CocoaSampleApp.gyp b/CocoaSampleApp.gyp index 27846e1..88f7168 100644 --- a/CocoaSampleApp.gyp +++ b/CocoaSampleApp.gyp @@ -62,7 +62,7 @@ #'../samplecode/SampleFilter.cpp', #'../samplecode/SampleFilter2.cpp', #'../samplecode/SampleFontCache.cpp', - #'../samplecode/SampleFontScalerTest.cpp', + '../samplecode/SampleFontScalerTest.cpp', #'../samplecode/SampleFuzz.cpp', #'../samplecode/SampleGM.cpp', #'../samplecode/SampleGradients.cpp', -- cgit v1.2.3 From f88759a49cb4155a58b5a1bf454221310b32fe53 Mon Sep 17 00:00:00 2001 From: "reed@google.com" Date: Mon, 29 Aug 2011 17:41:02 +0000 Subject: add new test for complex clips temp disable picture testing until I fix the bug w/ expanding clips git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@2184 2bbb7eff-a529-9590-31e7-b0007b416f81 --- bench.gyp | 1 + gm.gyp | 7 ++++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/bench.gyp b/bench.gyp index 715a364..bae46f8 100644 --- a/bench.gyp +++ b/bench.gyp @@ -32,6 +32,7 @@ '../bench/DecodeBench.cpp', '../bench/FPSBench.cpp', '../bench/GradientBench.cpp', + '../bench/MathBench.cpp', '../bench/MatrixBench.cpp', '../bench/PathBench.cpp', '../bench/RectBench.cpp', diff --git a/gm.gyp b/gm.gyp index 180e81f..cebd26f 100644 --- a/gm.gyp +++ b/gm.gyp @@ -12,13 +12,17 @@ '../gm/bitmapfilters.cpp', '../gm/bitmapscroll.cpp', '../gm/blurs.cpp', + '../gm/complexclip.cpp', + '../gm/complexclip2.cpp', '../gm/filltypes.cpp', + '../gm/gmmain.cpp', '../gm/gradients.cpp', '../gm/lcdtext.cpp', '../gm/nocolorbleed.cpp', '../gm/pathfill.cpp', '../gm/points.cpp', '../gm/poly2poly.cpp', + '../gm/shadertext.cpp', '../gm/shadows.cpp', '../gm/shapes.cpp', '../gm/strokerects.cpp', @@ -27,9 +31,6 @@ '../gm/tilemodes.cpp', '../gm/tinybitmap.cpp', '../gm/xfermodes.cpp', - '../gm/shadertext.cpp', - '../gm/complexclip.cpp', - '../gm/gmmain.cpp', ], 'dependencies': [ 'core.gyp:core', -- cgit v1.2.3 From 14b8f1ca2010335e8d78588a947d12a469e8390d Mon Sep 17 00:00:00 2001 From: "yangsu@google.com" Date: Tue, 30 Aug 2011 14:40:49 +0000 Subject: Switched Mac SampleApp to use Cocoa, removed the seperate CocoaSampleApp, moved dependencies out of experimental git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@2190 2bbb7eff-a529-9590-31e7-b0007b416f81 --- CocoaSampleApp.gyp | 239 --------------------------------------------- SampleApp.gyp | 47 +++++++-- SimpleCocoaApp.gyp | 41 ++++---- core.gyp | 1 - iOSSampleApp.gyp | 278 +++++++++++++++++++++++++++++++++++++++++++++++++++++ utils.gyp | 4 +- views.gyp | 4 +- 7 files changed, 341 insertions(+), 273 deletions(-) delete mode 100644 CocoaSampleApp.gyp create mode 100644 iOSSampleApp.gyp diff --git a/CocoaSampleApp.gyp b/CocoaSampleApp.gyp deleted file mode 100644 index 88f7168..0000000 --- a/CocoaSampleApp.gyp +++ /dev/null @@ -1,239 +0,0 @@ -{ - 'includes': [ - 'common.gypi', - ], - 'targets': [ - { - 'target_name': 'CocoaSampleApp', - 'type': 'executable', - 'mac_bundle' : 1, - 'include_dirs' : [ - '../src/core', # needed to get SkConcaveToTriangle, maybe this should be moved to include dir? - '../gm', # SampleGM.cpp pulls gm.h - '../include/pipe', # To pull in SkGPipe.h for pipe reader/writer - ], - 'sources': [ - # gm files needed for SampleGM.cpp - #'../gm/bitmapfilters.cpp', - #'../gm/blurs.cpp', - #'../gm/complexclip.cpp', - #'../gm/filltypes.cpp', - #'../gm/gm.h', - #'../gm/gradients.cpp', - #'../gm/nocolorbleed.cpp', - #'../gm/points.cpp', - #'../gm/poly2poly.cpp', - #'../gm/shadertext.cpp', - #'../gm/shadows.cpp', - #'../gm/shapes.cpp', - #'../gm/tilemodes.cpp', - #'../gm/xfermodes.cpp', - - #'../samplecode/ClockFaceView.cpp', - '../samplecode/OverView.cpp', - #'../samplecode/Sample2PtRadial.cpp', - #'../samplecode/SampleAll.cpp', - #'../samplecode/SampleAnimator.cpp', - '../samplecode/SampleApp.cpp', - '../samplecode/SampleArc.cpp', - '../samplecode/SampleAvoid.cpp', - #'../samplecode/SampleBigBlur.cpp', - #'../samplecode/SampleBigGradient.cpp', - #'../samplecode/SampleBitmapRect.cpp', - '../samplecode/SampleBlur.cpp', - #'../samplecode/SampleCamera.cpp', - #'../samplecode/SampleCircle.cpp', - '../samplecode/SampleCode.h', - #'../samplecode/SampleColorFilter.cpp', - '../samplecode/SampleComplexClip.cpp', - #'../samplecode/SampleConcavePaths.cpp', - '../samplecode/SampleCull.cpp', - #'../samplecode/SampleDecode.cpp', - '../samplecode/SampleDegenerateTwoPtRadials.cpp', - #'../samplecode/SampleDither.cpp', - #'../samplecode/SampleDitherBitmap.cpp', - #'../samplecode/SampleDrawBitmap.cpp', - #'../samplecode/SampleDrawLooper.cpp', - #'../samplecode/SampleEffects.cpp', - #'../samplecode/SampleEmboss.cpp', - #'../samplecode/SampleEncode.cpp', - #'../samplecode/SampleExtractAlpha.cpp', - '../samplecode/SampleFillType.cpp', - #'../samplecode/SampleFilter.cpp', - #'../samplecode/SampleFilter2.cpp', - #'../samplecode/SampleFontCache.cpp', - '../samplecode/SampleFontScalerTest.cpp', - #'../samplecode/SampleFuzz.cpp', - #'../samplecode/SampleGM.cpp', - #'../samplecode/SampleGradients.cpp', - #'../samplecode/SampleHairline.cpp', - #'../samplecode/SampleImage.cpp', - #'../samplecode/SampleImageDir.cpp', - #'../samplecode/SampleLayerMask.cpp', - #'../samplecode/SampleLayers.cpp', - '../samplecode/SampleLCD.cpp', - '../samplecode/SampleLineClipper.cpp', - #'../samplecode/SampleLines.cpp', - #'../samplecode/SampleMeasure.cpp', - #'../samplecode/SampleMipMap.cpp', - #'../samplecode/SampleMovie.cpp', - #'../samplecode/SampleNinePatch.cpp', - #'../samplecode/SampleOvalTest.cpp', - #'../samplecode/SampleOverflow.cpp', - #'../samplecode/SamplePageFlip.cpp', - #'../samplecode/SamplePatch.cpp', - '../samplecode/SamplePath.cpp', - '../samplecode/SamplePathClip.cpp', - '../samplecode/SamplePathEffects.cpp', - '../samplecode/SamplePicture.cpp', - '../samplecode/SamplePoints.cpp', - '../samplecode/SamplePolyToPoly.cpp', - ##'../samplecode/SampleAARects.cpp', - '../samplecode/SampleRegion.cpp', - #'../samplecode/SampleRepeatTile.cpp', - #'../samplecode/SampleShaders.cpp', - #'../samplecode/SampleShaderText.cpp', - #'../samplecode/SampleShapes.cpp', - #'../samplecode/SampleSkLayer.cpp', - '../samplecode/SampleSlides.cpp', - #'../samplecode/SampleStrokePath.cpp', - #'../samplecode/SampleStrokeText.cpp', - #'../samplecode/SampleTests.cpp', - #'../samplecode/SampleText.cpp', - #'../samplecode/SampleTextAlpha.cpp', - '../samplecode/SampleTextBox.cpp', - '../samplecode/SampleTextEffects.cpp', - '../samplecode/SampleTextOnPath.cpp', - #'../samplecode/SampleTextureDomain.cpp', - #'../samplecode/SampleTiling.cpp', - #'../samplecode/SampleTinyBitmap.cpp', - '../samplecode/SampleTriangles.cpp', - '../samplecode/SampleTypeface.cpp', - '../samplecode/SampleUnitMapper.cpp', - #'../samplecode/SampleVertices.cpp', - #'../samplecode/SampleXfermodes.cpp', - '../samplecode/SampleXfermodesBlur.cpp', - '../samplecode/TransitionView.cpp', - - # Dependencies for the pipe code in SampleApp - '../src/pipe/SkGPipeRead.cpp', - '../src/pipe/SkGPipeWrite.cpp', - - # DrawingBoard - '../experimental/DrawingBoard/SkColorPalette.h', - '../experimental/DrawingBoard/SkColorPalette.cpp', - '../experimental/DrawingBoard/SkNetPipeController.h', - '../experimental/DrawingBoard/SkNetPipeController.cpp', - #'../experimental/DrawingBoard/SampleDrawingClient.cpp', - '../experimental/DrawingBoard/SampleDrawingServer.cpp', - - # Networking - '../experimental/Networking/SampleNetPipeReader.cpp', - '../experimental/Networking/SkSockets.cpp', - '../experimental/Networking/SkSockets.h', - - # Debugger - '../experimental/Debugger/DebuggerViews.h', - '../experimental/Debugger/DebuggerContentView.cpp', - '../experimental/Debugger/DebuggerCommandsView.cpp', - '../experimental/Debugger/DebuggerStateView.cpp', - '../experimental/Debugger/SkDebugDumper.cpp', - '../experimental/Debugger/SkDebugDumper.h', - ], - 'sources!': [ - '../samplecode/SampleSkLayer.cpp', #relies on SkMatrix44 which doesn't compile - '../samplecode/SampleTests.cpp', #includes unknown file SkShaderExtras.h - '../samplecode/SampleWarp.cpp', - '../samplecode/SampleFontCache.cpp', - ], - 'dependencies': [ - 'core.gyp:core', - 'effects.gyp:effects', - 'images.gyp:images', - 'views.gyp:views', - 'utils.gyp:utils', - 'animator.gyp:animator', - 'xml.gyp:xml', - 'svg.gyp:svg', - 'experimental.gyp:experimental', - 'gpu.gyp:gr', - 'gpu.gyp:skgr', - 'pdf.gyp:pdf', - ], - 'conditions' : [ - [ 'skia_os in ["linux", "freebsd", "openbsd", "solaris"]', { - 'sources!': [ - '../samplecode/SampleDecode.cpp', - ], - }], - [ 'skia_os == "win"', { - 'sources!': [ - # require UNIX functions - '../samplecode/SampleEncode.cpp', - '../samplecode/SamplePageFlip.cpp', - ], - }], - [ 'skia_os == "mac"', { - 'defines': [ - # To be removed when SampleApp is ready to move to Cocoa completely - 'Sk_MAC_COCOA', - ], - 'sources!': [ - '../samplecode/SampleDecode.cpp', - ], - 'sources': [ - '../experimental/CocoaSampleApp/main.m', - '../experimental/CocoaSampleApp/SampleApp-Info.plist', - '../experimental/CocoaSampleApp/SampleApp.xib', - '../experimental/CocoaSampleApp/SampleAppDelegate.h', - '../experimental/CocoaSampleApp/SampleAppDelegate.mm', - '../experimental/CocoaSampleApp/SkNSView.h', - '../experimental/CocoaSampleApp/SkNSView.mm', - '../experimental/CocoaSampleApp/SkOptionsTableView.h', - '../experimental/CocoaSampleApp/SkOptionsTableView.mm', - '../experimental/CocoaSampleApp/SkTextFieldCell.h', - '../experimental/CocoaSampleApp/SkTextFieldCell.m', - '../experimental/SkEventNotifier.h', - '../experimental/SkEventNotifier.mm', - - # Cocoa versions of SkOSWindow for Mac - '../include/views/SkOSWindow_Mac_Cocoa.h', - '../src/utils/mac/SkOSWindow_Mac_Cocoa.mm', - ], - 'link_settings': { - 'libraries': [ - '$(SDKROOT)/System/Library/Frameworks/Cocoa.framework', - '$(SDKROOT)/System/Library/Frameworks/Foundation.framework', - '$(SDKROOT)/System/Library/Frameworks/QuartzCore.framework', - '$(SDKROOT)/System/Library/Frameworks/OpenGL.framework', - ], - 'libraries!': [ - '$(SDKROOT)/System/Library/Frameworks/Carbon.framework', - '$(SDKROOT)/System/Library/Frameworks/AGL.framework', - ], - }, - 'xcode_settings' : { - 'INFOPLIST_FILE' : '../experimental/CocoaSampleApp/SampleApp-Info.plist', - }, - 'mac_bundle_resources' : [ - '../experimental/CocoaSampleApp/SampleApp.xib', - ], - }], - ], - 'msvs_settings': { - 'VCLinkerTool': { - 'SubSystem': '2', - 'AdditionalDependencies': [ - 'd3d9.lib', - ], - }, - }, - }, - ], -} - -# Local Variables: -# tab-width:2 -# indent-tabs-mode:nil -# End: -# vim: set expandtab tabstop=2 shiftwidth=2: diff --git a/SampleApp.gyp b/SampleApp.gyp index d51c76c..92d6e74 100644 --- a/SampleApp.gyp +++ b/SampleApp.gyp @@ -121,7 +121,20 @@ '../src/pipe/SkGPipeRead.cpp', '../src/pipe/SkGPipeWrite.cpp', - # Debugger dependencies + # DrawingBoard + #'../experimental/DrawingBoard/SkColorPalette.h', + #'../experimental/DrawingBoard/SkColorPalette.cpp', + #'../experimental/DrawingBoard/SkNetPipeController.h', + #'../experimental/DrawingBoard/SkNetPipeController.cpp', + #'../experimental/DrawingBoard/SampleDrawingClient.cpp', + #'../experimental/DrawingBoard/SampleDrawingServer.cpp', + + # Networking + #'../experimental/Networking/SampleNetPipeReader.cpp', + #'../experimental/Networking/SkSockets.cpp', + #'../experimental/Networking/SkSockets.h', + + # Debugger '../experimental/Debugger/DebuggerViews.h', '../experimental/Debugger/DebuggerContentView.cpp', '../experimental/Debugger/DebuggerCommandsView.cpp', @@ -167,12 +180,34 @@ '../samplecode/SampleDecode.cpp', ], 'sources': [ - '../src/utils/mac/skia_mac.cpp', - '../src/utils/mac/SkOSWindow_Mac.cpp', + # Sample App specific files + '../src/utils/mac/SampleApp-Info.plist', + '../src/utils/mac/SampleAppDelegate.h', + '../src/utils/mac/SampleAppDelegate.mm', + '../src/utils/mac/SkSampleNSView.h', + '../src/utils/mac/SkSampleNSView.mm', + + # Mac files + '../src/utils/mac/SkEventNotifier.h', + '../src/utils/mac/SkEventNotifier.mm', + '../src/utils/mac/skia_mac.mm', + '../src/utils/mac/SkNSView.h', + '../src/utils/mac/SkNSView.mm', + '../src/utils/mac/SkOptionsTableView.h', + '../src/utils/mac/SkOptionsTableView.mm', + '../src/utils/mac/SkOSWindow_Mac.mm', + '../src/utils/mac/SkTextFieldCell.h', + '../src/utils/mac/SkTextFieldCell.m', + ], + 'libraries': [ + '$(SDKROOT)/System/Library/Frameworks/QuartzCore.framework', + '$(SDKROOT)/System/Library/Frameworks/OpenGL.framework', ], - 'dependencies': [ - # Build Cocoa version of SampleApp - 'CocoaSampleApp.gyp:CocoaSampleApp', + 'xcode_settings' : { + 'INFOPLIST_FILE' : '../src/utils/mac/SampleApp-Info.plist', + }, + 'mac_bundle_resources' : [ + '../src/utils/mac/SampleApp.xib', ], }], [ 'skia_os == "ios"', { diff --git a/SimpleCocoaApp.gyp b/SimpleCocoaApp.gyp index 1725f12..ed35d54 100644 --- a/SimpleCocoaApp.gyp +++ b/SimpleCocoaApp.gyp @@ -11,17 +11,21 @@ '../experimental/SimpleCocoaApp/', ], 'sources': [ - '../experimental/SimpleCocoaApp/main.m', - '../experimental/SimpleCocoaApp/SampleWindow.h', - '../experimental/SimpleCocoaApp/SampleWindow.mm', - '../experimental/SimpleCocoaApp/SimpleCocoaAppDelegate.h', - '../experimental/SimpleCocoaApp/SimpleCocoaAppDelegate.mm', - '../experimental/SimpleCocoaApp/SkNSView.h', - '../experimental/SimpleCocoaApp/SkNSView.mm', - '../experimental/SimpleCocoaApp/SkNSWindow.h', - '../experimental/SimpleCocoaApp/SkNSWindow.mm', - '../experimental/SimpleCocoaApp/SimpleCocoaApp-Info.plist', - '../experimental/SimpleCocoaApp/SimpleCocoaApp_Prefix.pch', + '../src/utils/mac/SkEventNotifier.h', + '../src/utils/mac/SkEventNotifier.mm', + '../src/utils/mac/skia_mac.mm', + '../src/utils/mac/SkNSView.h', + '../src/utils/mac/SkNSView.mm', + '../src/utils/mac/SkOptionsTableView.h', + '../src/utils/mac/SkOptionsTableView.mm', + '../src/utils/mac/SkOSWindow_Mac.mm', + '../src/utils/mac/SkTextFieldCell.h', + '../src/utils/mac/SkTextFieldCell.m', + + '../experimental/SimpleCocoaApp/SimpleApp-Info.plist', + '../experimental/SimpleCocoaApp/SimpleApp.h', + '../experimental/SimpleCocoaApp/SimpleApp.mm', + ], 'dependencies': [ 'core.gyp:core', @@ -39,23 +43,14 @@ ], 'link_settings': { 'libraries': [ - '$(SDKROOT)/System/Library/Frameworks/Cocoa.framework', - '$(SDKROOT)/System/Library/Frameworks/AppKit.framework', - ], - 'libraries!': [ - # Currently skia mac apps rely on Carbon and AGL for UI. Future - # apps should use Cocoa instead and dependencies on Carbon and AGL - # should eventually be removed - '$(SDKROOT)/System/Library/Frameworks/Carbon.framework', - '$(SDKROOT)/System/Library/Frameworks/AGL.framework', + '$(SDKROOT)/System/Library/Frameworks/OpenGL.framework', ], }, 'xcode_settings' : { - 'INFOPLIST_FILE' : '../experimental/SimpleCocoaApp/SimpleCocoaApp-Info.plist', + 'INFOPLIST_FILE' : '../experimental/SimpleCocoaApp/SimpleApp-Info.plist', }, 'mac_bundle_resources' : [ - '../experimental/SimpleCocoaApp/English.lproj/InfoPlist.strings', - '../experimental/SimpleCocoaApp/English.lproj/MainMenu.xib', + '../experimental/SimpleCocoaApp/SimpleApp.xib', ], }], ], diff --git a/core.gyp b/core.gyp index aa2a199..389c998 100644 --- a/core.gyp +++ b/core.gyp @@ -293,7 +293,6 @@ ], 'link_settings': { 'libraries': [ - '$(SDKROOT)/System/Library/Frameworks/Carbon.framework', '$(SDKROOT)/System/Library/Frameworks/ApplicationServices.framework', ], }, diff --git a/iOSSampleApp.gyp b/iOSSampleApp.gyp new file mode 100644 index 0000000..63d58b7 --- /dev/null +++ b/iOSSampleApp.gyp @@ -0,0 +1,278 @@ +{ + 'includes': [ + 'target_defaults.gypi', + ], + 'defines!': [ + 'SK_BUILD_FOR_MAC', + ], + 'targets': [ + { + 'target_name': 'iOSSampleApp', + 'type': 'executable', + 'mac_bundle' : 1, + 'include_dirs' : [ + '../src/core', # needed to get SkConcaveToTriangle, maybe this should be moved to include dir? + '../gm', # SampleGM.cpp pulls gm.h + '../include/pipe', # To pull in SkGPipe.h for pipe reader/writer + ], + 'sources': [ + # gm files needed for SampleGM.cpp + '../gm/bitmapfilters.cpp', + '../gm/blurs.cpp', + '../gm/complexclip.cpp', + '../gm/filltypes.cpp', + '../gm/gm.h', + '../gm/gradients.cpp', + '../gm/nocolorbleed.cpp', + '../gm/points.cpp', + '../gm/poly2poly.cpp', + '../gm/shadertext.cpp', + '../gm/shadows.cpp', + '../gm/shapes.cpp', + '../gm/tilemodes.cpp', + '../gm/xfermodes.cpp', + + '../samplecode/ClockFaceView.cpp', + '../samplecode/OverView.cpp', + '../samplecode/Sample2PtRadial.cpp', + '../samplecode/SampleAll.cpp', + '../samplecode/SampleAnimator.cpp', + '../samplecode/SampleApp.cpp', + '../samplecode/SampleArc.cpp', + '../samplecode/SampleAvoid.cpp', + '../samplecode/SampleBigBlur.cpp', + '../samplecode/SampleBigGradient.cpp', + '../samplecode/SampleBitmapRect.cpp', + '../samplecode/SampleBlur.cpp', + '../samplecode/SampleCamera.cpp', + '../samplecode/SampleCircle.cpp', + '../samplecode/SampleCode.h', + '../samplecode/SampleColorFilter.cpp', + '../samplecode/SampleComplexClip.cpp', + '../samplecode/SampleConcavePaths.cpp', + '../samplecode/SampleCull.cpp', + '../samplecode/SampleDecode.cpp', + '../samplecode/SampleDegenerateTwoPtRadials.cpp', + '../samplecode/SampleDither.cpp', + '../samplecode/SampleDitherBitmap.cpp', + '../samplecode/SampleDrawBitmap.cpp', + '../samplecode/SampleDrawLooper.cpp', + '../samplecode/SampleEffects.cpp', + '../samplecode/SampleEmboss.cpp', + '../samplecode/SampleEncode.cpp', + '../samplecode/SampleExtractAlpha.cpp', + '../samplecode/SampleFillType.cpp', + '../samplecode/SampleFilter.cpp', + '../samplecode/SampleFilter2.cpp', + '../samplecode/SampleFontCache.cpp', + '../samplecode/SampleFontScalerTest.cpp', + '../samplecode/SampleFuzz.cpp', + '../samplecode/SampleGM.cpp', + '../samplecode/SampleGradients.cpp', + '../samplecode/SampleHairline.cpp', + '../samplecode/SampleImage.cpp', + '../samplecode/SampleImageDir.cpp', + '../samplecode/SampleLayerMask.cpp', + '../samplecode/SampleLayers.cpp', + '../samplecode/SampleLCD.cpp', + '../samplecode/SampleLineClipper.cpp', + '../samplecode/SampleLines.cpp', + '../samplecode/SampleMeasure.cpp', + '../samplecode/SampleMipMap.cpp', + '../samplecode/SampleMovie.cpp', + '../samplecode/SampleNinePatch.cpp', + '../samplecode/SampleOvalTest.cpp', + '../samplecode/SampleOverflow.cpp', + '../samplecode/SamplePageFlip.cpp', + '../samplecode/SamplePatch.cpp', + '../samplecode/SamplePath.cpp', + '../samplecode/SamplePathClip.cpp', + '../samplecode/SamplePathEffects.cpp', + '../samplecode/SamplePicture.cpp', + '../samplecode/SamplePoints.cpp', + '../samplecode/SamplePolyToPoly.cpp', + '../samplecode/SampleAARects.cpp', + '../samplecode/SampleRegion.cpp', + '../samplecode/SampleRepeatTile.cpp', + '../samplecode/SampleShaders.cpp', + '../samplecode/SampleShaderText.cpp', + '../samplecode/SampleShapes.cpp', + '../samplecode/SampleSkLayer.cpp', + '../samplecode/SampleSlides.cpp', + '../samplecode/SampleStrokePath.cpp', + '../samplecode/SampleStrokeText.cpp', + '../samplecode/SampleTests.cpp', + '../samplecode/SampleText.cpp', + '../samplecode/SampleTextAlpha.cpp', + '../samplecode/SampleTextBox.cpp', + '../samplecode/SampleTextEffects.cpp', + '../samplecode/SampleTextOnPath.cpp', + '../samplecode/SampleTextureDomain.cpp', + '../samplecode/SampleTiling.cpp', + '../samplecode/SampleTinyBitmap.cpp', + '../samplecode/SampleTriangles.cpp', + '../samplecode/SampleTypeface.cpp', + '../samplecode/SampleUnitMapper.cpp', + '../samplecode/SampleVertices.cpp', + '../samplecode/SampleXfermodes.cpp', + '../samplecode/SampleXfermodesBlur.cpp', + + # Dependencies for the pipe code in SampleApp + '../src/pipe/SkGPipeRead.cpp', + '../src/pipe/SkGPipeWrite.cpp', + + # DrawingBoard + '../experimental/DrawingBoard/SkColorPalette.h', + '../experimental/DrawingBoard/SkColorPalette.cpp', + '../experimental/DrawingBoard/SkNetPipeController.h', + '../experimental/DrawingBoard/SkNetPipeController.cpp', + '../experimental/DrawingBoard/SampleDrawingClient.cpp', + '../experimental/DrawingBoard/SampleDrawingServer.cpp', + + # Networking + '../experimental/Networking/SampleNetPipeReader.cpp', + '../experimental/Networking/SkSockets.cpp', + '../experimental/Networking/SkSockets.h', + + # Transition + '../src/utils/SkInterpolator.cpp', + '../include/utils/SkInterpolator.h', + '../samplecode/TransitionView.cpp', + ], + 'sources!': [ + '../samplecode/SampleSkLayer.cpp', #relies on SkMatrix44 which doesn't compile + '../samplecode/SampleTests.cpp', #includes unknown file SkShaderExtras.h + '../samplecode/SampleWarp.cpp', + '../samplecode/SampleFontCache.cpp', + ], + 'dependencies': [ + 'core.gyp:core', + 'effects.gyp:effects', + 'images.gyp:images', + 'views.gyp:views', + 'utils.gyp:utils', + 'animator.gyp:animator', + 'xml.gyp:xml', + 'svg.gyp:svg', + 'experimental.gyp:experimental', + 'gpu.gyp:gr', + 'gpu.gyp:skgr', + 'pdf.gyp:pdf', + ], + 'conditions' : [ + [ 'OS == "linux" or OS == "freebsd" or OS == "openbsd" or OS == "solaris"', { + 'sources!': [ + '../samplecode/SampleDecode.cpp', + ], + }], + [ 'OS == "win"', { + 'sources!': [ + # require UNIX functions + '../samplecode/SampleEncode.cpp', + '../samplecode/SamplePageFlip.cpp', + ], + }], + [ 'OS == "mac"', { + 'sources!': [ + '../samplecode/SampleDecode.cpp', + '../gpu/src/mac/GrGLDefaultInterface_mac.cpp', + ], + 'sources': [ + # Shared resources + '../experimental/SkEventNotifier.h', + '../experimental/SkEventNotifier.mm', + '../experimental/iOSSampleApp/SkiOSSampleApp-Base.xcconfig', + '../experimental/iOSSampleApp/SkiOSSampleApp-Debug.xcconfig', + '../experimental/iOSSampleApp/SkiOSSampleApp-Release.xcconfig', + '../experimental/iOSSampleApp/iOSSampleApp-Info.plist', + '../experimental/iOSSampleApp/iOSSampleApp_Prefix.pch', + '../experimental/iOSSampleApp/Shared/SkOptionListController.h', + '../experimental/iOSSampleApp/Shared/SkOptionListController.mm', + '../experimental/iOSSampleApp/Shared/SkUIRootViewController.h', + '../experimental/iOSSampleApp/Shared/SkUIRootViewController.mm', + '../experimental/iOSSampleApp/Shared/SkOptionsTableViewController.h', + '../experimental/iOSSampleApp/Shared/SkOptionsTableViewController.mm', + '../experimental/iOSSampleApp/Shared/SkUIView.h', + '../experimental/iOSSampleApp/Shared/SkUIView.mm', + '../experimental/iOSSampleApp/Shared/SkUIDetailViewController.h', + '../experimental/iOSSampleApp/Shared/SkUIDetailViewController.mm', + '../experimental/iOSSampleApp/Shared/main.m', + + # iPad + '../experimental/iOSSampleApp/iPad/AppDelegate_iPad.h', + '../experimental/iOSSampleApp/iPad/AppDelegate_iPad.mm', + '../experimental/iOSSampleApp/iPad/SkUISplitViewController.h', + '../experimental/iOSSampleApp/iPad/SkUISplitViewController.mm', + '../experimental/iOSSampleApp/iPad/MainWindow_iPad.xib', + + # iPhone + '../experimental/iOSSampleApp/iPhone/AppDelegate_iPhone.h', + '../experimental/iOSSampleApp/iPhone/AppDelegate_iPhone.mm', + '../experimental/iOSSampleApp/iPhone/SkUINavigationController.h', + '../experimental/iOSSampleApp/iPhone/SkUINavigationController.mm', + '../experimental/iOSSampleApp/iPhone/MainWindow_iPhone.xib', + + '../src/utils/ios/SkOSWindow_iOS.mm', + '../src/utils/ios/SkImageDecoder_iOS.mm', + '../src/utils/ios/SkStream_NSData.mm', + '../src/utils/ios/SkOSFile_iOS.mm', + + '../include/utils/mac/SkCGUtils.h', + '../src/utils/mac/SkCreateCGImageRef.cpp', + '../experimental/iOSSampleApp/SkiOSSampleApp-Debug.xcconfig', + '../experimental/iOSSampleApp/SkiOSSampleApp-Release.xcconfig', + ], + 'link_settings': { + 'libraries': [ + '/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS4.3.sdk/System/Library/Frameworks/CoreFoundation.framework', + '/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS4.3.sdk/System/Library/Frameworks/CoreGraphics.framework', + '/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS4.3.sdk/System/Library/Frameworks/CoreText.framework', + '/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS4.3.sdk/System/Library/Frameworks/UIKit.framework', + '/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS4.3.sdk/System/Library/Frameworks/Foundation.framework', + '/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS4.3.sdk/System/Library/Frameworks/QuartzCore.framework', + '/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS4.3.sdk/System/Library/Frameworks/OpenGLES.framework', + ], + 'libraries!': [ + #remove mac dependencies + '$(SDKROOT)/System/Library/Frameworks/Cocoa.framework', + '$(SDKROOT)/System/Library/Frameworks/Foundation.framework', + '$(SDKROOT)/System/Library/Frameworks/QuartzCore.framework', + '$(SDKROOT)/System/Library/Frameworks/OpenGL.framework', + '$(SDKROOT)/System/Library/Frameworks/ApplicationServices.framework', + ], + }, + 'include_dirs' : [ + '../experimental/iOSSampleApp', + '../experimental/iOSSampleApp/iPad', + '../experimental/iOSSampleApp/iPhone', + '../include/utils/ios', + '../../gpu/include', + ], + #'xcode_settings' : { + # 'INFOPLIST_FILE' : '../experimental/iOSSampleApp/iOSSampleApp-Info.plist', + # 'ARCHS' : 'armv6 armv7', + # 'IPHONEOS_DEPLOYMENT_TARGET' : '4.2', + # 'SDKROOT' : 'iphoneos', + # 'TARGETED_DEVICE_FAMILY' : '1,2', + # 'USER_HEADER_SEARCH_PATHS' : '../../gpu/include/** ../../include/**', + # 'CODE_SIGN_IDENTITY' : 'iPhone Developer', + # 'GCC_PREPROCESSOR_DEFINITIONS' : 'SK_BUILD_FOR_IOS', + # 'GCC_OPTIMIZATION_LEVEL' : '0', + #}, + 'xcode_config_file': '../experimental/iOSSampleApp/SkiOSSampleApp-Base.xcconfig', + 'mac_bundle_resources' : [ + '../experimental/iOSSampleApp/iPad/MainWindow_iPad.xib', + '../experimental/iOSSampleApp/iPhone/MainWindow_iPhone.xib', + ], + }], + + ], + }, + ], +} + +# Local Variables: +# tab-width:2 +# indent-tabs-mode:nil +# End: +# vim: set expandtab tabstop=2 shiftwidth=2: diff --git a/utils.gyp b/utils.gyp index 7f03425..6c53701 100644 --- a/utils.gyp +++ b/utils.gyp @@ -113,8 +113,8 @@ '../include/utils/mac/SkCGUtils.h', '../src/utils/mac/SkCreateCGImageRef.cpp', '../src/utils/mac/SkEGLContext_mac.cpp', - '../src/utils/mac/skia_mac.cpp', - '../src/utils/mac/SkOSWindow_Mac.cpp', + '../src/utils/mac/skia_mac.mm', + '../src/utils/mac/SkOSWindow_Mac.mm', ], }], [ 'skia_os in ["linux", "freebsd", "openbsd", "solaris"]', { diff --git a/views.gyp b/views.gyp index 096a888..6d91c28 100644 --- a/views.gyp +++ b/views.gyp @@ -76,8 +76,8 @@ [ 'skia_os == "mac"', { 'link_settings': { 'libraries': [ - '$(SDKROOT)/System/Library/Frameworks/Carbon.framework', - '$(SDKROOT)/System/Library/Frameworks/AGL.framework', + '$(SDKROOT)/System/Library/Frameworks/Cocoa.framework', + '$(SDKROOT)/System/Library/Frameworks/Foundation.framework', ], }, }], -- cgit v1.2.3 From f2a623784e1c4db825b3431445875f146bf12850 Mon Sep 17 00:00:00 2001 From: "bsalomon@google.com" Date: Tue, 30 Aug 2011 18:13:44 +0000 Subject: Add GrAAHairLinePathRenderer Review URL: http://codereview.appspot.com/4926045 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@2196 2bbb7eff-a529-9590-31e7-b0007b416f81 --- SampleApp.gyp | 3 ++- gpu.gyp | 4 +++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/SampleApp.gyp b/SampleApp.gyp index 92d6e74..a3f4017 100644 --- a/SampleApp.gyp +++ b/SampleApp.gyp @@ -34,6 +34,7 @@ '../samplecode/ClockFaceView.cpp', '../samplecode/OverView.cpp', '../samplecode/Sample2PtRadial.cpp', + '../samplecode/SampleAARects.cpp', '../samplecode/SampleAll.cpp', '../samplecode/SampleAnimator.cpp', '../samplecode/SampleApp.cpp', @@ -68,6 +69,7 @@ '../samplecode/SampleFuzz.cpp', '../samplecode/SampleGM.cpp', '../samplecode/SampleGradients.cpp', + '../samplecode/SampleHairCurves.cpp', '../samplecode/SampleHairline.cpp', '../samplecode/SampleImage.cpp', '../samplecode/SampleImageDir.cpp', @@ -90,7 +92,6 @@ '../samplecode/SamplePicture.cpp', '../samplecode/SamplePoints.cpp', '../samplecode/SamplePolyToPoly.cpp', - '../samplecode/SampleAARects.cpp', '../samplecode/SampleRegion.cpp', '../samplecode/SampleRepeatTile.cpp', '../samplecode/SampleShaders.cpp', diff --git a/gpu.gyp b/gpu.gyp index b7fa1c8..f77add2 100644 --- a/gpu.gyp +++ b/gpu.gyp @@ -126,7 +126,9 @@ '../gpu/include/GrTypes.h', '../gpu/include/GrUserConfig.h', - '../gpu/src/GrAddPathRenderers_none.cpp', + '../gpu/src/GrAAHairlinePathRenderer.cpp', + '../gpu/src/GrAAHairlinePathRenderer.h', + '../gpu/src/GrAddPathRenderers_aahairline.cpp', '../gpu/src/GrAllocPool.cpp', '../gpu/src/GrAtlas.cpp', '../gpu/src/GrBinHashKey.h', -- cgit v1.2.3 From 4436af2ed9d11f305d4ea9c1ac64b4cc60c69444 Mon Sep 17 00:00:00 2001 From: "bsalomon@google.com" Date: Tue, 30 Aug 2011 18:17:35 +0000 Subject: Fix file name in gyp (wasn't caught b/c of windows case insensitivity) git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@2197 2bbb7eff-a529-9590-31e7-b0007b416f81 --- gpu.gyp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gpu.gyp b/gpu.gyp index f77add2..24e8f01 100644 --- a/gpu.gyp +++ b/gpu.gyp @@ -126,8 +126,8 @@ '../gpu/include/GrTypes.h', '../gpu/include/GrUserConfig.h', - '../gpu/src/GrAAHairlinePathRenderer.cpp', - '../gpu/src/GrAAHairlinePathRenderer.h', + '../gpu/src/GrAAHairLinePathRenderer.cpp', + '../gpu/src/GrAAHairLinePathRenderer.h', '../gpu/src/GrAddPathRenderers_aahairline.cpp', '../gpu/src/GrAllocPool.cpp', '../gpu/src/GrAtlas.cpp', -- cgit v1.2.3 From 9bd6ab419dc6b95da8766afd1fa97d0109008cd9 Mon Sep 17 00:00:00 2001 From: "bsalomon@google.com" Date: Fri, 2 Sep 2011 17:28:06 +0000 Subject: Remove unneeded #define Review URL: http://codereview.appspot.com/4973053/ git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@2213 2bbb7eff-a529-9590-31e7-b0007b416f81 --- gpu.gyp | 1 - 1 file changed, 1 deletion(-) diff --git a/gpu.gyp b/gpu.gyp index 24e8f01..ae05baa 100644 --- a/gpu.gyp +++ b/gpu.gyp @@ -208,7 +208,6 @@ ], 'defines': [ 'GR_IMPLEMENTATION=1', - 'GR_USE_PLATFORM_CREATE_SAMPLE_COUNT=1', ], 'conditions': [ [ 'skia_os == "linux"', { -- cgit v1.2.3 From 40de74b465cb13e0aacfcd23a762da8e473a11ac Mon Sep 17 00:00:00 2001 From: "reed@google.com" Date: Tue, 6 Sep 2011 19:23:41 +0000 Subject: add gm test for ninepatch stretching pdf output incorrect, so not checked in. git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@2224 2bbb7eff-a529-9590-31e7-b0007b416f81 --- gm.gyp | 1 + 1 file changed, 1 insertion(+) diff --git a/gm.gyp b/gm.gyp index cebd26f..0c9f145 100644 --- a/gm.gyp +++ b/gm.gyp @@ -18,6 +18,7 @@ '../gm/gmmain.cpp', '../gm/gradients.cpp', '../gm/lcdtext.cpp', + '../gm/ninepatchstretch.cpp', '../gm/nocolorbleed.cpp', '../gm/pathfill.cpp', '../gm/points.cpp', -- cgit v1.2.3 From c173ec3e71b7c2bc90f1b263eb87a2cefee51eba Mon Sep 17 00:00:00 2001 From: "bsalomon@google.com" Date: Tue, 13 Sep 2011 15:27:18 +0000 Subject: Fix some issues in gpu device with perspective. Add a gm that would have caught them. Review URL: http://codereview.appspot.com/4994048/ git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@2256 2bbb7eff-a529-9590-31e7-b0007b416f81 --- gm.gyp | 1 + 1 file changed, 1 insertion(+) diff --git a/gm.gyp b/gm.gyp index 0c9f145..cd4defd 100644 --- a/gm.gyp +++ b/gm.gyp @@ -15,6 +15,7 @@ '../gm/complexclip.cpp', '../gm/complexclip2.cpp', '../gm/filltypes.cpp', + '../gm/filltypespersp.cpp', '../gm/gmmain.cpp', '../gm/gradients.cpp', '../gm/lcdtext.cpp', -- cgit v1.2.3 From 75e865351f8e2012c3b86cc73e2274b8d7d32e54 Mon Sep 17 00:00:00 2001 From: "bsalomon@google.com" Date: Tue, 13 Sep 2011 20:57:33 +0000 Subject: remove nonexistent files from gyps and make AdditionalOptions a list rather than str ReviewURL: http://codereview.appspot.com/5022042/ git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@2262 2bbb7eff-a529-9590-31e7-b0007b416f81 --- common.gypi | 2 +- core.gyp | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/common.gypi b/common.gypi index f1f1e97..64d54ba 100644 --- a/common.gypi +++ b/common.gypi @@ -70,7 +70,7 @@ 'WarningLevel': '1', 'WarnAsError': 'false', 'DebugInformationFormat': '3', - 'AdditionalOptions': '/MP', + 'AdditionalOptions': ['/MP',], }, 'VCLinkerTool': { 'AdditionalDependencies': [ diff --git a/core.gyp b/core.gyp index 389c998..bca65e9 100644 --- a/core.gyp +++ b/core.gyp @@ -133,7 +133,6 @@ '../src/core/SkStrokerPriv.cpp', '../src/core/SkStrokerPriv.h', '../src/core/SkTextFormatParams.h', - '../src/core/SkTLazy.h', '../src/core/SkTSearch.cpp', '../src/core/SkTSort.h', '../src/core/SkTemplatesPriv.h', @@ -141,7 +140,6 @@ '../src/core/SkTypefaceCache.cpp', '../src/core/SkTypefaceCache.h', '../src/core/SkUnPreMultiply.cpp', - '../src/core/SkUserTrace.h', '../src/core/SkUtils.cpp', '../src/core/SkWriter32.cpp', '../src/core/SkXfermode.cpp', -- cgit v1.2.3 From 47f4838de4cc5b8200ef69cffb345c722f0f8dc0 Mon Sep 17 00:00:00 2001 From: "bsalomon@google.com" Date: Wed, 14 Sep 2011 13:54:05 +0000 Subject: GrTArray->SkTArray & docs Review URL: http://codereview.appspot.com/5005045/ git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@2265 2bbb7eff-a529-9590-31e7-b0007b416f81 --- gpu.gyp | 1 - 1 file changed, 1 deletion(-) diff --git a/gpu.gyp b/gpu.gyp index ae05baa..dc113d1 100644 --- a/gpu.gyp +++ b/gpu.gyp @@ -115,7 +115,6 @@ '../gpu/include/GrStencil.h', '../gpu/include/GrStopwatch.h', '../gpu/include/GrStringBuilder.h', - '../gpu/include/GrTArray.h', '../gpu/include/GrTBSearch.h', '../gpu/include/GrTDArray.h', '../gpu/include/GrTextContext.h', -- cgit v1.2.3 From eac08c811813049c8a8afafbcf0fc491f63ea078 Mon Sep 17 00:00:00 2001 From: "seanpaul@google.com" Date: Thu, 15 Sep 2011 14:24:33 +0000 Subject: Refactor the bench and common gyp/gypi files to allow for building bench within a chromium checkout (using chromium build configuration). BUG=362 TEST=Build bench from within the chromium and skia source tree, ensured it built and ran successfully. Review URL: http://codereview.appspot.com/5023042 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@2270 2bbb7eff-a529-9590-31e7-b0007b416f81 --- bench.gyp | 69 +-------------------- bench.gypi | 78 ++++++++++++++++++++++++ common.gypi | 161 +++++++------------------------------------------ common_conditions.gypi | 122 +++++++++++++++++++++++++++++++++++++ common_variables.gypi | 21 +++++++ 5 files changed, 244 insertions(+), 207 deletions(-) create mode 100644 bench.gypi create mode 100644 common_conditions.gypi create mode 100644 common_variables.gypi diff --git a/bench.gyp b/bench.gyp index bae46f8..73472a5 100644 --- a/bench.gyp +++ b/bench.gyp @@ -9,36 +9,8 @@ { 'target_name': 'bench', 'type': 'executable', - 'sources': [ - '../bench/benchmain.cpp', - '../bench/BenchTimer.h', - '../bench/BenchTimer.cpp', - '../bench/BenchSysTimer_mach.h', - '../bench/BenchSysTimer_mach.cpp', - '../bench/BenchSysTimer_posix.h', - '../bench/BenchSysTimer_posix.cpp', - '../bench/BenchSysTimer_windows.h', - '../bench/BenchSysTimer_windows.cpp', - '../bench/BenchGpuTimer_gl.h', - '../bench/BenchGpuTimer_gl.cpp', - '../bench/BenchGpuTimer_none.h', - '../bench/BenchGpuTimer_none.cpp', - - '../bench/SkBenchmark.h', - '../bench/SkBenchmark.cpp', - - '../bench/BitmapBench.cpp', - '../bench/BlurBench.cpp', - '../bench/DecodeBench.cpp', - '../bench/FPSBench.cpp', - '../bench/GradientBench.cpp', - '../bench/MathBench.cpp', - '../bench/MatrixBench.cpp', - '../bench/PathBench.cpp', - '../bench/RectBench.cpp', - '../bench/RepeatTileBench.cpp', - '../bench/ScalarBench.cpp', - '../bench/TextBench.cpp', + 'includes': [ + 'bench.gypi' ], 'dependencies': [ 'core.gyp:core', @@ -48,43 +20,6 @@ 'images.gyp:images', 'utils.gyp:utils', ], - 'conditions': [ - [ 'skia_os != "mac"', { - 'sources!': [ - '../bench/BenchSysTimer_mach.h', - '../bench/BenchSysTimer_mach.cpp', - ], - }], - [ 'skia_os not in ["linux", "freebsd", "openbsd", "solaris"]', { - 'sources!': [ - '../bench/BenchSysTimer_posix.h', - '../bench/BenchSysTimer_posix.cpp', - ], - },{ - 'link_settings': { - 'libraries': [ - '-lrt', - ], - }, - }], - [ 'skia_os != "win"', { - 'sources!': [ - '../bench/BenchSysTimer_windows.h', - '../bench/BenchSysTimer_windows.cpp', - ], - }], - [ 'skia_os in ["win", "mac", "linux", "freebsd", "openbsd", "solaris"]', { - 'sources!': [ - '../bench/BenchGpuTimer_none.h', - '../bench/BenchGpuTimer_none.cpp', - ], - },{ - 'sources!': [ - '../bench/BenchGpuTimer_gl.h', - '../bench/BenchGpuTimer_gl.cpp', - ], - }], - ], }, ], } diff --git a/bench.gypi b/bench.gypi new file mode 100644 index 0000000..e84b6ba --- /dev/null +++ b/bench.gypi @@ -0,0 +1,78 @@ +# sources and conditions used in skia's bench.gyp and chromium's skia.gyp +# +{ + 'sources': [ + '../bench/benchmain.cpp', + '../bench/BenchTimer.h', + '../bench/BenchTimer.cpp', + '../bench/BenchSysTimer_mach.h', + '../bench/BenchSysTimer_mach.cpp', + '../bench/BenchSysTimer_posix.h', + '../bench/BenchSysTimer_posix.cpp', + '../bench/BenchSysTimer_windows.h', + '../bench/BenchSysTimer_windows.cpp', + '../bench/BenchGpuTimer_gl.h', + '../bench/BenchGpuTimer_gl.cpp', + '../bench/BenchGpuTimer_none.h', + '../bench/BenchGpuTimer_none.cpp', + + '../bench/SkBenchmark.h', + '../bench/SkBenchmark.cpp', + + '../bench/BitmapBench.cpp', + '../bench/BlurBench.cpp', + '../bench/DecodeBench.cpp', + '../bench/FPSBench.cpp', + '../bench/GradientBench.cpp', + '../bench/MathBench.cpp', + '../bench/MatrixBench.cpp', + '../bench/PathBench.cpp', + '../bench/RectBench.cpp', + '../bench/RepeatTileBench.cpp', + '../bench/ScalarBench.cpp', + '../bench/TextBench.cpp', + ], + 'conditions': [ + [ 'skia_os != "mac"', { + 'sources!': [ + '../bench/BenchSysTimer_mach.h', + '../bench/BenchSysTimer_mach.cpp', + ], + }], + [ 'skia_os not in ["linux", "freebsd", "openbsd", "solaris"]', { + 'sources!': [ + '../bench/BenchSysTimer_posix.h', + '../bench/BenchSysTimer_posix.cpp', + ], + },{ + 'link_settings': { + 'libraries': [ + '-lrt', + ], + }, + }], + [ 'skia_os != "win"', { + 'sources!': [ + '../bench/BenchSysTimer_windows.h', + '../bench/BenchSysTimer_windows.cpp', + ], + }], + [ 'skia_os in ["win", "mac", "linux", "freebsd", "openbsd", "solaris"]', { + 'sources!': [ + '../bench/BenchGpuTimer_none.h', + '../bench/BenchGpuTimer_none.cpp', + ], + },{ + 'sources!': [ + '../bench/BenchGpuTimer_gl.h', + '../bench/BenchGpuTimer_gl.cpp', + ], + }], + ], +} + +# Local Variables: +# tab-width:2 +# indent-tabs-mode:nil +# End: +# vim: set expandtab tabstop=2 shiftwidth=2: diff --git a/common.gypi b/common.gypi index 64d54ba..51d68e8 100644 --- a/common.gypi +++ b/common.gypi @@ -3,18 +3,9 @@ # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. { - # Define all variables, allowing for override in GYP_DEFINES. - # - # One such variable is 'skia_os', which we use instead of 'OS' throughout - # our gyp files. We set it automatically based on 'OS', but allow the - # user to override it via GYP_DEFINES if they like. - 'variables': { - 'skia_scalar%': 'float', - 'skia_os%': '<(OS)', - }, - 'skia_scalar%': '<(skia_scalar)', - 'skia_os': '<(skia_os)', - + 'includes': [ + 'common_variables.gypi', + ], 'target_defaults': { # Validate the 'skia_os' setting against 'OS', because only certain @@ -26,7 +17,24 @@ {'error': ' Date: Fri, 16 Sep 2011 15:47:33 +0000 Subject: Change AdditionalOptions to a list from a string. This fixes compilation errors when building bench within chrome. BUG=363 TEST=Build bench through a chrome checkout on windows Review URL: http://codereview.appspot.com/5045042 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@2275 2bbb7eff-a529-9590-31e7-b0007b416f81 --- common_conditions.gypi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common_conditions.gypi b/common_conditions.gypi index 2a49556..add8a62 100644 --- a/common_conditions.gypi +++ b/common_conditions.gypi @@ -15,7 +15,7 @@ 'WarningLevel': '1', 'WarnAsError': 'false', 'DebugInformationFormat': '3', - 'AdditionalOptions': '/MP', + 'AdditionalOptions': [ '/MP' ], }, 'VCLinkerTool': { 'AdditionalDependencies': [ -- cgit v1.2.3 From 3e785b7e35e5709c758d729321f3df10219a82b3 Mon Sep 17 00:00:00 2001 From: "reed@google.com" Date: Mon, 19 Sep 2011 19:01:38 +0000 Subject: add gm test for drawing hairlines (and varying thin lines) in xfermodes add --nopdf option to gm app git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@2281 2bbb7eff-a529-9590-31e7-b0007b416f81 --- SampleApp.gyp | 1 + gm.gyp | 1 + 2 files changed, 2 insertions(+) diff --git a/SampleApp.gyp b/SampleApp.gyp index a3f4017..fd84893 100644 --- a/SampleApp.gyp +++ b/SampleApp.gyp @@ -71,6 +71,7 @@ '../samplecode/SampleGradients.cpp', '../samplecode/SampleHairCurves.cpp', '../samplecode/SampleHairline.cpp', + '../samplecode/SampleHairModes.cpp', '../samplecode/SampleImage.cpp', '../samplecode/SampleImageDir.cpp', '../samplecode/SampleLayerMask.cpp', diff --git a/gm.gyp b/gm.gyp index cd4defd..f0aeb64 100644 --- a/gm.gyp +++ b/gm.gyp @@ -18,6 +18,7 @@ '../gm/filltypespersp.cpp', '../gm/gmmain.cpp', '../gm/gradients.cpp', + '../gm/hairmodes.cpp', '../gm/lcdtext.cpp', '../gm/ninepatchstretch.cpp', '../gm/nocolorbleed.cpp', -- cgit v1.2.3 From 6a50c7a519c3b441c5fe072c3957b0dd44821151 Mon Sep 17 00:00:00 2001 From: "bsalomon@google.com" Date: Mon, 19 Sep 2011 19:43:36 +0000 Subject: Add missing header SkTArray.h to core.gyp git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@2285 2bbb7eff-a529-9590-31e7-b0007b416f81 --- core.gyp | 1 + 1 file changed, 1 insertion(+) diff --git a/core.gyp b/core.gyp index bca65e9..8f529cd 100644 --- a/core.gyp +++ b/core.gyp @@ -227,6 +227,7 @@ '../include/core/SkStream.h', '../include/core/SkString.h', '../include/core/SkStroke.h', + '../include/core/SkTArray.h', '../include/core/SkTDArray.h', '../include/core/SkTDStack.h', '../include/core/SkTDict.h', -- cgit v1.2.3 From 7023555365a380d9ebf7bd87c86cbdec6ac444aa Mon Sep 17 00:00:00 2001 From: "bsalomon@google.com" Date: Tue, 20 Sep 2011 17:33:24 +0000 Subject: [GPU] Use new Var type for inputs/outputs of FS and VS Review URL: http://codereview.appspot.com/5056048/ git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@2289 2bbb7eff-a529-9590-31e7-b0007b416f81 --- gpu.gyp | 1 + 1 file changed, 1 insertion(+) diff --git a/gpu.gyp b/gpu.gyp index dc113d1..2b94240 100644 --- a/gpu.gyp +++ b/gpu.gyp @@ -149,6 +149,7 @@ '../gpu/src/GrGLProgram.h', '../gpu/src/GrGLRenderTarget.cpp', '../gpu/src/GrGLRenderTarget.h', + '../gpu/src/GrGLShaderVar.h', '../gpu/src/GrGLStencilBuffer.cpp', '../gpu/src/GrGLStencilBuffer.h', '../gpu/src/GrGLTexture.cpp', -- cgit v1.2.3 From 9d038056c8d50a28cf0f1cb6744cf301ae8f2dcd Mon Sep 17 00:00:00 2001 From: "bsalomon@google.com" Date: Tue, 20 Sep 2011 17:57:44 +0000 Subject: Revert 2289. GLSL version detection not robust enough. May think we don't have GLSL 1.50 support based on OpenGL version. We have to look at the available extensions, not just GL version. git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@2290 2bbb7eff-a529-9590-31e7-b0007b416f81 --- gpu.gyp | 1 - 1 file changed, 1 deletion(-) diff --git a/gpu.gyp b/gpu.gyp index 2b94240..dc113d1 100644 --- a/gpu.gyp +++ b/gpu.gyp @@ -149,7 +149,6 @@ '../gpu/src/GrGLProgram.h', '../gpu/src/GrGLRenderTarget.cpp', '../gpu/src/GrGLRenderTarget.h', - '../gpu/src/GrGLShaderVar.h', '../gpu/src/GrGLStencilBuffer.cpp', '../gpu/src/GrGLStencilBuffer.h', '../gpu/src/GrGLTexture.cpp', -- cgit v1.2.3 From 8f0d645d0b7a58c2a94ad7c37962fe403cb92634 Mon Sep 17 00:00:00 2001 From: "bsalomon@google.com" Date: Tue, 20 Sep 2011 19:06:12 +0000 Subject: Resubmit 2289 with fix for glsl version git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@2291 2bbb7eff-a529-9590-31e7-b0007b416f81 --- gpu.gyp | 1 + 1 file changed, 1 insertion(+) diff --git a/gpu.gyp b/gpu.gyp index dc113d1..2b94240 100644 --- a/gpu.gyp +++ b/gpu.gyp @@ -149,6 +149,7 @@ '../gpu/src/GrGLProgram.h', '../gpu/src/GrGLRenderTarget.cpp', '../gpu/src/GrGLRenderTarget.h', + '../gpu/src/GrGLShaderVar.h', '../gpu/src/GrGLStencilBuffer.cpp', '../gpu/src/GrGLStencilBuffer.h', '../gpu/src/GrGLTexture.cpp', -- cgit v1.2.3 From 6980c6bc981f7eb6652b04298143dd377b2f0540 Mon Sep 17 00:00:00 2001 From: "bsalomon@google.com" Date: Wed, 28 Sep 2011 14:32:01 +0000 Subject: Set window build flags (warn level 4, release optimization options, pdbs in release builds) Review URL: http://codereview.appspot.com/5142050/ git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@2346 2bbb7eff-a529-9590-31e7-b0007b416f81 --- common_conditions.gypi | 27 +++++++++++++++++++++------ 1 file changed, 21 insertions(+), 6 deletions(-) diff --git a/common_conditions.gypi b/common_conditions.gypi index add8a62..9ea490e 100644 --- a/common_conditions.gypi +++ b/common_conditions.gypi @@ -8,6 +8,7 @@ 'defines': [ 'SK_BUILD_FOR_WIN32', 'SK_IGNORE_STDINT_DOT_H', + '_CRT_SECURE_NO_WARNINGS', ], 'msvs_cygwin_shell': 0, 'msvs_settings': { @@ -28,26 +29,40 @@ 'Debug': { 'msvs_settings': { 'VCCLCompilerTool': { - 'DebugInformationFormat': '1', # debugOldStyleInfo (/Z7) + 'DebugInformationFormat': '4', # editAndContiue (/ZI) + 'ProgramDataBaseFileName': '$(OutDir)$(ProjectName).pdb', 'Optimization': '0', # optimizeDisabled (/Od) 'PreprocessorDefinitions': ['_DEBUG'], 'RuntimeLibrary': '3', # rtMultiThreadedDebugDLL (/MDd) + 'ExceptionHandling': '0', + 'RuntimeTypeInfo': 'false', # /GR- + 'WarningLevel': '3', # level3 (/W3) }, 'VCLinkerTool': { - 'GenerateDebugInformation': 'true', + 'GenerateDebugInformation': 'true', # /DEBUG + 'LinkIncremental': '2', # /INCREMENTAL }, }, }, 'Release': { 'msvs_settings': { 'VCCLCompilerTool': { - 'DebugInformationFormat': '0', # debugDisabled - 'Optimization': '2', # optimizeMaxSpeed (/O2) + 'DebugInformationFormat': '3', # programDatabase (/Zi) + 'ProgramDataBaseFileName': '$(OutDir)$(ProjectName).pdb', + 'Optimization': '3', # full (/Ox) + 'WholeProgramOptimization': 'true', #/GL + # Changing the floating point model requires rebaseling gm images + #'FloatingPointModel': '2', # fast (/fp:fast) + 'FavorSizeOrSpeed': '1', # speed (/Ot) 'PreprocessorDefinitions': ['NDEBUG'], - 'RuntimeLibrary': '2', # rtMultiThreadedDLL (/MD) + 'RuntimeLibrary': '2', # rtMultiThreadedDLL (/MD) + 'ExceptionHandling': '0', + 'RuntimeTypeInfo': 'false', # /GR- + 'WarningLevel': '3', # level3 (/W3) }, 'VCLinkerTool': { - 'GenerateDebugInformation': 'false', + 'GenerateDebugInformation': 'true', # /DEBUG + 'LinkTimeCodeGeneration': '1', # useLinkTimeCodeGeneration /LTCG }, }, }, -- cgit v1.2.3 From 5c61076cfdae1ac80cfd37af981b558f71c1f1ac Mon Sep 17 00:00:00 2001 From: "bungeman@google.com" Date: Mon, 3 Oct 2011 19:36:51 +0000 Subject: Roll gyp and add librarian settings (now supported). http://codereview.appspot.com/5169048/ git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@2397 2bbb7eff-a529-9590-31e7-b0007b416f81 --- common_conditions.gypi | 3 +++ 1 file changed, 3 insertions(+) diff --git a/common_conditions.gypi b/common_conditions.gypi index 9ea490e..e2accd7 100644 --- a/common_conditions.gypi +++ b/common_conditions.gypi @@ -64,6 +64,9 @@ 'GenerateDebugInformation': 'true', # /DEBUG 'LinkTimeCodeGeneration': '1', # useLinkTimeCodeGeneration /LTCG }, + 'VCLibrarianTool': { + 'LinkTimeCodeGeneration': 'true', # useLinkTimeCodeGeneration /LTCG + }, }, }, }, -- cgit v1.2.3 From aca0a32dfbe23d037edd45bc1e6fc90d3f9bdcb7 Mon Sep 17 00:00:00 2001 From: "bungeman@google.com" Date: Mon, 3 Oct 2011 20:15:13 +0000 Subject: Update common_conditions to make sure there is a slash in VS2008. http://codereview.appspot.com/5172047/ git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@2398 2bbb7eff-a529-9590-31e7-b0007b416f81 --- common_conditions.gypi | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/common_conditions.gypi b/common_conditions.gypi index e2accd7..40649f1 100644 --- a/common_conditions.gypi +++ b/common_conditions.gypi @@ -30,7 +30,7 @@ 'msvs_settings': { 'VCCLCompilerTool': { 'DebugInformationFormat': '4', # editAndContiue (/ZI) - 'ProgramDataBaseFileName': '$(OutDir)$(ProjectName).pdb', + 'ProgramDataBaseFileName': '$(OutDir)\\$(ProjectName).pdb', 'Optimization': '0', # optimizeDisabled (/Od) 'PreprocessorDefinitions': ['_DEBUG'], 'RuntimeLibrary': '3', # rtMultiThreadedDebugDLL (/MDd) @@ -48,7 +48,7 @@ 'msvs_settings': { 'VCCLCompilerTool': { 'DebugInformationFormat': '3', # programDatabase (/Zi) - 'ProgramDataBaseFileName': '$(OutDir)$(ProjectName).pdb', + 'ProgramDataBaseFileName': '$(OutDir)\\$(ProjectName).pdb', 'Optimization': '3', # full (/Ox) 'WholeProgramOptimization': 'true', #/GL # Changing the floating point model requires rebaseling gm images -- cgit v1.2.3 From 6e80a8f67f92355157bea71944b41c1e4eaaee4d Mon Sep 17 00:00:00 2001 From: "bsalomon@google.com" Date: Tue, 4 Oct 2011 21:03:41 +0000 Subject: Remove nonexistant header from gyp file Review URL: http://codereview.appspot.com/5179046/ git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@2408 2bbb7eff-a529-9590-31e7-b0007b416f81 --- gpu.gyp | 1 - 1 file changed, 1 deletion(-) diff --git a/gpu.gyp b/gpu.gyp index 2b94240..14b7027 100644 --- a/gpu.gyp +++ b/gpu.gyp @@ -16,7 +16,6 @@ 'sources': [ '../include/gpu/SkGpuCanvas.h', '../include/gpu/SkGpuDevice.h', - '../include/gpu/SkGpuDeviceFactory.h', '../include/gpu/SkGr.h', '../include/gpu/SkGrTexturePixelRef.h', -- cgit v1.2.3 From 83ebb3020775a02fcfafe682e913fd042809919d Mon Sep 17 00:00:00 2001 From: "bsalomon@google.com" Date: Wed, 5 Oct 2011 19:57:55 +0000 Subject: Fixup rendering of empty paths (including inverted fills) Add GM and Sample that draw empty paths with various styles and fills Review URL: http://codereview.appspot.com/5185047/ git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@2414 2bbb7eff-a529-9590-31e7-b0007b416f81 --- SampleApp.gyp | 1 + gm.gyp | 1 + 2 files changed, 2 insertions(+) diff --git a/SampleApp.gyp b/SampleApp.gyp index fd84893..dfd1e4c 100644 --- a/SampleApp.gyp +++ b/SampleApp.gyp @@ -59,6 +59,7 @@ '../samplecode/SampleDrawLooper.cpp', '../samplecode/SampleEffects.cpp', '../samplecode/SampleEmboss.cpp', + '../samplecode/SampleEmptyPath.cpp', '../samplecode/SampleEncode.cpp', '../samplecode/SampleExtractAlpha.cpp', '../samplecode/SampleFillType.cpp', diff --git a/gm.gyp b/gm.gyp index f0aeb64..6226546 100644 --- a/gm.gyp +++ b/gm.gyp @@ -14,6 +14,7 @@ '../gm/blurs.cpp', '../gm/complexclip.cpp', '../gm/complexclip2.cpp', + '../gm/emptypath.cpp', '../gm/filltypes.cpp', '../gm/filltypespersp.cpp', '../gm/gmmain.cpp', -- cgit v1.2.3 From 2ab9c8452da86afb5a8a06d628c78bb38d047149 Mon Sep 17 00:00:00 2001 From: "bungeman@google.com" Date: Mon, 10 Oct 2011 13:19:10 +0000 Subject: Add xps device to skia. http://codereview.appspot.com/5076041/ git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@2437 2bbb7eff-a529-9590-31e7-b0007b416f81 --- gm.gyp | 1 + utils.gyp | 4 ++++ xps.gyp | 67 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 72 insertions(+) create mode 100644 xps.gyp diff --git a/gm.gyp b/gm.gyp index 6226546..716e056 100644 --- a/gm.gyp +++ b/gm.gyp @@ -44,6 +44,7 @@ 'images.gyp:images', 'pdf.gyp:pdf', 'utils.gyp:utils', + 'xps.gyp:xps', ], }, ], diff --git a/utils.gyp b/utils.gyp index 6c53701..73a80eb 100644 --- a/utils.gyp +++ b/utils.gyp @@ -78,11 +78,13 @@ #windows '../include/utils/win/SkAutoCoInitialize.h', + '../include/utils/win/SkHRESULT.h', '../include/utils/win/SkIStream.h', '../include/utils/win/SkTScopedComPtr.h', '../src/utils/win/SkAutoCoInitialize.cpp', '../src/utils/win/skia_win.cpp', '../src/utils/win/SkEGLContext_Win.cpp', + '../src/utils/win/SkHRESULT.cpp', '../src/utils/win/SkIStream.cpp', '../src/utils/win/SkOSWindow_Win.cpp', ], @@ -152,11 +154,13 @@ ], 'sources!': [ '../include/utils/win/SkAutoCoInitialize.h', + '../include/utils/win/SkHRESULT.h', '../include/utils/win/SkIStream.h', '../include/utils/win/SkTScopedComPtr.h', '../src/utils/win/SkAutoCoInitialize.cpp', '../src/utils/win/skia_win.cpp', '../src/utils/win/SkEGLContext_Win.cpp', + '../src/utils/win/SkHRESULT.cpp', '../src/utils/win/SkIStream.cpp', '../src/utils/win/SkOSWindow_Win.cpp', ], diff --git a/xps.gyp b/xps.gyp new file mode 100644 index 0000000..ff68d6f --- /dev/null +++ b/xps.gyp @@ -0,0 +1,67 @@ +{ + 'includes': [ + 'common.gypi', + ], + 'targets': [ + { + 'target_name': 'xps', + 'type': 'static_library', + 'dependencies': [ + 'core.gyp:core', + 'images.gyp:images', + 'utils.gyp:utils', + 'pdf.gyp:pdf', # needed to get SkBitSet + ], + 'include_dirs': [ + '../include/device/xps', + '../include/utils/win', + '../src/core', # needed to get SkGlyphCache.h + ], + 'sources': [ + '../include/device/xps/SkConstexprMath.h', + '../include/device/xps/SkXPSDevice.h', + + '../src/device/xps/SkXPSDevice.cpp', + ], + 'conditions': [ + [ 'skia_os == "win"', { + 'link_settings': { + 'libraries': [ + 'T2Embed.lib', + 'FontSub.lib', + ], + }, + },{ #else if 'skia_os != "win"' + 'include_dirs!': [ + '../include/utils/win', + ], + 'sources!': [ + '../include/device/xps/SkXPSDevice.h', + + '../src/device/xps/SkXPSDevice.cpp', + ], + }], + ], + # This section makes all targets that depend on this target + # #define SK_SUPPORT_XPS and have access to the xps header files. + 'direct_dependent_settings': { + 'conditions': [ + [ 'skia_os == "win"', { + 'defines': [ + 'SK_SUPPORT_XPS', + ], + }], + ], + 'include_dirs': [ + '../include/device/xps', + ], + }, + }, + ], +} + +# Local Variables: +# tab-width:2 +# indent-tabs-mode:nil +# End: +# vim: set expandtab tabstop=2 shiftwidth=2: -- cgit v1.2.3 From cda7f641f6665a8d2fe21eb365ab60c3959e2e05 Mon Sep 17 00:00:00 2001 From: "bungeman@google.com" Date: Mon, 10 Oct 2011 13:47:06 +0000 Subject: Mac does not like empty projects. git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@2438 2bbb7eff-a529-9590-31e7-b0007b416f81 --- gm.gyp | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/gm.gyp b/gm.gyp index 716e056..fc43221 100644 --- a/gm.gyp +++ b/gm.gyp @@ -43,9 +43,16 @@ 'gpu.gyp:skgr', 'images.gyp:images', 'pdf.gyp:pdf', - 'utils.gyp:utils', - 'xps.gyp:xps', + 'utils.gyp:utils', ], + #mac does not like empty dependency. + 'conditions': [ + [ 'skia_os == "win"', { + 'dependencies': [ + 'xps.gyp:xps', + ], + }], + ], }, ], } -- cgit v1.2.3 From 81b5e51c25145ef4bf7327021c894b59db0ea479 Mon Sep 17 00:00:00 2001 From: "bsalomon@google.com" Date: Mon, 10 Oct 2011 14:08:47 +0000 Subject: Add per-vertex coverage field, use in AA rects when alpha tweak is not valid, add relevant sample/gm Review URL: http://codereview.appspot.com/5181044/ git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@2440 2bbb7eff-a529-9590-31e7-b0007b416f81 --- SampleApp.gyp | 1 + gm.gyp | 1 + 2 files changed, 2 insertions(+) diff --git a/SampleApp.gyp b/SampleApp.gyp index dfd1e4c..a3ffd65 100644 --- a/SampleApp.gyp +++ b/SampleApp.gyp @@ -35,6 +35,7 @@ '../samplecode/OverView.cpp', '../samplecode/Sample2PtRadial.cpp', '../samplecode/SampleAARects.cpp', + '../samplecode/SampleAARectModes.cpp', '../samplecode/SampleAll.cpp', '../samplecode/SampleAnimator.cpp', '../samplecode/SampleApp.cpp', diff --git a/gm.gyp b/gm.gyp index fc43221..575cb8d 100644 --- a/gm.gyp +++ b/gm.gyp @@ -9,6 +9,7 @@ 'target_name': 'gm', 'type': 'executable', 'sources': [ + '../gm/aarectmodes.cpp', '../gm/bitmapfilters.cpp', '../gm/bitmapscroll.cpp', '../gm/blurs.cpp', -- cgit v1.2.3 From e9b195ed9d569e304e6edbf873a56142cfbd755e Mon Sep 17 00:00:00 2001 From: "reed@google.com" Date: Mon, 10 Oct 2011 14:19:40 +0000 Subject: explicitly set opt level for mac-release delete obsolete FPS bench git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@2442 2bbb7eff-a529-9590-31e7-b0007b416f81 --- bench.gypi | 1 - common_conditions.gypi | 5 +++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/bench.gypi b/bench.gypi index e84b6ba..3b79380 100644 --- a/bench.gypi +++ b/bench.gypi @@ -22,7 +22,6 @@ '../bench/BitmapBench.cpp', '../bench/BlurBench.cpp', '../bench/DecodeBench.cpp', - '../bench/FPSBench.cpp', '../bench/GradientBench.cpp', '../bench/MathBench.cpp', '../bench/MatrixBench.cpp', diff --git a/common_conditions.gypi b/common_conditions.gypi index 40649f1..19fad9e 100644 --- a/common_conditions.gypi +++ b/common_conditions.gypi @@ -105,6 +105,11 @@ 'GCC_OPTIMIZATION_LEVEL': '0', }, }, + 'Release': { + 'xcode_settings': { + 'GCC_OPTIMIZATION_LEVEL': '3', + }, + }, }, 'xcode_settings': { 'SYMROOT': '<(DEPTH)/xcodebuild', -- cgit v1.2.3 From 5ed623f514333156c3083512f6ad3a1390a67066 Mon Sep 17 00:00:00 2001 From: "reed@google.com" Date: Mon, 10 Oct 2011 15:42:36 +0000 Subject: add sample for clipping git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@2446 2bbb7eff-a529-9590-31e7-b0007b416f81 --- SampleApp.gyp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/SampleApp.gyp b/SampleApp.gyp index a3ffd65..f49499a 100644 --- a/SampleApp.gyp +++ b/SampleApp.gyp @@ -34,6 +34,8 @@ '../samplecode/ClockFaceView.cpp', '../samplecode/OverView.cpp', '../samplecode/Sample2PtRadial.cpp', + '../samplecode/SampleAAClip.cpp', + '../samplecode/SampleAAClip2.cpp', '../samplecode/SampleAARects.cpp', '../samplecode/SampleAARectModes.cpp', '../samplecode/SampleAll.cpp', @@ -47,6 +49,7 @@ '../samplecode/SampleBlur.cpp', '../samplecode/SampleCamera.cpp', '../samplecode/SampleCircle.cpp', + '../samplecode/SampleClip.cpp', '../samplecode/SampleCode.h', '../samplecode/SampleColorFilter.cpp', '../samplecode/SampleComplexClip.cpp', -- cgit v1.2.3 From 8813ca351a249206dc4c1d51e1effa7b6db7992e Mon Sep 17 00:00:00 2001 From: "reed@google.com" Date: Mon, 10 Oct 2011 16:04:26 +0000 Subject: add SkAAClip.cpp git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@2447 2bbb7eff-a529-9590-31e7-b0007b416f81 --- core.gyp | 1 + 1 file changed, 1 insertion(+) diff --git a/core.gyp b/core.gyp index 8f529cd..cfb1bfa 100644 --- a/core.gyp +++ b/core.gyp @@ -11,6 +11,7 @@ 'sources': [ '../src/core/ARGB32_Clamp_Bilinear_BitmapShader.h', '../src/core/Sk64.cpp', + '../src/core/SkAAClip.cpp', '../src/core/SkAdvancedTypefaceMetrics.cpp', '../src/core/SkAlphaRuns.cpp', '../src/core/SkAntiRun.h', -- cgit v1.2.3 From 149e7bf20a38c3b9b8c62a092cb735510ebacc18 Mon Sep 17 00:00:00 2001 From: suyang1 Date: Mon, 10 Oct 2011 16:38:58 +0000 Subject: Bug fixes: - Mac SampleApp resize and maximize bug - Mac SampleApp now accepts/dispatches mouse moved events - SampleAnimator: moved drawColor outside so the sample draws a background every drawing call - Removed SampleExtractAlpha from the repository and SampleApp.gyp http://codereview.appspot.com/5249054/ git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@2448 2bbb7eff-a529-9590-31e7-b0007b416f81 --- SampleApp.gyp | 1 - 1 file changed, 1 deletion(-) diff --git a/SampleApp.gyp b/SampleApp.gyp index f49499a..0b2e4ca 100644 --- a/SampleApp.gyp +++ b/SampleApp.gyp @@ -65,7 +65,6 @@ '../samplecode/SampleEmboss.cpp', '../samplecode/SampleEmptyPath.cpp', '../samplecode/SampleEncode.cpp', - '../samplecode/SampleExtractAlpha.cpp', '../samplecode/SampleFillType.cpp', '../samplecode/SampleFilter.cpp', '../samplecode/SampleFilter2.cpp', -- cgit v1.2.3 From 451e582f06d81f008a014c9736d1741c5eb4128f Mon Sep 17 00:00:00 2001 From: "reed@google.com" Date: Tue, 11 Oct 2011 18:00:20 +0000 Subject: add SkRasterClip git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@2456 2bbb7eff-a529-9590-31e7-b0007b416f81 --- core.gyp | 1 + 1 file changed, 1 insertion(+) diff --git a/core.gyp b/core.gyp index cfb1bfa..069a397 100644 --- a/core.gyp +++ b/core.gyp @@ -107,6 +107,7 @@ '../src/core/SkPtrRecorder.cpp', '../src/core/SkQuadClipper.cpp', '../src/core/SkQuadClipper.h', + '../src/core/SkRasterClip.cpp', '../src/core/SkRasterizer.cpp', '../src/core/SkRect.cpp', '../src/core/SkRefDict.cpp', -- cgit v1.2.3 From f87d5aeb219b5f3a319a3458a1032d7a12efb7b9 Mon Sep 17 00:00:00 2001 From: "bsalomon@google.com" Date: Wed, 12 Oct 2011 18:12:11 +0000 Subject: Set SDK for Mac build to 10.6, ignore gyp/build, fixup gpu files to compile against 10.5 if needed Review URL: http://codereview.appspot.com/5260041/ git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@2470 2bbb7eff-a529-9590-31e7-b0007b416f81 --- common_conditions.gypi | 1 + 1 file changed, 1 insertion(+) diff --git a/common_conditions.gypi b/common_conditions.gypi index 19fad9e..d627998 100644 --- a/common_conditions.gypi +++ b/common_conditions.gypi @@ -113,6 +113,7 @@ }, 'xcode_settings': { 'SYMROOT': '<(DEPTH)/xcodebuild', + 'SDKROOT': 'macosx10.6', }, }, ], -- cgit v1.2.3 From f45d8206bc24825eabb75826447f1a70237b9789 Mon Sep 17 00:00:00 2001 From: "bsalomon@google.com" Date: Wed, 12 Oct 2011 19:53:16 +0000 Subject: Move gpu/include/* to include/gpu and gpu/src/* to src/gpu Review URL: http://codereview.appspot.com/5250070/ git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@2471 2bbb7eff-a529-9590-31e7-b0007b416f81 --- SampleApp.gyp | 2 +- gpu.gyp | 255 +++++++++++++++++++++++++++---------------------------- iOSSampleApp.gyp | 4 +- tests.gyp | 2 +- 4 files changed, 131 insertions(+), 132 deletions(-) diff --git a/SampleApp.gyp b/SampleApp.gyp index 0b2e4ca..d893f28 100644 --- a/SampleApp.gyp +++ b/SampleApp.gyp @@ -249,7 +249,7 @@ '../experimental/iOSSampleApp/iPad', '../experimental/iOSSampleApp/iPhone', '../include/utils/ios', - '../../gpu/include', + '../../include/gpu', ], 'xcode_config_file': '../experimental/iOSSampleApp/SkiOSSampleApp-Base.xcconfig', 'mac_bundle_resources' : [ diff --git a/gpu.gyp b/gpu.gyp index 14b7027..83aa525 100644 --- a/gpu.gyp +++ b/gpu.gyp @@ -11,7 +11,6 @@ '../include/core', '../src/core', '../include/gpu', - '../gpu/include', ], 'sources': [ '../include/gpu/SkGpuCanvas.h', @@ -70,140 +69,140 @@ 'target_name': 'gr', 'type': 'static_library', 'include_dirs': [ - '../gpu/include', '../include/core', '../include/config', + '../include/gpu', ], 'dependencies': [ 'libtess.gyp:libtess', ], 'sources': [ - '../gpu/include/GrAllocator.h', - '../gpu/include/GrAllocPool.h', - '../gpu/include/GrAtlas.h', - '../gpu/include/GrClip.h', - '../gpu/include/GrClipIterator.h', - '../gpu/include/GrColor.h', - '../gpu/include/GrConfig.h', - '../gpu/include/GrContext.h', - '../gpu/include/GrFontScaler.h', - '../gpu/include/GrGLConfig.h', - '../gpu/include/GrGLConfig_chrome.h', - '../gpu/include/GrGLInterface.h', - '../gpu/include/GrGlyph.h', - '../gpu/include/GrGpuVertex.h', - '../gpu/include/GrInstanceCounter.h', - '../gpu/include/GrIPoint.h', - '../gpu/include/GrKey.h', - '../gpu/include/GrMatrix.h', - '../gpu/include/GrMesh.h', - '../gpu/include/GrNoncopyable.h', - '../gpu/include/GrPaint.h', - '../gpu/include/GrPath.h', - '../gpu/include/GrPathSink.h', - '../gpu/include/GrPlotMgr.h', - '../gpu/include/GrPoint.h', - '../gpu/include/GrRandom.h', - '../gpu/include/GrRect.h', - '../gpu/include/GrRectanizer.h', - '../gpu/include/GrRefCnt.h', - '../gpu/include/GrRenderTarget.h', - '../gpu/include/GrResource.h', - '../gpu/include/GrSamplerState.h', - '../gpu/include/GrScalar.h', - '../gpu/include/GrStencil.h', - '../gpu/include/GrStopwatch.h', - '../gpu/include/GrStringBuilder.h', - '../gpu/include/GrTBSearch.h', - '../gpu/include/GrTDArray.h', - '../gpu/include/GrTextContext.h', - '../gpu/include/GrTextStrike.h', - '../gpu/include/GrTexture.h', - '../gpu/include/GrTHashCache.h', - '../gpu/include/GrTLList.h', - '../gpu/include/GrTypes.h', - '../gpu/include/GrUserConfig.h', + '../include/gpu/GrAllocator.h', + '../include/gpu/GrAllocPool.h', + '../include/gpu/GrAtlas.h', + '../include/gpu/GrClip.h', + '../include/gpu/GrClipIterator.h', + '../include/gpu/GrColor.h', + '../include/gpu/GrConfig.h', + '../include/gpu/GrContext.h', + '../include/gpu/GrFontScaler.h', + '../include/gpu/GrGLConfig.h', + '../include/gpu/GrGLConfig_chrome.h', + '../include/gpu/GrGLInterface.h', + '../include/gpu/GrGlyph.h', + '../include/gpu/GrGpuVertex.h', + '../include/gpu/GrInstanceCounter.h', + '../include/gpu/GrIPoint.h', + '../include/gpu/GrKey.h', + '../include/gpu/GrMatrix.h', + '../include/gpu/GrMesh.h', + '../include/gpu/GrNoncopyable.h', + '../include/gpu/GrPaint.h', + '../include/gpu/GrPath.h', + '../include/gpu/GrPathSink.h', + '../include/gpu/GrPlotMgr.h', + '../include/gpu/GrPoint.h', + '../include/gpu/GrRandom.h', + '../include/gpu/GrRect.h', + '../include/gpu/GrRectanizer.h', + '../include/gpu/GrRefCnt.h', + '../include/gpu/GrRenderTarget.h', + '../include/gpu/GrResource.h', + '../include/gpu/GrSamplerState.h', + '../include/gpu/GrScalar.h', + '../include/gpu/GrStencil.h', + '../include/gpu/GrStopwatch.h', + '../include/gpu/GrStringBuilder.h', + '../include/gpu/GrTBSearch.h', + '../include/gpu/GrTDArray.h', + '../include/gpu/GrTextContext.h', + '../include/gpu/GrTextStrike.h', + '../include/gpu/GrTexture.h', + '../include/gpu/GrTHashCache.h', + '../include/gpu/GrTLList.h', + '../include/gpu/GrTypes.h', + '../include/gpu/GrUserConfig.h', - '../gpu/src/GrAAHairLinePathRenderer.cpp', - '../gpu/src/GrAAHairLinePathRenderer.h', - '../gpu/src/GrAddPathRenderers_aahairline.cpp', - '../gpu/src/GrAllocPool.cpp', - '../gpu/src/GrAtlas.cpp', - '../gpu/src/GrBinHashKey.h', - '../gpu/src/GrBufferAllocPool.cpp', - '../gpu/src/GrBufferAllocPool.h', - '../gpu/src/GrClip.cpp', - '../gpu/src/GrContext.cpp', - '../gpu/src/GrDefaultPathRenderer.cpp', - '../gpu/src/GrDefaultPathRenderer.h', - '../gpu/src/GrDrawTarget.cpp', - '../gpu/src/GrDrawTarget.h', - '../gpu/src/GrGeometryBuffer.h', - '../gpu/src/GrGLDefaultInterface_none.cpp', - '../gpu/src/GrGLIndexBuffer.cpp', - '../gpu/src/GrGLIndexBuffer.h', - '../gpu/src/GrGLInterface.cpp', - '../gpu/src/GrGLIRect.h', - '../gpu/src/GrGLProgram.cpp', - '../gpu/src/GrGLProgram.h', - '../gpu/src/GrGLRenderTarget.cpp', - '../gpu/src/GrGLRenderTarget.h', - '../gpu/src/GrGLShaderVar.h', - '../gpu/src/GrGLStencilBuffer.cpp', - '../gpu/src/GrGLStencilBuffer.h', - '../gpu/src/GrGLTexture.cpp', - '../gpu/src/GrGLTexture.h', - '../gpu/src/GrGLUtil.cpp', - '../gpu/src/GrGLVertexBuffer.cpp', - '../gpu/src/GrGLVertexBuffer.h', - '../gpu/src/GrGpu.cpp', - '../gpu/src/GrGpu.h', - '../gpu/src/GrGpuFactory.cpp', - '../gpu/src/GrGpuGL.cpp', - '../gpu/src/GrGpuGL.h', - '../gpu/src/GrGpuGLFixed.cpp', - '../gpu/src/GrGpuGLFixed.h', - '../gpu/src/GrGpuGLShaders.cpp', - '../gpu/src/GrGpuGLShaders.h', - '../gpu/src/GrIndexBuffer.h', - '../gpu/src/GrInOrderDrawBuffer.cpp', - '../gpu/src/GrInOrderDrawBuffer.h', - '../gpu/src/GrMatrix.cpp', - '../gpu/src/GrMemory.cpp', - '../gpu/src/GrPathRendererChain.cpp', - '../gpu/src/GrPathRendererChain.h', - '../gpu/src/GrPathRenderer.cpp', - '../gpu/src/GrPathRenderer.h', - '../gpu/src/GrPathUtils.cpp', - '../gpu/src/GrPathUtils.h', - '../gpu/src/GrRectanizer.cpp', - '../gpu/src/GrRedBlackTree.h', - '../gpu/src/GrRenderTarget.cpp', - '../gpu/src/GrResource.cpp', - '../gpu/src/GrResourceCache.cpp', - '../gpu/src/GrResourceCache.h', - '../gpu/src/GrStencil.cpp', - '../gpu/src/GrStencilBuffer.cpp', - '../gpu/src/GrStencilBuffer.h', - '../gpu/src/GrTesselatedPathRenderer.cpp', - '../gpu/src/GrTesselatedPathRenderer.h', - '../gpu/src/GrTextContext.cpp', - '../gpu/src/GrTextStrike.cpp', - '../gpu/src/GrTextStrike_impl.h', - '../gpu/src/GrTexture.cpp', - '../gpu/src/GrVertexBuffer.h', - '../gpu/src/gr_unittests.cpp', + '../src/gpu/GrAAHairLinePathRenderer.cpp', + '../src/gpu/GrAAHairLinePathRenderer.h', + '../src/gpu/GrAddPathRenderers_aahairline.cpp', + '../src/gpu/GrAllocPool.cpp', + '../src/gpu/GrAtlas.cpp', + '../src/gpu/GrBinHashKey.h', + '../src/gpu/GrBufferAllocPool.cpp', + '../src/gpu/GrBufferAllocPool.h', + '../src/gpu/GrClip.cpp', + '../src/gpu/GrContext.cpp', + '../src/gpu/GrDefaultPathRenderer.cpp', + '../src/gpu/GrDefaultPathRenderer.h', + '../src/gpu/GrDrawTarget.cpp', + '../src/gpu/GrDrawTarget.h', + '../src/gpu/GrGeometryBuffer.h', + '../src/gpu/GrGLDefaultInterface_none.cpp', + '../src/gpu/GrGLIndexBuffer.cpp', + '../src/gpu/GrGLIndexBuffer.h', + '../src/gpu/GrGLInterface.cpp', + '../src/gpu/GrGLIRect.h', + '../src/gpu/GrGLProgram.cpp', + '../src/gpu/GrGLProgram.h', + '../src/gpu/GrGLRenderTarget.cpp', + '../src/gpu/GrGLRenderTarget.h', + '../src/gpu/GrGLShaderVar.h', + '../src/gpu/GrGLStencilBuffer.cpp', + '../src/gpu/GrGLStencilBuffer.h', + '../src/gpu/GrGLTexture.cpp', + '../src/gpu/GrGLTexture.h', + '../src/gpu/GrGLUtil.cpp', + '../src/gpu/GrGLVertexBuffer.cpp', + '../src/gpu/GrGLVertexBuffer.h', + '../src/gpu/GrGpu.cpp', + '../src/gpu/GrGpu.h', + '../src/gpu/GrGpuFactory.cpp', + '../src/gpu/GrGpuGL.cpp', + '../src/gpu/GrGpuGL.h', + '../src/gpu/GrGpuGLFixed.cpp', + '../src/gpu/GrGpuGLFixed.h', + '../src/gpu/GrGpuGLShaders.cpp', + '../src/gpu/GrGpuGLShaders.h', + '../src/gpu/GrIndexBuffer.h', + '../src/gpu/GrInOrderDrawBuffer.cpp', + '../src/gpu/GrInOrderDrawBuffer.h', + '../src/gpu/GrMatrix.cpp', + '../src/gpu/GrMemory.cpp', + '../src/gpu/GrPathRendererChain.cpp', + '../src/gpu/GrPathRendererChain.h', + '../src/gpu/GrPathRenderer.cpp', + '../src/gpu/GrPathRenderer.h', + '../src/gpu/GrPathUtils.cpp', + '../src/gpu/GrPathUtils.h', + '../src/gpu/GrRectanizer.cpp', + '../src/gpu/GrRedBlackTree.h', + '../src/gpu/GrRenderTarget.cpp', + '../src/gpu/GrResource.cpp', + '../src/gpu/GrResourceCache.cpp', + '../src/gpu/GrResourceCache.h', + '../src/gpu/GrStencil.cpp', + '../src/gpu/GrStencilBuffer.cpp', + '../src/gpu/GrStencilBuffer.h', + '../src/gpu/GrTesselatedPathRenderer.cpp', + '../src/gpu/GrTesselatedPathRenderer.h', + '../src/gpu/GrTextContext.cpp', + '../src/gpu/GrTextStrike.cpp', + '../src/gpu/GrTextStrike_impl.h', + '../src/gpu/GrTexture.cpp', + '../src/gpu/GrVertexBuffer.h', + '../src/gpu/gr_unittests.cpp', - '../gpu/src/mac/GrGLDefaultInterface_mac.cpp', + '../src/gpu/mac/GrGLDefaultInterface_mac.cpp', - '../gpu/src/win/GrGLDefaultInterface_win.cpp', + '../src/gpu/win/GrGLDefaultInterface_win.cpp', - '../gpu/src/unix/GrGLDefaultInterface_unix.cpp', + '../src/gpu/unix/GrGLDefaultInterface_unix.cpp', - '../gpu/src/mesa/GrGLDefaultInterface_mesa.cpp', + '../src/gpu/mesa/GrGLDefaultInterface_mesa.cpp', ], 'sources!': [ - '../gpu/src/mesa/GrGLDefaultInterface_mesa.cpp', + '../src/gpu/mesa/GrGLDefaultInterface_mesa.cpp', ], 'defines': [ 'GR_IMPLEMENTATION=1', @@ -214,7 +213,7 @@ 'GR_LINUX_BUILD=1', ], 'sources!': [ - '../gpu/src/GrGLDefaultInterface_none.cpp', + '../src/gpu/GrGLDefaultInterface_none.cpp', ], 'link_settings': { 'libraries': [ @@ -233,7 +232,7 @@ ], }, 'sources!': [ - '../gpu/src/GrGLDefaultInterface_none.cpp', + '../src/gpu/GrGLDefaultInterface_none.cpp', ], }], [ 'skia_os == "win"', { @@ -242,22 +241,22 @@ 'GR_GL_FUNCTION_TYPE=__stdcall', ], 'sources!': [ - '../gpu/src/GrGLDefaultInterface_none.cpp', + '../src/gpu/GrGLDefaultInterface_none.cpp', ], }], [ 'skia_os != "win"', { 'sources!': [ - '../gpu/src/win/GrGLDefaultInterface_win.cpp', + '../src/gpu/win/GrGLDefaultInterface_win.cpp', ], }], [ 'skia_os != "mac"', { 'sources!': [ - '../gpu/src/mac/GrGLDefaultInterface_mac.cpp', + '../src/gpu/mac/GrGLDefaultInterface_mac.cpp', ], }], [ 'skia_os != "linux"', { 'sources!': [ - '../gpu/src/unix/GrGLDefaultInterface_unix.cpp', + '../src/gpu/unix/GrGLDefaultInterface_unix.cpp', ], }], ], @@ -281,7 +280,7 @@ }], ], 'include_dirs': [ - '../gpu/include', + '../include/gpu', ], }, }, diff --git a/iOSSampleApp.gyp b/iOSSampleApp.gyp index 63d58b7..4fe7fe2 100644 --- a/iOSSampleApp.gyp +++ b/iOSSampleApp.gyp @@ -175,7 +175,7 @@ [ 'OS == "mac"', { 'sources!': [ '../samplecode/SampleDecode.cpp', - '../gpu/src/mac/GrGLDefaultInterface_mac.cpp', + '../src/gpu/mac/GrGLDefaultInterface_mac.cpp', ], 'sources': [ # Shared resources @@ -246,7 +246,7 @@ '../experimental/iOSSampleApp/iPad', '../experimental/iOSSampleApp/iPhone', '../include/utils/ios', - '../../gpu/include', + '../../include/gpu', ], #'xcode_settings' : { # 'INFOPLIST_FILE' : '../experimental/iOSSampleApp/iOSSampleApp-Info.plist', diff --git a/tests.gyp b/tests.gyp index 93b1149..c5c3ff6 100644 --- a/tests.gyp +++ b/tests.gyp @@ -10,7 +10,7 @@ 'type': 'executable', 'include_dirs' : [ '../src/core', - '../gpu/src', + '../src/gpu', ], 'sources': [ '../tests/BitmapCopyTest.cpp', -- cgit v1.2.3 From 4d53312431033e5232c75e9e811a6752ed2d9103 Mon Sep 17 00:00:00 2001 From: "bsalomon@google.com" Date: Thu, 13 Oct 2011 13:33:08 +0000 Subject: move utils/SkEGLContext to gpu/SkGLContext, some gpu.gyp cleanup, set eol style LF on all gpu files Review URL: http://codereview.appspot.com/5242056/ git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@2474 2bbb7eff-a529-9590-31e7-b0007b416f81 --- gpu.gyp | 181 +++++++++++++++++++++++++++++++++----------------------------- utils.gyp | 21 -------- 2 files changed, 95 insertions(+), 107 deletions(-) diff --git a/gpu.gyp b/gpu.gyp index 83aa525..690258a 100644 --- a/gpu.gyp +++ b/gpu.gyp @@ -2,6 +2,89 @@ 'includes': [ 'common.gypi', ], + 'target_defaults': { + 'conditions': [ + ['skia_os != "win"', { + 'sources/': [ ['exclude', '_win.(h|cpp)$'], + ], + }], + ['skia_os != "mac"', { + 'sources/': [ ['exclude', '_mac.(h|cpp)$'], + ], + }], + ['skia_os != "linux"', { + 'sources/': [ ['exclude', '_unix.(h|cpp)$'], + ], + }], + ['skia_os != "ios"', { + 'sources/': [ ['exclude', '_iOS.(h|cpp)$'], + ], + }], + ['skia_os != "android"', { + 'sources/': [ ['exclude', '_android.(h|cpp)$'], + ], + }], + [ 'skia_os == "android"', { + 'defines': [ + 'GR_ANDROID_BUILD=1', + ], + }], + [ 'skia_os == "mac"', { + 'defines': [ + 'GR_MAC_BUILD=1', + ], + }], + [ 'skia_os == "linux"', { + 'defines': [ + 'GR_LINUX_BUILD=1', + ], + }], + [ 'skia_os == "ios"', { + 'defines': [ + 'GR_IOS_BUILD=1', + ], + }], + [ 'skia_os == "win"', { + 'defines': [ + 'GR_WIN32_BUILD=1', + 'GR_GL_FUNCTION_TYPE=__stdcall', + ], + }], + ], + 'direct_dependent_settings': { + 'conditions': [ + [ 'skia_os == "android"', { + 'defines': [ + 'GR_ANDROID_BUILD=1', + ], + }], + [ 'skia_os == "mac"', { + 'defines': [ + 'GR_MAC_BUILD=1', + ], + }], + [ 'skia_os == "linux"', { + 'defines': [ + 'GR_LINUX_BUILD=1', + ], + }], + [ 'skia_os == "ios"', { + 'defines': [ + 'GR_IOS_BUILD=1', + ], + }], + [ 'skia_os == "win"', { + 'defines': [ + 'GR_WIN32_BUILD=1', + 'GR_GL_FUNCTION_TYPE=__stdcall', + ], + }], + ], + 'include_dirs': [ + '../include/gpu', + ], + }, + }, 'targets': [ { 'target_name': 'skgr', @@ -24,46 +107,19 @@ '../src/gpu/SkGr.cpp', '../src/gpu/SkGrFontScaler.cpp', '../src/gpu/SkGrTexturePixelRef.cpp', + + '../src/gpu/mac/SkGLContext_mac.cpp', + + '../src/gpu/win/SkGLContext_win.cpp', + + '../src/gpu/unix/SkGLContext_unix.cpp', + + '../src/gpu/mesa/SkGLContext_mesa.cpp', ], - 'conditions': [ - [ 'skia_os == "linux"', { - 'defines': [ - 'GR_LINUX_BUILD=1', - ], - }], - [ 'skia_os == "mac"', { - 'defines': [ - 'GR_MAC_BUILD=1', - ], - }], - [ 'skia_os == "win"', { - 'defines': [ - 'GR_WIN32_BUILD=1', - ], - }], + # Removed for now + 'sources!': [ + '../src/gpu/mesa/SkGLContext_mesa.cpp', ], - 'direct_dependent_settings': { - 'conditions': [ - [ 'skia_os == "linux"', { - 'defines': [ - 'GR_LINUX_BUILD=1', - ], - }], - [ 'skia_os == "mac"', { - 'defines': [ - 'GR_MAC_BUILD=1', - ], - }], - [ 'skia_os == "win"', { - 'defines': [ - 'GR_WIN32_BUILD=1', - ], - }], - ], - 'include_dirs': [ - '../include/gpu', - ], - }, }, { 'target_name': 'gr', @@ -201,6 +257,7 @@ '../src/gpu/mesa/GrGLDefaultInterface_mesa.cpp', ], + # Removed for now 'sources!': [ '../src/gpu/mesa/GrGLDefaultInterface_mesa.cpp', ], @@ -209,9 +266,6 @@ ], 'conditions': [ [ 'skia_os == "linux"', { - 'defines': [ - 'GR_LINUX_BUILD=1', - ], 'sources!': [ '../src/gpu/GrGLDefaultInterface_none.cpp', ], @@ -223,9 +277,6 @@ }, }], [ 'skia_os == "mac"', { - 'defines': [ - 'GR_MAC_BUILD=1', - ], 'link_settings': { 'libraries': [ '$(SDKROOT)/System/Library/Frameworks/OpenGL.framework', @@ -236,53 +287,11 @@ ], }], [ 'skia_os == "win"', { - 'defines': [ - 'GR_WIN32_BUILD=1', - 'GR_GL_FUNCTION_TYPE=__stdcall', - ], 'sources!': [ '../src/gpu/GrGLDefaultInterface_none.cpp', ], }], - [ 'skia_os != "win"', { - 'sources!': [ - '../src/gpu/win/GrGLDefaultInterface_win.cpp', - ], - }], - [ 'skia_os != "mac"', { - 'sources!': [ - '../src/gpu/mac/GrGLDefaultInterface_mac.cpp', - ], - }], - [ 'skia_os != "linux"', { - 'sources!': [ - '../src/gpu/unix/GrGLDefaultInterface_unix.cpp', - ], - }], ], - 'direct_dependent_settings': { - 'conditions': [ - [ 'skia_os == "linux"', { - 'defines': [ - 'GR_LINUX_BUILD=1', - ], - }], - [ 'skia_os == "mac"', { - 'defines': [ - 'GR_MAC_BUILD=1', - ], - }], - [ 'skia_os == "win"', { - 'defines': [ - 'GR_WIN32_BUILD=1', - 'GR_GL_FUNCTION_TYPE=__stdcall', - ], - }], - ], - 'include_dirs': [ - '../include/gpu', - ], - }, }, ], } diff --git a/utils.gyp b/utils.gyp index 73a80eb..067671e 100644 --- a/utils.gyp +++ b/utils.gyp @@ -23,7 +23,6 @@ '../include/utils/SkCubicInterval.h', '../include/utils/SkCullPoints.h', '../include/utils/SkDumpCanvas.h', - '../include/utils/SkEGLContext.h', '../include/utils/SkGLCanvas.h', '../include/utils/SkInterpolator.h', '../include/utils/SkLayer.h', @@ -45,7 +44,6 @@ '../src/utils/SkCubicInterval.cpp', '../src/utils/SkCullPoints.cpp', '../src/utils/SkDumpCanvas.cpp', - '../src/utils/SkEGLContext_none.cpp', '../src/utils/SkInterpolator.cpp', '../src/utils/SkLayer.cpp', '../src/utils/SkMatrix44.cpp', @@ -63,17 +61,12 @@ #mac '../include/utils/mac/SkCGUtils.h', '../src/utils/mac/SkCreateCGImageRef.cpp', - '../src/utils/mac/SkEGLContext_mac.cpp', - - #mesa - '../src/utils/mesa/SkEGLContext_Mesa.cpp', #sdl '../src/utils/SDL/SkOSWindow_SDL.cpp', #*nix '../src/utils/unix/keysym2ucs.c', - '../src/utils/unix/SkEGLContext_Unix.cpp', '../src/utils/unix/SkOSWindow_Unix.cpp', #windows @@ -83,20 +76,15 @@ '../include/utils/win/SkTScopedComPtr.h', '../src/utils/win/SkAutoCoInitialize.cpp', '../src/utils/win/skia_win.cpp', - '../src/utils/win/SkEGLContext_Win.cpp', '../src/utils/win/SkHRESULT.cpp', '../src/utils/win/SkIStream.cpp', '../src/utils/win/SkOSWindow_Win.cpp', ], 'sources!': [ - '../src/utils/mesa/SkEGLContext_Mesa.cpp', '../src/utils/SDL/SkOSWindow_SDL.cpp', ], 'conditions': [ [ 'skia_os == "mac"', { - 'sources!': [ - '../src/utils/SkEGLContext_none.cpp', - ], 'link_settings': { 'libraries': [ '$(SDKROOT)/System/Library/Frameworks/AGL.framework', @@ -114,15 +102,11 @@ 'sources!': [ '../include/utils/mac/SkCGUtils.h', '../src/utils/mac/SkCreateCGImageRef.cpp', - '../src/utils/mac/SkEGLContext_mac.cpp', '../src/utils/mac/skia_mac.mm', '../src/utils/mac/SkOSWindow_Mac.mm', ], }], [ 'skia_os in ["linux", "freebsd", "openbsd", "solaris"]', { - 'sources!': [ - '../src/utils/SkEGLContext_none.cpp', - ], 'link_settings': { 'libraries': [ '-lGL', @@ -135,14 +119,10 @@ ], 'sources!': [ '../src/utils/unix/keysym2ucs.c', - '../src/utils/unix/SkEGLContext_Unix.cpp', '../src/utils/unix/SkOSWindow_Unix.cpp', ], }], [ 'skia_os == "win"', { - 'sources!': [ - '../src/utils/SkEGLContext_none.cpp', - ], 'direct_dependent_settings': { 'include_dirs': [ '../include/utils/win', @@ -159,7 +139,6 @@ '../include/utils/win/SkTScopedComPtr.h', '../src/utils/win/SkAutoCoInitialize.cpp', '../src/utils/win/skia_win.cpp', - '../src/utils/win/SkEGLContext_Win.cpp', '../src/utils/win/SkHRESULT.cpp', '../src/utils/win/SkIStream.cpp', '../src/utils/win/SkOSWindow_Win.cpp', -- cgit v1.2.3 From 0053ee48e272a98b4395487522cb24e1e28749bd Mon Sep 17 00:00:00 2001 From: "reed@google.com" Date: Tue, 18 Oct 2011 13:56:50 +0000 Subject: move LCD blits into opts, so they can have assembly versions git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@2484 2bbb7eff-a529-9590-31e7-b0007b416f81 --- core.gyp | 1 + 1 file changed, 1 insertion(+) diff --git a/core.gyp b/core.gyp index 069a397..abe9d11 100644 --- a/core.gyp +++ b/core.gyp @@ -30,6 +30,7 @@ '../src/core/SkBitmapShaderTemplate.h', '../src/core/SkBitmap_scroll.cpp', '../src/core/SkBlitBWMaskTemplate.h', + '../src/core/SkBlitMask_D32.cpp', '../src/core/SkBlitRow_D16.cpp', '../src/core/SkBlitRow_D32.cpp', '../src/core/SkBlitRow_D4444.cpp', -- cgit v1.2.3 From 54ca6fdc05ba4ec7af6cc08db936d7545a8f403a Mon Sep 17 00:00:00 2001 From: "bsalomon@google.com" Date: Wed, 19 Oct 2011 20:43:20 +0000 Subject: Virtualize SkGLContext with subclasses SkNativeGLContext and SkMesaGLContext, allow both in gm Review URL: http://codereview.appspot.com/5307045/ git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@2499 2bbb7eff-a529-9590-31e7-b0007b416f81 --- bench.gypi | 13 ---------- common.gypi | 12 +++++++++ common_variables.gypi | 2 ++ gpu.gyp | 68 +++++++++++++++++++++++++++++++++++++++------------ 4 files changed, 66 insertions(+), 29 deletions(-) diff --git a/bench.gypi b/bench.gypi index 3b79380..127c62a 100644 --- a/bench.gypi +++ b/bench.gypi @@ -13,8 +13,6 @@ '../bench/BenchSysTimer_windows.cpp', '../bench/BenchGpuTimer_gl.h', '../bench/BenchGpuTimer_gl.cpp', - '../bench/BenchGpuTimer_none.h', - '../bench/BenchGpuTimer_none.cpp', '../bench/SkBenchmark.h', '../bench/SkBenchmark.cpp', @@ -56,17 +54,6 @@ '../bench/BenchSysTimer_windows.cpp', ], }], - [ 'skia_os in ["win", "mac", "linux", "freebsd", "openbsd", "solaris"]', { - 'sources!': [ - '../bench/BenchGpuTimer_none.h', - '../bench/BenchGpuTimer_none.cpp', - ], - },{ - 'sources!': [ - '../bench/BenchGpuTimer_gl.h', - '../bench/BenchGpuTimer_gl.cpp', - ], - }], ], } diff --git a/common.gypi b/common.gypi index 51d68e8..30424de 100644 --- a/common.gypi +++ b/common.gypi @@ -15,6 +15,8 @@ 'conditions': [ ['skia_os != OS and not (skia_os == "ios" and OS == "mac")', {'error': ' Date: Thu, 20 Oct 2011 13:43:13 +0000 Subject: Move a bunch of headers from include/gpu to src/gpu. Delete some unused files. Review URL: http://codereview.appspot.com/5304047/ git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@2506 2bbb7eff-a529-9590-31e7-b0007b416f81 --- gpu.gyp | 32 ++++++++++++++------------------ 1 file changed, 14 insertions(+), 18 deletions(-) diff --git a/gpu.gyp b/gpu.gyp index 132b8e9..391824e 100644 --- a/gpu.gyp +++ b/gpu.gyp @@ -145,9 +145,6 @@ 'libtess.gyp:libtess', ], 'sources': [ - '../include/gpu/GrAllocator.h', - '../include/gpu/GrAllocPool.h', - '../include/gpu/GrAtlas.h', '../include/gpu/GrClip.h', '../include/gpu/GrClipIterator.h', '../include/gpu/GrColor.h', @@ -158,44 +155,32 @@ '../include/gpu/GrGLConfig_chrome.h', '../include/gpu/GrGLInterface.h', '../include/gpu/GrGlyph.h', - '../include/gpu/GrGpuVertex.h', '../include/gpu/GrInstanceCounter.h', - '../include/gpu/GrIPoint.h', '../include/gpu/GrKey.h', '../include/gpu/GrMatrix.h', - '../include/gpu/GrMesh.h', '../include/gpu/GrNoncopyable.h', '../include/gpu/GrPaint.h', '../include/gpu/GrPath.h', - '../include/gpu/GrPathSink.h', - '../include/gpu/GrPlotMgr.h', '../include/gpu/GrPoint.h', - '../include/gpu/GrRandom.h', '../include/gpu/GrRect.h', - '../include/gpu/GrRectanizer.h', '../include/gpu/GrRefCnt.h', '../include/gpu/GrRenderTarget.h', '../include/gpu/GrResource.h', '../include/gpu/GrSamplerState.h', '../include/gpu/GrScalar.h', - '../include/gpu/GrStencil.h', - '../include/gpu/GrStopwatch.h', - '../include/gpu/GrStringBuilder.h', - '../include/gpu/GrTBSearch.h', - '../include/gpu/GrTDArray.h', '../include/gpu/GrTextContext.h', - '../include/gpu/GrTextStrike.h', '../include/gpu/GrTexture.h', - '../include/gpu/GrTHashCache.h', - '../include/gpu/GrTLList.h', '../include/gpu/GrTypes.h', '../include/gpu/GrUserConfig.h', '../src/gpu/GrAAHairLinePathRenderer.cpp', '../src/gpu/GrAAHairLinePathRenderer.h', '../src/gpu/GrAddPathRenderers_aahairline.cpp', + '../src/gpu/GrAllocator.h', + '../src/gpu/GrAllocPool.h', '../src/gpu/GrAllocPool.cpp', '../src/gpu/GrAtlas.cpp', + '../src/gpu/GrAtlas.h', '../src/gpu/GrBinHashKey.h', '../src/gpu/GrBufferAllocPool.cpp', '../src/gpu/GrBufferAllocPool.h', @@ -234,6 +219,7 @@ '../src/gpu/GrGpuGLFixed.h', '../src/gpu/GrGpuGLShaders.cpp', '../src/gpu/GrGpuGLShaders.h', + '../src/gpu/GrGpuVertex.h', '../src/gpu/GrIndexBuffer.h', '../src/gpu/GrInOrderDrawBuffer.cpp', '../src/gpu/GrInOrderDrawBuffer.h', @@ -245,21 +231,31 @@ '../src/gpu/GrPathRenderer.h', '../src/gpu/GrPathUtils.cpp', '../src/gpu/GrPathUtils.h', + '../src/gpu/GrPlotMgr.h', + '../src/gpu/GrRandom.h', '../src/gpu/GrRectanizer.cpp', + '../src/gpu/GrRectanizer.h', '../src/gpu/GrRedBlackTree.h', '../src/gpu/GrRenderTarget.cpp', '../src/gpu/GrResource.cpp', '../src/gpu/GrResourceCache.cpp', '../src/gpu/GrResourceCache.h', '../src/gpu/GrStencil.cpp', + '../src/gpu/GrStencil.h', '../src/gpu/GrStencilBuffer.cpp', '../src/gpu/GrStencilBuffer.h', + '../src/gpu/GrStringBuilder.h', + '../src/gpu/GrTBSearch.h', + '../src/gpu/GrTDArray.h', '../src/gpu/GrTesselatedPathRenderer.cpp', '../src/gpu/GrTesselatedPathRenderer.h', '../src/gpu/GrTextContext.cpp', '../src/gpu/GrTextStrike.cpp', + '../src/gpu/GrTextStrike.h', '../src/gpu/GrTextStrike_impl.h', '../src/gpu/GrTexture.cpp', + '../src/gpu/GrTHashCache.h', + '../src/gpu/GrTLList.h', '../src/gpu/GrVertexBuffer.h', '../src/gpu/gr_unittests.cpp', -- cgit v1.2.3 From 59e9a4c41f0f21db6d9afcd4d39bce8616a9082a Mon Sep 17 00:00:00 2001 From: "bsalomon@google.com" Date: Thu, 20 Oct 2011 21:09:45 +0000 Subject: Add test that validates GrGLInterfaces Review URL: http://codereview.appspot.com/5304048/ git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@2510 2bbb7eff-a529-9590-31e7-b0007b416f81 --- tests.gyp | 1 + 1 file changed, 1 insertion(+) diff --git a/tests.gyp b/tests.gyp index c5c3ff6..ede5885 100644 --- a/tests.gyp +++ b/tests.gyp @@ -30,6 +30,7 @@ '../tests/FillPathTest.cpp', '../tests/FlateTest.cpp', '../tests/GeometryTest.cpp', + '../tests/GLInterfaceValidation.cpp', '../tests/GLProgramsTest.cpp', '../tests/InfRectTest.cpp', '../tests/MathTest.cpp', -- cgit v1.2.3 From 1743fcbcda25bc1653a400153ad57ba6be32a18b Mon Sep 17 00:00:00 2001 From: "bsalomon@google.com" Date: Thu, 20 Oct 2011 21:54:46 +0000 Subject: Temporary revert of r2510. The test that it introduced fails on the Mac build bots. I suspect there is something wrong with the Mac bot machine's GL that is preventing context creation from succeeding. The OpenGL Driver monitor on the machine only shows a software rasterizer. aglChoosePixelFormat seems to fail regardless of input. It may just need a reboot. I'll investigate it more on Monday. git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@2511 2bbb7eff-a529-9590-31e7-b0007b416f81 --- tests.gyp | 1 - 1 file changed, 1 deletion(-) diff --git a/tests.gyp b/tests.gyp index ede5885..c5c3ff6 100644 --- a/tests.gyp +++ b/tests.gyp @@ -30,7 +30,6 @@ '../tests/FillPathTest.cpp', '../tests/FlateTest.cpp', '../tests/GeometryTest.cpp', - '../tests/GLInterfaceValidation.cpp', '../tests/GLProgramsTest.cpp', '../tests/InfRectTest.cpp', '../tests/MathTest.cpp', -- cgit v1.2.3 From 6d469326881b613d6e57901fdbd5292af4c36172 Mon Sep 17 00:00:00 2001 From: "bsalomon@google.com" Date: Mon, 24 Oct 2011 21:17:53 +0000 Subject: Recommit r2510 now that mac build bot issue has been fixed. git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@2521 2bbb7eff-a529-9590-31e7-b0007b416f81 --- tests.gyp | 1 + 1 file changed, 1 insertion(+) diff --git a/tests.gyp b/tests.gyp index c5c3ff6..ede5885 100644 --- a/tests.gyp +++ b/tests.gyp @@ -30,6 +30,7 @@ '../tests/FillPathTest.cpp', '../tests/FlateTest.cpp', '../tests/GeometryTest.cpp', + '../tests/GLInterfaceValidation.cpp', '../tests/GLProgramsTest.cpp', '../tests/InfRectTest.cpp', '../tests/MathTest.cpp', -- cgit v1.2.3 From a3b6b50b81deb301a1154bc78ab14132b7cf9bbc Mon Sep 17 00:00:00 2001 From: "reed@google.com" Date: Wed, 26 Oct 2011 15:03:48 +0000 Subject: add initial unittests for aaclip. Fix case where BuilderBlitter skipped the top few scanlines (of its bounds) and therefore didn't know to trim its bounds back down. This can happen when the path's bounds are larger than the curve's bounds (i.e. the control points are outside of the tight-bounds of the shape.) git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@2534 2bbb7eff-a529-9590-31e7-b0007b416f81 --- tests.gyp | 1 + 1 file changed, 1 insertion(+) diff --git a/tests.gyp b/tests.gyp index ede5885..d190487 100644 --- a/tests.gyp +++ b/tests.gyp @@ -13,6 +13,7 @@ '../src/gpu', ], 'sources': [ + '../tests/AAClipTest.cpp', '../tests/BitmapCopyTest.cpp', '../tests/BitmapGetColorTest.cpp', '../tests/BitSetTest.cpp', -- cgit v1.2.3 From 18a9870117c3c2b03a8c5f80c04ae5323c585bf8 Mon Sep 17 00:00:00 2001 From: "tomhudson@google.com" Date: Thu, 27 Oct 2011 13:27:20 +0000 Subject: New benchmark for blitRect based on call frequency observed while scrolling Gmail inside Chrome. Is a bit slow... git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@2540 2bbb7eff-a529-9590-31e7-b0007b416f81 --- bench.gypi | 1 + 1 file changed, 1 insertion(+) diff --git a/bench.gypi b/bench.gypi index 127c62a..b46abc5 100644 --- a/bench.gypi +++ b/bench.gypi @@ -19,6 +19,7 @@ '../bench/BitmapBench.cpp', '../bench/BlurBench.cpp', + '../bench/ChromeBench.cpp', '../bench/DecodeBench.cpp', '../bench/GradientBench.cpp', '../bench/MathBench.cpp', -- cgit v1.2.3 From 5ecbeb39288a00e40782d2543242fc117a3ab1e9 Mon Sep 17 00:00:00 2001 From: "tomhudson@google.com" Date: Thu, 27 Oct 2011 20:21:16 +0000 Subject: Extract GrDrawTarget::DrState into independent GrDrawState struct. This is intended to be a first step towards making the stack of states maintained by GrDrawTarget cheaper to maintain. git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@2544 2bbb7eff-a529-9590-31e7-b0007b416f81 --- gpu.gyp | 1 + 1 file changed, 1 insertion(+) diff --git a/gpu.gyp b/gpu.gyp index 391824e..b66bfc6 100644 --- a/gpu.gyp +++ b/gpu.gyp @@ -188,6 +188,7 @@ '../src/gpu/GrContext.cpp', '../src/gpu/GrDefaultPathRenderer.cpp', '../src/gpu/GrDefaultPathRenderer.h', + '../src/gpu/GrDrawState.h', '../src/gpu/GrDrawTarget.cpp', '../src/gpu/GrDrawTarget.h', '../src/gpu/GrGeometryBuffer.h', -- cgit v1.2.3 From 196520d590be252927bc4cc4dd4d0d31a83890bb Mon Sep 17 00:00:00 2001 From: "bsalomon@google.com" Date: Thu, 27 Oct 2011 20:44:19 +0000 Subject: Add NULL GL context implementation. Use in bench (-nullgl) and SampleApp (backspace key) Review URL: http://codereview.appspot.com/5303080/ git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@2545 2bbb7eff-a529-9590-31e7-b0007b416f81 --- gpu.gyp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/gpu.gyp b/gpu.gyp index b66bfc6..a919de7 100644 --- a/gpu.gyp +++ b/gpu.gyp @@ -99,6 +99,7 @@ '../include/gpu/SkGLContext.h', '../include/gpu/SkMesaGLContext.h', '../include/gpu/SkNativeGLContext.h', + '../include/gpu/SkNullGLContext.h', '../include/gpu/SkGpuCanvas.h', '../include/gpu/SkGpuDevice.h', '../include/gpu/SkGr.h', @@ -111,6 +112,7 @@ '../src/gpu/SkGr.cpp', '../src/gpu/SkGrFontScaler.cpp', '../src/gpu/SkGrTexturePixelRef.cpp', + '../src/gpu/SkNullGLContext.cpp', '../src/gpu/mac/SkNativeGLContext_mac.cpp', @@ -193,6 +195,7 @@ '../src/gpu/GrDrawTarget.h', '../src/gpu/GrGeometryBuffer.h', '../src/gpu/GrGLCreateNativeInterface_none.cpp', + '../src/gpu/GrGLCreateNullInterface.cpp', '../src/gpu/GrGLDefaultInterface_none.cpp', '../src/gpu/GrGLDefaultInterface_native.cpp', '../src/gpu/GrGLIndexBuffer.cpp', -- cgit v1.2.3 From 338d167c232e7b1e180f32993ff5fec11af198fe Mon Sep 17 00:00:00 2001 From: "reed@google.com" Date: Fri, 28 Oct 2011 18:57:32 +0000 Subject: add initial bench for drawVertices git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@2553 2bbb7eff-a529-9590-31e7-b0007b416f81 --- bench.gypi | 1 + 1 file changed, 1 insertion(+) diff --git a/bench.gypi b/bench.gypi index b46abc5..879dee5 100644 --- a/bench.gypi +++ b/bench.gypi @@ -29,6 +29,7 @@ '../bench/RepeatTileBench.cpp', '../bench/ScalarBench.cpp', '../bench/TextBench.cpp', + '../bench/VertBench.cpp', ], 'conditions': [ [ 'skia_os != "mac"', { -- cgit v1.2.3 From c7d3a5ae2d1f017d896a1c4e6898063cbda6e17e Mon Sep 17 00:00:00 2001 From: "bsalomon@google.com" Date: Mon, 31 Oct 2011 14:18:20 +0000 Subject: Import all GMs as Samples. Review URL: http://codereview.appspot.com/5332043/ git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@2564 2bbb7eff-a529-9590-31e7-b0007b416f81 --- SampleApp.gyp | 22 ++++++---------------- gm.gyp | 30 ++++-------------------------- gmslides.gypi | 37 +++++++++++++++++++++++++++++++++++++ 3 files changed, 47 insertions(+), 42 deletions(-) create mode 100644 gmslides.gypi diff --git a/SampleApp.gyp b/SampleApp.gyp index d893f28..ba65096 100644 --- a/SampleApp.gyp +++ b/SampleApp.gyp @@ -10,27 +10,18 @@ 'mac_bundle' : 1, 'include_dirs' : [ '../src/core', # needed to get SkConcaveToTriangle, maybe this should be moved to include dir? - '../gm', # SampleGM.cpp pulls gm.h + '../gm', # needed to pull gm.h '../include/pipe', # To pull in SkGPipe.h for pipe reader/writer '../samplecode', # To pull SampleApp.h and SampleCode.h ], + 'includes': [ + 'gmslides.gypi', + ], 'sources': [ - # gm files needed for SampleGM.cpp - '../gm/bitmapfilters.cpp', - '../gm/blurs.cpp', - '../gm/complexclip.cpp', - '../gm/filltypes.cpp', + '../gm/gm.cpp', '../gm/gm.h', - '../gm/gradients.cpp', - '../gm/nocolorbleed.cpp', - '../gm/points.cpp', - '../gm/poly2poly.cpp', - '../gm/shadertext.cpp', - '../gm/shadows.cpp', - '../gm/shapes.cpp', - '../gm/tilemodes.cpp', - '../gm/xfermodes.cpp', + '../samplecode/GMSampleView.h', '../samplecode/ClockFaceView.cpp', '../samplecode/OverView.cpp', '../samplecode/Sample2PtRadial.cpp', @@ -71,7 +62,6 @@ '../samplecode/SampleFontCache.cpp', '../samplecode/SampleFontScalerTest.cpp', '../samplecode/SampleFuzz.cpp', - '../samplecode/SampleGM.cpp', '../samplecode/SampleGradients.cpp', '../samplecode/SampleHairCurves.cpp', '../samplecode/SampleHairline.cpp', diff --git a/gm.gyp b/gm.gyp index 575cb8d..16577e9 100644 --- a/gm.gyp +++ b/gm.gyp @@ -8,34 +8,12 @@ { 'target_name': 'gm', 'type': 'executable', + 'includes': [ + 'gmslides.gypi', + ], 'sources': [ - '../gm/aarectmodes.cpp', - '../gm/bitmapfilters.cpp', - '../gm/bitmapscroll.cpp', - '../gm/blurs.cpp', - '../gm/complexclip.cpp', - '../gm/complexclip2.cpp', - '../gm/emptypath.cpp', - '../gm/filltypes.cpp', - '../gm/filltypespersp.cpp', + '../gm/gm.cpp', '../gm/gmmain.cpp', - '../gm/gradients.cpp', - '../gm/hairmodes.cpp', - '../gm/lcdtext.cpp', - '../gm/ninepatchstretch.cpp', - '../gm/nocolorbleed.cpp', - '../gm/pathfill.cpp', - '../gm/points.cpp', - '../gm/poly2poly.cpp', - '../gm/shadertext.cpp', - '../gm/shadows.cpp', - '../gm/shapes.cpp', - '../gm/strokerects.cpp', - '../gm/strokes.cpp', - '../gm/texdata.cpp', - '../gm/tilemodes.cpp', - '../gm/tinybitmap.cpp', - '../gm/xfermodes.cpp', ], 'dependencies': [ 'core.gyp:core', diff --git a/gmslides.gypi b/gmslides.gypi new file mode 100644 index 0000000..f772993 --- /dev/null +++ b/gmslides.gypi @@ -0,0 +1,37 @@ +# include this gypi to include all the golden master slides. +{ + 'sources': [ + '../gm/aarectmodes.cpp', + '../gm/bitmapfilters.cpp', + '../gm/bitmapscroll.cpp', + '../gm/blurs.cpp', + '../gm/complexclip.cpp', + '../gm/complexclip2.cpp', + '../gm/emptypath.cpp', + '../gm/filltypes.cpp', + '../gm/filltypespersp.cpp', + '../gm/gradients.cpp', + '../gm/hairmodes.cpp', + '../gm/lcdtext.cpp', + '../gm/ninepatchstretch.cpp', + '../gm/nocolorbleed.cpp', + '../gm/pathfill.cpp', + '../gm/points.cpp', + '../gm/poly2poly.cpp', + '../gm/shadertext.cpp', + '../gm/shadows.cpp', + '../gm/shapes.cpp', + '../gm/strokerects.cpp', + '../gm/strokes.cpp', + '../gm/texdata.cpp', + '../gm/tilemodes.cpp', + '../gm/tinybitmap.cpp', + '../gm/xfermodes.cpp', + ], +} + +# Local Variables: +# tab-width:2 +# indent-tabs-mode:nil +# End: +# vim: set expandtab tabstop=2 shiftwidth=2: -- cgit v1.2.3 From 60562ad30e8e2f9db43f61766c26c54d25211ccd Mon Sep 17 00:00:00 2001 From: "reed@google.com" Date: Mon, 31 Oct 2011 14:33:35 +0000 Subject: add bench for building aaclips git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@2565 2bbb7eff-a529-9590-31e7-b0007b416f81 --- bench.gyp | 6 +++++- bench.gypi | 1 + 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/bench.gyp b/bench.gyp index 73472a5..6361586 100644 --- a/bench.gyp +++ b/bench.gyp @@ -9,8 +9,12 @@ { 'target_name': 'bench', 'type': 'executable', + 'include_dirs' : [ + '../src/core', + '../src/gpu', + ], 'includes': [ - 'bench.gypi' + 'bench.gypi' ], 'dependencies': [ 'core.gyp:core', diff --git a/bench.gypi b/bench.gypi index 879dee5..b8f3e58 100644 --- a/bench.gypi +++ b/bench.gypi @@ -17,6 +17,7 @@ '../bench/SkBenchmark.h', '../bench/SkBenchmark.cpp', + '../bench/AAClipBench.cpp', '../bench/BitmapBench.cpp', '../bench/BlurBench.cpp', '../bench/ChromeBench.cpp', -- cgit v1.2.3 From ebeca82c09339a0a34165a20f03619d2dbf12166 Mon Sep 17 00:00:00 2001 From: "bsalomon@google.com" Date: Wed, 2 Nov 2011 19:34:16 +0000 Subject: Changes the SkCanvas::readPixels API. Allows caller to read into prealloced bitmap pixels. Changes how clipping to device bounds is handled. Review URL: http://codereview.appspot.com/5307077/ git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@2584 2bbb7eff-a529-9590-31e7-b0007b416f81 --- tests.gyp | 1 + 1 file changed, 1 insertion(+) diff --git a/tests.gyp b/tests.gyp index d190487..92aba93 100644 --- a/tests.gyp +++ b/tests.gyp @@ -47,6 +47,7 @@ '../tests/PDFPrimitivesTest.cpp', '../tests/PointTest.cpp', '../tests/Reader32Test.cpp', + '../tests/ReadPixelsTest.cpp', '../tests/RefDictTest.cpp', '../tests/RegionTest.cpp', '../tests/Sk64Test.cpp', -- cgit v1.2.3 From 43df1ac54b6e118c1221c3e00590be1397e37efc Mon Sep 17 00:00:00 2001 From: "bsalomon@google.com" Date: Wed, 2 Nov 2011 19:39:51 +0000 Subject: Revert r2584 (new test fails in fixed pt builds) git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@2585 2bbb7eff-a529-9590-31e7-b0007b416f81 --- tests.gyp | 1 - 1 file changed, 1 deletion(-) diff --git a/tests.gyp b/tests.gyp index 92aba93..d190487 100644 --- a/tests.gyp +++ b/tests.gyp @@ -47,7 +47,6 @@ '../tests/PDFPrimitivesTest.cpp', '../tests/PointTest.cpp', '../tests/Reader32Test.cpp', - '../tests/ReadPixelsTest.cpp', '../tests/RefDictTest.cpp', '../tests/RegionTest.cpp', '../tests/Sk64Test.cpp', -- cgit v1.2.3 From cf3cd9673e16f81d2547b79a1806d2f8771eb9be Mon Sep 17 00:00:00 2001 From: "bsalomon@google.com" Date: Wed, 2 Nov 2011 19:57:21 +0000 Subject: Recommit r2584 with gpu pass of the new ReadPixels test disabled in fixed pt (gpu code doesn't work in general in fixed pt). git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@2586 2bbb7eff-a529-9590-31e7-b0007b416f81 --- tests.gyp | 1 + 1 file changed, 1 insertion(+) diff --git a/tests.gyp b/tests.gyp index d190487..92aba93 100644 --- a/tests.gyp +++ b/tests.gyp @@ -47,6 +47,7 @@ '../tests/PDFPrimitivesTest.cpp', '../tests/PointTest.cpp', '../tests/Reader32Test.cpp', + '../tests/ReadPixelsTest.cpp', '../tests/RefDictTest.cpp', '../tests/RegionTest.cpp', '../tests/Sk64Test.cpp', -- cgit v1.2.3 From 6eecc9e994e833925cf47a2523cfbbcb46f003f0 Mon Sep 17 00:00:00 2001 From: "reed@google.com" Date: Wed, 2 Nov 2011 21:02:57 +0000 Subject: add bench for building the font cache git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@2590 2bbb7eff-a529-9590-31e7-b0007b416f81 --- bench.gypi | 1 + 1 file changed, 1 insertion(+) diff --git a/bench.gypi b/bench.gypi index b8f3e58..e993790 100644 --- a/bench.gypi +++ b/bench.gypi @@ -22,6 +22,7 @@ '../bench/BlurBench.cpp', '../bench/ChromeBench.cpp', '../bench/DecodeBench.cpp', + '../bench/FontScalerBench.cpp', '../bench/GradientBench.cpp', '../bench/MathBench.cpp', '../bench/MatrixBench.cpp', -- cgit v1.2.3 From d2e844850ad1f24c8b4c6adcc0a1a86390632ed3 Mon Sep 17 00:00:00 2001 From: "djsollen@google.com" Date: Thu, 3 Nov 2011 13:08:29 +0000 Subject: Adding support to trunk for building Skia using the Android NDK. This CL depends on a subsequent CL to add the appropriate NDK toolchain and system sources to the skia repo. Review URL: http://codereview.appspot.com/5306089/ Review URL: http://codereview.appspot.com/5306089 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@2592 2bbb7eff-a529-9590-31e7-b0007b416f81 --- SampleApp.gyp | 17 +++++- android_system.gyp | 152 +++++++++++++++++++++++++++++++++++++++++++++++++ bench.gypi | 5 +- common_conditions.gypi | 44 ++++++++++++++ core.gyp | 18 ++++++ gpu.gyp | 17 ++++++ images.gyp | 11 +++- opts.gyp | 34 +++++++++-- xml.gyp | 2 +- 9 files changed, 290 insertions(+), 10 deletions(-) create mode 100644 android_system.gyp diff --git a/SampleApp.gyp b/SampleApp.gyp index ba65096..1855fe7 100644 --- a/SampleApp.gyp +++ b/SampleApp.gyp @@ -247,7 +247,22 @@ '../experimental/iOSSampleApp/iPhone/MainWindow_iPhone.xib', ], }], - + [ 'skia_os == "android"', { + # TODO: This doesn't build properly yet, but it's getting there. + 'type': 'shared_library', + 'sources!': [ + '../samplecode/SampleAnimator.cpp', + '../samplecode/SampleUnitMapper.cpp', + ], + 'dependencies!': [ + 'animator.gyp:animator', + 'experimental.gyp:experimental', + ], + 'sources': [ + # TODO add support for the android sample app +# '../samplecode/SampleApp_android.cpp', + ], + }], ], 'msvs_settings': { 'VCLinkerTool': { diff --git a/android_system.gyp b/android_system.gyp new file mode 100644 index 0000000..6818f69 --- /dev/null +++ b/android_system.gyp @@ -0,0 +1,152 @@ +# This GYP file stores the dependencies necessary to build Skia on the Android +# platform. The OS doesn't provide many stable libraries as part of the +# distribution so we have to build a few of them ourselves. +# +# NOTE: We tried adding the gyp file to the android/ directory at the root of +# the Skia repo, but that resulted in the generated makefiles being created +# outside of the out directory. We may be able to move the bulk of this gyp +# to the /android directory and put a simple shim here, but that has yet to be +# tested. + +{ + # Define the location of the required Android sources, allowing for override + # in GYP_DEFINES. + # + # These sources are necessary because they must be built using the Android + # toolchain and they are not expected to be present on the host OS. + # + 'variables': { + 'android_repo%': '../../android_tools', + }, + 'android_repo%': '<(android_repo)', + + 'includes': [ + 'common.gypi', + ], + + 'targets': [ + { + 'target_name': 'ft2', + 'type': 'static_library', + 'sources': [ + '<(android_repo)/external/freetype/src/base/ftbbox.c', + '<(android_repo)/external/freetype/src/base/ftbitmap.c', + '<(android_repo)/external/freetype/src/base/ftglyph.c', + '<(android_repo)/external/freetype/src/base/ftlcdfil.c', + '<(android_repo)/external/freetype/src/base/ftstroke.c', + '<(android_repo)/external/freetype/src/base/ftxf86.c', + '<(android_repo)/external/freetype/src/base/ftbase.c', + '<(android_repo)/external/freetype/src/base/ftsystem.c', + '<(android_repo)/external/freetype/src/base/ftinit.c', + '<(android_repo)/external/freetype/src/base/ftgasp.c', + '<(android_repo)/external/freetype/src/base/ftfstype.c', + '<(android_repo)/external/freetype/src/raster/raster.c', + '<(android_repo)/external/freetype/src/sfnt/sfnt.c', + '<(android_repo)/external/freetype/src/smooth/smooth.c', + '<(android_repo)/external/freetype/src/autofit/autofit.c', + '<(android_repo)/external/freetype/src/truetype/truetype.c', + '<(android_repo)/external/freetype/src/cff/cff.c', + '<(android_repo)/external/freetype/src/psnames/psnames.c', + '<(android_repo)/external/freetype/src/pshinter/pshinter.c', + ], + 'include_dirs': [ + '<(android_repo)/external/freetype/builds', + '<(android_repo)/external/freetype/include', + ], + 'cflags': [ + '-W', + '-Wall', + '-fPIC', + '-DPIC', + '-DDARWIN_NO_CARBON', + '-DFT2_BUILD_LIBRARY', + '-O2', + ], + 'direct_dependent_settings': { + 'include_dirs': [ + '<(android_repo)/external/freetype/include', # For ft2build.h + ], + } + }, + { + 'target_name': 'expat', + 'type': 'static_library', + 'sources': [ + '<(android_repo)/external/expat/lib/xmlparse.c', + '<(android_repo)/external/expat/lib/xmlrole.c', + '<(android_repo)/external/expat/lib/xmltok.c', + ], + 'include_dirs': [ + '<(android_repo)/external/expat', + '<(android_repo)/external/expat/lib', + ], + 'cflags': [ + '-Wall', + '-Wmissing-prototypes', + '-Wstrict-prototypes', + '-fexceptions', + '-DHAVE_EXPAT_CONFIG_H', + ], + 'direct_dependent_settings': { + 'include_dirs': [ + '<(android_repo)/external/expat/lib', # For expat.h + ], + } + }, + { + 'target_name': 'gif', + 'type': 'static_library', + 'sources': [ + '<(android_repo)/external/gif/dgif_lib.c', + '<(android_repo)/external/gif/gifalloc.c', + '<(android_repo)/external/gif/gif_err.c', + ], + 'include_dirs': [ + '<(android_repo)/external/gif', + ], + 'cflags': [ + '-Wno-format', + '-DHAVE_CONFIG_H', + ], + 'direct_dependent_settings': { + 'include_dirs': [ + '<(android_repo)/external/gif', + ], + } + }, + { + 'target_name': 'png', + 'type': 'static_library', + 'sources': [ + '<(android_repo)/external/png/png.c', + '<(android_repo)/external/png/pngerror.c', + '<(android_repo)/external/png/pnggccrd.c', + '<(android_repo)/external/png/pngget.c', + '<(android_repo)/external/png/pngmem.c', + '<(android_repo)/external/png/pngpread.c', + '<(android_repo)/external/png/pngread.c', + '<(android_repo)/external/png/pngrio.c', + '<(android_repo)/external/png/pngrtran.c', + '<(android_repo)/external/png/pngrutil.c', + '<(android_repo)/external/png/pngset.c', + '<(android_repo)/external/png/pngtrans.c', + '<(android_repo)/external/png/pngvcrd.c', + '<(android_repo)/external/png/pngwio.c', + '<(android_repo)/external/png/pngwrite.c', + '<(android_repo)/external/png/pngwtran.c', + '<(android_repo)/external/png/pngwutil.c', + ], + 'include_dirs': [ + '<(android_repo)/external/png', + ], + 'cflags': [ + '-fvisibility=hidden', + ], + 'direct_dependent_settings': { + 'include_dirs': [ + '<(android_repo)/external/png', + ], + } + }, + ] +} \ No newline at end of file diff --git a/bench.gypi b/bench.gypi index e993790..6ac64d1 100644 --- a/bench.gypi +++ b/bench.gypi @@ -40,12 +40,13 @@ '../bench/BenchSysTimer_mach.cpp', ], }], - [ 'skia_os not in ["linux", "freebsd", "openbsd", "solaris"]', { + [ 'skia_os not in ["linux", "freebsd", "openbsd", "solaris", "android"]', { 'sources!': [ '../bench/BenchSysTimer_posix.h', '../bench/BenchSysTimer_posix.cpp', ], - },{ + }], + [ 'skia_os in ["linux", "freebsd", "openbsd", "solaris"]', { 'link_settings': { 'libraries': [ '-lrt', diff --git a/common_conditions.gypi b/common_conditions.gypi index d627998..759d895 100644 --- a/common_conditions.gypi +++ b/common_conditions.gypi @@ -135,6 +135,50 @@ }, }, ], + + ['skia_os == "android"', + { + 'defines': [ + 'ANDROID', # TODO: change these defines to SK_BUILD_FOR_ANDROID + 'SK_BUILD_FOR_ANDROID', + 'SK_BUILD_FOR_ANDROID_NDK', + ], + 'configurations': { + 'Debug': { + 'cflags': ['-g'] + }, + 'Release': { + 'cflags': ['-O2'] + }, + }, + 'libraries': [ + '-lstdc++', + '-lm', + + ], + 'conditions': [ + [ 'skia_target_arch == "arm" and armv7 == 1', { + 'defines': [ + '__ARM_ARCH__=7', + ], + 'cflags': [ + '-march=armv7-a', + ], + 'conditions': [ + [ 'arm_neon == 1', { + 'defines': [ + '__ARM_HAVE_NEON', + ], + 'cflags': [ + '-mfloat-abi=softfp', + '-mfpu=neon', + ], + }], + ], + }], + ], + }, + ], ], # end 'conditions' } diff --git a/core.gyp b/core.gyp index abe9d11..a79af6b 100644 --- a/core.gyp +++ b/core.gyp @@ -340,6 +340,24 @@ '../src/ports/SkTime_win.cpp', ], }], + [ 'skia_os == "android"', { + 'sources!': [ + '../src/opts/opts_check_SSE2.cpp', + ], + 'sources': [ + '../include/core/SkMMapStream.h', + '../src/core/SkMMapStream.cpp', + '../src/ports/SkThread_pthread.cpp', + '../src/ports/SkFontHost_android.cpp', + '../src/ports/SkFontHost_gamma.cpp', + '../src/ports/SkFontHost_FreeType.cpp', + '../src/ports/FontHostConfiguration_android.cpp', + ], + 'dependencies': [ + 'android_system.gyp:ft2', + 'android_system.gyp:expat', + ], + }], ], 'direct_dependent_settings': { 'include_dirs': [ diff --git a/gpu.gyp b/gpu.gyp index a919de7..8b30a12 100644 --- a/gpu.gyp +++ b/gpu.gyp @@ -114,6 +114,8 @@ '../src/gpu/SkGrTexturePixelRef.cpp', '../src/gpu/SkNullGLContext.cpp', + '../src/gpu/android/SkNativeGLContext_android.cpp', + '../src/gpu/mac/SkNativeGLContext_mac.cpp', '../src/gpu/win/SkNativeGLContext_win.cpp', @@ -270,6 +272,8 @@ '../src/gpu/unix/GrGLCreateNativeInterface_unix.cpp', + '../src/gpu/android/GrGLCreateNativeInterface_android.cpp', + '../src/gpu/mesa/GrGLCreateMesaInterface.cpp', ], 'defines': [ @@ -327,6 +331,19 @@ '../src/gpu/GrGLCreateNativeInterface_none.cpp', ], }], + [ 'skia_os == "android"', { + 'sources!': [ + '../src/gpu/GrGLDefaultInterface_none.cpp', + '../src/gpu/GrGLCreateNativeInterface_none.cpp', + ], + 'link_settings': { + 'libraries': [ + '-lGLESv2', + '-lEGL', + '-shared', + ], + }, + }], ], }, ], diff --git a/images.gyp b/images.gyp index b50dd34..4dce2c5 100644 --- a/images.gyp +++ b/images.gyp @@ -116,7 +116,16 @@ }, # end libpng stuff }], - + [ 'skia_os == "android"', { + 'sources!': [ + '../src/images/SkImageDecoder_libjpeg.cpp', + '../src/images/SkJpegUtility.cpp', + ], + 'dependencies': [ + 'android_system.gyp:gif', + 'android_system.gyp:png', + ], + }], ], 'direct_dependent_settings': { 'include_dirs': [ diff --git a/opts.gyp b/opts.gyp index e63b1cb..ae36481 100644 --- a/opts.gyp +++ b/opts.gyp @@ -35,11 +35,35 @@ '-msse2', ], }], - ], - 'sources': [ - '../src/opts/SkBitmapProcState_opts_SSE2.cpp', - '../src/opts/SkBlitRow_opts_SSE2.cpp', - '../src/opts/SkUtils_opts_SSE2.cpp', + [ 'skia_target_arch != "arm"', { + 'sources': [ + '../src/opts/SkBitmapProcState_opts_SSE2.cpp', + '../src/opts/SkBlitRow_opts_SSE2.cpp', + '../src/opts/SkUtils_opts_SSE2.cpp', + ], + }], + [ 'skia_target_arch == "arm" and armv7 == 1', { + # The assembly uses the frame pointer register (r7 in Thumb/r11 in + # ARM), the compiler doesn't like that. + 'cflags!': [ + '-fno-omit-frame-pointer', + ], + 'cflags': [ + '-fomit-frame-pointer', + ], + 'sources': [ + '../src/opts/SkBitmapProcState_opts_arm.cpp', + '../src/opts/SkBlitRow_opts_arm.cpp', + '../src/opts/SkUtils_opts_none.cpp', + ], + }], + [ 'skia_target_arch == "arm" and armv7 != 1', { + 'sources': [ + '../src/opts/SkBitmapProcState_opts_none.cpp', + '../src/opts/SkBlitRow_opts_none.cpp', + '../src/opts/SkUtils_opts_none.cpp', + ], + }], ], }, ], diff --git a/xml.gyp b/xml.gyp index 5c9edb2..7da8666 100644 --- a/xml.gyp +++ b/xml.gyp @@ -33,7 +33,7 @@ '../src/xml/SkXMLPullParser.cpp', #if 0 around class decl in header ], 'conditions': [ - [ 'skia_os in ["win", "mac", "linux", "freebsd", "openbsd", "solaris"]', { + [ 'skia_os in ["win", "mac", "linux", "freebsd", "openbsd", "solaris", "android"]', { 'sources!': [ # no jsapi.h by default on system '../include/xml/SkJS.h', -- cgit v1.2.3 From b0007a45d7ad47b86f7dac52e5faafc8205febf8 Mon Sep 17 00:00:00 2001 From: "djsollen@google.com" Date: Thu, 3 Nov 2011 13:13:27 +0000 Subject: Fix for missing file from previous CL that broke the build. The file defines skia_target_arch to '' for non-arm platforms. git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@2593 2bbb7eff-a529-9590-31e7-b0007b416f81 --- common_variables.gypi | 2 ++ 1 file changed, 2 insertions(+) diff --git a/common_variables.gypi b/common_variables.gypi index 42e7c22..94e2b9b 100644 --- a/common_variables.gypi +++ b/common_variables.gypi @@ -10,10 +10,12 @@ 'skia_scalar%': 'float', 'skia_os%': '<(OS)', 'skia_mesa%': 0, + 'skia_target_arch%': '', }, 'skia_scalar%': '<(skia_scalar)', 'skia_os': '<(skia_os)', 'skia_mesa': '<(skia_mesa)', + 'skia_target_arch': '<(skia_target_arch)', } # Local Variables: -- cgit v1.2.3 From 20f6db7e43737d61f2224801a52c046ff194eca3 Mon Sep 17 00:00:00 2001 From: "djsollen@google.com" Date: Thu, 3 Nov 2011 17:31:41 +0000 Subject: Update the Skia gyp files to use the external android sources. Review URL: http://codereview.appspot.com/5336048 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@2598 2bbb7eff-a529-9590-31e7-b0007b416f81 --- android_system.gyp | 106 ++++++++++++++++++++++++------------------------- common_conditions.gypi | 5 +++ 2 files changed, 58 insertions(+), 53 deletions(-) diff --git a/android_system.gyp b/android_system.gyp index 6818f69..85e70b8 100644 --- a/android_system.gyp +++ b/android_system.gyp @@ -16,7 +16,7 @@ # toolchain and they are not expected to be present on the host OS. # 'variables': { - 'android_repo%': '../../android_tools', + 'android_repo%': '../../android', }, 'android_repo%': '<(android_repo)', @@ -29,29 +29,29 @@ 'target_name': 'ft2', 'type': 'static_library', 'sources': [ - '<(android_repo)/external/freetype/src/base/ftbbox.c', - '<(android_repo)/external/freetype/src/base/ftbitmap.c', - '<(android_repo)/external/freetype/src/base/ftglyph.c', - '<(android_repo)/external/freetype/src/base/ftlcdfil.c', - '<(android_repo)/external/freetype/src/base/ftstroke.c', - '<(android_repo)/external/freetype/src/base/ftxf86.c', - '<(android_repo)/external/freetype/src/base/ftbase.c', - '<(android_repo)/external/freetype/src/base/ftsystem.c', - '<(android_repo)/external/freetype/src/base/ftinit.c', - '<(android_repo)/external/freetype/src/base/ftgasp.c', - '<(android_repo)/external/freetype/src/base/ftfstype.c', - '<(android_repo)/external/freetype/src/raster/raster.c', - '<(android_repo)/external/freetype/src/sfnt/sfnt.c', - '<(android_repo)/external/freetype/src/smooth/smooth.c', - '<(android_repo)/external/freetype/src/autofit/autofit.c', - '<(android_repo)/external/freetype/src/truetype/truetype.c', - '<(android_repo)/external/freetype/src/cff/cff.c', - '<(android_repo)/external/freetype/src/psnames/psnames.c', - '<(android_repo)/external/freetype/src/pshinter/pshinter.c', + '<(android_repo)/third_party/externals/freetype/src/base/ftbbox.c', + '<(android_repo)/third_party/externals/freetype/src/base/ftbitmap.c', + '<(android_repo)/third_party/externals/freetype/src/base/ftglyph.c', + '<(android_repo)/third_party/externals/freetype/src/base/ftlcdfil.c', + '<(android_repo)/third_party/externals/freetype/src/base/ftstroke.c', + '<(android_repo)/third_party/externals/freetype/src/base/ftxf86.c', + '<(android_repo)/third_party/externals/freetype/src/base/ftbase.c', + '<(android_repo)/third_party/externals/freetype/src/base/ftsystem.c', + '<(android_repo)/third_party/externals/freetype/src/base/ftinit.c', + '<(android_repo)/third_party/externals/freetype/src/base/ftgasp.c', +# '<(android_repo)/third_party/externals/freetype/src/base/ftfstype.c', + '<(android_repo)/third_party/externals/freetype/src/raster/raster.c', + '<(android_repo)/third_party/externals/freetype/src/sfnt/sfnt.c', + '<(android_repo)/third_party/externals/freetype/src/smooth/smooth.c', + '<(android_repo)/third_party/externals/freetype/src/autofit/autofit.c', + '<(android_repo)/third_party/externals/freetype/src/truetype/truetype.c', + '<(android_repo)/third_party/externals/freetype/src/cff/cff.c', + '<(android_repo)/third_party/externals/freetype/src/psnames/psnames.c', + '<(android_repo)/third_party/externals/freetype/src/pshinter/pshinter.c', ], 'include_dirs': [ - '<(android_repo)/external/freetype/builds', - '<(android_repo)/external/freetype/include', + '<(android_repo)/third_party/externals/freetype/builds', + '<(android_repo)/third_party/externals/freetype/include', ], 'cflags': [ '-W', @@ -64,7 +64,7 @@ ], 'direct_dependent_settings': { 'include_dirs': [ - '<(android_repo)/external/freetype/include', # For ft2build.h + '<(android_repo)/third_party/externals/freetype/include', # For ft2build.h ], } }, @@ -72,13 +72,13 @@ 'target_name': 'expat', 'type': 'static_library', 'sources': [ - '<(android_repo)/external/expat/lib/xmlparse.c', - '<(android_repo)/external/expat/lib/xmlrole.c', - '<(android_repo)/external/expat/lib/xmltok.c', + '<(android_repo)/third_party/externals/expat/lib/xmlparse.c', + '<(android_repo)/third_party/externals/expat/lib/xmlrole.c', + '<(android_repo)/third_party/externals/expat/lib/xmltok.c', ], 'include_dirs': [ - '<(android_repo)/external/expat', - '<(android_repo)/external/expat/lib', + '<(android_repo)/third_party/externals/expat', + '<(android_repo)/third_party/externals/expat/lib', ], 'cflags': [ '-Wall', @@ -89,7 +89,7 @@ ], 'direct_dependent_settings': { 'include_dirs': [ - '<(android_repo)/external/expat/lib', # For expat.h + '<(android_repo)/third_party/externals/expat/lib', # For expat.h ], } }, @@ -97,12 +97,12 @@ 'target_name': 'gif', 'type': 'static_library', 'sources': [ - '<(android_repo)/external/gif/dgif_lib.c', - '<(android_repo)/external/gif/gifalloc.c', - '<(android_repo)/external/gif/gif_err.c', + '<(android_repo)/third_party/externals/gif/dgif_lib.c', + '<(android_repo)/third_party/externals/gif/gifalloc.c', + '<(android_repo)/third_party/externals/gif/gif_err.c', ], 'include_dirs': [ - '<(android_repo)/external/gif', + '<(android_repo)/third_party/externals/gif', ], 'cflags': [ '-Wno-format', @@ -110,7 +110,7 @@ ], 'direct_dependent_settings': { 'include_dirs': [ - '<(android_repo)/external/gif', + '<(android_repo)/third_party/externals/gif', ], } }, @@ -118,33 +118,33 @@ 'target_name': 'png', 'type': 'static_library', 'sources': [ - '<(android_repo)/external/png/png.c', - '<(android_repo)/external/png/pngerror.c', - '<(android_repo)/external/png/pnggccrd.c', - '<(android_repo)/external/png/pngget.c', - '<(android_repo)/external/png/pngmem.c', - '<(android_repo)/external/png/pngpread.c', - '<(android_repo)/external/png/pngread.c', - '<(android_repo)/external/png/pngrio.c', - '<(android_repo)/external/png/pngrtran.c', - '<(android_repo)/external/png/pngrutil.c', - '<(android_repo)/external/png/pngset.c', - '<(android_repo)/external/png/pngtrans.c', - '<(android_repo)/external/png/pngvcrd.c', - '<(android_repo)/external/png/pngwio.c', - '<(android_repo)/external/png/pngwrite.c', - '<(android_repo)/external/png/pngwtran.c', - '<(android_repo)/external/png/pngwutil.c', + '<(android_repo)/third_party/externals/png/png.c', + '<(android_repo)/third_party/externals/png/pngerror.c', + '<(android_repo)/third_party/externals/png/pnggccrd.c', + '<(android_repo)/third_party/externals/png/pngget.c', + '<(android_repo)/third_party/externals/png/pngmem.c', + '<(android_repo)/third_party/externals/png/pngpread.c', + '<(android_repo)/third_party/externals/png/pngread.c', + '<(android_repo)/third_party/externals/png/pngrio.c', + '<(android_repo)/third_party/externals/png/pngrtran.c', + '<(android_repo)/third_party/externals/png/pngrutil.c', + '<(android_repo)/third_party/externals/png/pngset.c', + '<(android_repo)/third_party/externals/png/pngtrans.c', + '<(android_repo)/third_party/externals/png/pngvcrd.c', + '<(android_repo)/third_party/externals/png/pngwio.c', + '<(android_repo)/third_party/externals/png/pngwrite.c', + '<(android_repo)/third_party/externals/png/pngwtran.c', + '<(android_repo)/third_party/externals/png/pngwutil.c', ], 'include_dirs': [ - '<(android_repo)/external/png', + '<(android_repo)/third_party/externals/png', ], 'cflags': [ '-fvisibility=hidden', ], 'direct_dependent_settings': { 'include_dirs': [ - '<(android_repo)/external/png', + '<(android_repo)/third_party/externals/png', ], } }, diff --git a/common_conditions.gypi b/common_conditions.gypi index 759d895..766a04f 100644 --- a/common_conditions.gypi +++ b/common_conditions.gypi @@ -157,6 +157,11 @@ ], 'conditions': [ + [ 'skia_target_arch == "arm" and arm_thumb == 1', { + 'cflags': [ + '-mthumb', + ], + }], [ 'skia_target_arch == "arm" and armv7 == 1', { 'defines': [ '__ARM_ARCH__=7', -- cgit v1.2.3 From f79d4aa7ac9a54263e4c0bb8ca94e81942b6043a Mon Sep 17 00:00:00 2001 From: "djsollen@google.com" Date: Fri, 4 Nov 2011 13:00:18 +0000 Subject: Move the Android sample app into the android repo. Review URL: http://codereview.appspot.com/5332054 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@2602 2bbb7eff-a529-9590-31e7-b0007b416f81 --- SampleApp.gyp | 7 +-- android_system.gyp | 153 ++++------------------------------------------------- 2 files changed, 13 insertions(+), 147 deletions(-) diff --git a/SampleApp.gyp b/SampleApp.gyp index 1855fe7..3f468f8 100644 --- a/SampleApp.gyp +++ b/SampleApp.gyp @@ -248,8 +248,6 @@ ], }], [ 'skia_os == "android"', { - # TODO: This doesn't build properly yet, but it's getting there. - 'type': 'shared_library', 'sources!': [ '../samplecode/SampleAnimator.cpp', '../samplecode/SampleUnitMapper.cpp', @@ -258,9 +256,8 @@ 'animator.gyp:animator', 'experimental.gyp:experimental', ], - 'sources': [ - # TODO add support for the android sample app -# '../samplecode/SampleApp_android.cpp', + 'dependencies': [ + 'android_system.gyp:sampleApp', ], }], ], diff --git a/android_system.gyp b/android_system.gyp index 85e70b8..27a82f3 100644 --- a/android_system.gyp +++ b/android_system.gyp @@ -2,151 +2,20 @@ # platform. The OS doesn't provide many stable libraries as part of the # distribution so we have to build a few of them ourselves. # -# NOTE: We tried adding the gyp file to the android/ directory at the root of +# We tried adding this gyp file to the android directory at the root of # the Skia repo, but that resulted in the generated makefiles being created -# outside of the out directory. We may be able to move the bulk of this gyp -# to the /android directory and put a simple shim here, but that has yet to be -# tested. - +# outside of the intended output directory. So to avoid this we created a simple +# shim here that includes the android_system.gypi file. The actual dependencies +# are defined and maintained in that gypi file. +# +# Also this assumes that the android directory is a sibling to the directory +# that contains your primary Skia checkout. If it is not then you must manually +# edit the includes below to specify the actual location of the android.gypi. +# This is due to the fact that we cannot use variables in an includes as the +# variable expansion step for gyp happens after the includes are processed. { - # Define the location of the required Android sources, allowing for override - # in GYP_DEFINES. - # - # These sources are necessary because they must be built using the Android - # toolchain and they are not expected to be present on the host OS. - # - 'variables': { - 'android_repo%': '../../android', - }, - 'android_repo%': '<(android_repo)', - 'includes': [ 'common.gypi', + '../../android/gyp/android.gypi', ], - - 'targets': [ - { - 'target_name': 'ft2', - 'type': 'static_library', - 'sources': [ - '<(android_repo)/third_party/externals/freetype/src/base/ftbbox.c', - '<(android_repo)/third_party/externals/freetype/src/base/ftbitmap.c', - '<(android_repo)/third_party/externals/freetype/src/base/ftglyph.c', - '<(android_repo)/third_party/externals/freetype/src/base/ftlcdfil.c', - '<(android_repo)/third_party/externals/freetype/src/base/ftstroke.c', - '<(android_repo)/third_party/externals/freetype/src/base/ftxf86.c', - '<(android_repo)/third_party/externals/freetype/src/base/ftbase.c', - '<(android_repo)/third_party/externals/freetype/src/base/ftsystem.c', - '<(android_repo)/third_party/externals/freetype/src/base/ftinit.c', - '<(android_repo)/third_party/externals/freetype/src/base/ftgasp.c', -# '<(android_repo)/third_party/externals/freetype/src/base/ftfstype.c', - '<(android_repo)/third_party/externals/freetype/src/raster/raster.c', - '<(android_repo)/third_party/externals/freetype/src/sfnt/sfnt.c', - '<(android_repo)/third_party/externals/freetype/src/smooth/smooth.c', - '<(android_repo)/third_party/externals/freetype/src/autofit/autofit.c', - '<(android_repo)/third_party/externals/freetype/src/truetype/truetype.c', - '<(android_repo)/third_party/externals/freetype/src/cff/cff.c', - '<(android_repo)/third_party/externals/freetype/src/psnames/psnames.c', - '<(android_repo)/third_party/externals/freetype/src/pshinter/pshinter.c', - ], - 'include_dirs': [ - '<(android_repo)/third_party/externals/freetype/builds', - '<(android_repo)/third_party/externals/freetype/include', - ], - 'cflags': [ - '-W', - '-Wall', - '-fPIC', - '-DPIC', - '-DDARWIN_NO_CARBON', - '-DFT2_BUILD_LIBRARY', - '-O2', - ], - 'direct_dependent_settings': { - 'include_dirs': [ - '<(android_repo)/third_party/externals/freetype/include', # For ft2build.h - ], - } - }, - { - 'target_name': 'expat', - 'type': 'static_library', - 'sources': [ - '<(android_repo)/third_party/externals/expat/lib/xmlparse.c', - '<(android_repo)/third_party/externals/expat/lib/xmlrole.c', - '<(android_repo)/third_party/externals/expat/lib/xmltok.c', - ], - 'include_dirs': [ - '<(android_repo)/third_party/externals/expat', - '<(android_repo)/third_party/externals/expat/lib', - ], - 'cflags': [ - '-Wall', - '-Wmissing-prototypes', - '-Wstrict-prototypes', - '-fexceptions', - '-DHAVE_EXPAT_CONFIG_H', - ], - 'direct_dependent_settings': { - 'include_dirs': [ - '<(android_repo)/third_party/externals/expat/lib', # For expat.h - ], - } - }, - { - 'target_name': 'gif', - 'type': 'static_library', - 'sources': [ - '<(android_repo)/third_party/externals/gif/dgif_lib.c', - '<(android_repo)/third_party/externals/gif/gifalloc.c', - '<(android_repo)/third_party/externals/gif/gif_err.c', - ], - 'include_dirs': [ - '<(android_repo)/third_party/externals/gif', - ], - 'cflags': [ - '-Wno-format', - '-DHAVE_CONFIG_H', - ], - 'direct_dependent_settings': { - 'include_dirs': [ - '<(android_repo)/third_party/externals/gif', - ], - } - }, - { - 'target_name': 'png', - 'type': 'static_library', - 'sources': [ - '<(android_repo)/third_party/externals/png/png.c', - '<(android_repo)/third_party/externals/png/pngerror.c', - '<(android_repo)/third_party/externals/png/pnggccrd.c', - '<(android_repo)/third_party/externals/png/pngget.c', - '<(android_repo)/third_party/externals/png/pngmem.c', - '<(android_repo)/third_party/externals/png/pngpread.c', - '<(android_repo)/third_party/externals/png/pngread.c', - '<(android_repo)/third_party/externals/png/pngrio.c', - '<(android_repo)/third_party/externals/png/pngrtran.c', - '<(android_repo)/third_party/externals/png/pngrutil.c', - '<(android_repo)/third_party/externals/png/pngset.c', - '<(android_repo)/third_party/externals/png/pngtrans.c', - '<(android_repo)/third_party/externals/png/pngvcrd.c', - '<(android_repo)/third_party/externals/png/pngwio.c', - '<(android_repo)/third_party/externals/png/pngwrite.c', - '<(android_repo)/third_party/externals/png/pngwtran.c', - '<(android_repo)/third_party/externals/png/pngwutil.c', - ], - 'include_dirs': [ - '<(android_repo)/third_party/externals/png', - ], - 'cflags': [ - '-fvisibility=hidden', - ], - 'direct_dependent_settings': { - 'include_dirs': [ - '<(android_repo)/third_party/externals/png', - ], - } - }, - ] } \ No newline at end of file -- cgit v1.2.3 From c25e2e6753ca7b3dbbb8ae39a613b61047acd1bd Mon Sep 17 00:00:00 2001 From: "bungeman@google.com" Date: Fri, 4 Nov 2011 15:47:41 +0000 Subject: Add font scaler gm. http://codereview.appspot.com/5337044/ git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@2603 2bbb7eff-a529-9590-31e7-b0007b416f81 --- gmslides.gypi | 1 + 1 file changed, 1 insertion(+) diff --git a/gmslides.gypi b/gmslides.gypi index f772993..8a97b0c 100644 --- a/gmslides.gypi +++ b/gmslides.gypi @@ -10,6 +10,7 @@ '../gm/emptypath.cpp', '../gm/filltypes.cpp', '../gm/filltypespersp.cpp', + '../gm/fontscaler.cpp', '../gm/gradients.cpp', '../gm/hairmodes.cpp', '../gm/lcdtext.cpp', -- cgit v1.2.3 From 4a6af61e1069288aa837ea12876c4baf301e28df Mon Sep 17 00:00:00 2001 From: "bungeman@google.com" Date: Fri, 4 Nov 2011 16:06:33 +0000 Subject: Back out fontscaler gm, as it seems to show up a gpu issue. git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@2604 2bbb7eff-a529-9590-31e7-b0007b416f81 --- gmslides.gypi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gmslides.gypi b/gmslides.gypi index 8a97b0c..e7cc883 100644 --- a/gmslides.gypi +++ b/gmslides.gypi @@ -10,7 +10,7 @@ '../gm/emptypath.cpp', '../gm/filltypes.cpp', '../gm/filltypespersp.cpp', - '../gm/fontscaler.cpp', +# '../gm/fontscaler.cpp', '../gm/gradients.cpp', '../gm/hairmodes.cpp', '../gm/lcdtext.cpp', -- cgit v1.2.3 From cdb3c6a74a55c1a01e18d8f660a7ce3d186c2ef3 Mon Sep 17 00:00:00 2001 From: "bsalomon@google.com" Date: Mon, 7 Nov 2011 14:56:51 +0000 Subject: Add support for GL_ARB_texture_swizzle Review URL: http://codereview.appspot.com/5347042/ git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@2615 2bbb7eff-a529-9590-31e7-b0007b416f81 --- gpu.gyp | 1 + 1 file changed, 1 insertion(+) diff --git a/gpu.gyp b/gpu.gyp index 8b30a12..3a6a730 100644 --- a/gpu.gyp +++ b/gpu.gyp @@ -157,6 +157,7 @@ '../include/gpu/GrFontScaler.h', '../include/gpu/GrGLConfig.h', '../include/gpu/GrGLConfig_chrome.h', + '../include/gpu/GrGLDefines.h', '../include/gpu/GrGLInterface.h', '../include/gpu/GrGlyph.h', '../include/gpu/GrInstanceCounter.h', -- cgit v1.2.3 From 5ce7f54674929cf20b5dfe1a3d465003de8e1117 Mon Sep 17 00:00:00 2001 From: "djsollen@google.com" Date: Mon, 7 Nov 2011 15:43:57 +0000 Subject: Add support for building Android SampleApp. Review URL: http://codereview.appspot.com/5342051 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@2617 2bbb7eff-a529-9590-31e7-b0007b416f81 --- views.gyp | 15 +++++++++++++++ zlib.gyp | 2 +- 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/views.gyp b/views.gyp index 6d91c28..e91b28e 100644 --- a/views.gyp +++ b/views.gyp @@ -86,6 +86,21 @@ '../unix_test_app/main.cpp', ], }], + [ 'skia_os == "android"', { + # Android does not support animator so we need to remove all files + # that have references to it. + 'include_dirs!': [ + '../include/animator', + ], + 'sources!': [ + '../src/views/SkBorderView.cpp', + '../src/views/SkImageView.cpp', + '../src/views/SkProgressBarView.cpp', + '../src/views/SkScrollBarView.cpp', + '../src/views/SkStaticTextView.cpp', + '../src/views/SkWidgetViews.cpp', + ], + }], ], 'direct_dependent_settings': { 'include_dirs': [ diff --git a/zlib.gyp b/zlib.gyp index 7665505..5ed9d14 100644 --- a/zlib.gyp +++ b/zlib.gyp @@ -24,7 +24,7 @@ }, 'defines': [ 'SK_ZLIB_INCLUDE=', ], }], - [ 'skia_os in ["linux", "freebsd", "openbsd", "solaris"]', { + [ 'skia_os in ["linux", "freebsd", "openbsd", "solaris", "android"]', { 'link_settings': { 'libraries': [ '-lz', ], }, 'defines': [ 'SK_ZLIB_INCLUDE=', ], }], -- cgit v1.2.3 From 9e94c393db94a9e046d9a9e2ec1d86b0c3404dd2 Mon Sep 17 00:00:00 2001 From: "bungeman@google.com" Date: Mon, 7 Nov 2011 16:33:40 +0000 Subject: Add font scaler gm. http://codereview.appspot.com/5337044/ git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@2619 2bbb7eff-a529-9590-31e7-b0007b416f81 --- gmslides.gypi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gmslides.gypi b/gmslides.gypi index e7cc883..8a97b0c 100644 --- a/gmslides.gypi +++ b/gmslides.gypi @@ -10,7 +10,7 @@ '../gm/emptypath.cpp', '../gm/filltypes.cpp', '../gm/filltypespersp.cpp', -# '../gm/fontscaler.cpp', + '../gm/fontscaler.cpp', '../gm/gradients.cpp', '../gm/hairmodes.cpp', '../gm/lcdtext.cpp', -- cgit v1.2.3 From 5f8446d15fff26e2662c695faacf97283ef0016b Mon Sep 17 00:00:00 2001 From: "djsollen@google.com" Date: Tue, 8 Nov 2011 19:03:43 +0000 Subject: Cleanup for the Android build. git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@2630 2bbb7eff-a529-9590-31e7-b0007b416f81 --- common_conditions.gypi | 2 +- core.gyp | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/common_conditions.gypi b/common_conditions.gypi index 766a04f..bf3252d 100644 --- a/common_conditions.gypi +++ b/common_conditions.gypi @@ -154,7 +154,7 @@ 'libraries': [ '-lstdc++', '-lm', - + '-llog', ], 'conditions': [ [ 'skia_target_arch == "arm" and arm_thumb == 1', { diff --git a/core.gyp b/core.gyp index a79af6b..00db957 100644 --- a/core.gyp +++ b/core.gyp @@ -343,10 +343,12 @@ [ 'skia_os == "android"', { 'sources!': [ '../src/opts/opts_check_SSE2.cpp', + '../src/ports/SkDebug_stdio.cpp', ], 'sources': [ '../include/core/SkMMapStream.h', '../src/core/SkMMapStream.cpp', + '../src/ports/SkDebug_android.cpp', '../src/ports/SkThread_pthread.cpp', '../src/ports/SkFontHost_android.cpp', '../src/ports/SkFontHost_gamma.cpp', -- cgit v1.2.3 From c4444405151d69514713819c420ebce3ef33d433 Mon Sep 17 00:00:00 2001 From: "senorblanco@chromium.org" Date: Wed, 9 Nov 2011 16:05:58 +0000 Subject: Implement Gaussian blurs for images. The caller creates an an SkBlurImageFilter, sets it on an SkPaint, passes that paint to saveLayer(), draws the primitives which are to be blurred, then calls restore(), which applies the blur. The blurs have separate sizes in the horizontal and vertical direction. This feature is GPU-only for now. NB: Due to the clipping change, there are slight pixel differences on the blurs_gpu and shadows_gpu tests, so those will require rebaselining on all platforms, as will some of the WebKit layout tests (TBD). Review URL: http://codereview.appspot.com/5322068/ git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@2643 2bbb7eff-a529-9590-31e7-b0007b416f81 --- effects.gyp | 2 ++ gmslides.gypi | 1 + 2 files changed, 3 insertions(+) diff --git a/effects.gyp b/effects.gyp index 3b67838..81e8fa8 100644 --- a/effects.gyp +++ b/effects.gyp @@ -16,6 +16,7 @@ '../include/effects/Sk2DPathEffect.h', '../include/effects/SkAvoidXfermode.h', '../include/effects/SkBlurDrawLooper.h', + '../include/effects/SkBlurImageFilter.h', '../include/effects/SkBlurMaskFilter.h', '../include/effects/SkColorMatrix.h', '../include/effects/SkColorMatrixFilter.h', @@ -43,6 +44,7 @@ '../src/effects/SkBlurDrawLooper.cpp', '../src/effects/SkBlurMask.cpp', '../src/effects/SkBlurMask.h', + '../src/effects/SkBlurImageFilter.cpp', '../src/effects/SkBlurMaskFilter.cpp', '../src/effects/SkColorFilters.cpp', '../src/effects/SkColorMatrixFilter.cpp', diff --git a/gmslides.gypi b/gmslides.gypi index 8a97b0c..3eb6604 100644 --- a/gmslides.gypi +++ b/gmslides.gypi @@ -13,6 +13,7 @@ '../gm/fontscaler.cpp', '../gm/gradients.cpp', '../gm/hairmodes.cpp', + '../gm/imageblur.cpp', '../gm/lcdtext.cpp', '../gm/ninepatchstretch.cpp', '../gm/nocolorbleed.cpp', -- cgit v1.2.3 From 3781aaf188d8e5f8de77cf76683495cb6319e680 Mon Sep 17 00:00:00 2001 From: "senorblanco@chromium.org" Date: Wed, 9 Nov 2011 17:02:15 +0000 Subject: Build fix; unreviewed. Remove the imageblur test from gmslides.gypi for now, since SkPicture output is incorrect. SkImageFilter is not flattenable, so the output is black. git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@2647 2bbb7eff-a529-9590-31e7-b0007b416f81 --- gmslides.gypi | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/gmslides.gypi b/gmslides.gypi index 3eb6604..ca78e79 100644 --- a/gmslides.gypi +++ b/gmslides.gypi @@ -13,7 +13,9 @@ '../gm/fontscaler.cpp', '../gm/gradients.cpp', '../gm/hairmodes.cpp', - '../gm/imageblur.cpp', +# commented out until SkPicture support for SkImageFilter is complete +# See http://code.google.com/p/skia/issues/detail?id=391 +# '../gm/imageblur.cpp', '../gm/lcdtext.cpp', '../gm/ninepatchstretch.cpp', '../gm/nocolorbleed.cpp', -- cgit v1.2.3 From 9c93a2c742dd003c463e64e722a8f0155ec0f164 Mon Sep 17 00:00:00 2001 From: "reed@google.com" Date: Thu, 10 Nov 2011 15:00:52 +0000 Subject: add initial gyp to build freetype lib (problems with cflags not showing up in xcode) git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@2655 2bbb7eff-a529-9590-31e7-b0007b416f81 --- freetype.gyp | 69 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 69 insertions(+) create mode 100644 freetype.gyp diff --git a/freetype.gyp b/freetype.gyp new file mode 100644 index 0000000..e86a338 --- /dev/null +++ b/freetype.gyp @@ -0,0 +1,69 @@ +{ +# 'includes': [ +# 'common.gypi', +# ], + 'targets': [ + { + 'target_name': 'skfreetype', + 'type': 'static_library', + 'sources': [ + '../third_party/freetype/src/base/ftbbox.c', + '../third_party/freetype/src/base/ftbitmap.c', + '../third_party/freetype/src/base/ftglyph.c', + '../third_party/freetype/src/base/ftlcdfil.c', + '../third_party/freetype/src/base/ftstroke.c', + '../third_party/freetype/src/base/ftxf86.c', + '../third_party/freetype/src/base/ftbase.c', + '../third_party/freetype/src/base/ftsystem.c', + '../third_party/freetype/src/base/ftinit.c', + '../third_party/freetype/src/base/ftgasp.c', + '../third_party/freetype/src/base/ftfstype.c', + '../third_party/freetype/src/raster/raster.c', + '../third_party/freetype/src/sfnt/sfnt.c', + '../third_party/freetype/src/smooth/smooth.c', + '../third_party/freetype/src/autofit/autofit.c', + '../third_party/freetype/src/truetype/truetype.c', + '../third_party/freetype/src/cff/cff.c', + '../third_party/freetype/src/psnames/psnames.c', + '../third_party/freetype/src/pshinter/pshinter.c', + +# added for linker + '../third_party/freetype/src/lzw/ftlzw.c', + '../third_party/freetype/src/gzip/ftgzip.c', + '../third_party/freetype/src/cid/type1cid.c', + '../third_party/freetype/src/bdf/bdf.c', + '../third_party/freetype/src/psaux/psaux.c', + '../third_party/freetype/src/pcf/pcf.c', + '../third_party/freetype/src/pfr/pfr.c', + '../third_party/freetype/src/type1/type1.c', + '../third_party/freetype/src/type42/type42.c', + '../third_party/freetype/src/winfonts/winfnt.c', + ], + 'include_dirs': [ + '../third_party/freetype/internal', + '../third_party/freetype/builds', + '../third_party/freetype/include', + '../third_party/freetype', + ], + 'cflags': [ + '-W', + '-Wall', + '-fPIC', + '-DPIC', + '-DDARWIN_NO_CARBON', + '-DFT2_BUILD_LIBRARY', + ], + 'direct_dependent_settings': { + 'include_dirs': [ + '../third_party/freetype/include', # For ft2build.h + ], + }, + }, + ], +} + +# Local Variables: +# tab-width:2 +# indent-tabs-mode:nil +# End: +# vim: set expandtab tabstop=2 shiftwidth=2: -- cgit v1.2.3 From 5d8fa0daf390c28e177c98e3f4cbcc47880d60b9 Mon Sep 17 00:00:00 2001 From: "reed@google.com" Date: Thu, 10 Nov 2011 15:20:49 +0000 Subject: add vertical-text bit to paint (not supported yet) check-point for using freetype on mac (not enabled yet) git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@2657 2bbb7eff-a529-9590-31e7-b0007b416f81 --- core.gyp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/core.gyp b/core.gyp index 00db957..ca07529 100644 --- a/core.gyp +++ b/core.gyp @@ -283,6 +283,7 @@ [ 'skia_os == "mac"', { 'include_dirs': [ '../include/utils/mac', + '../third_party/freetype/include/**', ], 'sources': [ '../include/core/SkMMapStream.h', @@ -290,7 +291,9 @@ '../src/core/SkMMapStream.cpp', '../src/ports/SkFontHost_mac_coretext.cpp', - +# '../src/ports/SkFontHost_FreeType.cpp', +# '../src/ports/SkFontHost_freetype_mac.cpp', +# '../src/ports/SkFontHost_gamma_none.cpp', '../src/ports/SkThread_pthread.cpp', ], 'link_settings': { -- cgit v1.2.3 From 063b1de3a4977373d5db50628c722794af547b57 Mon Sep 17 00:00:00 2001 From: "reed@google.com" Date: Thu, 10 Nov 2011 20:06:01 +0000 Subject: add test gm for vertical text git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@2661 2bbb7eff-a529-9590-31e7-b0007b416f81 --- gmslides.gypi | 1 + 1 file changed, 1 insertion(+) diff --git a/gmslides.gypi b/gmslides.gypi index ca78e79..576d129 100644 --- a/gmslides.gypi +++ b/gmslides.gypi @@ -30,6 +30,7 @@ '../gm/texdata.cpp', '../gm/tilemodes.cpp', '../gm/tinybitmap.cpp', + '../gm/verttext.cpp', '../gm/xfermodes.cpp', ], } -- cgit v1.2.3 From 35e00e820490cca1df73ba5651b0cd9cfd67afd0 Mon Sep 17 00:00:00 2001 From: "bsalomon@google.com" Date: Thu, 10 Nov 2011 20:57:43 +0000 Subject: Add config8888 support to writePixels Review URL: http://codereview.appspot.com/5374052/ git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@2662 2bbb7eff-a529-9590-31e7-b0007b416f81 --- core.gyp | 1 + tests.gyp | 1 + 2 files changed, 2 insertions(+) diff --git a/core.gyp b/core.gyp index ca07529..341eb4f 100644 --- a/core.gyp +++ b/core.gyp @@ -52,6 +52,7 @@ '../src/core/SkComposeShader.cpp', '../src/core/SkConcaveToTriangles.cpp', '../src/core/SkConcaveToTriangles.h', + '../src/core/SkConfig8888.h', '../src/core/SkCordic.cpp', '../src/core/SkCordic.h', '../src/core/SkCoreBlitters.h', diff --git a/tests.gyp b/tests.gyp index 92aba93..872f035 100644 --- a/tests.gyp +++ b/tests.gyp @@ -61,6 +61,7 @@ '../tests/TestSize.cpp', '../tests/ToUnicode.cpp', '../tests/UtilsTest.cpp', + '../tests/WritePixelsTest.cpp', '../tests/Writer32Test.cpp', '../tests/XfermodeTest.cpp', ], -- cgit v1.2.3 From f6532e349765752646759899f7d3e7b4f1c20972 Mon Sep 17 00:00:00 2001 From: "vandebo@chromium.org" Date: Fri, 11 Nov 2011 19:38:54 +0000 Subject: [PDF] Optimize W-array generation with respect to subsetted fonts and add test. Testing framework originally from http://codereview.appspot.com/4916044 Review URL: http://codereview.appspot.com/5379041 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@2667 2bbb7eff-a529-9590-31e7-b0007b416f81 --- tests.gyp | 1 + 1 file changed, 1 insertion(+) diff --git a/tests.gyp b/tests.gyp index 872f035..4d35312 100644 --- a/tests.gyp +++ b/tests.gyp @@ -61,6 +61,7 @@ '../tests/TestSize.cpp', '../tests/ToUnicode.cpp', '../tests/UtilsTest.cpp', + '../tests/WArrayTest.cpp', '../tests/WritePixelsTest.cpp', '../tests/Writer32Test.cpp', '../tests/XfermodeTest.cpp', -- cgit v1.2.3 From 8facbfd4b0e560de1a9cb09ee01733ce6bee3ced Mon Sep 17 00:00:00 2001 From: "tomhudson@google.com" Date: Mon, 14 Nov 2011 17:30:08 +0000 Subject: New SkMutex benchmark - used when we suspected mutex performance issues; committed not because they're a bottleneck now but because we might do something with them in the future & it's quite lightweight. git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@2675 2bbb7eff-a529-9590-31e7-b0007b416f81 --- bench.gypi | 1 + 1 file changed, 1 insertion(+) diff --git a/bench.gypi b/bench.gypi index 6ac64d1..f0cdfe1 100644 --- a/bench.gypi +++ b/bench.gypi @@ -26,6 +26,7 @@ '../bench/GradientBench.cpp', '../bench/MathBench.cpp', '../bench/MatrixBench.cpp', + '../bench/MutexBench.cpp', '../bench/PathBench.cpp', '../bench/RectBench.cpp', '../bench/RepeatTileBench.cpp', -- cgit v1.2.3 From ddbb54142c7fa5fe411254503880c5ee6e5f834c Mon Sep 17 00:00:00 2001 From: "bsalomon@google.com" Date: Mon, 14 Nov 2011 19:29:53 +0000 Subject: Remove GrGpuGLFixed subclass and ES1 support Review URL: http://codereview.appspot.com/5376094/ git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@2678 2bbb7eff-a529-9590-31e7-b0007b416f81 --- gpu.gyp | 2 -- 1 file changed, 2 deletions(-) diff --git a/gpu.gyp b/gpu.gyp index 3a6a730..0a7c4ee 100644 --- a/gpu.gyp +++ b/gpu.gyp @@ -222,8 +222,6 @@ '../src/gpu/GrGpuFactory.cpp', '../src/gpu/GrGpuGL.cpp', '../src/gpu/GrGpuGL.h', - '../src/gpu/GrGpuGLFixed.cpp', - '../src/gpu/GrGpuGLFixed.h', '../src/gpu/GrGpuGLShaders.cpp', '../src/gpu/GrGpuGLShaders.h', '../src/gpu/GrGpuVertex.h', -- cgit v1.2.3 From 92d6c5f757cec28d1b39281d6f884f65013aa8d0 Mon Sep 17 00:00:00 2001 From: "reed@google.com" Date: Tue, 15 Nov 2011 15:29:45 +0000 Subject: add bench for shader+blitMask git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@2685 2bbb7eff-a529-9590-31e7-b0007b416f81 --- bench.gypi | 1 + 1 file changed, 1 insertion(+) diff --git a/bench.gypi b/bench.gypi index f0cdfe1..5fbfef7 100644 --- a/bench.gypi +++ b/bench.gypi @@ -31,6 +31,7 @@ '../bench/RectBench.cpp', '../bench/RepeatTileBench.cpp', '../bench/ScalarBench.cpp', + '../bench/ShaderMaskBench.cpp', '../bench/TextBench.cpp', '../bench/VertBench.cpp', ], -- cgit v1.2.3 From 98572c509b443b120385e14d180a1f786a4e3321 Mon Sep 17 00:00:00 2001 From: "bungeman@google.com" Date: Tue, 15 Nov 2011 22:26:41 +0000 Subject: Add paging support for handle based typefaces. http://codereview.appspot.com/5379043/ http://codereview.appspot.com/5364052/ git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@2693 2bbb7eff-a529-9590-31e7-b0007b416f81 --- core.gyp | 1 + 1 file changed, 1 insertion(+) diff --git a/core.gyp b/core.gyp index 341eb4f..a31755a 100644 --- a/core.gyp +++ b/core.gyp @@ -152,6 +152,7 @@ '../src/ports/SkDebug_stdio.cpp', '../src/ports/SkDebug_win.cpp', + '../src/ports/SkFontHost_sandbox_none.cpp', '../src/ports/SkFontHost_win.cpp', '../src/ports/SkThread_win.cpp', -- cgit v1.2.3 From 3c1657e7e4863a44218fe4cee73c8e93fb9e392b Mon Sep 17 00:00:00 2001 From: "reed@google.com" Date: Thu, 17 Nov 2011 15:35:47 +0000 Subject: add commented line to try to add additional warnings git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@2706 2bbb7eff-a529-9590-31e7-b0007b416f81 --- common_conditions.gypi | 2 ++ 1 file changed, 2 insertions(+) diff --git a/common_conditions.gypi b/common_conditions.gypi index bf3252d..014046f 100644 --- a/common_conditions.gypi +++ b/common_conditions.gypi @@ -114,6 +114,8 @@ 'xcode_settings': { 'SYMROOT': '<(DEPTH)/xcodebuild', 'SDKROOT': 'macosx10.6', +# trying to get this to work, but it needs clang I think... +# 'WARNING_CFLAGS': '-Wexit-time-destructors', }, }, ], -- cgit v1.2.3 From 94bfcfd554795467028d2440514c4fdeff6f8b05 Mon Sep 17 00:00:00 2001 From: "reed@google.com" Date: Thu, 17 Nov 2011 22:09:47 +0000 Subject: remove all references to SkGlobals (obsolete) git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@2713 2bbb7eff-a529-9590-31e7-b0007b416f81 --- core.gyp | 3 --- 1 file changed, 3 deletions(-) diff --git a/core.gyp b/core.gyp index a31755a..0ee608e 100644 --- a/core.gyp +++ b/core.gyp @@ -78,7 +78,6 @@ '../src/core/SkFloatBits.cpp', '../src/core/SkFontHost.cpp', '../src/core/SkGeometry.cpp', - '../src/core/SkGlobals.cpp', '../src/core/SkGlyphCache.cpp', '../src/core/SkGlyphCache.h', '../src/core/SkGraphics.cpp', @@ -157,7 +156,6 @@ '../src/ports/SkThread_win.cpp', '../src/ports/SkFontHost_tables.cpp', - '../src/ports/SkGlobals_global.cpp', '../src/ports/SkMemory_malloc.cpp', '../src/ports/SkOSFile_stdio.cpp', '../src/ports/SkTime_Unix.cpp', @@ -198,7 +196,6 @@ '../include/core/SkFloatingPoint.h', '../include/core/SkFontHost.h', '../include/core/SkGeometry.h', - '../include/core/SkGlobals.h', '../include/core/SkGraphics.h', '../include/core/SkMallocPixelRef.h', '../include/core/SkMask.h', -- cgit v1.2.3 From cfaeabbf85881620b9185af9b04f8f638f3e05aa Mon Sep 17 00:00:00 2001 From: "reed@google.com" Date: Mon, 21 Nov 2011 15:16:16 +0000 Subject: don't quickReject bitmaps if there is a looper or other possible bounds-modifier add unittest for the above change git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@2722 2bbb7eff-a529-9590-31e7-b0007b416f81 --- tests.gyp | 1 + 1 file changed, 1 insertion(+) diff --git a/tests.gyp b/tests.gyp index 4d35312..bb99c87 100644 --- a/tests.gyp +++ b/tests.gyp @@ -46,6 +46,7 @@ '../tests/PathTest.cpp', '../tests/PDFPrimitivesTest.cpp', '../tests/PointTest.cpp', + '../tests/QuickRejectTest.cpp', '../tests/Reader32Test.cpp', '../tests/ReadPixelsTest.cpp', '../tests/RefDictTest.cpp', -- cgit v1.2.3 From bee3c4509393b78f42b4822f4886111a93338640 Mon Sep 17 00:00:00 2001 From: "bsalomon@google.com" Date: Mon, 21 Nov 2011 21:04:06 +0000 Subject: Add windowscodecs.lib to images.gyp Review URL: http://codereview.appspot.com/5422046/ git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@2728 2bbb7eff-a529-9590-31e7-b0007b416f81 --- images.gyp | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/images.gyp b/images.gyp index 4dce2c5..9785b3f 100644 --- a/images.gyp +++ b/images.gyp @@ -69,6 +69,11 @@ '../src/images/SkJpegUtility.cpp', '../src/images/SkMovie_gif.cpp', ], + 'link_settings': { + 'libraries': [ + 'windowscodecs.lib', + ], + }, },{ #else if skia_os != win 'sources!': [ '../src/ports/SkImageDecoder_WIC.cpp', -- cgit v1.2.3 From 0e6e1beede5476ec0a08f3c751056f93254ba00b Mon Sep 17 00:00:00 2001 From: "bsalomon@google.com" Date: Wed, 23 Nov 2011 15:01:08 +0000 Subject: Fix warnings Review URL: http://codereview.appspot.com/5433054/ git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@2741 2bbb7eff-a529-9590-31e7-b0007b416f81 --- common_conditions.gypi | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/common_conditions.gypi b/common_conditions.gypi index 014046f..91d051f 100644 --- a/common_conditions.gypi +++ b/common_conditions.gypi @@ -87,7 +87,14 @@ 'cflags': ['-O2'] }, }, - 'cflags': [ '-Wall', '-Wextra', '-Wno-unused' ], + 'cflags': [ + '-Wall', + '-Wextra', + '-Wno-unused', + # suppressions below here were added for clang + '-Wno-unused-parameter', + '-Wno-c++11-extensions' + ], 'include_dirs' : [ '/usr/include/freetype2', ], -- cgit v1.2.3 From a8e6432ac8005637a7fbdd5cccfdf35c299391cd Mon Sep 17 00:00:00 2001 From: "reed@google.com" Date: Mon, 28 Nov 2011 16:06:04 +0000 Subject: add unittest for save/restore git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@2751 2bbb7eff-a529-9590-31e7-b0007b416f81 --- tests.gyp | 1 + 1 file changed, 1 insertion(+) diff --git a/tests.gyp b/tests.gyp index bb99c87..e0201b1 100644 --- a/tests.gyp +++ b/tests.gyp @@ -19,6 +19,7 @@ '../tests/BitSetTest.cpp', '../tests/BlitRowTest.cpp', '../tests/BlurTest.cpp', + '../tests/CanvasTest.cpp', '../tests/ClampRangeTest.cpp', '../tests/ClipCubicTest.cpp', '../tests/ClipStackTest.cpp', -- cgit v1.2.3 From 313eaac6b32995f35a09924eeaadcbe9820d817f Mon Sep 17 00:00:00 2001 From: "reed@google.com" Date: Mon, 28 Nov 2011 16:31:28 +0000 Subject: add test for shader text w/ and w/o lcd (and w/ and w/o opaque) git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@2753 2bbb7eff-a529-9590-31e7-b0007b416f81 --- gmslides.gypi | 1 + 1 file changed, 1 insertion(+) diff --git a/gmslides.gypi b/gmslides.gypi index 576d129..f5d161e 100644 --- a/gmslides.gypi +++ b/gmslides.gypi @@ -12,6 +12,7 @@ '../gm/filltypespersp.cpp', '../gm/fontscaler.cpp', '../gm/gradients.cpp', + '../gm/gradtext.cpp', '../gm/hairmodes.cpp', # commented out until SkPicture support for SkImageFilter is complete # See http://code.google.com/p/skia/issues/detail?id=391 -- cgit v1.2.3 From e4f0e07ab512766c66ec8bb4933c06edca386f49 Mon Sep 17 00:00:00 2001 From: "bsalomon@google.com" Date: Wed, 30 Nov 2011 14:13:48 +0000 Subject: [GPU] tile when large bitmap pased drawBitmap and only a small fraction is used Review URL: http://codereview.appspot.com/5450048/ git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@2760 2bbb7eff-a529-9590-31e7-b0007b416f81 --- gmslides.gypi | 1 + 1 file changed, 1 insertion(+) diff --git a/gmslides.gypi b/gmslides.gypi index f5d161e..4c8f4ab 100644 --- a/gmslides.gypi +++ b/gmslides.gypi @@ -7,6 +7,7 @@ '../gm/blurs.cpp', '../gm/complexclip.cpp', '../gm/complexclip2.cpp', + '../gm/drawbitmaprect.cpp', '../gm/emptypath.cpp', '../gm/filltypes.cpp', '../gm/filltypespersp.cpp', -- cgit v1.2.3 From 34848372602fea90f1015b9a0f3e6f0b23347303 Mon Sep 17 00:00:00 2001 From: "bsalomon@google.com" Date: Thu, 1 Dec 2011 15:47:23 +0000 Subject: Move SkGLCanvas.h to obsolete, delete from gyp Review URL: http://codereview.appspot.com/5451065/ git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@2776 2bbb7eff-a529-9590-31e7-b0007b416f81 --- utils.gyp | 1 - 1 file changed, 1 deletion(-) diff --git a/utils.gyp b/utils.gyp index 067671e..5e6fa85 100644 --- a/utils.gyp +++ b/utils.gyp @@ -23,7 +23,6 @@ '../include/utils/SkCubicInterval.h', '../include/utils/SkCullPoints.h', '../include/utils/SkDumpCanvas.h', - '../include/utils/SkGLCanvas.h', '../include/utils/SkInterpolator.h', '../include/utils/SkLayer.h', '../include/utils/SkMatrix44.h', -- cgit v1.2.3 From d232c8ce48599d215ba3f504b93a8aaa976073f2 Mon Sep 17 00:00:00 2001 From: "bsalomon@google.com" Date: Thu, 1 Dec 2011 16:34:28 +0000 Subject: Add SkWGLExtensionInterface for dealing with WGL extensions Review URL: http://codereview.appspot.com/5447059 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@2777 2bbb7eff-a529-9590-31e7-b0007b416f81 --- utils.gyp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/utils.gyp b/utils.gyp index 5e6fa85..b4b2be3 100644 --- a/utils.gyp +++ b/utils.gyp @@ -36,6 +36,7 @@ '../include/utils/SkSfntUtils.h', '../include/utils/SkTextBox.h', '../include/utils/SkUnitMappers.h', + '../include/utils/SkWGL.h', '../src/utils/SkBoundaryPatch.cpp', '../src/utils/SkCamera.cpp', @@ -77,7 +78,8 @@ '../src/utils/win/skia_win.cpp', '../src/utils/win/SkHRESULT.cpp', '../src/utils/win/SkIStream.cpp', - '../src/utils/win/SkOSWindow_Win.cpp', + '../src/utils/win/SkOSWindow_win.cpp', + '../src/utils/win/SkWGL_win.cpp', ], 'sources!': [ '../src/utils/SDL/SkOSWindow_SDL.cpp', @@ -131,16 +133,15 @@ 'include_dirs!': [ '../include/utils/win', ], + 'sources/': [ ['exclude', '_win.(h|cpp)$'],], 'sources!': [ '../include/utils/win/SkAutoCoInitialize.h', '../include/utils/win/SkHRESULT.h', '../include/utils/win/SkIStream.h', '../include/utils/win/SkTScopedComPtr.h', '../src/utils/win/SkAutoCoInitialize.cpp', - '../src/utils/win/skia_win.cpp', '../src/utils/win/SkHRESULT.cpp', '../src/utils/win/SkIStream.cpp', - '../src/utils/win/SkOSWindow_Win.cpp', ], }], ], -- cgit v1.2.3 From 49416fe4ff03105c4e110364321bf3ef23af78e1 Mon Sep 17 00:00:00 2001 From: "senorblanco@chromium.org" Date: Fri, 2 Dec 2011 19:11:17 +0000 Subject: When a bitmap is texture-backed, change SkBitmap::copyTo() to do a deep copy of the texels in VRAM rather than a readback and re-upload. This gives a 3-10X speedup on recursive canvas-to-canvas draws. N.B.: This introduces a new GM test, which will need new baselines. git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@2790 2bbb7eff-a529-9590-31e7-b0007b416f81 --- gmslides.gypi | 1 + 1 file changed, 1 insertion(+) diff --git a/gmslides.gypi b/gmslides.gypi index 4c8f4ab..0aaef36 100644 --- a/gmslides.gypi +++ b/gmslides.gypi @@ -2,6 +2,7 @@ { 'sources': [ '../gm/aarectmodes.cpp', + '../gm/bitmapcopy.cpp', '../gm/bitmapfilters.cpp', '../gm/bitmapscroll.cpp', '../gm/blurs.cpp', -- cgit v1.2.3 From f63d7fa89f9e7520b5e211d1aab026548deae2ba Mon Sep 17 00:00:00 2001 From: "djsollen@google.com" Date: Mon, 5 Dec 2011 13:55:55 +0000 Subject: Changes to the android gyp system to build without RTTI and exceptions. Review URL: http://codereview.appspot.com/5437089 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@2794 2bbb7eff-a529-9590-31e7-b0007b416f81 --- common_conditions.gypi | 4 ++++ gpu.gyp | 1 - libtess.gyp | 7 +++++++ 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/common_conditions.gypi b/common_conditions.gypi index 91d051f..12139f3 100644 --- a/common_conditions.gypi +++ b/common_conditions.gypi @@ -165,6 +165,10 @@ '-lm', '-llog', ], + 'cflags': [ + '-fno-exceptions', + '-fno-rtti', + ], 'conditions': [ [ 'skia_target_arch == "arm" and arm_thumb == 1', { 'cflags': [ diff --git a/gpu.gyp b/gpu.gyp index 0a7c4ee..f0173f7 100644 --- a/gpu.gyp +++ b/gpu.gyp @@ -339,7 +339,6 @@ 'libraries': [ '-lGLESv2', '-lEGL', - '-shared', ], }, }], diff --git a/libtess.gyp b/libtess.gyp index 4a776c3..d74bcc7 100644 --- a/libtess.gyp +++ b/libtess.gyp @@ -41,6 +41,13 @@ '../third_party/glu', ], }, + 'conditions': [ + [ 'skia_os == "android"', { + 'cflags!': [ + '-fno-rtti', # supresses warnings about invalid option of non-C++ code + ], + }], + ], }, ], } -- cgit v1.2.3 From 62e1912bf074e923614594217c48d0a91029792e Mon Sep 17 00:00:00 2001 From: "reed@google.com" Date: Mon, 5 Dec 2011 20:49:37 +0000 Subject: add test for isFinite git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@2800 2bbb7eff-a529-9590-31e7-b0007b416f81 --- tests.gyp | 1 + 1 file changed, 1 insertion(+) diff --git a/tests.gyp b/tests.gyp index e0201b1..46c5ac5 100644 --- a/tests.gyp +++ b/tests.gyp @@ -52,6 +52,7 @@ '../tests/ReadPixelsTest.cpp', '../tests/RefDictTest.cpp', '../tests/RegionTest.cpp', + '../tests/ScalarTest.cpp', '../tests/Sk64Test.cpp', '../tests/skia_test.cpp', '../tests/SortTest.cpp', -- cgit v1.2.3 From 5e763193b9d4dee9abfcc242204ce1c5298b44d0 Mon Sep 17 00:00:00 2001 From: "tomhudson@google.com" Date: Thu, 8 Dec 2011 14:44:10 +0000 Subject: Make GrGLShaderVar objects aware of whether they are uniform, varying, or attribute varibles. Extract GLSL generation enum and utility function into new GrGLSL header. git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@2827 2bbb7eff-a529-9590-31e7-b0007b416f81 --- gpu.gyp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/gpu.gyp b/gpu.gyp index f0173f7..9fcded1 100644 --- a/gpu.gyp +++ b/gpu.gyp @@ -210,6 +210,8 @@ '../src/gpu/GrGLRenderTarget.cpp', '../src/gpu/GrGLRenderTarget.h', '../src/gpu/GrGLShaderVar.h', + '../src/gpu/GrGLSL.cpp', + '../src/gpu/GrGLSL.h', '../src/gpu/GrGLStencilBuffer.cpp', '../src/gpu/GrGLStencilBuffer.h', '../src/gpu/GrGLTexture.cpp', -- cgit v1.2.3 From 2feddf281306a68e6b7af858d53df28f7bf59e9e Mon Sep 17 00:00:00 2001 From: "junov@chromium.org" Date: Fri, 9 Dec 2011 15:48:03 +0000 Subject: Adding isOpaque method to skia shader classes REVIEW=http://codereview.appspot.com/5451102/ TEST=unit test ShaderOpacity git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@2840 2bbb7eff-a529-9590-31e7-b0007b416f81 --- tests.gyp | 1 + 1 file changed, 1 insertion(+) diff --git a/tests.gyp b/tests.gyp index 46c5ac5..a9c152d 100644 --- a/tests.gyp +++ b/tests.gyp @@ -53,6 +53,7 @@ '../tests/RefDictTest.cpp', '../tests/RegionTest.cpp', '../tests/ScalarTest.cpp', + '../tests/ShaderOpacityTest.cpp', '../tests/Sk64Test.cpp', '../tests/skia_test.cpp', '../tests/SortTest.cpp', -- cgit v1.2.3 From 58f192faa8fc453be392e7147145411911227c11 Mon Sep 17 00:00:00 2001 From: "mike@reedtribe.org" Date: Sat, 10 Dec 2011 19:36:56 +0000 Subject: add first cut at arithmetic mode git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@2849 2bbb7eff-a529-9590-31e7-b0007b416f81 --- common_conditions.gypi | 1 + effects.gyp | 2 ++ gmslides.gypi | 1 + 3 files changed, 4 insertions(+) diff --git a/common_conditions.gypi b/common_conditions.gypi index 12139f3..1a7c672 100644 --- a/common_conditions.gypi +++ b/common_conditions.gypi @@ -123,6 +123,7 @@ 'SDKROOT': 'macosx10.6', # trying to get this to work, but it needs clang I think... # 'WARNING_CFLAGS': '-Wexit-time-destructors', + 'CLANG_WARN_CXX0X_EXTENSIONS': 'NO', }, }, ], diff --git a/effects.gyp b/effects.gyp index 81e8fa8..270edc3 100644 --- a/effects.gyp +++ b/effects.gyp @@ -15,6 +15,7 @@ '../include/effects/Sk1DPathEffect.h', '../include/effects/Sk2DPathEffect.h', '../include/effects/SkAvoidXfermode.h', + '../include/effects/SkArithmeticMode.h', '../include/effects/SkBlurDrawLooper.h', '../include/effects/SkBlurImageFilter.h', '../include/effects/SkBlurMaskFilter.h', @@ -39,6 +40,7 @@ '../src/effects/Sk1DPathEffect.cpp', '../src/effects/Sk2DPathEffect.cpp', '../src/effects/SkAvoidXfermode.cpp', + '../src/effects/SkArithmeticMode.cpp', '../src/effects/SkBitmapCache.cpp', '../src/effects/SkBitmapCache.h', '../src/effects/SkBlurDrawLooper.cpp', diff --git a/gmslides.gypi b/gmslides.gypi index 0aaef36..17873d6 100644 --- a/gmslides.gypi +++ b/gmslides.gypi @@ -2,6 +2,7 @@ { 'sources': [ '../gm/aarectmodes.cpp', + '../gm/arithmode.cpp', '../gm/bitmapcopy.cpp', '../gm/bitmapfilters.cpp', '../gm/bitmapscroll.cpp', -- cgit v1.2.3 From f8394f30b9a62dbb2f3162677f3129c72577e695 Mon Sep 17 00:00:00 2001 From: "caryclark@google.com" Date: Wed, 14 Dec 2011 17:12:04 +0000 Subject: move ports into its own gyp file git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@2874 2bbb7eff-a529-9590-31e7-b0007b416f81 --- FileReaderApp.gyp | 1 + SampleApp.gyp | 1 + bench.gyp | 1 + core.gyp | 44 ----------------------- gm.gyp | 1 + iOSSampleApp.gyp | 1 + ports.gyp | 106 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ tests.gyp | 1 + tools.gyp | 3 ++ 9 files changed, 115 insertions(+), 44 deletions(-) create mode 100644 ports.gyp diff --git a/FileReaderApp.gyp b/FileReaderApp.gyp index 0e2c48f..c5651c7 100644 --- a/FileReaderApp.gyp +++ b/FileReaderApp.gyp @@ -24,6 +24,7 @@ 'core.gyp:core', 'effects.gyp:effects', 'opts.gyp:opts', + 'ports.gyp:ports', 'utils.gyp:utils', 'views.gyp:views', 'xml.gyp:xml', diff --git a/SampleApp.gyp b/SampleApp.gyp index 3f468f8..fed4bf4 100644 --- a/SampleApp.gyp +++ b/SampleApp.gyp @@ -148,6 +148,7 @@ 'core.gyp:core', 'effects.gyp:effects', 'images.gyp:images', + 'ports.gyp:ports', 'views.gyp:views', 'utils.gyp:utils', 'animator.gyp:animator', diff --git a/bench.gyp b/bench.gyp index 6361586..0c5e2ea 100644 --- a/bench.gyp +++ b/bench.gyp @@ -22,6 +22,7 @@ 'gpu.gyp:gr', 'gpu.gyp:skgr', 'images.gyp:images', + 'ports.gyp:ports', 'utils.gyp:utils', ], }, diff --git a/core.gyp b/core.gyp index 0ee608e..488caa3 100644 --- a/core.gyp +++ b/core.gyp @@ -149,20 +149,6 @@ '../src/opts/opts_check_SSE2.cpp', - '../src/ports/SkDebug_stdio.cpp', - '../src/ports/SkDebug_win.cpp', - '../src/ports/SkFontHost_sandbox_none.cpp', - '../src/ports/SkFontHost_win.cpp', - '../src/ports/SkThread_win.cpp', - - '../src/ports/SkFontHost_tables.cpp', - '../src/ports/SkMemory_malloc.cpp', - '../src/ports/SkOSFile_stdio.cpp', - '../src/ports/SkTime_Unix.cpp', - '../src/ports/SkTime_win.cpp', - '../src/ports/SkXMLParser_empty.cpp', - '../src/ports/sk_predefined_gamma.h', - '../include/core/Sk64.h', '../include/core/SkAdvancedTypefaceMetrics.h', '../include/core/SkAutoKern.h', @@ -267,10 +253,6 @@ 'sources': [ '../include/core/SkMMapStream.h', '../src/core/SkMMapStream.cpp', - '../src/ports/SkThread_pthread.cpp', - '../src/ports/SkFontHost_FreeType.cpp', - '../src/ports/SkFontHost_gamma_none.cpp', - '../src/ports/SkFontHost_linux.cpp', ], 'link_settings': { 'libraries': [ @@ -289,11 +271,6 @@ '../include/utils/mac/SkCGUtils.h', '../src/core/SkMMapStream.cpp', - '../src/ports/SkFontHost_mac_coretext.cpp', -# '../src/ports/SkFontHost_FreeType.cpp', -# '../src/ports/SkFontHost_freetype_mac.cpp', -# '../src/ports/SkFontHost_gamma_none.cpp', - '../src/ports/SkThread_pthread.cpp', ], 'link_settings': { 'libraries': [ @@ -310,9 +287,6 @@ '../include/utils/mac/SkCGUtils.h', '../src/core/SkMMapStream.cpp', - '../src/ports/SkFontHost_mac_coretext.cpp', - - '../src/ports/SkThread_pthread.cpp', ], 'link_settings': { 'libraries': [ @@ -330,32 +304,14 @@ 'include_dirs': [ 'config/win', ], - 'sources!': [ # these are used everywhere but windows - '../src/ports/SkDebug_stdio.cpp', - '../src/ports/SkTime_Unix.cpp', - ], - }, { # else !win - 'sources!': [ - '../src/ports/SkDebug_win.cpp', - '../src/ports/SkFontHost_win.cpp', - '../src/ports/SkThread_win.cpp', - '../src/ports/SkTime_win.cpp', - ], }], [ 'skia_os == "android"', { 'sources!': [ '../src/opts/opts_check_SSE2.cpp', - '../src/ports/SkDebug_stdio.cpp', ], 'sources': [ '../include/core/SkMMapStream.h', '../src/core/SkMMapStream.cpp', - '../src/ports/SkDebug_android.cpp', - '../src/ports/SkThread_pthread.cpp', - '../src/ports/SkFontHost_android.cpp', - '../src/ports/SkFontHost_gamma.cpp', - '../src/ports/SkFontHost_FreeType.cpp', - '../src/ports/FontHostConfiguration_android.cpp', ], 'dependencies': [ 'android_system.gyp:ft2', diff --git a/gm.gyp b/gm.gyp index 16577e9..43075dc 100644 --- a/gm.gyp +++ b/gm.gyp @@ -21,6 +21,7 @@ 'gpu.gyp:gr', 'gpu.gyp:skgr', 'images.gyp:images', + 'ports.gyp:ports', 'pdf.gyp:pdf', 'utils.gyp:utils', ], diff --git a/iOSSampleApp.gyp b/iOSSampleApp.gyp index 4fe7fe2..84708bb 100644 --- a/iOSSampleApp.gyp +++ b/iOSSampleApp.gyp @@ -149,6 +149,7 @@ 'core.gyp:core', 'effects.gyp:effects', 'images.gyp:images', + 'ports.gyp:ports', 'views.gyp:views', 'utils.gyp:utils', 'animator.gyp:animator', diff --git a/ports.gyp b/ports.gyp new file mode 100644 index 0000000..dd9c981 --- /dev/null +++ b/ports.gyp @@ -0,0 +1,106 @@ +# Port-specific Skia library code. +{ + 'includes': [ + 'common.gypi', + ], + 'targets': [ + { + 'target_name': 'ports', + 'type': 'static_library', + 'include_dirs': [ + '../include/config', + '../include/core', + '../include/ports', + '../include/xml', + '../src/core', + ], + 'sources': [ + '../src/ports/SkDebug_stdio.cpp', + '../src/ports/SkDebug_win.cpp', + '../src/ports/SkFontHost_sandbox_none.cpp', + '../src/ports/SkFontHost_win.cpp', + '../src/ports/SkThread_win.cpp', + + '../src/ports/SkFontHost_tables.cpp', + '../src/ports/SkMemory_malloc.cpp', + '../src/ports/SkOSFile_stdio.cpp', + '../src/ports/SkTime_Unix.cpp', + '../src/ports/SkTime_win.cpp', + '../src/ports/SkXMLParser_empty.cpp', + '../src/ports/sk_predefined_gamma.h', + ], + 'conditions': [ + [ 'skia_os in ["linux", "freebsd", "openbsd", "solaris"]', { + 'sources': [ + '../src/ports/SkThread_pthread.cpp', + '../src/ports/SkFontHost_FreeType.cpp', + '../src/ports/SkFontHost_gamma_none.cpp', + '../src/ports/SkFontHost_linux.cpp', + ], + }], + [ 'skia_os == "mac"', { + 'include_dirs': [ + '../include/utils/mac', + '../third_party/freetype/include/**', + ], + 'sources': [ + '../src/ports/SkFontHost_mac_coretext.cpp', +# '../src/ports/SkFontHost_FreeType.cpp', +# '../src/ports/SkFontHost_freetype_mac.cpp', +# '../src/ports/SkFontHost_gamma_none.cpp', + '../src/ports/SkThread_pthread.cpp', + ], + }], + [ 'skia_os == "ios"', { + 'include_dirs': [ + '../include/utils/ios', + ], + 'sources': [ + '../src/ports/SkFontHost_mac_coretext.cpp', + '../src/ports/SkThread_pthread.cpp', + ], + }], + [ 'skia_os == "win"', { + 'include_dirs': [ + 'config/win', + ], + 'sources!': [ # these are used everywhere but windows + '../src/ports/SkDebug_stdio.cpp', + '../src/ports/SkTime_Unix.cpp', + ], + }, { # else !win + 'sources!': [ + '../src/ports/SkDebug_win.cpp', + '../src/ports/SkFontHost_win.cpp', + '../src/ports/SkThread_win.cpp', + '../src/ports/SkTime_win.cpp', + ], + }], + [ 'skia_os == "android"', { + 'sources!': [ + '../src/ports/SkDebug_stdio.cpp', + ], + 'sources': [ + '../src/ports/SkDebug_android.cpp', + '../src/ports/SkThread_pthread.cpp', + '../src/ports/SkFontHost_android.cpp', + '../src/ports/SkFontHost_gamma.cpp', + '../src/ports/SkFontHost_FreeType.cpp', + '../src/ports/FontHostConfiguration_android.cpp', + ], + }], + ], + 'direct_dependent_settings': { + 'include_dirs': [ + '../include/ports', + ], + }, + }, + ], +} + +# Local Variables: +# tab-width:2 +# indent-tabs-mode:nil +# End: +# vim: set expandtab tabstop=2 shiftwidth=2: diff --git a/tests.gyp b/tests.gyp index a9c152d..acec823 100644 --- a/tests.gyp +++ b/tests.gyp @@ -77,6 +77,7 @@ 'gpu.gyp:gr', 'gpu.gyp:skgr', 'images.gyp:images', + 'ports.gyp:ports', 'pdf.gyp:pdf', 'utils.gyp:utils', ], diff --git a/tools.gyp b/tools.gyp index e0c04b4..3bc2814 100644 --- a/tools.gyp +++ b/tools.gyp @@ -30,6 +30,7 @@ 'dependencies': [ 'core.gyp:core', 'images.gyp:images', + 'ports.gyp:ports', 'utils.gyp:utils', ], }, @@ -42,6 +43,7 @@ 'dependencies': [ 'core.gyp:core', 'images.gyp:images', + 'ports.gyp:ports', 'utils.gyp:utils', ], }, @@ -54,6 +56,7 @@ 'dependencies': [ 'core.gyp:core', 'images.gyp:images', + 'ports.gyp:ports', 'utils.gyp:utils', ], }, -- cgit v1.2.3 From af243a22d36ed48b65dfd101e5788422463f53f4 Mon Sep 17 00:00:00 2001 From: "caryclark@google.com" Date: Thu, 15 Dec 2011 14:16:43 +0000 Subject: add optional manual global initialization M include/effects/SkAvoidXfermode.h M include/effects/SkDiscretePathEffect.h M include/effects/Sk1DPathEffect.h M include/effects/Sk2DPathEffect.h M include/effects/SkBlurDrawLooper.h M include/effects/SkPixelXorXfermode.h M include/effects/SkDashPathEffect.h M include/effects/SkColorMatrixFilter.h M include/effects/SkEmbossMaskFilter.h M include/effects/SkLayerDrawLooper.h M include/effects/SkGroupShape.h M include/effects/SkBlurImageFilter.h M include/effects/SkRectShape.h A include/effects/SkEffects.h M include/effects/SkCornerPathEffect.h M include/effects/SkGradientShader.h M include/effects/SkBlurMaskFilter.h M include/effects/SkLayerRasterizer.h M include/core/SkMallocPixelRef.h M include/core/SkFlattenable.h M include/core/SkShape.h M include/core/SkPixelRef.h M include/core/SkGraphics.h M include/core/SkPathEffect.h M include/core/SkPostConfig.h M include/core/SkXfermode.h M include/core/SkColorFilter.h M include/images/SkFlipPixelRef.h M include/images/SkImageRef_GlobalPool.h M src/effects/SkDashPathEffect.cpp M src/effects/SkColorMatrixFilter.cpp M src/effects/SkBlurImageFilter.cpp M src/effects/SkGroupShape.cpp M src/effects/SkCornerPathEffect.cpp M src/effects/SkGradientShader.cpp M src/effects/SkBlurMaskFilter.cpp M src/effects/SkAvoidXfermode.cpp M src/effects/Sk2DPathEffect.cpp M src/effects/SkBlurDrawLooper.cpp M src/effects/SkPixelXorXfermode.cpp M src/effects/SkColorFilters.cpp M src/effects/SkLayerDrawLooper.cpp M src/effects/SkRectShape.cpp A src/effects/SkEffects.cpp M src/effects/SkLayerRasterizer.cpp M src/effects/SkDiscretePathEffect.cpp M src/effects/Sk1DPathEffect.cpp A src/effects/SkEffects_none.cpp M src/core/SkPixelRef.cpp M src/core/SkGraphics.cpp M src/core/SkFlattenable.cpp M src/core/SkBitmapProcShader.h M src/core/SkPathEffect.cpp M src/core/SkShape.cpp M src/core/SkXfermode.cpp M src/core/SkMallocPixelRef.cpp M src/core/SkBitmapProcShader.cpp M src/images/SkFlipPixelRef.cpp M src/images/SkImageRef_GlobalPool.cpp A src/ports/SkGlobalInitialization_chromium.cpp M src/ports/SkImageRef_ashmem.h M src/ports/SkImageRef_ashmem.cpp A src/ports/SkGlobalInitialization_default.cpp M gyp/effects.gyp M gyp/tools.gyp M gyp/ports.gyp git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@2876 2bbb7eff-a529-9590-31e7-b0007b416f81 --- effects.gyp | 2 ++ ports.gyp | 3 +++ tools.gyp | 3 +++ 3 files changed, 8 insertions(+) diff --git a/effects.gyp b/effects.gyp index 270edc3..4549439 100644 --- a/effects.gyp +++ b/effects.gyp @@ -25,6 +25,7 @@ '../include/effects/SkDashPathEffect.h', '../include/effects/SkDiscretePathEffect.h', '../include/effects/SkDrawExtraPathEffect.h', + '../include/effects/SkEffects.h', '../include/effects/SkEmbossMaskFilter.h', '../include/effects/SkGradientShader.h', '../include/effects/SkGroupShape.h', @@ -53,6 +54,7 @@ '../src/effects/SkCornerPathEffect.cpp', '../src/effects/SkDashPathEffect.cpp', '../src/effects/SkDiscretePathEffect.cpp', + '../src/effects/SkEffects.cpp', '../src/effects/SkEmbossMask.cpp', '../src/effects/SkEmbossMask.h', '../src/effects/SkEmbossMask_Table.h', diff --git a/ports.gyp b/ports.gyp index dd9c981..d53542b 100644 --- a/ports.gyp +++ b/ports.gyp @@ -10,6 +10,8 @@ 'include_dirs': [ '../include/config', '../include/core', + '../include/images', + '../include/effects', '../include/ports', '../include/xml', '../src/core', @@ -19,6 +21,7 @@ '../src/ports/SkDebug_win.cpp', '../src/ports/SkFontHost_sandbox_none.cpp', '../src/ports/SkFontHost_win.cpp', + '../src/ports/SkGlobalInitialization_default.cpp', '../src/ports/SkThread_win.cpp', '../src/ports/SkFontHost_tables.cpp', diff --git a/tools.gyp b/tools.gyp index 3bc2814..1e419cd 100644 --- a/tools.gyp +++ b/tools.gyp @@ -25,6 +25,7 @@ 'target_name': 'skdiff', 'type': 'executable', 'sources': [ + '../src/effects/SkEffects_none.cpp', '../tools/skdiff_main.cpp', ], 'dependencies': [ @@ -38,6 +39,7 @@ 'target_name': 'skhello', 'type': 'executable', 'sources': [ + '../src/effects/SkEffects_none.cpp', '../tools/skhello.cpp', ], 'dependencies': [ @@ -51,6 +53,7 @@ 'target_name': 'skimage', 'type': 'executable', 'sources': [ + '../src/effects/SkEffects_none.cpp', '../tools/skimage_main.cpp', ], 'dependencies': [ -- cgit v1.2.3 From 7462c40c9de84145fd8ccc4c566042fe6ed2ecb4 Mon Sep 17 00:00:00 2001 From: "djsollen@google.com" Date: Thu, 15 Dec 2011 16:16:22 +0000 Subject: Fix android build and cleanup references to SkMMapStream Review URL: http://codereview.appspot.com/5489050 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@2877 2bbb7eff-a529-9590-31e7-b0007b416f81 --- core.gyp | 21 ++++++--------------- ports.gyp | 4 ++++ 2 files changed, 10 insertions(+), 15 deletions(-) diff --git a/core.gyp b/core.gyp index 488caa3..9e5c536 100644 --- a/core.gyp +++ b/core.gyp @@ -88,6 +88,7 @@ '../src/core/SkMath.cpp', '../src/core/SkMatrix.cpp', '../src/core/SkMetaData.cpp', + '../src/core/SkMMapStream.cpp', '../src/core/SkPackBits.cpp', '../src/core/SkPaint.cpp', '../src/core/SkPath.cpp', @@ -189,6 +190,7 @@ '../include/core/SkMath.h', '../include/core/SkMatrix.h', '../include/core/SkMetaData.h', + '../include/core/SkMMapStream.h', '../include/core/SkOSFile.h', '../include/core/SkPackBits.h', '../include/core/SkPaint.h', @@ -250,10 +252,6 @@ '-Wno-unused', '-Wno-unused-function', ], - 'sources': [ - '../include/core/SkMMapStream.h', - '../src/core/SkMMapStream.cpp', - ], 'link_settings': { 'libraries': [ '-lfreetype', @@ -267,10 +265,7 @@ '../third_party/freetype/include/**', ], 'sources': [ - '../include/core/SkMMapStream.h', '../include/utils/mac/SkCGUtils.h', - - '../src/core/SkMMapStream.cpp', ], 'link_settings': { 'libraries': [ @@ -283,10 +278,7 @@ '../include/utils/ios', ], 'sources': [ - '../include/core/SkMMapStream.h', '../include/utils/mac/SkCGUtils.h', - - '../src/core/SkMMapStream.cpp', ], 'link_settings': { 'libraries': [ @@ -304,18 +296,17 @@ 'include_dirs': [ 'config/win', ], + 'sources!': [ + '../include/core/SkMMapStream.h', + '../src/core/SkMMapStream.cpp', + ], }], [ 'skia_os == "android"', { 'sources!': [ '../src/opts/opts_check_SSE2.cpp', ], - 'sources': [ - '../include/core/SkMMapStream.h', - '../src/core/SkMMapStream.cpp', - ], 'dependencies': [ 'android_system.gyp:ft2', - 'android_system.gyp:expat', ], }], ], diff --git a/ports.gyp b/ports.gyp index d53542b..5d697e5 100644 --- a/ports.gyp +++ b/ports.gyp @@ -91,6 +91,10 @@ '../src/ports/SkFontHost_FreeType.cpp', '../src/ports/FontHostConfiguration_android.cpp', ], + 'dependencies': [ + 'android_system.gyp:ft2', + 'android_system.gyp:expat', + ], }], ], 'direct_dependent_settings': { -- cgit v1.2.3 From 40b9cdb5d7e0e36bfeb5b602c76b71a0c70d4058 Mon Sep 17 00:00:00 2001 From: "schenney@chromium.org" Date: Tue, 20 Dec 2011 15:14:18 +0000 Subject: Modifying SkPath to store all verbs provided by the user, and to give correct results for all stroke and fill modes even on the various types of degenerate paths. The goals of this patch include: 1. Have Skia store all of the verbs implied by path construction methods, even if those define degenerate paths. The SVG implementation in WebKit, which is backed by Skia, needs to know about all elements of the path, even degenerate ones, for the correct drawing of markers and line caps. For example, in SVG you should be able to draw a scatter plot by specifying a marker for vertices and then giving a sequence of moveTo commands. Skia will not store the moveTos, requiring a different storage mechanism. 2. Assuming 1, maintain the current Skia behavior. That is, make Skia robust to degenerate paths. 3. Fix an existing bug in Skia where a degenerate moveTo-lineTo pair spits out warnings from rasterization and produces incorrect results in inverse-fill renderings. 4. Adds extensive testing for degenerate paths and path rendering in general. To meet these goals, the patch I am proposing will result in minor additional storage for degenerate paths (a few bytes per degenerate path, only if the user defines such paths). There is also some additional overhead in the iteration code, with the path now cleaned to remove degenerate segments as part of the iteration process. I suspect this will also fix issues with computing normal vectors to degenerate segments. Benchmarking suggests that this change may result in slightly (< 1%) slower path drawing due to the checks for degeneracy. This overhead could be removed (in fact, a significant speedup could occur) if the results of iterating to clean up the path were cached. This would cost memory, of course, and quite a bit of it. BUG=398 TEST=tests/PathTest.cpp gm/cubicpaths.cpp gm/degeneratesegments.cpp gm/movepaths.cpp gm/linepaths.cpp gm/quadpaths.cpp Review URL: http://codereview.appspot.com/5482051 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@2901 2bbb7eff-a529-9590-31e7-b0007b416f81 --- gmslides.gypi | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/gmslides.gypi b/gmslides.gypi index 17873d6..d20cf73 100644 --- a/gmslides.gypi +++ b/gmslides.gypi @@ -9,6 +9,8 @@ '../gm/blurs.cpp', '../gm/complexclip.cpp', '../gm/complexclip2.cpp', + '../gm/cubicpaths.cpp', + '../gm/degeneratesegments.cpp', '../gm/drawbitmaprect.cpp', '../gm/emptypath.cpp', '../gm/filltypes.cpp', @@ -21,11 +23,14 @@ # See http://code.google.com/p/skia/issues/detail?id=391 # '../gm/imageblur.cpp', '../gm/lcdtext.cpp', + '../gm/linepaths.cpp', + '../gm/movepaths.cpp', '../gm/ninepatchstretch.cpp', '../gm/nocolorbleed.cpp', '../gm/pathfill.cpp', '../gm/points.cpp', '../gm/poly2poly.cpp', + '../gm/quadpaths.cpp', '../gm/shadertext.cpp', '../gm/shadows.cpp', '../gm/shapes.cpp', -- cgit v1.2.3 From 562d94bbfe6a8de031b3efb778ab972ef5cde572 Mon Sep 17 00:00:00 2001 From: "reed@google.com" Date: Tue, 20 Dec 2011 16:19:00 +0000 Subject: initial impl of SkImageFilters : virtual signature will change! Do not invest too much in other subclasses until this API solidifies. git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@2903 2bbb7eff-a529-9590-31e7-b0007b416f81 --- effects.gyp | 1 + gmslides.gypi | 1 + 2 files changed, 2 insertions(+) diff --git a/effects.gyp b/effects.gyp index 4549439..39d9c8c 100644 --- a/effects.gyp +++ b/effects.gyp @@ -69,6 +69,7 @@ '../src/effects/SkPorterDuff.cpp', '../src/effects/SkRadialGradient_Table.h', '../src/effects/SkRectShape.cpp', + '../src/effects/SkTestImageFilters.cpp', '../src/effects/SkTransparentShader.cpp', ], 'direct_dependent_settings': { diff --git a/gmslides.gypi b/gmslides.gypi index d20cf73..aee917d 100644 --- a/gmslides.gypi +++ b/gmslides.gypi @@ -36,6 +36,7 @@ '../gm/shapes.cpp', '../gm/strokerects.cpp', '../gm/strokes.cpp', + '../gm/testimagefilters.cpp', '../gm/texdata.cpp', '../gm/tilemodes.cpp', '../gm/tinybitmap.cpp', -- cgit v1.2.3 From 6faf2848177b8bc89249d4aff8147ab71843f88a Mon Sep 17 00:00:00 2001 From: "senorblanco@chromium.org" Date: Tue, 20 Dec 2011 20:02:19 +0000 Subject: A software implementation of the Gaussian blur filter, using 3 box blurs. Also re-enable the imageblur GM test, since the SkPicture path now works. Review URL: http://codereview.appspot.com/5413048/ git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@2905 2bbb7eff-a529-9590-31e7-b0007b416f81 --- gmslides.gypi | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/gmslides.gypi b/gmslides.gypi index aee917d..9e86b0f 100644 --- a/gmslides.gypi +++ b/gmslides.gypi @@ -19,9 +19,7 @@ '../gm/gradients.cpp', '../gm/gradtext.cpp', '../gm/hairmodes.cpp', -# commented out until SkPicture support for SkImageFilter is complete -# See http://code.google.com/p/skia/issues/detail?id=391 -# '../gm/imageblur.cpp', + '../gm/imageblur.cpp', '../gm/lcdtext.cpp', '../gm/linepaths.cpp', '../gm/movepaths.cpp', -- cgit v1.2.3 From ef49da2786ab237cf896511d4cd93c1712858280 Mon Sep 17 00:00:00 2001 From: "senorblanco@chromium.org" Date: Tue, 20 Dec 2011 20:58:18 +0000 Subject: Implement SkColorFilter::asColorMatrix() virtual, and override in SkColorMatrixFilter. Implement missing SkColorMatrixFilter::setMatrix() and setArray() functions (were in .h, just not implemented). Add a gm for color matrix filters. Review URL: http://codereview.appspot.com/5500044/ git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@2909 2bbb7eff-a529-9590-31e7-b0007b416f81 --- gmslides.gypi | 1 + 1 file changed, 1 insertion(+) diff --git a/gmslides.gypi b/gmslides.gypi index 9e86b0f..9d4a664 100644 --- a/gmslides.gypi +++ b/gmslides.gypi @@ -7,6 +7,7 @@ '../gm/bitmapfilters.cpp', '../gm/bitmapscroll.cpp', '../gm/blurs.cpp', + '../gm/colormatrix.cpp', '../gm/complexclip.cpp', '../gm/complexclip2.cpp', '../gm/cubicpaths.cpp', -- cgit v1.2.3 From 444d3d90affab5e7af2c84dc54c2bb49f2a75290 Mon Sep 17 00:00:00 2001 From: "senorblanco@chromium.org" Date: Tue, 20 Dec 2011 21:12:58 +0000 Subject: Disable colorfilter GM for now, since it causes Debug Fixed builds to assert. Unreviewed; build fix. git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@2910 2bbb7eff-a529-9590-31e7-b0007b416f81 --- gmslides.gypi | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/gmslides.gypi b/gmslides.gypi index 9d4a664..8870a2a 100644 --- a/gmslides.gypi +++ b/gmslides.gypi @@ -7,7 +7,9 @@ '../gm/bitmapfilters.cpp', '../gm/bitmapscroll.cpp', '../gm/blurs.cpp', - '../gm/colormatrix.cpp', + #Disabling this test until premult issues can be worked out. + #See http://code.google.com/p/skia/issues/detail?id=423 + #'../gm/colormatrix.cpp', '../gm/complexclip.cpp', '../gm/complexclip2.cpp', '../gm/cubicpaths.cpp', -- cgit v1.2.3 From 5870c62e52465fd1fd2c01057ce157f8db58273f Mon Sep 17 00:00:00 2001 From: "tomhudson@google.com" Date: Wed, 21 Dec 2011 14:27:14 +0000 Subject: New gm to test anti-aliased clipping. git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@2914 2bbb7eff-a529-9590-31e7-b0007b416f81 --- gmslides.gypi | 1 + 1 file changed, 1 insertion(+) diff --git a/gmslides.gypi b/gmslides.gypi index 8870a2a..44bc7de 100644 --- a/gmslides.gypi +++ b/gmslides.gypi @@ -1,6 +1,7 @@ # include this gypi to include all the golden master slides. { 'sources': [ + '../gm/aaclip.cpp', '../gm/aarectmodes.cpp', '../gm/arithmode.cpp', '../gm/bitmapcopy.cpp', -- cgit v1.2.3 From d9b0445e16cd3cb16a7e439d616cd90d2624cc53 Mon Sep 17 00:00:00 2001 From: "reed@google.com" Date: Wed, 21 Dec 2011 15:21:32 +0000 Subject: add SkUnichar_IsVariationSelector() git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@2915 2bbb7eff-a529-9590-31e7-b0007b416f81 --- tests.gyp | 1 + 1 file changed, 1 insertion(+) diff --git a/tests.gyp b/tests.gyp index acec823..e47bec6 100644 --- a/tests.gyp +++ b/tests.gyp @@ -64,6 +64,7 @@ '../tests/Test.h', '../tests/TestSize.cpp', '../tests/ToUnicode.cpp', + '../tests/UnicodeTest.cpp', '../tests/UtilsTest.cpp', '../tests/WArrayTest.cpp', '../tests/WritePixelsTest.cpp', -- cgit v1.2.3 From 6a0f87a9edcac4adb6e7657c008fa58a45ee2633 Mon Sep 17 00:00:00 2001 From: "reed@google.com" Date: Wed, 21 Dec 2011 19:36:21 +0000 Subject: add unittest for invariants for empty paths, still need to think about hairlines in those cases git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@2919 2bbb7eff-a529-9590-31e7-b0007b416f81 --- tests.gyp | 1 + 1 file changed, 1 insertion(+) diff --git a/tests.gyp b/tests.gyp index e47bec6..187eea5 100644 --- a/tests.gyp +++ b/tests.gyp @@ -29,6 +29,7 @@ '../tests/DataRefTest.cpp', '../tests/DequeTest.cpp', '../tests/DrawBitmapRectTest.cpp', + '../tests/EmptyPathTest.cpp', '../tests/FillPathTest.cpp', '../tests/FlateTest.cpp', '../tests/GeometryTest.cpp', -- cgit v1.2.3 From 33f6d5575261569c9ad8754547ea2a1f9a1e46f1 Mon Sep 17 00:00:00 2001 From: "caryclark@google.com" Date: Wed, 21 Dec 2011 20:06:30 +0000 Subject: support vertical text and typeface-by-name on Leopard M src/ports/SkFontHost_mac_coretext.cpp M gyp/gmslides.gypi A gm/verttext2.cpp git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@2920 2bbb7eff-a529-9590-31e7-b0007b416f81 --- gmslides.gypi | 1 + 1 file changed, 1 insertion(+) diff --git a/gmslides.gypi b/gmslides.gypi index 44bc7de..b85a701 100644 --- a/gmslides.gypi +++ b/gmslides.gypi @@ -43,6 +43,7 @@ '../gm/tilemodes.cpp', '../gm/tinybitmap.cpp', '../gm/verttext.cpp', + '../gm/verttext2.cpp', '../gm/xfermodes.cpp', ], } -- cgit v1.2.3 From 40be676680c2688a212a6e6c0b26352ef22d2533 Mon Sep 17 00:00:00 2001 From: "mike@reedtribe.org" Date: Wed, 28 Dec 2011 20:31:00 +0000 Subject: Add SkTableColorFilter, as a foundation for several SVG filters git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@2933 2bbb7eff-a529-9590-31e7-b0007b416f81 --- effects.gyp | 2 ++ gmslides.gypi | 1 + 2 files changed, 3 insertions(+) diff --git a/effects.gyp b/effects.gyp index 39d9c8c..2d716e3 100644 --- a/effects.gyp +++ b/effects.gyp @@ -36,6 +36,7 @@ '../include/effects/SkPixelXorXfermode.h', '../include/effects/SkPorterDuff.h', '../include/effects/SkRectShape.h', + '../include/effects/SkTableColorFilter.h', '../include/effects/SkTransparentShader.h', '../src/effects/Sk1DPathEffect.cpp', @@ -69,6 +70,7 @@ '../src/effects/SkPorterDuff.cpp', '../src/effects/SkRadialGradient_Table.h', '../src/effects/SkRectShape.cpp', + '../src/effects/SkTableColorFilter.cpp', '../src/effects/SkTestImageFilters.cpp', '../src/effects/SkTransparentShader.cpp', ], diff --git a/gmslides.gypi b/gmslides.gypi index b85a701..953699d 100644 --- a/gmslides.gypi +++ b/gmslides.gypi @@ -38,6 +38,7 @@ '../gm/shapes.cpp', '../gm/strokerects.cpp', '../gm/strokes.cpp', + '../gm/tablecolorfilter.cpp', '../gm/testimagefilters.cpp', '../gm/texdata.cpp', '../gm/tilemodes.cpp', -- cgit v1.2.3 From a54f923731182529d0c57000c9ade499f366001d Mon Sep 17 00:00:00 2001 From: "senorblanco@chromium.org" Date: Tue, 3 Jan 2012 20:51:57 +0000 Subject: Implement the color matrix filter in Ganesh. Also, fix and enable the color matrix test slide. This was basically implemented in the same places where the blending-based color filter was being done. The shader simply does a mat4 matrix multiply and a vec4 add. Review URL: http://codereview.appspot.com/5489107/ git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@2948 2bbb7eff-a529-9590-31e7-b0007b416f81 --- gmslides.gypi | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/gmslides.gypi b/gmslides.gypi index 953699d..c4a88d3 100644 --- a/gmslides.gypi +++ b/gmslides.gypi @@ -8,9 +8,7 @@ '../gm/bitmapfilters.cpp', '../gm/bitmapscroll.cpp', '../gm/blurs.cpp', - #Disabling this test until premult issues can be worked out. - #See http://code.google.com/p/skia/issues/detail?id=423 - #'../gm/colormatrix.cpp', + '../gm/colormatrix.cpp', '../gm/complexclip.cpp', '../gm/complexclip2.cpp', '../gm/cubicpaths.cpp', -- cgit v1.2.3 From c0be18f6835281b95e3d2f823059e8487f875eb3 Mon Sep 17 00:00:00 2001 From: "schenney@chromium.org" Date: Tue, 3 Jan 2012 21:42:10 +0000 Subject: Build fix. Forgot to update gyp. git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@2952 2bbb7eff-a529-9590-31e7-b0007b416f81 --- gmslides.gypi | 1 - 1 file changed, 1 deletion(-) diff --git a/gmslides.gypi b/gmslides.gypi index c4a88d3..2fd92cd 100644 --- a/gmslides.gypi +++ b/gmslides.gypi @@ -24,7 +24,6 @@ '../gm/imageblur.cpp', '../gm/lcdtext.cpp', '../gm/linepaths.cpp', - '../gm/movepaths.cpp', '../gm/ninepatchstretch.cpp', '../gm/nocolorbleed.cpp', '../gm/pathfill.cpp', -- cgit v1.2.3 From 5aa79a3e2d704e93e48ab2913c80034212e06d95 Mon Sep 17 00:00:00 2001 From: "senorblanco@chromium.org" Date: Tue, 3 Jan 2012 22:14:41 +0000 Subject: Disable colormatrix GM test, since it's failing on win32 float release. Build fix; unreviewed. git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@2953 2bbb7eff-a529-9590-31e7-b0007b416f81 --- gmslides.gypi | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/gmslides.gypi b/gmslides.gypi index 2fd92cd..88046b0 100644 --- a/gmslides.gypi +++ b/gmslides.gypi @@ -8,7 +8,9 @@ '../gm/bitmapfilters.cpp', '../gm/bitmapscroll.cpp', '../gm/blurs.cpp', - '../gm/colormatrix.cpp', + #Still giving problems on Win32_Float_NoDebug, so disabling until + #that is sorted out. + #'../gm/colormatrix.cpp', '../gm/complexclip.cpp', '../gm/complexclip2.cpp', '../gm/cubicpaths.cpp', -- cgit v1.2.3 From 59a4b160027d543f6ea8119aa190328e6ac04ebc Mon Sep 17 00:00:00 2001 From: "senorblanco@chromium.org" Date: Wed, 4 Jan 2012 22:00:34 +0000 Subject: Fix incorrect use of the SK_RESTRICT macro in SkColorMatrixFilter, and re-enable the colormatrix GM test. Review URL: http://codereview.appspot.com/5509048/ git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@2963 2bbb7eff-a529-9590-31e7-b0007b416f81 --- gmslides.gypi | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/gmslides.gypi b/gmslides.gypi index 88046b0..2fd92cd 100644 --- a/gmslides.gypi +++ b/gmslides.gypi @@ -8,9 +8,7 @@ '../gm/bitmapfilters.cpp', '../gm/bitmapscroll.cpp', '../gm/blurs.cpp', - #Still giving problems on Win32_Float_NoDebug, so disabling until - #that is sorted out. - #'../gm/colormatrix.cpp', + '../gm/colormatrix.cpp', '../gm/complexclip.cpp', '../gm/complexclip2.cpp', '../gm/cubicpaths.cpp', -- cgit v1.2.3 From b78198855d86776bf7c343075c3c0405f5458c53 Mon Sep 17 00:00:00 2001 From: "bsalomon@google.com" Date: Fri, 6 Jan 2012 19:22:11 +0000 Subject: Towards enabling -Werror in skia on Linux Review URL: http://codereview.appspot.com/5516044/ git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@2983 2bbb7eff-a529-9590-31e7-b0007b416f81 --- common_conditions.gypi | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/common_conditions.gypi b/common_conditions.gypi index 1a7c672..c3d96ff 100644 --- a/common_conditions.gypi +++ b/common_conditions.gypi @@ -87,7 +87,10 @@ 'cflags': ['-O2'] }, }, - 'cflags': [ + 'cflags': [ + # TODO(tony): Enable -Werror once all the strict-aliasing problems + # are fixed. + #'-Werror', '-Wall', '-Wextra', '-Wno-unused', -- cgit v1.2.3 From 5d1efa4271e22f44f1dcdedf198562a986a8ab75 Mon Sep 17 00:00:00 2001 From: "mike@reedtribe.org" Date: Sat, 7 Jan 2012 03:49:13 +0000 Subject: add unittest for sk_memset16 and sk_memset32 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@2985 2bbb7eff-a529-9590-31e7-b0007b416f81 --- tests.gyp | 1 + 1 file changed, 1 insertion(+) diff --git a/tests.gyp b/tests.gyp index 187eea5..27a34a0 100644 --- a/tests.gyp +++ b/tests.gyp @@ -39,6 +39,7 @@ '../tests/MathTest.cpp', '../tests/MatrixTest.cpp', '../tests/Matrix44Test.cpp', + '../tests/MemsetTest.cpp', '../tests/MetaDataTest.cpp', '../tests/PackBitsTest.cpp', '../tests/PaintTest.cpp', -- cgit v1.2.3 From 3f85e7f9e24b7dd9adc1c955eaa5b0fc42c0ca08 Mon Sep 17 00:00:00 2001 From: "djsollen@google.com" Date: Mon, 9 Jan 2012 14:38:25 +0000 Subject: Add ARM optimizations to the build. Also had to fix a problem in the ARM memset code that was causing some tests and bench to fail. Review URL: http://codereview.appspot.com/5522052 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@2989 2bbb7eff-a529-9590-31e7-b0007b416f81 --- core.gyp | 5 ----- opts.gyp | 7 ++++++- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/core.gyp b/core.gyp index 9e5c536..f83f482 100644 --- a/core.gyp +++ b/core.gyp @@ -148,8 +148,6 @@ '../src/core/SkWriter32.cpp', '../src/core/SkXfermode.cpp', - '../src/opts/opts_check_SSE2.cpp', - '../include/core/Sk64.h', '../include/core/SkAdvancedTypefaceMetrics.h', '../include/core/SkAutoKern.h', @@ -302,9 +300,6 @@ ], }], [ 'skia_os == "android"', { - 'sources!': [ - '../src/opts/opts_check_SSE2.cpp', - ], 'dependencies': [ 'android_system.gyp:ft2', ], diff --git a/opts.gyp b/opts.gyp index ae36481..1f67e00 100644 --- a/opts.gyp +++ b/opts.gyp @@ -28,6 +28,7 @@ '../include/config', '../include/core', '../src/core', + '../src/opts', ], 'conditions': [ [ 'skia_os in ["linux", "freebsd", "openbsd", "solaris"]', { @@ -37,6 +38,7 @@ }], [ 'skia_target_arch != "arm"', { 'sources': [ + '../src/opts/opts_check_SSE2.cpp', '../src/opts/SkBitmapProcState_opts_SSE2.cpp', '../src/opts/SkBlitRow_opts_SSE2.cpp', '../src/opts/SkUtils_opts_SSE2.cpp', @@ -52,9 +54,12 @@ '-fomit-frame-pointer', ], 'sources': [ + '../src/opts/opts_check_arm.cpp', + '../src/opts/memset.arm.S', + '../src/opts/memset16_neon.S', + '../src/opts/memset32_neon.S', '../src/opts/SkBitmapProcState_opts_arm.cpp', '../src/opts/SkBlitRow_opts_arm.cpp', - '../src/opts/SkUtils_opts_none.cpp', ], }], [ 'skia_target_arch == "arm" and armv7 != 1', { -- cgit v1.2.3 From 954055dab5954e36cfaf7a38fd73f0e038c56d79 Mon Sep 17 00:00:00 2001 From: "djsollen@google.com" Date: Mon, 9 Jan 2012 20:40:25 +0000 Subject: Change remaining ANDROID ifdefs to SK_BUILD_FOR_ANDROID Review URL: http://codereview.appspot.com/5528050 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@2990 2bbb7eff-a529-9590-31e7-b0007b416f81 --- common_conditions.gypi | 1 - 1 file changed, 1 deletion(-) diff --git a/common_conditions.gypi b/common_conditions.gypi index c3d96ff..cfdd4e8 100644 --- a/common_conditions.gypi +++ b/common_conditions.gypi @@ -152,7 +152,6 @@ ['skia_os == "android"', { 'defines': [ - 'ANDROID', # TODO: change these defines to SK_BUILD_FOR_ANDROID 'SK_BUILD_FOR_ANDROID', 'SK_BUILD_FOR_ANDROID_NDK', ], -- cgit v1.2.3 From 0998ff0eb69860608d6c86e3ea6c7970392155fc Mon Sep 17 00:00:00 2001 From: "digit@google.com" Date: Tue, 10 Jan 2012 10:28:30 +0000 Subject: Android: disable static global initializers Review URL: http://codereview.appspot.com/5503066 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@2992 2bbb7eff-a529-9590-31e7-b0007b416f81 --- common_conditions.gypi | 1 + 1 file changed, 1 insertion(+) diff --git a/common_conditions.gypi b/common_conditions.gypi index cfdd4e8..e18cbc1 100644 --- a/common_conditions.gypi +++ b/common_conditions.gypi @@ -154,6 +154,7 @@ 'defines': [ 'SK_BUILD_FOR_ANDROID', 'SK_BUILD_FOR_ANDROID_NDK', + 'SK_ALLOW_STATIC_GLOBAL_INITIALIZERS=0', ], 'configurations': { 'Debug': { -- cgit v1.2.3 From a583a7e959378091adbc6ba0a8386d3a00470875 Mon Sep 17 00:00:00 2001 From: "reed@google.com" Date: Tue, 10 Jan 2012 15:33:12 +0000 Subject: add SkPath::reverseAddPath() git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@2995 2bbb7eff-a529-9590-31e7-b0007b416f81 --- gmslides.gypi | 1 + 1 file changed, 1 insertion(+) diff --git a/gmslides.gypi b/gmslides.gypi index 2fd92cd..c4f3899 100644 --- a/gmslides.gypi +++ b/gmslides.gypi @@ -33,6 +33,7 @@ '../gm/shadertext.cpp', '../gm/shadows.cpp', '../gm/shapes.cpp', + '../gm/strokefill.cpp', '../gm/strokerects.cpp', '../gm/strokes.cpp', '../gm/tablecolorfilter.cpp', -- cgit v1.2.3 From e26f6cd144478c09a5e4c043ca25bd1b01ca44f1 Mon Sep 17 00:00:00 2001 From: "reed@google.com" Date: Tue, 10 Jan 2012 18:44:37 +0000 Subject: add gm for reverseAddPath git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@3001 2bbb7eff-a529-9590-31e7-b0007b416f81 --- gmslides.gypi | 1 + 1 file changed, 1 insertion(+) diff --git a/gmslides.gypi b/gmslides.gypi index c4f3899..66692d1 100644 --- a/gmslides.gypi +++ b/gmslides.gypi @@ -27,6 +27,7 @@ '../gm/ninepatchstretch.cpp', '../gm/nocolorbleed.cpp', '../gm/pathfill.cpp', + '../gm/pathreverse.cpp', '../gm/points.cpp', '../gm/poly2poly.cpp', '../gm/quadpaths.cpp', -- cgit v1.2.3 From 5ddc6aee967aeb3833229fb5be5b3921c0dcaa36 Mon Sep 17 00:00:00 2001 From: "bsalomon@google.com" Date: Thu, 12 Jan 2012 20:19:56 +0000 Subject: Add code path to SW rasterize paths and upload as a mask texture Review URL: http://codereview.appspot.com/5542043/ git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@3031 2bbb7eff-a529-9590-31e7-b0007b416f81 --- gpu.gyp | 1 + 1 file changed, 1 insertion(+) diff --git a/gpu.gyp b/gpu.gyp index 9fcded1..454204d 100644 --- a/gpu.gyp +++ b/gpu.gyp @@ -144,6 +144,7 @@ '../include/core', '../include/config', '../include/gpu', + '../src/core', # SkRasterClip.h ], 'dependencies': [ 'libtess.gyp:libtess', -- cgit v1.2.3 From d98038845b438459efb12312fcf7753d09c49b76 Mon Sep 17 00:00:00 2001 From: "bsalomon@google.com" Date: Thu, 12 Jan 2012 20:56:52 +0000 Subject: Add gyp variable to disable OSAA Review URL: http://codereview.appspot.com/5539047 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@3033 2bbb7eff-a529-9590-31e7-b0007b416f81 --- gpu.gyp | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/gpu.gyp b/gpu.gyp index 454204d..d16d797 100644 --- a/gpu.gyp +++ b/gpu.gyp @@ -1,4 +1,9 @@ { + 'variables': { + 'skia_gpu_disable_osaa%': 0, + }, + 'skia_gpu_disable_osaa': '<(skia_gpu_disable_osaa)', + 'includes': [ 'common.gypi', ], @@ -282,6 +287,11 @@ 'GR_IMPLEMENTATION=1', ], 'conditions': [ + [ 'skia_gpu_disable_osaa', { + 'defines': [ + 'GR_USE_OFFSCREEN_AA=0', + ], + }], [ 'skia_os == "linux"', { 'sources!': [ '../src/gpu/GrGLDefaultInterface_none.cpp', -- cgit v1.2.3 From 0964ae2506ca652dbd3cc74eeb1a522559171d13 Mon Sep 17 00:00:00 2001 From: "bungeman@google.com" Date: Fri, 13 Jan 2012 15:02:58 +0000 Subject: Subpixel text 3/8 of a pixel too far to the right. http://codereview.appspot.com/5502097/ git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@3037 2bbb7eff-a529-9590-31e7-b0007b416f81 --- tests.gyp | 1 + 1 file changed, 1 insertion(+) diff --git a/tests.gyp b/tests.gyp index 27a34a0..011030c 100644 --- a/tests.gyp +++ b/tests.gyp @@ -29,6 +29,7 @@ '../tests/DataRefTest.cpp', '../tests/DequeTest.cpp', '../tests/DrawBitmapRectTest.cpp', + '../tests/DrawTextTest.cpp', '../tests/EmptyPathTest.cpp', '../tests/FillPathTest.cpp', '../tests/FlateTest.cpp', -- cgit v1.2.3 From 8f56bf60b41476783ec7daaf76213f4b71983cb2 Mon Sep 17 00:00:00 2001 From: "bsalomon@google.com" Date: Tue, 17 Jan 2012 14:25:10 +0000 Subject: Add convex path renderer (disabled) Review URL: http://codereview.appspot.com/5533061/ git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@3040 2bbb7eff-a529-9590-31e7-b0007b416f81 --- gmslides.gypi | 1 + gpu.gyp | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/gmslides.gypi b/gmslides.gypi index 66692d1..0750dbe 100644 --- a/gmslides.gypi +++ b/gmslides.gypi @@ -11,6 +11,7 @@ '../gm/colormatrix.cpp', '../gm/complexclip.cpp', '../gm/complexclip2.cpp', + '../gm/convexpaths.cpp', '../gm/cubicpaths.cpp', '../gm/degeneratesegments.cpp', '../gm/drawbitmaprect.cpp', diff --git a/gpu.gyp b/gpu.gyp index d16d797..c3f75f5 100644 --- a/gpu.gyp +++ b/gpu.gyp @@ -186,7 +186,9 @@ '../src/gpu/GrAAHairLinePathRenderer.cpp', '../src/gpu/GrAAHairLinePathRenderer.h', - '../src/gpu/GrAddPathRenderers_aahairline.cpp', + '../src/gpu/GrAAConvexPathRenderer.cpp', + '../src/gpu/GrAAConvexPathRenderer.h', + '../src/gpu/GrAddPathRenderers_default.cpp', '../src/gpu/GrAllocator.h', '../src/gpu/GrAllocPool.h', '../src/gpu/GrAllocPool.cpp', -- cgit v1.2.3 From b84a51749fdcf6381da07de877210bc546770d4a Mon Sep 17 00:00:00 2001 From: "junov@google.com" Date: Wed, 18 Jan 2012 16:21:08 +0000 Subject: Adding class SkDeferredCanvas for deferred rendering. TEST=added a new pass to gm, so all gm tests are run through SkDeferredCanvas REVIEW=http://codereview.appspot.com/5430058/ git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@3059 2bbb7eff-a529-9590-31e7-b0007b416f81 --- utils.gyp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/utils.gyp b/utils.gyp index b4b2be3..d8c421d 100644 --- a/utils.gyp +++ b/utils.gyp @@ -22,6 +22,7 @@ '../include/utils/SkCamera.h', '../include/utils/SkCubicInterval.h', '../include/utils/SkCullPoints.h', + '../include/utils/SkDeferredCanvas.h', '../include/utils/SkDumpCanvas.h', '../include/utils/SkInterpolator.h', '../include/utils/SkLayer.h', @@ -43,6 +44,7 @@ '../src/utils/SkColorMatrix.cpp', '../src/utils/SkCubicInterval.cpp', '../src/utils/SkCullPoints.cpp', + '../src/utils/SkDeferredCanvas.cpp', '../src/utils/SkDumpCanvas.cpp', '../src/utils/SkInterpolator.cpp', '../src/utils/SkLayer.cpp', -- cgit v1.2.3 From c430e2fe09bea3c0d44f895f02c8289730152cf9 Mon Sep 17 00:00:00 2001 From: "senorblanco@chromium.org" Date: Thu, 19 Jan 2012 19:59:22 +0000 Subject: Fix a warning in libtess in Release builds; define NDEBUG in Release on all platforms. BUG: http://code.google.com/p/skia/issues/detail?id=456 Review URL: http://codereview.appspot.com/5555054/ git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@3076 2bbb7eff-a529-9590-31e7-b0007b416f81 --- common_conditions.gypi | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/common_conditions.gypi b/common_conditions.gypi index e18cbc1..99cabc9 100644 --- a/common_conditions.gypi +++ b/common_conditions.gypi @@ -84,7 +84,8 @@ 'cflags': ['-g'] }, 'Release': { - 'cflags': ['-O2'] + 'cflags': ['-O2'], + 'defines': [ 'NDEBUG' ], }, }, 'cflags': [ @@ -119,6 +120,7 @@ 'xcode_settings': { 'GCC_OPTIMIZATION_LEVEL': '3', }, + 'defines': [ 'NDEBUG' ], }, }, 'xcode_settings': { @@ -161,7 +163,8 @@ 'cflags': ['-g'] }, 'Release': { - 'cflags': ['-O2'] + 'cflags': ['-O2'], + 'defines': [ 'NDEBUG' ], }, }, 'libraries': [ -- cgit v1.2.3 From 72c136836abc708a63ec92f8e741a0a732d61714 Mon Sep 17 00:00:00 2001 From: "digit@google.com" Date: Thu, 26 Jan 2012 21:26:40 +0000 Subject: posix: Avoid static initializers in static/global mutexes This patch removes static initializers related to static and global mutexes from the final library's machine code when building on a pthread-capable system. We use PTHREAD_MUTEX_INITIALIZER to perform POD-style initialization. You need a line like the following to declare a global mutex with it: SkBaseMutex gMutex = { PTHREAD_MUTEX_INITIALIZER }; We introduce the SK_DECLARE_STATIC_MUTEX and SK_DECLARE_GLOBAL_MUTEX macros to be able to declare static/global mutexes in the source tree uniformly. SkMutex is now defined as a sub-class of SkBaseMutex, with standard construction/destruction semantics. This is useful if the mutex object is a member of another C++ class, or allocated dynamically. We also modify a few places to refer to SkBaseMutex instead of a SkMutex, where it makes sense. Generally speaking, client code should hold and use pointers to SkBaseMutex whenever they can now. We defined a new built-time macro named SK_USE_POSIX_THREADS to indicate that we're using a pthread-based SkThread.h interface. The macro will also be used in future patches to implement other helper thread synchronization classes. Finally, we inline the acquire() and release() functions in the case of Posix to improve performance a bit. Running: 'bench -repeat 10 -match mutex' on an Android device or a 2.4GHz Xeon Linux desktop shows the following improvements: Before After Galaxy Nexus 1.64 1.45 Nexus S 1.47 1.16 Xoom 1.86 1.66 Xeon 0.36 0.31 This removes 5 static mutex initializers from the library Review URL: https://codereview.appspot.com/5501066 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@3091 2bbb7eff-a529-9590-31e7-b0007b416f81 --- common_conditions.gypi | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/common_conditions.gypi b/common_conditions.gypi index 99cabc9..faa48fb 100644 --- a/common_conditions.gypi +++ b/common_conditions.gypi @@ -205,6 +205,14 @@ }, ], + # We can POD-style initialization of static mutexes to avoid generating + # static initializers if we're using a pthread-compatible thread interface. + [ 'skia_os != "win"', { + 'defines': [ + 'SK_USE_POSIX_THREADS' + ], + }], + ], # end 'conditions' } -- cgit v1.2.3 From 602b782c878122b30433c1bd3656816f76b14609 Mon Sep 17 00:00:00 2001 From: "bungeman@google.com" Date: Thu, 2 Feb 2012 19:15:21 +0000 Subject: Open type table definitions. http://codereview.appspot.com/5577064/ git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@3131 2bbb7eff-a529-9590-31e7-b0007b416f81 --- sfnt.gyp | 45 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) create mode 100644 sfnt.gyp diff --git a/sfnt.gyp b/sfnt.gyp new file mode 100644 index 0000000..5068108 --- /dev/null +++ b/sfnt.gyp @@ -0,0 +1,45 @@ +{ + 'includes': [ + 'common.gypi', + ], + 'targets': [ + { + 'target_name': 'sfnt', + 'type': 'static_library', + 'dependencies': [ + 'core.gyp:core', + ], + 'include_dirs': [ + '../src/sfnt', + ], + 'sources': [ + '../src/sfnt/SkIBMFamilyClass.h', + '../src/sfnt/SkOTTableTypes.h', + '../src/sfnt/SkOTTable_head.h', + '../src/sfnt/SkOTTable_hhea.h', + '../src/sfnt/SkOTTable_OS_2.h', + '../src/sfnt/SkOTTable_OS_2_V0.h', + '../src/sfnt/SkOTTable_OS_2_V1.h', + '../src/sfnt/SkOTTable_OS_2_V2.h', + '../src/sfnt/SkOTTable_OS_2_V3.h', + '../src/sfnt/SkOTTable_OS_2_V4.h', + '../src/sfnt/SkOTTable_OS_2_VA.h', + '../src/sfnt/SkOTTable_post.h', + '../src/sfnt/SkPanose.h', + '../src/sfnt/SkPreprocessorSeq.h', + '../src/sfnt/SkTypedEnum.h', + ], + 'direct_dependent_settings': { + 'include_dirs': [ + '../src/sfnt', + ], + }, + }, + ], +} + +# Local Variables: +# tab-width:2 +# indent-tabs-mode:nil +# End: +# vim: set expandtab tabstop=2 shiftwidth=2: -- cgit v1.2.3 From 0c8241172c1ed04097313c8e94231c3ccb740031 Mon Sep 17 00:00:00 2001 From: "junov@chromium.org" Date: Tue, 7 Feb 2012 16:27:57 +0000 Subject: Fixing backing store access in SkDeferredCanvas. Chromium CL required for rolling skia DEPS past this change is posted here: https://chromiumcodereview.appspot.com/9341003/ BUG=http://code.google.com/p/skia/issues/detail?id=475 REVIEW=http://codereview.appspot.com/5626047/ TEST=DeferredCanvas unit test git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@3147 2bbb7eff-a529-9590-31e7-b0007b416f81 --- tests.gyp | 1 + 1 file changed, 1 insertion(+) diff --git a/tests.gyp b/tests.gyp index 011030c..63ff7c9 100644 --- a/tests.gyp +++ b/tests.gyp @@ -27,6 +27,7 @@ '../tests/ColorFilterTest.cpp', '../tests/ColorTest.cpp', '../tests/DataRefTest.cpp', + '../tests/DeferredCanvasTest.cpp', '../tests/DequeTest.cpp', '../tests/DrawBitmapRectTest.cpp', '../tests/DrawTextTest.cpp', -- cgit v1.2.3 From d2b3e35465415599fdc74dc8b6bf0adc4e292ca9 Mon Sep 17 00:00:00 2001 From: "bungeman@google.com" Date: Tue, 7 Feb 2012 20:47:38 +0000 Subject: Move SkBase64 to utils, allow user defined encoding. git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@3148 2bbb7eff-a529-9590-31e7-b0007b416f81 --- animator.gyp | 3 +-- utils.gyp | 2 ++ 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/animator.gyp b/animator.gyp index fc61e71..f713f3f 100644 --- a/animator.gyp +++ b/animator.gyp @@ -15,6 +15,7 @@ '../include/xml', '../include/utils', '../include/images', + '../src/utils', ], 'sources': [ '../include/animator/SkAnimator.h', @@ -36,8 +37,6 @@ '../src/animator/SkAnimatorScript.h', #'../src/animator/SkAnimatorScript2.cpp', fails on windows #'../src/animator/SkAnimatorScript2.h', - '../src/animator/SkBase64.cpp', - '../src/animator/SkBase64.h', '../src/animator/SkBoundable.cpp', '../src/animator/SkBoundable.h', '../src/animator/SkBuildCondensedInfo.cpp', diff --git a/utils.gyp b/utils.gyp index d8c421d..8d2415a 100644 --- a/utils.gyp +++ b/utils.gyp @@ -39,6 +39,8 @@ '../include/utils/SkUnitMappers.h', '../include/utils/SkWGL.h', + '../src/utils/SkBase64.cpp', + '../src/utils/SkBase64.h', '../src/utils/SkBoundaryPatch.cpp', '../src/utils/SkCamera.cpp', '../src/utils/SkColorMatrix.cpp', -- cgit v1.2.3 From bd4cfe2ad8bc27aa98a453c90429d5744a0afce6 Mon Sep 17 00:00:00 2001 From: "bungeman@google.com" Date: Tue, 7 Feb 2012 21:30:21 +0000 Subject: Add more TT table definitions and create fake enum typedef. git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@3150 2bbb7eff-a529-9590-31e7-b0007b416f81 --- sfnt.gyp | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/sfnt.gyp b/sfnt.gyp index 5068108..2f2fc76 100644 --- a/sfnt.gyp +++ b/sfnt.gyp @@ -17,6 +17,7 @@ '../src/sfnt/SkOTTableTypes.h', '../src/sfnt/SkOTTable_head.h', '../src/sfnt/SkOTTable_hhea.h', + '../src/sfnt/SkOTTable_name.h', '../src/sfnt/SkOTTable_OS_2.h', '../src/sfnt/SkOTTable_OS_2_V0.h', '../src/sfnt/SkOTTable_OS_2_V1.h', @@ -26,8 +27,12 @@ '../src/sfnt/SkOTTable_OS_2_VA.h', '../src/sfnt/SkOTTable_post.h', '../src/sfnt/SkPanose.h', + '../src/sfnt/SkOTUtils.h', '../src/sfnt/SkPreprocessorSeq.h', + '../src/sfnt/SkSFNTHeader.h', '../src/sfnt/SkTypedEnum.h', + + '../src/sfnt/SkOTUtils.cpp', ], 'direct_dependent_settings': { 'include_dirs': [ -- cgit v1.2.3 From e81538758242957b406875f044eb81c80e927bed Mon Sep 17 00:00:00 2001 From: "bsalomon@google.com" Date: Fri, 10 Feb 2012 20:05:18 +0000 Subject: Add GrGLContextInfo Review URL: http://codereview.appspot.com/5653060/ git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@3162 2bbb7eff-a529-9590-31e7-b0007b416f81 --- gpu.gyp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/gpu.gyp b/gpu.gyp index c3f75f5..f85e819 100644 --- a/gpu.gyp +++ b/gpu.gyp @@ -205,6 +205,8 @@ '../src/gpu/GrDrawTarget.cpp', '../src/gpu/GrDrawTarget.h', '../src/gpu/GrGeometryBuffer.h', + '../src/gpu/GrGLContextInfo.cpp', + '../src/gpu/GrGLContextInfo.h', '../src/gpu/GrGLCreateNativeInterface_none.cpp', '../src/gpu/GrGLCreateNullInterface.cpp', '../src/gpu/GrGLDefaultInterface_none.cpp', -- cgit v1.2.3 From f7bfba18b7f36392fd2b38b7b063264e647e68db Mon Sep 17 00:00:00 2001 From: "tomhudson@google.com" Date: Fri, 10 Feb 2012 21:35:06 +0000 Subject: Add two files missed in r3165; most critically the gyp! git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@3166 2bbb7eff-a529-9590-31e7-b0007b416f81 --- gpu.gyp | 95 ++++++++++++++++++++++++++++++++++------------------------------- 1 file changed, 49 insertions(+), 46 deletions(-) diff --git a/gpu.gyp b/gpu.gyp index f85e819..275a792 100644 --- a/gpu.gyp +++ b/gpu.gyp @@ -101,23 +101,25 @@ '../include/gpu', ], 'sources': [ - '../include/gpu/SkGLContext.h', - '../include/gpu/SkMesaGLContext.h', - '../include/gpu/SkNativeGLContext.h', - '../include/gpu/SkNullGLContext.h', '../include/gpu/SkGpuCanvas.h', '../include/gpu/SkGpuDevice.h', '../include/gpu/SkGr.h', '../include/gpu/SkGrTexturePixelRef.h', + '../include/gpu/SkGLContext.h', + '../include/gpu/SkMesaGLContext.h', + '../include/gpu/SkNativeGLContext.h', + '../include/gpu/SkNullGLContext.h', + '../src/gpu/GrPrintf_skia.cpp', - '../src/gpu/SkGLContext.cpp', '../src/gpu/SkGpuCanvas.cpp', '../src/gpu/SkGpuDevice.cpp', '../src/gpu/SkGr.cpp', '../src/gpu/SkGrFontScaler.cpp', '../src/gpu/SkGrTexturePixelRef.cpp', - '../src/gpu/SkNullGLContext.cpp', + + '../src/gpu/gl/SkGLContext.cpp', + '../src/gpu/gl/SkNullGLContext.cpp', '../src/gpu/android/SkNativeGLContext_android.cpp', @@ -161,10 +163,6 @@ '../include/gpu/GrConfig.h', '../include/gpu/GrContext.h', '../include/gpu/GrFontScaler.h', - '../include/gpu/GrGLConfig.h', - '../include/gpu/GrGLConfig_chrome.h', - '../include/gpu/GrGLDefines.h', - '../include/gpu/GrGLInterface.h', '../include/gpu/GrGlyph.h', '../include/gpu/GrInstanceCounter.h', '../include/gpu/GrKey.h', @@ -184,6 +182,11 @@ '../include/gpu/GrTypes.h', '../include/gpu/GrUserConfig.h', + '../include/gpu/GrGLConfig.h', + '../include/gpu/GrGLConfig_chrome.h', + '../include/gpu/GrGLDefines.h', + '../include/gpu/GrGLInterface.h', + '../src/gpu/GrAAHairLinePathRenderer.cpp', '../src/gpu/GrAAHairLinePathRenderer.h', '../src/gpu/GrAAConvexPathRenderer.cpp', @@ -205,37 +208,9 @@ '../src/gpu/GrDrawTarget.cpp', '../src/gpu/GrDrawTarget.h', '../src/gpu/GrGeometryBuffer.h', - '../src/gpu/GrGLContextInfo.cpp', - '../src/gpu/GrGLContextInfo.h', - '../src/gpu/GrGLCreateNativeInterface_none.cpp', - '../src/gpu/GrGLCreateNullInterface.cpp', - '../src/gpu/GrGLDefaultInterface_none.cpp', - '../src/gpu/GrGLDefaultInterface_native.cpp', - '../src/gpu/GrGLIndexBuffer.cpp', - '../src/gpu/GrGLIndexBuffer.h', - '../src/gpu/GrGLInterface.cpp', - '../src/gpu/GrGLIRect.h', - '../src/gpu/GrGLProgram.cpp', - '../src/gpu/GrGLProgram.h', - '../src/gpu/GrGLRenderTarget.cpp', - '../src/gpu/GrGLRenderTarget.h', - '../src/gpu/GrGLShaderVar.h', - '../src/gpu/GrGLSL.cpp', - '../src/gpu/GrGLSL.h', - '../src/gpu/GrGLStencilBuffer.cpp', - '../src/gpu/GrGLStencilBuffer.h', - '../src/gpu/GrGLTexture.cpp', - '../src/gpu/GrGLTexture.h', - '../src/gpu/GrGLUtil.cpp', - '../src/gpu/GrGLVertexBuffer.cpp', - '../src/gpu/GrGLVertexBuffer.h', '../src/gpu/GrGpu.cpp', '../src/gpu/GrGpu.h', '../src/gpu/GrGpuFactory.cpp', - '../src/gpu/GrGpuGL.cpp', - '../src/gpu/GrGpuGL.h', - '../src/gpu/GrGpuGLShaders.cpp', - '../src/gpu/GrGpuGLShaders.h', '../src/gpu/GrGpuVertex.h', '../src/gpu/GrIndexBuffer.h', '../src/gpu/GrInOrderDrawBuffer.cpp', @@ -276,6 +251,34 @@ '../src/gpu/GrVertexBuffer.h', '../src/gpu/gr_unittests.cpp', + '../src/gpu/gl/GrGLContextInfo.cpp', + '../src/gpu/gl/GrGLContextInfo.h', + '../src/gpu/gl/GrGLCreateNativeInterface_none.cpp', + '../src/gpu/gl/GrGLCreateNullInterface.cpp', + '../src/gpu/gl/GrGLDefaultInterface_none.cpp', + '../src/gpu/gl/GrGLDefaultInterface_native.cpp', + '../src/gpu/gl/GrGLIndexBuffer.cpp', + '../src/gpu/gl/GrGLIndexBuffer.h', + '../src/gpu/gl/GrGLInterface.cpp', + '../src/gpu/gl/GrGLIRect.h', + '../src/gpu/gl/GrGLProgram.cpp', + '../src/gpu/gl/GrGLProgram.h', + '../src/gpu/gl/GrGLRenderTarget.cpp', + '../src/gpu/gl/GrGLRenderTarget.h', + '../src/gpu/gl/GrGLShaderVar.h', + '../src/gpu/gl/GrGLSL.cpp', + '../src/gpu/gl/GrGLSL.h', + '../src/gpu/gl/GrGLStencilBuffer.cpp', + '../src/gpu/gl/GrGLStencilBuffer.h', + '../src/gpu/gl/GrGLTexture.cpp', + '../src/gpu/gl/GrGLTexture.h', + '../src/gpu/gl/GrGLUtil.cpp', + '../src/gpu/gl/GrGLVertexBuffer.cpp', + '../src/gpu/gl/GrGLVertexBuffer.h', + '../src/gpu/gl/GrGpuGL.cpp', + '../src/gpu/gl/GrGpuGL.h', + '../src/gpu/gl/GrGpuGLShaders.cpp', + '../src/gpu/gl/GrGpuGLShaders.h', '../src/gpu/mac/GrGLCreateNativeInterface_mac.cpp', @@ -298,8 +301,8 @@ }], [ 'skia_os == "linux"', { 'sources!': [ - '../src/gpu/GrGLDefaultInterface_none.cpp', - '../src/gpu/GrGLCreateNativeInterface_none.cpp', + '../src/gpu/gl/GrGLDefaultInterface_none.cpp', + '../src/gpu/gl/GrGLCreateNativeInterface_none.cpp', ], 'link_settings': { 'libraries': [ @@ -322,8 +325,8 @@ ], }, 'sources!': [ - '../src/gpu/GrGLDefaultInterface_none.cpp', - '../src/gpu/GrGLCreateNativeInterface_none.cpp', + '../src/gpu/gl/GrGLDefaultInterface_none.cpp', + '../src/gpu/gl/GrGLCreateNativeInterface_none.cpp', ], }], [ 'skia_mesa and skia_os == "mac"', { @@ -343,14 +346,14 @@ }], [ 'skia_os == "win"', { 'sources!': [ - '../src/gpu/GrGLDefaultInterface_none.cpp', - '../src/gpu/GrGLCreateNativeInterface_none.cpp', + '../src/gpu/gl/GrGLDefaultInterface_none.cpp', + '../src/gpu/gl/GrGLCreateNativeInterface_none.cpp', ], }], [ 'skia_os == "android"', { 'sources!': [ - '../src/gpu/GrGLDefaultInterface_none.cpp', - '../src/gpu/GrGLCreateNativeInterface_none.cpp', + '../src/gpu/gl/GrGLDefaultInterface_none.cpp', + '../src/gpu/gl/GrGLCreateNativeInterface_none.cpp', ], 'link_settings': { 'libraries': [ -- cgit v1.2.3 From 0d2c1ad5de3394785f74b8689fe854f730d9b494 Mon Sep 17 00:00:00 2001 From: "bsalomon@google.com" Date: Mon, 13 Feb 2012 15:18:34 +0000 Subject: Add path effect GM Review URL: http://codereview.appspot.com/5649069/ git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@3172 2bbb7eff-a529-9590-31e7-b0007b416f81 --- gmslides.gypi | 1 + 1 file changed, 1 insertion(+) diff --git a/gmslides.gypi b/gmslides.gypi index 0750dbe..613b950 100644 --- a/gmslides.gypi +++ b/gmslides.gypi @@ -27,6 +27,7 @@ '../gm/linepaths.cpp', '../gm/ninepatchstretch.cpp', '../gm/nocolorbleed.cpp', + '../gm/patheffects.cpp', '../gm/pathfill.cpp', '../gm/pathreverse.cpp', '../gm/points.cpp', -- cgit v1.2.3 From 454ecab81a68c891a1a908ef2ea80d4a363f049d Mon Sep 17 00:00:00 2001 From: "bsalomon@google.com" Date: Tue, 14 Feb 2012 14:09:57 +0000 Subject: Make GLCaps be standalone and be a member of GrGLContextInfo Review URL: http://codereview.appspot.com/5654084/ git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@3183 2bbb7eff-a529-9590-31e7-b0007b416f81 --- gpu.gyp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/gpu.gyp b/gpu.gyp index 275a792..37cc4c0 100644 --- a/gpu.gyp +++ b/gpu.gyp @@ -251,6 +251,8 @@ '../src/gpu/GrVertexBuffer.h', '../src/gpu/gr_unittests.cpp', + '../src/gpu/gl/GrGLCaps.cpp', + '../src/gpu/gl/GrGLCaps.h', '../src/gpu/gl/GrGLContextInfo.cpp', '../src/gpu/gl/GrGLContextInfo.h', '../src/gpu/gl/GrGLCreateNativeInterface_none.cpp', -- cgit v1.2.3 From 771651b6a03e57336b26ac9abaf80f8b71f7b297 Mon Sep 17 00:00:00 2001 From: "epoger@google.com" Date: Tue, 14 Feb 2012 14:53:59 +0000 Subject: Set LCD font smoothing to "medium" for gm on Mac, regardless of system settings http://code.google.com/p/skia/issues/detail?id=382 ('make gm results consistent regardless of system LCDtext settings') Review URL: https://codereview.appspot.com/5661043 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@3184 2bbb7eff-a529-9590-31e7-b0007b416f81 --- gm.gyp | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/gm.gyp b/gm.gyp index 43075dc..3c5e12e 100644 --- a/gm.gyp +++ b/gm.gyp @@ -14,6 +14,7 @@ 'sources': [ '../gm/gm.cpp', '../gm/gmmain.cpp', + '../gm/system_preferences_default.cpp', ], 'dependencies': [ 'core.gyp:core', @@ -25,9 +26,22 @@ 'pdf.gyp:pdf', 'utils.gyp:utils', ], - #mac does not like empty dependency. 'conditions': [ - [ 'skia_os == "win"', { + ['skia_os == "mac"', { + 'sources!': [ + '../gm/system_preferences_default.cpp', + ], + 'sources': [ + '../gm/system_preferences_mac.mm', + ], + 'link_settings': { + 'libraries': [ + '$(SDKROOT)/System/Library/Frameworks/Cocoa.framework', + '$(SDKROOT)/System/Library/Frameworks/Foundation.framework', + ], + }, + }], + ['skia_os == "win"', { 'dependencies': [ 'xps.gyp:xps', ], -- cgit v1.2.3 From 402496a642d8f6ce81ace66f5a7bc8a658fbe9f8 Mon Sep 17 00:00:00 2001 From: "tomhudson@google.com" Date: Tue, 14 Feb 2012 15:11:59 +0000 Subject: Move GL-specific include files to their own subdirectory, to better coexist alongside D3D backend. Requires gyp change. http://codereview.appspot.com/5665045/ git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@3185 2bbb7eff-a529-9590-31e7-b0007b416f81 --- gpu.gyp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/gpu.gyp b/gpu.gyp index 37cc4c0..39e0ee9 100644 --- a/gpu.gyp +++ b/gpu.gyp @@ -106,10 +106,10 @@ '../include/gpu/SkGr.h', '../include/gpu/SkGrTexturePixelRef.h', - '../include/gpu/SkGLContext.h', - '../include/gpu/SkMesaGLContext.h', - '../include/gpu/SkNativeGLContext.h', - '../include/gpu/SkNullGLContext.h', + '../include/gpu/gl/SkGLContext.h', + '../include/gpu/gl/SkMesaGLContext.h', + '../include/gpu/gl/SkNativeGLContext.h', + '../include/gpu/gl/SkNullGLContext.h', '../src/gpu/GrPrintf_skia.cpp', '../src/gpu/SkGpuCanvas.cpp', @@ -182,10 +182,10 @@ '../include/gpu/GrTypes.h', '../include/gpu/GrUserConfig.h', - '../include/gpu/GrGLConfig.h', - '../include/gpu/GrGLConfig_chrome.h', - '../include/gpu/GrGLDefines.h', - '../include/gpu/GrGLInterface.h', + '../include/gpu/gl/GrGLConfig.h', + '../include/gpu/gl/GrGLConfig_chrome.h', + '../include/gpu/gl/GrGLDefines.h', + '../include/gpu/gl/GrGLInterface.h', '../src/gpu/GrAAHairLinePathRenderer.cpp', '../src/gpu/GrAAHairLinePathRenderer.h', -- cgit v1.2.3 From 6525c3cbac66a00c3457c1d096273c1324eee8c3 Mon Sep 17 00:00:00 2001 From: "reed@google.com" Date: Tue, 14 Feb 2012 16:12:49 +0000 Subject: add test for colored text drawing (hopefully gamma corrected) git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@3190 2bbb7eff-a529-9590-31e7-b0007b416f81 --- gmslides.gypi | 1 + 1 file changed, 1 insertion(+) diff --git a/gmslides.gypi b/gmslides.gypi index 613b950..43bf87a 100644 --- a/gmslides.gypi +++ b/gmslides.gypi @@ -19,6 +19,7 @@ '../gm/filltypes.cpp', '../gm/filltypespersp.cpp', '../gm/fontscaler.cpp', + '../gm/gammatext.cpp', '../gm/gradients.cpp', '../gm/gradtext.cpp', '../gm/hairmodes.cpp', -- cgit v1.2.3 From cf87468b4b13f4f23c188f522f499b4928464d4f Mon Sep 17 00:00:00 2001 From: "bsalomon@google.com" Date: Tue, 14 Feb 2012 17:03:16 +0000 Subject: Add test to detect bias in conversion of frag shader floats to bytes Review URL: http://codereview.appspot.com/5669045/ git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@3191 2bbb7eff-a529-9590-31e7-b0007b416f81 --- gpu.gyp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/gpu.gyp b/gpu.gyp index 39e0ee9..ec85ab0 100644 --- a/gpu.gyp +++ b/gpu.gyp @@ -253,6 +253,8 @@ '../src/gpu/gl/GrGLCaps.cpp', '../src/gpu/gl/GrGLCaps.h', + '../src/gpu/gl/GrGLColorConversionTest.cpp', + '../src/gpu/gl/GrGLColorConversionTest.h', '../src/gpu/gl/GrGLContextInfo.cpp', '../src/gpu/gl/GrGLContextInfo.h', '../src/gpu/gl/GrGLCreateNativeInterface_none.cpp', -- cgit v1.2.3 From 91164d20c8f0d7034683fd2454b388907e3f49b0 Mon Sep 17 00:00:00 2001 From: "tomhudson@google.com" Date: Tue, 14 Feb 2012 18:28:54 +0000 Subject: Add SSSE3 acceleration for S32_{opaque,alpha}_D32_filter_DX; should yield 25% speedup on 64b architectures, something smaller but still valuable on 32b. Adds new files, breaking client gyps. http://codereview.appspot.com/5515044/ git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@3193 2bbb7eff-a529-9590-31e7-b0007b416f81 --- opts.gyp | 40 +++++++++++++++++++++++++++++++++++----- 1 file changed, 35 insertions(+), 5 deletions(-) diff --git a/opts.gyp b/opts.gyp index 1f67e00..66348f6 100644 --- a/opts.gyp +++ b/opts.gyp @@ -31,18 +31,23 @@ '../src/opts', ], 'conditions': [ - [ 'skia_os in ["linux", "freebsd", "openbsd", "solaris"]', { - 'cflags': [ - '-msse2', - ], - }], [ 'skia_target_arch != "arm"', { + 'conditions': [ + [ 'skia_os in ["linux", "freebsd", "openbsd", "solaris"]', { + 'cflags': [ + '-msse2', + ], + }], + ], 'sources': [ '../src/opts/opts_check_SSE2.cpp', '../src/opts/SkBitmapProcState_opts_SSE2.cpp', '../src/opts/SkBlitRow_opts_SSE2.cpp', '../src/opts/SkUtils_opts_SSE2.cpp', ], + 'dependencies': [ + 'opts_ssse3', + ], }], [ 'skia_target_arch == "arm" and armv7 == 1', { # The assembly uses the frame pointer register (r7 in Thumb/r11 in @@ -71,6 +76,31 @@ }], ], }, + # For the same lame reasons as what is done for skia_opts, we have to + # create another target specifically for SSSE3 code as we would not want + # to compile the SSE2 code with -mssse3 which would potentially allow + # gcc to generate SSSE3 code. + { + 'target_name': 'opts_ssse3', + 'type': 'static_library', + 'include_dirs': [ + '../include/config', + '../include/core', + '../src/core', + ], + 'conditions': [ + [ 'skia_os in ["linux", "freebsd", "openbsd", "solaris"]', { + 'cflags': [ + '-mssse3', + ], + }], + [ 'skia_target_arch != "arm"', { + 'sources': [ + '../src/opts/SkBitmapProcState_opts_SSSE3.cpp', + ], + }], + ], + }, ], } -- cgit v1.2.3 From 64fa1fdcaf338f3a6a3b77ad7dbb337d5344ecba Mon Sep 17 00:00:00 2001 From: "tomhudson@google.com" Date: Tue, 14 Feb 2012 19:42:39 +0000 Subject: Attempt to make Windows and Mac compilers happy after breakage in r3193. Verified that changes in parameter signatures git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@3194 2bbb7eff-a529-9590-31e7-b0007b416f81 --- opts.gyp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/opts.gyp b/opts.gyp index 66348f6..d2aec5c 100644 --- a/opts.gyp +++ b/opts.gyp @@ -89,7 +89,7 @@ '../src/core', ], 'conditions': [ - [ 'skia_os in ["linux", "freebsd", "openbsd", "solaris"]', { + [ 'skia_os in ["linux", "freebsd", "mac", "openbsd", "solaris"]', { 'cflags': [ '-mssse3', ], -- cgit v1.2.3 From 3b56c8e83d56815271376e61297e3c987bc36c14 Mon Sep 17 00:00:00 2001 From: "epoger@google.com" Date: Tue, 14 Feb 2012 19:49:19 +0000 Subject: hack to enable SSSE3 on Macs Review URL: https://codereview.appspot.com/5649091 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@3195 2bbb7eff-a529-9590-31e7-b0007b416f81 --- opts.gyp | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/opts.gyp b/opts.gyp index d2aec5c..11391a8 100644 --- a/opts.gyp +++ b/opts.gyp @@ -89,11 +89,19 @@ '../src/core', ], 'conditions': [ - [ 'skia_os in ["linux", "freebsd", "mac", "openbsd", "solaris"]', { + [ 'skia_os in ["linux", "freebsd", "openbsd", "solaris"]', { 'cflags': [ '-mssse3', ], }], + # TODO(epoger): the following will enable SSSE3 on Macs, but it will + # break once we set OTHER_CFLAGS anywhere else (the first setting will + # be replaced, not added to) + [ 'skia_os in ["mac"]', { + 'xcode_settings': { + 'OTHER_CFLAGS': ['-mssse3',], + }, + }], [ 'skia_target_arch != "arm"', { 'sources': [ '../src/opts/SkBitmapProcState_opts_SSSE3.cpp', -- cgit v1.2.3 From 7a916c04c6f544c0d1b41a810cb7048a085d9f9a Mon Sep 17 00:00:00 2001 From: "djsollen@google.com" Date: Wed, 15 Feb 2012 18:49:15 +0000 Subject: Merge changes from the android repo upstream to Skia Review URL: https://codereview.appspot.com/5545070 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@3199 2bbb7eff-a529-9590-31e7-b0007b416f81 --- effects.gyp | 2 ++ ports.gyp | 1 + 2 files changed, 3 insertions(+) diff --git a/effects.gyp b/effects.gyp index 2d716e3..28f0017 100644 --- a/effects.gyp +++ b/effects.gyp @@ -37,6 +37,7 @@ '../include/effects/SkPorterDuff.h', '../include/effects/SkRectShape.h', '../include/effects/SkTableColorFilter.h', + '../include/effects/SkTableMaskFilter.h', '../include/effects/SkTransparentShader.h', '../src/effects/Sk1DPathEffect.cpp', @@ -71,6 +72,7 @@ '../src/effects/SkRadialGradient_Table.h', '../src/effects/SkRectShape.cpp', '../src/effects/SkTableColorFilter.cpp', + '../src/effects/SkTableMaskFilter.cpp', '../src/effects/SkTestImageFilters.cpp', '../src/effects/SkTransparentShader.cpp', ], diff --git a/ports.gyp b/ports.gyp index 5d697e5..c89a06d 100644 --- a/ports.gyp +++ b/ports.gyp @@ -90,6 +90,7 @@ '../src/ports/SkFontHost_gamma.cpp', '../src/ports/SkFontHost_FreeType.cpp', '../src/ports/FontHostConfiguration_android.cpp', + #TODO: include the ports/SkImageRef_ashmem.cpp for non-NDK builds ], 'dependencies': [ 'android_system.gyp:ft2', -- cgit v1.2.3 From 1eed4c593a234e1055535d03dcbde5ba0156ef05 Mon Sep 17 00:00:00 2001 From: "bsalomon@google.com" Date: Wed, 15 Feb 2012 21:16:03 +0000 Subject: Revert 3191 Review URL: http://codereview.appspot.com/5656068/ git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@3203 2bbb7eff-a529-9590-31e7-b0007b416f81 --- gpu.gyp | 2 -- 1 file changed, 2 deletions(-) diff --git a/gpu.gyp b/gpu.gyp index ec85ab0..39e0ee9 100644 --- a/gpu.gyp +++ b/gpu.gyp @@ -253,8 +253,6 @@ '../src/gpu/gl/GrGLCaps.cpp', '../src/gpu/gl/GrGLCaps.h', - '../src/gpu/gl/GrGLColorConversionTest.cpp', - '../src/gpu/gl/GrGLColorConversionTest.h', '../src/gpu/gl/GrGLContextInfo.cpp', '../src/gpu/gl/GrGLContextInfo.h', '../src/gpu/gl/GrGLCreateNativeInterface_none.cpp', -- cgit v1.2.3 From f38b4a4182f8870f7d18c28fdd7e8d4afef394e3 Mon Sep 17 00:00:00 2001 From: "bsalomon@google.com" Date: Wed, 22 Feb 2012 21:25:34 +0000 Subject: Use nested template expansions to implement Config8888 conversions. Review URL: https://codereview.appspot.com/5690068 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@3230 2bbb7eff-a529-9590-31e7-b0007b416f81 --- core.gyp | 1 + 1 file changed, 1 insertion(+) diff --git a/core.gyp b/core.gyp index f83f482..56238eb 100644 --- a/core.gyp +++ b/core.gyp @@ -52,6 +52,7 @@ '../src/core/SkComposeShader.cpp', '../src/core/SkConcaveToTriangles.cpp', '../src/core/SkConcaveToTriangles.h', + '../src/core/SkConfig8888.cpp', '../src/core/SkConfig8888.h', '../src/core/SkCordic.cpp', '../src/core/SkCordic.h', -- cgit v1.2.3 From 8d6ad71239e8261891bee29a60adb6ab90c37c5d Mon Sep 17 00:00:00 2001 From: "reed@google.com" Date: Thu, 23 Feb 2012 14:51:10 +0000 Subject: add unittest for FontHost (just tables at the moment) git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@3233 2bbb7eff-a529-9590-31e7-b0007b416f81 --- ports.gyp | 3 +++ tests.gyp | 1 + 2 files changed, 4 insertions(+) diff --git a/ports.gyp b/ports.gyp index c89a06d..148197d 100644 --- a/ports.gyp +++ b/ports.gyp @@ -53,6 +53,9 @@ # '../src/ports/SkFontHost_gamma_none.cpp', '../src/ports/SkThread_pthread.cpp', ], + 'sources!': [ + '../src/ports/SkFontHost_tables.cpp', + ], }], [ 'skia_os == "ios"', { 'include_dirs': [ diff --git a/tests.gyp b/tests.gyp index 63ff7c9..1a8f0cd 100644 --- a/tests.gyp +++ b/tests.gyp @@ -34,6 +34,7 @@ '../tests/EmptyPathTest.cpp', '../tests/FillPathTest.cpp', '../tests/FlateTest.cpp', + '../tests/FontHostTest.cpp', '../tests/GeometryTest.cpp', '../tests/GLInterfaceValidation.cpp', '../tests/GLProgramsTest.cpp', -- cgit v1.2.3 From c419701c1bd4a46bf593c07ae9e2ee0f27dadc12 Mon Sep 17 00:00:00 2001 From: "bsalomon@google.com" Date: Thu, 23 Feb 2012 15:39:54 +0000 Subject: GPU device preserves pixel values across read/write/read of unpremul pixel values Review URL: http://codereview.appspot.com/5695047/ git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@3237 2bbb7eff-a529-9590-31e7-b0007b416f81 --- tests.gyp | 1 + 1 file changed, 1 insertion(+) diff --git a/tests.gyp b/tests.gyp index 1a8f0cd..cf793ab 100644 --- a/tests.gyp +++ b/tests.gyp @@ -52,6 +52,7 @@ '../tests/PathTest.cpp', '../tests/PDFPrimitivesTest.cpp', '../tests/PointTest.cpp', + '../tests/PremulAlphaRoundTripTest.cpp', '../tests/QuickRejectTest.cpp', '../tests/Reader32Test.cpp', '../tests/ReadPixelsTest.cpp', -- cgit v1.2.3 From b3d763e7a87f8f109e2ea46c06722fb65705b274 Mon Sep 17 00:00:00 2001 From: "djsollen@google.com" Date: Thu, 23 Feb 2012 20:57:09 +0000 Subject: Add a bench for picture playback. Review URL: https://codereview.appspot.com/5694053 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@3245 2bbb7eff-a529-9590-31e7-b0007b416f81 --- bench.gypi | 1 + 1 file changed, 1 insertion(+) diff --git a/bench.gypi b/bench.gypi index 5fbfef7..2ea3660 100644 --- a/bench.gypi +++ b/bench.gypi @@ -28,6 +28,7 @@ '../bench/MatrixBench.cpp', '../bench/MutexBench.cpp', '../bench/PathBench.cpp', + '../bench/PicturePlaybackBench.cpp', '../bench/RectBench.cpp', '../bench/RepeatTileBench.cpp', '../bench/ScalarBench.cpp', -- cgit v1.2.3 From 0e0eafc3af802840cf94c11b8f1ab1573442d54e Mon Sep 17 00:00:00 2001 From: "djsollen@google.com" Date: Fri, 24 Feb 2012 14:09:02 +0000 Subject: Enable hardware float for all armv7 and add NDK required linker flags git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@3247 2bbb7eff-a529-9590-31e7-b0007b416f81 --- common_conditions.gypi | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/common_conditions.gypi b/common_conditions.gypi index faa48fb..f119f28 100644 --- a/common_conditions.gypi +++ b/common_conditions.gypi @@ -177,6 +177,12 @@ '-fno-rtti', ], 'conditions': [ + [ 'skia_target_arch == "arm", { + 'ldflags': [ + '-Wl', + '--fix-cortex-a8', + ], + }], [ 'skia_target_arch == "arm" and arm_thumb == 1', { 'cflags': [ '-mthumb', @@ -188,6 +194,7 @@ ], 'cflags': [ '-march=armv7-a', + '-mfloat-abi=softfp', ], 'conditions': [ [ 'arm_neon == 1', { @@ -195,7 +202,6 @@ '__ARM_HAVE_NEON', ], 'cflags': [ - '-mfloat-abi=softfp', '-mfpu=neon', ], }], -- cgit v1.2.3 From a81e1c6d67b90e1f0127e7ec4131cee849169d68 Mon Sep 17 00:00:00 2001 From: "djsollen@google.com" Date: Fri, 24 Feb 2012 14:10:44 +0000 Subject: Fix typo in the gyp file. git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@3248 2bbb7eff-a529-9590-31e7-b0007b416f81 --- common_conditions.gypi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common_conditions.gypi b/common_conditions.gypi index f119f28..a14a6f2 100644 --- a/common_conditions.gypi +++ b/common_conditions.gypi @@ -177,7 +177,7 @@ '-fno-rtti', ], 'conditions': [ - [ 'skia_target_arch == "arm", { + [ 'skia_target_arch == "arm"', { 'ldflags': [ '-Wl', '--fix-cortex-a8', -- cgit v1.2.3 From 8512f3c6fc75e88fc446c8367ac7814f0a421a96 Mon Sep 17 00:00:00 2001 From: "reed@google.com" Date: Fri, 24 Feb 2012 15:29:00 +0000 Subject: add SkCreateDataProviderFromStream to SkCGUtils implement SkFontHost create_from_file/stream using SkCGUtils git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@3249 2bbb7eff-a529-9590-31e7-b0007b416f81 --- ports.gyp | 1 + 1 file changed, 1 insertion(+) diff --git a/ports.gyp b/ports.gyp index 148197d..5dc88d5 100644 --- a/ports.gyp +++ b/ports.gyp @@ -48,6 +48,7 @@ ], 'sources': [ '../src/ports/SkFontHost_mac_coretext.cpp', + '../src/utils/mac/SkStream_mac.cpp', # '../src/ports/SkFontHost_FreeType.cpp', # '../src/ports/SkFontHost_freetype_mac.cpp', # '../src/ports/SkFontHost_gamma_none.cpp', -- cgit v1.2.3 From 357a88e13910c6211a517d65d08e8b4d28a66a00 Mon Sep 17 00:00:00 2001 From: "djsollen@google.com" Date: Fri, 24 Feb 2012 19:45:16 +0000 Subject: Enable Android GM to produce PNG images. git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@3253 2bbb7eff-a529-9590-31e7-b0007b416f81 --- images.gyp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/images.gyp b/images.gyp index 9785b3f..851fa29 100644 --- a/images.gyp +++ b/images.gyp @@ -130,6 +130,9 @@ 'android_system.gyp:gif', 'android_system.gyp:png', ], + 'defines': [ + 'SK_ENABLE_LIBPNG', + ], }], ], 'direct_dependent_settings': { -- cgit v1.2.3 From 88aa7f4ad39635911102b82cad488881398efa69 Mon Sep 17 00:00:00 2001 From: "tomhudson@google.com" Date: Tue, 28 Feb 2012 16:46:01 +0000 Subject: Remove referenecs to nonexistent file SkImageDecoder_libpvjpeg.c from gyp http://codereview.appspot.com/5707046/ git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@3275 2bbb7eff-a529-9590-31e7-b0007b416f81 --- images.gyp | 3 --- 1 file changed, 3 deletions(-) diff --git a/images.gyp b/images.gyp index 851fa29..c0f8ebd 100644 --- a/images.gyp +++ b/images.gyp @@ -64,7 +64,6 @@ '../src/images/SkImageDecoder_libgif.cpp', '../src/images/SkImageDecoder_libjpeg.cpp', '../src/images/SkImageDecoder_libpng.cpp', - '../src/images/SkImageDecoder_libpvjpeg.c', '../src/images/SkImageEncoder_Factory.cpp', '../src/images/SkJpegUtility.cpp', '../src/images/SkMovie_gif.cpp', @@ -87,7 +86,6 @@ '../src/images/SkImageDecoder_libpng.cpp', '../src/images/SkImageDecoder_libgif.cpp', '../src/images/SkImageDecoder_libjpeg.cpp', - '../src/images/SkImageDecoder_libpvjpeg.c', '../src/images/SkImageEncoder_Factory.cpp', '../src/images/SkJpegUtility.cpp', '../src/images/SkMovie_gif.cpp', @@ -103,7 +101,6 @@ '../src/images/SkImageDecoder_libjpeg.cpp', '../src/images/SkImageDecoder_libgif.cpp', - '../src/images/SkImageDecoder_libpvjpeg.c', '../src/images/SkJpegUtility.cpp', '../src/images/SkMovie_gif.cpp', ], -- cgit v1.2.3 From 8f08603e21af644ded6c315e26d5af4aa8443224 Mon Sep 17 00:00:00 2001 From: "reed@google.com" Date: Tue, 28 Feb 2012 17:06:02 +0000 Subject: implement gamma correction for freetype text. Need to opt-in to have it applied to kA8 text (which chrome can't for a while) A8 text needs to use Slight hinting to look better, but that is not forced... git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@3277 2bbb7eff-a529-9590-31e7-b0007b416f81 --- common_conditions.gypi | 2 ++ 1 file changed, 2 insertions(+) diff --git a/common_conditions.gypi b/common_conditions.gypi index a14a6f2..7152181 100644 --- a/common_conditions.gypi +++ b/common_conditions.gypi @@ -78,6 +78,8 @@ 'defines': [ 'SK_SAMPLES_FOR_X', 'SK_BUILD_FOR_UNIX', + 'SK_USE_COLOR_LUMINANCE', + 'SK_GAMMA_APPLY_TO_A8', ], 'configurations': { 'Debug': { -- cgit v1.2.3 From 5ee9085babd45296b8387f2d6766002d4d9fbfa3 Mon Sep 17 00:00:00 2001 From: "tomhudson@google.com" Date: Tue, 28 Feb 2012 19:03:13 +0000 Subject: Remove references to svg.gyp from projects that don't use it. svg is now an orphan and can be deprecated. http://codereview.appspot.com/5703047/ git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@3279 2bbb7eff-a529-9590-31e7-b0007b416f81 --- SampleApp.gyp | 1 - iOSSampleApp.gyp | 1 - 2 files changed, 2 deletions(-) diff --git a/SampleApp.gyp b/SampleApp.gyp index fed4bf4..1f97dc6 100644 --- a/SampleApp.gyp +++ b/SampleApp.gyp @@ -153,7 +153,6 @@ 'utils.gyp:utils', 'animator.gyp:animator', 'xml.gyp:xml', - 'svg.gyp:svg', 'experimental.gyp:experimental', 'gpu.gyp:gr', 'gpu.gyp:skgr', diff --git a/iOSSampleApp.gyp b/iOSSampleApp.gyp index 84708bb..b864ca6 100644 --- a/iOSSampleApp.gyp +++ b/iOSSampleApp.gyp @@ -154,7 +154,6 @@ 'utils.gyp:utils', 'animator.gyp:animator', 'xml.gyp:xml', - 'svg.gyp:svg', 'experimental.gyp:experimental', 'gpu.gyp:gr', 'gpu.gyp:skgr', -- cgit v1.2.3 From f605d91adcfc3dbde9a1f3f1d05c71a5a7685b82 Mon Sep 17 00:00:00 2001 From: "reed@google.com" Date: Thu, 1 Mar 2012 19:21:11 +0000 Subject: add experimental files to encapsulate device-level font settings git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@3292 2bbb7eff-a529-9590-31e7-b0007b416f81 --- core.gyp | 1 + 1 file changed, 1 insertion(+) diff --git a/core.gyp b/core.gyp index 56238eb..077d395 100644 --- a/core.gyp +++ b/core.gyp @@ -63,6 +63,7 @@ '../src/core/SkDebug.cpp', '../src/core/SkDeque.cpp', '../src/core/SkDevice.cpp', + '../src/core/SkDeviceProfile.cpp', '../src/core/SkDither.cpp', '../src/core/SkDraw.cpp', '../src/core/SkDrawProcs.h', -- cgit v1.2.3 From 81f39929323c4fffc3836a10afed1facea96da6a Mon Sep 17 00:00:00 2001 From: "tomhudson@google.com" Date: Fri, 2 Mar 2012 15:38:23 +0000 Subject: Remove libjpeg image decoder, since we've never built it since we changed to gyp. http://codereview.appspot.com/5722046/ git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@3302 2bbb7eff-a529-9590-31e7-b0007b416f81 --- images.gyp | 5 ----- 1 file changed, 5 deletions(-) diff --git a/images.gyp b/images.gyp index c0f8ebd..c167bd4 100644 --- a/images.gyp +++ b/images.gyp @@ -35,7 +35,6 @@ '../src/images/SkImageDecoder_libbmp.cpp', '../src/images/SkImageDecoder_libgif.cpp', '../src/images/SkImageDecoder_libico.cpp', - '../src/images/SkImageDecoder_libjpeg.cpp', '../src/images/SkImageDecoder_libpng.cpp', '../src/images/SkImageDecoder_wbmp.cpp', '../src/images/SkImageEncoder.cpp', @@ -62,7 +61,6 @@ '../src/images/SkFDStream.cpp', '../src/images/SkImageDecoder_Factory.cpp', '../src/images/SkImageDecoder_libgif.cpp', - '../src/images/SkImageDecoder_libjpeg.cpp', '../src/images/SkImageDecoder_libpng.cpp', '../src/images/SkImageEncoder_Factory.cpp', '../src/images/SkJpegUtility.cpp', @@ -85,7 +83,6 @@ '../src/images/SkImageDecoder_Factory.cpp', '../src/images/SkImageDecoder_libpng.cpp', '../src/images/SkImageDecoder_libgif.cpp', - '../src/images/SkImageDecoder_libjpeg.cpp', '../src/images/SkImageEncoder_Factory.cpp', '../src/images/SkJpegUtility.cpp', '../src/images/SkMovie_gif.cpp', @@ -99,7 +96,6 @@ 'sources!': [ '../include/images/SkJpegUtility.h', - '../src/images/SkImageDecoder_libjpeg.cpp', '../src/images/SkImageDecoder_libgif.cpp', '../src/images/SkJpegUtility.cpp', '../src/images/SkMovie_gif.cpp', @@ -120,7 +116,6 @@ }], [ 'skia_os == "android"', { 'sources!': [ - '../src/images/SkImageDecoder_libjpeg.cpp', '../src/images/SkJpegUtility.cpp', ], 'dependencies': [ -- cgit v1.2.3 From 3d7bb18b42a013dd3bdbf3ca5c984462112980b5 Mon Sep 17 00:00:00 2001 From: "bsalomon@google.com" Date: Fri, 2 Mar 2012 18:57:25 +0000 Subject: Remove offscreen supersampler. THIS IS EXPECTED TO BREAK MANY GM TESTS. They will be rebaselined. Review URL: http://codereview.appspot.com/5722044/ git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@3305 2bbb7eff-a529-9590-31e7-b0007b416f81 --- gpu.gyp | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/gpu.gyp b/gpu.gyp index 39e0ee9..bb13bbd 100644 --- a/gpu.gyp +++ b/gpu.gyp @@ -1,9 +1,4 @@ { - 'variables': { - 'skia_gpu_disable_osaa%': 0, - }, - 'skia_gpu_disable_osaa': '<(skia_gpu_disable_osaa)', - 'includes': [ 'common.gypi', ], @@ -296,11 +291,6 @@ 'GR_IMPLEMENTATION=1', ], 'conditions': [ - [ 'skia_gpu_disable_osaa', { - 'defines': [ - 'GR_USE_OFFSCREEN_AA=0', - ], - }], [ 'skia_os == "linux"', { 'sources!': [ '../src/gpu/gl/GrGLDefaultInterface_none.cpp', -- cgit v1.2.3 From dc645df3316a0270ac11acf600223da1470d736c Mon Sep 17 00:00:00 2001 From: "senorblanco@chromium.org" Date: Fri, 2 Mar 2012 21:05:45 +0000 Subject: Erode and dilate image filter effects, CPU and GPU implementations. Review URL: http://codereview.appspot.com/5656067/ git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@3310 2bbb7eff-a529-9590-31e7-b0007b416f81 --- effects.gyp | 2 ++ gmslides.gypi | 1 + 2 files changed, 3 insertions(+) diff --git a/effects.gyp b/effects.gyp index 28f0017..ac56510 100644 --- a/effects.gyp +++ b/effects.gyp @@ -32,6 +32,7 @@ '../include/effects/SkKernel33MaskFilter.h', '../include/effects/SkLayerDrawLooper.h', '../include/effects/SkLayerRasterizer.h', + '../include/effects/SkMorphologyImageFilter.h', '../include/effects/SkPaintFlagsDrawFilter.h', '../include/effects/SkPixelXorXfermode.h', '../include/effects/SkPorterDuff.h', @@ -66,6 +67,7 @@ '../src/effects/SkKernel33MaskFilter.cpp', '../src/effects/SkLayerDrawLooper.cpp', '../src/effects/SkLayerRasterizer.cpp', + '../src/effects/SkMorphologyImageFilter.cpp', '../src/effects/SkPaintFlagsDrawFilter.cpp', '../src/effects/SkPixelXorXfermode.cpp', '../src/effects/SkPorterDuff.cpp', diff --git a/gmslides.gypi b/gmslides.gypi index 43bf87a..2c96e45 100644 --- a/gmslides.gypi +++ b/gmslides.gypi @@ -26,6 +26,7 @@ '../gm/imageblur.cpp', '../gm/lcdtext.cpp', '../gm/linepaths.cpp', + '../gm/morphology.cpp', '../gm/ninepatchstretch.cpp', '../gm/nocolorbleed.cpp', '../gm/patheffects.cpp', -- cgit v1.2.3 From 78a03df14ef6e020b9f44305b35c98ae0cb70c7c Mon Sep 17 00:00:00 2001 From: "bsalomon@google.com" Date: Tue, 6 Mar 2012 20:43:53 +0000 Subject: Change skia_target_arch != arm to skia_target_arch == x86 in gyp files BUG= http://code.google.com/p/skia/issues/detail?id=478 Review URL: http://codereview.appspot.com/5757053/ git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@3332 2bbb7eff-a529-9590-31e7-b0007b416f81 --- common_variables.gypi | 2 +- opts.gyp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/common_variables.gypi b/common_variables.gypi index 94e2b9b..6a8587e 100644 --- a/common_variables.gypi +++ b/common_variables.gypi @@ -10,7 +10,7 @@ 'skia_scalar%': 'float', 'skia_os%': '<(OS)', 'skia_mesa%': 0, - 'skia_target_arch%': '', + 'skia_target_arch%': 'x86', }, 'skia_scalar%': '<(skia_scalar)', 'skia_os': '<(skia_os)', diff --git a/opts.gyp b/opts.gyp index 11391a8..b3c1be9 100644 --- a/opts.gyp +++ b/opts.gyp @@ -31,7 +31,7 @@ '../src/opts', ], 'conditions': [ - [ 'skia_target_arch != "arm"', { + [ 'skia_target_arch == "x86"', { 'conditions': [ [ 'skia_os in ["linux", "freebsd", "openbsd", "solaris"]', { 'cflags': [ @@ -102,7 +102,7 @@ 'OTHER_CFLAGS': ['-mssse3',], }, }], - [ 'skia_target_arch != "arm"', { + [ 'skia_target_arch == "x86"', { 'sources': [ '../src/opts/SkBitmapProcState_opts_SSSE3.cpp', ], -- cgit v1.2.3 From 465c9aa3c6bb92dd4a2edc69a3f020e142cf04f1 Mon Sep 17 00:00:00 2001 From: "reed@google.com" Date: Wed, 7 Mar 2012 12:36:07 +0000 Subject: add bench for various interp techniques used in bitmapshader_matrix git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@3333 2bbb7eff-a529-9590-31e7-b0007b416f81 --- bench.gypi | 1 + 1 file changed, 1 insertion(+) diff --git a/bench.gypi b/bench.gypi index 2ea3660..1ca3f06 100644 --- a/bench.gypi +++ b/bench.gypi @@ -24,6 +24,7 @@ '../bench/DecodeBench.cpp', '../bench/FontScalerBench.cpp', '../bench/GradientBench.cpp', + '../bench/InterpBench.cpp', '../bench/MathBench.cpp', '../bench/MatrixBench.cpp', '../bench/MutexBench.cpp', -- cgit v1.2.3 From fc9d3c244f49cae3ca5fbdc332f98e9b4e5d24cb Mon Sep 17 00:00:00 2001 From: "reed@google.com" Date: Wed, 7 Mar 2012 21:47:41 +0000 Subject: use higher precision (64bit) fixed-point for matrix proc Review URL: https://codereview.appspot.com/5772044 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@3336 2bbb7eff-a529-9590-31e7-b0007b416f81 --- gmslides.gypi | 1 + 1 file changed, 1 insertion(+) diff --git a/gmslides.gypi b/gmslides.gypi index 2c96e45..dd49af4 100644 --- a/gmslides.gypi +++ b/gmslides.gypi @@ -20,6 +20,7 @@ '../gm/filltypespersp.cpp', '../gm/fontscaler.cpp', '../gm/gammatext.cpp', + '../gm/giantbitmap.cpp', '../gm/gradients.cpp', '../gm/gradtext.cpp', '../gm/hairmodes.cpp', -- cgit v1.2.3 From a629ce2e87d003f6812bda7dbe6078d595be9897 Mon Sep 17 00:00:00 2001 From: "bsalomon@google.com" Date: Thu, 15 Mar 2012 14:40:46 +0000 Subject: Perform degenerate check in device coords in convex path renderer Review URL: http://codereview.appspot.com/5821053/ git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@3401 2bbb7eff-a529-9590-31e7-b0007b416f81 --- gmslides.gypi | 1 + 1 file changed, 1 insertion(+) diff --git a/gmslides.gypi b/gmslides.gypi index dd49af4..ec223fb 100644 --- a/gmslides.gypi +++ b/gmslides.gypi @@ -4,6 +4,7 @@ '../gm/aaclip.cpp', '../gm/aarectmodes.cpp', '../gm/arithmode.cpp', + '../gm/bigmatrix.cpp', '../gm/bitmapcopy.cpp', '../gm/bitmapfilters.cpp', '../gm/bitmapscroll.cpp', -- cgit v1.2.3 From fc79bcf11ae67e538c55f5fb3239fcfea8b29115 Mon Sep 17 00:00:00 2001 From: "epoger@google.com" Date: Fri, 16 Mar 2012 13:52:49 +0000 Subject: Make all gyp targets automatically include common.gypi Do this, rather than including common.gypi explicitly in all our gyp files, so that gyp files we use but do not maintain (e.g., third_party/externals/libjpeg/libjpeg.gyp) will include common.gypi too. Review URL: https://codereview.appspot.com/5820068 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@3411 2bbb7eff-a529-9590-31e7-b0007b416f81 --- FileReaderApp.gyp | 3 --- SampleApp.gyp | 3 --- SimpleCocoaApp.gyp | 3 --- android_system.gyp | 3 +-- animator.gyp | 3 --- bench.gyp | 1 - common.gypi | 18 +++++++++++++++--- common_variables.gypi | 25 ------------------------- core.gyp | 3 --- effects.gyp | 3 --- experimental.gyp | 3 --- freetype.gyp | 3 --- gm.gyp | 1 - gpu.gyp | 3 --- images.gyp | 3 --- libtess.gyp | 3 --- opts.gyp | 3 --- pdf.gyp | 3 --- ports.gyp | 3 --- sfnt.gyp | 3 --- svg.gyp | 3 --- tests.gyp | 1 - tools.gyp | 1 - utils.gyp | 3 --- views.gyp | 3 --- xml.gyp | 3 --- xps.gyp | 3 --- zlib.gyp | 3 --- 28 files changed, 16 insertions(+), 97 deletions(-) delete mode 100644 common_variables.gypi diff --git a/FileReaderApp.gyp b/FileReaderApp.gyp index c5651c7..545eff2 100644 --- a/FileReaderApp.gyp +++ b/FileReaderApp.gyp @@ -1,7 +1,4 @@ { - 'includes': [ - 'common.gypi', - ], 'targets': [ { 'target_name': 'FileReaderApp', diff --git a/SampleApp.gyp b/SampleApp.gyp index 1f97dc6..b915821 100644 --- a/SampleApp.gyp +++ b/SampleApp.gyp @@ -1,8 +1,5 @@ { - 'includes': [ - 'common.gypi', - ], 'targets': [ { 'target_name': 'SampleApp', diff --git a/SimpleCocoaApp.gyp b/SimpleCocoaApp.gyp index ed35d54..f5e41c4 100644 --- a/SimpleCocoaApp.gyp +++ b/SimpleCocoaApp.gyp @@ -1,7 +1,4 @@ { - 'includes': [ - 'common.gypi', - ], 'targets': [ { 'target_name': 'SimpleCocoaApp', diff --git a/android_system.gyp b/android_system.gyp index 27a82f3..bbc1e69 100644 --- a/android_system.gyp +++ b/android_system.gyp @@ -15,7 +15,6 @@ # variable expansion step for gyp happens after the includes are processed. { 'includes': [ - 'common.gypi', '../../android/gyp/android.gypi', ], -} \ No newline at end of file +} diff --git a/animator.gyp b/animator.gyp index f713f3f..744cd37 100644 --- a/animator.gyp +++ b/animator.gyp @@ -1,7 +1,4 @@ { - 'includes': [ - 'common.gypi', - ], 'targets': [ { 'target_name': 'animator', diff --git a/bench.gyp b/bench.gyp index 0c5e2ea..1935f9d 100644 --- a/bench.gyp +++ b/bench.gyp @@ -3,7 +3,6 @@ { 'includes': [ 'apptype_console.gypi', - 'common.gypi', ], 'targets': [ { diff --git a/common.gypi b/common.gypi index 30424de..aa6e276 100644 --- a/common.gypi +++ b/common.gypi @@ -2,10 +2,22 @@ # # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. +# +# This file is automatically included by gyp_skia when building any target. + { - 'includes': [ - 'common_variables.gypi', - ], + # Define all variables, allowing for override in GYP_DEFINES. + # + # One such variable is 'skia_os', which we use instead of 'OS' throughout + # our gyp files. We set it automatically based on 'OS', but allow the + # user to override it via GYP_DEFINES if they like. + 'variables': { + 'skia_scalar%': 'float', + 'skia_os%': '<(OS)', + 'skia_mesa%': 0, + 'skia_target_arch%': 'x86', + }, + 'target_defaults': { # Validate the 'skia_os' setting against 'OS', because only certain diff --git a/common_variables.gypi b/common_variables.gypi deleted file mode 100644 index 6a8587e..0000000 --- a/common_variables.gypi +++ /dev/null @@ -1,25 +0,0 @@ -# variables used in both common.gypi and skia.gyp in chromium -# -{ - # Define all variables, allowing for override in GYP_DEFINES. - # - # One such variable is 'skia_os', which we use instead of 'OS' throughout - # our gyp files. We set it automatically based on 'OS', but allow the - # user to override it via GYP_DEFINES if they like. - 'variables': { - 'skia_scalar%': 'float', - 'skia_os%': '<(OS)', - 'skia_mesa%': 0, - 'skia_target_arch%': 'x86', - }, - 'skia_scalar%': '<(skia_scalar)', - 'skia_os': '<(skia_os)', - 'skia_mesa': '<(skia_mesa)', - 'skia_target_arch': '<(skia_target_arch)', -} - -# Local Variables: -# tab-width:2 -# indent-tabs-mode:nil -# End: -# vim: set expandtab tabstop=2 shiftwidth=2: diff --git a/core.gyp b/core.gyp index 077d395..1d0630e 100644 --- a/core.gyp +++ b/core.gyp @@ -1,8 +1,5 @@ # Core Skia library code. { - 'includes': [ - 'common.gypi', - ], 'targets': [ { 'target_name': 'core', diff --git a/effects.gyp b/effects.gyp index ac56510..692a5bb 100644 --- a/effects.gyp +++ b/effects.gyp @@ -1,7 +1,4 @@ { - 'includes': [ - 'common.gypi', - ], 'targets': [ { 'target_name': 'effects', diff --git a/experimental.gyp b/experimental.gyp index c5b8c5e..09711ac 100644 --- a/experimental.gyp +++ b/experimental.gyp @@ -1,7 +1,4 @@ { - 'includes': [ - 'common.gypi', - ], 'targets': [ { 'target_name': 'experimental', diff --git a/freetype.gyp b/freetype.gyp index e86a338..4a885a1 100644 --- a/freetype.gyp +++ b/freetype.gyp @@ -1,7 +1,4 @@ { -# 'includes': [ -# 'common.gypi', -# ], 'targets': [ { 'target_name': 'skfreetype', diff --git a/gm.gyp b/gm.gyp index 3c5e12e..9e3eaac 100644 --- a/gm.gyp +++ b/gm.gyp @@ -2,7 +2,6 @@ { 'includes': [ 'apptype_console.gypi', - 'common.gypi', ], 'targets': [ { diff --git a/gpu.gyp b/gpu.gyp index bb13bbd..410a5b7 100644 --- a/gpu.gyp +++ b/gpu.gyp @@ -1,7 +1,4 @@ { - 'includes': [ - 'common.gypi', - ], 'target_defaults': { 'conditions': [ ['skia_os != "win"', { diff --git a/images.gyp b/images.gyp index c167bd4..a93ba06 100644 --- a/images.gyp +++ b/images.gyp @@ -1,7 +1,4 @@ { - 'includes': [ - 'common.gypi', - ], 'targets': [ { 'target_name': 'images', diff --git a/libtess.gyp b/libtess.gyp index d74bcc7..c90ca12 100644 --- a/libtess.gyp +++ b/libtess.gyp @@ -1,7 +1,4 @@ { - 'includes': [ - 'common.gypi', - ], 'targets': [ { 'target_name': 'libtess', diff --git a/opts.gyp b/opts.gyp index b3c1be9..2ec076c 100644 --- a/opts.gyp +++ b/opts.gyp @@ -1,7 +1,4 @@ { - 'includes': [ - 'common.gypi', - ], 'targets': [ # Due to an unfortunate intersection of lameness between gcc and gyp, # we have to build the *_SSE2.cpp files in a separate target. The diff --git a/pdf.gyp b/pdf.gyp index f0c6b47..0d5fef5 100644 --- a/pdf.gyp +++ b/pdf.gyp @@ -1,7 +1,4 @@ { - 'includes': [ - 'common.gypi', - ], 'targets': [ { 'target_name': 'pdf', diff --git a/ports.gyp b/ports.gyp index 5dc88d5..73dd594 100644 --- a/ports.gyp +++ b/ports.gyp @@ -1,8 +1,5 @@ # Port-specific Skia library code. { - 'includes': [ - 'common.gypi', - ], 'targets': [ { 'target_name': 'ports', diff --git a/sfnt.gyp b/sfnt.gyp index 2f2fc76..17dd2d8 100644 --- a/sfnt.gyp +++ b/sfnt.gyp @@ -1,7 +1,4 @@ { - 'includes': [ - 'common.gypi', - ], 'targets': [ { 'target_name': 'sfnt', diff --git a/svg.gyp b/svg.gyp index c72b99f..9e90f28 100644 --- a/svg.gyp +++ b/svg.gyp @@ -1,7 +1,4 @@ { - 'includes': [ - 'common.gypi', - ], 'targets': [ { 'target_name': 'svg', diff --git a/tests.gyp b/tests.gyp index cf793ab..1eecc39 100644 --- a/tests.gyp +++ b/tests.gyp @@ -2,7 +2,6 @@ { 'includes': [ 'apptype_console.gypi', - 'common.gypi', ], 'targets': [ { diff --git a/tools.gyp b/tools.gyp index 1e419cd..6175eee 100644 --- a/tools.gyp +++ b/tools.gyp @@ -8,7 +8,6 @@ { 'includes': [ 'apptype_console.gypi', - 'common.gypi', ], 'targets': [ { diff --git a/utils.gyp b/utils.gyp index 8d2415a..87d6e97 100644 --- a/utils.gyp +++ b/utils.gyp @@ -1,7 +1,4 @@ { - 'includes': [ - 'common.gypi', - ], 'targets': [ { 'target_name': 'utils', diff --git a/views.gyp b/views.gyp index e91b28e..e997573 100644 --- a/views.gyp +++ b/views.gyp @@ -1,7 +1,4 @@ { - 'includes': [ - 'common.gypi', - ], 'targets': [ { 'target_name': 'views', diff --git a/xml.gyp b/xml.gyp index 7da8666..6650a5c 100644 --- a/xml.gyp +++ b/xml.gyp @@ -1,7 +1,4 @@ { - 'includes': [ - 'common.gypi', - ], 'targets': [ { 'target_name': 'xml', diff --git a/xps.gyp b/xps.gyp index ff68d6f..8090166 100644 --- a/xps.gyp +++ b/xps.gyp @@ -1,7 +1,4 @@ { - 'includes': [ - 'common.gypi', - ], 'targets': [ { 'target_name': 'xps', diff --git a/zlib.gyp b/zlib.gyp index 5ed9d14..d41924d 100644 --- a/zlib.gyp +++ b/zlib.gyp @@ -1,7 +1,4 @@ { - 'includes': [ - 'common.gypi', - ], 'targets': [ { 'target_name': 'zlib', -- cgit v1.2.3 From c4f9857c23c5c15d0d4d203375bbc39ca30c7ce7 Mon Sep 17 00:00:00 2001 From: "bsalomon@google.com" Date: Fri, 16 Mar 2012 14:02:46 +0000 Subject: Split GrTextContext into baseclass and subclass This is a step towards enabling alternate text rendering code paths (GLyphy in particular) Committed on behalf of baranowski@chromium.org Review URL: http://codereview.appspot.com/5796071/ git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@3412 2bbb7eff-a529-9590-31e7-b0007b416f81 --- gpu.gyp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gpu.gyp b/gpu.gyp index 410a5b7..7080ebb 100644 --- a/gpu.gyp +++ b/gpu.gyp @@ -189,6 +189,8 @@ '../src/gpu/GrAllocPool.cpp', '../src/gpu/GrAtlas.cpp', '../src/gpu/GrAtlas.h', + '../src/gpu/GrBatchedTextContext.cpp', + '../src/gpu/GrBatchedTextContext.h', '../src/gpu/GrBinHashKey.h', '../src/gpu/GrBufferAllocPool.cpp', '../src/gpu/GrBufferAllocPool.h', @@ -196,6 +198,8 @@ '../src/gpu/GrContext.cpp', '../src/gpu/GrDefaultPathRenderer.cpp', '../src/gpu/GrDefaultPathRenderer.h', + '../src/gpu/GrDefaultTextContext.cpp', + '../src/gpu/GrDefaultTextContext.h', '../src/gpu/GrDrawState.h', '../src/gpu/GrDrawTarget.cpp', '../src/gpu/GrDrawTarget.h', @@ -233,7 +237,6 @@ '../src/gpu/GrTDArray.h', '../src/gpu/GrTesselatedPathRenderer.cpp', '../src/gpu/GrTesselatedPathRenderer.h', - '../src/gpu/GrTextContext.cpp', '../src/gpu/GrTextStrike.cpp', '../src/gpu/GrTextStrike.h', '../src/gpu/GrTextStrike_impl.h', -- cgit v1.2.3 From ac44a111439fad95c9c17f735d1dfd82e2270760 Mon Sep 17 00:00:00 2001 From: "epoger@google.com" Date: Fri, 16 Mar 2012 18:28:24 +0000 Subject: Add os_posix gyp variable, nesting variables dicts as needed to do so. Review URL: https://codereview.appspot.com/5845050 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@3418 2bbb7eff-a529-9590-31e7-b0007b416f81 --- common.gypi | 16 +++-------- common_variables.gypi | 80 +++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 84 insertions(+), 12 deletions(-) create mode 100644 common_variables.gypi diff --git a/common.gypi b/common.gypi index aa6e276..ad684c2 100644 --- a/common.gypi +++ b/common.gypi @@ -6,17 +6,9 @@ # This file is automatically included by gyp_skia when building any target. { - # Define all variables, allowing for override in GYP_DEFINES. - # - # One such variable is 'skia_os', which we use instead of 'OS' throughout - # our gyp files. We set it automatically based on 'OS', but allow the - # user to override it via GYP_DEFINES if they like. - 'variables': { - 'skia_scalar%': 'float', - 'skia_os%': '<(OS)', - 'skia_mesa%': 0, - 'skia_target_arch%': 'x86', - }, + 'includes': [ + 'common_variables.gypi', + ], 'target_defaults': { @@ -32,7 +24,7 @@ ], }, 'includes': [ - 'common_conditions.gypi' + 'common_conditions.gypi', ], 'conditions': [ [ 'skia_scalar == "float"', diff --git a/common_variables.gypi b/common_variables.gypi new file mode 100644 index 0000000..eb58de0 --- /dev/null +++ b/common_variables.gypi @@ -0,0 +1,80 @@ +# Copyright 2012 The Android Open Source Project +# +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE file. + +{ + # Get ready for the ugly... + # + # - We have to nest our variables dictionaries multiple levels deep, so that + # this and other gyp files can rely on previously-set variable values in + # their 'variables': { 'conditions': [] } clauses. + # + # Example 1: + # Within this file, we use the value of variable 'skia_os' to set the + # value of variable 'os_posix', so 'skia_os' must be defined within a + # "more inner" (enclosed) scope than 'os_posix'. + # + # Example 2: + # http://src.chromium.org/viewvc/chrome/trunk/src/third_party/libjpeg/libjpeg.gyp?revision=102306 , + # which we currently import into our build, uses the value of 'os_posix' + # within the 'conditions' list in its 'variables' dict. + # In order for that to work, it needs the value of 'os_posix' to have been + # set within a "more inner" (enclosed) scope than its own 'variables' dict. + # + # - On the other hand, key/value pairs of a given 'variable' dict are only + # inherited by: + # 1. directly enclosing 'variable' dicts, and + # 2. "sibling" 'variable' dicts (which, I guess, are combined into a single + # 'variable' dict during gyp processing) + # and NOT inherited by "uncles" (siblings of directly enclosing 'variable' + # dicts), so we have to re-define every variable at every enclosure level + # within our ridiculous matryoshka doll of 'variable' dicts. That's why + # we have variable definitions like this: 'skia_os%': '<(skia_os)', + # + # See http://src.chromium.org/viewvc/chrome/trunk/src/build/common.gypi?revision=127004 , + # which deals with these same constraints in a similar manner. + # + 'variables': { # level 1 + 'variables': { # level 2 + + # Variables needed by conditions list within the level-2 variables dict. + 'variables': { # level 3 + # We use 'skia_os' instead of 'OS' throughout our gyp files, to allow + # for cross-compilation (e.g. building for either MacOS or iOS on Mac). + # We set it automatically based on 'OS' (the host OS), but allow the + # user to override it via GYP_DEFINES if they like. + 'skia_os%': '<(OS)', + }, + + # Re-define all variables defined within the level-3 'variables' dict, + # so that siblings of the level-2 'variables' dict can see them. + 'skia_os%': '<(skia_os)', + + 'conditions': [ + ['skia_os == "win"', { + 'os_posix%': 0, + }, { + 'os_posix%': 1, + }], + ], + + 'skia_scalar%': 'float', + 'skia_mesa%': 0, + 'skia_target_arch%': 'x86', + }, + + # Re-define all variables defined within the level-2 'variables' dict, + # so that siblings of the level-1 'variables' dict can see them. + 'skia_os%': '<(skia_os)', + 'os_posix%': '<(os_posix)', + 'skia_scalar%': '<(skia_scalar)', + 'skia_mesa%': '<(skia_mesa)', + 'skia_target_arch%': '<(skia_target_arch)', + }, +} +# Local Variables: +# tab-width:2 +# indent-tabs-mode:nil +# End: +# vim: set expandtab tabstop=2 shiftwidth=2: -- cgit v1.2.3 From 2ae4fc589c07084db82dc2c3f2763945e25240f7 Mon Sep 17 00:00:00 2001 From: "epoger@google.com" Date: Fri, 16 Mar 2012 19:01:38 +0000 Subject: Add libjpeg.gyp that wraps third_party/externals/libjpeg/libjpeg.gyp Review URL: https://codereview.appspot.com/5848046 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@3419 2bbb7eff-a529-9590-31e7-b0007b416f81 --- libjpeg.gyp | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 libjpeg.gyp diff --git a/libjpeg.gyp b/libjpeg.gyp new file mode 100644 index 0000000..4826f48 --- /dev/null +++ b/libjpeg.gyp @@ -0,0 +1,24 @@ +# Copyright 2012 The Android Open Source Project +# +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE file. + +# Depend on this wrapper to pick up libjpeg from third_party + +{ + 'targets': [ + { + 'target_name': 'libjpeg', + 'type': 'none', + 'dependencies': [ + '../third_party/externals/libjpeg/libjpeg.gyp:libjpeg', + ], + }, + ], +} + +# Local Variables: +# tab-width:2 +# indent-tabs-mode:nil +# End: +# vim: set expandtab tabstop=2 shiftwidth=2: -- cgit v1.2.3 From d8e9f0f57b4fe9a6f0991c7d4e7a4d3253ba858e Mon Sep 17 00:00:00 2001 From: "tomhudson@google.com" Date: Mon, 19 Mar 2012 13:49:50 +0000 Subject: (SSE2) acceleration for rectangular opaque erases. 15% speedup for rectangles < 31 px wide, 5% for larger. http://codereview.appspot.com/5843050/ git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@3423 2bbb7eff-a529-9590-31e7-b0007b416f81 --- opts.gyp | 1 + 1 file changed, 1 insertion(+) diff --git a/opts.gyp b/opts.gyp index 2ec076c..cf8e6dd 100644 --- a/opts.gyp +++ b/opts.gyp @@ -40,6 +40,7 @@ '../src/opts/opts_check_SSE2.cpp', '../src/opts/SkBitmapProcState_opts_SSE2.cpp', '../src/opts/SkBlitRow_opts_SSE2.cpp', + '../src/opts/SkBlitRect_opts_SSE2.cpp', '../src/opts/SkUtils_opts_SSE2.cpp', ], 'dependencies': [ -- cgit v1.2.3 From 808b86d447ecd22104400bf9b3a01fa6042844aa Mon Sep 17 00:00:00 2001 From: "robertphillips@google.com" Date: Mon, 19 Mar 2012 14:42:13 +0000 Subject: Added debug GL Interface. This interface tracks various GL objects in order to find leaks & invalid accesses. Core Review: http://codereview.appspot.com/5846049/ git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@3426 2bbb7eff-a529-9590-31e7-b0007b416f81 --- gpu.gyp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/gpu.gyp b/gpu.gyp index 7080ebb..a4d7c18 100644 --- a/gpu.gyp +++ b/gpu.gyp @@ -102,6 +102,7 @@ '../include/gpu/gl/SkMesaGLContext.h', '../include/gpu/gl/SkNativeGLContext.h', '../include/gpu/gl/SkNullGLContext.h', + '../include/gpu/gl/SkDebugGLContext.h', '../src/gpu/GrPrintf_skia.cpp', '../src/gpu/SkGpuCanvas.cpp', @@ -112,6 +113,7 @@ '../src/gpu/gl/SkGLContext.cpp', '../src/gpu/gl/SkNullGLContext.cpp', + '../src/gpu/gl/SkDebugGLContext.cpp', '../src/gpu/android/SkNativeGLContext_android.cpp', @@ -252,6 +254,7 @@ '../src/gpu/gl/GrGLContextInfo.h', '../src/gpu/gl/GrGLCreateNativeInterface_none.cpp', '../src/gpu/gl/GrGLCreateNullInterface.cpp', + '../src/gpu/gl/GrGLCreateDebugInterface.cpp', '../src/gpu/gl/GrGLDefaultInterface_none.cpp', '../src/gpu/gl/GrGLDefaultInterface_native.cpp', '../src/gpu/gl/GrGLIndexBuffer.cpp', -- cgit v1.2.3 From 3e93e8010ecf1902c61b3fb9b061d83cb54657d2 Mon Sep 17 00:00:00 2001 From: "robertphillips@google.com" Date: Tue, 20 Mar 2012 14:51:47 +0000 Subject: Fix for CMYK jpeg decoding issue (69 - unable to read some jpeg files on android) http://codereview.appspot.com/5785054/ git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@3438 2bbb7eff-a529-9590-31e7-b0007b416f81 --- gmslides.gypi | 1 + images.gyp | 12 ++---------- libjpeg.gyp | 13 +++++++++++++ 3 files changed, 16 insertions(+), 10 deletions(-) diff --git a/gmslides.gypi b/gmslides.gypi index ec223fb..601aa88 100644 --- a/gmslides.gypi +++ b/gmslides.gypi @@ -9,6 +9,7 @@ '../gm/bitmapfilters.cpp', '../gm/bitmapscroll.cpp', '../gm/blurs.cpp', + '../gm/cmykjpeg.cpp', '../gm/colormatrix.cpp', '../gm/complexclip.cpp', '../gm/complexclip2.cpp', diff --git a/images.gyp b/images.gyp index a93ba06..d0b5c1a 100644 --- a/images.gyp +++ b/images.gyp @@ -5,6 +5,7 @@ 'type': 'static_library', 'dependencies': [ 'utils.gyp:utils', + 'libjpeg.gyp:libjpeg', ], 'include_dirs': [ '../include/config', @@ -33,6 +34,7 @@ '../src/images/SkImageDecoder_libgif.cpp', '../src/images/SkImageDecoder_libico.cpp', '../src/images/SkImageDecoder_libpng.cpp', + '../src/images/SkImageDecoder_libjpeg.cpp', '../src/images/SkImageDecoder_wbmp.cpp', '../src/images/SkImageEncoder.cpp', '../src/images/SkImageEncoder_Factory.cpp', @@ -53,14 +55,11 @@ 'conditions': [ [ 'skia_os == "win"', { 'sources!': [ - '../include/images/SkJpegUtility.h', - '../src/images/SkFDStream.cpp', '../src/images/SkImageDecoder_Factory.cpp', '../src/images/SkImageDecoder_libgif.cpp', '../src/images/SkImageDecoder_libpng.cpp', '../src/images/SkImageEncoder_Factory.cpp', - '../src/images/SkJpegUtility.cpp', '../src/images/SkMovie_gif.cpp', ], 'link_settings': { @@ -75,13 +74,10 @@ }], [ 'skia_os == "mac"', { 'sources!': [ - '../include/images/SkJpegUtility.h', - '../src/images/SkImageDecoder_Factory.cpp', '../src/images/SkImageDecoder_libpng.cpp', '../src/images/SkImageDecoder_libgif.cpp', '../src/images/SkImageEncoder_Factory.cpp', - '../src/images/SkJpegUtility.cpp', '../src/images/SkMovie_gif.cpp', ], },{ #else if skia_os != mac @@ -91,10 +87,7 @@ }], [ 'skia_os in ["linux", "freebsd", "openbsd", "solaris"]', { 'sources!': [ - '../include/images/SkJpegUtility.h', - '../src/images/SkImageDecoder_libgif.cpp', - '../src/images/SkJpegUtility.cpp', '../src/images/SkMovie_gif.cpp', ], # libpng stuff: @@ -113,7 +106,6 @@ }], [ 'skia_os == "android"', { 'sources!': [ - '../src/images/SkJpegUtility.cpp', ], 'dependencies': [ 'android_system.gyp:gif', diff --git a/libjpeg.gyp b/libjpeg.gyp index 4826f48..d628f66 100644 --- a/libjpeg.gyp +++ b/libjpeg.gyp @@ -13,6 +13,19 @@ 'dependencies': [ '../third_party/externals/libjpeg/libjpeg.gyp:libjpeg', ], + + 'conditions': [ + [ 'os_posix != 1 or OS == "mac"', { + # need to set include path when using our own version + 'direct_dependent_settings': { + 'include_dirs': [ + '../third_party/externals/libjpeg', + ], + }, + },], + ], + + }, ], } -- cgit v1.2.3 From f27bc8ea979fba351f4e715527ac2b09b67b9d5f Mon Sep 17 00:00:00 2001 From: "robertphillips@google.com" Date: Tue, 20 Mar 2012 15:13:04 +0000 Subject: reverting to 3437 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@3439 2bbb7eff-a529-9590-31e7-b0007b416f81 --- gmslides.gypi | 1 - images.gyp | 12 ++++++++++-- libjpeg.gyp | 13 ------------- 3 files changed, 10 insertions(+), 16 deletions(-) diff --git a/gmslides.gypi b/gmslides.gypi index 601aa88..ec223fb 100644 --- a/gmslides.gypi +++ b/gmslides.gypi @@ -9,7 +9,6 @@ '../gm/bitmapfilters.cpp', '../gm/bitmapscroll.cpp', '../gm/blurs.cpp', - '../gm/cmykjpeg.cpp', '../gm/colormatrix.cpp', '../gm/complexclip.cpp', '../gm/complexclip2.cpp', diff --git a/images.gyp b/images.gyp index d0b5c1a..a93ba06 100644 --- a/images.gyp +++ b/images.gyp @@ -5,7 +5,6 @@ 'type': 'static_library', 'dependencies': [ 'utils.gyp:utils', - 'libjpeg.gyp:libjpeg', ], 'include_dirs': [ '../include/config', @@ -34,7 +33,6 @@ '../src/images/SkImageDecoder_libgif.cpp', '../src/images/SkImageDecoder_libico.cpp', '../src/images/SkImageDecoder_libpng.cpp', - '../src/images/SkImageDecoder_libjpeg.cpp', '../src/images/SkImageDecoder_wbmp.cpp', '../src/images/SkImageEncoder.cpp', '../src/images/SkImageEncoder_Factory.cpp', @@ -55,11 +53,14 @@ 'conditions': [ [ 'skia_os == "win"', { 'sources!': [ + '../include/images/SkJpegUtility.h', + '../src/images/SkFDStream.cpp', '../src/images/SkImageDecoder_Factory.cpp', '../src/images/SkImageDecoder_libgif.cpp', '../src/images/SkImageDecoder_libpng.cpp', '../src/images/SkImageEncoder_Factory.cpp', + '../src/images/SkJpegUtility.cpp', '../src/images/SkMovie_gif.cpp', ], 'link_settings': { @@ -74,10 +75,13 @@ }], [ 'skia_os == "mac"', { 'sources!': [ + '../include/images/SkJpegUtility.h', + '../src/images/SkImageDecoder_Factory.cpp', '../src/images/SkImageDecoder_libpng.cpp', '../src/images/SkImageDecoder_libgif.cpp', '../src/images/SkImageEncoder_Factory.cpp', + '../src/images/SkJpegUtility.cpp', '../src/images/SkMovie_gif.cpp', ], },{ #else if skia_os != mac @@ -87,7 +91,10 @@ }], [ 'skia_os in ["linux", "freebsd", "openbsd", "solaris"]', { 'sources!': [ + '../include/images/SkJpegUtility.h', + '../src/images/SkImageDecoder_libgif.cpp', + '../src/images/SkJpegUtility.cpp', '../src/images/SkMovie_gif.cpp', ], # libpng stuff: @@ -106,6 +113,7 @@ }], [ 'skia_os == "android"', { 'sources!': [ + '../src/images/SkJpegUtility.cpp', ], 'dependencies': [ 'android_system.gyp:gif', diff --git a/libjpeg.gyp b/libjpeg.gyp index d628f66..4826f48 100644 --- a/libjpeg.gyp +++ b/libjpeg.gyp @@ -13,19 +13,6 @@ 'dependencies': [ '../third_party/externals/libjpeg/libjpeg.gyp:libjpeg', ], - - 'conditions': [ - [ 'os_posix != 1 or OS == "mac"', { - # need to set include path when using our own version - 'direct_dependent_settings': { - 'include_dirs': [ - '../third_party/externals/libjpeg', - ], - }, - },], - ], - - }, ], } -- cgit v1.2.3 From 08b3bb9cb0683a10852a71b9d85dac5f902649f2 Mon Sep 17 00:00:00 2001 From: "tomhudson@google.com" Date: Tue, 20 Mar 2012 21:18:43 +0000 Subject: Move SkClampRange into src/effects, where it isn't being advertised as something for end-users. http://codereview.appspot.com/5864044/ git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@3445 2bbb7eff-a529-9590-31e7-b0007b416f81 --- core.gyp | 2 -- effects.gyp | 2 ++ tests.gyp | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/core.gyp b/core.gyp index 1d0630e..c60059e 100644 --- a/core.gyp +++ b/core.gyp @@ -41,7 +41,6 @@ '../src/core/SkBuffer.cpp', '../src/core/SkCanvas.cpp', '../src/core/SkChunkAlloc.cpp', - '../src/core/SkClampRange.cpp', '../src/core/SkClipStack.cpp', '../src/core/SkColor.cpp', '../src/core/SkColorFilter.cpp', @@ -157,7 +156,6 @@ '../include/core/SkBuffer.h', '../include/core/SkCanvas.h', '../include/core/SkChunkAlloc.h', - '../include/core/SkClampRange.h', '../include/core/SkClipStack.h', '../include/core/SkColor.h', '../include/core/SkColorFilter.h', diff --git a/effects.gyp b/effects.gyp index 692a5bb..d23d7ef 100644 --- a/effects.gyp +++ b/effects.gyp @@ -49,6 +49,8 @@ '../src/effects/SkBlurMask.h', '../src/effects/SkBlurImageFilter.cpp', '../src/effects/SkBlurMaskFilter.cpp', + '../src/effects/SkClampRange.cpp', + '../src/effects/SkClampRange.h', '../src/effects/SkColorFilters.cpp', '../src/effects/SkColorMatrixFilter.cpp', '../src/effects/SkCornerPathEffect.cpp', diff --git a/tests.gyp b/tests.gyp index 1eecc39..2492274 100644 --- a/tests.gyp +++ b/tests.gyp @@ -9,6 +9,7 @@ 'type': 'executable', 'include_dirs' : [ '../src/core', + '../src/effects', '../src/gpu', ], 'sources': [ -- cgit v1.2.3 From 799a1c8123db1a1faa75990704a945061705e367 Mon Sep 17 00:00:00 2001 From: "vandebo@chromium.org" Date: Wed, 21 Mar 2012 16:45:47 +0000 Subject: [PDF] Add GM and infrastructure to test drawing shaders with an initial transform. Review URL: https://codereview.appspot.com/5867047 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@3450 2bbb7eff-a529-9590-31e7-b0007b416f81 --- gmslides.gypi | 1 + 1 file changed, 1 insertion(+) diff --git a/gmslides.gypi b/gmslides.gypi index ec223fb..5beac2b 100644 --- a/gmslides.gypi +++ b/gmslides.gypi @@ -37,6 +37,7 @@ '../gm/points.cpp', '../gm/poly2poly.cpp', '../gm/quadpaths.cpp', + '../gm/shaderbounds.cpp', '../gm/shadertext.cpp', '../gm/shadows.cpp', '../gm/shapes.cpp', -- cgit v1.2.3 From d586fc1b7f2d13eef15488fa9883b5d6e0bd1f88 Mon Sep 17 00:00:00 2001 From: "vandebo@chromium.org" Date: Wed, 21 Mar 2012 17:11:27 +0000 Subject: Revert "[PDF] Add GM and infrastructure to test drawing shaders with an initial transform." This reverts r3450 TBR=reed@google.com Review URL: https://codereview.appspot.com/5864050 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@3451 2bbb7eff-a529-9590-31e7-b0007b416f81 --- gmslides.gypi | 1 - 1 file changed, 1 deletion(-) diff --git a/gmslides.gypi b/gmslides.gypi index 5beac2b..ec223fb 100644 --- a/gmslides.gypi +++ b/gmslides.gypi @@ -37,7 +37,6 @@ '../gm/points.cpp', '../gm/poly2poly.cpp', '../gm/quadpaths.cpp', - '../gm/shaderbounds.cpp', '../gm/shadertext.cpp', '../gm/shadows.cpp', '../gm/shapes.cpp', -- cgit v1.2.3 From 54802116f817f5fee5b322e66b8119df1a3c54f0 Mon Sep 17 00:00:00 2001 From: "vandebo@chromium.org" Date: Wed, 21 Mar 2012 17:34:30 +0000 Subject: [PDF] Add GM and infrastructure to test drawing shaders with an initial transform. Previous review at https://codereview.appspot.com/5867047/ and https://codereview.appspot.com/5849045/ TBR=reed@google.com Review URL: https://codereview.appspot.com/5860044 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@3452 2bbb7eff-a529-9590-31e7-b0007b416f81 --- gmslides.gypi | 1 + 1 file changed, 1 insertion(+) diff --git a/gmslides.gypi b/gmslides.gypi index ec223fb..5beac2b 100644 --- a/gmslides.gypi +++ b/gmslides.gypi @@ -37,6 +37,7 @@ '../gm/points.cpp', '../gm/poly2poly.cpp', '../gm/quadpaths.cpp', + '../gm/shaderbounds.cpp', '../gm/shadertext.cpp', '../gm/shadows.cpp', '../gm/shapes.cpp', -- cgit v1.2.3 From ffcf36ccacd4a17632924381cb58a315d200f27d Mon Sep 17 00:00:00 2001 From: "vandebo@chromium.org" Date: Wed, 21 Mar 2012 19:59:04 +0000 Subject: [PDF] Move most of the headers to be private. Compute font stats in SkPDFDocument in order to make more of the headers private. Previous review: https://codereview.appspot.com/5865048/ Review URL: https://codereview.appspot.com/5868049 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@3457 2bbb7eff-a529-9590-31e7-b0007b416f81 --- tests.gyp | 1 + 1 file changed, 1 insertion(+) diff --git a/tests.gyp b/tests.gyp index 2492274..52f44bb 100644 --- a/tests.gyp +++ b/tests.gyp @@ -11,6 +11,7 @@ '../src/core', '../src/effects', '../src/gpu', + '../src/pdf', ], 'sources': [ '../tests/AAClipTest.cpp', -- cgit v1.2.3 From 8bc57f73434ad005d58c548faf1c7c6cd0adfcf3 Mon Sep 17 00:00:00 2001 From: "vandebo@chromium.org" Date: Wed, 21 Mar 2012 20:31:08 +0000 Subject: Revert "[PDF] Move most of the headers to be private." This reverts r3457 TBR=epoger@google.com Review URL: https://codereview.appspot.com/5866051 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@3458 2bbb7eff-a529-9590-31e7-b0007b416f81 --- tests.gyp | 1 - 1 file changed, 1 deletion(-) diff --git a/tests.gyp b/tests.gyp index 52f44bb..2492274 100644 --- a/tests.gyp +++ b/tests.gyp @@ -11,7 +11,6 @@ '../src/core', '../src/effects', '../src/gpu', - '../src/pdf', ], 'sources': [ '../tests/AAClipTest.cpp', -- cgit v1.2.3 From 2b7a4bd07d76ad7cf3b488f2be280a4182068137 Mon Sep 17 00:00:00 2001 From: "bungeman@google.com" Date: Wed, 21 Mar 2012 20:59:49 +0000 Subject: Utils must not depend on Views. http://codereview.appspot.com/5867051/ git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@3459 2bbb7eff-a529-9590-31e7-b0007b416f81 --- SampleApp.gyp | 36 ++++++++++++++++++------------------ SimpleCocoaApp.gyp | 20 ++++++++++---------- iOSSampleApp.gyp | 5 +---- utils.gyp | 16 ---------------- views.gyp | 35 +++++++++++++++++++++++++++++++++++ 5 files changed, 64 insertions(+), 48 deletions(-) diff --git a/SampleApp.gyp b/SampleApp.gyp index b915821..2a38add 100644 --- a/SampleApp.gyp +++ b/SampleApp.gyp @@ -174,33 +174,33 @@ ], 'sources': [ # Sample App specific files - '../src/utils/mac/SampleApp-Info.plist', - '../src/utils/mac/SampleAppDelegate.h', - '../src/utils/mac/SampleAppDelegate.mm', - '../src/utils/mac/SkSampleNSView.h', - '../src/utils/mac/SkSampleNSView.mm', + '../src/views/mac/SampleApp-Info.plist', + '../src/views/mac/SampleAppDelegate.h', + '../src/views/mac/SampleAppDelegate.mm', + '../src/views/mac/SkSampleNSView.h', + '../src/views/mac/SkSampleNSView.mm', # Mac files - '../src/utils/mac/SkEventNotifier.h', - '../src/utils/mac/SkEventNotifier.mm', - '../src/utils/mac/skia_mac.mm', - '../src/utils/mac/SkNSView.h', - '../src/utils/mac/SkNSView.mm', - '../src/utils/mac/SkOptionsTableView.h', - '../src/utils/mac/SkOptionsTableView.mm', - '../src/utils/mac/SkOSWindow_Mac.mm', - '../src/utils/mac/SkTextFieldCell.h', - '../src/utils/mac/SkTextFieldCell.m', + '../src/views/mac/SkEventNotifier.h', + '../src/views/mac/SkEventNotifier.mm', + '../src/views/mac/skia_mac.mm', + '../src/views/mac/SkNSView.h', + '../src/views/mac/SkNSView.mm', + '../src/views/mac/SkOptionsTableView.h', + '../src/views/mac/SkOptionsTableView.mm', + '../src/views/mac/SkOSWindow_Mac.mm', + '../src/views/mac/SkTextFieldCell.h', + '../src/views/mac/SkTextFieldCell.m', ], 'libraries': [ '$(SDKROOT)/System/Library/Frameworks/QuartzCore.framework', '$(SDKROOT)/System/Library/Frameworks/OpenGL.framework', ], 'xcode_settings' : { - 'INFOPLIST_FILE' : '../src/utils/mac/SampleApp-Info.plist', + 'INFOPLIST_FILE' : '../src/views/mac/SampleApp-Info.plist', }, 'mac_bundle_resources' : [ - '../src/utils/mac/SampleApp.xib', + '../src/views/mac/SampleApp.xib', ], }], [ 'skia_os == "ios"', { @@ -222,7 +222,7 @@ '../experimental/iOSSampleApp/iPhone/AppDelegate_iPhone.mm', '../experimental/iOSSampleApp/iPhone/SkUINavigationController.mm', - '../src/utils/ios/SkOSWindow_iOS.mm', + '../src/views/ios/SkOSWindow_iOS.mm', '../src/utils/ios/SkImageDecoder_iOS.mm', '../src/utils/ios/SkStream_NSData.mm', '../src/utils/ios/SkOSFile_iOS.mm', diff --git a/SimpleCocoaApp.gyp b/SimpleCocoaApp.gyp index f5e41c4..13f05dc 100644 --- a/SimpleCocoaApp.gyp +++ b/SimpleCocoaApp.gyp @@ -8,16 +8,16 @@ '../experimental/SimpleCocoaApp/', ], 'sources': [ - '../src/utils/mac/SkEventNotifier.h', - '../src/utils/mac/SkEventNotifier.mm', - '../src/utils/mac/skia_mac.mm', - '../src/utils/mac/SkNSView.h', - '../src/utils/mac/SkNSView.mm', - '../src/utils/mac/SkOptionsTableView.h', - '../src/utils/mac/SkOptionsTableView.mm', - '../src/utils/mac/SkOSWindow_Mac.mm', - '../src/utils/mac/SkTextFieldCell.h', - '../src/utils/mac/SkTextFieldCell.m', + '../src/views/mac/SkEventNotifier.h', + '../src/views/mac/SkEventNotifier.mm', + '../src/views/mac/skia_mac.mm', + '../src/views/mac/SkNSView.h', + '../src/views/mac/SkNSView.mm', + '../src/views/mac/SkOptionsTableView.h', + '../src/views/mac/SkOptionsTableView.mm', + '../src/views/mac/SkOSWindow_Mac.mm', + '../src/views/mac/SkTextFieldCell.h', + '../src/views/mac/SkTextFieldCell.m', '../experimental/SimpleCocoaApp/SimpleApp-Info.plist', '../experimental/SimpleCocoaApp/SimpleApp.h', diff --git a/iOSSampleApp.gyp b/iOSSampleApp.gyp index b864ca6..f504594 100644 --- a/iOSSampleApp.gyp +++ b/iOSSampleApp.gyp @@ -1,7 +1,4 @@ { - 'includes': [ - 'target_defaults.gypi', - ], 'defines!': [ 'SK_BUILD_FOR_MAC', ], @@ -212,7 +209,7 @@ '../experimental/iOSSampleApp/iPhone/SkUINavigationController.mm', '../experimental/iOSSampleApp/iPhone/MainWindow_iPhone.xib', - '../src/utils/ios/SkOSWindow_iOS.mm', + '../src/views/ios/SkOSWindow_iOS.mm', '../src/utils/ios/SkImageDecoder_iOS.mm', '../src/utils/ios/SkStream_NSData.mm', '../src/utils/ios/SkOSFile_iOS.mm', diff --git a/utils.gyp b/utils.gyp index 87d6e97..1847e95 100644 --- a/utils.gyp +++ b/utils.gyp @@ -10,7 +10,6 @@ '../include/utils/mac', '../include/utils/unix', '../include/utils/win', - '../include/views', '../include/effects', '../include/xml', ], @@ -62,13 +61,6 @@ #mac '../include/utils/mac/SkCGUtils.h', '../src/utils/mac/SkCreateCGImageRef.cpp', - - #sdl - '../src/utils/SDL/SkOSWindow_SDL.cpp', - - #*nix - '../src/utils/unix/keysym2ucs.c', - '../src/utils/unix/SkOSWindow_Unix.cpp', #windows '../include/utils/win/SkAutoCoInitialize.h', @@ -76,10 +68,8 @@ '../include/utils/win/SkIStream.h', '../include/utils/win/SkTScopedComPtr.h', '../src/utils/win/SkAutoCoInitialize.cpp', - '../src/utils/win/skia_win.cpp', '../src/utils/win/SkHRESULT.cpp', '../src/utils/win/SkIStream.cpp', - '../src/utils/win/SkOSWindow_win.cpp', '../src/utils/win/SkWGL_win.cpp', ], 'sources!': [ @@ -104,8 +94,6 @@ 'sources!': [ '../include/utils/mac/SkCGUtils.h', '../src/utils/mac/SkCreateCGImageRef.cpp', - '../src/utils/mac/skia_mac.mm', - '../src/utils/mac/SkOSWindow_Mac.mm', ], }], [ 'skia_os in ["linux", "freebsd", "openbsd", "solaris"]', { @@ -119,10 +107,6 @@ 'include_dirs!': [ '../include/utils/unix', ], - 'sources!': [ - '../src/utils/unix/keysym2ucs.c', - '../src/utils/unix/SkOSWindow_Unix.cpp', - ], }], [ 'skia_os == "win"', { 'direct_dependent_settings': { diff --git a/views.gyp b/views.gyp index e997573..832c180 100644 --- a/views.gyp +++ b/views.gyp @@ -12,6 +12,7 @@ '../include/images', '../include/animator', '../include/effects', + '../include/views/unix', ], 'sources': [ '../include/views/SkApplication.h', @@ -64,10 +65,27 @@ '../src/views/SkWidgets.cpp', '../src/views/SkWidgetViews.cpp', '../src/views/SkWindow.cpp', + + #mac + '../src/views/mac/SkOSWindow_Mac.mm', + '../src/views/mac/skia_mac.mm', + + #sdl + '../src/views/SDL/SkOSWindow_SDL.cpp', + + #*nix + '../src/views/unix/SkOSWindow_Unix.cpp', + '../src/views/unix/keysym2ucs.c', + + #windows + '../src/views/win/SkOSWindow_win.cpp', + '../src/views/win/skia_win.cpp', + ], 'sources!' : [ '../src/views/SkListView.cpp', #depends on missing SkListSource implementation '../src/views/SkListWidget.cpp', #depends on missing SkListSource implementation + '../src/views/SDL/SkOSWindow_SDL.cpp', ], 'conditions': [ [ 'skia_os == "mac"', { @@ -77,11 +95,28 @@ '$(SDKROOT)/System/Library/Frameworks/Foundation.framework', ], }, + },{ + 'sources!': [ + '../src/views/mac/SkOSWindow_Mac.mm', + '../src/views/mac/skia_mac.mm', + ], }], [ 'skia_os in ["linux", "freebsd", "openbsd", "solaris"]', { 'sources': [ '../unix_test_app/main.cpp', ], + },{ + 'sources!': [ + '../src/views/unix/SkOSWindow_Unix.cpp', + '../src/views/unix/keysym2ucs.c', + ], + }], + [ 'skia_os == "win"', { + },{ + 'sources!': [ + '../src/views/win/SkOSWindow_win.cpp', + '../src/views/win/skia_win.cpp', + ], }], [ 'skia_os == "android"', { # Android does not support animator so we need to remove all files -- cgit v1.2.3 From 6b6eab07bbf57d1effa86668a8527376c2622316 Mon Sep 17 00:00:00 2001 From: "vandebo@chromium.org" Date: Wed, 21 Mar 2012 23:11:46 +0000 Subject: Move SkBitSet to utils. Review URL: https://codereview.appspot.com/5875043 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@3460 2bbb7eff-a529-9590-31e7-b0007b416f81 --- pdf.gyp | 12 +++++++----- tests.gyp | 1 + utils.gyp | 2 ++ xps.gyp | 2 +- 4 files changed, 11 insertions(+), 6 deletions(-) diff --git a/pdf.gyp b/pdf.gyp index 0d5fef5..bb42f00 100644 --- a/pdf.gyp +++ b/pdf.gyp @@ -3,14 +3,20 @@ { 'target_name': 'pdf', 'type': 'static_library', + 'dependencies': [ + 'core.gyp:core', + 'ports.gyp:ports', + 'utils.gyp:utils', + 'zlib.gyp:zlib', + ], 'include_dirs': [ '../include/config', '../include/core', '../include/pdf', '../src/core', # needed to get SkGlyphCache.h and SkTextFormatParams.h + '../src/utils', # needed to get SkBitSet.h ], 'sources': [ - '../include/pdf/SkBitSet.h', '../include/pdf/SkPDFCatalog.h', '../include/pdf/SkPDFDevice.h', '../include/pdf/SkPDFDocument.h', @@ -24,7 +30,6 @@ '../include/pdf/SkPDFTypes.h', '../include/pdf/SkPDFUtils.h', - '../src/pdf/SkBitSet.cpp', '../src/pdf/SkPDFCatalog.cpp', '../src/pdf/SkPDFDevice.cpp', '../src/pdf/SkPDFDocument.cpp', @@ -49,9 +54,6 @@ '../include/pdf', ], }, - 'dependencies': [ - 'zlib.gyp:zlib', - ], }, ], } diff --git a/tests.gyp b/tests.gyp index 2492274..541db7f 100644 --- a/tests.gyp +++ b/tests.gyp @@ -11,6 +11,7 @@ '../src/core', '../src/effects', '../src/gpu', + '../src/utils', ], 'sources': [ '../tests/AAClipTest.cpp', diff --git a/utils.gyp b/utils.gyp index 1847e95..e30b433 100644 --- a/utils.gyp +++ b/utils.gyp @@ -37,6 +37,8 @@ '../src/utils/SkBase64.cpp', '../src/utils/SkBase64.h', + '../src/utils/SkBitSet.cpp', + '../src/utils/SkBitSet.h', '../src/utils/SkBoundaryPatch.cpp', '../src/utils/SkCamera.cpp', '../src/utils/SkColorMatrix.cpp', diff --git a/xps.gyp b/xps.gyp index 8090166..5249c16 100644 --- a/xps.gyp +++ b/xps.gyp @@ -7,12 +7,12 @@ 'core.gyp:core', 'images.gyp:images', 'utils.gyp:utils', - 'pdf.gyp:pdf', # needed to get SkBitSet ], 'include_dirs': [ '../include/device/xps', '../include/utils/win', '../src/core', # needed to get SkGlyphCache.h + '../src/utils', # needed to get SkBitSet.h ], 'sources': [ '../include/device/xps/SkConstexprMath.h', -- cgit v1.2.3 From 339ad6b388b8e05adce6b26c2758630319c9dcfc Mon Sep 17 00:00:00 2001 From: "epoger@google.com" Date: Thu, 22 Mar 2012 15:37:22 +0000 Subject: Move unix_test_app/main.cpp to src/views/unix/skia_unix.cpp Review URL: https://codereview.appspot.com/5881048 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@3466 2bbb7eff-a529-9590-31e7-b0007b416f81 --- views.gyp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/views.gyp b/views.gyp index 832c180..4056a46 100644 --- a/views.gyp +++ b/views.gyp @@ -76,6 +76,7 @@ #*nix '../src/views/unix/SkOSWindow_Unix.cpp', '../src/views/unix/keysym2ucs.c', + '../src/views/unix/skia_unix.cpp', #windows '../src/views/win/SkOSWindow_win.cpp', @@ -102,13 +103,11 @@ ], }], [ 'skia_os in ["linux", "freebsd", "openbsd", "solaris"]', { - 'sources': [ - '../unix_test_app/main.cpp', - ], },{ 'sources!': [ '../src/views/unix/SkOSWindow_Unix.cpp', '../src/views/unix/keysym2ucs.c', + '../src/views/unix/skia_unix.cpp', ], }], [ 'skia_os == "win"', { -- cgit v1.2.3 From 58eb0ecc320f06ef49041b01dec1649cb1c9c047 Mon Sep 17 00:00:00 2001 From: "bungeman@google.com" Date: Thu, 22 Mar 2012 17:56:29 +0000 Subject: Remove mutual dependency of gr and skgr. http://codereview.appspot.com/5879043/ git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@3467 2bbb7eff-a529-9590-31e7-b0007b416f81 --- gpu.gyp | 1 - 1 file changed, 1 deletion(-) diff --git a/gpu.gyp b/gpu.gyp index a4d7c18..db506d7 100644 --- a/gpu.gyp +++ b/gpu.gyp @@ -104,7 +104,6 @@ '../include/gpu/gl/SkNullGLContext.h', '../include/gpu/gl/SkDebugGLContext.h', - '../src/gpu/GrPrintf_skia.cpp', '../src/gpu/SkGpuCanvas.cpp', '../src/gpu/SkGpuDevice.cpp', '../src/gpu/SkGr.cpp', -- cgit v1.2.3 From f63960178669f0a5f1965a1e92096393ca433350 Mon Sep 17 00:00:00 2001 From: "vandebo@chromium.org" Date: Thu, 22 Mar 2012 20:45:15 +0000 Subject: [PDF] Move most of the headers to be private. Compute font stats in SkPDFDocument in order to make more of the headers private. Previous review: https://codereview.appspot.com/5868049/ Review URL: https://codereview.appspot.com/5875049 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@3470 2bbb7eff-a529-9590-31e7-b0007b416f81 --- pdf.gyp | 20 ++++++++++---------- tests.gyp | 1 + 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/pdf.gyp b/pdf.gyp index bb42f00..e7b0369 100644 --- a/pdf.gyp +++ b/pdf.gyp @@ -17,32 +17,32 @@ '../src/utils', # needed to get SkBitSet.h ], 'sources': [ - '../include/pdf/SkPDFCatalog.h', '../include/pdf/SkPDFDevice.h', '../include/pdf/SkPDFDocument.h', - '../include/pdf/SkPDFFont.h', - '../include/pdf/SkPDFFormXObject.h', - '../include/pdf/SkPDFGraphicState.h', - '../include/pdf/SkPDFImage.h', - '../include/pdf/SkPDFPage.h', - '../include/pdf/SkPDFShader.h', - '../include/pdf/SkPDFStream.h', - '../include/pdf/SkPDFTypes.h', - '../include/pdf/SkPDFUtils.h', '../src/pdf/SkPDFCatalog.cpp', + '../src/pdf/SkPDFCatalog.h', '../src/pdf/SkPDFDevice.cpp', '../src/pdf/SkPDFDocument.cpp', '../src/pdf/SkPDFFont.cpp', + '../src/pdf/SkPDFFont.h', '../src/pdf/SkPDFFontImpl.h', '../src/pdf/SkPDFFormXObject.cpp', + '../src/pdf/SkPDFFormXObject.h', '../src/pdf/SkPDFGraphicState.cpp', + '../src/pdf/SkPDFGraphicState.h', '../src/pdf/SkPDFImage.cpp', + '../src/pdf/SkPDFImage.h', '../src/pdf/SkPDFPage.cpp', + '../src/pdf/SkPDFPage.h', '../src/pdf/SkPDFShader.cpp', + '../src/pdf/SkPDFShader.h', '../src/pdf/SkPDFStream.cpp', + '../src/pdf/SkPDFStream.h', '../src/pdf/SkPDFTypes.cpp', + '../src/pdf/SkPDFTypes.h', '../src/pdf/SkPDFUtils.cpp', + '../src/pdf/SkPDFUtils.h', ], # This section makes all targets that depend on this target # #define SK_SUPPORT_PDF and have access to the pdf header files. diff --git a/tests.gyp b/tests.gyp index 541db7f..a3a8002 100644 --- a/tests.gyp +++ b/tests.gyp @@ -11,6 +11,7 @@ '../src/core', '../src/effects', '../src/gpu', + '../src/pdf', '../src/utils', ], 'sources': [ -- cgit v1.2.3 From 26a8d9611c256c8f3a7f6acc9e6f4cba4b15cc91 Mon Sep 17 00:00:00 2001 From: "bungeman@google.com" Date: Fri, 23 Mar 2012 14:11:43 +0000 Subject: Remove circular dependency of views and animator. http://codereview.appspot.com/5874056/ git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@3473 2bbb7eff-a529-9590-31e7-b0007b416f81 --- SampleApp.gyp | 1 + animator.gyp | 4 +++ views.gyp | 32 +++++------------------ views_animated.gyp | 74 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 85 insertions(+), 26 deletions(-) create mode 100644 views_animated.gyp diff --git a/SampleApp.gyp b/SampleApp.gyp index 2a38add..bdd46ed 100644 --- a/SampleApp.gyp +++ b/SampleApp.gyp @@ -154,6 +154,7 @@ 'gpu.gyp:gr', 'gpu.gyp:skgr', 'pdf.gyp:pdf', + 'views_animated.gyp:views_animated', ], 'conditions' : [ [ 'skia_os in ["linux", "freebsd", "openbsd", "solaris"]', { diff --git a/animator.gyp b/animator.gyp index 744cd37..b3c651c 100644 --- a/animator.gyp +++ b/animator.gyp @@ -1,3 +1,7 @@ +#Animator is basically Skia's (much saner) version of Flash. +#On top of Views it provides a declarative UI model which can be updated +#based on events which trigger changes or scripts. + { 'targets': [ { diff --git a/views.gyp b/views.gyp index 4056a46..f663f12 100644 --- a/views.gyp +++ b/views.gyp @@ -1,3 +1,9 @@ +#Views is the Skia windowing toolkit. +#It provides +# * a portable means of creating native windows +# * events +# * basic widgets and controls + { 'targets': [ { @@ -10,7 +16,6 @@ '../include/xml', '../include/utils', '../include/images', - '../include/animator', '../include/effects', '../include/views/unix', ], @@ -36,23 +41,16 @@ '../include/views/SkView.h', '../include/views/SkViewInflate.h', '../include/views/SkWidget.h', - '../include/views/SkWidgetViews.h', '../include/views/SkWindow.h', '../src/views/SkBGViewArtist.cpp', - '../src/views/SkBorderView.cpp', '../src/views/SkEvent.cpp', '../src/views/SkEventSink.cpp', - '../src/views/SkImageView.cpp', '../src/views/SkListView.cpp', - '../src/views/SkListWidget.cpp', '../src/views/SkOSMenu.cpp', '../src/views/SkParsePaint.cpp', - '../src/views/SkProgressBarView.cpp', '../src/views/SkProgressView.cpp', - '../src/views/SkScrollBarView.cpp', '../src/views/SkStackViewLayout.cpp', - '../src/views/SkStaticTextView.cpp', '../src/views/SkTagList.cpp', '../src/views/SkTagList.h', '../src/views/SkTextBox.cpp', @@ -63,7 +61,6 @@ '../src/views/SkViewPriv.h', '../src/views/SkWidget.cpp', '../src/views/SkWidgets.cpp', - '../src/views/SkWidgetViews.cpp', '../src/views/SkWindow.cpp', #mac @@ -84,8 +81,6 @@ ], 'sources!' : [ - '../src/views/SkListView.cpp', #depends on missing SkListSource implementation - '../src/views/SkListWidget.cpp', #depends on missing SkListSource implementation '../src/views/SDL/SkOSWindow_SDL.cpp', ], 'conditions': [ @@ -117,21 +112,6 @@ '../src/views/win/skia_win.cpp', ], }], - [ 'skia_os == "android"', { - # Android does not support animator so we need to remove all files - # that have references to it. - 'include_dirs!': [ - '../include/animator', - ], - 'sources!': [ - '../src/views/SkBorderView.cpp', - '../src/views/SkImageView.cpp', - '../src/views/SkProgressBarView.cpp', - '../src/views/SkScrollBarView.cpp', - '../src/views/SkStaticTextView.cpp', - '../src/views/SkWidgetViews.cpp', - ], - }], ], 'direct_dependent_settings': { 'include_dirs': [ diff --git a/views_animated.gyp b/views_animated.gyp new file mode 100644 index 0000000..f7cd052 --- /dev/null +++ b/views_animated.gyp @@ -0,0 +1,74 @@ +#Animated widgets are views which use animator. + +{ + 'targets': [ + { + 'target_name': 'views_animated', + 'type': 'static_library', + 'include_dirs': [ + '../include/config', + '../include/core', + '../include/views', + '../include/xml', + '../include/utils', + '../include/images', + '../include/animator', + '../include/effects', + '../include/views/unix', + '../include/views/animated', + ], + 'sources': [ + '../include/views/animated/SkWidgetViews.h', + + '../src/views/animated/SkBorderView.cpp', + '../src/views/animated/SkImageView.cpp', + '../src/views/animated/SkListWidget.cpp', + '../src/views/animated/SkProgressBarView.cpp', + '../src/views/animated/SkScrollBarView.cpp', + '../src/views/animated/SkStaticTextView.cpp', + '../src/views/animated/SkWidgetViews.cpp', + ], + 'sources!' : [ + '../src/views/animated/SkListView.cpp', #depends on missing SkListSource implementation + '../src/views/animated/SkListWidget.cpp', #depends on missing SkListSource implementation + ], + 'conditions': [ + [ 'skia_os == "mac"', { + 'link_settings': { + 'libraries': [ + '$(SDKROOT)/System/Library/Frameworks/Cocoa.framework', + '$(SDKROOT)/System/Library/Frameworks/Foundation.framework', + ], + }, + }], + [ 'skia_os == "android"', { + # Android does not support animator so we need to remove all files + # that have references to it. + 'include_dirs!': [ + '../include/animator', + ], + 'sources!': [ + '../src/views/animated/SkBorderView.cpp', + '../src/views/animated/SkImageView.cpp', + '../src/views/animated/SkListWidget.cpp', + '../src/views/animated/SkProgressBarView.cpp', + '../src/views/animated/SkScrollBarView.cpp', + '../src/views/animated/SkStaticTextView.cpp', + '../src/views/animated/SkWidgetViews.cpp', + ], + }], + ], + 'direct_dependent_settings': { + 'include_dirs': [ + '../include/views/animated', + ], + }, + }, + ], +} + +# Local Variables: +# tab-width:2 +# indent-tabs-mode:nil +# End: +# vim: set expandtab tabstop=2 shiftwidth=2: -- cgit v1.2.3 From 80f6078fca3f080d514cbade78713daaaa4d1ec7 Mon Sep 17 00:00:00 2001 From: "reed@google.com" Date: Fri, 23 Mar 2012 15:36:36 +0000 Subject: apply imagefilter to all draw calls Review URL: https://codereview.appspot.com/5856048 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@3476 2bbb7eff-a529-9590-31e7-b0007b416f81 --- gmslides.gypi | 1 + 1 file changed, 1 insertion(+) diff --git a/gmslides.gypi b/gmslides.gypi index 5beac2b..491af68 100644 --- a/gmslides.gypi +++ b/gmslides.gypi @@ -26,6 +26,7 @@ '../gm/gradtext.cpp', '../gm/hairmodes.cpp', '../gm/imageblur.cpp', + '../gm/imagefiltersbase.cpp', '../gm/lcdtext.cpp', '../gm/linepaths.cpp', '../gm/morphology.cpp', -- cgit v1.2.3 From 089afe85809054f1b143e3eb35e5a80d4f59be34 Mon Sep 17 00:00:00 2001 From: "djsollen@google.com" Date: Fri, 23 Mar 2012 19:00:34 +0000 Subject: Cleanup Macros arround static initializers for SkFlattenable. This CL also removes an unused debugging function from the class Review URL: https://codereview.appspot.com/5890043 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@3483 2bbb7eff-a529-9590-31e7-b0007b416f81 --- effects.gyp | 2 -- 1 file changed, 2 deletions(-) diff --git a/effects.gyp b/effects.gyp index d23d7ef..3975965 100644 --- a/effects.gyp +++ b/effects.gyp @@ -22,7 +22,6 @@ '../include/effects/SkDashPathEffect.h', '../include/effects/SkDiscretePathEffect.h', '../include/effects/SkDrawExtraPathEffect.h', - '../include/effects/SkEffects.h', '../include/effects/SkEmbossMaskFilter.h', '../include/effects/SkGradientShader.h', '../include/effects/SkGroupShape.h', @@ -56,7 +55,6 @@ '../src/effects/SkCornerPathEffect.cpp', '../src/effects/SkDashPathEffect.cpp', '../src/effects/SkDiscretePathEffect.cpp', - '../src/effects/SkEffects.cpp', '../src/effects/SkEmbossMask.cpp', '../src/effects/SkEmbossMask.h', '../src/effects/SkEmbossMask_Table.h', -- cgit v1.2.3 From 697df83475d51338c4f74fdebdce236888600e42 Mon Sep 17 00:00:00 2001 From: "djsollen@google.com" Date: Fri, 23 Mar 2012 19:36:53 +0000 Subject: Fix android build git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@3484 2bbb7eff-a529-9590-31e7-b0007b416f81 --- tools.gyp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tools.gyp b/tools.gyp index 6175eee..349b0e0 100644 --- a/tools.gyp +++ b/tools.gyp @@ -24,11 +24,11 @@ 'target_name': 'skdiff', 'type': 'executable', 'sources': [ - '../src/effects/SkEffects_none.cpp', '../tools/skdiff_main.cpp', ], 'dependencies': [ 'core.gyp:core', + 'effects.gyp:effects', 'images.gyp:images', 'ports.gyp:ports', 'utils.gyp:utils', @@ -38,11 +38,11 @@ 'target_name': 'skhello', 'type': 'executable', 'sources': [ - '../src/effects/SkEffects_none.cpp', '../tools/skhello.cpp', ], 'dependencies': [ 'core.gyp:core', + 'effects.gyp:effects', 'images.gyp:images', 'ports.gyp:ports', 'utils.gyp:utils', @@ -52,11 +52,11 @@ 'target_name': 'skimage', 'type': 'executable', 'sources': [ - '../src/effects/SkEffects_none.cpp', '../tools/skimage_main.cpp', ], 'dependencies': [ 'core.gyp:core', + 'effects.gyp:effects', 'images.gyp:images', 'ports.gyp:ports', 'utils.gyp:utils', -- cgit v1.2.3 From a8ce59041d437924bf143763759a63f6063c2eaf Mon Sep 17 00:00:00 2001 From: "epoger@google.com" Date: Mon, 26 Mar 2012 18:29:26 +0000 Subject: Copy libjpeg.gyp from third_party/externals/libjpeg/ to gyp/ This should get our use of libjpeg-from-source unblocked; see http://code.google.com/p/skia/issues/detail?id=543 ('wrap libjpeg.gyp from Chrome's libjpeg port, rather than making our own copy') for a better long-term solution. Review URL: https://codereview.appspot.com/5908058 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@3496 2bbb7eff-a529-9590-31e7-b0007b416f81 --- images.gyp | 1 + libjpeg.gyp | 115 ++++++++++++++++++++++++++++++++++++++++++++++++++++++------ 2 files changed, 106 insertions(+), 10 deletions(-) diff --git a/images.gyp b/images.gyp index a93ba06..f6efa49 100644 --- a/images.gyp +++ b/images.gyp @@ -4,6 +4,7 @@ 'target_name': 'images', 'type': 'static_library', 'dependencies': [ + 'libjpeg.gyp:libjpeg', 'utils.gyp:utils', ], 'include_dirs': [ diff --git a/libjpeg.gyp b/libjpeg.gyp index 4826f48..4480d51 100644 --- a/libjpeg.gyp +++ b/libjpeg.gyp @@ -1,19 +1,114 @@ -# Copyright 2012 The Android Open Source Project -# +# Copyright 2012 The Chromium Authors. All rights reserved. # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. -# Depend on this wrapper to pick up libjpeg from third_party +# This is a copy of ../third_party/externals/libjpeg/libjpeg.gyp , modified +# such that all source paths point into that directory. +# See http://code.google.com/p/skia/issues/detail?id=543 ('wrap libjpeg.gyp +# from Chrome's libjpeg port, rather than making our own copy') for a better +# long-term solution. { - 'targets': [ - { - 'target_name': 'libjpeg', - 'type': 'none', - 'dependencies': [ - '../third_party/externals/libjpeg/libjpeg.gyp:libjpeg', + 'variables': { + 'conditions': [ + [ 'os_posix == 1 and OS != "mac"', { + # Link to system .so since we already use it due to GTK. + 'use_system_libjpeg%': 1, + }, { # os_posix != 1 or OS == "mac" + 'use_system_libjpeg%': 0, + }], + ], + }, + 'conditions': [ + ['use_system_libjpeg==0', { + 'targets': [ + { + 'target_name': 'libjpeg', + 'type': 'static_library', + 'sources': [ + '../third_party/externals/libjpeg/jcapimin.c', + '../third_party/externals/libjpeg/jcapistd.c', + '../third_party/externals/libjpeg/jccoefct.c', + '../third_party/externals/libjpeg/jccolor.c', + '../third_party/externals/libjpeg/jcdctmgr.c', + '../third_party/externals/libjpeg/jchuff.c', + '../third_party/externals/libjpeg/jchuff.h', + '../third_party/externals/libjpeg/jcinit.c', + '../third_party/externals/libjpeg/jcmainct.c', + '../third_party/externals/libjpeg/jcmarker.c', + '../third_party/externals/libjpeg/jcmaster.c', + '../third_party/externals/libjpeg/jcomapi.c', + '../third_party/externals/libjpeg/jconfig.h', + '../third_party/externals/libjpeg/jcparam.c', + '../third_party/externals/libjpeg/jcphuff.c', + '../third_party/externals/libjpeg/jcprepct.c', + '../third_party/externals/libjpeg/jcsample.c', + '../third_party/externals/libjpeg/jdapimin.c', + '../third_party/externals/libjpeg/jdapistd.c', + '../third_party/externals/libjpeg/jdatadst.c', + '../third_party/externals/libjpeg/jdatasrc.c', + '../third_party/externals/libjpeg/jdcoefct.c', + '../third_party/externals/libjpeg/jdcolor.c', + '../third_party/externals/libjpeg/jdct.h', + '../third_party/externals/libjpeg/jddctmgr.c', + '../third_party/externals/libjpeg/jdhuff.c', + '../third_party/externals/libjpeg/jdhuff.h', + '../third_party/externals/libjpeg/jdinput.c', + '../third_party/externals/libjpeg/jdmainct.c', + '../third_party/externals/libjpeg/jdmarker.c', + '../third_party/externals/libjpeg/jdmaster.c', + '../third_party/externals/libjpeg/jdmerge.c', + '../third_party/externals/libjpeg/jdphuff.c', + '../third_party/externals/libjpeg/jdpostct.c', + '../third_party/externals/libjpeg/jdsample.c', + '../third_party/externals/libjpeg/jerror.c', + '../third_party/externals/libjpeg/jerror.h', + '../third_party/externals/libjpeg/jfdctflt.c', + '../third_party/externals/libjpeg/jfdctfst.c', + '../third_party/externals/libjpeg/jfdctint.c', + '../third_party/externals/libjpeg/jidctflt.c', + '../third_party/externals/libjpeg/jidctfst.c', + '../third_party/externals/libjpeg/jidctint.c', + '../third_party/externals/libjpeg/jinclude.h', + '../third_party/externals/libjpeg/jmemmgr.c', + '../third_party/externals/libjpeg/jmemnobs.c', + '../third_party/externals/libjpeg/jmemsys.h', + '../third_party/externals/libjpeg/jmorecfg.h', + '../third_party/externals/libjpeg/jpegint.h', + '../third_party/externals/libjpeg/jpeglib.h', + '../third_party/externals/libjpeg/jquant1.c', + '../third_party/externals/libjpeg/jquant2.c', + '../third_party/externals/libjpeg/jutils.c', + '../third_party/externals/libjpeg/jversion.h', + ], + 'direct_dependent_settings': { + 'include_dirs': [ + '.', + ], + }, + 'conditions': [ + ['OS!="win"', {'product_name': 'jpeg'}], + ], + }, ], - }, + }, { + 'targets': [ + { + 'target_name': 'libjpeg', + 'type': 'none', + 'direct_dependent_settings': { + 'defines': [ + 'USE_SYSTEM_LIBJPEG', + ], + }, + 'link_settings': { + 'libraries': [ + '-ljpeg', + ], + }, + } + ], + }], ], } -- cgit v1.2.3 From 3ae6480becb9076e9abff5fd77ab9262ea25839f Mon Sep 17 00:00:00 2001 From: "epoger@google.com" Date: Mon, 26 Mar 2012 20:04:54 +0000 Subject: Build libjpeg from source for all platforms (We were already doing so on Mac and Windows.) Review URL: https://codereview.appspot.com/5909067 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@3497 2bbb7eff-a529-9590-31e7-b0007b416f81 --- libjpeg.gyp | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/libjpeg.gyp b/libjpeg.gyp index 4480d51..b7ce7a8 100644 --- a/libjpeg.gyp +++ b/libjpeg.gyp @@ -10,14 +10,7 @@ { 'variables': { - 'conditions': [ - [ 'os_posix == 1 and OS != "mac"', { - # Link to system .so since we already use it due to GTK. - 'use_system_libjpeg%': 1, - }, { # os_posix != 1 or OS == "mac" - 'use_system_libjpeg%': 0, - }], - ], + 'use_system_libjpeg%': 0, }, 'conditions': [ ['use_system_libjpeg==0', { -- cgit v1.2.3 From 343e5ce43b5eff50089b101879613c1ffc264fc7 Mon Sep 17 00:00:00 2001 From: "caryclark@google.com" Date: Tue, 27 Mar 2012 13:27:36 +0000 Subject: Files to build Cary's Shape Ops test projects. These will be moved to experimental/Intersection later. git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@3501 2bbb7eff-a529-9590-31e7-b0007b416f81 --- shapeops_demo.gyp | 86 +++++++++++++++++++++++++++++++++++++++++++++++++++++ shapeops_edge.gyp | 88 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 174 insertions(+) create mode 100644 shapeops_demo.gyp create mode 100644 shapeops_edge.gyp diff --git a/shapeops_demo.gyp b/shapeops_demo.gyp new file mode 100644 index 0000000..f004850 --- /dev/null +++ b/shapeops_demo.gyp @@ -0,0 +1,86 @@ + +{ + 'includes': [ + 'common.gypi', + ], + 'targets': [ + { + 'target_name': 'shapeops_demo', + 'type': 'executable', + 'mac_bundle' : 1, + 'include_dirs' : [ + '../experimental/SimpleCocoaApp', # needed to get SimpleApp.h + ], + 'sources': [ + '../experimental/Intersection/DataTypes.cpp', + '../experimental/Intersection/EdgeWalker.cpp', + '../experimental/Intersection/EdgeWalker_TestUtility.cpp', + '../experimental/Intersection/LineIntersection.cpp', + '../experimental/Intersection/LineParameterization.cpp', + '../experimental/Intersection/LineUtilities.cpp', + '../experimental/Intersection/EdgeDemoApp.mm', + ], + 'dependencies': [ + 'core.gyp:core', + 'effects.gyp:effects', + 'images.gyp:images', + 'ports.gyp:ports', + 'views.gyp:views', + 'utils.gyp:utils', + 'animator.gyp:animator', + 'xml.gyp:xml', + 'svg.gyp:svg', + 'experimental.gyp:experimental', + 'gpu.gyp:gr', + 'gpu.gyp:skgr', + 'pdf.gyp:pdf', + ], + 'conditions' : [ + [ 'skia_os in ["linux", "freebsd", "openbsd", "solaris"]', { + }], + [ 'skia_os == "win"', { + }], + [ 'skia_os == "mac"', { + 'sources': [ + + # Mac files + '../src/utils/mac/SkEventNotifier.h', + '../src/utils/mac/SkEventNotifier.mm', + '../src/utils/mac/skia_mac.mm', + '../src/utils/mac/SkNSView.h', + '../src/utils/mac/SkNSView.mm', + '../src/utils/mac/SkOptionsTableView.h', + '../src/utils/mac/SkOptionsTableView.mm', + '../src/utils/mac/SkOSWindow_Mac.mm', + '../src/utils/mac/SkTextFieldCell.h', + '../src/utils/mac/SkTextFieldCell.m', + ], + 'libraries': [ + '$(SDKROOT)/System/Library/Frameworks/QuartzCore.framework', + '$(SDKROOT)/System/Library/Frameworks/OpenGL.framework', + ], + 'xcode_settings' : { + 'INFOPLIST_FILE' : '../experimental/Intersection/EdgeDemoApp-Info.plist', + }, + 'mac_bundle_resources' : [ + '../experimental/Intersection/EdgeDemoApp.xib', + ], + }], + ], + 'msvs_settings': { + 'VCLinkerTool': { + 'SubSystem': '2', + 'AdditionalDependencies': [ + 'd3d9.lib', + ], + }, + }, + }, + ], +} + +# Local Variables: +# tab-width:2 +# indent-tabs-mode:nil +# End: +# vim: set expandtab tabstop=2 shiftwidth=2: diff --git a/shapeops_edge.gyp b/shapeops_edge.gyp new file mode 100644 index 0000000..58f5052 --- /dev/null +++ b/shapeops_edge.gyp @@ -0,0 +1,88 @@ +# GYP file to build unit tests. +{ + 'includes': [ + 'apptype_console.gypi', + 'common.gypi', + ], + 'targets': [ + { + 'target_name': 'edge', + 'type': 'executable', + 'include_dirs' : [ + '../src/core', + '../src/gpu', + ], + 'sources': [ + '../experimental/Intersection/ActiveEdge_Test.cpp', + '../experimental/Intersection/ConvexHull.cpp', + '../experimental/Intersection/ConvexHull_Test.cpp', + '../experimental/Intersection/CubeRoot.cpp', + '../experimental/Intersection/CubicBezierClip.cpp', + '../experimental/Intersection/CubicBezierClip_Test.cpp', + '../experimental/Intersection/CubicBounds.cpp', + '../experimental/Intersection/CubicIntersection.cpp', + '../experimental/Intersection/CubicIntersection_Test.cpp', + '../experimental/Intersection/CubicIntersection_TestData.cpp', + '../experimental/Intersection/CubicParameterization.cpp', + '../experimental/Intersection/CubicParameterization_Test.cpp', + '../experimental/Intersection/CubicParameterizationCode.cpp', + '../experimental/Intersection/CubicReduceOrder.cpp', + '../experimental/Intersection/CubicReduceOrder_Test.cpp', + '../experimental/Intersection/CubicSubDivide.cpp', + '../experimental/Intersection/CubicUtilities.cpp', + '../experimental/Intersection/DataTypes.cpp', + '../experimental/Intersection/EdgeMain.cpp', + '../experimental/Intersection/EdgeWalker.cpp', + '../experimental/Intersection/EdgeWalker_TestUtility.cpp', + '../experimental/Intersection/EdgeWalkerPolygon4x4_Test.cpp', + '../experimental/Intersection/EdgeWalkerPolygons_Mismatches.cpp', + '../experimental/Intersection/EdgeWalkerPolygons_Test.cpp', + '../experimental/Intersection/EdgeWalkerQuadralaterals_Test.cpp', + '../experimental/Intersection/EdgeWalkerRectangles_Test.cpp', + '../experimental/Intersection/Extrema.cpp', + '../experimental/Intersection/Inline_Tests.cpp', + '../experimental/Intersection/Intersection_Tests.cpp', + '../experimental/Intersection/IntersectionUtilities.cpp', + '../experimental/Intersection/LineCubicIntersection.cpp', + '../experimental/Intersection/LineCubicIntersection_Test.cpp', + '../experimental/Intersection/LineIntersection.cpp', + '../experimental/Intersection/LineIntersection_Test.cpp', + '../experimental/Intersection/LineParameterization.cpp', + '../experimental/Intersection/LineParameteters_Test.cpp', + '../experimental/Intersection/LineQuadraticIntersection.cpp', + '../experimental/Intersection/LineQuadraticIntersection_Test.cpp', + '../experimental/Intersection/LineUtilities.cpp', + '../experimental/Intersection/QuadraticBezierClip.cpp', + '../experimental/Intersection/QuadraticBezierClip_Test.cpp', + '../experimental/Intersection/QuadraticIntersection.cpp', + '../experimental/Intersection/QuadraticIntersection_Test.cpp', + '../experimental/Intersection/QuadraticIntersection_TestData.cpp', + '../experimental/Intersection/QuadraticParameterization.cpp', + '../experimental/Intersection/QuadraticParameterization_Test.cpp', + '../experimental/Intersection/QuadraticReduceOrder.cpp', + '../experimental/Intersection/QuadraticReduceOrder_Test.cpp', + '../experimental/Intersection/QuadraticSubDivide.cpp', + '../experimental/Intersection/QuadraticUtilities.cpp', + '../experimental/Intersection/RectUtilities.cpp', + '../experimental/Intersection/TestUtilities.cpp', + ], + 'dependencies': [ + 'core.gyp:core', + 'effects.gyp:effects', + 'experimental.gyp:experimental', + 'gpu.gyp:gr', + 'gpu.gyp:skgr', + 'images.gyp:images', + 'ports.gyp:ports', + 'pdf.gyp:pdf', + 'utils.gyp:utils', + ], + }, + ], +} + +# Local Variables: +# tab-width:2 +# indent-tabs-mode:nil +# End: +# vim: set expandtab tabstop=2 shiftwidth=2: -- cgit v1.2.3 From a949f06f745c04b9ce5d0a1f7a6c27154756c23c Mon Sep 17 00:00:00 2001 From: "bsalomon@google.com" Date: Wed, 28 Mar 2012 14:44:37 +0000 Subject: disable GPU blur on small paths Change originally by Guanqun.Lu@gmail.com with minor edits and sample added by me COULD POSSIBLY CHANGE GPU RESULTS OF GM SLIDES WITH BLUR, WILL REBASILINE IF SO. Review URL: https://codereview.appspot.com/5940045/ git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@3514 2bbb7eff-a529-9590-31e7-b0007b416f81 --- SampleApp.gyp | 1 + 1 file changed, 1 insertion(+) diff --git a/SampleApp.gyp b/SampleApp.gyp index bdd46ed..3d79c3d 100644 --- a/SampleApp.gyp +++ b/SampleApp.gyp @@ -28,6 +28,7 @@ '../samplecode/SampleAARectModes.cpp', '../samplecode/SampleAll.cpp', '../samplecode/SampleAnimator.cpp', + '../samplecode/SampleAnimBlur.cpp', '../samplecode/SampleApp.cpp', '../samplecode/SampleArc.cpp', '../samplecode/SampleAvoid.cpp', -- cgit v1.2.3 From b8b85a559b5e00a2508f03c6c872d8f906dc7240 Mon Sep 17 00:00:00 2001 From: "caryclark@google.com" Date: Wed, 28 Mar 2012 16:20:21 +0000 Subject: first support at shape ops support for quads git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@3520 2bbb7eff-a529-9590-31e7-b0007b416f81 --- shapeops_demo.gyp | 52 +++++++++++++++++++++++++++++++++++++++++----------- shapeops_edge.gyp | 22 ++++++++++++++++++++++ 2 files changed, 63 insertions(+), 11 deletions(-) diff --git a/shapeops_demo.gyp b/shapeops_demo.gyp index f004850..f3a8b42 100644 --- a/shapeops_demo.gyp +++ b/shapeops_demo.gyp @@ -12,13 +12,43 @@ '../experimental/SimpleCocoaApp', # needed to get SimpleApp.h ], 'sources': [ + '../experimental/Intersection/ConvexHull.cpp', + '../experimental/Intersection/CubeRoot.cpp', + '../experimental/Intersection/CubicBezierClip.cpp', + '../experimental/Intersection/CubicIntersection.cpp', + '../experimental/Intersection/CubicReduceOrder.cpp', + '../experimental/Intersection/CubicSubDivide.cpp', + '../experimental/Intersection/CubicUtilities.cpp', '../experimental/Intersection/DataTypes.cpp', + '../experimental/Intersection/EdgeDemo.cpp', + '../experimental/Intersection/EdgeDemoApp.mm', '../experimental/Intersection/EdgeWalker.cpp', '../experimental/Intersection/EdgeWalker_TestUtility.cpp', + '../experimental/Intersection/Extrema.cpp', + '../experimental/Intersection/LineCubicIntersection.cpp '../experimental/Intersection/LineIntersection.cpp', '../experimental/Intersection/LineParameterization.cpp', + '../experimental/Intersection/LineQuadraticIntersection.cpp', '../experimental/Intersection/LineUtilities.cpp', - '../experimental/Intersection/EdgeDemoApp.mm', + '../experimental/Intersection/QuadraticBezierClip.cpp', + '../experimental/Intersection/QuadraticIntersection.cpp', + '../experimental/Intersection/QuadraticReduceOrder.cpp', + '../experimental/Intersection/QuadraticSubDivide.cpp', + '../experimental/Intersection/QuadraticUtilities.cpp', + '../experimental/Intersection/CubicIntersection.h', + '../experimental/Intersection/CubicUtilities.h', + '../experimental/Intersection/CurveIntersection.h', + '../experimental/Intersection/DataTypes.h', + '../experimental/Intersection/EdgeDemo.h', + '../experimental/Intersection/Extrema.h', + '../experimental/Intersection/Intersections.h', + '../experimental/Intersection/IntersectionUtilities.h', + '../experimental/Intersection/LineIntersection.h', + '../experimental/Intersection/LineParameters.h', + '../experimental/Intersection/LineUtilities.h', + '../experimental/Intersection/QuadraticUtilities.h', + '../experimental/Intersection/ShapeOps.h', + '../experimental/Intersection/TSearch.h', ], 'dependencies': [ 'core.gyp:core', @@ -44,16 +74,16 @@ 'sources': [ # Mac files - '../src/utils/mac/SkEventNotifier.h', - '../src/utils/mac/SkEventNotifier.mm', - '../src/utils/mac/skia_mac.mm', - '../src/utils/mac/SkNSView.h', - '../src/utils/mac/SkNSView.mm', - '../src/utils/mac/SkOptionsTableView.h', - '../src/utils/mac/SkOptionsTableView.mm', - '../src/utils/mac/SkOSWindow_Mac.mm', - '../src/utils/mac/SkTextFieldCell.h', - '../src/utils/mac/SkTextFieldCell.m', + '../src/views/mac/SkEventNotifier.h', + '../src/views/mac/SkEventNotifier.mm', + '../src/views/mac/skia_mac.mm', + '../src/views/mac/SkNSView.h', + '../src/views/mac/SkNSView.mm', + '../src/views/mac/SkOptionsTableView.h', + '../src/views/mac/SkOptionsTableView.mm', + '../src/views/mac/SkOSWindow_Mac.mm', + '../src/views/mac/SkTextFieldCell.h', + '../src/views/mac/SkTextFieldCell.m', ], 'libraries': [ '$(SDKROOT)/System/Library/Frameworks/QuartzCore.framework', diff --git a/shapeops_edge.gyp b/shapeops_edge.gyp index 58f5052..b5c9d16 100644 --- a/shapeops_edge.gyp +++ b/shapeops_edge.gyp @@ -38,6 +38,7 @@ '../experimental/Intersection/EdgeWalkerPolygons_Mismatches.cpp', '../experimental/Intersection/EdgeWalkerPolygons_Test.cpp', '../experimental/Intersection/EdgeWalkerQuadralaterals_Test.cpp', + '../experimental/Intersection/EdgeWalkerQuadratics_Test.cpp', '../experimental/Intersection/EdgeWalkerRectangles_Test.cpp', '../experimental/Intersection/Extrema.cpp', '../experimental/Intersection/Inline_Tests.cpp', @@ -65,6 +66,27 @@ '../experimental/Intersection/QuadraticUtilities.cpp', '../experimental/Intersection/RectUtilities.cpp', '../experimental/Intersection/TestUtilities.cpp', + '../experimental/Intersection/CubicIntersection.h', + '../experimental/Intersection/CubicIntersection_TestData.h', + '../experimental/Intersection/CubicUtilities.h', + '../experimental/Intersection/CurveIntersection.h', + '../experimental/Intersection/DataTypes.h', + '../experimental/Intersection/EdgeMain.h', + '../experimental/Intersection/EdgeWalker_Test.h', + '../experimental/Intersection/EdgeWalkerPolygons_Mismatches.h', + '../experimental/Intersection/Extrema.h', + '../experimental/Intersection/Intersection_Tests.h', + '../experimental/Intersection/Intersections.h', + '../experimental/Intersection/IntersectionUtilities.h', + '../experimental/Intersection/LineIntersection.h', + '../experimental/Intersection/LineParameters.h', + '../experimental/Intersection/LineUtilities.h', + '../experimental/Intersection/Parameterization_Test.h', + '../experimental/Intersection/QuadraticIntersection_TestData.h', + '../experimental/Intersection/QuadraticUtilities.h', + '../experimental/Intersection/ShapeOps.h', + '../experimental/Intersection/TestUtilities.h', + '../experimental/Intersection/TSearch.h', ], 'dependencies': [ 'core.gyp:core', -- cgit v1.2.3 From 86fa412d823cf77eea39e94bc6f3bc3bde6fc825 Mon Sep 17 00:00:00 2001 From: "caryclark@google.com" Date: Wed, 28 Mar 2012 17:04:08 +0000 Subject: shape ops builders; fix typo git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@3521 2bbb7eff-a529-9590-31e7-b0007b416f81 --- shapeops_demo.gyp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/shapeops_demo.gyp b/shapeops_demo.gyp index f3a8b42..038b282 100644 --- a/shapeops_demo.gyp +++ b/shapeops_demo.gyp @@ -25,7 +25,7 @@ '../experimental/Intersection/EdgeWalker.cpp', '../experimental/Intersection/EdgeWalker_TestUtility.cpp', '../experimental/Intersection/Extrema.cpp', - '../experimental/Intersection/LineCubicIntersection.cpp + '../experimental/Intersection/LineCubicIntersection.cpp', '../experimental/Intersection/LineIntersection.cpp', '../experimental/Intersection/LineParameterization.cpp', '../experimental/Intersection/LineQuadraticIntersection.cpp', -- cgit v1.2.3 From df20215f53bf759ee5cd5ceed9f30c6480b68176 Mon Sep 17 00:00:00 2001 From: "robertphillips@google.com" Date: Wed, 28 Mar 2012 18:22:01 +0000 Subject: Moved Debug GL interface to src/gpu/gl/debug in preparation for splitting it up. http://codereview.appspot.com/5938054/ git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@3526 2bbb7eff-a529-9590-31e7-b0007b416f81 --- gpu.gyp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/gpu.gyp b/gpu.gyp index db506d7..416d0e3 100644 --- a/gpu.gyp +++ b/gpu.gyp @@ -112,7 +112,8 @@ '../src/gpu/gl/SkGLContext.cpp', '../src/gpu/gl/SkNullGLContext.cpp', - '../src/gpu/gl/SkDebugGLContext.cpp', + + '../src/gpu/gl/debug/SkDebugGLContext.cpp', '../src/gpu/android/SkNativeGLContext_android.cpp', @@ -253,7 +254,6 @@ '../src/gpu/gl/GrGLContextInfo.h', '../src/gpu/gl/GrGLCreateNativeInterface_none.cpp', '../src/gpu/gl/GrGLCreateNullInterface.cpp', - '../src/gpu/gl/GrGLCreateDebugInterface.cpp', '../src/gpu/gl/GrGLDefaultInterface_none.cpp', '../src/gpu/gl/GrGLDefaultInterface_native.cpp', '../src/gpu/gl/GrGLIndexBuffer.cpp', @@ -279,6 +279,8 @@ '../src/gpu/gl/GrGpuGLShaders.cpp', '../src/gpu/gl/GrGpuGLShaders.h', + '../src/gpu/gl/debug/GrGLCreateDebugInterface.cpp', + '../src/gpu/mac/GrGLCreateNativeInterface_mac.cpp', '../src/gpu/win/GrGLCreateNativeInterface_win.cpp', -- cgit v1.2.3 From cf4ff2a52c0742cc3a2ea9397cc3de38c5aa91ed Mon Sep 17 00:00:00 2001 From: "djsollen@google.com" Date: Wed, 28 Mar 2012 19:36:39 +0000 Subject: Remove unused classes from the build. Review URL: https://codereview.appspot.com/5938053 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@3529 2bbb7eff-a529-9590-31e7-b0007b416f81 --- images.gyp | 2 -- 1 file changed, 2 deletions(-) diff --git a/images.gyp b/images.gyp index f6efa49..a4bdcd0 100644 --- a/images.gyp +++ b/images.gyp @@ -24,8 +24,6 @@ '../src/images/bmpdecoderhelper.cpp', '../src/images/bmpdecoderhelper.h', - '../src/images/SkBitmap_RLEPixels.h', - '../src/images/SkCreateRLEPixelRef.cpp', '../src/images/SkFDStream.cpp', '../src/images/SkFlipPixelRef.cpp', '../src/images/SkImageDecoder.cpp', -- cgit v1.2.3 From 89782a9b6fdd9c681f37ad00d1be8abdaaab1bac Mon Sep 17 00:00:00 2001 From: "robertphillips@google.com" Date: Wed, 28 Mar 2012 19:37:51 +0000 Subject: Moved mac, unix, win and mesa directories under src/gpu/gl http://codereview.appspot.com/5937052/ git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@3530 2bbb7eff-a529-9590-31e7-b0007b416f81 --- gpu.gyp | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/gpu.gyp b/gpu.gyp index 416d0e3..fb5dff3 100644 --- a/gpu.gyp +++ b/gpu.gyp @@ -115,20 +115,20 @@ '../src/gpu/gl/debug/SkDebugGLContext.cpp', - '../src/gpu/android/SkNativeGLContext_android.cpp', + '../src/gpu/gl/mac/SkNativeGLContext_mac.cpp', - '../src/gpu/mac/SkNativeGLContext_mac.cpp', + '../src/gpu/gl/win/SkNativeGLContext_win.cpp', - '../src/gpu/win/SkNativeGLContext_win.cpp', + '../src/gpu/gl/unix/SkNativeGLContext_unix.cpp', - '../src/gpu/unix/SkNativeGLContext_unix.cpp', + '../src/gpu/gl/mesa/SkMesaGLContext.cpp', - '../src/gpu/mesa/SkMesaGLContext.cpp', + '../src/gpu/android/SkNativeGLContext_android.cpp', ], 'conditions': [ [ 'not skia_mesa', { 'sources!': [ - '../src/gpu/mesa/SkMesaGLContext.cpp', + '../src/gpu/gl/mesa/SkMesaGLContext.cpp', ], }], [ 'skia_mesa and skia_os == "mac"', { @@ -281,15 +281,15 @@ '../src/gpu/gl/debug/GrGLCreateDebugInterface.cpp', - '../src/gpu/mac/GrGLCreateNativeInterface_mac.cpp', + '../src/gpu/gl/mac/GrGLCreateNativeInterface_mac.cpp', - '../src/gpu/win/GrGLCreateNativeInterface_win.cpp', + '../src/gpu/gl/win/GrGLCreateNativeInterface_win.cpp', - '../src/gpu/unix/GrGLCreateNativeInterface_unix.cpp', + '../src/gpu/gl/unix/GrGLCreateNativeInterface_unix.cpp', - '../src/gpu/android/GrGLCreateNativeInterface_android.cpp', + '../src/gpu/gl/mesa/GrGLCreateMesaInterface.cpp', - '../src/gpu/mesa/GrGLCreateMesaInterface.cpp', + '../src/gpu/android/GrGLCreateNativeInterface_android.cpp', ], 'defines': [ 'GR_IMPLEMENTATION=1', @@ -337,7 +337,7 @@ }], [ 'not skia_mesa', { 'sources!': [ - '../src/gpu/mesa/GrGLCreateMesaInterface.cpp', + '../src/gpu/gl/mesa/GrGLCreateMesaInterface.cpp', ], }], [ 'skia_os == "win"', { -- cgit v1.2.3 From 0b2caab3d70b9fec3e66b04206a737b5a3df4d32 Mon Sep 17 00:00:00 2001 From: "bungeman@google.com" Date: Wed, 28 Mar 2012 20:01:06 +0000 Subject: Move SkTextBox.h from utils to views. git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@3531 2bbb7eff-a529-9590-31e7-b0007b416f81 --- utils.gyp | 1 - views.gyp | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/utils.gyp b/utils.gyp index e30b433..4859360 100644 --- a/utils.gyp +++ b/utils.gyp @@ -31,7 +31,6 @@ '../include/utils/SkParsePath.h', '../include/utils/SkProxyCanvas.h', '../include/utils/SkSfntUtils.h', - '../include/utils/SkTextBox.h', '../include/utils/SkUnitMappers.h', '../include/utils/SkWGL.h', diff --git a/views.gyp b/views.gyp index f663f12..7998cd7 100644 --- a/views.gyp +++ b/views.gyp @@ -37,6 +37,7 @@ '../include/views/SkScrollBarView.h', '../include/views/SkStackViewLayout.h', '../include/views/SkSystemEventTypes.h', + '../include/views/SkTextBox.h', '../include/views/SkTouchGesture.h', '../include/views/SkView.h', '../include/views/SkViewInflate.h', -- cgit v1.2.3 From c2c8d812d161a55c83eee505c572ab3797f3a7d3 Mon Sep 17 00:00:00 2001 From: "bungeman@google.com" Date: Wed, 28 Mar 2012 21:14:17 +0000 Subject: Move SkColorMatrix to effects. git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@3535 2bbb7eff-a529-9590-31e7-b0007b416f81 --- effects.gyp | 1 + utils.gyp | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/effects.gyp b/effects.gyp index 3975965..394ec30 100644 --- a/effects.gyp +++ b/effects.gyp @@ -51,6 +51,7 @@ '../src/effects/SkClampRange.cpp', '../src/effects/SkClampRange.h', '../src/effects/SkColorFilters.cpp', + '../src/effects/SkColorMatrix.cpp', '../src/effects/SkColorMatrixFilter.cpp', '../src/effects/SkCornerPathEffect.cpp', '../src/effects/SkDashPathEffect.cpp', diff --git a/utils.gyp b/utils.gyp index 4859360..2fca63f 100644 --- a/utils.gyp +++ b/utils.gyp @@ -40,7 +40,6 @@ '../src/utils/SkBitSet.h', '../src/utils/SkBoundaryPatch.cpp', '../src/utils/SkCamera.cpp', - '../src/utils/SkColorMatrix.cpp', '../src/utils/SkCubicInterval.cpp', '../src/utils/SkCullPoints.cpp', '../src/utils/SkDeferredCanvas.cpp', -- cgit v1.2.3 From 404b9f781687d683c570b19b47f3445a80a16dee Mon Sep 17 00:00:00 2001 From: "bungeman@google.com" Date: Thu, 29 Mar 2012 14:28:59 +0000 Subject: Correct dependencies in gyp files. http://codereview.appspot.com/5934044/ git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@3538 2bbb7eff-a529-9590-31e7-b0007b416f81 --- animator.gyp | 16 +++++++++------- core.gyp | 7 ++++--- effects.gyp | 6 ++++-- experimental.gyp | 6 +++--- gpu.gyp | 9 +++++++-- images.gyp | 4 ++-- opts.gyp | 13 +++++++++++++ ports.gyp | 13 ++++++++++--- utils.gyp | 8 ++++---- views.gyp | 14 ++++++++------ views_animated.gyp | 17 ++++++++--------- xml.gyp | 8 +++++--- 12 files changed, 77 insertions(+), 44 deletions(-) diff --git a/animator.gyp b/animator.gyp index b3c651c..ad3edf3 100644 --- a/animator.gyp +++ b/animator.gyp @@ -7,15 +7,17 @@ { 'target_name': 'animator', 'type': 'static_library', + 'dependencies': [ + 'core.gyp:core', + 'effects.gyp:effects', + 'images.gyp:images', + 'ports.gyp:ports', + 'utils.gyp:utils', + 'views.gyp:views', + 'xml.gyp:xml', + ], 'include_dirs': [ - '../include/config', - '../include/core', - '../include/effects', '../include/animator', - '../include/views', - '../include/xml', - '../include/utils', - '../include/images', '../src/utils', ], 'sources': [ diff --git a/core.gyp b/core.gyp index c60059e..08aa7e5 100644 --- a/core.gyp +++ b/core.gyp @@ -5,6 +5,10 @@ 'target_name': 'core', 'type': 'static_library', 'msvs_guid': 'B7760B5E-BFA8-486B-ACFD-49E3A6DE8E76', + 'dependencies': [ + 'opts.gyp:opts', + 'ports.gyp:ports', + ], 'sources': [ '../src/core/ARGB32_Clamp_Bilinear_BitmapShader.h', '../src/core/Sk64.cpp', @@ -310,9 +314,6 @@ 'ext', ], }, - 'dependencies': [ - 'opts.gyp:opts' - ], }, ], } diff --git a/effects.gyp b/effects.gyp index 394ec30..3078523 100644 --- a/effects.gyp +++ b/effects.gyp @@ -3,9 +3,11 @@ { 'target_name': 'effects', 'type': 'static_library', + 'dependencies': [ + 'core.gyp:core', + 'ports.gyp:ports', + ], 'include_dirs': [ - '../include/config', - '../include/core', '../include/effects', ], 'sources': [ diff --git a/experimental.gyp b/experimental.gyp index 09711ac..8c976dd 100644 --- a/experimental.gyp +++ b/experimental.gyp @@ -3,9 +3,9 @@ { 'target_name': 'experimental', 'type': 'static_library', - 'include_dirs': [ - '../include/config', - '../include/core', + 'dependencies': [ + 'core.gyp:core', + 'ports.gyp:ports', ], 'sources': [ '../experimental/SkSetPoly3To3.cpp', diff --git a/gpu.gyp b/gpu.gyp index fb5dff3..1ac07aa 100644 --- a/gpu.gyp +++ b/gpu.gyp @@ -86,9 +86,12 @@ { 'target_name': 'skgr', 'type': 'static_library', + 'dependencies': [ + 'core.gyp:core', + 'gpu.gyp:gr', + 'ports.gyp:ports', + ], 'include_dirs': [ - '../include/config', - '../include/core', '../src/core', '../include/gpu', ], @@ -148,7 +151,9 @@ '../src/core', # SkRasterClip.h ], 'dependencies': [ + 'core.gyp:core', 'libtess.gyp:libtess', + 'ports.gyp:ports', ], 'sources': [ '../include/gpu/GrClip.h', diff --git a/images.gyp b/images.gyp index a4bdcd0..5ccad8b 100644 --- a/images.gyp +++ b/images.gyp @@ -4,12 +4,12 @@ 'target_name': 'images', 'type': 'static_library', 'dependencies': [ + 'core.gyp:core', 'libjpeg.gyp:libjpeg', + 'ports.gyp:ports', 'utils.gyp:utils', ], 'include_dirs': [ - '../include/config', - '../include/core', '../include/images', ], 'sources': [ diff --git a/opts.gyp b/opts.gyp index cf8e6dd..c3e2516 100644 --- a/opts.gyp +++ b/opts.gyp @@ -21,9 +21,16 @@ { 'target_name': 'opts', 'type': 'static_library', + 'dependencies': [ + #opts depends on core, but core also depends on opts. + #'core.gyp:core', + 'opts.gyp:opts_ssse3', + 'ports.gyp:ports', + ], 'include_dirs': [ '../include/config', '../include/core', + '../src/core', '../src/opts', ], @@ -81,9 +88,15 @@ { 'target_name': 'opts_ssse3', 'type': 'static_library', + 'dependencies': [ + #opts_ssse3 depends on core, but core also depends on opts_ssse3. + #'core.gyp:core', + 'ports.gyp:ports', + ], 'include_dirs': [ '../include/config', '../include/core', + '../src/core', ], 'conditions': [ diff --git a/ports.gyp b/ports.gyp index 73dd594..341c2cf 100644 --- a/ports.gyp +++ b/ports.gyp @@ -4,13 +4,20 @@ { 'target_name': 'ports', 'type': 'static_library', + 'dependencies': [ + #ports depends on core, but core also depends on ports. + #'core.gyp:core', + #ports depends on utils, but utils also depends on ports. + #'utils.gyp:utils', + ], 'include_dirs': [ '../include/config', '../include/core', - '../include/images', - '../include/effects', - '../include/ports', + '../include/utils', + #ports currently implements the xml parser backend. '../include/xml', + + '../include/ports', '../src/core', ], 'sources': [ diff --git a/utils.gyp b/utils.gyp index 2fca63f..1ecc0c2 100644 --- a/utils.gyp +++ b/utils.gyp @@ -3,15 +3,15 @@ { 'target_name': 'utils', 'type': 'static_library', + 'dependencies': [ + 'core.gyp:core', + 'ports.gyp:ports', + ], 'include_dirs': [ - '../include/config', - '../include/core', '../include/utils', '../include/utils/mac', '../include/utils/unix', '../include/utils/win', - '../include/effects', - '../include/xml', ], 'sources': [ '../include/utils/SkBoundaryPatch.h', diff --git a/views.gyp b/views.gyp index 7998cd7..a0aafe6 100644 --- a/views.gyp +++ b/views.gyp @@ -9,14 +9,16 @@ { 'target_name': 'views', 'type': 'static_library', + 'dependencies': [ + 'core.gyp:core', + 'effects.gyp:effects', + 'images.gyp:images', + 'ports.gyp:ports', + 'utils.gyp:utils', + 'xml.gyp:xml', + ], 'include_dirs': [ - '../include/config', - '../include/core', '../include/views', - '../include/xml', - '../include/utils', - '../include/images', - '../include/effects', '../include/views/unix', ], 'sources': [ diff --git a/views_animated.gyp b/views_animated.gyp index f7cd052..b74030c 100644 --- a/views_animated.gyp +++ b/views_animated.gyp @@ -5,16 +5,15 @@ { 'target_name': 'views_animated', 'type': 'static_library', + 'dependencies': [ + 'animator.gyp:animator', + 'core.gyp:core', + 'images.gyp:images', + 'ports.gyp:ports', + 'views.gyp:views', + 'xml.gyp:xml', + ], 'include_dirs': [ - '../include/config', - '../include/core', - '../include/views', - '../include/xml', - '../include/utils', - '../include/images', - '../include/animator', - '../include/effects', - '../include/views/unix', '../include/views/animated', ], 'sources': [ diff --git a/xml.gyp b/xml.gyp index 6650a5c..636398b 100644 --- a/xml.gyp +++ b/xml.gyp @@ -3,11 +3,13 @@ { 'target_name': 'xml', 'type': 'static_library', + 'dependencies': [ + 'core.gyp:core', + 'ports.gyp:ports', + 'utils.gyp:utils', + ], 'include_dirs': [ - '../include/config', - '../include/core', '../include/xml', - '../include/utils', ], 'sources': [ '../include/xml/SkBML_WXMLParser.h', -- cgit v1.2.3 From a3eafbe2b24b97ff7f0327256c6efea32b1f8c64 Mon Sep 17 00:00:00 2001 From: "bungeman@google.com" Date: Thu, 29 Mar 2012 14:51:56 +0000 Subject: Revert 3538. git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@3539 2bbb7eff-a529-9590-31e7-b0007b416f81 --- animator.gyp | 16 +++++++--------- core.gyp | 7 +++---- effects.gyp | 6 ++---- experimental.gyp | 6 +++--- gpu.gyp | 9 ++------- images.gyp | 4 ++-- opts.gyp | 13 ------------- ports.gyp | 13 +++---------- utils.gyp | 8 ++++---- views.gyp | 14 ++++++-------- views_animated.gyp | 17 +++++++++-------- xml.gyp | 8 +++----- 12 files changed, 44 insertions(+), 77 deletions(-) diff --git a/animator.gyp b/animator.gyp index ad3edf3..b3c651c 100644 --- a/animator.gyp +++ b/animator.gyp @@ -7,17 +7,15 @@ { 'target_name': 'animator', 'type': 'static_library', - 'dependencies': [ - 'core.gyp:core', - 'effects.gyp:effects', - 'images.gyp:images', - 'ports.gyp:ports', - 'utils.gyp:utils', - 'views.gyp:views', - 'xml.gyp:xml', - ], 'include_dirs': [ + '../include/config', + '../include/core', + '../include/effects', '../include/animator', + '../include/views', + '../include/xml', + '../include/utils', + '../include/images', '../src/utils', ], 'sources': [ diff --git a/core.gyp b/core.gyp index 08aa7e5..c60059e 100644 --- a/core.gyp +++ b/core.gyp @@ -5,10 +5,6 @@ 'target_name': 'core', 'type': 'static_library', 'msvs_guid': 'B7760B5E-BFA8-486B-ACFD-49E3A6DE8E76', - 'dependencies': [ - 'opts.gyp:opts', - 'ports.gyp:ports', - ], 'sources': [ '../src/core/ARGB32_Clamp_Bilinear_BitmapShader.h', '../src/core/Sk64.cpp', @@ -314,6 +310,9 @@ 'ext', ], }, + 'dependencies': [ + 'opts.gyp:opts' + ], }, ], } diff --git a/effects.gyp b/effects.gyp index 3078523..394ec30 100644 --- a/effects.gyp +++ b/effects.gyp @@ -3,11 +3,9 @@ { 'target_name': 'effects', 'type': 'static_library', - 'dependencies': [ - 'core.gyp:core', - 'ports.gyp:ports', - ], 'include_dirs': [ + '../include/config', + '../include/core', '../include/effects', ], 'sources': [ diff --git a/experimental.gyp b/experimental.gyp index 8c976dd..09711ac 100644 --- a/experimental.gyp +++ b/experimental.gyp @@ -3,9 +3,9 @@ { 'target_name': 'experimental', 'type': 'static_library', - 'dependencies': [ - 'core.gyp:core', - 'ports.gyp:ports', + 'include_dirs': [ + '../include/config', + '../include/core', ], 'sources': [ '../experimental/SkSetPoly3To3.cpp', diff --git a/gpu.gyp b/gpu.gyp index 1ac07aa..fb5dff3 100644 --- a/gpu.gyp +++ b/gpu.gyp @@ -86,12 +86,9 @@ { 'target_name': 'skgr', 'type': 'static_library', - 'dependencies': [ - 'core.gyp:core', - 'gpu.gyp:gr', - 'ports.gyp:ports', - ], 'include_dirs': [ + '../include/config', + '../include/core', '../src/core', '../include/gpu', ], @@ -151,9 +148,7 @@ '../src/core', # SkRasterClip.h ], 'dependencies': [ - 'core.gyp:core', 'libtess.gyp:libtess', - 'ports.gyp:ports', ], 'sources': [ '../include/gpu/GrClip.h', diff --git a/images.gyp b/images.gyp index 5ccad8b..a4bdcd0 100644 --- a/images.gyp +++ b/images.gyp @@ -4,12 +4,12 @@ 'target_name': 'images', 'type': 'static_library', 'dependencies': [ - 'core.gyp:core', 'libjpeg.gyp:libjpeg', - 'ports.gyp:ports', 'utils.gyp:utils', ], 'include_dirs': [ + '../include/config', + '../include/core', '../include/images', ], 'sources': [ diff --git a/opts.gyp b/opts.gyp index c3e2516..cf8e6dd 100644 --- a/opts.gyp +++ b/opts.gyp @@ -21,16 +21,9 @@ { 'target_name': 'opts', 'type': 'static_library', - 'dependencies': [ - #opts depends on core, but core also depends on opts. - #'core.gyp:core', - 'opts.gyp:opts_ssse3', - 'ports.gyp:ports', - ], 'include_dirs': [ '../include/config', '../include/core', - '../src/core', '../src/opts', ], @@ -88,15 +81,9 @@ { 'target_name': 'opts_ssse3', 'type': 'static_library', - 'dependencies': [ - #opts_ssse3 depends on core, but core also depends on opts_ssse3. - #'core.gyp:core', - 'ports.gyp:ports', - ], 'include_dirs': [ '../include/config', '../include/core', - '../src/core', ], 'conditions': [ diff --git a/ports.gyp b/ports.gyp index 341c2cf..73dd594 100644 --- a/ports.gyp +++ b/ports.gyp @@ -4,20 +4,13 @@ { 'target_name': 'ports', 'type': 'static_library', - 'dependencies': [ - #ports depends on core, but core also depends on ports. - #'core.gyp:core', - #ports depends on utils, but utils also depends on ports. - #'utils.gyp:utils', - ], 'include_dirs': [ '../include/config', '../include/core', - '../include/utils', - #ports currently implements the xml parser backend. - '../include/xml', - + '../include/images', + '../include/effects', '../include/ports', + '../include/xml', '../src/core', ], 'sources': [ diff --git a/utils.gyp b/utils.gyp index 1ecc0c2..2fca63f 100644 --- a/utils.gyp +++ b/utils.gyp @@ -3,15 +3,15 @@ { 'target_name': 'utils', 'type': 'static_library', - 'dependencies': [ - 'core.gyp:core', - 'ports.gyp:ports', - ], 'include_dirs': [ + '../include/config', + '../include/core', '../include/utils', '../include/utils/mac', '../include/utils/unix', '../include/utils/win', + '../include/effects', + '../include/xml', ], 'sources': [ '../include/utils/SkBoundaryPatch.h', diff --git a/views.gyp b/views.gyp index a0aafe6..7998cd7 100644 --- a/views.gyp +++ b/views.gyp @@ -9,16 +9,14 @@ { 'target_name': 'views', 'type': 'static_library', - 'dependencies': [ - 'core.gyp:core', - 'effects.gyp:effects', - 'images.gyp:images', - 'ports.gyp:ports', - 'utils.gyp:utils', - 'xml.gyp:xml', - ], 'include_dirs': [ + '../include/config', + '../include/core', '../include/views', + '../include/xml', + '../include/utils', + '../include/images', + '../include/effects', '../include/views/unix', ], 'sources': [ diff --git a/views_animated.gyp b/views_animated.gyp index b74030c..f7cd052 100644 --- a/views_animated.gyp +++ b/views_animated.gyp @@ -5,15 +5,16 @@ { 'target_name': 'views_animated', 'type': 'static_library', - 'dependencies': [ - 'animator.gyp:animator', - 'core.gyp:core', - 'images.gyp:images', - 'ports.gyp:ports', - 'views.gyp:views', - 'xml.gyp:xml', - ], 'include_dirs': [ + '../include/config', + '../include/core', + '../include/views', + '../include/xml', + '../include/utils', + '../include/images', + '../include/animator', + '../include/effects', + '../include/views/unix', '../include/views/animated', ], 'sources': [ diff --git a/xml.gyp b/xml.gyp index 636398b..6650a5c 100644 --- a/xml.gyp +++ b/xml.gyp @@ -3,13 +3,11 @@ { 'target_name': 'xml', 'type': 'static_library', - 'dependencies': [ - 'core.gyp:core', - 'ports.gyp:ports', - 'utils.gyp:utils', - ], 'include_dirs': [ + '../include/config', + '../include/core', '../include/xml', + '../include/utils', ], 'sources': [ '../include/xml/SkBML_WXMLParser.h', -- cgit v1.2.3 From a8fe647ee8cf2397ce4e4fd59adc6a3e029aed64 Mon Sep 17 00:00:00 2001 From: "caryclark@google.com" Date: Fri, 30 Mar 2012 18:47:02 +0000 Subject: shape ops work in progress git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@3566 2bbb7eff-a529-9590-31e7-b0007b416f81 --- shapeops_edge.gyp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/shapeops_edge.gyp b/shapeops_edge.gyp index b5c9d16..92007a0 100644 --- a/shapeops_edge.gyp +++ b/shapeops_edge.gyp @@ -66,7 +66,6 @@ '../experimental/Intersection/QuadraticUtilities.cpp', '../experimental/Intersection/RectUtilities.cpp', '../experimental/Intersection/TestUtilities.cpp', - '../experimental/Intersection/CubicIntersection.h', '../experimental/Intersection/CubicIntersection_TestData.h', '../experimental/Intersection/CubicUtilities.h', '../experimental/Intersection/CurveIntersection.h', @@ -87,6 +86,7 @@ '../experimental/Intersection/ShapeOps.h', '../experimental/Intersection/TestUtilities.h', '../experimental/Intersection/TSearch.h', + '../experimental/Intersection/thingsToDo.txt', ], 'dependencies': [ 'core.gyp:core', -- cgit v1.2.3 From 9e0afa819e61de4ce7d93b32f21d25fe4995f8cf Mon Sep 17 00:00:00 2001 From: "robertphillips@google.com" Date: Mon, 2 Apr 2012 20:42:26 +0000 Subject: Delivering .gyp files to enable building & linking w/ ANGLE on Windows http://codereview.appspot.com/5933057/ git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@3580 2bbb7eff-a529-9590-31e7-b0007b416f81 --- angle.gyp | 30 ++++++++++++++++++++++++++++++ common.gypi | 13 +++++++++++++ common_variables.gypi | 3 +++ gpu.gyp | 30 ++++++++++++++++++++++++++++++ views.gyp | 4 ++++ 5 files changed, 80 insertions(+) create mode 100644 angle.gyp diff --git a/angle.gyp b/angle.gyp new file mode 100644 index 0000000..c181856 --- /dev/null +++ b/angle.gyp @@ -0,0 +1,30 @@ +# ANGLE is the Windows-specific translator from OGL ES 2.0 to D3D 9 + +{ + 'targets': [ + { + 'target_name': 'angle', + 'type': 'none', + + 'conditions': [ + [ 'skia_angle', { + 'direct_dependent_settings': { + 'libraries': [ + '../../third_party/externals/angle/lib/Debug/libEGL.lib', + '../../third_party/externals/angle/lib/Debug/libGLESv2.lib', + ], + 'include_dirs': [ + '../third_party/externals/angle/include' + ], + }, + }], + ] + } + ], +} + +# Local Variables: +# tab-width:2 +# indent-tabs-mode:nil +# End: +# vim: set expandtab tabstop=2 shiftwidth=2: diff --git a/common.gypi b/common.gypi index ad684c2..a9b274d 100644 --- a/common.gypi +++ b/common.gypi @@ -21,6 +21,9 @@ {'error': ' Date: Tue, 3 Apr 2012 20:20:47 +0000 Subject: Fixing gm build with SkXPSDevice enabled REVIEW=http://codereview.appspot.com/5981054/ git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@3591 2bbb7eff-a529-9590-31e7-b0007b416f81 --- xps.gyp | 1 + 1 file changed, 1 insertion(+) diff --git a/xps.gyp b/xps.gyp index 5249c16..1337fd3 100644 --- a/xps.gyp +++ b/xps.gyp @@ -51,6 +51,7 @@ ], 'include_dirs': [ '../include/device/xps', + '../src/utils', # needed to get SkBitSet.h ], }, }, -- cgit v1.2.3 From 13904239e0a21d4ac45b37a46a87666d73b9af9c Mon Sep 17 00:00:00 2001 From: "bsalomon@google.com" Date: Wed, 4 Apr 2012 19:05:31 +0000 Subject: Remove old D3D9 stuff Review URL: http://codereview.appspot.com/5966071/ git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@3601 2bbb7eff-a529-9590-31e7-b0007b416f81 --- SampleApp.gyp | 3 --- 1 file changed, 3 deletions(-) diff --git a/SampleApp.gyp b/SampleApp.gyp index 3d79c3d..9e74982 100644 --- a/SampleApp.gyp +++ b/SampleApp.gyp @@ -263,9 +263,6 @@ 'msvs_settings': { 'VCLinkerTool': { 'SubSystem': '2', - 'AdditionalDependencies': [ - 'd3d9.lib', - ], }, }, }, -- cgit v1.2.3 From 62c5a4a93ff068c26491db78b11058b72cd156ea Mon Sep 17 00:00:00 2001 From: "robertphillips@google.com" Date: Thu, 5 Apr 2012 13:20:35 +0000 Subject: Finally enabled libjpeg functionality in .gyps http://codereview.appspot.com/5967047/ git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@3611 2bbb7eff-a529-9590-31e7-b0007b416f81 --- gmslides.gypi | 1 + images.gyp | 16 +++++----------- libjpeg.gyp | 2 +- 3 files changed, 7 insertions(+), 12 deletions(-) diff --git a/gmslides.gypi b/gmslides.gypi index 491af68..8442d7d 100644 --- a/gmslides.gypi +++ b/gmslides.gypi @@ -14,6 +14,7 @@ '../gm/complexclip2.cpp', '../gm/convexpaths.cpp', '../gm/cubicpaths.cpp', + '../gm/cmykjpeg.cpp', '../gm/degeneratesegments.cpp', '../gm/drawbitmaprect.cpp', '../gm/emptypath.cpp', diff --git a/images.gyp b/images.gyp index a4bdcd0..b92c9db 100644 --- a/images.gyp +++ b/images.gyp @@ -4,9 +4,12 @@ 'target_name': 'images', 'type': 'static_library', 'dependencies': [ - 'libjpeg.gyp:libjpeg', + 'libjpeg.gyp:*', 'utils.gyp:utils', ], + 'export_dependent_settings': [ + 'libjpeg.gyp:*', + ], 'include_dirs': [ '../include/config', '../include/core', @@ -28,6 +31,7 @@ '../src/images/SkFlipPixelRef.cpp', '../src/images/SkImageDecoder.cpp', '../src/images/SkImageDecoder_Factory.cpp', + '../src/images/SkImageDecoder_libjpeg.cpp', '../src/images/SkImageDecoder_libbmp.cpp', '../src/images/SkImageDecoder_libgif.cpp', '../src/images/SkImageDecoder_libico.cpp', @@ -52,14 +56,11 @@ 'conditions': [ [ 'skia_os == "win"', { 'sources!': [ - '../include/images/SkJpegUtility.h', - '../src/images/SkFDStream.cpp', '../src/images/SkImageDecoder_Factory.cpp', '../src/images/SkImageDecoder_libgif.cpp', '../src/images/SkImageDecoder_libpng.cpp', '../src/images/SkImageEncoder_Factory.cpp', - '../src/images/SkJpegUtility.cpp', '../src/images/SkMovie_gif.cpp', ], 'link_settings': { @@ -74,13 +75,10 @@ }], [ 'skia_os == "mac"', { 'sources!': [ - '../include/images/SkJpegUtility.h', - '../src/images/SkImageDecoder_Factory.cpp', '../src/images/SkImageDecoder_libpng.cpp', '../src/images/SkImageDecoder_libgif.cpp', '../src/images/SkImageEncoder_Factory.cpp', - '../src/images/SkJpegUtility.cpp', '../src/images/SkMovie_gif.cpp', ], },{ #else if skia_os != mac @@ -90,10 +88,7 @@ }], [ 'skia_os in ["linux", "freebsd", "openbsd", "solaris"]', { 'sources!': [ - '../include/images/SkJpegUtility.h', - '../src/images/SkImageDecoder_libgif.cpp', - '../src/images/SkJpegUtility.cpp', '../src/images/SkMovie_gif.cpp', ], # libpng stuff: @@ -112,7 +107,6 @@ }], [ 'skia_os == "android"', { 'sources!': [ - '../src/images/SkJpegUtility.cpp', ], 'dependencies': [ 'android_system.gyp:gif', diff --git a/libjpeg.gyp b/libjpeg.gyp index b7ce7a8..dcf1450 100644 --- a/libjpeg.gyp +++ b/libjpeg.gyp @@ -76,7 +76,7 @@ ], 'direct_dependent_settings': { 'include_dirs': [ - '.', + '../third_party/externals/libjpeg', ], }, 'conditions': [ -- cgit v1.2.3 From b4e5570f0bf995db9ad3cb7b0656001da1454b51 Mon Sep 17 00:00:00 2001 From: "robertphillips@google.com" Date: Thu, 5 Apr 2012 13:38:27 +0000 Subject: Rolling back r3611 until the Android compilation issue is resolved git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@3613 2bbb7eff-a529-9590-31e7-b0007b416f81 --- gmslides.gypi | 1 - images.gyp | 16 +++++++++++----- libjpeg.gyp | 2 +- 3 files changed, 12 insertions(+), 7 deletions(-) diff --git a/gmslides.gypi b/gmslides.gypi index 8442d7d..491af68 100644 --- a/gmslides.gypi +++ b/gmslides.gypi @@ -14,7 +14,6 @@ '../gm/complexclip2.cpp', '../gm/convexpaths.cpp', '../gm/cubicpaths.cpp', - '../gm/cmykjpeg.cpp', '../gm/degeneratesegments.cpp', '../gm/drawbitmaprect.cpp', '../gm/emptypath.cpp', diff --git a/images.gyp b/images.gyp index b92c9db..a4bdcd0 100644 --- a/images.gyp +++ b/images.gyp @@ -4,12 +4,9 @@ 'target_name': 'images', 'type': 'static_library', 'dependencies': [ - 'libjpeg.gyp:*', + 'libjpeg.gyp:libjpeg', 'utils.gyp:utils', ], - 'export_dependent_settings': [ - 'libjpeg.gyp:*', - ], 'include_dirs': [ '../include/config', '../include/core', @@ -31,7 +28,6 @@ '../src/images/SkFlipPixelRef.cpp', '../src/images/SkImageDecoder.cpp', '../src/images/SkImageDecoder_Factory.cpp', - '../src/images/SkImageDecoder_libjpeg.cpp', '../src/images/SkImageDecoder_libbmp.cpp', '../src/images/SkImageDecoder_libgif.cpp', '../src/images/SkImageDecoder_libico.cpp', @@ -56,11 +52,14 @@ 'conditions': [ [ 'skia_os == "win"', { 'sources!': [ + '../include/images/SkJpegUtility.h', + '../src/images/SkFDStream.cpp', '../src/images/SkImageDecoder_Factory.cpp', '../src/images/SkImageDecoder_libgif.cpp', '../src/images/SkImageDecoder_libpng.cpp', '../src/images/SkImageEncoder_Factory.cpp', + '../src/images/SkJpegUtility.cpp', '../src/images/SkMovie_gif.cpp', ], 'link_settings': { @@ -75,10 +74,13 @@ }], [ 'skia_os == "mac"', { 'sources!': [ + '../include/images/SkJpegUtility.h', + '../src/images/SkImageDecoder_Factory.cpp', '../src/images/SkImageDecoder_libpng.cpp', '../src/images/SkImageDecoder_libgif.cpp', '../src/images/SkImageEncoder_Factory.cpp', + '../src/images/SkJpegUtility.cpp', '../src/images/SkMovie_gif.cpp', ], },{ #else if skia_os != mac @@ -88,7 +90,10 @@ }], [ 'skia_os in ["linux", "freebsd", "openbsd", "solaris"]', { 'sources!': [ + '../include/images/SkJpegUtility.h', + '../src/images/SkImageDecoder_libgif.cpp', + '../src/images/SkJpegUtility.cpp', '../src/images/SkMovie_gif.cpp', ], # libpng stuff: @@ -107,6 +112,7 @@ }], [ 'skia_os == "android"', { 'sources!': [ + '../src/images/SkJpegUtility.cpp', ], 'dependencies': [ 'android_system.gyp:gif', diff --git a/libjpeg.gyp b/libjpeg.gyp index dcf1450..b7ce7a8 100644 --- a/libjpeg.gyp +++ b/libjpeg.gyp @@ -76,7 +76,7 @@ ], 'direct_dependent_settings': { 'include_dirs': [ - '../third_party/externals/libjpeg', + '.', ], }, 'conditions': [ -- cgit v1.2.3 From 08f8836484f7cd3be79de6c9cbf04b84555cc49d Mon Sep 17 00:00:00 2001 From: "robertphillips@google.com" Date: Thu, 5 Apr 2012 14:40:53 +0000 Subject: Initial split up of Debug Interface into separate files http://codereview.appspot.com/5979048/ git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@3616 2bbb7eff-a529-9590-31e7-b0007b416f81 --- gpu.gyp | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/gpu.gyp b/gpu.gyp index 7f7b566..df8fb7b 100644 --- a/gpu.gyp +++ b/gpu.gyp @@ -301,6 +301,26 @@ '../src/gpu/gl/GrGpuGLShaders.h', '../src/gpu/gl/debug/GrGLCreateDebugInterface.cpp', + '../src/gpu/gl/debug/GrFakeRefObj.h', + '../src/gpu/gl/debug/GrFakeRefObj.cpp', + '../src/gpu/gl/debug/GrBufferObj.h', + '../src/gpu/gl/debug/GrBufferObj.cpp', + '../src/gpu/gl/debug/GrFBBindableObj.h', + '../src/gpu/gl/debug/GrFBBindableObj.cpp', + '../src/gpu/gl/debug/GrRenderBufferObj.h', + '../src/gpu/gl/debug/GrRenderBufferObj.cpp', + '../src/gpu/gl/debug/GrTextureObj.h', + '../src/gpu/gl/debug/GrTextureObj.cpp', + '../src/gpu/gl/debug/GrTextureUnitObj.h', + '../src/gpu/gl/debug/GrTextureUnitObj.cpp', + '../src/gpu/gl/debug/GrFrameBufferObj.h', + '../src/gpu/gl/debug/GrFrameBufferObj.cpp', + '../src/gpu/gl/debug/GrShaderObj.h', + '../src/gpu/gl/debug/GrShaderObj.cpp', + '../src/gpu/gl/debug/GrProgramObj.h', + '../src/gpu/gl/debug/GrProgramObj.cpp', + '../src/gpu/gl/debug/GrDebugGL.h', + '../src/gpu/gl/debug/GrDebugGL.cpp', '../src/gpu/gl/mac/GrGLCreateNativeInterface_mac.cpp', -- cgit v1.2.3 From 1e57a142765a026170d6972e867cf37cc091663c Mon Sep 17 00:00:00 2001 From: "robertphillips@google.com" Date: Thu, 5 Apr 2012 14:52:01 +0000 Subject: Redelivering r3611 changes (enabling cmyk jpeg changes in .gyps) http://codereview.appspot.com/5967047/ git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@3617 2bbb7eff-a529-9590-31e7-b0007b416f81 --- gmslides.gypi | 1 + images.gyp | 16 +++++----------- libjpeg.gyp | 2 +- 3 files changed, 7 insertions(+), 12 deletions(-) diff --git a/gmslides.gypi b/gmslides.gypi index 491af68..8442d7d 100644 --- a/gmslides.gypi +++ b/gmslides.gypi @@ -14,6 +14,7 @@ '../gm/complexclip2.cpp', '../gm/convexpaths.cpp', '../gm/cubicpaths.cpp', + '../gm/cmykjpeg.cpp', '../gm/degeneratesegments.cpp', '../gm/drawbitmaprect.cpp', '../gm/emptypath.cpp', diff --git a/images.gyp b/images.gyp index a4bdcd0..b92c9db 100644 --- a/images.gyp +++ b/images.gyp @@ -4,9 +4,12 @@ 'target_name': 'images', 'type': 'static_library', 'dependencies': [ - 'libjpeg.gyp:libjpeg', + 'libjpeg.gyp:*', 'utils.gyp:utils', ], + 'export_dependent_settings': [ + 'libjpeg.gyp:*', + ], 'include_dirs': [ '../include/config', '../include/core', @@ -28,6 +31,7 @@ '../src/images/SkFlipPixelRef.cpp', '../src/images/SkImageDecoder.cpp', '../src/images/SkImageDecoder_Factory.cpp', + '../src/images/SkImageDecoder_libjpeg.cpp', '../src/images/SkImageDecoder_libbmp.cpp', '../src/images/SkImageDecoder_libgif.cpp', '../src/images/SkImageDecoder_libico.cpp', @@ -52,14 +56,11 @@ 'conditions': [ [ 'skia_os == "win"', { 'sources!': [ - '../include/images/SkJpegUtility.h', - '../src/images/SkFDStream.cpp', '../src/images/SkImageDecoder_Factory.cpp', '../src/images/SkImageDecoder_libgif.cpp', '../src/images/SkImageDecoder_libpng.cpp', '../src/images/SkImageEncoder_Factory.cpp', - '../src/images/SkJpegUtility.cpp', '../src/images/SkMovie_gif.cpp', ], 'link_settings': { @@ -74,13 +75,10 @@ }], [ 'skia_os == "mac"', { 'sources!': [ - '../include/images/SkJpegUtility.h', - '../src/images/SkImageDecoder_Factory.cpp', '../src/images/SkImageDecoder_libpng.cpp', '../src/images/SkImageDecoder_libgif.cpp', '../src/images/SkImageEncoder_Factory.cpp', - '../src/images/SkJpegUtility.cpp', '../src/images/SkMovie_gif.cpp', ], },{ #else if skia_os != mac @@ -90,10 +88,7 @@ }], [ 'skia_os in ["linux", "freebsd", "openbsd", "solaris"]', { 'sources!': [ - '../include/images/SkJpegUtility.h', - '../src/images/SkImageDecoder_libgif.cpp', - '../src/images/SkJpegUtility.cpp', '../src/images/SkMovie_gif.cpp', ], # libpng stuff: @@ -112,7 +107,6 @@ }], [ 'skia_os == "android"', { 'sources!': [ - '../src/images/SkJpegUtility.cpp', ], 'dependencies': [ 'android_system.gyp:gif', diff --git a/libjpeg.gyp b/libjpeg.gyp index b7ce7a8..dcf1450 100644 --- a/libjpeg.gyp +++ b/libjpeg.gyp @@ -76,7 +76,7 @@ ], 'direct_dependent_settings': { 'include_dirs': [ - '.', + '../third_party/externals/libjpeg', ], }, 'conditions': [ -- cgit v1.2.3 From ca365c56000907e56c1feadeaf3ef21e92444428 Mon Sep 17 00:00:00 2001 From: "robertphillips@google.com" Date: Thu, 5 Apr 2012 19:29:04 +0000 Subject: Fix xcode 4.1 build issue http://codereview.appspot.com/5992048/ git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@3621 2bbb7eff-a529-9590-31e7-b0007b416f81 --- common_conditions.gypi | 1 + 1 file changed, 1 insertion(+) diff --git a/common_conditions.gypi b/common_conditions.gypi index 7152181..cfb67ae 100644 --- a/common_conditions.gypi +++ b/common_conditions.gypi @@ -126,6 +126,7 @@ }, }, 'xcode_settings': { + 'GCC_SYMBOLS_PRIVATE_EXTERN': 'NO', 'SYMROOT': '<(DEPTH)/xcodebuild', 'SDKROOT': 'macosx10.6', # trying to get this to work, but it needs clang I think... -- cgit v1.2.3 From fe06230e6707b618d740d4632237b414aad3e31d Mon Sep 17 00:00:00 2001 From: "robertphillips@google.com" Date: Fri, 6 Apr 2012 18:06:10 +0000 Subject: Initial version of R8 support http://codereview.appspot.com/5967067/ git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@3622 2bbb7eff-a529-9590-31e7-b0007b416f81 --- tests.gyp | 1 + 1 file changed, 1 insertion(+) diff --git a/tests.gyp b/tests.gyp index a3a8002..8c9c985 100644 --- a/tests.gyp +++ b/tests.gyp @@ -58,6 +58,7 @@ '../tests/QuickRejectTest.cpp', '../tests/Reader32Test.cpp', '../tests/ReadPixelsTest.cpp', + '../tests/ReadWriteAlphaTest.cpp', '../tests/RefDictTest.cpp', '../tests/RegionTest.cpp', '../tests/ScalarTest.cpp', -- cgit v1.2.3 From 05cd4132e6530975cb9347a66b22c9fef1202e33 Mon Sep 17 00:00:00 2001 From: "djsollen@google.com" Date: Thu, 12 Apr 2012 13:24:04 +0000 Subject: Decouple the SkFlattenable from SkReader32/SkWriter32. The current impl for SkFlattenable read/write buffers is that they extend from SkReader32 and SkWriter32, but that dependency must be abstract if we are to add any other serialization format. Review URL: https://codereview.appspot.com/5999045 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@3654 2bbb7eff-a529-9590-31e7-b0007b416f81 --- core.gyp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/core.gyp b/core.gyp index c60059e..5cab78a 100644 --- a/core.gyp +++ b/core.gyp @@ -87,6 +87,8 @@ '../src/core/SkMatrix.cpp', '../src/core/SkMetaData.cpp', '../src/core/SkMMapStream.cpp', + '../src/core/SkOrderedReadBuffer.cpp', + '../src/core/SkOrderedWriteBuffer.cpp', '../src/core/SkPackBits.cpp', '../src/core/SkPaint.cpp', '../src/core/SkPath.cpp', -- cgit v1.2.3 From e736650d20692125a94f04b56c9bf23d60bdbff8 Mon Sep 17 00:00:00 2001 From: "mike@reedtribe.org" Date: Sat, 14 Apr 2012 12:55:17 +0000 Subject: dd DrawPathTest to gyp add regression tests for bug 533 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@3678 2bbb7eff-a529-9590-31e7-b0007b416f81 --- tests.gyp | 1 + 1 file changed, 1 insertion(+) diff --git a/tests.gyp b/tests.gyp index 8c9c985..58039ba 100644 --- a/tests.gyp +++ b/tests.gyp @@ -32,6 +32,7 @@ '../tests/DeferredCanvasTest.cpp', '../tests/DequeTest.cpp', '../tests/DrawBitmapRectTest.cpp', + '../tests/DrawPathTest.cpp', '../tests/DrawTextTest.cpp', '../tests/EmptyPathTest.cpp', '../tests/FillPathTest.cpp', -- cgit v1.2.3 From 6095acc093aeff6c2d76c1237e1573a625fcbe8c Mon Sep 17 00:00:00 2001 From: "bsalomon@google.com" Date: Mon, 16 Apr 2012 14:10:47 +0000 Subject: add gm circles Committed on behalf of Guanqun.Lu@gmail.com Review URL: http://codereview.appspot.com/6005047/ git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@3682 2bbb7eff-a529-9590-31e7-b0007b416f81 --- gmslides.gypi | 1 + 1 file changed, 1 insertion(+) diff --git a/gmslides.gypi b/gmslides.gypi index 8442d7d..7e3c690 100644 --- a/gmslides.gypi +++ b/gmslides.gypi @@ -9,6 +9,7 @@ '../gm/bitmapfilters.cpp', '../gm/bitmapscroll.cpp', '../gm/blurs.cpp', + '../gm/circles.cpp', '../gm/colormatrix.cpp', '../gm/complexclip.cpp', '../gm/complexclip2.cpp', -- cgit v1.2.3 From c010f9befac677047da658895b678227ed924245 Mon Sep 17 00:00:00 2001 From: "epoger@google.com" Date: Mon, 16 Apr 2012 15:14:22 +0000 Subject: Make Mac build generate both 32-bit and 64-bit code. BUG=http://code.google.com/p/skia/issues/detail?id=524 Review URL: https://codereview.appspot.com/6022057 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@3687 2bbb7eff-a529-9590-31e7-b0007b416f81 --- common_conditions.gypi | 1 + 1 file changed, 1 insertion(+) diff --git a/common_conditions.gypi b/common_conditions.gypi index cfb67ae..b202506 100644 --- a/common_conditions.gypi +++ b/common_conditions.gypi @@ -132,6 +132,7 @@ # trying to get this to work, but it needs clang I think... # 'WARNING_CFLAGS': '-Wexit-time-destructors', 'CLANG_WARN_CXX0X_EXTENSIONS': 'NO', + 'ARCHS': '$(ARCHS_STANDARD_32_64_BIT)', }, }, ], -- cgit v1.2.3 From 35ef09fe0176b3be1778cd714bc018981c9e22de Mon Sep 17 00:00:00 2001 From: "epoger@google.com" Date: Mon, 16 Apr 2012 15:49:04 +0000 Subject: roll out http://code.google.com/p/skia/source/detail?r=3687 because Mac 10.6 bot is failing git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@3688 2bbb7eff-a529-9590-31e7-b0007b416f81 --- common_conditions.gypi | 1 - 1 file changed, 1 deletion(-) diff --git a/common_conditions.gypi b/common_conditions.gypi index b202506..cfb67ae 100644 --- a/common_conditions.gypi +++ b/common_conditions.gypi @@ -132,7 +132,6 @@ # trying to get this to work, but it needs clang I think... # 'WARNING_CFLAGS': '-Wexit-time-destructors', 'CLANG_WARN_CXX0X_EXTENSIONS': 'NO', - 'ARCHS': '$(ARCHS_STANDARD_32_64_BIT)', }, }, ], -- cgit v1.2.3 From f8d2a634c860bf17a3496ae9cbef7baa7a24a932 Mon Sep 17 00:00:00 2001 From: "robertphillips@google.com" Date: Mon, 16 Apr 2012 16:24:35 +0000 Subject: Minor code cleanup of Debug GL Interface http://codereview.appspot.com/6032043/ git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@3690 2bbb7eff-a529-9590-31e7-b0007b416f81 --- gpu.gyp | 1 - 1 file changed, 1 deletion(-) diff --git a/gpu.gyp b/gpu.gyp index df8fb7b..026f3b9 100644 --- a/gpu.gyp +++ b/gpu.gyp @@ -302,7 +302,6 @@ '../src/gpu/gl/debug/GrGLCreateDebugInterface.cpp', '../src/gpu/gl/debug/GrFakeRefObj.h', - '../src/gpu/gl/debug/GrFakeRefObj.cpp', '../src/gpu/gl/debug/GrBufferObj.h', '../src/gpu/gl/debug/GrBufferObj.cpp', '../src/gpu/gl/debug/GrFBBindableObj.h', -- cgit v1.2.3 From fd69720462cda02c377aba865e9f7a99ff011a20 Mon Sep 17 00:00:00 2001 From: "robertphillips@google.com" Date: Mon, 16 Apr 2012 18:03:03 +0000 Subject: Minor refactoring to pull GrClipMaskManager into its own files http://codereview.appspot.com/5978055/ git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@3697 2bbb7eff-a529-9590-31e7-b0007b416f81 --- gpu.gyp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/gpu.gyp b/gpu.gyp index 026f3b9..fc2277e 100644 --- a/gpu.gyp +++ b/gpu.gyp @@ -227,6 +227,8 @@ '../src/gpu/GrDrawTarget.cpp', '../src/gpu/GrDrawTarget.h', '../src/gpu/GrGeometryBuffer.h', + '../src/gpu/GrClipMaskManager.h', + '../src/gpu/GrClipMaskManager.cpp', '../src/gpu/GrGpu.cpp', '../src/gpu/GrGpu.h', '../src/gpu/GrGpuFactory.cpp', -- cgit v1.2.3 From 95ba16834ec96f49cc21ef036223c90bcbcb7383 Mon Sep 17 00:00:00 2001 From: "tomhudson@google.com" Date: Wed, 18 Apr 2012 17:49:20 +0000 Subject: Infrastructure for new Ganesh shader pipeline: base classes for GPU implementation of user-defined effects. http://codereview.appspot.com/6052047/ git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@3726 2bbb7eff-a529-9590-31e7-b0007b416f81 --- gpu.gyp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/gpu.gyp b/gpu.gyp index fc2277e..0ffaa28 100644 --- a/gpu.gyp +++ b/gpu.gyp @@ -219,6 +219,8 @@ '../src/gpu/GrBufferAllocPool.h', '../src/gpu/GrClip.cpp', '../src/gpu/GrContext.cpp', + '../src/gpu/GrCustomStage.cpp', + '../src/gpu/GrCustomStage.h', '../src/gpu/GrDefaultPathRenderer.cpp', '../src/gpu/GrDefaultPathRenderer.h', '../src/gpu/GrDefaultTextContext.cpp', @@ -285,6 +287,8 @@ '../src/gpu/gl/GrGLIRect.h', '../src/gpu/gl/GrGLProgram.cpp', '../src/gpu/gl/GrGLProgram.h', + '../src/gpu/gl/GrGLProgramStage.cpp', + '../src/gpu/gl/GrGLProgramStage.h', '../src/gpu/gl/GrGLRenderTarget.cpp', '../src/gpu/gl/GrGLRenderTarget.h', '../src/gpu/gl/GrGLShaderVar.h', -- cgit v1.2.3 From 1dc22a1458520bed4de9ed5c4795c5904569620c Mon Sep 17 00:00:00 2001 From: "bsalomon@google.com" Date: Thu, 19 Apr 2012 19:15:35 +0000 Subject: Make GM able to run MSAA modes and multiple GPU configs in a single run. Review URL: http://codereview.appspot.com/6061051/ git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@3734 2bbb7eff-a529-9590-31e7-b0007b416f81 --- gpu.gyp | 1 + 1 file changed, 1 insertion(+) diff --git a/gpu.gyp b/gpu.gyp index 0ffaa28..685eca1 100644 --- a/gpu.gyp +++ b/gpu.gyp @@ -177,6 +177,7 @@ '../include/gpu/GrColor.h', '../include/gpu/GrConfig.h', '../include/gpu/GrContext.h', + '../include/gpu/GrContextFactory.h', '../include/gpu/GrFontScaler.h', '../include/gpu/GrGlyph.h', '../include/gpu/GrInstanceCounter.h', -- cgit v1.2.3 From 41c58ad77282c067bd3d315c416df6313fc5edd8 Mon Sep 17 00:00:00 2001 From: "tomhudson@google.com" Date: Fri, 20 Apr 2012 18:35:38 +0000 Subject: Hooks up the GrCustomStage/GrGLProgramStageFactory/GrGLProgramStage classes from r3726 so they can be used. Does not implement any actual effect stages. Has one large known bug: if custom stages are provided, GrSamplerState comparisons will break; this should preserve correct drawing, but decrease performance - among other things, we'll break draw batching. To fix this we'll need a RTTI system for GrCustomState objects, and we'll need to change the GrSamplerState comparison from a memcmp to something that also does a deep type-sensitive compare of any GrCustomState objects present. http://codereview.appspot.com/6074043/ git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@3742 2bbb7eff-a529-9590-31e7-b0007b416f81 --- gpu.gyp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gpu.gyp b/gpu.gyp index 685eca1..f0f9821 100644 --- a/gpu.gyp +++ b/gpu.gyp @@ -178,6 +178,7 @@ '../include/gpu/GrConfig.h', '../include/gpu/GrContext.h', '../include/gpu/GrContextFactory.h', + '../include/gpu/GrCustomStage.h', '../include/gpu/GrFontScaler.h', '../include/gpu/GrGlyph.h', '../include/gpu/GrInstanceCounter.h', @@ -221,7 +222,6 @@ '../src/gpu/GrClip.cpp', '../src/gpu/GrContext.cpp', '../src/gpu/GrCustomStage.cpp', - '../src/gpu/GrCustomStage.h', '../src/gpu/GrDefaultPathRenderer.cpp', '../src/gpu/GrDefaultPathRenderer.h', '../src/gpu/GrDefaultTextContext.cpp', -- cgit v1.2.3 From 067e34d52463373e963e3f57a57ea28763b7e9b0 Mon Sep 17 00:00:00 2001 From: "bsalomon@google.com" Date: Fri, 27 Apr 2012 15:52:53 +0000 Subject: Remove GrPath typedef Review URL: http://codereview.appspot.com/6128045/ git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@3780 2bbb7eff-a529-9590-31e7-b0007b416f81 --- gpu.gyp | 1 - 1 file changed, 1 deletion(-) diff --git a/gpu.gyp b/gpu.gyp index f0f9821..5e05c9a 100644 --- a/gpu.gyp +++ b/gpu.gyp @@ -186,7 +186,6 @@ '../include/gpu/GrMatrix.h', '../include/gpu/GrNoncopyable.h', '../include/gpu/GrPaint.h', - '../include/gpu/GrPath.h', '../include/gpu/GrPoint.h', '../include/gpu/GrRect.h', '../include/gpu/GrRefCnt.h', -- cgit v1.2.3 From 8e2b0533e6dddda75ff05f437f91d1e039d1ce3f Mon Sep 17 00:00:00 2001 From: "reed@google.com" Date: Fri, 27 Apr 2012 19:29:52 +0000 Subject: add RegionBench, in preparation for speeding up intersects and contains for chrome git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@3784 2bbb7eff-a529-9590-31e7-b0007b416f81 --- bench.gypi | 1 + 1 file changed, 1 insertion(+) diff --git a/bench.gypi b/bench.gypi index 1ca3f06..1ff0946 100644 --- a/bench.gypi +++ b/bench.gypi @@ -31,6 +31,7 @@ '../bench/PathBench.cpp', '../bench/PicturePlaybackBench.cpp', '../bench/RectBench.cpp', + '../bench/RegionBench.cpp', '../bench/RepeatTileBench.cpp', '../bench/ScalarBench.cpp', '../bench/ShaderMaskBench.cpp', -- cgit v1.2.3 From 77dbc51832a9d456b693003fec8ff3cbee42f7a0 Mon Sep 17 00:00:00 2001 From: "epoger@google.com" Date: Mon, 30 Apr 2012 19:02:08 +0000 Subject: Roll back http://code.google.com/p/skia/source/detail?r=3622 to deal with http://crbug.com/125596 ('M20 windows renderer stability maze') git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@3800 2bbb7eff-a529-9590-31e7-b0007b416f81 --- tests.gyp | 1 - 1 file changed, 1 deletion(-) diff --git a/tests.gyp b/tests.gyp index 58039ba..aea125a 100644 --- a/tests.gyp +++ b/tests.gyp @@ -59,7 +59,6 @@ '../tests/QuickRejectTest.cpp', '../tests/Reader32Test.cpp', '../tests/ReadPixelsTest.cpp', - '../tests/ReadWriteAlphaTest.cpp', '../tests/RefDictTest.cpp', '../tests/RegionTest.cpp', '../tests/ScalarTest.cpp', -- cgit v1.2.3 From ecbe23babb1927d8e0d68e20aaa8e2fea11d78bf Mon Sep 17 00:00:00 2001 From: "robertphillips@google.com" Date: Mon, 30 Apr 2012 20:01:21 +0000 Subject: Re-adding red texture support (by rolling back r3800) http://code.google.com/p/skia/source/detail?r=3622 - for original review http://crbug.com/125596 ('M20 windows renderer stability maze') - for issue git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@3802 2bbb7eff-a529-9590-31e7-b0007b416f81 --- tests.gyp | 1 + 1 file changed, 1 insertion(+) diff --git a/tests.gyp b/tests.gyp index aea125a..58039ba 100644 --- a/tests.gyp +++ b/tests.gyp @@ -59,6 +59,7 @@ '../tests/QuickRejectTest.cpp', '../tests/Reader32Test.cpp', '../tests/ReadPixelsTest.cpp', + '../tests/ReadWriteAlphaTest.cpp', '../tests/RefDictTest.cpp', '../tests/RegionTest.cpp', '../tests/ScalarTest.cpp', -- cgit v1.2.3 From 9652c1bcfdc0a150b3d8d8bf8963ef3c401e3853 Mon Sep 17 00:00:00 2001 From: "robertphillips@google.com" Date: Tue, 1 May 2012 12:19:34 +0000 Subject: Second half of refactoring to move SW path rendering to GrPathRenderer http://codereview.appspot.com/6125046/ git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@3804 2bbb7eff-a529-9590-31e7-b0007b416f81 --- gpu.gyp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/gpu.gyp b/gpu.gyp index 5e05c9a..31662ab 100644 --- a/gpu.gyp +++ b/gpu.gyp @@ -264,6 +264,8 @@ '../src/gpu/GrTDArray.h', '../src/gpu/GrTesselatedPathRenderer.cpp', '../src/gpu/GrTesselatedPathRenderer.h', + '../src/gpu/GrSoftwarePathRenderer.cpp', + '../src/gpu/GrSoftwarePathRenderer.h', '../src/gpu/GrTextStrike.cpp', '../src/gpu/GrTextStrike.h', '../src/gpu/GrTextStrike_impl.h', -- cgit v1.2.3 From 8a18a6003ecc8aaa2ddbc5bcab2779562a77f739 Mon Sep 17 00:00:00 2001 From: "robertphillips@google.com" Date: Wed, 2 May 2012 13:55:06 +0000 Subject: Added GM test to stress test the texture unit/sampler allocation http://codereview.appspot.com/6134058/ git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@3814 2bbb7eff-a529-9590-31e7-b0007b416f81 --- gmslides.gypi | 1 + 1 file changed, 1 insertion(+) diff --git a/gmslides.gypi b/gmslides.gypi index 7e3c690..e3b4b64 100644 --- a/gmslides.gypi +++ b/gmslides.gypi @@ -40,6 +40,7 @@ '../gm/points.cpp', '../gm/poly2poly.cpp', '../gm/quadpaths.cpp', + '../gm/samplerstress.cpp', '../gm/shaderbounds.cpp', '../gm/shadertext.cpp', '../gm/shadows.cpp', -- cgit v1.2.3 From 1c2c7ddd1865e75d37ceeaa0c0b3515c89207526 Mon Sep 17 00:00:00 2001 From: "epoger@google.com" Date: Thu, 3 May 2012 14:02:17 +0000 Subject: recreate http://codereview.appspot.com/6131051/ in svn instead of git Review URL: https://codereview.appspot.com/6181044 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@3829 2bbb7eff-a529-9590-31e7-b0007b416f81 --- core.gyp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core.gyp b/core.gyp index 5cab78a..07e6456 100644 --- a/core.gyp +++ b/core.gyp @@ -133,6 +133,7 @@ '../src/core/SkSpriteBlitterTemplate.h', '../src/core/SkStream.cpp', '../src/core/SkString.cpp', + '../src/core/SkStroke.h', '../src/core/SkStroke.cpp', '../src/core/SkStrokerPriv.cpp', '../src/core/SkStrokerPriv.h', @@ -213,7 +214,6 @@ '../include/core/SkShader.h', '../include/core/SkStream.h', '../include/core/SkString.h', - '../include/core/SkStroke.h', '../include/core/SkTArray.h', '../include/core/SkTDArray.h', '../include/core/SkTDStack.h', -- cgit v1.2.3 From e4dd0ef64d1948fcd114ade8b1a53252ded263b1 Mon Sep 17 00:00:00 2001 From: "reed@google.com" Date: Fri, 4 May 2012 16:37:45 +0000 Subject: add initial bench for dashing (more work to do) git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@3841 2bbb7eff-a529-9590-31e7-b0007b416f81 --- bench.gypi | 1 + 1 file changed, 1 insertion(+) diff --git a/bench.gypi b/bench.gypi index 1ff0946..47c4574 100644 --- a/bench.gypi +++ b/bench.gypi @@ -21,6 +21,7 @@ '../bench/BitmapBench.cpp', '../bench/BlurBench.cpp', '../bench/ChromeBench.cpp', + '../bench/DashBench.cpp', '../bench/DecodeBench.cpp', '../bench/FontScalerBench.cpp', '../bench/GradientBench.cpp', -- cgit v1.2.3 From fdfafdf1a2380319b0df2ebf962227f1b9c3259e Mon Sep 17 00:00:00 2001 From: "reed@google.com" Date: Fri, 4 May 2012 21:49:27 +0000 Subject: add gm for dashing variations git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@3842 2bbb7eff-a529-9590-31e7-b0007b416f81 --- gmslides.gypi | 1 + 1 file changed, 1 insertion(+) diff --git a/gmslides.gypi b/gmslides.gypi index e3b4b64..659fe9f 100644 --- a/gmslides.gypi +++ b/gmslides.gypi @@ -17,6 +17,7 @@ '../gm/cubicpaths.cpp', '../gm/cmykjpeg.cpp', '../gm/degeneratesegments.cpp', + '../gm/dashing.cpp', '../gm/drawbitmaprect.cpp', '../gm/emptypath.cpp', '../gm/filltypes.cpp', -- cgit v1.2.3 From e57586985f728fe29231dbcb5db544c6102c2ee7 Mon Sep 17 00:00:00 2001 From: "reed@google.com" Date: Mon, 7 May 2012 13:46:32 +0000 Subject: add bench for SkPath::Iter and SkPath::RawIter git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@3844 2bbb7eff-a529-9590-31e7-b0007b416f81 --- bench.gypi | 1 + 1 file changed, 1 insertion(+) diff --git a/bench.gypi b/bench.gypi index 47c4574..8499ca1 100644 --- a/bench.gypi +++ b/bench.gypi @@ -30,6 +30,7 @@ '../bench/MatrixBench.cpp', '../bench/MutexBench.cpp', '../bench/PathBench.cpp', + '../bench/PathIterBench.cpp', '../bench/PicturePlaybackBench.cpp', '../bench/RectBench.cpp', '../bench/RegionBench.cpp', -- cgit v1.2.3 From 8bf3d20bb923fb6a76fd1a61ec0b797fe64ecf2f Mon Sep 17 00:00:00 2001 From: "bsalomon@google.com" Date: Mon, 7 May 2012 17:09:37 +0000 Subject: Move function decls and macros out of public headers that are meant for internal use. git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@3849 2bbb7eff-a529-9590-31e7-b0007b416f81 --- SampleApp.gyp | 1 + gpu.gyp | 2 ++ 2 files changed, 3 insertions(+) diff --git a/SampleApp.gyp b/SampleApp.gyp index 9e74982..a9af72a 100644 --- a/SampleApp.gyp +++ b/SampleApp.gyp @@ -10,6 +10,7 @@ '../gm', # needed to pull gm.h '../include/pipe', # To pull in SkGPipe.h for pipe reader/writer '../samplecode', # To pull SampleApp.h and SampleCode.h + '../src/gpu', # To pull gl/GrGLUtil.h ], 'includes': [ 'gmslides.gypi', diff --git a/gpu.gyp b/gpu.gyp index 31662ab..6f304d1 100644 --- a/gpu.gyp +++ b/gpu.gyp @@ -91,6 +91,7 @@ '../include/core', '../src/core', '../include/gpu', + '../src/gpu', ], 'dependencies': [ 'libtess.gyp:libtess', @@ -301,6 +302,7 @@ '../src/gpu/gl/GrGLTexture.cpp', '../src/gpu/gl/GrGLTexture.h', '../src/gpu/gl/GrGLUtil.cpp', + '../src/gpu/gl/GrGLUtil.h', '../src/gpu/gl/GrGLVertexBuffer.cpp', '../src/gpu/gl/GrGLVertexBuffer.h', '../src/gpu/gl/GrGpuGL.cpp', -- cgit v1.2.3 From e46fd126a4f46f04a46a2ca545277b82d23c98f2 Mon Sep 17 00:00:00 2001 From: "bsalomon@google.com" Date: Mon, 7 May 2012 17:28:41 +0000 Subject: Make GrGLDefines.h be a private header Review URL: http://codereview.appspot.com/6198048/ git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@3851 2bbb7eff-a529-9590-31e7-b0007b416f81 --- gpu.gyp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gpu.gyp b/gpu.gyp index 6f304d1..63dd6b2 100644 --- a/gpu.gyp +++ b/gpu.gyp @@ -201,7 +201,6 @@ '../include/gpu/gl/GrGLConfig.h', '../include/gpu/gl/GrGLConfig_chrome.h', - '../include/gpu/gl/GrGLDefines.h', '../include/gpu/gl/GrGLInterface.h', '../src/gpu/GrAAHairLinePathRenderer.cpp', @@ -284,6 +283,7 @@ '../src/gpu/gl/GrGLCreateNullInterface.cpp', '../src/gpu/gl/GrGLDefaultInterface_none.cpp', '../src/gpu/gl/GrGLDefaultInterface_native.cpp', + '../src/gpu/gl/GrGLDefines.h', '../src/gpu/gl/GrGLIndexBuffer.cpp', '../src/gpu/gl/GrGLIndexBuffer.h', '../src/gpu/gl/GrGLInterface.cpp', -- cgit v1.2.3 From e605c21d4d88e1deb138dcc2a772ad34869fd5f0 Mon Sep 17 00:00:00 2001 From: "reed@google.com" Date: Mon, 7 May 2012 20:23:27 +0000 Subject: impl SkTLS for windows, refactoring to share code with pthread impl git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@3859 2bbb7eff-a529-9590-31e7-b0007b416f81 --- core.gyp | 1 + 1 file changed, 1 insertion(+) diff --git a/core.gyp b/core.gyp index 07e6456..c2d98f0 100644 --- a/core.gyp +++ b/core.gyp @@ -138,6 +138,7 @@ '../src/core/SkStrokerPriv.cpp', '../src/core/SkStrokerPriv.h', '../src/core/SkTextFormatParams.h', + '../src/core/SkTLS.cpp', '../src/core/SkTSearch.cpp', '../src/core/SkTSort.h', '../src/core/SkTemplatesPriv.h', -- cgit v1.2.3 From 2bd2fbf7778d4f8d60a7a7d09f907265883b5765 Mon Sep 17 00:00:00 2001 From: "caryclark@google.com" Date: Mon, 7 May 2012 20:49:36 +0000 Subject: shape ops work in progress git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@3861 2bbb7eff-a529-9590-31e7-b0007b416f81 --- shapeops_edge.gyp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/shapeops_edge.gyp b/shapeops_edge.gyp index 92007a0..01469a6 100644 --- a/shapeops_edge.gyp +++ b/shapeops_edge.gyp @@ -38,6 +38,7 @@ '../experimental/Intersection/EdgeWalkerPolygons_Mismatches.cpp', '../experimental/Intersection/EdgeWalkerPolygons_Test.cpp', '../experimental/Intersection/EdgeWalkerQuadralaterals_Test.cpp', + '../experimental/Intersection/EdgeWalkerQuadratic4x4_Test.cpp', '../experimental/Intersection/EdgeWalkerQuadratics_Test.cpp', '../experimental/Intersection/EdgeWalkerRectangles_Test.cpp', '../experimental/Intersection/Extrema.cpp', @@ -55,6 +56,7 @@ '../experimental/Intersection/LineUtilities.cpp', '../experimental/Intersection/QuadraticBezierClip.cpp', '../experimental/Intersection/QuadraticBezierClip_Test.cpp', + '../experimental/Intersection/QuadraticBounds.cpp', '../experimental/Intersection/QuadraticIntersection.cpp', '../experimental/Intersection/QuadraticIntersection_Test.cpp', '../experimental/Intersection/QuadraticIntersection_TestData.cpp', @@ -65,6 +67,8 @@ '../experimental/Intersection/QuadraticSubDivide.cpp', '../experimental/Intersection/QuadraticUtilities.cpp', '../experimental/Intersection/RectUtilities.cpp', + '../experimental/Intersection/Simplify.cpp', + '../experimental/Intersection/SimplifyAddIntersectingTs_Test.cpp', '../experimental/Intersection/TestUtilities.cpp', '../experimental/Intersection/CubicIntersection_TestData.h', '../experimental/Intersection/CubicUtilities.h', -- cgit v1.2.3 From 130c43660c01ad3772f7f562572e1aca7cbd2433 Mon Sep 17 00:00:00 2001 From: "bsalomon@google.com" Date: Mon, 7 May 2012 21:33:56 +0000 Subject: Move GL function prototype typdefs to a separate header Review URL: http://codereview.appspot.com/6189054/ git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@3864 2bbb7eff-a529-9590-31e7-b0007b416f81 --- gpu.gyp | 1 + 1 file changed, 1 insertion(+) diff --git a/gpu.gyp b/gpu.gyp index 63dd6b2..1db7f80 100644 --- a/gpu.gyp +++ b/gpu.gyp @@ -201,6 +201,7 @@ '../include/gpu/gl/GrGLConfig.h', '../include/gpu/gl/GrGLConfig_chrome.h', + '../include/gpu/gl/GrGLFunctions.h', '../include/gpu/gl/GrGLInterface.h', '../src/gpu/GrAAHairLinePathRenderer.cpp', -- cgit v1.2.3 From 7069404358bdc931deec306110a9b9837d15bb35 Mon Sep 17 00:00:00 2001 From: "robertphillips@google.com" Date: Wed, 9 May 2012 21:15:28 +0000 Subject: Added stack to AA clip mask cache http://codereview.appspot.com/6201058/ git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@3885 2bbb7eff-a529-9590-31e7-b0007b416f81 --- tests.gyp | 1 + 1 file changed, 1 insertion(+) diff --git a/tests.gyp b/tests.gyp index 58039ba..e7d5724 100644 --- a/tests.gyp +++ b/tests.gyp @@ -23,6 +23,7 @@ '../tests/BlurTest.cpp', '../tests/CanvasTest.cpp', '../tests/ClampRangeTest.cpp', + '../tests/ClipCacheTest.cpp', '../tests/ClipCubicTest.cpp', '../tests/ClipStackTest.cpp', '../tests/ClipperTest.cpp', -- cgit v1.2.3 From d4c2328daf8b335dc3eed0c53442f41662943567 Mon Sep 17 00:00:00 2001 From: "tomhudson@google.com" Date: Thu, 10 May 2012 12:13:36 +0000 Subject: Move convolution from code in GrGLProgram to new GrConvolutionEffect class. This is the first test of the new Ganesh shader pipeline. Also includes some cleanup of the gpu.gyp file: added src/gpu, allowing us to remove ../ from many #include directives. http://codereview.appspot.com/6199053/ git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@3887 2bbb7eff-a529-9590-31e7-b0007b416f81 --- gpu.gyp | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/gpu.gyp b/gpu.gyp index 1db7f80..b30e5cf 100644 --- a/gpu.gyp +++ b/gpu.gyp @@ -164,6 +164,7 @@ '../include/config', '../include/gpu', '../src/core', # SkRasterClip.h + '../src/gpu' ], 'dependencies': [ 'libtess.gyp:libtess', @@ -248,6 +249,8 @@ '../src/gpu/GrPathUtils.cpp', '../src/gpu/GrPathUtils.h', '../src/gpu/GrPlotMgr.h', + '../src/gpu/GrProgramStageFactory.cpp', + '../src/gpu/GrProgramStageFactory.h', '../src/gpu/GrRandom.h', '../src/gpu/GrRectanizer.cpp', '../src/gpu/GrRectanizer.h', @@ -276,6 +279,9 @@ '../src/gpu/GrVertexBuffer.h', '../src/gpu/gr_unittests.cpp', + '../src/gpu/effects/GrConvolutionEffect.cpp', + '../src/gpu/effects/GrConvolutionEffect.h', + '../src/gpu/gl/GrGLCaps.cpp', '../src/gpu/gl/GrGLCaps.h', '../src/gpu/gl/GrGLContextInfo.cpp', -- cgit v1.2.3 From f53b0e8f797988df2fd11ee1a635549874a80568 Mon Sep 17 00:00:00 2001 From: "djsollen@google.com" Date: Fri, 11 May 2012 13:29:32 +0000 Subject: Set no rtti option to avoid warnings on Android. git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@3905 2bbb7eff-a529-9590-31e7-b0007b416f81 --- libjpeg.gyp | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/libjpeg.gyp b/libjpeg.gyp index dcf1450..77bc276 100644 --- a/libjpeg.gyp +++ b/libjpeg.gyp @@ -81,6 +81,11 @@ }, 'conditions': [ ['OS!="win"', {'product_name': 'jpeg'}], + ['OS=="android"', { + 'cflags!': [ + '-fno-rtti', # supresses warnings about invalid option of non-C++ code + ], + }], ], }, ], -- cgit v1.2.3 From 3e15dec665a955649a548826e2af265a1c1a0ff2 Mon Sep 17 00:00:00 2001 From: "bsalomon@google.com" Date: Fri, 11 May 2012 17:32:43 +0000 Subject: Remove tesselated path renderer and supporting code, glu, and libtess target Review URL: http://codereview.appspot.com/6197075/ git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@3912 2bbb7eff-a529-9590-31e7-b0007b416f81 --- gpu.gyp | 4 ---- libtess.gyp | 56 -------------------------------------------------------- 2 files changed, 60 deletions(-) delete mode 100644 libtess.gyp diff --git a/gpu.gyp b/gpu.gyp index b30e5cf..9d9c6c2 100644 --- a/gpu.gyp +++ b/gpu.gyp @@ -94,7 +94,6 @@ '../src/gpu', ], 'dependencies': [ - 'libtess.gyp:libtess', 'angle.gyp:*', ], 'export_dependent_settings': [ @@ -167,7 +166,6 @@ '../src/gpu' ], 'dependencies': [ - 'libtess.gyp:libtess', 'angle.gyp:*', ], 'export_dependent_settings': [ @@ -266,8 +264,6 @@ '../src/gpu/GrStringBuilder.h', '../src/gpu/GrTBSearch.h', '../src/gpu/GrTDArray.h', - '../src/gpu/GrTesselatedPathRenderer.cpp', - '../src/gpu/GrTesselatedPathRenderer.h', '../src/gpu/GrSoftwarePathRenderer.cpp', '../src/gpu/GrSoftwarePathRenderer.h', '../src/gpu/GrTextStrike.cpp', diff --git a/libtess.gyp b/libtess.gyp deleted file mode 100644 index c90ca12..0000000 --- a/libtess.gyp +++ /dev/null @@ -1,56 +0,0 @@ -{ - 'targets': [ - { - 'target_name': 'libtess', - 'type': 'static_library', - 'include_dirs': [ - '../third_party/glu', - ], - 'sources': [ - '../third_party/glu/sk_glu.h', - '../third_party/glu/gluos.h', - '../third_party/glu/libtess/dict-list.h', - '../third_party/glu/libtess/dict.c', - '../third_party/glu/libtess/dict.h', - '../third_party/glu/libtess/geom.c', - '../third_party/glu/libtess/geom.h', - '../third_party/glu/libtess/memalloc.c', - '../third_party/glu/libtess/memalloc.h', - '../third_party/glu/libtess/mesh.c', - '../third_party/glu/libtess/mesh.h', - '../third_party/glu/libtess/normal.c', - '../third_party/glu/libtess/normal.h', - '../third_party/glu/libtess/priorityq-heap.h', - '../third_party/glu/libtess/priorityq-sort.h', - '../third_party/glu/libtess/priorityq.c', - '../third_party/glu/libtess/priorityq.h', - '../third_party/glu/libtess/render.c', - '../third_party/glu/libtess/render.h', - '../third_party/glu/libtess/sweep.c', - '../third_party/glu/libtess/sweep.h', - '../third_party/glu/libtess/tess.c', - '../third_party/glu/libtess/tess.h', - '../third_party/glu/libtess/tessmono.c', - '../third_party/glu/libtess/tessmono.h', - ], - 'direct_dependent_settings': { - 'include_dirs': [ - '../third_party/glu', - ], - }, - 'conditions': [ - [ 'skia_os == "android"', { - 'cflags!': [ - '-fno-rtti', # supresses warnings about invalid option of non-C++ code - ], - }], - ], - }, - ], -} - -# Local Variables: -# tab-width:2 -# indent-tabs-mode:nil -# End: -# vim: set expandtab tabstop=2 shiftwidth=2: -- cgit v1.2.3 From ed1dcc6e70af71918d8dfc69205a6205c584b848 Mon Sep 17 00:00:00 2001 From: "tomhudson@google.com" Date: Fri, 11 May 2012 20:38:48 +0000 Subject: Extract ShaderCodeSegments from GrGLProgram into a new class, GrGLShaderBuilder. Begin populating its interface. Requires gyp changes. http://codereview.appspot.com/6197076/ git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@3916 2bbb7eff-a529-9590-31e7-b0007b416f81 --- gpu.gyp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/gpu.gyp b/gpu.gyp index 9d9c6c2..9ca225e 100644 --- a/gpu.gyp +++ b/gpu.gyp @@ -297,6 +297,8 @@ '../src/gpu/gl/GrGLProgramStage.h', '../src/gpu/gl/GrGLRenderTarget.cpp', '../src/gpu/gl/GrGLRenderTarget.h', + '../src/gpu/gl/GrGLShaderBuilder.cpp', + '../src/gpu/gl/GrGLShaderBuilder.h', '../src/gpu/gl/GrGLShaderVar.h', '../src/gpu/gl/GrGLSL.cpp', '../src/gpu/gl/GrGLSL.h', -- cgit v1.2.3 From ea08e220ed7811a4a0b127d8b064ad6c72dc229e Mon Sep 17 00:00:00 2001 From: "bungeman@google.com" Date: Mon, 14 May 2012 14:09:24 +0000 Subject: Add bench and test for SkRefCnt. http://codereview.appspot.com/6195071/ This also adds a cross platform SkThread for testing purposes. git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@3921 2bbb7eff-a529-9590-31e7-b0007b416f81 --- bench.gypi | 1 + tests.gyp | 1 + utils.gyp | 23 +++++++++++++++++++++++ 3 files changed, 25 insertions(+) diff --git a/bench.gypi b/bench.gypi index 8499ca1..221faed 100644 --- a/bench.gypi +++ b/bench.gypi @@ -33,6 +33,7 @@ '../bench/PathIterBench.cpp', '../bench/PicturePlaybackBench.cpp', '../bench/RectBench.cpp', + '../bench/RefCntBench.cpp', '../bench/RegionBench.cpp', '../bench/RepeatTileBench.cpp', '../bench/ScalarBench.cpp', diff --git a/tests.gyp b/tests.gyp index e7d5724..ec850a4 100644 --- a/tests.gyp +++ b/tests.gyp @@ -61,6 +61,7 @@ '../tests/Reader32Test.cpp', '../tests/ReadPixelsTest.cpp', '../tests/ReadWriteAlphaTest.cpp', + '../tests/RefCntTest.cpp', '../tests/RefDictTest.cpp', '../tests/RegionTest.cpp', '../tests/ScalarTest.cpp', diff --git a/utils.gyp b/utils.gyp index 2fca63f..d2c413e 100644 --- a/utils.gyp +++ b/utils.gyp @@ -56,6 +56,14 @@ '../src/utils/SkParsePath.cpp', '../src/utils/SkProxyCanvas.cpp', '../src/utils/SkSfntUtils.cpp', + '../src/utils/SkThreadUtils.h', + '../src/utils/SkThreadUtils_pthread.cpp', + '../src/utils/SkThreadUtils_pthread.h', + '../src/utils/SkThreadUtils_pthread_linux.cpp', + '../src/utils/SkThreadUtils_pthread_mach.cpp', + '../src/utils/SkThreadUtils_pthread_other.cpp', + '../src/utils/SkThreadUtils_win.cpp', + '../src/utils/SkThreadUtils_win.h', '../src/utils/SkUnitMappers.cpp', #mac @@ -87,6 +95,9 @@ '../include/utils/mac', ], }, + 'sources!': [ + '../src/utils/SkThreadUtils_pthread_other.cpp', + ], },{ #else if 'skia_os != "mac"' 'include_dirs!': [ '../include/utils/mac', @@ -94,6 +105,7 @@ 'sources!': [ '../include/utils/mac/SkCGUtils.h', '../src/utils/mac/SkCreateCGImageRef.cpp', + '../src/utils/SkThreadUtils_pthread_mach.cpp', ], }], [ 'skia_os in ["linux", "freebsd", "openbsd", "solaris"]', { @@ -103,10 +115,16 @@ '-lGLU', ], }, + 'sources!': [ + '../src/utils/SkThreadUtils_pthread_other.cpp', + ], },{ #else if 'skia_os not in ["linux", "freebsd", "openbsd", "solaris"]' 'include_dirs!': [ '../include/utils/unix', ], + 'sources!': [ + '../src/utils/SkThreadUtils_pthread_linux.cpp', + ], }], [ 'skia_os == "win"', { 'direct_dependent_settings': { @@ -114,6 +132,11 @@ '../include/utils/win', ], }, + 'sources!': [ + '../src/utils/SkThreadUtils_pthread.cpp', + '../src/utils/SkThreadUtils_pthread.h', + '../src/utils/SkThreadUtils_pthread_other.cpp', + ], },{ #else if 'skia_os != "win"' 'include_dirs!': [ '../include/utils/win', -- cgit v1.2.3 From 1a4dba9d8ae18e2c127a381bc3959feac88176d4 Mon Sep 17 00:00:00 2001 From: "robertphillips@google.com" Date: Mon, 14 May 2012 16:33:36 +0000 Subject: Debug Windows compiler complaint fixes http://codereview.appspot.com/6208055/ git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@3924 2bbb7eff-a529-9590-31e7-b0007b416f81 --- gpu.gyp | 2 -- 1 file changed, 2 deletions(-) diff --git a/gpu.gyp b/gpu.gyp index 9ca225e..04cb4e3 100644 --- a/gpu.gyp +++ b/gpu.gyp @@ -320,9 +320,7 @@ '../src/gpu/gl/debug/GrBufferObj.h', '../src/gpu/gl/debug/GrBufferObj.cpp', '../src/gpu/gl/debug/GrFBBindableObj.h', - '../src/gpu/gl/debug/GrFBBindableObj.cpp', '../src/gpu/gl/debug/GrRenderBufferObj.h', - '../src/gpu/gl/debug/GrRenderBufferObj.cpp', '../src/gpu/gl/debug/GrTextureObj.h', '../src/gpu/gl/debug/GrTextureObj.cpp', '../src/gpu/gl/debug/GrTextureUnitObj.h', -- cgit v1.2.3 From a441dced9d52baf4f8cd34ddbe264bd53830231a Mon Sep 17 00:00:00 2001 From: "bungeman@google.com" Date: Wed, 16 May 2012 18:21:56 +0000 Subject: WeakRefCnt http://codereview.appspot.com/5649046/ git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@3978 2bbb7eff-a529-9590-31e7-b0007b416f81 --- core.gyp | 1 + ports.gyp | 8 ++++++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/core.gyp b/core.gyp index c2d98f0..c9ff391 100644 --- a/core.gyp +++ b/core.gyp @@ -233,6 +233,7 @@ '../include/core/SkUnPreMultiply.h', '../include/core/SkUnitMapper.h', '../include/core/SkUtils.h', + '../include/core/SkWeakRefCnt.h', '../include/core/SkWriter32.h', '../include/core/SkXfermode.h', ], diff --git a/ports.gyp b/ports.gyp index 73dd594..8b29acb 100644 --- a/ports.gyp +++ b/ports.gyp @@ -4,14 +4,18 @@ { 'target_name': 'ports', 'type': 'static_library', + 'dependencies': [ + 'core.gyp:core', + 'sfnt.gyp:sfnt', + 'utils.gyp:utils', + ], 'include_dirs': [ - '../include/config', - '../include/core', '../include/images', '../include/effects', '../include/ports', '../include/xml', '../src/core', + '../src/utils', ], 'sources': [ '../src/ports/SkDebug_stdio.cpp', -- cgit v1.2.3 From 12fbc30293cb2847514c03b75c23fcc5718ca7d5 Mon Sep 17 00:00:00 2001 From: "reed@google.com" Date: Thu, 17 May 2012 13:58:26 +0000 Subject: move Release build to -O3 (from -O2) git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@3988 2bbb7eff-a529-9590-31e7-b0007b416f81 --- common_conditions.gypi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common_conditions.gypi b/common_conditions.gypi index cfb67ae..7f6fbd3 100644 --- a/common_conditions.gypi +++ b/common_conditions.gypi @@ -86,7 +86,7 @@ 'cflags': ['-g'] }, 'Release': { - 'cflags': ['-O2'], + 'cflags': ['-O3'], 'defines': [ 'NDEBUG' ], }, }, -- cgit v1.2.3 From bd8fbf68b5090c3bb881cf26caa7afa07a7445be Mon Sep 17 00:00:00 2001 From: "reed@google.com" Date: Thu, 17 May 2012 14:28:11 +0000 Subject: change SkChunkAlloc to grow its allocations geometrically (not linearly) plus add a bench and unittest for it. git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@3989 2bbb7eff-a529-9590-31e7-b0007b416f81 --- bench.gypi | 1 + 1 file changed, 1 insertion(+) diff --git a/bench.gypi b/bench.gypi index 221faed..0489ac6 100644 --- a/bench.gypi +++ b/bench.gypi @@ -28,6 +28,7 @@ '../bench/InterpBench.cpp', '../bench/MathBench.cpp', '../bench/MatrixBench.cpp', + '../bench/MemoryBench.cpp', '../bench/MutexBench.cpp', '../bench/PathBench.cpp', '../bench/PathIterBench.cpp', -- cgit v1.2.3 From 78bf6abe8095b2d4a55d1a0778504b9e8fad3f66 Mon Sep 17 00:00:00 2001 From: "bungeman@google.com" Date: Fri, 18 May 2012 19:06:41 +0000 Subject: CreateTypefaceFromStream for GDI. http://codereview.appspot.com/5616047/ git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@4001 2bbb7eff-a529-9590-31e7-b0007b416f81 --- tests.gyp | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/tests.gyp b/tests.gyp index ec850a4..631d280 100644 --- a/tests.gyp +++ b/tests.gyp @@ -38,6 +38,7 @@ '../tests/EmptyPathTest.cpp', '../tests/FillPathTest.cpp', '../tests/FlateTest.cpp', + '../tests/FontHostStreamTest.cpp', '../tests/FontHostTest.cpp', '../tests/GeometryTest.cpp', '../tests/GLInterfaceValidation.cpp', @@ -94,6 +95,14 @@ 'pdf.gyp:pdf', 'utils.gyp:utils', ], + 'conditions': [ + [ 'skia_os == "mac"', { + 'sources!': [ + #mac port currently does not support fonts from streams. + '../tests/FontHostStreamTest.cpp', + ], + }], + ], }, ], } -- cgit v1.2.3 From e13599632d37f2393af808892220a3f06ef32d02 Mon Sep 17 00:00:00 2001 From: "bsalomon@google.com" Date: Fri, 18 May 2012 19:54:48 +0000 Subject: Some refactoring of GrCustomStage and friends Review URL: http://codereview.appspot.com/6209071/ git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@4003 2bbb7eff-a529-9590-31e7-b0007b416f81 --- gpu.gyp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/gpu.gyp b/gpu.gyp index 04cb4e3..621ea02 100644 --- a/gpu.gyp +++ b/gpu.gyp @@ -187,6 +187,7 @@ '../include/gpu/GrNoncopyable.h', '../include/gpu/GrPaint.h', '../include/gpu/GrPoint.h', + '../include/gpu/GrProgramStageFactory.h', '../include/gpu/GrRect.h', '../include/gpu/GrRefCnt.h', '../include/gpu/GrRenderTarget.h', @@ -247,8 +248,6 @@ '../src/gpu/GrPathUtils.cpp', '../src/gpu/GrPathUtils.h', '../src/gpu/GrPlotMgr.h', - '../src/gpu/GrProgramStageFactory.cpp', - '../src/gpu/GrProgramStageFactory.h', '../src/gpu/GrRandom.h', '../src/gpu/GrRectanizer.cpp', '../src/gpu/GrRectanizer.h', -- cgit v1.2.3 From 4e12f66682baa7db5934bb639091bc70287f99b8 Mon Sep 17 00:00:00 2001 From: "caryclark@google.com" Date: Fri, 18 May 2012 20:50:33 +0000 Subject: shape ops work in progress git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@4006 2bbb7eff-a529-9590-31e7-b0007b416f81 --- shapeops_edge.gyp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/shapeops_edge.gyp b/shapeops_edge.gyp index 01469a6..defe7cd 100644 --- a/shapeops_edge.gyp +++ b/shapeops_edge.gyp @@ -69,14 +69,15 @@ '../experimental/Intersection/RectUtilities.cpp', '../experimental/Intersection/Simplify.cpp', '../experimental/Intersection/SimplifyAddIntersectingTs_Test.cpp', + '../experimental/Intersection/SimplifyAngle_Test.cpp', + '../experimental/Intersection/SimplifyFindNext_Test.cpp', + '../experimental/Intersection/SimplifyFindTop_Test.cpp', '../experimental/Intersection/TestUtilities.cpp', '../experimental/Intersection/CubicIntersection_TestData.h', '../experimental/Intersection/CubicUtilities.h', '../experimental/Intersection/CurveIntersection.h', '../experimental/Intersection/DataTypes.h', - '../experimental/Intersection/EdgeMain.h', '../experimental/Intersection/EdgeWalker_Test.h', - '../experimental/Intersection/EdgeWalkerPolygons_Mismatches.h', '../experimental/Intersection/Extrema.h', '../experimental/Intersection/Intersection_Tests.h', '../experimental/Intersection/Intersections.h', @@ -88,6 +89,7 @@ '../experimental/Intersection/QuadraticIntersection_TestData.h', '../experimental/Intersection/QuadraticUtilities.h', '../experimental/Intersection/ShapeOps.h', + '../experimental/Intersection/Simplify.h', '../experimental/Intersection/TestUtilities.h', '../experimental/Intersection/TSearch.h', '../experimental/Intersection/thingsToDo.txt', -- cgit v1.2.3 From f293ad95c6268fdf19cde1efeeaefffc87ccde9b Mon Sep 17 00:00:00 2001 From: "reed@google.com" Date: Mon, 21 May 2012 15:29:27 +0000 Subject: ~glyphcache_globals needs to actually delete its cache git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@4011 2bbb7eff-a529-9590-31e7-b0007b416f81 --- tests.gyp | 1 + 1 file changed, 1 insertion(+) diff --git a/tests.gyp b/tests.gyp index 631d280..3ea3b61 100644 --- a/tests.gyp +++ b/tests.gyp @@ -76,6 +76,7 @@ '../tests/Test.cpp', '../tests/Test.h', '../tests/TestSize.cpp', + '../tests/TLSTest.cpp', '../tests/ToUnicode.cpp', '../tests/UnicodeTest.cpp', '../tests/UtilsTest.cpp', -- cgit v1.2.3 From 30d443ca4d908c11f4d8bff27e75f591fd6ef2fc Mon Sep 17 00:00:00 2001 From: "robertphillips@google.com" Date: Tue, 22 May 2012 12:14:50 +0000 Subject: Converted AAClips SampleApp slide to GM:simpleaaclip http://codereview.appspot.com/6220043/ git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@4025 2bbb7eff-a529-9590-31e7-b0007b416f81 --- SampleApp.gyp | 1 - gm.gyp | 3 +++ gmslides.gypi | 1 + 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/SampleApp.gyp b/SampleApp.gyp index a9af72a..8452488 100644 --- a/SampleApp.gyp +++ b/SampleApp.gyp @@ -24,7 +24,6 @@ '../samplecode/OverView.cpp', '../samplecode/Sample2PtRadial.cpp', '../samplecode/SampleAAClip.cpp', - '../samplecode/SampleAAClip2.cpp', '../samplecode/SampleAARects.cpp', '../samplecode/SampleAARectModes.cpp', '../samplecode/SampleAll.cpp', diff --git a/gm.gyp b/gm.gyp index 9e3eaac..b333130 100644 --- a/gm.gyp +++ b/gm.gyp @@ -7,6 +7,9 @@ { 'target_name': 'gm', 'type': 'executable', + 'include_dirs' : [ + '../src/core', + ], 'includes': [ 'gmslides.gypi', ], diff --git a/gmslides.gypi b/gmslides.gypi index 659fe9f..2b64074 100644 --- a/gmslides.gypi +++ b/gmslides.gypi @@ -46,6 +46,7 @@ '../gm/shadertext.cpp', '../gm/shadows.cpp', '../gm/shapes.cpp', + '../gm/simpleaaclip.cpp', '../gm/strokefill.cpp', '../gm/strokerects.cpp', '../gm/strokes.cpp', -- cgit v1.2.3 From dab8378d90fad65b9e501621f3a1bc86fbc9b4c4 Mon Sep 17 00:00:00 2001 From: "caryclark@google.com" Date: Wed, 23 May 2012 18:09:25 +0000 Subject: shape ops work in progress (get rid of some warnings) git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@4037 2bbb7eff-a529-9590-31e7-b0007b416f81 --- shapeops_edge.gyp | 1 + 1 file changed, 1 insertion(+) diff --git a/shapeops_edge.gyp b/shapeops_edge.gyp index defe7cd..37ef610 100644 --- a/shapeops_edge.gyp +++ b/shapeops_edge.gyp @@ -72,6 +72,7 @@ '../experimental/Intersection/SimplifyAngle_Test.cpp', '../experimental/Intersection/SimplifyFindNext_Test.cpp', '../experimental/Intersection/SimplifyFindTop_Test.cpp', + '../experimental/Intersection/SimplifyNew_Test.cpp', '../experimental/Intersection/TestUtilities.cpp', '../experimental/Intersection/CubicIntersection_TestData.h', '../experimental/Intersection/CubicUtilities.h', -- cgit v1.2.3 From b18f85ef3cf6ae5c44f5f9957f8fdcfc109658bd Mon Sep 17 00:00:00 2001 From: "digit@google.com" Date: Wed, 30 May 2012 13:54:41 +0000 Subject: arm: First step towards dynamic NEON support. This patch adds minimal support for dynamic ARM NEON support, i.e. the ability to probe the CPU at runtime for NEON and provide alternate code paths when it is available. - Add include/core/SkUtilsArm.h, which declares a few helper macros (e.g. SK_NEON_ARM_IS_DYNAMIC), plus the handy function 'sk_cpu_arm_has_neon()' which returns true if the target CPU supports the ARM NEON instruction set. Note that the header is in include/core/ because it will have to be included from NEON-specific code under src/code/ It would probably be more logical to put it under include/opts/ instead, but this would require moving all the NEON-specific stuff under src/code/ into src/opts/, which is not trivial due to the way the code is currently architected. - Add src/core/SkUtilsArm.cpp which implements 'sk_cpu_arm_has_neon' for ARM-based Linux systems, only when SK_NEON_ARM_IS_DYNAMIC is true. (For other cases, 'sk_cpu_arm_has_neon' is an inline function that returns a constant 'true' or 'false' value). There is no user-level accessible CPUID instruction on ARM, so do all CPU feature probing by parsing /proc/cpuinfo. This is Linux-specific. For Debug build types, the CPU probing result is printed to the Android log (or Linux command-line) for easier debugging. - Create a new 'opts_neon' target (static library) which shall contain all the NEON-specific code paths for the library. This is necessary because -mfpu=neon impacts also non-scalar code. Just like with -mssse3 on x86, we can't build the rest of the library with this flag. Note that for now, we only include memset16_neon and memset32_neon in this library. - Modify opts_check_arm.cpp to implement SK_ARM_NEON_IS_DYNAMIC properly. Compared to a 'xoom' build, the only difference is the use of NEON-optimized memset16/32 functions. Later patches will move more NEON-specific code paths to 'opts_neon'. Review URL: https://codereview.appspot.com/6247058 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@4069 2bbb7eff-a529-9590-31e7-b0007b416f81 --- common_conditions.gypi | 10 +++++++++- core.gyp | 9 ++++++++- opts.gyp | 39 +++++++++++++++++++++++++++++++++++++-- 3 files changed, 54 insertions(+), 4 deletions(-) diff --git a/common_conditions.gypi b/common_conditions.gypi index 7f6fbd3..ab98171 100644 --- a/common_conditions.gypi +++ b/common_conditions.gypi @@ -192,6 +192,9 @@ ], }], [ 'skia_target_arch == "arm" and armv7 == 1', { + 'variables': { + 'arm_neon_optional%': 0, + }, 'defines': [ '__ARM_ARCH__=7', ], @@ -207,7 +210,12 @@ 'cflags': [ '-mfpu=neon', ], - }], + }], + [ 'arm_neon_optional == 1', { + 'defines': [ + '__ARM_HAVE_OPTIONAL_NEON_SUPPORT', + ], + }], ], }], ], diff --git a/core.gyp b/core.gyp index c9ff391..6d5cd13 100644 --- a/core.gyp +++ b/core.gyp @@ -233,6 +233,7 @@ '../include/core/SkUnPreMultiply.h', '../include/core/SkUnitMapper.h', '../include/core/SkUtils.h', + '../include/core/SkUtilsArm.h', '../include/core/SkWeakRefCnt.h', '../include/core/SkWriter32.h', '../include/core/SkXfermode.h', @@ -304,7 +305,13 @@ 'dependencies': [ 'android_system.gyp:ft2', ], - }], + }], + [ 'skia_os == "android" and skia_target_arch == "arm" and armv7 == 1', { + # The code in SkUtilsArm.cpp can be used on an ARM-based Linux system, not only Android. + 'sources': [ + '../src/core/SkUtilsArm.cpp', + ], + }], ], 'direct_dependent_settings': { 'include_dirs': [ diff --git a/opts.gyp b/opts.gyp index cf8e6dd..41cb0ed 100644 --- a/opts.gyp +++ b/opts.gyp @@ -56,14 +56,22 @@ 'cflags': [ '-fomit-frame-pointer', ], + 'variables': { + 'arm_neon_optional%': '<(arm_neon_optional>', + }, 'sources': [ '../src/opts/opts_check_arm.cpp', '../src/opts/memset.arm.S', - '../src/opts/memset16_neon.S', - '../src/opts/memset32_neon.S', '../src/opts/SkBitmapProcState_opts_arm.cpp', '../src/opts/SkBlitRow_opts_arm.cpp', ], + 'conditions': [ + [ 'arm_neon == 1 or arm_neon_optional == 1', { + 'dependencies': [ + 'opts_neon', + ] + }] + ], }], [ 'skia_target_arch == "arm" and armv7 != 1', { 'sources': [ @@ -107,6 +115,33 @@ }], ], }, + # NEON code must be compiled with -mfpu=neon which also affects scalar + # code. To support dynamic NEON code paths, we need to build all + # NEON-specific sources in a separate static library. The situation + # is very similar to the SSSE3 one. + { + 'target_name': 'opts_neon', + 'type': 'static_library', + 'include_dirs': [ + '../include/config', + '../include/core', + '../src/core', + ], + 'cflags!': [ + '-fno-omit-frame-pointer', + '-mfpu=vfp', # remove them all, just in case. + '-mfpu=vfpv3', + '-mfpu=vfpv3-d16', + ], + 'cflags': [ + '-fomit-frame-pointer', + '-mfpu=neon', + ], + 'sources': [ + '../src/opts/memset16_neon.S', + '../src/opts/memset32_neon.S', + ], + }, ], } -- cgit v1.2.3 From aef67e83427e6c2f006e8850a225db784614cc4d Mon Sep 17 00:00:00 2001 From: "djsollen@google.com" Date: Wed, 30 May 2012 16:50:11 +0000 Subject: Add bench to test the performance of creating a picture. Review URL: https://codereview.appspot.com/6258062 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@4076 2bbb7eff-a529-9590-31e7-b0007b416f81 --- bench.gypi | 1 + 1 file changed, 1 insertion(+) diff --git a/bench.gypi b/bench.gypi index 0489ac6..ce089d6 100644 --- a/bench.gypi +++ b/bench.gypi @@ -33,6 +33,7 @@ '../bench/PathBench.cpp', '../bench/PathIterBench.cpp', '../bench/PicturePlaybackBench.cpp', + '../bench/PictureRecordBench.cpp', '../bench/RectBench.cpp', '../bench/RefCntBench.cpp', '../bench/RegionBench.cpp', -- cgit v1.2.3 From f4b3e81f98daba4db8362dd35d8fed424d2e6522 Mon Sep 17 00:00:00 2001 From: "caryclark@google.com" Date: Thu, 31 May 2012 12:39:18 +0000 Subject: suppress warning on Mac http://codereview.appspot.com/6245070/ M gyp/common_conditions.gypi git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@4087 2bbb7eff-a529-9590-31e7-b0007b416f81 --- common_conditions.gypi | 1 + 1 file changed, 1 insertion(+) diff --git a/common_conditions.gypi b/common_conditions.gypi index ab98171..985f1bd 100644 --- a/common_conditions.gypi +++ b/common_conditions.gypi @@ -132,6 +132,7 @@ # trying to get this to work, but it needs clang I think... # 'WARNING_CFLAGS': '-Wexit-time-destructors', 'CLANG_WARN_CXX0X_EXTENSIONS': 'NO', + 'OTHER_CPLUSPLUSFLAGS': '-mssse3 -fvisibility=hidden -fvisibility-inlines-hidden', }, }, ], -- cgit v1.2.3 From fd558ddc7b8bd0bbf1e2cfd04852510588252072 Mon Sep 17 00:00:00 2001 From: "bsalomon@google.com" Date: Thu, 31 May 2012 14:12:46 +0000 Subject: Use a single GrDrawState in GrContext for direct and buffered drawing Review URL: http://codereview.appspot.com/5933043 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@4091 2bbb7eff-a529-9590-31e7-b0007b416f81 --- common_conditions.gypi | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/common_conditions.gypi b/common_conditions.gypi index 985f1bd..ad4d81f 100644 --- a/common_conditions.gypi +++ b/common_conditions.gypi @@ -47,18 +47,19 @@ 'Release': { 'msvs_settings': { 'VCCLCompilerTool': { - 'DebugInformationFormat': '3', # programDatabase (/Zi) + 'DebugInformationFormat': '3', # programDatabase (/Zi) 'ProgramDataBaseFileName': '$(OutDir)\\$(ProjectName).pdb', - 'Optimization': '3', # full (/Ox) + 'Optimization': '3', # full (/Ox) 'WholeProgramOptimization': 'true', #/GL # Changing the floating point model requires rebaseling gm images - #'FloatingPointModel': '2', # fast (/fp:fast) - 'FavorSizeOrSpeed': '1', # speed (/Ot) + #'FloatingPointModel': '2', # fast (/fp:fast) + 'FavorSizeOrSpeed': '1', # speed (/Ot) 'PreprocessorDefinitions': ['NDEBUG'], - 'RuntimeLibrary': '2', # rtMultiThreadedDLL (/MD) + 'RuntimeLibrary': '2', # rtMultiThreadedDLL (/MD) 'ExceptionHandling': '0', - 'RuntimeTypeInfo': 'false', # /GR- - 'WarningLevel': '3', # level3 (/W3) + 'EnableEnhancedInstructionSet': '2',# /arch:SSE2 + 'RuntimeTypeInfo': 'false', # /GR- + 'WarningLevel': '3', # level3 (/W3) }, 'VCLinkerTool': { 'GenerateDebugInformation': 'true', # /DEBUG -- cgit v1.2.3 From a2cd167a7034e1187e4bb48f50cf5dcfc7dbc55f Mon Sep 17 00:00:00 2001 From: "bsalomon@google.com" Date: Thu, 31 May 2012 15:07:19 +0000 Subject: Merge GrGpuGLShaders into its parent class, GrGpuGL Review URL: http://codereview.appspot.com/6245076/ git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@4095 2bbb7eff-a529-9590-31e7-b0007b416f81 --- gpu.gyp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/gpu.gyp b/gpu.gyp index 621ea02..2292236 100644 --- a/gpu.gyp +++ b/gpu.gyp @@ -311,8 +311,7 @@ '../src/gpu/gl/GrGLVertexBuffer.h', '../src/gpu/gl/GrGpuGL.cpp', '../src/gpu/gl/GrGpuGL.h', - '../src/gpu/gl/GrGpuGLShaders.cpp', - '../src/gpu/gl/GrGpuGLShaders.h', + '../src/gpu/gl/GrGpuGL_program.cpp', '../src/gpu/gl/debug/GrGLCreateDebugInterface.cpp', '../src/gpu/gl/debug/GrFakeRefObj.h', -- cgit v1.2.3 From d0649634415b49f115de58a8b011e32e84344e3a Mon Sep 17 00:00:00 2001 From: "bsalomon@google.com" Date: Thu, 31 May 2012 18:40:36 +0000 Subject: Implement morphology as a custom effect Review URL: http://codereview.appspot.com/6250073/ git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@4102 2bbb7eff-a529-9590-31e7-b0007b416f81 --- gpu.gyp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/gpu.gyp b/gpu.gyp index 2292236..8594545 100644 --- a/gpu.gyp +++ b/gpu.gyp @@ -274,8 +274,11 @@ '../src/gpu/GrVertexBuffer.h', '../src/gpu/gr_unittests.cpp', + '../src/gpu/effects/Gr1DKernelEffect.h', '../src/gpu/effects/GrConvolutionEffect.cpp', '../src/gpu/effects/GrConvolutionEffect.h', + '../src/gpu/effects/GrMorphologyEffect.cpp', + '../src/gpu/effects/GrMorphologyEffect.h', '../src/gpu/gl/GrGLCaps.cpp', '../src/gpu/gl/GrGLCaps.h', -- cgit v1.2.3 From f79a5cde5f9916760165d20a9af1f448d5973950 Mon Sep 17 00:00:00 2001 From: "bungeman@google.com" Date: Thu, 31 May 2012 19:10:30 +0000 Subject: Enable typeface from stream test for Mac. git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@4103 2bbb7eff-a529-9590-31e7-b0007b416f81 --- tests.gyp | 8 -------- 1 file changed, 8 deletions(-) diff --git a/tests.gyp b/tests.gyp index 3ea3b61..c37e6b8 100644 --- a/tests.gyp +++ b/tests.gyp @@ -96,14 +96,6 @@ 'pdf.gyp:pdf', 'utils.gyp:utils', ], - 'conditions': [ - [ 'skia_os == "mac"', { - 'sources!': [ - #mac port currently does not support fonts from streams. - '../tests/FontHostStreamTest.cpp', - ], - }], - ], }, ], } -- cgit v1.2.3 From fa98c90b2494b098777b6aa16c0db64659a6e137 Mon Sep 17 00:00:00 2001 From: "tomhudson@google.com" Date: Thu, 31 May 2012 19:40:13 +0000 Subject: Add GrGradientEffects files. These implementations will be invoked from GrGLPrograms in a further change, replacing the current CoordMapping enums. http://codereview.appspot.com/6250081/ git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@4104 2bbb7eff-a529-9590-31e7-b0007b416f81 --- gpu.gyp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/gpu.gyp b/gpu.gyp index 8594545..bd415b4 100644 --- a/gpu.gyp +++ b/gpu.gyp @@ -277,6 +277,8 @@ '../src/gpu/effects/Gr1DKernelEffect.h', '../src/gpu/effects/GrConvolutionEffect.cpp', '../src/gpu/effects/GrConvolutionEffect.h', + '../src/gpu/effects/GrGradientEffects.cpp', + '../src/gpu/effects/GrGradientEffects.h', '../src/gpu/effects/GrMorphologyEffect.cpp', '../src/gpu/effects/GrMorphologyEffect.h', -- cgit v1.2.3 From fa061dac66583848335d99b649ff916e229314b7 Mon Sep 17 00:00:00 2001 From: "djsollen@google.com" Date: Thu, 31 May 2012 19:55:08 +0000 Subject: Add SkFontDescriptor for serializing fonts. Review URL: https://codereview.appspot.com/6250080 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@4106 2bbb7eff-a529-9590-31e7-b0007b416f81 --- ports.gyp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ports.gyp b/ports.gyp index 8b29acb..9436970 100644 --- a/ports.gyp +++ b/ports.gyp @@ -20,6 +20,8 @@ 'sources': [ '../src/ports/SkDebug_stdio.cpp', '../src/ports/SkDebug_win.cpp', + '../src/ports/SkFontDescriptor.h', + '../src/ports/SkFontDescriptor.cpp', '../src/ports/SkFontHost_sandbox_none.cpp', '../src/ports/SkFontHost_win.cpp', '../src/ports/SkGlobalInitialization_default.cpp', -- cgit v1.2.3 From 452cb86811c0dc83f09378077a468b87299b5356 Mon Sep 17 00:00:00 2001 From: "bsalomon@google.com" Date: Fri, 1 Jun 2012 19:28:26 +0000 Subject: Move GrGpuGL::programUnitTest into its own file Review URL: http://codereview.appspot.com/6272043/ git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@4124 2bbb7eff-a529-9590-31e7-b0007b416f81 --- gpu.gyp | 1 + 1 file changed, 1 insertion(+) diff --git a/gpu.gyp b/gpu.gyp index bd415b4..100ad82 100644 --- a/gpu.gyp +++ b/gpu.gyp @@ -317,6 +317,7 @@ '../src/gpu/gl/GrGpuGL.cpp', '../src/gpu/gl/GrGpuGL.h', '../src/gpu/gl/GrGpuGL_program.cpp', + '../src/gpu/gl/GrGpuGL_unittest.cpp', '../src/gpu/gl/debug/GrGLCreateDebugInterface.cpp', '../src/gpu/gl/debug/GrFakeRefObj.h', -- cgit v1.2.3 From f012988ff4a0b5695447917e18701de5b807281b Mon Sep 17 00:00:00 2001 From: "reed@google.com" Date: Mon, 4 Jun 2012 12:05:43 +0000 Subject: --pictureDir foo will load serialized pictures <>.skp from the foo directory git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@4132 2bbb7eff-a529-9590-31e7-b0007b416f81 --- SampleApp.gyp | 1 + 1 file changed, 1 insertion(+) diff --git a/SampleApp.gyp b/SampleApp.gyp index 8452488..0c370ab 100644 --- a/SampleApp.gyp +++ b/SampleApp.gyp @@ -83,6 +83,7 @@ '../samplecode/SamplePathClip.cpp', '../samplecode/SamplePathEffects.cpp', '../samplecode/SamplePicture.cpp', + '../samplecode/SamplePictFile.cpp', '../samplecode/SamplePoints.cpp', '../samplecode/SamplePolyToPoly.cpp', '../samplecode/SampleRegion.cpp', -- cgit v1.2.3 From 2b1534d37b8ddecc577637ad33b0b70dab2bf284 Mon Sep 17 00:00:00 2001 From: "scroggo@google.com" Date: Mon, 4 Jun 2012 17:17:36 +0000 Subject: Make the GM tool run GMs through an SkGPipe. Add pipe to core gyp project. Do not run samplerstress through the pipe, since its custom MaskFilter will not draw correctly. Fix an assert in SkGPipeWrite when writing a typeface. Review URL: https://codereview.appspot.com/6276044 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@4139 2bbb7eff-a529-9590-31e7-b0007b416f81 --- SampleApp.gyp | 7 +------ core.gyp | 4 ++++ gm.gyp | 2 +- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/SampleApp.gyp b/SampleApp.gyp index 0c370ab..c426508 100644 --- a/SampleApp.gyp +++ b/SampleApp.gyp @@ -8,7 +8,6 @@ 'include_dirs' : [ '../src/core', # needed to get SkConcaveToTriangle, maybe this should be moved to include dir? '../gm', # needed to pull gm.h - '../include/pipe', # To pull in SkGPipe.h for pipe reader/writer '../samplecode', # To pull SampleApp.h and SampleCode.h '../src/gpu', # To pull gl/GrGLUtil.h ], @@ -111,11 +110,7 @@ '../samplecode/SampleXfermodes.cpp', '../samplecode/SampleXfermodesBlur.cpp', '../samplecode/TransitionView.cpp', - - # Dependencies for the pipe code in SampleApp - '../src/pipe/SkGPipeRead.cpp', - '../src/pipe/SkGPipeWrite.cpp', - + # DrawingBoard #'../experimental/DrawingBoard/SkColorPalette.h', #'../experimental/DrawingBoard/SkColorPalette.cpp', diff --git a/core.gyp b/core.gyp index 6d5cd13..aea2a73 100644 --- a/core.gyp +++ b/core.gyp @@ -149,6 +149,8 @@ '../src/core/SkUtils.cpp', '../src/core/SkWriter32.cpp', '../src/core/SkXfermode.cpp', + '../src/pipe/SkGPipeRead.cpp', + '../src/pipe/SkGPipeWrite.cpp', '../include/core/Sk64.h', '../include/core/SkAdvancedTypefaceMetrics.h', @@ -241,6 +243,7 @@ 'include_dirs': [ '../include/config', '../include/core', + '../include/pipe', '../include/ports', '../include/xml', '../src/core', @@ -318,6 +321,7 @@ 'config', '../include/config', '../include/core', + '../include/pipe', 'ext', ], }, diff --git a/gm.gyp b/gm.gyp index b333130..980c199 100644 --- a/gm.gyp +++ b/gm.gyp @@ -24,8 +24,8 @@ 'gpu.gyp:gr', 'gpu.gyp:skgr', 'images.gyp:images', - 'ports.gyp:ports', 'pdf.gyp:pdf', + 'ports.gyp:ports', 'utils.gyp:utils', ], 'conditions': [ -- cgit v1.2.3 From cf45a9c9b0c0e7dc34f026c7a1bc99d1bc7efc41 Mon Sep 17 00:00:00 2001 From: "robertphillips@google.com" Date: Tue, 5 Jun 2012 12:55:05 +0000 Subject: Fixed flattening of SkStippleMaskFilter http://codereview.appspot.com/6279052/ git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@4154 2bbb7eff-a529-9590-31e7-b0007b416f81 --- effects.gyp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/effects.gyp b/effects.gyp index 394ec30..7d0cd9a 100644 --- a/effects.gyp +++ b/effects.gyp @@ -33,6 +33,7 @@ '../include/effects/SkPixelXorXfermode.h', '../include/effects/SkPorterDuff.h', '../include/effects/SkRectShape.h', + '../include/effects/SkStippleMaskFilter.h', '../include/effects/SkTableColorFilter.h', '../include/effects/SkTableMaskFilter.h', '../include/effects/SkTransparentShader.h', @@ -71,6 +72,7 @@ '../src/effects/SkPorterDuff.cpp', '../src/effects/SkRadialGradient_Table.h', '../src/effects/SkRectShape.cpp', + '../src/effects/SkStippleMaskFilter.cpp', '../src/effects/SkTableColorFilter.cpp', '../src/effects/SkTableMaskFilter.cpp', '../src/effects/SkTestImageFilters.cpp', -- cgit v1.2.3 From 239e2b61d8bbda29b5038f3b9c7d54dae8591b49 Mon Sep 17 00:00:00 2001 From: "robertphillips@google.com" Date: Tue, 5 Jun 2012 15:40:54 +0000 Subject: Added instance counting system for SkRefCnt-derived objects http://codereview.appspot.com/6242070/ git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@4162 2bbb7eff-a529-9590-31e7-b0007b416f81 --- core.gyp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/core.gyp b/core.gyp index aea2a73..f50d64a 100644 --- a/core.gyp +++ b/core.gyp @@ -112,6 +112,7 @@ '../src/core/SkRasterClip.cpp', '../src/core/SkRasterizer.cpp', '../src/core/SkRect.cpp', + '../src/core/SkRefCnt.cpp', '../src/core/SkRefDict.cpp', '../src/core/SkRegion.cpp', '../src/core/SkRegionPriv.h', @@ -185,6 +186,7 @@ '../include/core/SkFontHost.h', '../include/core/SkGeometry.h', '../include/core/SkGraphics.h', + '../include/core/SkInstCnt.h', '../include/core/SkMallocPixelRef.h', '../include/core/SkMask.h', '../include/core/SkMaskFilter.h', -- cgit v1.2.3 From 14361a1cfcf775ccfa7b7a75a42d1dc3dfb72170 Mon Sep 17 00:00:00 2001 From: "reed@google.com" Date: Tue, 5 Jun 2012 16:14:23 +0000 Subject: add gm (no images yet) for two-point-radial gradients git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@4163 2bbb7eff-a529-9590-31e7-b0007b416f81 --- gmslides.gypi | 1 + 1 file changed, 1 insertion(+) diff --git a/gmslides.gypi b/gmslides.gypi index 2b64074..d88ab0d 100644 --- a/gmslides.gypi +++ b/gmslides.gypi @@ -55,6 +55,7 @@ '../gm/texdata.cpp', '../gm/tilemodes.cpp', '../gm/tinybitmap.cpp', + '../gm/twopointradial.cpp', '../gm/verttext.cpp', '../gm/verttext2.cpp', '../gm/xfermodes.cpp', -- cgit v1.2.3 From f4901ae739d7561462a2af30f93aa7075cf2c386 Mon Sep 17 00:00:00 2001 From: "robertphillips@google.com" Date: Tue, 5 Jun 2012 16:24:32 +0000 Subject: Reverting r4162 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@4164 2bbb7eff-a529-9590-31e7-b0007b416f81 --- core.gyp | 2 -- 1 file changed, 2 deletions(-) diff --git a/core.gyp b/core.gyp index f50d64a..aea2a73 100644 --- a/core.gyp +++ b/core.gyp @@ -112,7 +112,6 @@ '../src/core/SkRasterClip.cpp', '../src/core/SkRasterizer.cpp', '../src/core/SkRect.cpp', - '../src/core/SkRefCnt.cpp', '../src/core/SkRefDict.cpp', '../src/core/SkRegion.cpp', '../src/core/SkRegionPriv.h', @@ -186,7 +185,6 @@ '../include/core/SkFontHost.h', '../include/core/SkGeometry.h', '../include/core/SkGraphics.h', - '../include/core/SkInstCnt.h', '../include/core/SkMallocPixelRef.h', '../include/core/SkMask.h', '../include/core/SkMaskFilter.h', -- cgit v1.2.3 From dd8d90b6f49c6794325b70b382455ffee8df75d7 Mon Sep 17 00:00:00 2001 From: "borenet@google.com" Date: Tue, 5 Jun 2012 17:57:48 +0000 Subject: Support Mac-Android Cross-Compilation - Rename Android sampleApp target to SampleAppAndroid to avoid name collision - Detect skia_os on Darwin to differentiate between xcode and make builds Review URL: https://codereview.appspot.com/6303044 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@4168 2bbb7eff-a529-9590-31e7-b0007b416f81 --- SampleApp.gyp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SampleApp.gyp b/SampleApp.gyp index c426508..fd41f00 100644 --- a/SampleApp.gyp +++ b/SampleApp.gyp @@ -252,7 +252,7 @@ 'experimental.gyp:experimental', ], 'dependencies': [ - 'android_system.gyp:sampleApp', + 'android_system.gyp:SampleAppAndroid', ], }], ], -- cgit v1.2.3 From fa2de96cf39aed8b8337751d2baaadf281b22eea Mon Sep 17 00:00:00 2001 From: "robertphillips@google.com" Date: Tue, 5 Jun 2012 19:35:09 +0000 Subject: Instance counting for SkRefCnt-derived objects (w/ CanvasTest fix) http://codereview.appspot.com/6242070/ git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@4170 2bbb7eff-a529-9590-31e7-b0007b416f81 --- core.gyp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/core.gyp b/core.gyp index aea2a73..f50d64a 100644 --- a/core.gyp +++ b/core.gyp @@ -112,6 +112,7 @@ '../src/core/SkRasterClip.cpp', '../src/core/SkRasterizer.cpp', '../src/core/SkRect.cpp', + '../src/core/SkRefCnt.cpp', '../src/core/SkRefDict.cpp', '../src/core/SkRegion.cpp', '../src/core/SkRegionPriv.h', @@ -185,6 +186,7 @@ '../include/core/SkFontHost.h', '../include/core/SkGeometry.h', '../include/core/SkGraphics.h', + '../include/core/SkInstCnt.h', '../include/core/SkMallocPixelRef.h', '../include/core/SkMask.h', '../include/core/SkMaskFilter.h', -- cgit v1.2.3 From 7bfcd10060a591f5cbe36356b30e23c76a4942f7 Mon Sep 17 00:00:00 2001 From: "caryclark@google.com" Date: Wed, 6 Jun 2012 12:12:28 +0000 Subject: Turn more warnings on, including - unused functions - unused locals - sign mismatch - missing function prototypes - missing newline at end of file - 64 to 32 bit truncation Review URL: https://codereview.appspot.com/6307043 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@4190 2bbb7eff-a529-9590-31e7-b0007b416f81 --- common_conditions.gypi | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/common_conditions.gypi b/common_conditions.gypi index ad4d81f..f73fa50 100644 --- a/common_conditions.gypi +++ b/common_conditions.gypi @@ -133,6 +133,24 @@ # trying to get this to work, but it needs clang I think... # 'WARNING_CFLAGS': '-Wexit-time-destructors', 'CLANG_WARN_CXX0X_EXTENSIONS': 'NO', + 'GCC_WARN_64_TO_32_BIT_CONVERSION': 'YES', + 'GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS': 'YES', + 'GCC_WARN_ABOUT_INVALID_OFFSETOF_MACRO': 'YES', + 'GCC_WARN_ABOUT_MISSING_NEWLINE': 'YES', + 'GCC_WARN_ABOUT_MISSING_PROTOTYPES': 'YES', + 'GCC_WARN_ABOUT_POINTER_SIGNEDNESS': 'YES', + 'GCC_WARN_ABOUT_RETURN_TYPE': 'YES', + 'GCC_WARN_ALLOW_INCOMPLETE_PROTOCOL': 'YES', + 'GCC_WARN_INITIALIZER_NOT_FULLY_BRACKETED': 'YES', + 'GCC_WARN_MISSING_PARENTHESES': 'YES', + 'GCC_WARN_PROTOTYPE_CONVERSION': 'YES', + 'GCC_WARN_SIGN_COMPARE': 'YES', + 'GCC_WARN_TYPECHECK_CALLS_TO_PRINTF': 'YES', + 'GCC_WARN_UNKNOWN_PRAGMAS': 'YES', + 'GCC_WARN_UNUSED_FUNCTION': 'YES', + 'GCC_WARN_UNUSED_LABEL': 'YES', + 'GCC_WARN_UNUSED_VALUE': 'YES', + 'GCC_WARN_UNUSED_VARIABLE': 'YES', 'OTHER_CPLUSPLUSFLAGS': '-mssse3 -fvisibility=hidden -fvisibility-inlines-hidden', }, }, -- cgit v1.2.3 From b2152433f1ede8cb3a807de5c867a9e783727be0 Mon Sep 17 00:00:00 2001 From: "scroggo@google.com" Date: Wed, 6 Jun 2012 21:07:10 +0000 Subject: Add tiled rendering as an option to GM. Use an SkGPipe to play back drawing into tiles. This will help us to debug differences in drawing while tiled. Pass --tiledPipe to gm to use the tiled pipe. Review URL: https://codereview.appspot.com/6295050 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@4199 2bbb7eff-a529-9590-31e7-b0007b416f81 --- gm.gyp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/gm.gyp b/gm.gyp index 980c199..c3f359c 100644 --- a/gm.gyp +++ b/gm.gyp @@ -17,6 +17,8 @@ '../gm/gm.cpp', '../gm/gmmain.cpp', '../gm/system_preferences_default.cpp', + '../src/pipe/utils/SamplePipeControllers.h', + '../src/pipe/utils/SamplePipeControllers.cpp', ], 'dependencies': [ 'core.gyp:core', -- cgit v1.2.3 From 98ffe72f432775ea838f6313d17e5d3295685a75 Mon Sep 17 00:00:00 2001 From: scroggo Date: Wed, 6 Jun 2012 21:26:31 +0000 Subject: Fix the build for GM. Add src/pipe/utils as an include directory. git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@4200 2bbb7eff-a529-9590-31e7-b0007b416f81 --- gm.gyp | 1 + 1 file changed, 1 insertion(+) diff --git a/gm.gyp b/gm.gyp index c3f359c..0dc4d55 100644 --- a/gm.gyp +++ b/gm.gyp @@ -9,6 +9,7 @@ 'type': 'executable', 'include_dirs' : [ '../src/core', + '../src/pipe/utils/', ], 'includes': [ 'gmslides.gypi', -- cgit v1.2.3 From 68db954e24989aebe73e035ba5b9156ada8a30f1 Mon Sep 17 00:00:00 2001 From: "reed@google.com" Date: Thu, 7 Jun 2012 20:26:47 +0000 Subject: extend asAGradient for Conical type (to be implemented by PDF and XPS) Review URL: https://codereview.appspot.com/6308051 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@4207 2bbb7eff-a529-9590-31e7-b0007b416f81 --- tests.gyp | 1 + 1 file changed, 1 insertion(+) diff --git a/tests.gyp b/tests.gyp index c37e6b8..646f4ae 100644 --- a/tests.gyp +++ b/tests.gyp @@ -43,6 +43,7 @@ '../tests/GeometryTest.cpp', '../tests/GLInterfaceValidation.cpp', '../tests/GLProgramsTest.cpp', + '../tests/GradientTest.cpp', '../tests/InfRectTest.cpp', '../tests/MathTest.cpp', '../tests/MatrixTest.cpp', -- cgit v1.2.3 From 9a201b9e716ee92700d2b8d62ad2d2dd5fe62db2 Mon Sep 17 00:00:00 2001 From: "scroggo@google.com" Date: Fri, 8 Jun 2012 15:35:03 +0000 Subject: Add a tiled pipe mode to SampleApp. Using the "Pipe" checkbox in SamleApp, you can now toggle amongst three states: no pipe, a normal pipe (or others depending on #defines), and a tiled pipe. You can also use shift + p to toggle. Review URL: https://codereview.appspot.com/6303055 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@4213 2bbb7eff-a529-9590-31e7-b0007b416f81 --- SampleApp.gyp | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/SampleApp.gyp b/SampleApp.gyp index fd41f00..4f0ad51 100644 --- a/SampleApp.gyp +++ b/SampleApp.gyp @@ -10,6 +10,7 @@ '../gm', # needed to pull gm.h '../samplecode', # To pull SampleApp.h and SampleCode.h '../src/gpu', # To pull gl/GrGLUtil.h + '../src/pipe/utils', # For TiledPipeController ], 'includes': [ 'gmslides.gypi', @@ -131,6 +132,10 @@ '../experimental/Debugger/DebuggerStateView.cpp', '../experimental/Debugger/SkDebugDumper.cpp', '../experimental/Debugger/SkDebugDumper.h', + + # TiledPipeController + '../src/pipe/utils/SamplePipeControllers.h', + '../src/pipe/utils/SamplePipeControllers.cpp', ], 'sources!': [ '../samplecode/SampleSkLayer.cpp', #relies on SkMatrix44 which doesn't compile -- cgit v1.2.3 From b99901f05edae0c7e0af0bb1fc5c467f1715ee9b Mon Sep 17 00:00:00 2001 From: "bsalomon@google.com" Date: Mon, 11 Jun 2012 15:36:13 +0000 Subject: Towards NV path rendering Review URL: http://codereview.appspot.com/6302049/ git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@4219 2bbb7eff-a529-9590-31e7-b0007b416f81 --- gpu.gyp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/gpu.gyp b/gpu.gyp index 100ad82..5f375e8 100644 --- a/gpu.gyp +++ b/gpu.gyp @@ -241,6 +241,7 @@ '../src/gpu/GrInOrderDrawBuffer.h', '../src/gpu/GrMatrix.cpp', '../src/gpu/GrMemory.cpp', + '../src/gpu/GrPath.h', '../src/gpu/GrPathRendererChain.cpp', '../src/gpu/GrPathRendererChain.h', '../src/gpu/GrPathRenderer.cpp', @@ -295,6 +296,8 @@ '../src/gpu/gl/GrGLIndexBuffer.h', '../src/gpu/gl/GrGLInterface.cpp', '../src/gpu/gl/GrGLIRect.h', + '../src/gpu/gl/GrGLPath.cpp', + '../src/gpu/gl/GrGLPath.h', '../src/gpu/gl/GrGLProgram.cpp', '../src/gpu/gl/GrGLProgram.h', '../src/gpu/gl/GrGLProgramStage.cpp', -- cgit v1.2.3 From 38859a53b3f7dbc5d793c117b9d2c76338e36abc Mon Sep 17 00:00:00 2001 From: "bsalomon@google.com" Date: Mon, 11 Jun 2012 15:39:15 +0000 Subject: Null canvas Review URL: http://codereview.appspot.com/6117051/ git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@4220 2bbb7eff-a529-9590-31e7-b0007b416f81 --- utils.gyp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/utils.gyp b/utils.gyp index d2c413e..9b11e59 100644 --- a/utils.gyp +++ b/utils.gyp @@ -26,6 +26,7 @@ '../include/utils/SkMeshUtils.h', '../include/utils/SkNinePatch.h', '../include/utils/SkNWayCanvas.h', + '../include/utils/SkNullCanvas.h', '../include/utils/SkParse.h', '../include/utils/SkParsePaint.h', '../include/utils/SkParsePath.h', @@ -50,6 +51,7 @@ '../src/utils/SkMeshUtils.cpp', '../src/utils/SkNinePatch.cpp', '../src/utils/SkNWayCanvas.cpp', + '../src/utils/SkNullCanvas.cpp', '../src/utils/SkOSFile.cpp', '../src/utils/SkParse.cpp', '../src/utils/SkParseColor.cpp', -- cgit v1.2.3 From 11308d4bc0f48b9126a45fc3cd03f2905c8f0957 Mon Sep 17 00:00:00 2001 From: "tomhudson@google.com" Date: Mon, 11 Jun 2012 19:22:01 +0000 Subject: Dilate & Erode benchmarks. Unlike the blur benchmarks (which test Convolution), they show no improvement from unrolling the GLSL loops in src/gpu/effects/GrMorphologyEffect.cpp http://codereview.appspot.com/6299067/ git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@4230 2bbb7eff-a529-9590-31e7-b0007b416f81 --- bench.gypi | 1 + 1 file changed, 1 insertion(+) diff --git a/bench.gypi b/bench.gypi index ce089d6..fcefa7f 100644 --- a/bench.gypi +++ b/bench.gypi @@ -29,6 +29,7 @@ '../bench/MathBench.cpp', '../bench/MatrixBench.cpp', '../bench/MemoryBench.cpp', + '../bench/MorphologyBench.cpp', '../bench/MutexBench.cpp', '../bench/PathBench.cpp', '../bench/PathIterBench.cpp', -- cgit v1.2.3 From 0703a372999fd1dd094ce9ccb4df4b665df4c192 Mon Sep 17 00:00:00 2001 From: "robertphillips@google.com" Date: Tue, 12 Jun 2012 00:32:28 +0000 Subject: Split GrContext's AA Rect drawing methods into helper class http://codereview.appspot.com/6300070/ git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@4233 2bbb7eff-a529-9590-31e7-b0007b416f81 --- gpu.gyp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/gpu.gyp b/gpu.gyp index 5f375e8..f5d15ed 100644 --- a/gpu.gyp +++ b/gpu.gyp @@ -172,6 +172,7 @@ 'angle.gyp:*', ], 'sources': [ + '../include/gpu/GrAARectRenderer.h', '../include/gpu/GrClip.h', '../include/gpu/GrClipIterator.h', '../include/gpu/GrColor.h', @@ -208,6 +209,7 @@ '../src/gpu/GrAAHairLinePathRenderer.h', '../src/gpu/GrAAConvexPathRenderer.cpp', '../src/gpu/GrAAConvexPathRenderer.h', + '../src/gpu/GrAARectRenderer.cpp', '../src/gpu/GrAddPathRenderers_default.cpp', '../src/gpu/GrAllocator.h', '../src/gpu/GrAllocPool.h', -- cgit v1.2.3 From 4d45bf5d7a1f1fc2881b2872c602b5084254720a Mon Sep 17 00:00:00 2001 From: "junov@chromium.org" Date: Tue, 12 Jun 2012 14:56:36 +0000 Subject: Adding the render_pictures test tool Submitted on behalf of keyar@chromium.org Review URL: https://codereview.appspot.com/6300056/ git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@4235 2bbb7eff-a529-9590-31e7-b0007b416f81 --- tools.gyp | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/tools.gyp b/tools.gyp index 349b0e0..04356c6 100644 --- a/tools.gyp +++ b/tools.gyp @@ -18,6 +18,7 @@ 'skdiff', 'skhello', 'skimage', + 'render_pictures', ], }, { @@ -62,6 +63,19 @@ 'utils.gyp:utils', ], }, + { + 'target_name': 'render_pictures', + 'type': 'executable', + 'sources': [ + '../tools/render_pictures_main.cpp', + ], + 'dependencies': [ + 'core.gyp:core', + 'images.gyp:images', + 'ports.gyp:ports', + ], + }, + ], } -- cgit v1.2.3 From 6a2767d5964d222827f67a2d59ca3b58909fa25d Mon Sep 17 00:00:00 2001 From: "reed@google.com" Date: Thu, 14 Jun 2012 18:58:40 +0000 Subject: tools/pinspect: quick tool to inspeact the header (and rough validity) of 1 or more picture files Review URL: https://codereview.appspot.com/6295085 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@4258 2bbb7eff-a529-9590-31e7-b0007b416f81 --- tools.gyp | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/tools.gyp b/tools.gyp index 04356c6..a43b811 100644 --- a/tools.gyp +++ b/tools.gyp @@ -19,6 +19,7 @@ 'skhello', 'skimage', 'render_pictures', + 'pinspect', ], }, { @@ -75,6 +76,20 @@ 'ports.gyp:ports', ], }, + { + 'target_name': 'pinspect', + 'type': 'executable', + 'sources': [ + '../tools/pinspect.cpp', + ], + 'dependencies': [ + 'core.gyp:core', + 'effects.gyp:effects', + 'images.gyp:images', + 'ports.gyp:ports', + 'utils.gyp:utils', + ], + }, ], } -- cgit v1.2.3 From 6d386c0ddad993e66f19e20e87ec44e53d809d26 Mon Sep 17 00:00:00 2001 From: "caryclark@google.com" Date: Mon, 18 Jun 2012 14:40:51 +0000 Subject: add missing dependency git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@4276 2bbb7eff-a529-9590-31e7-b0007b416f81 --- SimpleCocoaApp.gyp | 1 + 1 file changed, 1 insertion(+) diff --git a/SimpleCocoaApp.gyp b/SimpleCocoaApp.gyp index 13f05dc..f20c444 100644 --- a/SimpleCocoaApp.gyp +++ b/SimpleCocoaApp.gyp @@ -27,6 +27,7 @@ 'dependencies': [ 'core.gyp:core', 'opts.gyp:opts', + 'ports.gyp:ports', 'utils.gyp:utils', 'views.gyp:views', 'xml.gyp:xml', -- cgit v1.2.3 From 697fa36882fe3aa27710dc2df8f1f723ab8cab49 Mon Sep 17 00:00:00 2001 From: "bsalomon@google.com" Date: Tue, 19 Jun 2012 15:40:27 +0000 Subject: Add GrMemoryPool as a helper to override operators new/delete Review URL: http://codereview.appspot.com/6306090/ git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@4282 2bbb7eff-a529-9590-31e7-b0007b416f81 --- bench.gypi | 1 + gpu.gyp | 2 ++ tests.gyp | 1 + 3 files changed, 4 insertions(+) diff --git a/bench.gypi b/bench.gypi index fcefa7f..9dd1e11 100644 --- a/bench.gypi +++ b/bench.gypi @@ -25,6 +25,7 @@ '../bench/DecodeBench.cpp', '../bench/FontScalerBench.cpp', '../bench/GradientBench.cpp', + '../bench/GrMemoryPoolBench.cpp', '../bench/InterpBench.cpp', '../bench/MathBench.cpp', '../bench/MatrixBench.cpp', diff --git a/gpu.gyp b/gpu.gyp index f5d15ed..ffe0e05 100644 --- a/gpu.gyp +++ b/gpu.gyp @@ -243,6 +243,8 @@ '../src/gpu/GrInOrderDrawBuffer.h', '../src/gpu/GrMatrix.cpp', '../src/gpu/GrMemory.cpp', + '../src/gpu/GrMemoryPool.cpp', + '../src/gpu/GrMemoryPool.h', '../src/gpu/GrPath.h', '../src/gpu/GrPathRendererChain.cpp', '../src/gpu/GrPathRendererChain.h', diff --git a/tests.gyp b/tests.gyp index 646f4ae..22aa3c4 100644 --- a/tests.gyp +++ b/tests.gyp @@ -44,6 +44,7 @@ '../tests/GLInterfaceValidation.cpp', '../tests/GLProgramsTest.cpp', '../tests/GradientTest.cpp', + '../tests/GrMemoryPoolTest.cpp', '../tests/InfRectTest.cpp', '../tests/MathTest.cpp', '../tests/MatrixTest.cpp', -- cgit v1.2.3 From ade1278a9f36250140628d8cdec383bb901d411a Mon Sep 17 00:00:00 2001 From: "bsalomon@google.com" Date: Thu, 21 Jun 2012 19:58:20 +0000 Subject: Make GrClipMaskManager configure the stencil and scissor on GrGpu Review URL: http://codereview.appspot.com/6308096/ git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@4288 2bbb7eff-a529-9590-31e7-b0007b416f81 --- gpu.gyp | 1 + 1 file changed, 1 insertion(+) diff --git a/gpu.gyp b/gpu.gyp index ffe0e05..5acf244 100644 --- a/gpu.gyp +++ b/gpu.gyp @@ -195,6 +195,7 @@ '../include/gpu/GrResource.h', '../include/gpu/GrSamplerState.h', '../include/gpu/GrScalar.h', + '../include/gpu/GrTemplates.h', '../include/gpu/GrTextContext.h', '../include/gpu/GrTexture.h', '../include/gpu/GrTypes.h', -- cgit v1.2.3 From ad7d97e76e453281298edb6c82a84f6e4dcf2289 Mon Sep 17 00:00:00 2001 From: "robertphillips@google.com" Date: Thu, 21 Jun 2012 21:09:06 +0000 Subject: Add GrSurface parent class above GrTexture & GrRenderTarget http://codereview.appspot.com/6297092/ git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@4292 2bbb7eff-a529-9590-31e7-b0007b416f81 --- gpu.gyp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/gpu.gyp b/gpu.gyp index 5acf244..b601721 100644 --- a/gpu.gyp +++ b/gpu.gyp @@ -195,6 +195,7 @@ '../include/gpu/GrResource.h', '../include/gpu/GrSamplerState.h', '../include/gpu/GrScalar.h', + '../include/gpu/GrSurface.h', '../include/gpu/GrTemplates.h', '../include/gpu/GrTextContext.h', '../include/gpu/GrTexture.h', @@ -271,6 +272,7 @@ '../src/gpu/GrTDArray.h', '../src/gpu/GrSoftwarePathRenderer.cpp', '../src/gpu/GrSoftwarePathRenderer.h', + '../src/gpu/GrSurface.cpp', '../src/gpu/GrTextStrike.cpp', '../src/gpu/GrTextStrike.h', '../src/gpu/GrTextStrike_impl.h', -- cgit v1.2.3 From e52e2f18e80e2d099a2e291b777fb6f154e99ab3 Mon Sep 17 00:00:00 2001 From: "bsalomon@google.com" Date: Fri, 22 Jun 2012 12:34:22 +0000 Subject: Move GrTemplates.h to src Review URL: http://codereview.appspot.com/6333053/ git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@4300 2bbb7eff-a529-9590-31e7-b0007b416f81 --- gpu.gyp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gpu.gyp b/gpu.gyp index b601721..0dd0ad2 100644 --- a/gpu.gyp +++ b/gpu.gyp @@ -196,7 +196,6 @@ '../include/gpu/GrSamplerState.h', '../include/gpu/GrScalar.h', '../include/gpu/GrSurface.h', - '../include/gpu/GrTemplates.h', '../include/gpu/GrTextContext.h', '../include/gpu/GrTexture.h', '../include/gpu/GrTypes.h', @@ -273,6 +272,7 @@ '../src/gpu/GrSoftwarePathRenderer.cpp', '../src/gpu/GrSoftwarePathRenderer.h', '../src/gpu/GrSurface.cpp', + '../src/gpu/GrTemplates.h', '../src/gpu/GrTextStrike.cpp', '../src/gpu/GrTextStrike.h', '../src/gpu/GrTextStrike_impl.h', -- cgit v1.2.3 From 5405c938c73e5338c67a727880594622925008d9 Mon Sep 17 00:00:00 2001 From: "twiz@google.com" Date: Fri, 22 Jun 2012 18:24:56 +0000 Subject: Refactoring in preparation for adding the picture benchmarking program. Review URL: https://codereview.appspot.com/6339043/ git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@4310 2bbb7eff-a529-9590-31e7-b0007b416f81 --- bench.gyp | 52 ++++++++++++++++++++++++++++++++++++++++++++++++++++ bench.gypi | 38 -------------------------------------- tools.gyp | 12 +++++++++++- 3 files changed, 63 insertions(+), 39 deletions(-) diff --git a/bench.gyp b/bench.gyp index 1935f9d..dcf9b5f 100644 --- a/bench.gyp +++ b/bench.gyp @@ -23,8 +23,60 @@ 'images.gyp:images', 'ports.gyp:ports', 'utils.gyp:utils', + 'bench_timer', ], }, + { + 'target_name' : 'bench_timer', + 'type': 'static_library', + 'sources': [ + '../bench/BenchTimer.h', + '../bench/BenchTimer.cpp', + '../bench/BenchSysTimer_mach.h', + '../bench/BenchSysTimer_mach.cpp', + '../bench/BenchSysTimer_posix.h', + '../bench/BenchSysTimer_posix.cpp', + '../bench/BenchSysTimer_windows.h', + '../bench/BenchSysTimer_windows.cpp', + '../bench/BenchGpuTimer_gl.h', + '../bench/BenchGpuTimer_gl.cpp', + ], + 'include_dirs': [ + '../src/core', + '../src/gpu', + ], + 'dependencies': [ + 'core.gyp:core', + 'gpu.gyp:gr', + ], + 'conditions': [ + [ 'skia_os != "mac"', { + 'sources!': [ + '../bench/BenchSysTimer_mach.h', + '../bench/BenchSysTimer_mach.cpp', + ], + }], + [ 'skia_os not in ["linux", "freebsd", "openbsd", "solaris", "android"]', { + 'sources!': [ + '../bench/BenchSysTimer_posix.h', + '../bench/BenchSysTimer_posix.cpp', + ], + }], + [ 'skia_os in ["linux", "freebsd", "openbsd", "solaris"]', { + 'link_settings': { + 'libraries': [ + '-lrt', + ], + }, + }], + [ 'skia_os != "win"', { + 'sources!': [ + '../bench/BenchSysTimer_windows.h', + '../bench/BenchSysTimer_windows.cpp', + ], + }], + ], + } ], } diff --git a/bench.gypi b/bench.gypi index 9dd1e11..b11211f 100644 --- a/bench.gypi +++ b/bench.gypi @@ -3,17 +3,6 @@ { 'sources': [ '../bench/benchmain.cpp', - '../bench/BenchTimer.h', - '../bench/BenchTimer.cpp', - '../bench/BenchSysTimer_mach.h', - '../bench/BenchSysTimer_mach.cpp', - '../bench/BenchSysTimer_posix.h', - '../bench/BenchSysTimer_posix.cpp', - '../bench/BenchSysTimer_windows.h', - '../bench/BenchSysTimer_windows.cpp', - '../bench/BenchGpuTimer_gl.h', - '../bench/BenchGpuTimer_gl.cpp', - '../bench/SkBenchmark.h', '../bench/SkBenchmark.cpp', @@ -45,33 +34,6 @@ '../bench/TextBench.cpp', '../bench/VertBench.cpp', ], - 'conditions': [ - [ 'skia_os != "mac"', { - 'sources!': [ - '../bench/BenchSysTimer_mach.h', - '../bench/BenchSysTimer_mach.cpp', - ], - }], - [ 'skia_os not in ["linux", "freebsd", "openbsd", "solaris", "android"]', { - 'sources!': [ - '../bench/BenchSysTimer_posix.h', - '../bench/BenchSysTimer_posix.cpp', - ], - }], - [ 'skia_os in ["linux", "freebsd", "openbsd", "solaris"]', { - 'link_settings': { - 'libraries': [ - '-lrt', - ], - }, - }], - [ 'skia_os != "win"', { - 'sources!': [ - '../bench/BenchSysTimer_windows.h', - '../bench/BenchSysTimer_windows.cpp', - ], - }], - ], } # Local Variables: diff --git a/tools.gyp b/tools.gyp index a43b811..93eab7d 100644 --- a/tools.gyp +++ b/tools.gyp @@ -74,6 +74,17 @@ 'core.gyp:core', 'images.gyp:images', 'ports.gyp:ports', + 'tools.gyp:picture_utils', + ], + }, + { + 'target_name': 'picture_utils', + 'type': 'static_library', + 'sources': [ + '../tools/picture_utils.cpp', + ], + 'dependencies': [ + 'core.gyp:core', ], }, { @@ -90,7 +101,6 @@ 'utils.gyp:utils', ], }, - ], } -- cgit v1.2.3 From 7f6b7bbff42a5a0d2cb41628fb626e9c75bdec82 Mon Sep 17 00:00:00 2001 From: "senorblanco@chromium.org" Date: Fri, 22 Jun 2012 21:01:23 +0000 Subject: Raster implementation of diffuse and specular lighting filters. Externally, the caller instantiates a light (distant, point or spot), and an SkDiffuseLightingFilter or SkSpecularLightingImageFilter with that light. A Sobel edge detection filter is applied to the alpha of the incoming bitmap, and the result is used as a height map for lighting calculations. Review URL: http://codereview.appspot.com/6302101/ git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@4314 2bbb7eff-a529-9590-31e7-b0007b416f81 --- effects.gyp | 2 ++ gmslides.gypi | 1 + 2 files changed, 3 insertions(+) diff --git a/effects.gyp b/effects.gyp index 7d0cd9a..fbccb40 100644 --- a/effects.gyp +++ b/effects.gyp @@ -28,6 +28,7 @@ '../include/effects/SkKernel33MaskFilter.h', '../include/effects/SkLayerDrawLooper.h', '../include/effects/SkLayerRasterizer.h', + '../include/effects/SkLightingImageFilter.h', '../include/effects/SkMorphologyImageFilter.h', '../include/effects/SkPaintFlagsDrawFilter.h', '../include/effects/SkPixelXorXfermode.h', @@ -66,6 +67,7 @@ '../src/effects/SkKernel33MaskFilter.cpp', '../src/effects/SkLayerDrawLooper.cpp', '../src/effects/SkLayerRasterizer.cpp', + '../src/effects/SkLightingImageFilter.cpp', '../src/effects/SkMorphologyImageFilter.cpp', '../src/effects/SkPaintFlagsDrawFilter.cpp', '../src/effects/SkPixelXorXfermode.cpp', diff --git a/gmslides.gypi b/gmslides.gypi index d88ab0d..874c79a 100644 --- a/gmslides.gypi +++ b/gmslides.gypi @@ -29,6 +29,7 @@ '../gm/gradtext.cpp', '../gm/hairmodes.cpp', '../gm/imageblur.cpp', + '../gm/lighting.cpp', '../gm/imagefiltersbase.cpp', '../gm/lcdtext.cpp', '../gm/linepaths.cpp', -- cgit v1.2.3 From c114cdb3f9b2b2c606e9ff76ed152697002ff77d Mon Sep 17 00:00:00 2001 From: "borenet@google.com" Date: Wed, 27 Jun 2012 19:04:39 +0000 Subject: When building for Android, package executables in APKs (trunk) Review URL: https://codereview.appspot.com/6307101 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@4368 2bbb7eff-a529-9590-31e7-b0007b416f81 --- apptype_console.gypi | 7 +++++++ bench.gyp | 5 +++++ 2 files changed, 12 insertions(+) diff --git a/apptype_console.gypi b/apptype_console.gypi index f2f6e1c..6971b6a 100644 --- a/apptype_console.gypi +++ b/apptype_console.gypi @@ -11,6 +11,13 @@ 'EntryPointSymbol': 'mainCRTStartup', }, }, + 'conditions': [ + [ 'skia_os == "android"', { + 'dependencies': [ + 'android_system.gyp:Android_EntryPoint', + ], + }], + ], }, } diff --git a/bench.gyp b/bench.gyp index dcf9b5f..b0fe517 100644 --- a/bench.gyp +++ b/bench.gyp @@ -75,6 +75,11 @@ '../bench/BenchSysTimer_windows.cpp', ], }], + [ 'skia_os == "android"', { + 'dependencies!': [ + 'android_system.gyp:Android_EntryPoint', + ], + }], ], } ], -- cgit v1.2.3 From a4c6421e203d3b31062c6546ca2667a938c1e3ff Mon Sep 17 00:00:00 2001 From: "reed@google.com" Date: Wed, 27 Jun 2012 19:33:29 +0000 Subject: land https://codereview.appspot.com/6349043/ git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@4375 2bbb7eff-a529-9590-31e7-b0007b416f81 --- tools.gyp | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/tools.gyp b/tools.gyp index 93eab7d..f30f311 100644 --- a/tools.gyp +++ b/tools.gyp @@ -19,6 +19,7 @@ 'skhello', 'skimage', 'render_pictures', + 'bench_pictures', 'pinspect', ], }, @@ -77,6 +78,23 @@ 'tools.gyp:picture_utils', ], }, + { + 'target_name': 'bench_pictures', + 'type': 'executable', + 'sources': [ + '../tools/bench_pictures_main.cpp' + ], + 'include_dirs': [ + '../bench', + ], + 'dependencies': [ + 'core.gyp:core', + 'ports.gyp:ports', + 'images.gyp:images', + 'tools.gyp:picture_utils', + 'bench.gyp:bench_timer', + ], + }, { 'target_name': 'picture_utils', 'type': 'static_library', -- cgit v1.2.3 From cc9e740d3816fbb5d7fdcd6b2df899359540e32a Mon Sep 17 00:00:00 2001 From: "robertphillips@google.com" Date: Wed, 27 Jun 2012 19:41:42 +0000 Subject: Separated Inst counting from the SK_DEBUG #define (now SK_ENABLE_INST_COUNT) http://codereview.appspot.com/6353047/ git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@4376 2bbb7eff-a529-9590-31e7-b0007b416f81 --- common.gypi | 1 + core.gyp | 1 + 2 files changed, 2 insertions(+) diff --git a/common.gypi b/common.gypi index a9b274d..717e6eb 100644 --- a/common.gypi +++ b/common.gypi @@ -68,6 +68,7 @@ 'Debug': { 'defines': [ 'SK_DEBUG', + 'SK_ENABLE_INST_COUNT', 'GR_DEBUG=1', ], }, diff --git a/core.gyp b/core.gyp index f50d64a..ab2e117 100644 --- a/core.gyp +++ b/core.gyp @@ -79,6 +79,7 @@ '../src/core/SkGlyphCache.cpp', '../src/core/SkGlyphCache.h', '../src/core/SkGraphics.cpp', + '../src/core/SkInstCnt.cpp', '../src/core/SkLineClipper.cpp', '../src/core/SkMallocPixelRef.cpp', '../src/core/SkMask.cpp', -- cgit v1.2.3 From 4a88ecc67e8bd003c8e764f301aaa295571efa6a Mon Sep 17 00:00:00 2001 From: "junov@chromium.org" Date: Wed, 27 Jun 2012 20:03:16 +0000 Subject: Adding checksum to SkFlatData to accelerate SkPicture recording. The checksum triggers an early exit in the mem compare use to search for duplicate flattened objects. Also, call to memcmp was replaced with 64-bit at a time comparison loop. Review URL: http://codereview.appspot.com/6339046/ BUG=http://code.google.com/p/chromium/issues/detail?id=54079 TEST=Checksum and PictureRecord tests in bench.exe git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@4378 2bbb7eff-a529-9590-31e7-b0007b416f81 --- bench.gypi | 1 + core.gyp | 1 + 2 files changed, 2 insertions(+) diff --git a/bench.gypi b/bench.gypi index b11211f..f809b64 100644 --- a/bench.gypi +++ b/bench.gypi @@ -9,6 +9,7 @@ '../bench/AAClipBench.cpp', '../bench/BitmapBench.cpp', '../bench/BlurBench.cpp', + '../bench/ChecksumBench.cpp', '../bench/ChromeBench.cpp', '../bench/DashBench.cpp', '../bench/DecodeBench.cpp', diff --git a/core.gyp b/core.gyp index ab2e117..5386407 100644 --- a/core.gyp +++ b/core.gyp @@ -163,6 +163,7 @@ '../include/core/SkBounder.h', '../include/core/SkBuffer.h', '../include/core/SkCanvas.h', + '../include/core/SkChecksum.h', '../include/core/SkChunkAlloc.h', '../include/core/SkClipStack.h', '../include/core/SkColor.h', -- cgit v1.2.3 From 7d6e0ee4b646dbfe0c84d1f8ef52faf9f98180e2 Mon Sep 17 00:00:00 2001 From: "robertphillips@google.com" Date: Wed, 27 Jun 2012 20:44:52 +0000 Subject: Split GrSWMaskHelper into its own files http://codereview.appspot.com/6350046/ git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@4380 2bbb7eff-a529-9590-31e7-b0007b416f81 --- gpu.gyp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/gpu.gyp b/gpu.gyp index 0dd0ad2..5aa3cb7 100644 --- a/gpu.gyp +++ b/gpu.gyp @@ -269,6 +269,8 @@ '../src/gpu/GrStringBuilder.h', '../src/gpu/GrTBSearch.h', '../src/gpu/GrTDArray.h', + '../src/gpu/GrSWMaskHelper.cpp', + '../src/gpu/GrSWMaskHelper.h', '../src/gpu/GrSoftwarePathRenderer.cpp', '../src/gpu/GrSoftwarePathRenderer.h', '../src/gpu/GrSurface.cpp', -- cgit v1.2.3 From 9262c04ace3ee8a54a51b23bbd71b2f609594467 Mon Sep 17 00:00:00 2001 From: "djsollen@google.com" Date: Thu, 28 Jun 2012 16:08:05 +0000 Subject: Separate target architecture type and width into separate variables. Also add support for building mac in 64 bit mode. Review URL: https://codereview.appspot.com/6343050 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@4385 2bbb7eff-a529-9590-31e7-b0007b416f81 --- common.gypi | 3 +++ common_conditions.gypi | 18 +++++++++++++++--- common_variables.gypi | 6 ++++-- core.gyp | 2 +- opts.gyp | 8 ++++---- 5 files changed, 27 insertions(+), 10 deletions(-) diff --git a/common.gypi b/common.gypi index 717e6eb..85c590d 100644 --- a/common.gypi +++ b/common.gypi @@ -24,6 +24,9 @@ ['skia_angle and not skia_os == "win"', {'error': ' Date: Thu, 28 Jun 2012 16:19:03 +0000 Subject: fix the build git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@4387 2bbb7eff-a529-9590-31e7-b0007b416f81 --- common.gypi | 2 +- common_variables.gypi | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/common.gypi b/common.gypi index 85c590d..06db4a8 100644 --- a/common.gypi +++ b/common.gypi @@ -24,7 +24,7 @@ ['skia_angle and not skia_os == "win"', {'error': ' Date: Thu, 28 Jun 2012 18:48:06 +0000 Subject: Initial support for GL_NV_path_renering. Experimental, there are still some issues to resolve, set gyp variable skia_nv_path_rendering=1 or build flag GR_GL_USE_NV_PATH_RENDERING to enable. http://codereview.appspot.com/6349049/ git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@4390 2bbb7eff-a529-9590-31e7-b0007b416f81 --- common_variables.gypi | 2 ++ gpu.gyp | 7 +++++++ 2 files changed, 9 insertions(+) diff --git a/common_variables.gypi b/common_variables.gypi index 69cd509..ee00a34 100644 --- a/common_variables.gypi +++ b/common_variables.gypi @@ -61,6 +61,7 @@ 'skia_scalar%': 'float', 'skia_mesa%': 0, + 'skia_nv_path_rendering%': 0, # Do not turn on 'skia_angle' - it is currently experimental 'skia_angle%': 0, 'skia_arch_type%': 'x86', @@ -73,6 +74,7 @@ 'os_posix%': '<(os_posix)', 'skia_scalar%': '<(skia_scalar)', 'skia_mesa%': '<(skia_mesa)', + 'skia_nv_path_rendering%': '<(skia_nv_path_rendering)', 'skia_angle%': '<(skia_angle)', 'skia_arch_type%': '<(skia_arch_type)', 'skia_arch_width%': '<(skia_arch_width)', diff --git a/gpu.gyp b/gpu.gyp index 5aa3cb7..381d6bc 100644 --- a/gpu.gyp +++ b/gpu.gyp @@ -264,6 +264,8 @@ '../src/gpu/GrResourceCache.h', '../src/gpu/GrStencil.cpp', '../src/gpu/GrStencil.h', + '../src/gpu/GrStencilAndCoverPathRenderer.cpp', + '../src/gpu/GrStencilAndCoverPathRenderer.h', '../src/gpu/GrStencilBuffer.cpp', '../src/gpu/GrStencilBuffer.h', '../src/gpu/GrStringBuilder.h', @@ -365,6 +367,11 @@ 'GR_IMPLEMENTATION=1', ], 'conditions': [ + [ 'skia_nv_path_rendering', { + 'defines': [ + 'GR_GL_USE_NV_PATH_RENDERING=1', + ], + }], [ 'skia_os == "linux"', { 'sources!': [ '../src/gpu/gl/GrGLDefaultInterface_none.cpp', -- cgit v1.2.3 From d703231e7512812a678b7655aacdc591bf6f4595 Mon Sep 17 00:00:00 2001 From: "robertphillips@google.com" Date: Thu, 28 Jun 2012 20:59:13 +0000 Subject: Moved SkGrTexturePixelRef to SkGrPixelRef http://codereview.appspot.com/6344054/ git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@4397 2bbb7eff-a529-9590-31e7-b0007b416f81 --- gpu.gyp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gpu.gyp b/gpu.gyp index 381d6bc..40d5c28 100644 --- a/gpu.gyp +++ b/gpu.gyp @@ -103,7 +103,7 @@ '../include/gpu/SkGpuCanvas.h', '../include/gpu/SkGpuDevice.h', '../include/gpu/SkGr.h', - '../include/gpu/SkGrTexturePixelRef.h', + '../include/gpu/SkGrPixelRef.h', '../include/gpu/gl/SkGLContext.h', '../include/gpu/gl/SkMesaGLContext.h', @@ -116,7 +116,7 @@ '../src/gpu/SkGpuDevice.cpp', '../src/gpu/SkGr.cpp', '../src/gpu/SkGrFontScaler.cpp', - '../src/gpu/SkGrTexturePixelRef.cpp', + '../src/gpu/SkGrPixelRef.cpp', '../src/gpu/gl/SkGLContext.cpp', '../src/gpu/gl/SkNullGLContext.cpp', -- cgit v1.2.3 From 11742b95b7d83f899fd4c3540548bfe7a822b43b Mon Sep 17 00:00:00 2001 From: "robertphillips@google.com" Date: Fri, 29 Jun 2012 00:30:13 +0000 Subject: Pseudo-reverted r4396 (SkGrPixelRef files are still in source pool but are unused) git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@4402 2bbb7eff-a529-9590-31e7-b0007b416f81 --- gpu.gyp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gpu.gyp b/gpu.gyp index 40d5c28..381d6bc 100644 --- a/gpu.gyp +++ b/gpu.gyp @@ -103,7 +103,7 @@ '../include/gpu/SkGpuCanvas.h', '../include/gpu/SkGpuDevice.h', '../include/gpu/SkGr.h', - '../include/gpu/SkGrPixelRef.h', + '../include/gpu/SkGrTexturePixelRef.h', '../include/gpu/gl/SkGLContext.h', '../include/gpu/gl/SkMesaGLContext.h', @@ -116,7 +116,7 @@ '../src/gpu/SkGpuDevice.cpp', '../src/gpu/SkGr.cpp', '../src/gpu/SkGrFontScaler.cpp', - '../src/gpu/SkGrPixelRef.cpp', + '../src/gpu/SkGrTexturePixelRef.cpp', '../src/gpu/gl/SkGLContext.cpp', '../src/gpu/gl/SkNullGLContext.cpp', -- cgit v1.2.3 From 767db4397ee95ef521791a47c2c84f339d62a988 Mon Sep 17 00:00:00 2001 From: "chudy@google.com" Date: Fri, 29 Jun 2012 14:21:22 +0000 Subject: clt debugger Review URL: https://codereview.appspot.com/6267043 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@4404 2bbb7eff-a529-9590-31e7-b0007b416f81 --- debugger.gyp | 93 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 93 insertions(+) create mode 100644 debugger.gyp diff --git a/debugger.gyp b/debugger.gyp new file mode 100644 index 0000000..0789a96 --- /dev/null +++ b/debugger.gyp @@ -0,0 +1,93 @@ +{ + 'targets': [ + { + 'target_name': 'debugger', + 'type': 'executable', + 'include_dirs' : [ + '../src/core', + '../debugger', # To pull SkDebugger.h + '../debugger/QT', # For all the QT UI Goodies + ], + 'sources': [ + '../debugger/SkDebugCanvas.h', + '../debugger/SkDebugCanvas.cpp', + '../debugger/SkDebugger.cpp', + '../debugger/SkDrawCommand.h', + '../debugger/SkDrawCommand.cpp', + '../debugger/QT/moc_SkDebuggerGUI.cpp', + '../debugger/QT/moc_SkCanvasWidget.cpp', + '../debugger/QT/moc_SkInspectorWidget.cpp', + '../debugger/QT/moc_SkSettingsWidget.cpp', + '../debugger/QT/SkDebuggerGUI.cpp', + '../debugger/QT/SkDebuggerGUI.h', + '../debugger/QT/SkCanvasWidget.cpp', + '../debugger/QT/SkCanvasWidget.h', + '../debugger/QT/SkInspectorWidget.h', + '../debugger/QT/SkInspectorWidget.cpp', + '../debugger/QT/SkListWidget.h', + '../debugger/QT/SkListWidget.cpp', + '../debugger/SkObjectParser.h', + '../debugger/SkObjectParser.cpp', + '../debugger/QT/SkSettingsWidget.h', + '../debugger/QT/SkSettingsWidget.cpp', + + # To update this file edit SkIcons.qrc and rerun rcc to generate cpp + '../debugger/QT/qrc_SkIcons.cpp', + ], + 'dependencies': [ + 'core.gyp:core', + 'images.gyp:images', + 'ports.gyp:ports', + 'effects.gyp:effects', + ], + 'conditions': [ + [ 'skia_os in ["linux", "freebsd", "openbsd", "solaris"]', { + 'include_dirs': [ + '/usr/include/qt4', + '/usr/include/qt4/QtCore', + '/usr/include/qt4/QtGui', + ], + 'link_settings': { + 'libraries' : [ + '/usr/lib/libQtCore.so', + '/usr/lib/libQtGui.so', + ], + }, + }], + [ 'skia_os == "mac"', { + 'mac_bundle' : 1, + 'include_dirs': [ + '/Library/Frameworks/QtCore.framework/Headers/', + '/Library/Frameworks/QtGui.framework/Headers/', + ], + 'link_settings': { + 'libraries': [ + '/Library/Frameworks/QtCore.framework', + '/Library/Frameworks/QtGui.framework', + ], + }, + }], + [ 'skia_os == "win"', { + 'include_dirs': [ + # TODO(chudy): Dynamically generate these paths? + 'C:/Qt/4.6.4/include', + 'C:/Qt/4.6.4/include/QtCore', + 'C:/Qt/4.6.4/include/QtGui', + ], + 'link_settings': { + 'libraries': [ + 'C:/Qt/4.6.4/lib/QtCore4.lib', + 'C:/Qt/4.6.4/lib/QtGui4.lib', + ], + }, + }], + ] + }, + ], +} + +# Local Variables: +# tab-width:2 +# indent-tabs-mode:nil +# End: +# vim: set expandtab tabstop=2 shiftwidth=2: \ No newline at end of file -- cgit v1.2.3 From b658f53baa7975bd08a13494822baa08f050bc98 Mon Sep 17 00:00:00 2001 From: "chudy@google.com" Date: Fri, 29 Jun 2012 14:34:58 +0000 Subject: Add missing gyp dependencies for debugger git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@4405 2bbb7eff-a529-9590-31e7-b0007b416f81 --- common_variables.gypi | 2 ++ 1 file changed, 2 insertions(+) diff --git a/common_variables.gypi b/common_variables.gypi index ee00a34..70b68fd 100644 --- a/common_variables.gypi +++ b/common_variables.gypi @@ -66,6 +66,7 @@ 'skia_angle%': 0, 'skia_arch_type%': 'x86', 'skia_arch_width%': 32, + 'skia_debugger%': 'off', }, # Re-define all variables defined within the level-2 'variables' dict, @@ -78,6 +79,7 @@ 'skia_angle%': '<(skia_angle)', 'skia_arch_type%': '<(skia_arch_type)', 'skia_arch_width%': '<(skia_arch_width)', + 'skia_debugger%': '<(skia_debugger)', }, } # Local Variables: -- cgit v1.2.3 From 5d28ec357eb2dba77af6f8cda30c9426eaf53f55 Mon Sep 17 00:00:00 2001 From: "scroggo@google.com" Date: Fri, 29 Jun 2012 17:28:50 +0000 Subject: Create a new GM to exercise ComposeShader. Code borrowed from samplecode/SampleShaders.cpp Review URL: https://codereview.appspot.com/6371043 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@4407 2bbb7eff-a529-9590-31e7-b0007b416f81 --- gmslides.gypi | 1 + 1 file changed, 1 insertion(+) diff --git a/gmslides.gypi b/gmslides.gypi index 874c79a..7c64844 100644 --- a/gmslides.gypi +++ b/gmslides.gypi @@ -13,6 +13,7 @@ '../gm/colormatrix.cpp', '../gm/complexclip.cpp', '../gm/complexclip2.cpp', + '../gm/composeshader.cpp', '../gm/convexpaths.cpp', '../gm/cubicpaths.cpp', '../gm/cmykjpeg.cpp', -- cgit v1.2.3 From c658da82cef26c6201f35b79561413c9a85512a6 Mon Sep 17 00:00:00 2001 From: "djsollen@google.com" Date: Fri, 29 Jun 2012 18:26:27 +0000 Subject: Update the makefile and gyp for the debugger. Review URL: https://codereview.appspot.com/6355052 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@4410 2bbb7eff-a529-9590-31e7-b0007b416f81 --- common_variables.gypi | 2 -- debugger.gyp | 3 +++ 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/common_variables.gypi b/common_variables.gypi index 70b68fd..ee00a34 100644 --- a/common_variables.gypi +++ b/common_variables.gypi @@ -66,7 +66,6 @@ 'skia_angle%': 0, 'skia_arch_type%': 'x86', 'skia_arch_width%': 32, - 'skia_debugger%': 'off', }, # Re-define all variables defined within the level-2 'variables' dict, @@ -79,7 +78,6 @@ 'skia_angle%': '<(skia_angle)', 'skia_arch_type%': '<(skia_arch_type)', 'skia_arch_width%': '<(skia_arch_width)', - 'skia_debugger%': '<(skia_debugger)', }, } # Local Variables: diff --git a/debugger.gyp b/debugger.gyp index 0789a96..33b0932 100644 --- a/debugger.gyp +++ b/debugger.gyp @@ -54,6 +54,9 @@ ], }, }], + [ 'skia_os == "mac" and skia_arch_width != 64', { + 'error': ' Date: Fri, 29 Jun 2012 18:37:57 +0000 Subject: Un-trifurcate GrTextContext: get rid of Default and Batched subclasses, folding their functionality back into the base class. Requires gyp changes. http://codereview.appspot.com/6357048/ git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@4411 2bbb7eff-a529-9590-31e7-b0007b416f81 --- gpu.gyp | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/gpu.gyp b/gpu.gyp index 381d6bc..401759b 100644 --- a/gpu.gyp +++ b/gpu.gyp @@ -217,8 +217,6 @@ '../src/gpu/GrAllocPool.cpp', '../src/gpu/GrAtlas.cpp', '../src/gpu/GrAtlas.h', - '../src/gpu/GrBatchedTextContext.cpp', - '../src/gpu/GrBatchedTextContext.h', '../src/gpu/GrBinHashKey.h', '../src/gpu/GrBufferAllocPool.cpp', '../src/gpu/GrBufferAllocPool.h', @@ -227,8 +225,6 @@ '../src/gpu/GrCustomStage.cpp', '../src/gpu/GrDefaultPathRenderer.cpp', '../src/gpu/GrDefaultPathRenderer.h', - '../src/gpu/GrDefaultTextContext.cpp', - '../src/gpu/GrDefaultTextContext.h', '../src/gpu/GrDrawState.h', '../src/gpu/GrDrawTarget.cpp', '../src/gpu/GrDrawTarget.h', @@ -277,6 +273,7 @@ '../src/gpu/GrSoftwarePathRenderer.h', '../src/gpu/GrSurface.cpp', '../src/gpu/GrTemplates.h', + '../src/gpu/GrTextContext.cpp', '../src/gpu/GrTextStrike.cpp', '../src/gpu/GrTextStrike.h', '../src/gpu/GrTextStrike_impl.h', -- cgit v1.2.3 From 8907ba3ef51a181c5d80aa65d8e9da1eef10547c Mon Sep 17 00:00:00 2001 From: "robertphillips@google.com" Date: Fri, 29 Jun 2012 20:55:14 +0000 Subject: Partially rolled forward the SkGrPixelRef changes http://codereview.appspot.com/6354060/ git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@4415 2bbb7eff-a529-9590-31e7-b0007b416f81 --- gpu.gyp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/gpu.gyp b/gpu.gyp index 401759b..299be52 100644 --- a/gpu.gyp +++ b/gpu.gyp @@ -103,6 +103,7 @@ '../include/gpu/SkGpuCanvas.h', '../include/gpu/SkGpuDevice.h', '../include/gpu/SkGr.h', + '../include/gpu/SkGrPixelRef.h', '../include/gpu/SkGrTexturePixelRef.h', '../include/gpu/gl/SkGLContext.h', @@ -116,6 +117,7 @@ '../src/gpu/SkGpuDevice.cpp', '../src/gpu/SkGr.cpp', '../src/gpu/SkGrFontScaler.cpp', + '../src/gpu/SkGrPixelRef.cpp', '../src/gpu/SkGrTexturePixelRef.cpp', '../src/gpu/gl/SkGLContext.cpp', -- cgit v1.2.3 From b3571465a2ffdce0a44621439b7bef0b47b100d7 Mon Sep 17 00:00:00 2001 From: "scroggo@google.com" Date: Mon, 2 Jul 2012 13:35:09 +0000 Subject: Properly handle extracted bitmaps in cross process/shared addr space SkGPipe. Use the pixel ref which we have already copied and the appropriate pixel ref offset. Turn SampleDrawBitmap into a GM to test this functionality. Review URL: https://codereview.appspot.com/6348059 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@4417 2bbb7eff-a529-9590-31e7-b0007b416f81 --- SampleApp.gyp | 1 - gmslides.gypi | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/SampleApp.gyp b/SampleApp.gyp index 4f0ad51..bc128be 100644 --- a/SampleApp.gyp +++ b/SampleApp.gyp @@ -48,7 +48,6 @@ '../samplecode/SampleDegenerateTwoPtRadials.cpp', '../samplecode/SampleDither.cpp', '../samplecode/SampleDitherBitmap.cpp', - '../samplecode/SampleDrawBitmap.cpp', '../samplecode/SampleDrawLooper.cpp', '../samplecode/SampleEffects.cpp', '../samplecode/SampleEmboss.cpp', diff --git a/gmslides.gypi b/gmslides.gypi index 7c64844..45dab51 100644 --- a/gmslides.gypi +++ b/gmslides.gypi @@ -20,6 +20,7 @@ '../gm/degeneratesegments.cpp', '../gm/dashing.cpp', '../gm/drawbitmaprect.cpp', + '../gm/extractbitmap.cpp', '../gm/emptypath.cpp', '../gm/filltypes.cpp', '../gm/filltypespersp.cpp', -- cgit v1.2.3 From e59b28e58b6f44b7c92f93b9a51251323a180ec2 Mon Sep 17 00:00:00 2001 From: "caryclark@google.com" Date: Mon, 2 Jul 2012 20:44:59 +0000 Subject: update shapeops_edge gyp git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@4432 2bbb7eff-a529-9590-31e7-b0007b416f81 --- shapeops_edge.gyp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/shapeops_edge.gyp b/shapeops_edge.gyp index 37ef610..a862c5d 100644 --- a/shapeops_edge.gyp +++ b/shapeops_edge.gyp @@ -66,17 +66,18 @@ '../experimental/Intersection/QuadraticReduceOrder_Test.cpp', '../experimental/Intersection/QuadraticSubDivide.cpp', '../experimental/Intersection/QuadraticUtilities.cpp', - '../experimental/Intersection/RectUtilities.cpp', '../experimental/Intersection/Simplify.cpp', '../experimental/Intersection/SimplifyAddIntersectingTs_Test.cpp', '../experimental/Intersection/SimplifyAngle_Test.cpp', '../experimental/Intersection/SimplifyFindNext_Test.cpp', '../experimental/Intersection/SimplifyFindTop_Test.cpp', '../experimental/Intersection/SimplifyNew_Test.cpp', + '../experimental/Intersection/SimplifyRect4x4_Test.cpp', '../experimental/Intersection/TestUtilities.cpp', '../experimental/Intersection/CubicIntersection_TestData.h', '../experimental/Intersection/CubicUtilities.h', '../experimental/Intersection/CurveIntersection.h', + '../experimental/Intersection/CurveUtilities.h', '../experimental/Intersection/DataTypes.h', '../experimental/Intersection/EdgeWalker_Test.h', '../experimental/Intersection/Extrema.h', -- cgit v1.2.3 From f53d157206fcec6bc4dcdf360ebe748fd990f8b5 Mon Sep 17 00:00:00 2001 From: "mike@reedtribe.org" Date: Tue, 3 Jul 2012 02:44:02 +0000 Subject: add gm for hittesting paths git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@4438 2bbb7eff-a529-9590-31e7-b0007b416f81 --- gmslides.gypi | 1 + 1 file changed, 1 insertion(+) diff --git a/gmslides.gypi b/gmslides.gypi index 45dab51..e600d04 100644 --- a/gmslides.gypi +++ b/gmslides.gypi @@ -30,6 +30,7 @@ '../gm/gradients.cpp', '../gm/gradtext.cpp', '../gm/hairmodes.cpp', + '../gm/hittestpath.cpp', '../gm/imageblur.cpp', '../gm/lighting.cpp', '../gm/imagefiltersbase.cpp', -- cgit v1.2.3 From 059d21b025552d874dfc776c5d6035e6d754b516 Mon Sep 17 00:00:00 2001 From: "borenet@google.com" Date: Tue, 3 Jul 2012 16:03:51 +0000 Subject: Remove unnecessary lines after Android gyp fix Review URL: https://codereview.appspot.com/6353066 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@4452 2bbb7eff-a529-9590-31e7-b0007b416f81 --- bench.gyp | 5 ----- 1 file changed, 5 deletions(-) diff --git a/bench.gyp b/bench.gyp index b0fe517..dcf9b5f 100644 --- a/bench.gyp +++ b/bench.gyp @@ -75,11 +75,6 @@ '../bench/BenchSysTimer_windows.cpp', ], }], - [ 'skia_os == "android"', { - 'dependencies!': [ - 'android_system.gyp:Android_EntryPoint', - ], - }], ], } ], -- cgit v1.2.3 From 0b6855eb2c73a5aa02026fd82e5398651ce8eab6 Mon Sep 17 00:00:00 2001 From: "keyar@chromium.org" Date: Mon, 9 Jul 2012 18:32:08 +0000 Subject: Allow specific files and multiple inputs for picture testing tools. Changed the render_pictures, bench_pictures and test_pictures.py so that multiple inputs can be given. Furthermore, specific files can also be specified. Unit tests have also been added for picture_utils.cpp. Review URL: https://codereview.appspot.com/6345054 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@4486 2bbb7eff-a529-9590-31e7-b0007b416f81 --- tests.gyp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tests.gyp b/tests.gyp index 22aa3c4..cdf755b 100644 --- a/tests.gyp +++ b/tests.gyp @@ -13,6 +13,7 @@ '../src/gpu', '../src/pdf', '../src/utils', + '../tools/', ], 'sources': [ '../tests/AAClipTest.cpp', @@ -58,6 +59,7 @@ '../tests/PathMeasureTest.cpp', '../tests/PathTest.cpp', '../tests/PDFPrimitivesTest.cpp', + '../tests/PictureUtilsTest.cpp', '../tests/PointTest.cpp', '../tests/PremulAlphaRoundTripTest.cpp', '../tests/QuickRejectTest.cpp', @@ -96,6 +98,7 @@ 'images.gyp:images', 'ports.gyp:ports', 'pdf.gyp:pdf', + 'tools.gyp:picture_utils', 'utils.gyp:utils', ], }, -- cgit v1.2.3 From 13ac198182301467960720d8394be9a1ab61df8a Mon Sep 17 00:00:00 2001 From: "keyar@chromium.org" Date: Mon, 9 Jul 2012 19:37:40 +0000 Subject: Added a sgpipe benchmark. Review URL: https://codereview.appspot.com/6349070 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@4490 2bbb7eff-a529-9590-31e7-b0007b416f81 --- tools.gyp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/tools.gyp b/tools.gyp index f30f311..2fee6da 100644 --- a/tools.gyp +++ b/tools.gyp @@ -82,15 +82,18 @@ 'target_name': 'bench_pictures', 'type': 'executable', 'sources': [ - '../tools/bench_pictures_main.cpp' + '../tools/bench_pictures_main.cpp', + '../src/pipe/utils/SamplePipeControllers.h', + '../src/pipe/utils/SamplePipeControllers.cpp', ], 'include_dirs': [ '../bench', + '../src/pipe/utils/', ], 'dependencies': [ 'core.gyp:core', 'ports.gyp:ports', - 'images.gyp:images', + 'images.gyp:images', 'tools.gyp:picture_utils', 'bench.gyp:bench_timer', ], -- cgit v1.2.3 From 32a7169118946b3342920e7b2d70ac32d62c8b43 Mon Sep 17 00:00:00 2001 From: "bsalomon@google.com" Date: Tue, 10 Jul 2012 17:51:07 +0000 Subject: Remove GrStringBuilder Review URL: http://codereview.appspot.com/6343093/ git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@4514 2bbb7eff-a529-9590-31e7-b0007b416f81 --- gpu.gyp | 1 - 1 file changed, 1 deletion(-) diff --git a/gpu.gyp b/gpu.gyp index 299be52..91e7385 100644 --- a/gpu.gyp +++ b/gpu.gyp @@ -266,7 +266,6 @@ '../src/gpu/GrStencilAndCoverPathRenderer.h', '../src/gpu/GrStencilBuffer.cpp', '../src/gpu/GrStencilBuffer.h', - '../src/gpu/GrStringBuilder.h', '../src/gpu/GrTBSearch.h', '../src/gpu/GrTDArray.h', '../src/gpu/GrSWMaskHelper.cpp', -- cgit v1.2.3 From 326f75bade2a0391b82d8742b3f8cb7cc049e8a5 Mon Sep 17 00:00:00 2001 From: "bungeman@google.com" Date: Tue, 10 Jul 2012 21:54:31 +0000 Subject: Move animated view headers to correct directory. git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@4524 2bbb7eff-a529-9590-31e7-b0007b416f81 --- views.gyp | 5 ----- views_animated.gyp | 5 +++++ 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/views.gyp b/views.gyp index f3d3759..fa0a29a 100644 --- a/views.gyp +++ b/views.gyp @@ -26,10 +26,8 @@ 'sources': [ '../include/views/SkApplication.h', '../include/views/SkBGViewArtist.h', - '../include/views/SkBorderView.h', '../include/views/SkEvent.h', '../include/views/SkEventSink.h', - '../include/views/SkImageView.h', '../include/views/SkKey.h', '../include/views/SkOSMenu.h', '../include/views/SkOSWindow_Mac.h', @@ -37,8 +35,6 @@ '../include/views/SkOSWindow_Unix.h', '../include/views/SkOSWindow_Win.h', #'../include/views/SkOSWindow_wxwidgets.h', - '../include/views/SkProgressBarView.h', - '../include/views/SkScrollBarView.h', '../include/views/SkStackViewLayout.h', '../include/views/SkSystemEventTypes.h', '../include/views/SkTextBox.h', @@ -51,7 +47,6 @@ '../src/views/SkBGViewArtist.cpp', '../src/views/SkEvent.cpp', '../src/views/SkEventSink.cpp', - '../src/views/SkListView.cpp', '../src/views/SkOSMenu.cpp', '../src/views/SkParsePaint.cpp', '../src/views/SkProgressView.cpp', diff --git a/views_animated.gyp b/views_animated.gyp index f7cd052..90d5351 100644 --- a/views_animated.gyp +++ b/views_animated.gyp @@ -18,10 +18,15 @@ '../include/views/animated', ], 'sources': [ + '../include/views/animated/SkBorderView.h', + '../include/views/animated/SkImageView.h', + '../include/views/animated/SkProgressBarView.h', + '../include/views/animated/SkScrollBarView.h', '../include/views/animated/SkWidgetViews.h', '../src/views/animated/SkBorderView.cpp', '../src/views/animated/SkImageView.cpp', + '../src/views/animated/SkListView.cpp', '../src/views/animated/SkListWidget.cpp', '../src/views/animated/SkProgressBarView.cpp', '../src/views/animated/SkScrollBarView.cpp', -- cgit v1.2.3 From 8acdac467d07f7a6450a57ead4fb3a6dc82cdcd0 Mon Sep 17 00:00:00 2001 From: "senorblanco@chromium.org" Date: Wed, 11 Jul 2012 16:01:22 +0000 Subject: This patch implements the diffuse and specular lighting filters in Ganesh. There are three light types for each: distant, point and spot, whose code generation lives in a GrGLLight class hierarchy. This similar to the CPU implementation, where each light type provides a function to compute the vector from the surface plane to the light (surfaceToLight) and to compute the light colour (emitLightColour). Instead of templated member functions, as in the CPU implementation, these are virtual functions to emit the light-specific GLSL code. All of the code for the GPU path lives in the same file as that for the CPU path, SkLightingImageFilter.cpp. In order to provide Ganesh a hook to access it, SkImageFilter now has a asNewCustomStage() virtual, which allows an image filter to return a GrCustomStage representing that filter. Note that this patch does not handle the border conditions correctly (the [top|bottom][Left|Right]Normal() functions in the CPU implementation). That will come in a future patch. Review URL: http://codereview.appspot.com/6345081/ git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@4535 2bbb7eff-a529-9590-31e7-b0007b416f81 --- effects.gyp | 2 ++ gpu.gyp | 3 +++ 2 files changed, 5 insertions(+) diff --git a/effects.gyp b/effects.gyp index fbccb40..cb15a2a 100644 --- a/effects.gyp +++ b/effects.gyp @@ -7,6 +7,8 @@ '../include/config', '../include/core', '../include/effects', + '../include/gpu', + '../src/gpu', ], 'sources': [ '../include/effects/Sk1DPathEffect.h', diff --git a/gpu.gyp b/gpu.gyp index 91e7385..2874054 100644 --- a/gpu.gyp +++ b/gpu.gyp @@ -163,6 +163,9 @@ 'include_dirs': [ '../include/core', '../include/config', + '../include/effects', # This is only to get Sk effects into + # GrGpuGL_unittest.cpp, not for general + # consumption in src/gpu. '../include/gpu', '../src/core', # SkRasterClip.h '../src/gpu' -- cgit v1.2.3 From b936dec578cb0f7183bab4dba23a7fa45900a39e Mon Sep 17 00:00:00 2001 From: "reed@google.com" Date: Wed, 11 Jul 2012 19:57:55 +0000 Subject: idea: add annotation to SkPaint Review URL: https://codereview.appspot.com/6355050 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@4555 2bbb7eff-a529-9590-31e7-b0007b416f81 --- core.gyp | 1 + tests.gyp | 1 + 2 files changed, 2 insertions(+) diff --git a/core.gyp b/core.gyp index a109d7b..7b54024 100644 --- a/core.gyp +++ b/core.gyp @@ -9,6 +9,7 @@ '../src/core/ARGB32_Clamp_Bilinear_BitmapShader.h', '../src/core/Sk64.cpp', '../src/core/SkAAClip.cpp', + '../src/core/SkAnnotation.cpp', '../src/core/SkAdvancedTypefaceMetrics.cpp', '../src/core/SkAlphaRuns.cpp', '../src/core/SkAntiRun.h', diff --git a/tests.gyp b/tests.gyp index cdf755b..c6e2786 100644 --- a/tests.gyp +++ b/tests.gyp @@ -17,6 +17,7 @@ ], 'sources': [ '../tests/AAClipTest.cpp', + '../tests/AnnotationTest.cpp', '../tests/BitmapCopyTest.cpp', '../tests/BitmapGetColorTest.cpp', '../tests/BitSetTest.cpp', -- cgit v1.2.3 From c39137bf67132195115eaf4eea5a5b8ccadb28b4 Mon Sep 17 00:00:00 2001 From: "senorblanco@chromium.org" Date: Thu, 12 Jul 2012 00:34:39 +0000 Subject: The correct fix for the lighting filters on Windows: set the GL calling convention for all targets, not just gpu, since effects now makes GL calls too. Build fix; unreviewed. git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@4559 2bbb7eff-a529-9590-31e7-b0007b416f81 --- common_conditions.gypi | 1 + gpu.gyp | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/common_conditions.gypi b/common_conditions.gypi index 92113e3..6ccaa46 100644 --- a/common_conditions.gypi +++ b/common_conditions.gypi @@ -9,6 +9,7 @@ 'SK_BUILD_FOR_WIN32', 'SK_IGNORE_STDINT_DOT_H', '_CRT_SECURE_NO_WARNINGS', + 'GR_GL_FUNCTION_TYPE=__stdcall', ], 'msvs_cygwin_shell': 0, 'msvs_settings': { diff --git a/gpu.gyp b/gpu.gyp index 2874054..cabd331 100644 --- a/gpu.gyp +++ b/gpu.gyp @@ -44,7 +44,6 @@ [ 'skia_os == "win"', { 'defines': [ 'GR_WIN32_BUILD=1', - 'GR_GL_FUNCTION_TYPE=__stdcall', ], }], ], -- cgit v1.2.3 From ccac317ff320e4382aa23fcc2225815dd3f7a5b9 Mon Sep 17 00:00:00 2001 From: "chudy@google.com" Date: Thu, 12 Jul 2012 14:31:25 +0000 Subject: SkHitBox added. SkHitBox is a class that determines which draw command is associated with the pixel located at x,y. By calculating a single point instead of the entire bitmap at once there is no visible performance slowdown. Review URL: https://codereview.appspot.com/6350098 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@4565 2bbb7eff-a529-9590-31e7-b0007b416f81 --- debugger.gyp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/debugger.gyp b/debugger.gyp index 33b0932..ff3bd1b 100644 --- a/debugger.gyp +++ b/debugger.gyp @@ -30,6 +30,8 @@ '../debugger/SkObjectParser.cpp', '../debugger/QT/SkSettingsWidget.h', '../debugger/QT/SkSettingsWidget.cpp', + '../debugger/SkHitBox.h', + '../debugger/SkHitBox.cpp', # To update this file edit SkIcons.qrc and rerun rcc to generate cpp '../debugger/QT/qrc_SkIcons.cpp', -- cgit v1.2.3 From 5987c4f05cbb21d4ae8378326f8d6d0ff12ec2ba Mon Sep 17 00:00:00 2001 From: "tomhudson@google.com" Date: Thu, 12 Jul 2012 17:23:52 +0000 Subject: Introduces new SingleTextureEffect base class for GrCustomStage objects. This class tracks the texture that the object uses. A future commit will get rid of the GrTexture pointer currenty stored in the GrDrawState, allowing us to have CustomStages *without* textures. Requires gyp change on next roll. http://codereview.appspot.com/6306097/ git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@4576 2bbb7eff-a529-9590-31e7-b0007b416f81 --- gpu.gyp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/gpu.gyp b/gpu.gyp index cabd331..4a708d8 100644 --- a/gpu.gyp +++ b/gpu.gyp @@ -293,6 +293,8 @@ '../src/gpu/effects/GrGradientEffects.h', '../src/gpu/effects/GrMorphologyEffect.cpp', '../src/gpu/effects/GrMorphologyEffect.h', + '../src/gpu/effects/GrSingleTextureEffect.cpp', + '../src/gpu/effects/GrSingleTextureEffect.h', '../src/gpu/gl/GrGLCaps.cpp', '../src/gpu/gl/GrGLCaps.h', -- cgit v1.2.3 From 284054ac3d4a4eefdfe4a740648c378e7ddf76f0 Mon Sep 17 00:00:00 2001 From: "reed@google.com" Date: Fri, 13 Jul 2012 15:55:15 +0000 Subject: don't add circles on chopped cubics git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@4600 2bbb7eff-a529-9590-31e7-b0007b416f81 --- gmslides.gypi | 1 + 1 file changed, 1 insertion(+) diff --git a/gmslides.gypi b/gmslides.gypi index e600d04..fa4d2bb 100644 --- a/gmslides.gypi +++ b/gmslides.gypi @@ -18,6 +18,7 @@ '../gm/cubicpaths.cpp', '../gm/cmykjpeg.cpp', '../gm/degeneratesegments.cpp', + '../gm/dashcubics.cpp', '../gm/dashing.cpp', '../gm/drawbitmaprect.cpp', '../gm/extractbitmap.cpp', -- cgit v1.2.3 From cd9b1775b976cf09dc844ed9dc051a1001a6b45f Mon Sep 17 00:00:00 2001 From: "scroggo@google.com" Date: Mon, 16 Jul 2012 13:13:29 +0000 Subject: Add a skia method to perform an atomic add. Complements sk_atomic_inc for when you want to increase by more than one. Review URL: https://codereview.appspot.com/6350106 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@4614 2bbb7eff-a529-9590-31e7-b0007b416f81 --- tests.gyp | 1 + 1 file changed, 1 insertion(+) diff --git a/tests.gyp b/tests.gyp index c6e2786..8ea4ee8 100644 --- a/tests.gyp +++ b/tests.gyp @@ -18,6 +18,7 @@ 'sources': [ '../tests/AAClipTest.cpp', '../tests/AnnotationTest.cpp', + '../tests/AtomicTest.cpp', '../tests/BitmapCopyTest.cpp', '../tests/BitmapGetColorTest.cpp', '../tests/BitSetTest.cpp', -- cgit v1.2.3 From f14aedac9307a50fe991f1355da3da82846aa974 Mon Sep 17 00:00:00 2001 From: "scroggo@google.com" Date: Mon, 16 Jul 2012 13:22:56 +0000 Subject: Revert "Add a method to atomic add." This reverts commit eb539cf92f487daf9567ffbbba6b6653406d43ae. BUG= TEST= Review URL: https://codereview.appspot.com/6395051 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@4615 2bbb7eff-a529-9590-31e7-b0007b416f81 --- tests.gyp | 1 - 1 file changed, 1 deletion(-) diff --git a/tests.gyp b/tests.gyp index 8ea4ee8..c6e2786 100644 --- a/tests.gyp +++ b/tests.gyp @@ -18,7 +18,6 @@ 'sources': [ '../tests/AAClipTest.cpp', '../tests/AnnotationTest.cpp', - '../tests/AtomicTest.cpp', '../tests/BitmapCopyTest.cpp', '../tests/BitmapGetColorTest.cpp', '../tests/BitSetTest.cpp', -- cgit v1.2.3 From 0de6cd59d8a0197d530431e0b41f64c970840948 Mon Sep 17 00:00:00 2001 From: "scroggo@google.com" Date: Mon, 16 Jul 2012 16:51:28 +0000 Subject: Add a skia method to perform an atomic add. Complements sk_atomic_inc for when you want to increase by more than one. This time, use the correct atomic add function on Windows. Reviewed at https://codereview.appspot.com/6399050/ Review URL: https://codereview.appspot.com/6407048 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@4623 2bbb7eff-a529-9590-31e7-b0007b416f81 --- tests.gyp | 1 + 1 file changed, 1 insertion(+) diff --git a/tests.gyp b/tests.gyp index c6e2786..8ea4ee8 100644 --- a/tests.gyp +++ b/tests.gyp @@ -18,6 +18,7 @@ 'sources': [ '../tests/AAClipTest.cpp', '../tests/AnnotationTest.cpp', + '../tests/AtomicTest.cpp', '../tests/BitmapCopyTest.cpp', '../tests/BitmapGetColorTest.cpp', '../tests/BitSetTest.cpp', -- cgit v1.2.3 From e074b20e3c187140e809f276eba1f71a08697399 Mon Sep 17 00:00:00 2001 From: "keyar@chromium.org" Date: Mon, 16 Jul 2012 17:29:16 +0000 Subject: Added pipe as a rendering option for render_pictures. I will add tiling as a rendering option and then figure out a way to not have the code duplicated between render_pictures and bench_pictures. Review URL: https://codereview.appspot.com/6392066 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@4626 2bbb7eff-a529-9590-31e7-b0007b416f81 --- tools.gyp | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/tools.gyp b/tools.gyp index 2fee6da..47ab49a 100644 --- a/tools.gyp +++ b/tools.gyp @@ -70,6 +70,11 @@ 'type': 'executable', 'sources': [ '../tools/render_pictures_main.cpp', + '../src/pipe/utils/SamplePipeControllers.h', + '../src/pipe/utils/SamplePipeControllers.cpp', + ], + 'include_dirs': [ + '../src/pipe/utils/', ], 'dependencies': [ 'core.gyp:core', -- cgit v1.2.3 From be76d3d1f08541ed4b8d66641756a5e989e17f9c Mon Sep 17 00:00:00 2001 From: "tomhudson@google.com" Date: Tue, 17 Jul 2012 18:43:21 +0000 Subject: Move texture domains onto a GrCustomStage, off of GrSamplerState. This will require gyp changes to roll into Chrome. http://codereview.appspot.com/6405050/ git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@4641 2bbb7eff-a529-9590-31e7-b0007b416f81 --- gpu.gyp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/gpu.gyp b/gpu.gyp index 4a708d8..523ba52 100644 --- a/gpu.gyp +++ b/gpu.gyp @@ -295,6 +295,8 @@ '../src/gpu/effects/GrMorphologyEffect.h', '../src/gpu/effects/GrSingleTextureEffect.cpp', '../src/gpu/effects/GrSingleTextureEffect.h', + '../src/gpu/effects/GrTextureDomainEffect.cpp', + '../src/gpu/effects/GrTextureDomainEffect.h', '../src/gpu/gl/GrGLCaps.cpp', '../src/gpu/gl/GrGLCaps.h', -- cgit v1.2.3 From b33a8eac1583adcda7cc33fc8a62bac073a6a0bd Mon Sep 17 00:00:00 2001 From: "borenet@google.com" Date: Wed, 18 Jul 2012 14:59:54 +0000 Subject: Enable Compile Option to Build Android Executables Since we can't debug APKs on 4.1, we sometimes need to build Skia the old way for Android. This CL enables a switch to do so. Review URL: https://codereview.appspot.com/6408053 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@4653 2bbb7eff-a529-9590-31e7-b0007b416f81 --- apptype_console.gypi | 2 +- common_variables.gypi | 2 ++ effects.gyp | 7 ++++--- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/apptype_console.gypi b/apptype_console.gypi index 6971b6a..62f1b9f 100644 --- a/apptype_console.gypi +++ b/apptype_console.gypi @@ -12,7 +12,7 @@ }, }, 'conditions': [ - [ 'skia_os == "android"', { + [ 'skia_os == "android" and android_make_apk == 1', { 'dependencies': [ 'android_system.gyp:Android_EntryPoint', ], diff --git a/common_variables.gypi b/common_variables.gypi index ee00a34..88e710e 100644 --- a/common_variables.gypi +++ b/common_variables.gypi @@ -66,6 +66,7 @@ 'skia_angle%': 0, 'skia_arch_type%': 'x86', 'skia_arch_width%': 32, + 'android_make_apk%': 1, }, # Re-define all variables defined within the level-2 'variables' dict, @@ -78,6 +79,7 @@ 'skia_angle%': '<(skia_angle)', 'skia_arch_type%': '<(skia_arch_type)', 'skia_arch_width%': '<(skia_arch_width)', + 'android_make_apk%': '<(android_make_apk)', }, } # Local Variables: diff --git a/effects.gyp b/effects.gyp index cb15a2a..a551ceb 100644 --- a/effects.gyp +++ b/effects.gyp @@ -4,10 +4,7 @@ 'target_name': 'effects', 'type': 'static_library', 'include_dirs': [ - '../include/config', - '../include/core', '../include/effects', - '../include/gpu', '../src/gpu', ], 'sources': [ @@ -87,6 +84,10 @@ '../include/effects', ], }, + 'dependencies': [ + 'core.gyp:core', + 'gpu.gyp:gr', + ], }, ], } -- cgit v1.2.3 From d1b050d8bafe5bdcdf36f2b6ecbdbb4d04017801 Mon Sep 17 00:00:00 2001 From: "junov@chromium.org" Date: Wed, 18 Jul 2012 17:54:45 +0000 Subject: Refactoring SkDeferredCanvas to use SkGPipe. Keeping the refactor hidden behind a config macro for now. TEST=covered by existing skia gm tests BUG=https://code.google.com/p/chromium/issues/detail?id=133432 Review URL: https://codereview.appspot.com/6405054 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@4656 2bbb7eff-a529-9590-31e7-b0007b416f81 --- utils.gyp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/utils.gyp b/utils.gyp index 9b11e59..bdfcc6c 100644 --- a/utils.gyp +++ b/utils.gyp @@ -6,11 +6,12 @@ 'include_dirs': [ '../include/config', '../include/core', + '../include/effects', + '../include/pipe', '../include/utils', '../include/utils/mac', '../include/utils/unix', '../include/utils/win', - '../include/effects', '../include/xml', ], 'sources': [ -- cgit v1.2.3 From acbac444e050f551a60eaf1eb5a252eb164784a1 Mon Sep 17 00:00:00 2001 From: "twiz@google.com" Date: Wed, 18 Jul 2012 21:41:50 +0000 Subject: This CL implements the Ganesh path for the SkTable_ColorFilter color transformation. A new texture stage dedicated to color transforms has been added, along with the new custom stage implementing the LUT. Review URL: https://codereview.appspot.com/6351081 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@4663 2bbb7eff-a529-9590-31e7-b0007b416f81 --- gpu.gyp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/gpu.gyp b/gpu.gyp index 523ba52..cff89d3 100644 --- a/gpu.gyp +++ b/gpu.gyp @@ -287,6 +287,8 @@ '../src/gpu/gr_unittests.cpp', '../src/gpu/effects/Gr1DKernelEffect.h', + '../src/gpu/effects/GrColorTableEffect.cpp', + '../src/gpu/effects/GrColorTableEffect.h', '../src/gpu/effects/GrConvolutionEffect.cpp', '../src/gpu/effects/GrConvolutionEffect.h', '../src/gpu/effects/GrGradientEffects.cpp', -- cgit v1.2.3 From a06d79930553d29e2db7b5b174d5c6aa14b56fbb Mon Sep 17 00:00:00 2001 From: "chudy@google.com" Date: Thu, 19 Jul 2012 13:41:27 +0000 Subject: Quick bug fix that was rendering debugger unusable. Review URL: https://codereview.appspot.com/6422050 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@4668 2bbb7eff-a529-9590-31e7-b0007b416f81 --- debugger.gyp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/debugger.gyp b/debugger.gyp index ff3bd1b..a98e809 100644 --- a/debugger.gyp +++ b/debugger.gyp @@ -51,8 +51,8 @@ ], 'link_settings': { 'libraries' : [ - '/usr/lib/libQtCore.so', - '/usr/lib/libQtGui.so', + '-lQtCore', + '-lQtGui', ], }, }], @@ -95,4 +95,4 @@ # tab-width:2 # indent-tabs-mode:nil # End: -# vim: set expandtab tabstop=2 shiftwidth=2: \ No newline at end of file +# vim: set expandtab tabstop=2 shiftwidth=2: -- cgit v1.2.3 From 001614e6e45103c6d169497fdc7f22c65a3f8ea8 Mon Sep 17 00:00:00 2001 From: "reed@google.com" Date: Fri, 20 Jul 2012 11:20:32 +0000 Subject: add SkPaint::getPosTextPath(), with gm to test it Review URL: https://codereview.appspot.com/6427055 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@4684 2bbb7eff-a529-9590-31e7-b0007b416f81 --- gmslides.gypi | 1 + 1 file changed, 1 insertion(+) diff --git a/gmslides.gypi b/gmslides.gypi index fa4d2bb..6a032a1 100644 --- a/gmslides.gypi +++ b/gmslides.gypi @@ -27,6 +27,7 @@ '../gm/filltypespersp.cpp', '../gm/fontscaler.cpp', '../gm/gammatext.cpp', + '../gm/getpostextpath.cpp', '../gm/giantbitmap.cpp', '../gm/gradients.cpp', '../gm/gradtext.cpp', -- cgit v1.2.3 From 3c329d705059d7cee11d6f338f7e016c0f1fe976 Mon Sep 17 00:00:00 2001 From: "bungeman@google.com" Date: Tue, 24 Jul 2012 17:50:25 +0000 Subject: Remove SkSfntUtils, as it is not longer used. git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@4735 2bbb7eff-a529-9590-31e7-b0007b416f81 --- utils.gyp | 2 -- 1 file changed, 2 deletions(-) diff --git a/utils.gyp b/utils.gyp index bdfcc6c..8b919a3 100644 --- a/utils.gyp +++ b/utils.gyp @@ -32,7 +32,6 @@ '../include/utils/SkParsePaint.h', '../include/utils/SkParsePath.h', '../include/utils/SkProxyCanvas.h', - '../include/utils/SkSfntUtils.h', '../include/utils/SkUnitMappers.h', '../include/utils/SkWGL.h', @@ -58,7 +57,6 @@ '../src/utils/SkParseColor.cpp', '../src/utils/SkParsePath.cpp', '../src/utils/SkProxyCanvas.cpp', - '../src/utils/SkSfntUtils.cpp', '../src/utils/SkThreadUtils.h', '../src/utils/SkThreadUtils_pthread.cpp', '../src/utils/SkThreadUtils_pthread.h', -- cgit v1.2.3 From fc2bbbcd06d29c475f44d0fa9c59535e6a30c40b Mon Sep 17 00:00:00 2001 From: "bungeman@google.com" Date: Tue, 24 Jul 2012 20:33:21 +0000 Subject: Split SkGlyph into its own header. https://codereview.appspot.com/6434049/ git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@4741 2bbb7eff-a529-9590-31e7-b0007b416f81 --- core.gyp | 1 + 1 file changed, 1 insertion(+) diff --git a/core.gyp b/core.gyp index 7b54024..b4753b8 100644 --- a/core.gyp +++ b/core.gyp @@ -188,6 +188,7 @@ '../include/core/SkFloatingPoint.h', '../include/core/SkFontHost.h', '../include/core/SkGeometry.h', + '../include/core/SkGlyph.h', '../include/core/SkGraphics.h', '../include/core/SkInstCnt.h', '../include/core/SkMallocPixelRef.h', -- cgit v1.2.3 From ad91a7d99c96e926c1eba385cbd2f3551e9428fb Mon Sep 17 00:00:00 2001 From: "scroggo@google.com" Date: Tue, 24 Jul 2012 20:47:55 +0000 Subject: Avoid a loop in writeString and writePad by zeroing padding first. Also add a benchmark to time the new improved writeString. Before my change the bench took ~1.23ms and afterwards it takes ~.95ms. Add some testing to ensure that writePad works properly. TEST=Writer32Test, WriterBench Review URL: https://codereview.appspot.com/6438045 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@4742 2bbb7eff-a529-9590-31e7-b0007b416f81 --- bench.gypi | 1 + 1 file changed, 1 insertion(+) diff --git a/bench.gypi b/bench.gypi index f809b64..e32db41 100644 --- a/bench.gypi +++ b/bench.gypi @@ -34,6 +34,7 @@ '../bench/ShaderMaskBench.cpp', '../bench/TextBench.cpp', '../bench/VertBench.cpp', + '../bench/WriterBench.cpp', ], } -- cgit v1.2.3 From e333b2483487ad0e8a23dd0ab7f5ee7feff9692e Mon Sep 17 00:00:00 2001 From: "borenet@google.com" Date: Wed, 25 Jul 2012 15:17:03 +0000 Subject: Fix Android build for new toolchain The new toolchain (r8b) does not automatically include the necessary directories (http://code.google.com/p/android/issues/detail?id=35279). Add them manually until this is fixed. Review URL: https://codereview.appspot.com/6419076 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@4749 2bbb7eff-a529-9590-31e7-b0007b416f81 --- common_conditions.gypi | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/common_conditions.gypi b/common_conditions.gypi index 6ccaa46..2f58c1b 100644 --- a/common_conditions.gypi +++ b/common_conditions.gypi @@ -211,12 +211,20 @@ 'cflags': [ '-fno-exceptions', '-fno-rtti', + '-fuse-ld=gold', + '--sysroot=<(android_base)/toolchains/<(android_toolchain)/sysroot', + ], + 'include_dirs' : [ + '<(android_base)/toolchains/<(android_toolchain)/lib/gcc/arm-linux-androideabi/4.6.x-google/include', + '<(android_base)/toolchains/<(android_toolchain)/lib/gcc/arm-linux-androideabi/4.6.x-google/include-fixed', + '<(android_base)/toolchains/<(android_toolchain)/arm-linux-androideabi/include/c++/4.6', + '<(android_base)/toolchains/<(android_toolchain)/arm-linux-androideabi/include/c++/4.6/arm-linux-androideabi', + '<(android_base)/toolchains/<(android_toolchain)/sysroot/usr/include', ], 'conditions': [ [ 'skia_arch_type == "arm"', { 'ldflags': [ '-Wl', - '--fix-cortex-a8', ], }], [ 'skia_arch_type == "arm" and arm_thumb == 1', { -- cgit v1.2.3 From 0b9b09ff40cd46d3fe388a8e30617354f15f0c9a Mon Sep 17 00:00:00 2001 From: "bsalomon@google.com" Date: Wed, 25 Jul 2012 17:48:39 +0000 Subject: Add GL uniform manager Review URL: http://codereview.appspot.com/6423066/ git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@4758 2bbb7eff-a529-9590-31e7-b0007b416f81 --- gpu.gyp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/gpu.gyp b/gpu.gyp index cff89d3..6792db5 100644 --- a/gpu.gyp +++ b/gpu.gyp @@ -332,6 +332,9 @@ '../src/gpu/gl/GrGLTexture.h', '../src/gpu/gl/GrGLUtil.cpp', '../src/gpu/gl/GrGLUtil.h', + '../src/gpu/gl/GrGLUniformManager.cpp', + '../src/gpu/gl/GrGLUniformManager.h', + '../src/gpu/gl/GrGLUniformHandle.h', '../src/gpu/gl/GrGLVertexBuffer.cpp', '../src/gpu/gl/GrGLVertexBuffer.h', '../src/gpu/gl/GrGpuGL.cpp', -- cgit v1.2.3 From 20901dd0b8b3a1378d87b8cea5a04652b9b7e878 Mon Sep 17 00:00:00 2001 From: "keyar@chromium.org" Date: Thu, 26 Jul 2012 17:27:57 +0000 Subject: Changed to a class based method in passing around the rendering method for render_pictures. This is based on a comment for https://codereview.appspot.com/6427061/ Review URL: https://codereview.appspot.com/6405080 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@4786 2bbb7eff-a529-9590-31e7-b0007b416f81 --- tools.gyp | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/tools.gyp b/tools.gyp index 47ab49a..2ab422f 100644 --- a/tools.gyp +++ b/tools.gyp @@ -70,8 +70,6 @@ 'type': 'executable', 'sources': [ '../tools/render_pictures_main.cpp', - '../src/pipe/utils/SamplePipeControllers.h', - '../src/pipe/utils/SamplePipeControllers.cpp', ], 'include_dirs': [ '../src/pipe/utils/', @@ -80,6 +78,7 @@ 'core.gyp:core', 'images.gyp:images', 'ports.gyp:ports', + 'tools.gyp:PictureRenderer', 'tools.gyp:picture_utils', ], }, @@ -103,6 +102,22 @@ 'bench.gyp:bench_timer', ], }, + { + 'target_name': 'PictureRenderer', + 'type': 'static_library', + 'sources': [ + '../tools/PictureRenderer.cpp', + '../src/pipe/utils/SamplePipeControllers.h', + '../src/pipe/utils/SamplePipeControllers.cpp', + ], + 'include_dirs': [ + '../src/pipe/utils/', + ], + 'dependencies': [ + 'core.gyp:core', + 'tools.gyp:picture_utils', + ], + }, { 'target_name': 'picture_utils', 'type': 'static_library', -- cgit v1.2.3 From 6a9dc15081669d30c7bb7a0811421e9264c3ca95 Mon Sep 17 00:00:00 2001 From: "chudy@google.com" Date: Thu, 26 Jul 2012 19:38:22 +0000 Subject: GL Widget Alpha Review URL: https://codereview.appspot.com/6422060 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@4789 2bbb7eff-a529-9590-31e7-b0007b416f81 --- debugger.gyp | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/debugger.gyp b/debugger.gyp index a98e809..5b18c5e 100644 --- a/debugger.gyp +++ b/debugger.gyp @@ -7,6 +7,8 @@ '../src/core', '../debugger', # To pull SkDebugger.h '../debugger/QT', # For all the QT UI Goodies + '../include/gpu/', + '../src/gpu', # To pull gl/GrGLUtil.h ], 'sources': [ '../debugger/SkDebugCanvas.h', @@ -14,8 +16,8 @@ '../debugger/SkDebugger.cpp', '../debugger/SkDrawCommand.h', '../debugger/SkDrawCommand.cpp', - '../debugger/QT/moc_SkDebuggerGUI.cpp', '../debugger/QT/moc_SkCanvasWidget.cpp', + '../debugger/QT/moc_SkDebuggerGUI.cpp', '../debugger/QT/moc_SkInspectorWidget.cpp', '../debugger/QT/moc_SkSettingsWidget.cpp', '../debugger/QT/SkDebuggerGUI.cpp', @@ -32,6 +34,10 @@ '../debugger/QT/SkSettingsWidget.cpp', '../debugger/SkHitBox.h', '../debugger/SkHitBox.cpp', + '../debugger/QT/SkGLWidget.h', + '../debugger/QT/SkGLWidget.cpp', + '../debugger/QT/SkRasterWidget.h', + '../debugger/QT/SkRasterWidget.cpp', # To update this file edit SkIcons.qrc and rerun rcc to generate cpp '../debugger/QT/qrc_SkIcons.cpp', @@ -41,6 +47,8 @@ 'images.gyp:images', 'ports.gyp:ports', 'effects.gyp:effects', + 'gpu.gyp:gr', + 'gpu.gyp:skgr', ], 'conditions': [ [ 'skia_os in ["linux", "freebsd", "openbsd", "solaris"]', { @@ -48,11 +56,13 @@ '/usr/include/qt4', '/usr/include/qt4/QtCore', '/usr/include/qt4/QtGui', + '/usr/include/qt4/QtOpenGL', ], 'link_settings': { 'libraries' : [ '-lQtCore', '-lQtGui', + '-lQtOpenGL' ], }, }], @@ -64,11 +74,13 @@ 'include_dirs': [ '/Library/Frameworks/QtCore.framework/Headers/', '/Library/Frameworks/QtGui.framework/Headers/', + '/Library/Frameworks/QtOpenGL.framework/Headers/', ], 'link_settings': { 'libraries': [ '/Library/Frameworks/QtCore.framework', '/Library/Frameworks/QtGui.framework', + '/Library/Frameworks/QtOpenGL.framework', ], }, }], @@ -78,11 +90,13 @@ 'C:/Qt/4.6.4/include', 'C:/Qt/4.6.4/include/QtCore', 'C:/Qt/4.6.4/include/QtGui', + 'C:/Qt/4.6.4/include/QtOpenGL', ], 'link_settings': { 'libraries': [ 'C:/Qt/4.6.4/lib/QtCore4.lib', 'C:/Qt/4.6.4/lib/QtGui4.lib', + 'C:/Qt/4.6.4/lib/QtOpenGL.lib', ], }, }], -- cgit v1.2.3 From 9152f50aa7724e5ba0e51202e39d30b15218f87b Mon Sep 17 00:00:00 2001 From: "bsalomon@google.com" Date: Thu, 26 Jul 2012 19:39:06 +0000 Subject: Remove texture/mask setters on GrPaint Review URL: http://codereview.appspot.com/6446052/ git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@4790 2bbb7eff-a529-9590-31e7-b0007b416f81 --- gm.gyp | 1 + 1 file changed, 1 insertion(+) diff --git a/gm.gyp b/gm.gyp index 0dc4d55..20fe09e 100644 --- a/gm.gyp +++ b/gm.gyp @@ -10,6 +10,7 @@ 'include_dirs' : [ '../src/core', '../src/pipe/utils/', + '../src/gpu', ], 'includes': [ 'gmslides.gypi', -- cgit v1.2.3 From 95aff3f1a34410b4f1b8904e44485f0980deb084 Mon Sep 17 00:00:00 2001 From: "rileya@google.com" Date: Thu, 26 Jul 2012 20:04:23 +0000 Subject: Split SkGradientShader into separate files for each gradient subclass. Review URL: https://codereview.appspot.com/6447049 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@4792 2bbb7eff-a529-9590-31e7-b0007b416f81 --- effects.gyp | 24 ++++++++++++++++++------ 1 file changed, 18 insertions(+), 6 deletions(-) diff --git a/effects.gyp b/effects.gyp index a551ceb..28369ae 100644 --- a/effects.gyp +++ b/effects.gyp @@ -42,15 +42,11 @@ '../src/effects/Sk2DPathEffect.cpp', '../src/effects/SkAvoidXfermode.cpp', '../src/effects/SkArithmeticMode.cpp', - '../src/effects/SkBitmapCache.cpp', - '../src/effects/SkBitmapCache.h', '../src/effects/SkBlurDrawLooper.cpp', '../src/effects/SkBlurMask.cpp', '../src/effects/SkBlurMask.h', '../src/effects/SkBlurImageFilter.cpp', '../src/effects/SkBlurMaskFilter.cpp', - '../src/effects/SkClampRange.cpp', - '../src/effects/SkClampRange.h', '../src/effects/SkColorFilters.cpp', '../src/effects/SkColorMatrix.cpp', '../src/effects/SkColorMatrixFilter.cpp', @@ -61,7 +57,6 @@ '../src/effects/SkEmbossMask.h', '../src/effects/SkEmbossMask_Table.h', '../src/effects/SkEmbossMaskFilter.cpp', - '../src/effects/SkGradientShader.cpp', '../src/effects/SkGroupShape.cpp', '../src/effects/SkKernel33MaskFilter.cpp', '../src/effects/SkLayerDrawLooper.cpp', @@ -71,13 +66,30 @@ '../src/effects/SkPaintFlagsDrawFilter.cpp', '../src/effects/SkPixelXorXfermode.cpp', '../src/effects/SkPorterDuff.cpp', - '../src/effects/SkRadialGradient_Table.h', '../src/effects/SkRectShape.cpp', '../src/effects/SkStippleMaskFilter.cpp', '../src/effects/SkTableColorFilter.cpp', '../src/effects/SkTableMaskFilter.cpp', '../src/effects/SkTestImageFilters.cpp', '../src/effects/SkTransparentShader.cpp', + + '../src/effects/gradients/SkBitmapCache.cpp', + '../src/effects/gradients/SkBitmapCache.h', + '../src/effects/gradients/SkClampRange.cpp', + '../src/effects/gradients/SkClampRange.h', + '../src/effects/gradients/SkRadialGradient_Table.h', + '../src/effects/gradients/SkGradientShader.cpp', + '../src/effects/gradients/SkGradientShaderPriv.h', + '../src/effects/gradients/SkLinearGradient.cpp', + '../src/effects/gradients/SkLinearGradient.h', + '../src/effects/gradients/SkRadialGradient.cpp', + '../src/effects/gradients/SkRadialGradient.h', + '../src/effects/gradients/SkTwoPointRadialGradient.cpp', + '../src/effects/gradients/SkTwoPointRadialGradient.h', + '../src/effects/gradients/SkTwoPointConicalGradient.cpp', + '../src/effects/gradients/SkTwoPointConicalGradient.h', + '../src/effects/gradients/SkSweepGradient.cpp', + '../src/effects/gradients/SkSweepGradient.h', ], 'direct_dependent_settings': { 'include_dirs': [ -- cgit v1.2.3 From d1aa15e21c418bb8a36fc0932b6f597548ec2e70 Mon Sep 17 00:00:00 2001 From: "rileya@google.com" Date: Fri, 27 Jul 2012 14:00:39 +0000 Subject: Move GPU gradients into src/effects/gradients. Review URL: https://codereview.appspot.com/6453055 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@4805 2bbb7eff-a529-9590-31e7-b0007b416f81 --- gpu.gyp | 2 -- 1 file changed, 2 deletions(-) diff --git a/gpu.gyp b/gpu.gyp index 6792db5..2893a60 100644 --- a/gpu.gyp +++ b/gpu.gyp @@ -291,8 +291,6 @@ '../src/gpu/effects/GrColorTableEffect.h', '../src/gpu/effects/GrConvolutionEffect.cpp', '../src/gpu/effects/GrConvolutionEffect.h', - '../src/gpu/effects/GrGradientEffects.cpp', - '../src/gpu/effects/GrGradientEffects.h', '../src/gpu/effects/GrMorphologyEffect.cpp', '../src/gpu/effects/GrMorphologyEffect.h', '../src/gpu/effects/GrSingleTextureEffect.cpp', -- cgit v1.2.3 From a1fa9e20982521bd878db8a54fd800ea6a2a6204 Mon Sep 17 00:00:00 2001 From: "scroggo@google.com" Date: Fri, 27 Jul 2012 20:39:19 +0000 Subject: In SkGPipe, only serialize SkTypefaces in cross process mode. Also make SkGPipeController ref the recording canvas to ensure that objects used by SkGPipeCanvas (e.g. SharedHeap and fTypefaceSet, which hold references to objects to which pointers are written to the stream) survive to be played back even if SkGPipeWriter.endRecording() is called. BUG= TEST=TypefaceGM Review URL: https://codereview.appspot.com/6447055 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@4817 2bbb7eff-a529-9590-31e7-b0007b416f81 --- gmslides.gypi | 1 + 1 file changed, 1 insertion(+) diff --git a/gmslides.gypi b/gmslides.gypi index 6a032a1..5e25eb3 100644 --- a/gmslides.gypi +++ b/gmslides.gypi @@ -62,6 +62,7 @@ '../gm/tilemodes.cpp', '../gm/tinybitmap.cpp', '../gm/twopointradial.cpp', + '../gm/typeface.cpp', '../gm/verttext.cpp', '../gm/verttext2.cpp', '../gm/xfermodes.cpp', -- cgit v1.2.3 From e233917135132deea794ee663c5ac56863392b35 Mon Sep 17 00:00:00 2001 From: "scroggo@google.com" Date: Mon, 30 Jul 2012 14:40:01 +0000 Subject: Share code in various SkGPipeCanvas::drawBitmap_ calls. Also implement SkGPipeCanvas::drawBitmapMatrix, and create a GM to make sure it works properly. Use a flag instead of writing a bool for determining whether drawBitmap_ has a paint and whether drawBitmapRect has a source rectangle. BUG= TEST=drawbitmapmatrix GM Review URL: https://codereview.appspot.com/6450053 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@4828 2bbb7eff-a529-9590-31e7-b0007b416f81 --- gmslides.gypi | 1 + 1 file changed, 1 insertion(+) diff --git a/gmslides.gypi b/gmslides.gypi index 5e25eb3..18592d6 100644 --- a/gmslides.gypi +++ b/gmslides.gypi @@ -6,6 +6,7 @@ '../gm/arithmode.cpp', '../gm/bigmatrix.cpp', '../gm/bitmapcopy.cpp', + '../gm/bitmapmatrix.cpp', '../gm/bitmapfilters.cpp', '../gm/bitmapscroll.cpp', '../gm/blurs.cpp', -- cgit v1.2.3 From d26da0f84da74fa5de3bf397607990c7fb55b77f Mon Sep 17 00:00:00 2001 From: "bungeman@google.com" Date: Mon, 30 Jul 2012 20:40:50 +0000 Subject: Gamma correcting masks. https://codereview.appspot.com/6244068/ git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@4841 2bbb7eff-a529-9590-31e7-b0007b416f81 --- common.gypi | 4 ++++ common_conditions.gypi | 4 +--- core.gyp | 2 ++ ports.gyp | 4 ---- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/common.gypi b/common.gypi index 06db4a8..4b558f8 100644 --- a/common.gypi +++ b/common.gypi @@ -11,6 +11,10 @@ ], 'target_defaults': { + 'defines': [ + 'SK_GAMMA_SRGB', + 'SK_GAMMA_APPLY_TO_A8', + ], # Validate the 'skia_os' setting against 'OS', because only certain # combinations work. You should only override 'skia_os' for certain diff --git a/common_conditions.gypi b/common_conditions.gypi index 2f58c1b..6dcfd81 100644 --- a/common_conditions.gypi +++ b/common_conditions.gypi @@ -80,15 +80,13 @@ 'defines': [ 'SK_SAMPLES_FOR_X', 'SK_BUILD_FOR_UNIX', - 'SK_USE_COLOR_LUMINANCE', - 'SK_GAMMA_APPLY_TO_A8', ], 'configurations': { 'Debug': { 'cflags': ['-g'] }, 'Release': { - 'cflags': ['-O3'], + 'cflags': ['-O3 -g'], 'defines': [ 'NDEBUG' ], }, }, diff --git a/core.gyp b/core.gyp index b4753b8..2ad0da8 100644 --- a/core.gyp +++ b/core.gyp @@ -85,6 +85,8 @@ '../src/core/SkMallocPixelRef.cpp', '../src/core/SkMask.cpp', '../src/core/SkMaskFilter.cpp', + '../src/core/SkMaskGamma.cpp', + '../src/core/SkMaskGamma.h', '../src/core/SkMath.cpp', '../src/core/SkMatrix.cpp', '../src/core/SkMetaData.cpp', diff --git a/ports.gyp b/ports.gyp index 9436970..b9c1412 100644 --- a/ports.gyp +++ b/ports.gyp @@ -33,14 +33,12 @@ '../src/ports/SkTime_Unix.cpp', '../src/ports/SkTime_win.cpp', '../src/ports/SkXMLParser_empty.cpp', - '../src/ports/sk_predefined_gamma.h', ], 'conditions': [ [ 'skia_os in ["linux", "freebsd", "openbsd", "solaris"]', { 'sources': [ '../src/ports/SkThread_pthread.cpp', '../src/ports/SkFontHost_FreeType.cpp', - '../src/ports/SkFontHost_gamma_none.cpp', '../src/ports/SkFontHost_linux.cpp', ], }], @@ -54,7 +52,6 @@ '../src/utils/mac/SkStream_mac.cpp', # '../src/ports/SkFontHost_FreeType.cpp', # '../src/ports/SkFontHost_freetype_mac.cpp', -# '../src/ports/SkFontHost_gamma_none.cpp', '../src/ports/SkThread_pthread.cpp', ], 'sources!': [ @@ -94,7 +91,6 @@ '../src/ports/SkDebug_android.cpp', '../src/ports/SkThread_pthread.cpp', '../src/ports/SkFontHost_android.cpp', - '../src/ports/SkFontHost_gamma.cpp', '../src/ports/SkFontHost_FreeType.cpp', '../src/ports/FontHostConfiguration_android.cpp', #TODO: include the ports/SkImageRef_ashmem.cpp for non-NDK builds -- cgit v1.2.3 From 6f72e8af0e10fc049bcbf5c9f5e3d2712cc6804d Mon Sep 17 00:00:00 2001 From: "reed@google.com" Date: Tue, 31 Jul 2012 14:32:38 +0000 Subject: fix LayerDrawLooper to record its fFlagsMask convert SampleDrawLooper to a GM git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@4854 2bbb7eff-a529-9590-31e7-b0007b416f81 --- SampleApp.gyp | 1 - gmslides.gypi | 2 ++ 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/SampleApp.gyp b/SampleApp.gyp index bc128be..852d7f7 100644 --- a/SampleApp.gyp +++ b/SampleApp.gyp @@ -48,7 +48,6 @@ '../samplecode/SampleDegenerateTwoPtRadials.cpp', '../samplecode/SampleDither.cpp', '../samplecode/SampleDitherBitmap.cpp', - '../samplecode/SampleDrawLooper.cpp', '../samplecode/SampleEffects.cpp', '../samplecode/SampleEmboss.cpp', '../samplecode/SampleEmptyPath.cpp', diff --git a/gmslides.gypi b/gmslides.gypi index 18592d6..d1358f8 100644 --- a/gmslides.gypi +++ b/gmslides.gypi @@ -22,6 +22,7 @@ '../gm/dashcubics.cpp', '../gm/dashing.cpp', '../gm/drawbitmaprect.cpp', + '../gm/drawlooper.cpp', '../gm/extractbitmap.cpp', '../gm/emptypath.cpp', '../gm/filltypes.cpp', @@ -34,6 +35,7 @@ '../gm/gradtext.cpp', '../gm/hairmodes.cpp', '../gm/hittestpath.cpp', + '../gm/image.cpp', '../gm/imageblur.cpp', '../gm/lighting.cpp', '../gm/imagefiltersbase.cpp', -- cgit v1.2.3 From c1231f7d4c33f8c0626c4a0f6eb7ec2b81b10170 Mon Sep 17 00:00:00 2001 From: "reed@google.com" Date: Tue, 31 Jul 2012 15:01:57 +0000 Subject: remove '../gm/image.cpp', git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@4855 2bbb7eff-a529-9590-31e7-b0007b416f81 --- gmslides.gypi | 1 - 1 file changed, 1 deletion(-) diff --git a/gmslides.gypi b/gmslides.gypi index d1358f8..6fb0ee3 100644 --- a/gmslides.gypi +++ b/gmslides.gypi @@ -35,7 +35,6 @@ '../gm/gradtext.cpp', '../gm/hairmodes.cpp', '../gm/hittestpath.cpp', - '../gm/image.cpp', '../gm/imageblur.cpp', '../gm/lighting.cpp', '../gm/imagefiltersbase.cpp', -- cgit v1.2.3 From abc4024d403d2131005e0844979629d35c8d198a Mon Sep 17 00:00:00 2001 From: "chudy@google.com" Date: Tue, 31 Jul 2012 19:55:32 +0000 Subject: Optimized hit testing feature, refactored into seperate function from canvas draw calls Review URL: https://codereview.appspot.com/6443068 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@4867 2bbb7eff-a529-9590-31e7-b0007b416f81 --- debugger.gyp | 2 -- 1 file changed, 2 deletions(-) diff --git a/debugger.gyp b/debugger.gyp index 5b18c5e..34ff403 100644 --- a/debugger.gyp +++ b/debugger.gyp @@ -32,8 +32,6 @@ '../debugger/SkObjectParser.cpp', '../debugger/QT/SkSettingsWidget.h', '../debugger/QT/SkSettingsWidget.cpp', - '../debugger/SkHitBox.h', - '../debugger/SkHitBox.cpp', '../debugger/QT/SkGLWidget.h', '../debugger/QT/SkGLWidget.cpp', '../debugger/QT/SkRasterWidget.h', -- cgit v1.2.3 From cbd0f365a888eb2a73e817462ede225af2a09ee2 Mon Sep 17 00:00:00 2001 From: "digit@google.com" Date: Wed, 1 Aug 2012 14:25:07 +0000 Subject: arm: dynamic NEON support for SkBitmapProcState matrix operations. This patch implements dynamic ARM NEON support for the functions implemented by src/core/SkBitmapProcState_matrixProcs.cpp. - Because the SkBitmapProcState_matrix_{clamp,repeat}.h headers are NEON-specific, they are renamed with a _neon.h suffix, and moved to src/opts/ (from src/core/) - Add a new file src/opts/SkBitmapProcState_matrixProcs_neon.cpp which implements the NEON code paths for all builds, and add it to the 'opts_neon' static library. - Modify SkBitmapProcState_matrixProcs.cpp to select the right code-path depending on our build configuration. Note that in the case where 'arm_neon == 1', we do not embed regular ARM code paths in the final binary. Only 'arm_neon_optional == 1' builds will contain both regular and NEON code paths at the same time. Note that there doesn't seem to be a simple way to put the NEON-specific selection from that currently is in SkBitmapProcState_matrixProcs.cpp into src/opts/. Doing so would require much more drastic restructuring. This is also true of the other SkBitmapProcState source files that will be touched in a future patch. Review URL: https://codereview.appspot.com/6453065 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@4888 2bbb7eff-a529-9590-31e7-b0007b416f81 --- opts.gyp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/opts.gyp b/opts.gyp index ca2b1c1..8c85b9a 100644 --- a/opts.gyp +++ b/opts.gyp @@ -126,6 +126,7 @@ '../include/config', '../include/core', '../src/core', + '../src/opts', ], 'cflags!': [ '-fno-omit-frame-pointer', @@ -134,12 +135,15 @@ '-mfpu=vfpv3-d16', ], 'cflags': [ - '-fomit-frame-pointer', '-mfpu=neon', + '-fomit-frame-pointer', ], 'sources': [ '../src/opts/memset16_neon.S', '../src/opts/memset32_neon.S', + '../src/opts/SkBitmapProcState_matrixProcs_neon.cpp', + '../src/opts/SkBitmapProcState_matrix_clamp_neon.h', + '../src/opts/SkBitmapProcState_matrix_repeat_neon.h', ], }, ], -- cgit v1.2.3 From f06bf65c5960dfddbce6a7317548772de8fb5fdd Mon Sep 17 00:00:00 2001 From: "digit@google.com" Date: Wed, 1 Aug 2012 15:58:41 +0000 Subject: arm: Move SkUtilsArm.h from include/core to src/core There is no reason to make this visible to client code. Review URL: https://codereview.appspot.com/6441082 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@4892 2bbb7eff-a529-9590-31e7-b0007b416f81 --- core.gyp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core.gyp b/core.gyp index 2ad0da8..376512b 100644 --- a/core.gyp +++ b/core.gyp @@ -243,7 +243,6 @@ '../include/core/SkUnPreMultiply.h', '../include/core/SkUnitMapper.h', '../include/core/SkUtils.h', - '../include/core/SkUtilsArm.h', '../include/core/SkWeakRefCnt.h', '../include/core/SkWriter32.h', '../include/core/SkXfermode.h', @@ -321,6 +320,7 @@ # The code in SkUtilsArm.cpp can be used on an ARM-based Linux system, not only Android. 'sources': [ '../src/core/SkUtilsArm.cpp', + '../src/core/SkUtilsArm.h', ], }], ], -- cgit v1.2.3 From c9cecc3326bce423a949b1608c572e709aad300b Mon Sep 17 00:00:00 2001 From: "keyar@chromium.org" Date: Wed, 1 Aug 2012 17:53:29 +0000 Subject: Merged bench_pictures and render_pictures rendering methods. bench_pictures now uses a class based method for choosing the benchmark type as well. Review URL: https://codereview.appspot.com/6452070 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@4894 2bbb7eff-a529-9590-31e7-b0007b416f81 --- tools.gyp | 24 +++++++++++++++++++----- 1 file changed, 19 insertions(+), 5 deletions(-) diff --git a/tools.gyp b/tools.gyp index 2ab422f..3910b70 100644 --- a/tools.gyp +++ b/tools.gyp @@ -78,7 +78,7 @@ 'core.gyp:core', 'images.gyp:images', 'ports.gyp:ports', - 'tools.gyp:PictureRenderer', + 'tools.gyp:picture_renderer', 'tools.gyp:picture_utils', ], }, @@ -87,23 +87,37 @@ 'type': 'executable', 'sources': [ '../tools/bench_pictures_main.cpp', - '../src/pipe/utils/SamplePipeControllers.h', - '../src/pipe/utils/SamplePipeControllers.cpp', ], 'include_dirs': [ '../bench', - '../src/pipe/utils/', ], 'dependencies': [ 'core.gyp:core', 'ports.gyp:ports', 'images.gyp:images', 'tools.gyp:picture_utils', + 'tools.gyp:picture_benchmark', 'bench.gyp:bench_timer', ], }, { - 'target_name': 'PictureRenderer', + 'target_name': 'picture_benchmark', + 'type': 'static_library', + 'sources': [ + '../tools/PictureBenchmark.cpp', + ], + 'include_dirs': [ + '../bench', + ], + 'dependencies': [ + 'core.gyp:core', + 'tools.gyp:picture_utils', + 'tools.gyp:picture_renderer', + 'bench.gyp:bench_timer', + ], + }, + { + 'target_name': 'picture_renderer', 'type': 'static_library', 'sources': [ '../tools/PictureRenderer.cpp', -- cgit v1.2.3 From 4108e2c3638749a8f153af1d88f9fd0189dd3cac Mon Sep 17 00:00:00 2001 From: "scroggo@google.com" Date: Wed, 1 Aug 2012 19:34:20 +0000 Subject: Pipe factory names independently from the flattenables using them. Avoids an issue where a flattenable written twice might be written differently (the first time the flat data may have a name, whereas the second time it will have an index). Also add a test which confirms that identical flattenables will have the same SkFlatData representation. BUG=https://code.google.com/p/skia/issues/detail?id=721 TEST=FlatDataTest.cpp Review URL: https://codereview.appspot.com/6431057 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@4896 2bbb7eff-a529-9590-31e7-b0007b416f81 --- tests.gyp | 1 + 1 file changed, 1 insertion(+) diff --git a/tests.gyp b/tests.gyp index 8ea4ee8..b30a749 100644 --- a/tests.gyp +++ b/tests.gyp @@ -40,6 +40,7 @@ '../tests/DrawTextTest.cpp', '../tests/EmptyPathTest.cpp', '../tests/FillPathTest.cpp', + '../tests/FlatDataTest.cpp', '../tests/FlateTest.cpp', '../tests/FontHostStreamTest.cpp', '../tests/FontHostTest.cpp', -- cgit v1.2.3 From 679d8c30e7a2343102c00dbcd012b791d359e629 Mon Sep 17 00:00:00 2001 From: "robertphillips@google.com" Date: Wed, 1 Aug 2012 20:08:47 +0000 Subject: Removed GrClip & related classes http://codereview.appspot.com/6450071/ git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@4899 2bbb7eff-a529-9590-31e7-b0007b416f81 --- gpu.gyp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/gpu.gyp b/gpu.gyp index 2893a60..6a2445d 100644 --- a/gpu.gyp +++ b/gpu.gyp @@ -177,8 +177,7 @@ ], 'sources': [ '../include/gpu/GrAARectRenderer.h', - '../include/gpu/GrClip.h', - '../include/gpu/GrClipIterator.h', + '../include/gpu/GrClipData.h', '../include/gpu/GrColor.h', '../include/gpu/GrConfig.h', '../include/gpu/GrContext.h', @@ -224,7 +223,7 @@ '../src/gpu/GrBinHashKey.h', '../src/gpu/GrBufferAllocPool.cpp', '../src/gpu/GrBufferAllocPool.h', - '../src/gpu/GrClip.cpp', + '../src/gpu/GrClipData.cpp', '../src/gpu/GrContext.cpp', '../src/gpu/GrCustomStage.cpp', '../src/gpu/GrDefaultPathRenderer.cpp', -- cgit v1.2.3 From edb7a90972180c50ca81f9784e9c77eb29f82d6b Mon Sep 17 00:00:00 2001 From: "bsalomon@google.com" Date: Thu, 2 Aug 2012 14:03:32 +0000 Subject: Create GPU-less build of Skia. git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@4912 2bbb7eff-a529-9590-31e7-b0007b416f81 --- SampleApp.gyp | 13 +++++++++---- bench.gyp | 28 ++++++++++++++++++++++------ common_conditions.gypi | 12 +++++++++++- common_variables.gypi | 2 ++ debugger.gyp | 1 - effects.gyp | 12 ++++++++++-- gm.gyp | 14 ++++++++++---- gpu.gyp | 25 +++++++++++++++++++++++++ shapeops_demo.gyp | 8 ++++++-- shapeops_edge.gyp | 14 +++++++++++--- tests.gyp | 14 +++++++++++--- views.gyp | 6 +++++- 12 files changed, 122 insertions(+), 27 deletions(-) diff --git a/SampleApp.gyp b/SampleApp.gyp index 852d7f7..2db2a18 100644 --- a/SampleApp.gyp +++ b/SampleApp.gyp @@ -9,7 +9,6 @@ '../src/core', # needed to get SkConcaveToTriangle, maybe this should be moved to include dir? '../gm', # needed to pull gm.h '../samplecode', # To pull SampleApp.h and SampleCode.h - '../src/gpu', # To pull gl/GrGLUtil.h '../src/pipe/utils', # For TiledPipeController ], 'includes': [ @@ -151,8 +150,6 @@ 'animator.gyp:animator', 'xml.gyp:xml', 'experimental.gyp:experimental', - 'gpu.gyp:gr', - 'gpu.gyp:skgr', 'pdf.gyp:pdf', 'views_animated.gyp:views_animated', ], @@ -237,7 +234,6 @@ '../experimental/iOSSampleApp/iPad', '../experimental/iOSSampleApp/iPhone', '../include/utils/ios', - '../../include/gpu', ], 'xcode_config_file': '../experimental/iOSSampleApp/SkiOSSampleApp-Base.xcconfig', 'mac_bundle_resources' : [ @@ -258,6 +254,15 @@ 'android_system.gyp:SampleAppAndroid', ], }], + [ 'skia_gpu == 1', { + 'include_dirs': [ + '../src/gpu', # To pull gl/GrGLUtil.h + ], + 'dependencies': [ + 'gpu.gyp:gr', + 'gpu.gyp:skgr', + ], + }], ], 'msvs_settings': { 'VCLinkerTool': { diff --git a/bench.gyp b/bench.gyp index dcf9b5f..44ebbf2 100644 --- a/bench.gyp +++ b/bench.gyp @@ -10,7 +10,6 @@ 'type': 'executable', 'include_dirs' : [ '../src/core', - '../src/gpu', ], 'includes': [ 'bench.gypi' @@ -18,13 +17,24 @@ 'dependencies': [ 'core.gyp:core', 'effects.gyp:effects', - 'gpu.gyp:gr', - 'gpu.gyp:skgr', 'images.gyp:images', 'ports.gyp:ports', 'utils.gyp:utils', 'bench_timer', ], + 'conditions': [ + ['skia_gpu == 1', + { + 'include_dirs' : [ + '../src/gpu', + ], + 'dependencies': [ + 'gpu.gyp:gr', + 'gpu.gyp:skgr', + ], + }, + ], + ], }, { 'target_name' : 'bench_timer', @@ -38,8 +48,6 @@ '../bench/BenchSysTimer_posix.cpp', '../bench/BenchSysTimer_windows.h', '../bench/BenchSysTimer_windows.cpp', - '../bench/BenchGpuTimer_gl.h', - '../bench/BenchGpuTimer_gl.cpp', ], 'include_dirs': [ '../src/core', @@ -47,7 +55,6 @@ ], 'dependencies': [ 'core.gyp:core', - 'gpu.gyp:gr', ], 'conditions': [ [ 'skia_os != "mac"', { @@ -75,6 +82,15 @@ '../bench/BenchSysTimer_windows.cpp', ], }], + ['skia_gpu == 1', { + 'dependencies': [ + 'gpu.gyp:gr', + ], + 'sources': [ + '../bench/BenchGpuTimer_gl.h', + '../bench/BenchGpuTimer_gl.cpp', + ], + }], ], } ], diff --git a/common_conditions.gypi b/common_conditions.gypi index 6dcfd81..143e854 100644 --- a/common_conditions.gypi +++ b/common_conditions.gypi @@ -2,7 +2,17 @@ # { 'conditions' : [ - + ['skia_gpu == 1', + { + 'defines': [ + 'SK_SUPPORT_GPU=1', + ], + }, { + 'defines': [ + 'SK_SUPPORT_GPU=0', + ], + }, + ], ['skia_os == "win"', { 'defines': [ diff --git a/common_variables.gypi b/common_variables.gypi index 88e710e..d46ec5e 100644 --- a/common_variables.gypi +++ b/common_variables.gypi @@ -67,6 +67,7 @@ 'skia_arch_type%': 'x86', 'skia_arch_width%': 32, 'android_make_apk%': 1, + 'skia_gpu%': 1, }, # Re-define all variables defined within the level-2 'variables' dict, @@ -80,6 +81,7 @@ 'skia_arch_type%': '<(skia_arch_type)', 'skia_arch_width%': '<(skia_arch_width)', 'android_make_apk%': '<(android_make_apk)', + 'skia_gpu%': '<(skia_gpu)', }, } # Local Variables: diff --git a/debugger.gyp b/debugger.gyp index 34ff403..f2c3fe9 100644 --- a/debugger.gyp +++ b/debugger.gyp @@ -7,7 +7,6 @@ '../src/core', '../debugger', # To pull SkDebugger.h '../debugger/QT', # For all the QT UI Goodies - '../include/gpu/', '../src/gpu', # To pull gl/GrGLUtil.h ], 'sources': [ diff --git a/effects.gyp b/effects.gyp index 28369ae..0a9e8d7 100644 --- a/effects.gyp +++ b/effects.gyp @@ -5,7 +5,6 @@ 'type': 'static_library', 'include_dirs': [ '../include/effects', - '../src/gpu', ], 'sources': [ '../include/effects/Sk1DPathEffect.h', @@ -98,7 +97,16 @@ }, 'dependencies': [ 'core.gyp:core', - 'gpu.gyp:gr', + ], + 'conditions': [ + ['skia_gpu == 1', { + 'include_dirs': [ + '../src/gpu', + ], + 'dependencies': [ + 'gpu.gyp:gr', + ], + }], ], }, ], diff --git a/gm.gyp b/gm.gyp index 20fe09e..13f1976 100644 --- a/gm.gyp +++ b/gm.gyp @@ -10,7 +10,6 @@ 'include_dirs' : [ '../src/core', '../src/pipe/utils/', - '../src/gpu', ], 'includes': [ 'gmslides.gypi', @@ -25,8 +24,6 @@ 'dependencies': [ 'core.gyp:core', 'effects.gyp:effects', - 'gpu.gyp:gr', - 'gpu.gyp:skgr', 'images.gyp:images', 'pdf.gyp:pdf', 'ports.gyp:ports', @@ -52,7 +49,16 @@ 'xps.gyp:xps', ], }], - ], + ['skia_gpu == 1', { + 'include_dirs': [ + '../src/gpu', + ], + 'dependencies': [ + 'gpu.gyp:gr', + 'gpu.gyp:skgr', + ], + }], + ], }, ], } diff --git a/gpu.gyp b/gpu.gyp index 6a2445d..c9526ef 100644 --- a/gpu.gyp +++ b/gpu.gyp @@ -46,6 +46,31 @@ 'GR_WIN32_BUILD=1', ], }], + # nullify the targets in this gyp file if skia_gpu is 0 + [ 'skia_gpu == 0', { + 'sources/': [ + ['exclude', '.*'], + ], + 'defines/': [ + ['exclude', '.*'], + ], + 'include_dirs/': [ + ['exclude', '.*'], + ], + 'link_settings': { + 'libraries/': [ + ['exclude', '.*'], + ], + }, + 'direct_dependent_settings': { + 'defines/': [ + ['exclude', '.*'], + ], + 'include_dirs/': [ + ['exclude', '.*'], + ], + }, + }], ], 'direct_dependent_settings': { 'conditions': [ diff --git a/shapeops_demo.gyp b/shapeops_demo.gyp index 038b282..cb1b743 100644 --- a/shapeops_demo.gyp +++ b/shapeops_demo.gyp @@ -61,8 +61,6 @@ 'xml.gyp:xml', 'svg.gyp:svg', 'experimental.gyp:experimental', - 'gpu.gyp:gr', - 'gpu.gyp:skgr', 'pdf.gyp:pdf', ], 'conditions' : [ @@ -96,6 +94,12 @@ '../experimental/Intersection/EdgeDemoApp.xib', ], }], + [ 'skia_gpu == 1', { + 'dependencies': [ + 'gpu.gyp:gr', + 'gpu.gyp:skgr', + ], + }], ], 'msvs_settings': { 'VCLinkerTool': { diff --git a/shapeops_edge.gyp b/shapeops_edge.gyp index a862c5d..55ec5fd 100644 --- a/shapeops_edge.gyp +++ b/shapeops_edge.gyp @@ -10,7 +10,6 @@ 'type': 'executable', 'include_dirs' : [ '../src/core', - '../src/gpu', ], 'sources': [ '../experimental/Intersection/ActiveEdge_Test.cpp', @@ -100,13 +99,22 @@ 'core.gyp:core', 'effects.gyp:effects', 'experimental.gyp:experimental', - 'gpu.gyp:gr', - 'gpu.gyp:skgr', 'images.gyp:images', 'ports.gyp:ports', 'pdf.gyp:pdf', 'utils.gyp:utils', ], + 'conditions': [ + [ 'skia_gpu == 1', { + 'include_dirs': [ + '../src/gpu', + ], + 'dependencies': [ + 'gpu.gyp:gr', + 'gpu.gyp:skgr', + ], + }], + ], }, ], } diff --git a/tests.gyp b/tests.gyp index b30a749..278dce7 100644 --- a/tests.gyp +++ b/tests.gyp @@ -10,7 +10,6 @@ 'include_dirs' : [ '../src/core', '../src/effects', - '../src/gpu', '../src/pdf', '../src/utils', '../tools/', @@ -96,14 +95,23 @@ 'core.gyp:core', 'effects.gyp:effects', 'experimental.gyp:experimental', - 'gpu.gyp:gr', - 'gpu.gyp:skgr', 'images.gyp:images', 'ports.gyp:ports', 'pdf.gyp:pdf', 'tools.gyp:picture_utils', 'utils.gyp:utils', ], + 'conditions': [ + [ 'skia_gpu == 1', { + 'include_dirs': [ + '../src/gpu', + ], + 'dependencies': [ + 'gpu.gyp:gr', + 'gpu.gyp:skgr', + ], + }], + ], }, ], } diff --git a/views.gyp b/views.gyp index fa0a29a..ec3fd79 100644 --- a/views.gyp +++ b/views.gyp @@ -18,7 +18,6 @@ '../include/images', '../include/effects', '../include/views/unix', - '../include/gpu', ], 'dependencies': [ 'angle.gyp:*', @@ -112,6 +111,11 @@ '../src/views/win/skia_win.cpp', ], }], + [ 'skia_gpu == 1', { + 'include_dirs': [ + '../include/gpu', + ], + }], ], 'direct_dependent_settings': { 'include_dirs': [ -- cgit v1.2.3 From bb43af45851cf4d16970f2b63dcca8fc969eb3bb Mon Sep 17 00:00:00 2001 From: "bsalomon@google.com" Date: Thu, 2 Aug 2012 18:11:43 +0000 Subject: Move GL programs unit test code to tests project. Review URL: http://codereview.appspot.com/6453079/ git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@4927 2bbb7eff-a529-9590-31e7-b0007b416f81 --- gpu.gyp | 4 ---- 1 file changed, 4 deletions(-) diff --git a/gpu.gyp b/gpu.gyp index c9526ef..177a728 100644 --- a/gpu.gyp +++ b/gpu.gyp @@ -187,9 +187,6 @@ 'include_dirs': [ '../include/core', '../include/config', - '../include/effects', # This is only to get Sk effects into - # GrGpuGL_unittest.cpp, not for general - # consumption in src/gpu. '../include/gpu', '../src/core', # SkRasterClip.h '../src/gpu' @@ -362,7 +359,6 @@ '../src/gpu/gl/GrGpuGL.cpp', '../src/gpu/gl/GrGpuGL.h', '../src/gpu/gl/GrGpuGL_program.cpp', - '../src/gpu/gl/GrGpuGL_unittest.cpp', '../src/gpu/gl/debug/GrGLCreateDebugInterface.cpp', '../src/gpu/gl/debug/GrFakeRefObj.h', -- cgit v1.2.3 From 91548eb011ac4481f311d22a87375172c8d6eb7e Mon Sep 17 00:00:00 2001 From: "bsalomon@google.com" Date: Fri, 3 Aug 2012 14:34:46 +0000 Subject: Registry-based unit test for custom effects Review URL: http://codereview.appspot.com/6447085/ git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@4946 2bbb7eff-a529-9590-31e7-b0007b416f81 --- gpu.gyp | 1 + 1 file changed, 1 insertion(+) diff --git a/gpu.gyp b/gpu.gyp index 177a728..652708f 100644 --- a/gpu.gyp +++ b/gpu.gyp @@ -205,6 +205,7 @@ '../include/gpu/GrContext.h', '../include/gpu/GrContextFactory.h', '../include/gpu/GrCustomStage.h', + '../include/gpu/GrCustomStageUnitTest.h', '../include/gpu/GrFontScaler.h', '../include/gpu/GrGlyph.h', '../include/gpu/GrInstanceCounter.h', -- cgit v1.2.3 From 96d04b9ba28b84079b370763d087c48065b39aab Mon Sep 17 00:00:00 2001 From: "chudy@google.com" Date: Fri, 3 Aug 2012 17:32:05 +0000 Subject: Moved the ownership of the current clip and current matrix into the debug canvas as part of the upcoming general refactor to everything living in debug canvas. Review URL: https://codereview.appspot.com/6447077 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@4950 2bbb7eff-a529-9590-31e7-b0007b416f81 --- debugger.gyp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/debugger.gyp b/debugger.gyp index f2c3fe9..be3c793 100644 --- a/debugger.gyp +++ b/debugger.gyp @@ -19,6 +19,8 @@ '../debugger/QT/moc_SkDebuggerGUI.cpp', '../debugger/QT/moc_SkInspectorWidget.cpp', '../debugger/QT/moc_SkSettingsWidget.cpp', + '../debugger/QT/moc_SkRasterWidget.cpp', + '../debugger/QT/moc_SkGLWidget.cpp', '../debugger/QT/SkDebuggerGUI.cpp', '../debugger/QT/SkDebuggerGUI.h', '../debugger/QT/SkCanvasWidget.cpp', -- cgit v1.2.3 From 7f1072732f9c8b3761734380c7f75ef41794445e Mon Sep 17 00:00:00 2001 From: "bsalomon@google.com" Date: Fri, 3 Aug 2012 19:25:10 +0000 Subject: revert gpu-less mac sample app, remove busted sample (that has equivalent gm) Review URL: https://codereview.appspot.com/6450088/ git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@4954 2bbb7eff-a529-9590-31e7-b0007b416f81 --- SampleApp.gyp | 1 - 1 file changed, 1 deletion(-) diff --git a/SampleApp.gyp b/SampleApp.gyp index 2db2a18..93f3b73 100644 --- a/SampleApp.gyp +++ b/SampleApp.gyp @@ -71,7 +71,6 @@ '../samplecode/SampleMeasure.cpp', '../samplecode/SampleMipMap.cpp', '../samplecode/SampleMovie.cpp', - '../samplecode/SampleNinePatch.cpp', '../samplecode/SampleOvalTest.cpp', '../samplecode/SampleOverflow.cpp', '../samplecode/SamplePageFlip.cpp', -- cgit v1.2.3 From df99f4a792461d155d55c45504bd005eff1e8a17 Mon Sep 17 00:00:00 2001 From: "reed@google.com" Date: Tue, 7 Aug 2012 14:05:14 +0000 Subject: add gm for very large bitmaps (>32K >64K) raster expected to fail when scaling >64K (for now) git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@4967 2bbb7eff-a529-9590-31e7-b0007b416f81 --- gmslides.gypi | 1 + 1 file changed, 1 insertion(+) diff --git a/gmslides.gypi b/gmslides.gypi index 6fb0ee3..a430a9f 100644 --- a/gmslides.gypi +++ b/gmslides.gypi @@ -67,6 +67,7 @@ '../gm/typeface.cpp', '../gm/verttext.cpp', '../gm/verttext2.cpp', + '../gm/verylargebitmap.cpp', '../gm/xfermodes.cpp', ], } -- cgit v1.2.3 From 7b5f3a280206c03f0be336020abc45a6736bff8a Mon Sep 17 00:00:00 2001 From: "djsollen@google.com" Date: Tue, 7 Aug 2012 15:54:32 +0000 Subject: Update SkFlattenable buffers to be more modular. This CL is an effort to stage the conversion to named parameters for all SkFlattenable commands. This particular stage only does the following two things... 1. Move flattenable buffers from SkFlattenable.h into their own header. 2. Update and Add new read write methods for better clarity and convenience. BUG= Review URL: https://codereview.appspot.com/6448095 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@4980 2bbb7eff-a529-9590-31e7-b0007b416f81 --- core.gyp | 1 + 1 file changed, 1 insertion(+) diff --git a/core.gyp b/core.gyp index 376512b..6af2a57 100644 --- a/core.gyp +++ b/core.gyp @@ -72,6 +72,7 @@ '../src/core/SkFilterProc.cpp', '../src/core/SkFilterProc.h', '../src/core/SkFlattenable.cpp', + '../src/core/SkFlattenableBuffers.cpp', '../src/core/SkFloat.cpp', '../src/core/SkFloat.h', '../src/core/SkFloatBits.cpp', -- cgit v1.2.3 From c43260e9eac1c264cb3d86d6fee59c1fd306fd61 Mon Sep 17 00:00:00 2001 From: "chudy@google.com" Date: Tue, 7 Aug 2012 16:12:23 +0000 Subject: Refactoring into a public facing facing SkDebugger class first pass. Review URL: https://codereview.appspot.com/6450096 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@4986 2bbb7eff-a529-9590-31e7-b0007b416f81 --- debugger.gyp | 1 + 1 file changed, 1 insertion(+) diff --git a/debugger.gyp b/debugger.gyp index be3c793..8848832 100644 --- a/debugger.gyp +++ b/debugger.gyp @@ -10,6 +10,7 @@ '../src/gpu', # To pull gl/GrGLUtil.h ], 'sources': [ + '../debugger/debuggermain.cpp', '../debugger/SkDebugCanvas.h', '../debugger/SkDebugCanvas.cpp', '../debugger/SkDebugger.cpp', -- cgit v1.2.3 From 511af852ef261cf21672d3f17c575f2084938c4e Mon Sep 17 00:00:00 2001 From: "djsollen@google.com" Date: Tue, 7 Aug 2012 19:49:41 +0000 Subject: Refactor Bitmap Storage for SkPicture using SkPipe's design. Refactor Picture and Pipe bitmap storage into common data structure Update SkFlattenable buffers to be more modular. This CL is an effort to stage the conversion to named parameters for all SkFlattenable commands. This particular stage only does the following two things... 1. Move flattenable buffers from SkFlattenable.h into their own header. 2. Update and Add new read write methods for better clarity and convenience. BUG= Review URL: https://codereview.appspot.com/6445079 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@4994 2bbb7eff-a529-9590-31e7-b0007b416f81 --- core.gyp | 2 ++ effects.gyp | 1 + 2 files changed, 3 insertions(+) diff --git a/core.gyp b/core.gyp index 6af2a57..49b2b85 100644 --- a/core.gyp +++ b/core.gyp @@ -14,6 +14,8 @@ '../src/core/SkAlphaRuns.cpp', '../src/core/SkAntiRun.h', '../src/core/SkBitmap.cpp', + '../src/core/SkBitmapHeap.cpp', + '../src/core/SkBitmapHeap.h', '../src/core/SkBitmapProcShader.cpp', '../src/core/SkBitmapProcShader.h', '../src/core/SkBitmapProcState.cpp', diff --git a/effects.gyp b/effects.gyp index 0a9e8d7..86308b7 100644 --- a/effects.gyp +++ b/effects.gyp @@ -5,6 +5,7 @@ 'type': 'static_library', 'include_dirs': [ '../include/effects', + '../src/core', ], 'sources': [ '../include/effects/Sk1DPathEffect.h', -- cgit v1.2.3 From 73146952c25e71aee7318779a63c04385626f369 Mon Sep 17 00:00:00 2001 From: "reed@google.com" Date: Tue, 7 Aug 2012 21:41:42 +0000 Subject: Privatize SkAutoKern.h git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@4998 2bbb7eff-a529-9590-31e7-b0007b416f81 --- core.gyp | 2 -- 1 file changed, 2 deletions(-) diff --git a/core.gyp b/core.gyp index 49b2b85..ed65a56 100644 --- a/core.gyp +++ b/core.gyp @@ -162,7 +162,6 @@ '../include/core/Sk64.h', '../include/core/SkAdvancedTypefaceMetrics.h', - '../include/core/SkAutoKern.h', '../include/core/SkBitmap.h', '../include/core/SkBlitRow.h', '../include/core/SkBlitter.h', @@ -186,7 +185,6 @@ '../include/core/SkDrawFilter.h', '../include/core/SkDrawLooper.h', '../include/core/SkEndian.h', - '../include/core/SkFDot6.h', '../include/core/SkFixed.h', '../include/core/SkFlattenable.h', '../include/core/SkFloatBits.h', -- cgit v1.2.3 From 1b3effcae896c0017a6ec39a7e3db3adbe1f91c5 Mon Sep 17 00:00:00 2001 From: "robertphillips@google.com" Date: Wed, 8 Aug 2012 10:42:44 +0000 Subject: Refactored cacheID in preparation for clip mask caching changes http://codereview.appspot.com/6458089/ git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@5002 2bbb7eff-a529-9590-31e7-b0007b416f81 --- gpu.gyp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/gpu.gyp b/gpu.gyp index 652708f..20bddbf 100644 --- a/gpu.gyp +++ b/gpu.gyp @@ -246,6 +246,8 @@ '../src/gpu/GrBinHashKey.h', '../src/gpu/GrBufferAllocPool.cpp', '../src/gpu/GrBufferAllocPool.h', + '../src/gpu/GrCacheID.h', + '../src/gpu/GrCacheID.cpp', '../src/gpu/GrClipData.cpp', '../src/gpu/GrContext.cpp', '../src/gpu/GrCustomStage.cpp', -- cgit v1.2.3 From fa564477b848ffc6269ea940db141f12c22b2320 Mon Sep 17 00:00:00 2001 From: "reed@google.com" Date: Wed, 8 Aug 2012 20:39:17 +0000 Subject: split out src file names into core.gypi, with an eye towards sharing that file with chrome... Review URL: https://codereview.appspot.com/6446103 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@5007 2bbb7eff-a529-9590-31e7-b0007b416f81 --- common_variables.gypi | 5 + core.gyp | 244 +---------------------------------------------- core.gypi | 258 ++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 266 insertions(+), 241 deletions(-) create mode 100644 core.gypi diff --git a/common_variables.gypi b/common_variables.gypi index d46ec5e..e8b8b6d 100644 --- a/common_variables.gypi +++ b/common_variables.gypi @@ -82,6 +82,11 @@ 'skia_arch_width%': '<(skia_arch_width)', 'android_make_apk%': '<(android_make_apk)', 'skia_gpu%': '<(skia_gpu)', + + # These are referenced by our .gypi files that list files (e.g. core.gypi) + # + 'skia_src_path%': '../src', + 'skia_include_path%': '../include', }, } # Local Variables: diff --git a/core.gyp b/core.gyp index ed65a56..0be1ad5 100644 --- a/core.gyp +++ b/core.gyp @@ -5,249 +5,11 @@ 'target_name': 'core', 'type': 'static_library', 'msvs_guid': 'B7760B5E-BFA8-486B-ACFD-49E3A6DE8E76', - 'sources': [ - '../src/core/ARGB32_Clamp_Bilinear_BitmapShader.h', - '../src/core/Sk64.cpp', - '../src/core/SkAAClip.cpp', - '../src/core/SkAnnotation.cpp', - '../src/core/SkAdvancedTypefaceMetrics.cpp', - '../src/core/SkAlphaRuns.cpp', - '../src/core/SkAntiRun.h', - '../src/core/SkBitmap.cpp', - '../src/core/SkBitmapHeap.cpp', - '../src/core/SkBitmapHeap.h', - '../src/core/SkBitmapProcShader.cpp', - '../src/core/SkBitmapProcShader.h', - '../src/core/SkBitmapProcState.cpp', - '../src/core/SkBitmapProcState.h', - '../src/core/SkBitmapProcState_matrix.h', - '../src/core/SkBitmapProcState_matrixProcs.cpp', - '../src/core/SkBitmapProcState_sample.h', - '../src/core/SkBitmapSampler.cpp', - '../src/core/SkBitmapSampler.h', - '../src/core/SkBitmapSamplerTemplate.h', - '../src/core/SkBitmapShader16BilerpTemplate.h', - '../src/core/SkBitmapShaderTemplate.h', - '../src/core/SkBitmap_scroll.cpp', - '../src/core/SkBlitBWMaskTemplate.h', - '../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', - '../src/core/SkClipStack.cpp', - '../src/core/SkColor.cpp', - '../src/core/SkColorFilter.cpp', - '../src/core/SkColorTable.cpp', - '../src/core/SkComposeShader.cpp', - '../src/core/SkConcaveToTriangles.cpp', - '../src/core/SkConcaveToTriangles.h', - '../src/core/SkConfig8888.cpp', - '../src/core/SkConfig8888.h', - '../src/core/SkCordic.cpp', - '../src/core/SkCordic.h', - '../src/core/SkCoreBlitters.h', - '../src/core/SkCubicClipper.cpp', - '../src/core/SkCubicClipper.h', - '../src/core/SkData.cpp', - '../src/core/SkDebug.cpp', - '../src/core/SkDeque.cpp', - '../src/core/SkDevice.cpp', - '../src/core/SkDeviceProfile.cpp', - '../src/core/SkDither.cpp', - '../src/core/SkDraw.cpp', - '../src/core/SkDrawProcs.h', - '../src/core/SkEdgeBuilder.cpp', - '../src/core/SkEdgeClipper.cpp', - '../src/core/SkEdge.cpp', - '../src/core/SkEdge.h', - '../src/core/SkFP.h', - '../src/core/SkFilterProc.cpp', - '../src/core/SkFilterProc.h', - '../src/core/SkFlattenable.cpp', - '../src/core/SkFlattenableBuffers.cpp', - '../src/core/SkFloat.cpp', - '../src/core/SkFloat.h', - '../src/core/SkFloatBits.cpp', - '../src/core/SkFontHost.cpp', - '../src/core/SkGeometry.cpp', - '../src/core/SkGlyphCache.cpp', - '../src/core/SkGlyphCache.h', - '../src/core/SkGraphics.cpp', - '../src/core/SkInstCnt.cpp', - '../src/core/SkLineClipper.cpp', - '../src/core/SkMallocPixelRef.cpp', - '../src/core/SkMask.cpp', - '../src/core/SkMaskFilter.cpp', - '../src/core/SkMaskGamma.cpp', - '../src/core/SkMaskGamma.h', - '../src/core/SkMath.cpp', - '../src/core/SkMatrix.cpp', - '../src/core/SkMetaData.cpp', - '../src/core/SkMMapStream.cpp', - '../src/core/SkOrderedReadBuffer.cpp', - '../src/core/SkOrderedWriteBuffer.cpp', - '../src/core/SkPackBits.cpp', - '../src/core/SkPaint.cpp', - '../src/core/SkPath.cpp', - '../src/core/SkPathEffect.cpp', - '../src/core/SkPathHeap.cpp', - '../src/core/SkPathHeap.h', - '../src/core/SkPathMeasure.cpp', - '../src/core/SkPicture.cpp', - '../src/core/SkPictureFlat.cpp', - '../src/core/SkPictureFlat.h', - '../src/core/SkPicturePlayback.cpp', - '../src/core/SkPicturePlayback.h', - '../src/core/SkPictureRecord.cpp', - '../src/core/SkPictureRecord.h', - '../src/core/SkPixelRef.cpp', - '../src/core/SkPoint.cpp', - '../src/core/SkProcSpriteBlitter.cpp', - '../src/core/SkPtrRecorder.cpp', - '../src/core/SkQuadClipper.cpp', - '../src/core/SkQuadClipper.h', - '../src/core/SkRasterClip.cpp', - '../src/core/SkRasterizer.cpp', - '../src/core/SkRect.cpp', - '../src/core/SkRefCnt.cpp', - '../src/core/SkRefDict.cpp', - '../src/core/SkRegion.cpp', - '../src/core/SkRegionPriv.h', - '../src/core/SkRegion_path.cpp', - '../src/core/SkScalar.cpp', - '../src/core/SkScalerContext.cpp', - '../src/core/SkScan.cpp', - '../src/core/SkScanPriv.h', - '../src/core/SkScan_AntiPath.cpp', - '../src/core/SkScan_Antihair.cpp', - '../src/core/SkScan_Hairline.cpp', - '../src/core/SkScan_Path.cpp', - '../src/core/SkShader.cpp', - '../src/core/SkShape.cpp', - '../src/core/SkSpriteBlitter_ARGB32.cpp', - '../src/core/SkSpriteBlitter_RGB16.cpp', - '../src/core/SkSinTable.h', - '../src/core/SkSpriteBlitter.h', - '../src/core/SkSpriteBlitterTemplate.h', - '../src/core/SkStream.cpp', - '../src/core/SkString.cpp', - '../src/core/SkStroke.h', - '../src/core/SkStroke.cpp', - '../src/core/SkStrokerPriv.cpp', - '../src/core/SkStrokerPriv.h', - '../src/core/SkTextFormatParams.h', - '../src/core/SkTLS.cpp', - '../src/core/SkTSearch.cpp', - '../src/core/SkTSort.h', - '../src/core/SkTemplatesPriv.h', - '../src/core/SkTypeface.cpp', - '../src/core/SkTypefaceCache.cpp', - '../src/core/SkTypefaceCache.h', - '../src/core/SkUnPreMultiply.cpp', - '../src/core/SkUtils.cpp', - '../src/core/SkWriter32.cpp', - '../src/core/SkXfermode.cpp', - '../src/pipe/SkGPipeRead.cpp', - '../src/pipe/SkGPipeWrite.cpp', - '../include/core/Sk64.h', - '../include/core/SkAdvancedTypefaceMetrics.h', - '../include/core/SkBitmap.h', - '../include/core/SkBlitRow.h', - '../include/core/SkBlitter.h', - '../include/core/SkBounder.h', - '../include/core/SkBuffer.h', - '../include/core/SkCanvas.h', - '../include/core/SkChecksum.h', - '../include/core/SkChunkAlloc.h', - '../include/core/SkClipStack.h', - '../include/core/SkColor.h', - '../include/core/SkColorFilter.h', - '../include/core/SkColorPriv.h', - '../include/core/SkColorShader.h', - '../include/core/SkComposeShader.h', - '../include/core/SkData.h', - '../include/core/SkDeque.h', - '../include/core/SkDescriptor.h', - '../include/core/SkDevice.h', - '../include/core/SkDither.h', - '../include/core/SkDraw.h', - '../include/core/SkDrawFilter.h', - '../include/core/SkDrawLooper.h', - '../include/core/SkEndian.h', - '../include/core/SkFixed.h', - '../include/core/SkFlattenable.h', - '../include/core/SkFloatBits.h', - '../include/core/SkFloatingPoint.h', - '../include/core/SkFontHost.h', - '../include/core/SkGeometry.h', - '../include/core/SkGlyph.h', - '../include/core/SkGraphics.h', - '../include/core/SkInstCnt.h', - '../include/core/SkMallocPixelRef.h', - '../include/core/SkMask.h', - '../include/core/SkMaskFilter.h', - '../include/core/SkMath.h', - '../include/core/SkMatrix.h', - '../include/core/SkMetaData.h', - '../include/core/SkMMapStream.h', - '../include/core/SkOSFile.h', - '../include/core/SkPackBits.h', - '../include/core/SkPaint.h', - '../include/core/SkPath.h', - '../include/core/SkPathEffect.h', - '../include/core/SkPathMeasure.h', - '../include/core/SkPerspIter.h', - '../include/core/SkPicture.h', - '../include/core/SkPixelRef.h', - '../include/core/SkPoint.h', - '../include/core/SkPtrRecorder.h', - '../include/core/SkRandom.h', - '../include/core/SkRasterizer.h', - '../include/core/SkReader32.h', - '../include/core/SkRect.h', - '../include/core/SkRefCnt.h', - '../include/core/SkRefDict.h', - '../include/core/SkRegion.h', - '../include/core/SkScalar.h', - '../include/core/SkScalarCompare.h', - '../include/core/SkScalerContext.h', - '../include/core/SkScan.h', - '../include/core/SkShader.h', - '../include/core/SkStream.h', - '../include/core/SkString.h', - '../include/core/SkTArray.h', - '../include/core/SkTDArray.h', - '../include/core/SkTDStack.h', - '../include/core/SkTDict.h', - '../include/core/SkTRegistry.h', - '../include/core/SkTScopedPtr.h', - '../include/core/SkTSearch.h', - '../include/core/SkTemplates.h', - '../include/core/SkThread.h', - '../include/core/SkThread_platform.h', - '../include/core/SkTime.h', - '../include/core/SkTLazy.h', - '../include/core/SkTrace.h', - '../include/core/SkTypeface.h', - '../include/core/SkTypes.h', - '../include/core/SkUnPreMultiply.h', - '../include/core/SkUnitMapper.h', - '../include/core/SkUtils.h', - '../include/core/SkWeakRefCnt.h', - '../include/core/SkWriter32.h', - '../include/core/SkXfermode.h', + 'includes': [ + 'core.gypi', ], + 'include_dirs': [ '../include/config', '../include/core', diff --git a/core.gypi b/core.gypi new file mode 100644 index 0000000..b541d02 --- /dev/null +++ b/core.gypi @@ -0,0 +1,258 @@ +# Include this gypi to include all 'core' files +# The parent gyp/gypi file must define +# 'skia_src_path' e.g. skia/trunk/src +# 'skia_include_path' e.g. skia/trunk/include +# +# The skia build defines these in common_variables.gypi +# +{ + 'sources': [ + '<(skia_src_path)/core/ARGB32_Clamp_Bilinear_BitmapShader.h', + '<(skia_src_path)/core/Sk64.cpp', + '<(skia_src_path)/core/SkAAClip.cpp', + '<(skia_src_path)/core/SkAnnotation.cpp', + '<(skia_src_path)/core/SkAdvancedTypefaceMetrics.cpp', + '<(skia_src_path)/core/SkAlphaRuns.cpp', + '<(skia_src_path)/core/SkAntiRun.h', + '<(skia_src_path)/core/SkBitmap.cpp', + '<(skia_src_path)/core/SkBitmapHeap.cpp', + '<(skia_src_path)/core/SkBitmapHeap.h', + '<(skia_src_path)/core/SkBitmapProcShader.cpp', + '<(skia_src_path)/core/SkBitmapProcShader.h', + '<(skia_src_path)/core/SkBitmapProcState.cpp', + '<(skia_src_path)/core/SkBitmapProcState.h', + '<(skia_src_path)/core/SkBitmapProcState_matrix.h', + '<(skia_src_path)/core/SkBitmapProcState_matrixProcs.cpp', + '<(skia_src_path)/core/SkBitmapProcState_sample.h', + '<(skia_src_path)/core/SkBitmapSampler.cpp', + '<(skia_src_path)/core/SkBitmapSampler.h', + '<(skia_src_path)/core/SkBitmapSamplerTemplate.h', + '<(skia_src_path)/core/SkBitmapShader16BilerpTemplate.h', + '<(skia_src_path)/core/SkBitmapShaderTemplate.h', + '<(skia_src_path)/core/SkBitmap_scroll.cpp', + '<(skia_src_path)/core/SkBlitBWMaskTemplate.h', + '<(skia_src_path)/core/SkBlitMask_D32.cpp', + '<(skia_src_path)/core/SkBlitRow_D16.cpp', + '<(skia_src_path)/core/SkBlitRow_D32.cpp', + '<(skia_src_path)/core/SkBlitRow_D4444.cpp', + '<(skia_src_path)/core/SkBlitter.cpp', + '<(skia_src_path)/core/SkBlitter_4444.cpp', + '<(skia_src_path)/core/SkBlitter_A1.cpp', + '<(skia_src_path)/core/SkBlitter_A8.cpp', + '<(skia_src_path)/core/SkBlitter_ARGB32.cpp', + '<(skia_src_path)/core/SkBlitter_RGB16.cpp', + '<(skia_src_path)/core/SkBlitter_Sprite.cpp', + '<(skia_src_path)/core/SkBuffer.cpp', + '<(skia_src_path)/core/SkCanvas.cpp', + '<(skia_src_path)/core/SkChunkAlloc.cpp', + '<(skia_src_path)/core/SkClipStack.cpp', + '<(skia_src_path)/core/SkColor.cpp', + '<(skia_src_path)/core/SkColorFilter.cpp', + '<(skia_src_path)/core/SkColorTable.cpp', + '<(skia_src_path)/core/SkComposeShader.cpp', + '<(skia_src_path)/core/SkConcaveToTriangles.cpp', + '<(skia_src_path)/core/SkConcaveToTriangles.h', + '<(skia_src_path)/core/SkConfig8888.cpp', + '<(skia_src_path)/core/SkConfig8888.h', + '<(skia_src_path)/core/SkCordic.cpp', + '<(skia_src_path)/core/SkCordic.h', + '<(skia_src_path)/core/SkCoreBlitters.h', + '<(skia_src_path)/core/SkCubicClipper.cpp', + '<(skia_src_path)/core/SkCubicClipper.h', + '<(skia_src_path)/core/SkData.cpp', + '<(skia_src_path)/core/SkDebug.cpp', + '<(skia_src_path)/core/SkDeque.cpp', + '<(skia_src_path)/core/SkDevice.cpp', + '<(skia_src_path)/core/SkDeviceProfile.cpp', + '<(skia_src_path)/core/SkDither.cpp', + '<(skia_src_path)/core/SkDraw.cpp', + '<(skia_src_path)/core/SkDrawProcs.h', + '<(skia_src_path)/core/SkEdgeBuilder.cpp', + '<(skia_src_path)/core/SkEdgeClipper.cpp', + '<(skia_src_path)/core/SkEdge.cpp', + '<(skia_src_path)/core/SkEdge.h', + '<(skia_src_path)/core/SkFP.h', + '<(skia_src_path)/core/SkFilterProc.cpp', + '<(skia_src_path)/core/SkFilterProc.h', + '<(skia_src_path)/core/SkFlattenable.cpp', + '<(skia_src_path)/core/SkFlattenableBuffers.cpp', + '<(skia_src_path)/core/SkFloat.cpp', + '<(skia_src_path)/core/SkFloat.h', + '<(skia_src_path)/core/SkFloatBits.cpp', + '<(skia_src_path)/core/SkFontHost.cpp', + '<(skia_src_path)/core/SkGeometry.cpp', + '<(skia_src_path)/core/SkGlyphCache.cpp', + '<(skia_src_path)/core/SkGlyphCache.h', + '<(skia_src_path)/core/SkGraphics.cpp', + '<(skia_src_path)/core/SkInstCnt.cpp', + '<(skia_src_path)/core/SkLineClipper.cpp', + '<(skia_src_path)/core/SkMallocPixelRef.cpp', + '<(skia_src_path)/core/SkMask.cpp', + '<(skia_src_path)/core/SkMaskFilter.cpp', + '<(skia_src_path)/core/SkMaskGamma.cpp', + '<(skia_src_path)/core/SkMaskGamma.h', + '<(skia_src_path)/core/SkMath.cpp', + '<(skia_src_path)/core/SkMatrix.cpp', + '<(skia_src_path)/core/SkMetaData.cpp', + '<(skia_src_path)/core/SkMMapStream.cpp', + '<(skia_src_path)/core/SkOrderedReadBuffer.cpp', + '<(skia_src_path)/core/SkOrderedWriteBuffer.cpp', + '<(skia_src_path)/core/SkPackBits.cpp', + '<(skia_src_path)/core/SkPaint.cpp', + '<(skia_src_path)/core/SkPath.cpp', + '<(skia_src_path)/core/SkPathEffect.cpp', + '<(skia_src_path)/core/SkPathHeap.cpp', + '<(skia_src_path)/core/SkPathHeap.h', + '<(skia_src_path)/core/SkPathMeasure.cpp', + '<(skia_src_path)/core/SkPicture.cpp', + '<(skia_src_path)/core/SkPictureFlat.cpp', + '<(skia_src_path)/core/SkPictureFlat.h', + '<(skia_src_path)/core/SkPicturePlayback.cpp', + '<(skia_src_path)/core/SkPicturePlayback.h', + '<(skia_src_path)/core/SkPictureRecord.cpp', + '<(skia_src_path)/core/SkPictureRecord.h', + '<(skia_src_path)/core/SkPixelRef.cpp', + '<(skia_src_path)/core/SkPoint.cpp', + '<(skia_src_path)/core/SkProcSpriteBlitter.cpp', + '<(skia_src_path)/core/SkPtrRecorder.cpp', + '<(skia_src_path)/core/SkQuadClipper.cpp', + '<(skia_src_path)/core/SkQuadClipper.h', + '<(skia_src_path)/core/SkRasterClip.cpp', + '<(skia_src_path)/core/SkRasterizer.cpp', + '<(skia_src_path)/core/SkRect.cpp', + '<(skia_src_path)/core/SkRefCnt.cpp', + '<(skia_src_path)/core/SkRefDict.cpp', + '<(skia_src_path)/core/SkRegion.cpp', + '<(skia_src_path)/core/SkRegionPriv.h', + '<(skia_src_path)/core/SkRegion_path.cpp', + '<(skia_src_path)/core/SkScalar.cpp', + '<(skia_src_path)/core/SkScalerContext.cpp', + '<(skia_src_path)/core/SkScan.cpp', + '<(skia_src_path)/core/SkScanPriv.h', + '<(skia_src_path)/core/SkScan_AntiPath.cpp', + '<(skia_src_path)/core/SkScan_Antihair.cpp', + '<(skia_src_path)/core/SkScan_Hairline.cpp', + '<(skia_src_path)/core/SkScan_Path.cpp', + '<(skia_src_path)/core/SkShader.cpp', + '<(skia_src_path)/core/SkShape.cpp', + '<(skia_src_path)/core/SkSpriteBlitter_ARGB32.cpp', + '<(skia_src_path)/core/SkSpriteBlitter_RGB16.cpp', + '<(skia_src_path)/core/SkSinTable.h', + '<(skia_src_path)/core/SkSpriteBlitter.h', + '<(skia_src_path)/core/SkSpriteBlitterTemplate.h', + '<(skia_src_path)/core/SkStream.cpp', + '<(skia_src_path)/core/SkString.cpp', + '<(skia_src_path)/core/SkStroke.h', + '<(skia_src_path)/core/SkStroke.cpp', + '<(skia_src_path)/core/SkStrokerPriv.cpp', + '<(skia_src_path)/core/SkStrokerPriv.h', + '<(skia_src_path)/core/SkTextFormatParams.h', + '<(skia_src_path)/core/SkTLS.cpp', + '<(skia_src_path)/core/SkTSearch.cpp', + '<(skia_src_path)/core/SkTSort.h', + '<(skia_src_path)/core/SkTemplatesPriv.h', + '<(skia_src_path)/core/SkTypeface.cpp', + '<(skia_src_path)/core/SkTypefaceCache.cpp', + '<(skia_src_path)/core/SkTypefaceCache.h', + '<(skia_src_path)/core/SkUnPreMultiply.cpp', + '<(skia_src_path)/core/SkUtils.cpp', + '<(skia_src_path)/core/SkWriter32.cpp', + '<(skia_src_path)/core/SkXfermode.cpp', + '<(skia_src_path)/pipe/SkGPipeRead.cpp', + '<(skia_src_path)/pipe/SkGPipeWrite.cpp', + + '<(skia_include_path)/core/Sk64.h', + '<(skia_include_path)/core/SkAdvancedTypefaceMetrics.h', + '<(skia_include_path)/core/SkBitmap.h', + '<(skia_include_path)/core/SkBlitRow.h', + '<(skia_include_path)/core/SkBlitter.h', + '<(skia_include_path)/core/SkBounder.h', + '<(skia_include_path)/core/SkBuffer.h', + '<(skia_include_path)/core/SkCanvas.h', + '<(skia_include_path)/core/SkChecksum.h', + '<(skia_include_path)/core/SkChunkAlloc.h', + '<(skia_include_path)/core/SkClipStack.h', + '<(skia_include_path)/core/SkColor.h', + '<(skia_include_path)/core/SkColorFilter.h', + '<(skia_include_path)/core/SkColorPriv.h', + '<(skia_include_path)/core/SkColorShader.h', + '<(skia_include_path)/core/SkComposeShader.h', + '<(skia_include_path)/core/SkData.h', + '<(skia_include_path)/core/SkDeque.h', + '<(skia_include_path)/core/SkDescriptor.h', + '<(skia_include_path)/core/SkDevice.h', + '<(skia_include_path)/core/SkDither.h', + '<(skia_include_path)/core/SkDraw.h', + '<(skia_include_path)/core/SkDrawFilter.h', + '<(skia_include_path)/core/SkDrawLooper.h', + '<(skia_include_path)/core/SkEndian.h', + '<(skia_include_path)/core/SkFixed.h', + '<(skia_include_path)/core/SkFlattenable.h', + '<(skia_include_path)/core/SkFloatBits.h', + '<(skia_include_path)/core/SkFloatingPoint.h', + '<(skia_include_path)/core/SkFontHost.h', + '<(skia_include_path)/core/SkGeometry.h', + '<(skia_include_path)/core/SkGlyph.h', + '<(skia_include_path)/core/SkGraphics.h', + '<(skia_include_path)/core/SkInstCnt.h', + '<(skia_include_path)/core/SkMallocPixelRef.h', + '<(skia_include_path)/core/SkMask.h', + '<(skia_include_path)/core/SkMaskFilter.h', + '<(skia_include_path)/core/SkMath.h', + '<(skia_include_path)/core/SkMatrix.h', + '<(skia_include_path)/core/SkMetaData.h', + '<(skia_include_path)/core/SkMMapStream.h', + '<(skia_include_path)/core/SkOSFile.h', + '<(skia_include_path)/core/SkPackBits.h', + '<(skia_include_path)/core/SkPaint.h', + '<(skia_include_path)/core/SkPath.h', + '<(skia_include_path)/core/SkPathEffect.h', + '<(skia_include_path)/core/SkPathMeasure.h', + '<(skia_include_path)/core/SkPerspIter.h', + '<(skia_include_path)/core/SkPicture.h', + '<(skia_include_path)/core/SkPixelRef.h', + '<(skia_include_path)/core/SkPoint.h', + '<(skia_include_path)/core/SkPtrRecorder.h', + '<(skia_include_path)/core/SkRandom.h', + '<(skia_include_path)/core/SkRasterizer.h', + '<(skia_include_path)/core/SkReader32.h', + '<(skia_include_path)/core/SkRect.h', + '<(skia_include_path)/core/SkRefCnt.h', + '<(skia_include_path)/core/SkRefDict.h', + '<(skia_include_path)/core/SkRegion.h', + '<(skia_include_path)/core/SkScalar.h', + '<(skia_include_path)/core/SkScalarCompare.h', + '<(skia_include_path)/core/SkScalerContext.h', + '<(skia_include_path)/core/SkScan.h', + '<(skia_include_path)/core/SkShader.h', + '<(skia_include_path)/core/SkStream.h', + '<(skia_include_path)/core/SkString.h', + '<(skia_include_path)/core/SkTArray.h', + '<(skia_include_path)/core/SkTDArray.h', + '<(skia_include_path)/core/SkTDStack.h', + '<(skia_include_path)/core/SkTDict.h', + '<(skia_include_path)/core/SkTRegistry.h', + '<(skia_include_path)/core/SkTScopedPtr.h', + '<(skia_include_path)/core/SkTSearch.h', + '<(skia_include_path)/core/SkTemplates.h', + '<(skia_include_path)/core/SkThread.h', + '<(skia_include_path)/core/SkThread_platform.h', + '<(skia_include_path)/core/SkTime.h', + '<(skia_include_path)/core/SkTLazy.h', + '<(skia_include_path)/core/SkTrace.h', + '<(skia_include_path)/core/SkTypeface.h', + '<(skia_include_path)/core/SkTypes.h', + '<(skia_include_path)/core/SkUnPreMultiply.h', + '<(skia_include_path)/core/SkUnitMapper.h', + '<(skia_include_path)/core/SkUtils.h', + '<(skia_include_path)/core/SkWeakRefCnt.h', + '<(skia_include_path)/core/SkWriter32.h', + '<(skia_include_path)/core/SkXfermode.h', + ], +} + +# Local Variables: +# tab-width:2 +# indent-tabs-mode:nil +# End: +# vim: set expandtab tabstop=2 shiftwidth=2: -- cgit v1.2.3 From 1e97df9999808ec1915dede8cb0c26bd35e9e56b Mon Sep 17 00:00:00 2001 From: "scroggo@google.com" Date: Wed, 8 Aug 2012 20:43:22 +0000 Subject: Make SkGPipe use SkBitmapHeap. In the single process (or hypothetical cross process/shared address space) mode, SkGPipe now uses SkBitmapHeap instead of SharedHeap. Still need to use the shared heap for shaders as well as for cross process. TEST=PipeTest Review URL: https://codereview.appspot.com/6461059 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@5008 2bbb7eff-a529-9590-31e7-b0007b416f81 --- tests.gyp | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/tests.gyp b/tests.gyp index 278dce7..b128a54 100644 --- a/tests.gyp +++ b/tests.gyp @@ -11,6 +11,7 @@ '../src/core', '../src/effects', '../src/pdf', + '../src/pipe/utils', '../src/utils', '../tools/', ], @@ -61,6 +62,7 @@ '../tests/PathMeasureTest.cpp', '../tests/PathTest.cpp', '../tests/PDFPrimitivesTest.cpp', + '../tests/PipeTest.cpp', '../tests/PictureUtilsTest.cpp', '../tests/PointTest.cpp', '../tests/PremulAlphaRoundTripTest.cpp', @@ -90,6 +92,9 @@ '../tests/WritePixelsTest.cpp', '../tests/Writer32Test.cpp', '../tests/XfermodeTest.cpp', + + # Needed for PipeTest. + '../src/pipe/utils/SamplePipeControllers.cpp', ], 'dependencies': [ 'core.gyp:core', -- cgit v1.2.3 From 09fce0f0935d9641aaaa3055f276b74a9d7fdd6d Mon Sep 17 00:00:00 2001 From: "digit@google.com" Date: Wed, 8 Aug 2012 22:06:29 +0000 Subject: arm: dynamic NEON support for SkBlitRow_opts_arm.cpp This patch moves all NEON-specific code from the source src/opts/SkBlitRow_opts_arm.cpp into a new file that is built as part of the 'opts_arm_neon' static library. Review URL: https://codereview.appspot.com/6449110 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@5016 2bbb7eff-a529-9590-31e7-b0007b416f81 --- opts.gyp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/opts.gyp b/opts.gyp index 8c85b9a..2ac395c 100644 --- a/opts.gyp +++ b/opts.gyp @@ -64,6 +64,7 @@ '../src/opts/memset.arm.S', '../src/opts/SkBitmapProcState_opts_arm.cpp', '../src/opts/SkBlitRow_opts_arm.cpp', + '../src/opts/SkBlitRow_opts_arm.h', ], 'conditions': [ [ 'arm_neon == 1 or arm_neon_optional == 1', { @@ -141,9 +142,11 @@ 'sources': [ '../src/opts/memset16_neon.S', '../src/opts/memset32_neon.S', + '../src/opts/SkBitmapProcState_arm_neon.cpp', '../src/opts/SkBitmapProcState_matrixProcs_neon.cpp', '../src/opts/SkBitmapProcState_matrix_clamp_neon.h', '../src/opts/SkBitmapProcState_matrix_repeat_neon.h', + '../src/opts/SkBlitRow_opts_arm_neon.cpp', ], }, ], -- cgit v1.2.3 From 9deb176f61e8627b2b3eac31834d4bc9538fce9d Mon Sep 17 00:00:00 2001 From: "digit@google.com" Date: Wed, 8 Aug 2012 22:58:40 +0000 Subject: Fix the Android build. Sorry, the offending line should have been part of a different patch. Review URL: https://codereview.appspot.com/6448129 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@5023 2bbb7eff-a529-9590-31e7-b0007b416f81 --- opts.gyp | 1 - 1 file changed, 1 deletion(-) diff --git a/opts.gyp b/opts.gyp index 2ac395c..a9f85cc 100644 --- a/opts.gyp +++ b/opts.gyp @@ -142,7 +142,6 @@ 'sources': [ '../src/opts/memset16_neon.S', '../src/opts/memset32_neon.S', - '../src/opts/SkBitmapProcState_arm_neon.cpp', '../src/opts/SkBitmapProcState_matrixProcs_neon.cpp', '../src/opts/SkBitmapProcState_matrix_clamp_neon.h', '../src/opts/SkBitmapProcState_matrix_repeat_neon.h', -- cgit v1.2.3 From 3f28ad733a2e91b2ea027617380e0ab71e1bc4ab Mon Sep 17 00:00:00 2001 From: "mike@reedtribe.org" Date: Thu, 9 Aug 2012 01:05:35 +0000 Subject: removed SkPerspIter.h git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@5026 2bbb7eff-a529-9590-31e7-b0007b416f81 --- core.gypi | 1 - 1 file changed, 1 deletion(-) diff --git a/core.gypi b/core.gypi index b541d02..4deed95 100644 --- a/core.gypi +++ b/core.gypi @@ -208,7 +208,6 @@ '<(skia_include_path)/core/SkPath.h', '<(skia_include_path)/core/SkPathEffect.h', '<(skia_include_path)/core/SkPathMeasure.h', - '<(skia_include_path)/core/SkPerspIter.h', '<(skia_include_path)/core/SkPicture.h', '<(skia_include_path)/core/SkPixelRef.h', '<(skia_include_path)/core/SkPoint.h', -- cgit v1.2.3 From c44e0b2983de3f47643c76032960fcc2fbc2c72b Mon Sep 17 00:00:00 2001 From: "mike@reedtribe.org" Date: Thu, 9 Aug 2012 01:26:07 +0000 Subject: privatize SkEdgeClipper.h git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@5027 2bbb7eff-a529-9590-31e7-b0007b416f81 --- SampleApp.gyp | 1 - 1 file changed, 1 deletion(-) diff --git a/SampleApp.gyp b/SampleApp.gyp index 93f3b73..ad61b87 100644 --- a/SampleApp.gyp +++ b/SampleApp.gyp @@ -66,7 +66,6 @@ '../samplecode/SampleLayerMask.cpp', '../samplecode/SampleLayers.cpp', '../samplecode/SampleLCD.cpp', - '../samplecode/SampleLineClipper.cpp', '../samplecode/SampleLines.cpp', '../samplecode/SampleMeasure.cpp', '../samplecode/SampleMipMap.cpp', -- cgit v1.2.3 From 4c3aa2ff8656e9e534ef95a966326931f59bd4ef Mon Sep 17 00:00:00 2001 From: "borenet@google.com" Date: Thu, 9 Aug 2012 15:54:28 +0000 Subject: Set bench/gm/tests as explicit dependencies of SkiaAndroidApp (trunk) Hopefully this fixes the flaky Android build. Review URL: https://codereview.appspot.com/6461067 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@5032 2bbb7eff-a529-9590-31e7-b0007b416f81 --- android_deps.gyp | 20 ++++++++++++++++++++ apptype_console.gypi | 2 +- core.gyp | 2 +- images.gyp | 4 ++-- ports.gyp | 4 ++-- 5 files changed, 26 insertions(+), 6 deletions(-) create mode 100644 android_deps.gyp diff --git a/android_deps.gyp b/android_deps.gyp new file mode 100644 index 0000000..122f2c3 --- /dev/null +++ b/android_deps.gyp @@ -0,0 +1,20 @@ +# This GYP file stores the dependencies necessary to build Skia on the Android +# platform. The OS doesn't provide many stable libraries as part of the +# distribution so we have to build a few of them ourselves. +# +# We tried adding this gyp file to the android directory at the root of +# the Skia repo, but that resulted in the generated makefiles being created +# outside of the intended output directory. So to avoid this we created a simple +# shim here that includes the android_deps.gypi file. The actual dependencies +# are defined and maintained in that gypi file. +# +# Also this assumes that the android directory is a sibling to the directory +# that contains your primary Skia checkout. If it is not then you must manually +# edit the includes below to specify the actual location of the android.gypi. +# This is due to the fact that we cannot use variables in an includes as the +# variable expansion step for gyp happens after the includes are processed. +{ + 'includes': [ + '../../android/gyp/dependencies.gypi', + ], +} diff --git a/apptype_console.gypi b/apptype_console.gypi index 62f1b9f..229db0d 100644 --- a/apptype_console.gypi +++ b/apptype_console.gypi @@ -14,7 +14,7 @@ 'conditions': [ [ 'skia_os == "android" and android_make_apk == 1', { 'dependencies': [ - 'android_system.gyp:Android_EntryPoint', + 'android_deps.gyp:Android_EntryPoint', ], }], ], diff --git a/core.gyp b/core.gyp index 0be1ad5..47a46ac 100644 --- a/core.gyp +++ b/core.gyp @@ -76,7 +76,7 @@ }], [ 'skia_os == "android"', { 'dependencies': [ - 'android_system.gyp:ft2', + 'android_deps.gyp:ft2', ], }], [ 'skia_os == "android" and skia_arch_type == "arm" and armv7 == 1', { diff --git a/images.gyp b/images.gyp index b92c9db..24c70a1 100644 --- a/images.gyp +++ b/images.gyp @@ -109,8 +109,8 @@ 'sources!': [ ], 'dependencies': [ - 'android_system.gyp:gif', - 'android_system.gyp:png', + 'android_deps.gyp:gif', + 'android_deps.gyp:png', ], 'defines': [ 'SK_ENABLE_LIBPNG', diff --git a/ports.gyp b/ports.gyp index b9c1412..3272ac9 100644 --- a/ports.gyp +++ b/ports.gyp @@ -96,8 +96,8 @@ #TODO: include the ports/SkImageRef_ashmem.cpp for non-NDK builds ], 'dependencies': [ - 'android_system.gyp:ft2', - 'android_system.gyp:expat', + 'android_deps.gyp:ft2', + 'android_deps.gyp:expat', ], }], ], -- cgit v1.2.3 From 68bbeb55dd8d45a3c45b36d9dec05a15619f3504 Mon Sep 17 00:00:00 2001 From: "reed@google.com" Date: Thu, 9 Aug 2012 18:05:33 +0000 Subject: remove SkShape (unused) Review URL: https://codereview.appspot.com/6461069 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@5033 2bbb7eff-a529-9590-31e7-b0007b416f81 --- SampleApp.gyp | 1 - core.gypi | 1 - effects.gyp | 4 ---- gmslides.gypi | 1 - iOSSampleApp.gyp | 2 -- 5 files changed, 9 deletions(-) diff --git a/SampleApp.gyp b/SampleApp.gyp index ad61b87..e417e80 100644 --- a/SampleApp.gyp +++ b/SampleApp.gyp @@ -85,7 +85,6 @@ '../samplecode/SampleRepeatTile.cpp', '../samplecode/SampleShaders.cpp', '../samplecode/SampleShaderText.cpp', - '../samplecode/SampleShapes.cpp', '../samplecode/SampleSkLayer.cpp', '../samplecode/SampleSlides.cpp', '../samplecode/SampleStrokePath.cpp', diff --git a/core.gypi b/core.gypi index 4deed95..941f45d 100644 --- a/core.gypi +++ b/core.gypi @@ -134,7 +134,6 @@ '<(skia_src_path)/core/SkScan_Hairline.cpp', '<(skia_src_path)/core/SkScan_Path.cpp', '<(skia_src_path)/core/SkShader.cpp', - '<(skia_src_path)/core/SkShape.cpp', '<(skia_src_path)/core/SkSpriteBlitter_ARGB32.cpp', '<(skia_src_path)/core/SkSpriteBlitter_RGB16.cpp', '<(skia_src_path)/core/SkSinTable.h', diff --git a/effects.gyp b/effects.gyp index 86308b7..ab69556 100644 --- a/effects.gyp +++ b/effects.gyp @@ -23,7 +23,6 @@ '../include/effects/SkDrawExtraPathEffect.h', '../include/effects/SkEmbossMaskFilter.h', '../include/effects/SkGradientShader.h', - '../include/effects/SkGroupShape.h', '../include/effects/SkKernel33MaskFilter.h', '../include/effects/SkLayerDrawLooper.h', '../include/effects/SkLayerRasterizer.h', @@ -32,7 +31,6 @@ '../include/effects/SkPaintFlagsDrawFilter.h', '../include/effects/SkPixelXorXfermode.h', '../include/effects/SkPorterDuff.h', - '../include/effects/SkRectShape.h', '../include/effects/SkStippleMaskFilter.h', '../include/effects/SkTableColorFilter.h', '../include/effects/SkTableMaskFilter.h', @@ -57,7 +55,6 @@ '../src/effects/SkEmbossMask.h', '../src/effects/SkEmbossMask_Table.h', '../src/effects/SkEmbossMaskFilter.cpp', - '../src/effects/SkGroupShape.cpp', '../src/effects/SkKernel33MaskFilter.cpp', '../src/effects/SkLayerDrawLooper.cpp', '../src/effects/SkLayerRasterizer.cpp', @@ -66,7 +63,6 @@ '../src/effects/SkPaintFlagsDrawFilter.cpp', '../src/effects/SkPixelXorXfermode.cpp', '../src/effects/SkPorterDuff.cpp', - '../src/effects/SkRectShape.cpp', '../src/effects/SkStippleMaskFilter.cpp', '../src/effects/SkTableColorFilter.cpp', '../src/effects/SkTableMaskFilter.cpp', diff --git a/gmslides.gypi b/gmslides.gypi index a430a9f..117bd36 100644 --- a/gmslides.gypi +++ b/gmslides.gypi @@ -53,7 +53,6 @@ '../gm/shaderbounds.cpp', '../gm/shadertext.cpp', '../gm/shadows.cpp', - '../gm/shapes.cpp', '../gm/simpleaaclip.cpp', '../gm/strokefill.cpp', '../gm/strokerects.cpp', diff --git a/iOSSampleApp.gyp b/iOSSampleApp.gyp index f504594..6da247c 100644 --- a/iOSSampleApp.gyp +++ b/iOSSampleApp.gyp @@ -25,7 +25,6 @@ '../gm/poly2poly.cpp', '../gm/shadertext.cpp', '../gm/shadows.cpp', - '../gm/shapes.cpp', '../gm/tilemodes.cpp', '../gm/xfermodes.cpp', @@ -93,7 +92,6 @@ '../samplecode/SampleRepeatTile.cpp', '../samplecode/SampleShaders.cpp', '../samplecode/SampleShaderText.cpp', - '../samplecode/SampleShapes.cpp', '../samplecode/SampleSkLayer.cpp', '../samplecode/SampleSlides.cpp', '../samplecode/SampleStrokePath.cpp', -- cgit v1.2.3 From 8f69ee953e5ff0ed234d5e4ad78eed7ea2c64084 Mon Sep 17 00:00:00 2001 From: "reed@google.com" Date: Thu, 9 Aug 2012 20:08:13 +0000 Subject: privatize SkScan.h git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@5038 2bbb7eff-a529-9590-31e7-b0007b416f81 --- core.gypi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core.gypi b/core.gypi index 941f45d..e3ff3f7 100644 --- a/core.gypi +++ b/core.gypi @@ -128,6 +128,7 @@ '<(skia_src_path)/core/SkScalar.cpp', '<(skia_src_path)/core/SkScalerContext.cpp', '<(skia_src_path)/core/SkScan.cpp', + '<(skia_src_path)/core/SkScan.h', '<(skia_src_path)/core/SkScanPriv.h', '<(skia_src_path)/core/SkScan_AntiPath.cpp', '<(skia_src_path)/core/SkScan_Antihair.cpp', @@ -221,7 +222,6 @@ '<(skia_include_path)/core/SkScalar.h', '<(skia_include_path)/core/SkScalarCompare.h', '<(skia_include_path)/core/SkScalerContext.h', - '<(skia_include_path)/core/SkScan.h', '<(skia_include_path)/core/SkShader.h', '<(skia_include_path)/core/SkStream.h', '<(skia_include_path)/core/SkString.h', -- cgit v1.2.3 From 4622d439f9718ecc2db2db574072e5bb86ed5ace Mon Sep 17 00:00:00 2001 From: "reed@google.com" Date: Thu, 9 Aug 2012 20:32:43 +0000 Subject: privatize SkBlitter.h git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@5040 2bbb7eff-a529-9590-31e7-b0007b416f81 --- core.gypi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core.gypi b/core.gypi index e3ff3f7..92080d8 100644 --- a/core.gypi +++ b/core.gypi @@ -35,6 +35,7 @@ '<(skia_src_path)/core/SkBlitRow_D16.cpp', '<(skia_src_path)/core/SkBlitRow_D32.cpp', '<(skia_src_path)/core/SkBlitRow_D4444.cpp', + '<(skia_src_path)/core/SkBlitter.h', '<(skia_src_path)/core/SkBlitter.cpp', '<(skia_src_path)/core/SkBlitter_4444.cpp', '<(skia_src_path)/core/SkBlitter_A1.cpp', @@ -165,7 +166,6 @@ '<(skia_include_path)/core/SkAdvancedTypefaceMetrics.h', '<(skia_include_path)/core/SkBitmap.h', '<(skia_include_path)/core/SkBlitRow.h', - '<(skia_include_path)/core/SkBlitter.h', '<(skia_include_path)/core/SkBounder.h', '<(skia_include_path)/core/SkBuffer.h', '<(skia_include_path)/core/SkCanvas.h', -- cgit v1.2.3 From 664909195d1d538f1e541c7d1e5579a3aa91851d Mon Sep 17 00:00:00 2001 From: "borenet@google.com" Date: Thu, 9 Aug 2012 20:44:32 +0000 Subject: Enable 32/64-bit gyp switch on Linux Linux defaults to 64, other platforms 32. As of this change, only Mac and Linux are affected by the skia_arch_width flag. Next step is to make Win work as well. Review URL: https://codereview.appspot.com/6460066 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@5041 2bbb7eff-a529-9590-31e7-b0007b416f81 --- common_conditions.gypi | 18 ++++++++++++++++++ common_variables.gypi | 6 +++++- 2 files changed, 23 insertions(+), 1 deletion(-) diff --git a/common_conditions.gypi b/common_conditions.gypi index 143e854..2b9800f 100644 --- a/common_conditions.gypi +++ b/common_conditions.gypi @@ -111,6 +111,24 @@ '-Wno-unused-parameter', '-Wno-c++11-extensions' ], + 'conditions' : [ + ['skia_arch_width == 64', { + 'cflags': [ + '-m64', + ], + 'ldflags': [ + '-m64', + ], + }], + ['skia_arch_width == 32', { + 'cflags': [ + '-m32', + ], + 'ldflags': [ + '-m32', + ], + }], + ], 'include_dirs' : [ '/usr/include/freetype2', ], diff --git a/common_variables.gypi b/common_variables.gypi index e8b8b6d..f738b8a 100644 --- a/common_variables.gypi +++ b/common_variables.gypi @@ -57,6 +57,11 @@ }, { 'os_posix%': 1, }], + ['skia_os in ["linux", "freebsd", "openbsd", "solaris"]', { + 'skia_arch_width%': 64, + }, { + 'skia_arch_width%': 32, + }], ], 'skia_scalar%': 'float', @@ -65,7 +70,6 @@ # Do not turn on 'skia_angle' - it is currently experimental 'skia_angle%': 0, 'skia_arch_type%': 'x86', - 'skia_arch_width%': 32, 'android_make_apk%': 1, 'skia_gpu%': 1, }, -- cgit v1.2.3 From 691206bfdbd4729cc791a669630cb31583c4663f Mon Sep 17 00:00:00 2001 From: "mike@reedtribe.org" Date: Sun, 12 Aug 2012 19:34:07 +0000 Subject: privatize SkPtrRecorder.h git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@5047 2bbb7eff-a529-9590-31e7-b0007b416f81 --- core.gypi | 1 - 1 file changed, 1 deletion(-) diff --git a/core.gypi b/core.gypi index 92080d8..a85ed64 100644 --- a/core.gypi +++ b/core.gypi @@ -211,7 +211,6 @@ '<(skia_include_path)/core/SkPicture.h', '<(skia_include_path)/core/SkPixelRef.h', '<(skia_include_path)/core/SkPoint.h', - '<(skia_include_path)/core/SkPtrRecorder.h', '<(skia_include_path)/core/SkRandom.h', '<(skia_include_path)/core/SkRasterizer.h', '<(skia_include_path)/core/SkReader32.h', -- cgit v1.2.3 From 2c7cff76b557e9d3e8da00e65c290df90f8ca190 Mon Sep 17 00:00:00 2001 From: "mike@reedtribe.org" Date: Sun, 12 Aug 2012 19:43:52 +0000 Subject: privatize SkGlyph.h git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@5048 2bbb7eff-a529-9590-31e7-b0007b416f81 --- core.gypi | 1 - 1 file changed, 1 deletion(-) diff --git a/core.gypi b/core.gypi index a85ed64..fa03dd1 100644 --- a/core.gypi +++ b/core.gypi @@ -192,7 +192,6 @@ '<(skia_include_path)/core/SkFloatingPoint.h', '<(skia_include_path)/core/SkFontHost.h', '<(skia_include_path)/core/SkGeometry.h', - '<(skia_include_path)/core/SkGlyph.h', '<(skia_include_path)/core/SkGraphics.h', '<(skia_include_path)/core/SkInstCnt.h', '<(skia_include_path)/core/SkMallocPixelRef.h', -- cgit v1.2.3 From b847076ce2cfda2bc99d8c513ed5b64b91276800 Mon Sep 17 00:00:00 2001 From: "mike@reedtribe.org" Date: Sun, 12 Aug 2012 23:45:04 +0000 Subject: privatize SkRefDict.h git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@5049 2bbb7eff-a529-9590-31e7-b0007b416f81 --- core.gypi | 1 - 1 file changed, 1 deletion(-) diff --git a/core.gypi b/core.gypi index fa03dd1..e6cfc28 100644 --- a/core.gypi +++ b/core.gypi @@ -215,7 +215,6 @@ '<(skia_include_path)/core/SkReader32.h', '<(skia_include_path)/core/SkRect.h', '<(skia_include_path)/core/SkRefCnt.h', - '<(skia_include_path)/core/SkRefDict.h', '<(skia_include_path)/core/SkRegion.h', '<(skia_include_path)/core/SkScalar.h', '<(skia_include_path)/core/SkScalarCompare.h', -- cgit v1.2.3 From ee14e8a6c4503afedd6ef699c067653ddbb48465 Mon Sep 17 00:00:00 2001 From: "mike@reedtribe.org" Date: Mon, 13 Aug 2012 00:01:39 +0000 Subject: privatize SkBuffer.h git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@5050 2bbb7eff-a529-9590-31e7-b0007b416f81 --- core.gypi | 1 - 1 file changed, 1 deletion(-) diff --git a/core.gypi b/core.gypi index e6cfc28..9b7b050 100644 --- a/core.gypi +++ b/core.gypi @@ -167,7 +167,6 @@ '<(skia_include_path)/core/SkBitmap.h', '<(skia_include_path)/core/SkBlitRow.h', '<(skia_include_path)/core/SkBounder.h', - '<(skia_include_path)/core/SkBuffer.h', '<(skia_include_path)/core/SkCanvas.h', '<(skia_include_path)/core/SkChecksum.h', '<(skia_include_path)/core/SkChunkAlloc.h', -- cgit v1.2.3 From e9053864dab0338cdf1144396edd4faf0524807b Mon Sep 17 00:00:00 2001 From: "mike@reedtribe.org" Date: Mon, 13 Aug 2012 00:52:07 +0000 Subject: move texteffects from Sample to gm git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@5051 2bbb7eff-a529-9590-31e7-b0007b416f81 --- SampleApp.gyp | 1 - gmslides.gypi | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/SampleApp.gyp b/SampleApp.gyp index e417e80..23ab8a7 100644 --- a/SampleApp.gyp +++ b/SampleApp.gyp @@ -93,7 +93,6 @@ '../samplecode/SampleText.cpp', '../samplecode/SampleTextAlpha.cpp', '../samplecode/SampleTextBox.cpp', - '../samplecode/SampleTextEffects.cpp', '../samplecode/SampleTextOnPath.cpp', '../samplecode/SampleTextureDomain.cpp', '../samplecode/SampleTiling.cpp', diff --git a/gmslides.gypi b/gmslides.gypi index 117bd36..27d4cb5 100644 --- a/gmslides.gypi +++ b/gmslides.gypi @@ -58,6 +58,7 @@ '../gm/strokerects.cpp', '../gm/strokes.cpp', '../gm/tablecolorfilter.cpp', + '../gm/texteffects.cpp', '../gm/testimagefilters.cpp', '../gm/texdata.cpp', '../gm/tilemodes.cpp', -- cgit v1.2.3 From a20a47f6d6ca4f3301e95c5f88f122d2a62600af Mon Sep 17 00:00:00 2001 From: "digit@google.com" Date: Mon, 13 Aug 2012 14:06:34 +0000 Subject: arm: dynamic NEON support for SkBitmapProcState functions. This patch does the following: - Move the NEON-specific code from src/core/SkBitmapProcState_filter.h to src/opts/SkBitmapProcState_filter_neon.h - Implement the NEON-specific functions in the new source file src/opts/SkBitmapProcState_opts_arm_neon.cpp, added to the "opts_neon" static library target. All functions now use the _neon suffix, even in full-NEON builds. - Move most of the content of src/core/SkBitmapProcState.cpp to a new header: src/core/SkBitmapProcState_procs.h This header is included by two source files: src/core/SkBitmapProcState.cpp, to define the regular functions. src/opts/SkBitmapProcState_opts_arm_neon.cpp to define NEON ones. This is to deal with the fact that all NEON functions now use the _neon suffix, even in SK_ARM_NEON_IS_ALWAYS mode, and to be able to include the same header twice in the SK_ARM_NEON_IS_DYNAMIC case. Review URL: https://codereview.appspot.com/6449117 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@5055 2bbb7eff-a529-9590-31e7-b0007b416f81 --- opts.gyp | 1 + 1 file changed, 1 insertion(+) diff --git a/opts.gyp b/opts.gyp index a9f85cc..2ac395c 100644 --- a/opts.gyp +++ b/opts.gyp @@ -142,6 +142,7 @@ 'sources': [ '../src/opts/memset16_neon.S', '../src/opts/memset32_neon.S', + '../src/opts/SkBitmapProcState_arm_neon.cpp', '../src/opts/SkBitmapProcState_matrixProcs_neon.cpp', '../src/opts/SkBitmapProcState_matrix_clamp_neon.h', '../src/opts/SkBitmapProcState_matrix_repeat_neon.h', -- cgit v1.2.3 From d710d7ff87cdc9a75bc0d61ebee7125a1bae6064 Mon Sep 17 00:00:00 2001 From: "bsalomon@google.com" Date: Mon, 13 Aug 2012 14:22:17 +0000 Subject: Add a zoom filter to Skia. This will be used on ChromeOS to implement the screen magnifier. Committed on behalf of zork@chromium.org Review URL: http://codereview.appspot.com/6354065/ git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@5056 2bbb7eff-a529-9590-31e7-b0007b416f81 --- effects.gyp | 2 ++ gmslides.gypi | 1 + 2 files changed, 3 insertions(+) diff --git a/effects.gyp b/effects.gyp index ab69556..1236261 100644 --- a/effects.gyp +++ b/effects.gyp @@ -35,6 +35,7 @@ '../include/effects/SkTableColorFilter.h', '../include/effects/SkTableMaskFilter.h', '../include/effects/SkTransparentShader.h', + '../include/effects/SkMagnifierImageFilter.h', '../src/effects/Sk1DPathEffect.cpp', '../src/effects/Sk2DPathEffect.cpp', @@ -68,6 +69,7 @@ '../src/effects/SkTableMaskFilter.cpp', '../src/effects/SkTestImageFilters.cpp', '../src/effects/SkTransparentShader.cpp', + '../src/effects/SkMagnifierImageFilter.cpp', '../src/effects/gradients/SkBitmapCache.cpp', '../src/effects/gradients/SkBitmapCache.h', diff --git a/gmslides.gypi b/gmslides.gypi index 27d4cb5..fda02b6 100644 --- a/gmslides.gypi +++ b/gmslides.gypi @@ -36,6 +36,7 @@ '../gm/hairmodes.cpp', '../gm/hittestpath.cpp', '../gm/imageblur.cpp', + '../gm/imagemagnifier.cpp', '../gm/lighting.cpp', '../gm/imagefiltersbase.cpp', '../gm/lcdtext.cpp', -- cgit v1.2.3 From 8ab28c8480cc621113adf783561d280662c22ee2 Mon Sep 17 00:00:00 2001 From: "chudy@google.com" Date: Mon, 13 Aug 2012 14:26:36 +0000 Subject: Effects Bug Fix Certain compilers in an effort to optimize code chop off files that are never used. By adding a flag to common conditions and variables we can force skia to recompile with global static initializers off. By making a call to SkGraphics::Init we now register all those functions that had been previously automatically excluded by the compiler. Review URL: https://codereview.appspot.com/6443112 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@5057 2bbb7eff-a529-9590-31e7-b0007b416f81 --- common_conditions.gypi | 13 ++++++++----- common_variables.gypi | 4 +++- debugger.gyp | 2 +- 3 files changed, 12 insertions(+), 7 deletions(-) diff --git a/common_conditions.gypi b/common_conditions.gypi index 2b9800f..eff47bf 100644 --- a/common_conditions.gypi +++ b/common_conditions.gypi @@ -1,6 +1,9 @@ # conditions used in both common.gypi and skia.gyp in chromium # { + 'defines': [ + 'SK_ALLOW_STATIC_GLOBAL_INITIALIZERS=<(skia_static_initializers)', + ], 'conditions' : [ ['skia_gpu == 1', { @@ -135,7 +138,7 @@ }, ], - ['skia_os == "mac"', + ['skia_os == "mac"', { 'defines': [ 'SK_BUILD_FOR_MAC', @@ -195,7 +198,7 @@ }, ], - ['skia_os == "ios"', + ['skia_os == "ios"', { 'defines': [ 'SK_BUILD_FOR_IOS', @@ -212,8 +215,8 @@ }, }, ], - - ['skia_os == "android"', + + ['skia_os == "android"', { 'defines': [ 'SK_BUILD_FOR_ANDROID', @@ -285,7 +288,7 @@ }], ], }], - ], + ], }, ], diff --git a/common_variables.gypi b/common_variables.gypi index f738b8a..fd2c7e7 100644 --- a/common_variables.gypi +++ b/common_variables.gypi @@ -72,6 +72,7 @@ 'skia_arch_type%': 'x86', 'android_make_apk%': 1, 'skia_gpu%': 1, + 'skia_static_initializers%': 1, }, # Re-define all variables defined within the level-2 'variables' dict, @@ -86,7 +87,8 @@ 'skia_arch_width%': '<(skia_arch_width)', 'android_make_apk%': '<(android_make_apk)', 'skia_gpu%': '<(skia_gpu)', - + 'skia_static_initializers%': '<(skia_static_initializers)', + # These are referenced by our .gypi files that list files (e.g. core.gypi) # 'skia_src_path%': '../src', diff --git a/debugger.gyp b/debugger.gyp index 8848832..d3cf674 100644 --- a/debugger.gyp +++ b/debugger.gyp @@ -10,7 +10,7 @@ '../src/gpu', # To pull gl/GrGLUtil.h ], 'sources': [ - '../debugger/debuggermain.cpp', + '../debugger/debuggermain.cpp', '../debugger/SkDebugCanvas.h', '../debugger/SkDebugCanvas.cpp', '../debugger/SkDebugger.cpp', -- cgit v1.2.3 From efe0584bc6349b2461dc5ecb5b0b641009e30843 Mon Sep 17 00:00:00 2001 From: "robertphillips@google.com" Date: Mon, 13 Aug 2012 14:46:35 +0000 Subject: Updated gpu.gyp to move GrCacheID.h from src\gpu to include\gpu git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@5060 2bbb7eff-a529-9590-31e7-b0007b416f81 --- gpu.gyp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gpu.gyp b/gpu.gyp index 20bddbf..2355e7c 100644 --- a/gpu.gyp +++ b/gpu.gyp @@ -199,6 +199,7 @@ ], 'sources': [ '../include/gpu/GrAARectRenderer.h', + '../include/gpu/GrCacheID.h', '../include/gpu/GrClipData.h', '../include/gpu/GrColor.h', '../include/gpu/GrConfig.h', @@ -246,7 +247,6 @@ '../src/gpu/GrBinHashKey.h', '../src/gpu/GrBufferAllocPool.cpp', '../src/gpu/GrBufferAllocPool.h', - '../src/gpu/GrCacheID.h', '../src/gpu/GrCacheID.cpp', '../src/gpu/GrClipData.cpp', '../src/gpu/GrContext.cpp', -- cgit v1.2.3 From ad14c0c7744452b0ffabb3a76baa8dbeca330e6b Mon Sep 17 00:00:00 2001 From: "rileya@google.com" Date: Mon, 13 Aug 2012 20:28:48 +0000 Subject: Added GrTextureStripAtlas object. Review URL: https://codereview.appspot.com/6457099 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@5070 2bbb7eff-a529-9590-31e7-b0007b416f81 --- gpu.gyp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/gpu.gyp b/gpu.gyp index 2355e7c..4021f4f 100644 --- a/gpu.gyp +++ b/gpu.gyp @@ -311,6 +311,8 @@ '../src/gpu/gr_unittests.cpp', '../src/gpu/effects/Gr1DKernelEffect.h', + '../src/gpu/effects/GrTextureStripAtlas.h', + '../src/gpu/effects/GrTextureStripAtlas.cpp', '../src/gpu/effects/GrColorTableEffect.cpp', '../src/gpu/effects/GrColorTableEffect.h', '../src/gpu/effects/GrConvolutionEffect.cpp', -- cgit v1.2.3 From 8fcb198770a5b674bf251b20483eb30425a04c88 Mon Sep 17 00:00:00 2001 From: "junov@chromium.org" Date: Tue, 14 Aug 2012 13:36:26 +0000 Subject: Augmenting SkDeferredCanvas notification interface to signal flushes and memory allocations Renamed SkDeferredCanvas::DeviceContext to SkDeferredCanvas::NotificationClient BUG=http://code.google.com/p/chromium/issues/detail?id=136828 TEST=Added coverage for new API to DeferredCanvas unit test. Added DeferredCanvas bench test to track deferred canvas overhead cost. Review URL: https://codereview.appspot.com/6442108 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@5078 2bbb7eff-a529-9590-31e7-b0007b416f81 --- bench.gypi | 1 + 1 file changed, 1 insertion(+) diff --git a/bench.gypi b/bench.gypi index e32db41..5d2730d 100644 --- a/bench.gypi +++ b/bench.gypi @@ -13,6 +13,7 @@ '../bench/ChromeBench.cpp', '../bench/DashBench.cpp', '../bench/DecodeBench.cpp', + '../bench/DeferredCanvasBench.cpp', '../bench/FontScalerBench.cpp', '../bench/GradientBench.cpp', '../bench/GrMemoryPoolBench.cpp', -- cgit v1.2.3 From 221847fd4d4a5c9471d7825f60bc281bd33b18b9 Mon Sep 17 00:00:00 2001 From: "reed@google.com" Date: Tue, 14 Aug 2012 17:41:34 +0000 Subject: privatize SkDescriptor.h git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@5086 2bbb7eff-a529-9590-31e7-b0007b416f81 --- core.gypi | 1 - 1 file changed, 1 deletion(-) diff --git a/core.gypi b/core.gypi index 9b7b050..9614c5e 100644 --- a/core.gypi +++ b/core.gypi @@ -178,7 +178,6 @@ '<(skia_include_path)/core/SkComposeShader.h', '<(skia_include_path)/core/SkData.h', '<(skia_include_path)/core/SkDeque.h', - '<(skia_include_path)/core/SkDescriptor.h', '<(skia_include_path)/core/SkDevice.h', '<(skia_include_path)/core/SkDither.h', '<(skia_include_path)/core/SkDraw.h', -- cgit v1.2.3 From 006e5479caf850e65d8b37227c87b8b9a7da2eb6 Mon Sep 17 00:00:00 2001 From: "reed@google.com" Date: Tue, 14 Aug 2012 19:45:58 +0000 Subject: privatize SkScalerContext.h git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@5096 2bbb7eff-a529-9590-31e7-b0007b416f81 --- core.gypi | 1 - 1 file changed, 1 deletion(-) diff --git a/core.gypi b/core.gypi index 9614c5e..2f44ca0 100644 --- a/core.gypi +++ b/core.gypi @@ -216,7 +216,6 @@ '<(skia_include_path)/core/SkRegion.h', '<(skia_include_path)/core/SkScalar.h', '<(skia_include_path)/core/SkScalarCompare.h', - '<(skia_include_path)/core/SkScalerContext.h', '<(skia_include_path)/core/SkShader.h', '<(skia_include_path)/core/SkStream.h', '<(skia_include_path)/core/SkString.h', -- cgit v1.2.3 From 360bd1416785dfe5b6e4073b6ffae4717cda87e0 Mon Sep 17 00:00:00 2001 From: "keyar@chromium.org" Date: Tue, 14 Aug 2012 22:02:48 +0000 Subject: GrContextFactory can now expose the GLContext it is using. Review URL: https://codereview.appspot.com/6461081 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@5105 2bbb7eff-a529-9590-31e7-b0007b416f81 --- tests.gyp | 1 + 1 file changed, 1 insertion(+) diff --git a/tests.gyp b/tests.gyp index b128a54..efb41f8 100644 --- a/tests.gyp +++ b/tests.gyp @@ -47,6 +47,7 @@ '../tests/GeometryTest.cpp', '../tests/GLInterfaceValidation.cpp', '../tests/GLProgramsTest.cpp', + '../tests/GrContextFactoryTest.cpp', '../tests/GradientTest.cpp', '../tests/GrMemoryPoolTest.cpp', '../tests/InfRectTest.cpp', -- cgit v1.2.3 From fa07c86fe32c1572e97f99fd66a0f9fab0723372 Mon Sep 17 00:00:00 2001 From: "bungeman@google.com" Date: Thu, 16 Aug 2012 16:13:40 +0000 Subject: DirectWrite font host for skia. https://codereview.appspot.com/5417063/ git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@5128 2bbb7eff-a529-9590-31e7-b0007b416f81 --- common.gypi | 5 +++++ common_variables.gypi | 4 +++- ports.gyp | 13 +++++++++++++ utils.gyp | 15 +++++++++++++-- 4 files changed, 34 insertions(+), 3 deletions(-) diff --git a/common.gypi b/common.gypi index 4b558f8..08c266e 100644 --- a/common.gypi +++ b/common.gypi @@ -50,6 +50,11 @@ ], } ], + [ 'skia_directwrite', { + 'defines': [ + 'SK_FONTHOST_WIN_DW', + ], + }], [ 'skia_mesa', { 'defines': [ 'SK_MESA', diff --git a/common_variables.gypi b/common_variables.gypi index fd2c7e7..247fe74 100644 --- a/common_variables.gypi +++ b/common_variables.gypi @@ -70,6 +70,7 @@ # Do not turn on 'skia_angle' - it is currently experimental 'skia_angle%': 0, 'skia_arch_type%': 'x86', + 'skia_directwrite%': 0, 'android_make_apk%': 1, 'skia_gpu%': 1, 'skia_static_initializers%': 1, @@ -85,6 +86,7 @@ 'skia_angle%': '<(skia_angle)', 'skia_arch_type%': '<(skia_arch_type)', 'skia_arch_width%': '<(skia_arch_width)', + 'skia_directwrite%': '<(skia_directwrite)', 'android_make_apk%': '<(android_make_apk)', 'skia_gpu%': '<(skia_gpu)', 'skia_static_initializers%': '<(skia_static_initializers)', @@ -99,4 +101,4 @@ # tab-width:2 # indent-tabs-mode:nil # End: -# vim: set expandtab tabstop=2 shiftwidth=2: +# vim: set expandtab tabstop=2 shiftwidth=2: \ No newline at end of file diff --git a/ports.gyp b/ports.gyp index 3272ac9..bb55030 100644 --- a/ports.gyp +++ b/ports.gyp @@ -24,6 +24,7 @@ '../src/ports/SkFontDescriptor.cpp', '../src/ports/SkFontHost_sandbox_none.cpp', '../src/ports/SkFontHost_win.cpp', + '../src/ports/SkFontHost_win_dw.cpp', '../src/ports/SkGlobalInitialization_default.cpp', '../src/ports/SkThread_win.cpp', @@ -70,6 +71,18 @@ [ 'skia_os == "win"', { 'include_dirs': [ 'config/win', + '../src/utils/win', + ], + 'conditions': [ + [ 'skia_directwrite', { + 'sources!': [ + '../src/ports/SkFontHost_win.cpp', + ], + }, { # else !skia_directwrite + 'sources!': [ + '../src/ports/SkFontHost_win_dw.cpp', + ], + }], ], 'sources!': [ # these are used everywhere but windows '../src/ports/SkDebug_stdio.cpp', diff --git a/utils.gyp b/utils.gyp index 8b919a3..b4b8785 100644 --- a/utils.gyp +++ b/utils.gyp @@ -2,10 +2,11 @@ 'targets': [ { 'target_name': 'utils', + 'dependencies': [ + 'core.gyp:core', + ], 'type': 'static_library', 'include_dirs': [ - '../include/config', - '../include/core', '../include/effects', '../include/pipe', '../include/utils', @@ -13,6 +14,7 @@ '../include/utils/unix', '../include/utils/win', '../include/xml', + '../src/utils', ], 'sources': [ '../include/utils/SkBoundaryPatch.h', @@ -45,6 +47,7 @@ '../src/utils/SkCullPoints.cpp', '../src/utils/SkDeferredCanvas.cpp', '../src/utils/SkDumpCanvas.cpp', + '../src/utils/SkFloatUtils.h', '../src/utils/SkInterpolator.cpp', '../src/utils/SkLayer.cpp', '../src/utils/SkMatrix44.cpp', @@ -77,6 +80,10 @@ '../include/utils/win/SkIStream.h', '../include/utils/win/SkTScopedComPtr.h', '../src/utils/win/SkAutoCoInitialize.cpp', + '../src/utils/win/SkDWriteFontFileStream.cpp', + '../src/utils/win/SkDWriteFontFileStream.h', + '../src/utils/win/SkDWriteGeometrySink.cpp', + '../src/utils/win/SkDWriteGeometrySink.h', '../src/utils/win/SkHRESULT.cpp', '../src/utils/win/SkIStream.cpp', '../src/utils/win/SkWGL_win.cpp', @@ -149,6 +156,10 @@ '../include/utils/win/SkIStream.h', '../include/utils/win/SkTScopedComPtr.h', '../src/utils/win/SkAutoCoInitialize.cpp', + '../src/utils/win/SkDWriteFontFileStream.cpp', + '../src/utils/win/SkDWriteFontFileStream.h', + '../src/utils/win/SkDWriteGeometrySink.cpp', + '../src/utils/win/SkDWriteGeometrySink.h', '../src/utils/win/SkHRESULT.cpp', '../src/utils/win/SkIStream.cpp', ], -- cgit v1.2.3 From 970461d9804e12cd1128e6a3b62177f037e77d3a Mon Sep 17 00:00:00 2001 From: "bungeman@google.com" Date: Thu, 16 Aug 2012 16:23:09 +0000 Subject: Don't try to build SkFontHost_win_dw.cpp on non-Windows platforms. git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@5129 2bbb7eff-a529-9590-31e7-b0007b416f81 --- ports.gyp | 1 + 1 file changed, 1 insertion(+) diff --git a/ports.gyp b/ports.gyp index bb55030..d9a7536 100644 --- a/ports.gyp +++ b/ports.gyp @@ -92,6 +92,7 @@ 'sources!': [ '../src/ports/SkDebug_win.cpp', '../src/ports/SkFontHost_win.cpp', + '../src/ports/SkFontHost_win_dw.cpp', '../src/ports/SkThread_win.cpp', '../src/ports/SkTime_win.cpp', ], -- cgit v1.2.3 From 241cfb79c115945863edcd2cd7482c66bb3bc9a9 Mon Sep 17 00:00:00 2001 From: "bungeman@google.com" Date: Thu, 16 Aug 2012 17:35:58 +0000 Subject: Remove SK_FONTHOST_WIN_DW define. git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@5132 2bbb7eff-a529-9590-31e7-b0007b416f81 --- common.gypi | 5 ----- 1 file changed, 5 deletions(-) diff --git a/common.gypi b/common.gypi index 08c266e..4b558f8 100644 --- a/common.gypi +++ b/common.gypi @@ -50,11 +50,6 @@ ], } ], - [ 'skia_directwrite', { - 'defines': [ - 'SK_FONTHOST_WIN_DW', - ], - }], [ 'skia_mesa', { 'defines': [ 'SK_MESA', -- cgit v1.2.3 From 085e7e420bc754e4317789ed2135226778d065f7 Mon Sep 17 00:00:00 2001 From: "senorblanco@chromium.org" Date: Mon, 20 Aug 2012 14:53:21 +0000 Subject: Implements a new class, SkSingleInputImageFilter, to handle DAG connectivity for filters with a single image input. This provides functionality to store, flatten and unflatten a single SkImageFilter input, as well as to recursively evaluate it on the CPU or GPU. The following classes were re-parented to implement DAG connectivity: SkBlurImageFilter, SkDilateImageFilter, SkErodeImageFilter, SkColorFilterImageFilter. The constructors for each have been appended with a new parameter, representing the input filter (default NULL). This change also implements an arbitrary SkBitmap input source for filtering, SkBitmapSource. NOTE: This CL will require gyp file changes when rolling past this revision. Review URL: https://codereview.appspot.com/6462071/ git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@5170 2bbb7eff-a529-9590-31e7-b0007b416f81 --- effects.gyp | 4 ++++ gmslides.gypi | 1 + 2 files changed, 5 insertions(+) diff --git a/effects.gyp b/effects.gyp index 1236261..dee73d6 100644 --- a/effects.gyp +++ b/effects.gyp @@ -12,6 +12,7 @@ '../include/effects/Sk2DPathEffect.h', '../include/effects/SkAvoidXfermode.h', '../include/effects/SkArithmeticMode.h', + '../include/effects/SkBitmapSource.h', '../include/effects/SkBlurDrawLooper.h', '../include/effects/SkBlurImageFilter.h', '../include/effects/SkBlurMaskFilter.h', @@ -31,6 +32,7 @@ '../include/effects/SkPaintFlagsDrawFilter.h', '../include/effects/SkPixelXorXfermode.h', '../include/effects/SkPorterDuff.h', + '../include/effects/SkSingleInputImageFilter.h', '../include/effects/SkStippleMaskFilter.h', '../include/effects/SkTableColorFilter.h', '../include/effects/SkTableMaskFilter.h', @@ -41,6 +43,7 @@ '../src/effects/Sk2DPathEffect.cpp', '../src/effects/SkAvoidXfermode.cpp', '../src/effects/SkArithmeticMode.cpp', + '../src/effects/SkBitmapSource.cpp', '../src/effects/SkBlurDrawLooper.cpp', '../src/effects/SkBlurMask.cpp', '../src/effects/SkBlurMask.h', @@ -64,6 +67,7 @@ '../src/effects/SkPaintFlagsDrawFilter.cpp', '../src/effects/SkPixelXorXfermode.cpp', '../src/effects/SkPorterDuff.cpp', + '../src/effects/SkSingleInputImageFilter.cpp', '../src/effects/SkStippleMaskFilter.cpp', '../src/effects/SkTableColorFilter.cpp', '../src/effects/SkTableMaskFilter.cpp', diff --git a/gmslides.gypi b/gmslides.gypi index fda02b6..324d143 100644 --- a/gmslides.gypi +++ b/gmslides.gypi @@ -39,6 +39,7 @@ '../gm/imagemagnifier.cpp', '../gm/lighting.cpp', '../gm/imagefiltersbase.cpp', + '../gm/imagefiltersgraph.cpp', '../gm/lcdtext.cpp', '../gm/linepaths.cpp', '../gm/morphology.cpp', -- cgit v1.2.3 From d28ab4a4e07cc107d50166a85a374f0a359c8665 Mon Sep 17 00:00:00 2001 From: "keyar@chromium.org" Date: Mon, 20 Aug 2012 15:03:29 +0000 Subject: Dirty commit so Brian can see changes. git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@5171 2bbb7eff-a529-9590-31e7-b0007b416f81 --- tools.gyp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tools.gyp b/tools.gyp index 3910b70..799c960 100644 --- a/tools.gyp +++ b/tools.gyp @@ -129,6 +129,8 @@ ], 'dependencies': [ 'core.gyp:core', + 'gpu.gyp:gr', + 'gpu.gyp:skgr', 'tools.gyp:picture_utils', ], }, -- cgit v1.2.3 From 9f320c58b5fa474153236319286e759807cdd76c Mon Sep 17 00:00:00 2001 From: "keyar@chromium.org" Date: Mon, 20 Aug 2012 15:03:33 +0000 Subject: The GrContext and the GrFactoryContext are now kept around. git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@5172 2bbb7eff-a529-9590-31e7-b0007b416f81 --- tools.gyp | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/tools.gyp b/tools.gyp index 799c960..a0245f4 100644 --- a/tools.gyp +++ b/tools.gyp @@ -115,6 +115,9 @@ 'tools.gyp:picture_renderer', 'bench.gyp:bench_timer', ], + 'export_dependent_settings': [ + 'tools.gyp:picture_renderer', + ] }, { 'target_name': 'picture_renderer', @@ -133,6 +136,11 @@ 'gpu.gyp:skgr', 'tools.gyp:picture_utils', ], + 'direct_dependent_settings': { + 'include_dirs': [ + '../include/gpu', + ], + }, }, { 'target_name': 'picture_utils', -- cgit v1.2.3 From 56c3f80b792f6434fe4a6dba57a6913247b49428 Mon Sep 17 00:00:00 2001 From: "keyar@chromium.org" Date: Mon, 20 Aug 2012 15:03:38 +0000 Subject: Changed the gyp file to handle dpendencies via exports. git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@5174 2bbb7eff-a529-9590-31e7-b0007b416f81 --- tools.gyp | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/tools.gyp b/tools.gyp index a0245f4..1a99f76 100644 --- a/tools.gyp +++ b/tools.gyp @@ -136,11 +136,9 @@ 'gpu.gyp:skgr', 'tools.gyp:picture_utils', ], - 'direct_dependent_settings': { - 'include_dirs': [ - '../include/gpu', - ], - }, + 'export_dependent_settings': [ + 'gpu.gyp:gr', + ] }, { 'target_name': 'picture_utils', -- cgit v1.2.3 From f01246679b5c4fc31220a5f83717a63a8eedb574 Mon Sep 17 00:00:00 2001 From: "senorblanco@chromium.org" Date: Mon, 20 Aug 2012 15:43:14 +0000 Subject: Refactor SkImageFilter into its own .cpp file. Review URL: https://codereview.appspot.com/6465073/ git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@5188 2bbb7eff-a529-9590-31e7-b0007b416f81 --- core.gypi | 2 ++ 1 file changed, 2 insertions(+) diff --git a/core.gypi b/core.gypi index 2f44ca0..3a36987 100644 --- a/core.gypi +++ b/core.gypi @@ -86,6 +86,7 @@ '<(skia_src_path)/core/SkGlyphCache.h', '<(skia_src_path)/core/SkGraphics.cpp', '<(skia_src_path)/core/SkInstCnt.cpp', + '<(skia_src_path)/core/SkImageFilter.cpp', '<(skia_src_path)/core/SkLineClipper.cpp', '<(skia_src_path)/core/SkMallocPixelRef.cpp', '<(skia_src_path)/core/SkMask.cpp', @@ -191,6 +192,7 @@ '<(skia_include_path)/core/SkFontHost.h', '<(skia_include_path)/core/SkGeometry.h', '<(skia_include_path)/core/SkGraphics.h', + '<(skia_include_path)/core/SkImageFilter.h', '<(skia_include_path)/core/SkInstCnt.h', '<(skia_include_path)/core/SkMallocPixelRef.h', '<(skia_include_path)/core/SkMask.h', -- cgit v1.2.3 From 81c504d0e0d175c9c1cbcaa50c168efec57e6fb9 Mon Sep 17 00:00:00 2001 From: "keyar@chromium.org" Date: Mon, 20 Aug 2012 15:49:47 +0000 Subject: Fixed no GPU build. Not reviewed. git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@5189 2bbb7eff-a529-9590-31e7-b0007b416f81 --- tools.gyp | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/tools.gyp b/tools.gyp index 1a99f76..ca61453 100644 --- a/tools.gyp +++ b/tools.gyp @@ -127,18 +127,24 @@ '../src/pipe/utils/SamplePipeControllers.h', '../src/pipe/utils/SamplePipeControllers.cpp', ], - 'include_dirs': [ - '../src/pipe/utils/', - ], + 'include_dirs': [ + '../src/pipe/utils', + ], 'dependencies': [ 'core.gyp:core', - 'gpu.gyp:gr', - 'gpu.gyp:skgr', 'tools.gyp:picture_utils', ], - 'export_dependent_settings': [ - 'gpu.gyp:gr', - ] + 'conditions': [ + ['skia_gpu == 1', { + 'dependencies': [ + 'gpu.gyp:gr', + 'gpu.gyp:skgr', + ], + 'export_dependent_settings': [ + 'gpu.gyp:gr', + ], + }], + ], }, { 'target_name': 'picture_utils', -- cgit v1.2.3 From 341c1d4e42febad3e7e4941a896cdcdec4af41f7 Mon Sep 17 00:00:00 2001 From: "borenet@google.com" Date: Mon, 20 Aug 2012 18:58:26 +0000 Subject: Enable 64-bit builds on Windows Encountered compile errors passing 64-bit size_t to SkIntToScalar and needed to make adjustments to gm/gradients.cpp and bench/PicturePlaybackBench.cpp. Verified on my local Linux, Mac, and Windows machines. As of this change, the skia_arch_width gyp define actually forces a 32/64-bit build on Linux, Mac, and Windows. Review URL: https://codereview.appspot.com/6460112 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@5195 2bbb7eff-a529-9590-31e7-b0007b416f81 --- common_conditions.gypi | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/common_conditions.gypi b/common_conditions.gypi index eff47bf..b9fa429 100644 --- a/common_conditions.gypi +++ b/common_conditions.gypi @@ -85,6 +85,14 @@ }, }, }, + 'conditions' : [ + ['skia_arch_width == 64', { + 'msvs_configuration_platform': 'x64' + }], + ['skia_arch_width == 32', { + 'msvs_configuration_platform': 'Win32', + }], + ], }, ], -- cgit v1.2.3 From 63f9ddde18f590419d053f70029e47ffb8386a6e Mon Sep 17 00:00:00 2001 From: "senorblanco@chromium.org" Date: Mon, 20 Aug 2012 19:23:24 +0000 Subject: Move SkColorFilterImageFilter into its own file. Review URL: https://codereview.appspot.com/6463072/ git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@5197 2bbb7eff-a529-9590-31e7-b0007b416f81 --- effects.gyp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/effects.gyp b/effects.gyp index dee73d6..004eb8e 100644 --- a/effects.gyp +++ b/effects.gyp @@ -18,6 +18,7 @@ '../include/effects/SkBlurMaskFilter.h', '../include/effects/SkColorMatrix.h', '../include/effects/SkColorMatrixFilter.h', + '../include/effects/SkColorFilterImageFilter.h', '../include/effects/SkCornerPathEffect.h', '../include/effects/SkDashPathEffect.h', '../include/effects/SkDiscretePathEffect.h', @@ -50,6 +51,7 @@ '../src/effects/SkBlurImageFilter.cpp', '../src/effects/SkBlurMaskFilter.cpp', '../src/effects/SkColorFilters.cpp', + '../src/effects/SkColorFilterImageFilter.cpp', '../src/effects/SkColorMatrix.cpp', '../src/effects/SkColorMatrixFilter.cpp', '../src/effects/SkCornerPathEffect.cpp', -- cgit v1.2.3 From f582cae63f949ff0aee2a0b36c6c54bd806cb461 Mon Sep 17 00:00:00 2001 From: "senorblanco@chromium.org" Date: Mon, 20 Aug 2012 20:56:26 +0000 Subject: Extract list of source files from effects.gyp into effects.gypi, as was done for core.gyp. This should make our lives easier when rolling DEPS. Review URL: https://codereview.appspot.com/6454172/ git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@5202 2bbb7eff-a529-9590-31e7-b0007b416f81 --- effects.gyp | 91 ++-------------------------------------------------- effects.gypi | 103 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 106 insertions(+), 88 deletions(-) create mode 100644 effects.gypi diff --git a/effects.gyp b/effects.gyp index 004eb8e..7ea732a 100644 --- a/effects.gyp +++ b/effects.gyp @@ -3,98 +3,13 @@ { 'target_name': 'effects', 'type': 'static_library', + 'includes': [ + 'effects.gypi', + ], 'include_dirs': [ '../include/effects', '../src/core', ], - 'sources': [ - '../include/effects/Sk1DPathEffect.h', - '../include/effects/Sk2DPathEffect.h', - '../include/effects/SkAvoidXfermode.h', - '../include/effects/SkArithmeticMode.h', - '../include/effects/SkBitmapSource.h', - '../include/effects/SkBlurDrawLooper.h', - '../include/effects/SkBlurImageFilter.h', - '../include/effects/SkBlurMaskFilter.h', - '../include/effects/SkColorMatrix.h', - '../include/effects/SkColorMatrixFilter.h', - '../include/effects/SkColorFilterImageFilter.h', - '../include/effects/SkCornerPathEffect.h', - '../include/effects/SkDashPathEffect.h', - '../include/effects/SkDiscretePathEffect.h', - '../include/effects/SkDrawExtraPathEffect.h', - '../include/effects/SkEmbossMaskFilter.h', - '../include/effects/SkGradientShader.h', - '../include/effects/SkKernel33MaskFilter.h', - '../include/effects/SkLayerDrawLooper.h', - '../include/effects/SkLayerRasterizer.h', - '../include/effects/SkLightingImageFilter.h', - '../include/effects/SkMorphologyImageFilter.h', - '../include/effects/SkPaintFlagsDrawFilter.h', - '../include/effects/SkPixelXorXfermode.h', - '../include/effects/SkPorterDuff.h', - '../include/effects/SkSingleInputImageFilter.h', - '../include/effects/SkStippleMaskFilter.h', - '../include/effects/SkTableColorFilter.h', - '../include/effects/SkTableMaskFilter.h', - '../include/effects/SkTransparentShader.h', - '../include/effects/SkMagnifierImageFilter.h', - - '../src/effects/Sk1DPathEffect.cpp', - '../src/effects/Sk2DPathEffect.cpp', - '../src/effects/SkAvoidXfermode.cpp', - '../src/effects/SkArithmeticMode.cpp', - '../src/effects/SkBitmapSource.cpp', - '../src/effects/SkBlurDrawLooper.cpp', - '../src/effects/SkBlurMask.cpp', - '../src/effects/SkBlurMask.h', - '../src/effects/SkBlurImageFilter.cpp', - '../src/effects/SkBlurMaskFilter.cpp', - '../src/effects/SkColorFilters.cpp', - '../src/effects/SkColorFilterImageFilter.cpp', - '../src/effects/SkColorMatrix.cpp', - '../src/effects/SkColorMatrixFilter.cpp', - '../src/effects/SkCornerPathEffect.cpp', - '../src/effects/SkDashPathEffect.cpp', - '../src/effects/SkDiscretePathEffect.cpp', - '../src/effects/SkEmbossMask.cpp', - '../src/effects/SkEmbossMask.h', - '../src/effects/SkEmbossMask_Table.h', - '../src/effects/SkEmbossMaskFilter.cpp', - '../src/effects/SkKernel33MaskFilter.cpp', - '../src/effects/SkLayerDrawLooper.cpp', - '../src/effects/SkLayerRasterizer.cpp', - '../src/effects/SkLightingImageFilter.cpp', - '../src/effects/SkMorphologyImageFilter.cpp', - '../src/effects/SkPaintFlagsDrawFilter.cpp', - '../src/effects/SkPixelXorXfermode.cpp', - '../src/effects/SkPorterDuff.cpp', - '../src/effects/SkSingleInputImageFilter.cpp', - '../src/effects/SkStippleMaskFilter.cpp', - '../src/effects/SkTableColorFilter.cpp', - '../src/effects/SkTableMaskFilter.cpp', - '../src/effects/SkTestImageFilters.cpp', - '../src/effects/SkTransparentShader.cpp', - '../src/effects/SkMagnifierImageFilter.cpp', - - '../src/effects/gradients/SkBitmapCache.cpp', - '../src/effects/gradients/SkBitmapCache.h', - '../src/effects/gradients/SkClampRange.cpp', - '../src/effects/gradients/SkClampRange.h', - '../src/effects/gradients/SkRadialGradient_Table.h', - '../src/effects/gradients/SkGradientShader.cpp', - '../src/effects/gradients/SkGradientShaderPriv.h', - '../src/effects/gradients/SkLinearGradient.cpp', - '../src/effects/gradients/SkLinearGradient.h', - '../src/effects/gradients/SkRadialGradient.cpp', - '../src/effects/gradients/SkRadialGradient.h', - '../src/effects/gradients/SkTwoPointRadialGradient.cpp', - '../src/effects/gradients/SkTwoPointRadialGradient.h', - '../src/effects/gradients/SkTwoPointConicalGradient.cpp', - '../src/effects/gradients/SkTwoPointConicalGradient.h', - '../src/effects/gradients/SkSweepGradient.cpp', - '../src/effects/gradients/SkSweepGradient.h', - ], 'direct_dependent_settings': { 'include_dirs': [ '../include/effects', diff --git a/effects.gypi b/effects.gypi new file mode 100644 index 0000000..b3e3f92 --- /dev/null +++ b/effects.gypi @@ -0,0 +1,103 @@ +# Include this gypi to include all 'effects' files +# The parent gyp/gypi file must define: +# 'skia_src_path' e.g. skia/trunk/src +# 'skia_include_path' e.g. skia/trunk/include +# +# The skia build defines these in common_variables.gypi. +# +{ + 'sources': [ + '<(skia_src_path)/effects/Sk1DPathEffect.cpp', + '<(skia_src_path)/effects/Sk2DPathEffect.cpp', + '<(skia_src_path)/effects/SkAvoidXfermode.cpp', + '<(skia_src_path)/effects/SkArithmeticMode.cpp', + '<(skia_src_path)/effects/SkBitmapSource.cpp', + '<(skia_src_path)/effects/SkBlurDrawLooper.cpp', + '<(skia_src_path)/effects/SkBlurMask.cpp', + '<(skia_src_path)/effects/SkBlurMask.h', + '<(skia_src_path)/effects/SkBlurImageFilter.cpp', + '<(skia_src_path)/effects/SkBlurMaskFilter.cpp', + '<(skia_src_path)/effects/SkColorFilters.cpp', + '<(skia_src_path)/effects/SkColorFilterImageFilter.cpp', + '<(skia_src_path)/effects/SkColorMatrix.cpp', + '<(skia_src_path)/effects/SkColorMatrixFilter.cpp', + '<(skia_src_path)/effects/SkCornerPathEffect.cpp', + '<(skia_src_path)/effects/SkDashPathEffect.cpp', + '<(skia_src_path)/effects/SkDiscretePathEffect.cpp', + '<(skia_src_path)/effects/SkEmbossMask.cpp', + '<(skia_src_path)/effects/SkEmbossMask.h', + '<(skia_src_path)/effects/SkEmbossMask_Table.h', + '<(skia_src_path)/effects/SkEmbossMaskFilter.cpp', + '<(skia_src_path)/effects/SkKernel33MaskFilter.cpp', + '<(skia_src_path)/effects/SkLayerDrawLooper.cpp', + '<(skia_src_path)/effects/SkLayerRasterizer.cpp', + '<(skia_src_path)/effects/SkLightingImageFilter.cpp', + '<(skia_src_path)/effects/SkMorphologyImageFilter.cpp', + '<(skia_src_path)/effects/SkPaintFlagsDrawFilter.cpp', + '<(skia_src_path)/effects/SkPixelXorXfermode.cpp', + '<(skia_src_path)/effects/SkPorterDuff.cpp', + '<(skia_src_path)/effects/SkSingleInputImageFilter.cpp', + '<(skia_src_path)/effects/SkStippleMaskFilter.cpp', + '<(skia_src_path)/effects/SkTableColorFilter.cpp', + '<(skia_src_path)/effects/SkTableMaskFilter.cpp', + '<(skia_src_path)/effects/SkTestImageFilters.cpp', + '<(skia_src_path)/effects/SkTransparentShader.cpp', + '<(skia_src_path)/effects/SkMagnifierImageFilter.cpp', + + '<(skia_src_path)/effects/gradients/SkBitmapCache.cpp', + '<(skia_src_path)/effects/gradients/SkBitmapCache.h', + '<(skia_src_path)/effects/gradients/SkClampRange.cpp', + '<(skia_src_path)/effects/gradients/SkClampRange.h', + '<(skia_src_path)/effects/gradients/SkRadialGradient_Table.h', + '<(skia_src_path)/effects/gradients/SkGradientShader.cpp', + '<(skia_src_path)/effects/gradients/SkGradientShaderPriv.h', + '<(skia_src_path)/effects/gradients/SkLinearGradient.cpp', + '<(skia_src_path)/effects/gradients/SkLinearGradient.h', + '<(skia_src_path)/effects/gradients/SkRadialGradient.cpp', + '<(skia_src_path)/effects/gradients/SkRadialGradient.h', + '<(skia_src_path)/effects/gradients/SkTwoPointRadialGradient.cpp', + '<(skia_src_path)/effects/gradients/SkTwoPointRadialGradient.h', + '<(skia_src_path)/effects/gradients/SkTwoPointConicalGradient.cpp', + '<(skia_src_path)/effects/gradients/SkTwoPointConicalGradient.h', + '<(skia_src_path)/effects/gradients/SkSweepGradient.cpp', + '<(skia_src_path)/effects/gradients/SkSweepGradient.h', + + ' Date: Mon, 20 Aug 2012 21:35:00 +0000 Subject: Fix typo in r5202, preventing include files from showing up. Build fix; unreviewed. git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@5205 2bbb7eff-a529-9590-31e7-b0007b416f81 --- effects.gypi | 62 ++++++++++++++++++++++++++++++------------------------------ 1 file changed, 31 insertions(+), 31 deletions(-) diff --git a/effects.gypi b/effects.gypi index b3e3f92..acae42a 100644 --- a/effects.gypi +++ b/effects.gypi @@ -62,37 +62,37 @@ '<(skia_src_path)/effects/gradients/SkSweepGradient.cpp', '<(skia_src_path)/effects/gradients/SkSweepGradient.h', - ' Date: Tue, 21 Aug 2012 13:13:52 +0000 Subject: shape ops work in progress working demo of old vs. new git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@5209 2bbb7eff-a529-9590-31e7-b0007b416f81 --- shapeops_demo.gyp | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/shapeops_demo.gyp b/shapeops_demo.gyp index cb1b743..2e594b1 100644 --- a/shapeops_demo.gyp +++ b/shapeops_demo.gyp @@ -15,6 +15,7 @@ '../experimental/Intersection/ConvexHull.cpp', '../experimental/Intersection/CubeRoot.cpp', '../experimental/Intersection/CubicBezierClip.cpp', + '../experimental/Intersection/CubicBounds.cpp', '../experimental/Intersection/CubicIntersection.cpp', '../experimental/Intersection/CubicReduceOrder.cpp', '../experimental/Intersection/CubicSubDivide.cpp', @@ -31,11 +32,15 @@ '../experimental/Intersection/LineQuadraticIntersection.cpp', '../experimental/Intersection/LineUtilities.cpp', '../experimental/Intersection/QuadraticBezierClip.cpp', + '../experimental/Intersection/QuadraticBounds.cpp', '../experimental/Intersection/QuadraticIntersection.cpp', '../experimental/Intersection/QuadraticReduceOrder.cpp', '../experimental/Intersection/QuadraticSubDivide.cpp', '../experimental/Intersection/QuadraticUtilities.cpp', - '../experimental/Intersection/CubicIntersection.h', + '../experimental/Intersection/Simplify.cpp', + '../experimental/Intersection/CubicParameterization.cpp', + '../experimental/Intersection/CubicReduceOrder.cpp', + '../experimental/Intersection/CubicSubDivide.cpp', '../experimental/Intersection/CubicUtilities.h', '../experimental/Intersection/CurveIntersection.h', '../experimental/Intersection/DataTypes.h', @@ -46,8 +51,11 @@ '../experimental/Intersection/LineIntersection.h', '../experimental/Intersection/LineParameters.h', '../experimental/Intersection/LineUtilities.h', + '../experimental/Intersection/QuadraticParameterization.cpp', + '../experimental/Intersection/QuadraticSubDivide.cpp', '../experimental/Intersection/QuadraticUtilities.h', '../experimental/Intersection/ShapeOps.h', + '../experimental/Intersection/Simplify.h', '../experimental/Intersection/TSearch.h', ], 'dependencies': [ -- cgit v1.2.3 From 72cb09d937e636168eb2a0246407b3fabec3606f Mon Sep 17 00:00:00 2001 From: "keyar@chromium.org" Date: Tue, 21 Aug 2012 19:05:08 +0000 Subject: Images are written by PictureRenderer and not render_pictures_main. Review URL: https://codereview.appspot.com/6448174 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@5216 2bbb7eff-a529-9590-31e7-b0007b416f81 --- tools.gyp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/tools.gyp b/tools.gyp index ca61453..347812f 100644 --- a/tools.gyp +++ b/tools.gyp @@ -76,7 +76,6 @@ ], 'dependencies': [ 'core.gyp:core', - 'images.gyp:images', 'ports.gyp:ports', 'tools.gyp:picture_renderer', 'tools.gyp:picture_utils', @@ -94,10 +93,8 @@ 'dependencies': [ 'core.gyp:core', 'ports.gyp:ports', - 'images.gyp:images', 'tools.gyp:picture_utils', 'tools.gyp:picture_benchmark', - 'bench.gyp:bench_timer', ], }, { @@ -132,8 +129,12 @@ ], 'dependencies': [ 'core.gyp:core', + 'images.gyp:images', 'tools.gyp:picture_utils', ], + 'export_dependent_settings': [ + 'images.gyp:images', + ], 'conditions': [ ['skia_gpu == 1', { 'dependencies': [ -- cgit v1.2.3 From 9f28d0b4d952cd1293031c598b5f6902eaca7af4 Mon Sep 17 00:00:00 2001 From: "scroggo@google.com" Date: Wed, 22 Aug 2012 15:00:05 +0000 Subject: When copying a bitmap, copy the generation ID. Review URL: https://codereview.appspot.com/6462084 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@5227 2bbb7eff-a529-9590-31e7-b0007b416f81 --- tests.gyp | 1 + 1 file changed, 1 insertion(+) diff --git a/tests.gyp b/tests.gyp index efb41f8..fa04dce 100644 --- a/tests.gyp +++ b/tests.gyp @@ -47,6 +47,7 @@ '../tests/GeometryTest.cpp', '../tests/GLInterfaceValidation.cpp', '../tests/GLProgramsTest.cpp', + '../tests/GpuBitmapCopyTest.cpp', '../tests/GrContextFactoryTest.cpp', '../tests/GradientTest.cpp', '../tests/GrMemoryPoolTest.cpp', -- cgit v1.2.3 From 7ca487c0f8426a88c6b6a65028dd4c74420d54a4 Mon Sep 17 00:00:00 2001 From: "senorblanco@chromium.org" Date: Wed, 22 Aug 2012 16:24:44 +0000 Subject: Implements the non-Porter-Duff compositing modes required for SVG's feBlend element. This filter has two inputs, since normal blending can't be used. The GPU side uses two filter stages to accomplish this: one to sample the background, and one to sample the foreground and blend it. Review URL: https://codereview.appspot.com/6463081/ git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@5231 2bbb7eff-a529-9590-31e7-b0007b416f81 --- effects.gypi | 2 ++ gmslides.gypi | 1 + 2 files changed, 3 insertions(+) diff --git a/effects.gypi b/effects.gypi index acae42a..164fc82 100644 --- a/effects.gypi +++ b/effects.gypi @@ -12,6 +12,7 @@ '<(skia_src_path)/effects/SkAvoidXfermode.cpp', '<(skia_src_path)/effects/SkArithmeticMode.cpp', '<(skia_src_path)/effects/SkBitmapSource.cpp', + '<(skia_src_path)/effects/SkBlendImageFilter.cpp', '<(skia_src_path)/effects/SkBlurDrawLooper.cpp', '<(skia_src_path)/effects/SkBlurMask.cpp', '<(skia_src_path)/effects/SkBlurMask.h', @@ -67,6 +68,7 @@ '<(skia_include_path)/effects/SkAvoidXfermode.h', '<(skia_include_path)/effects/SkArithmeticMode.h', '<(skia_include_path)/effects/SkBitmapSource.h', + '<(skia_include_path)/effects/SkBlendImageFilter.h', '<(skia_include_path)/effects/SkBlurDrawLooper.h', '<(skia_include_path)/effects/SkBlurImageFilter.h', '<(skia_include_path)/effects/SkBlurMaskFilter.h', diff --git a/gmslides.gypi b/gmslides.gypi index 324d143..e36abf5 100644 --- a/gmslides.gypi +++ b/gmslides.gypi @@ -9,6 +9,7 @@ '../gm/bitmapmatrix.cpp', '../gm/bitmapfilters.cpp', '../gm/bitmapscroll.cpp', + '../gm/blend.cpp', '../gm/blurs.cpp', '../gm/circles.cpp', '../gm/colormatrix.cpp', -- cgit v1.2.3 From c6c6937ccb0773db46c57b4905cebff802fe546a Mon Sep 17 00:00:00 2001 From: "senorblanco@chromium.org" Date: Wed, 22 Aug 2012 20:51:19 +0000 Subject: Move the code for the GPU implementation of morphology effects from GrContext and GrMorphologyEffect.* into SkMorphologyImageFilter.cpp. Review URL: https://codereview.appspot.com/6458065/ git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@5241 2bbb7eff-a529-9590-31e7-b0007b416f81 --- gpu.gyp | 2 -- 1 file changed, 2 deletions(-) diff --git a/gpu.gyp b/gpu.gyp index 4021f4f..11e1b69 100644 --- a/gpu.gyp +++ b/gpu.gyp @@ -317,8 +317,6 @@ '../src/gpu/effects/GrColorTableEffect.h', '../src/gpu/effects/GrConvolutionEffect.cpp', '../src/gpu/effects/GrConvolutionEffect.h', - '../src/gpu/effects/GrMorphologyEffect.cpp', - '../src/gpu/effects/GrMorphologyEffect.h', '../src/gpu/effects/GrSingleTextureEffect.cpp', '../src/gpu/effects/GrSingleTextureEffect.h', '../src/gpu/effects/GrTextureDomainEffect.cpp', -- cgit v1.2.3 From ab5427eb4f6eb5f7516b821c122562623be75333 Mon Sep 17 00:00:00 2001 From: "george@mozilla.com" Date: Thu, 23 Aug 2012 00:39:08 +0000 Subject: Split out SkFontHost_FreeType into common files Review URL: https://codereview.appspot.com/6442092 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@5246 2bbb7eff-a529-9590-31e7-b0007b416f81 --- ports.gyp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/ports.gyp b/ports.gyp index d9a7536..c286603 100644 --- a/ports.gyp +++ b/ports.gyp @@ -40,6 +40,7 @@ 'sources': [ '../src/ports/SkThread_pthread.cpp', '../src/ports/SkFontHost_FreeType.cpp', + '../src/ports/SkFontHost_FreeType_common.cpp', '../src/ports/SkFontHost_linux.cpp', ], }], @@ -52,6 +53,7 @@ '../src/ports/SkFontHost_mac_coretext.cpp', '../src/utils/mac/SkStream_mac.cpp', # '../src/ports/SkFontHost_FreeType.cpp', +# '../src/ports/SkFontHost_FreeType_common.cpp', # '../src/ports/SkFontHost_freetype_mac.cpp', '../src/ports/SkThread_pthread.cpp', ], @@ -106,6 +108,7 @@ '../src/ports/SkThread_pthread.cpp', '../src/ports/SkFontHost_android.cpp', '../src/ports/SkFontHost_FreeType.cpp', + '../src/ports/SkFontHost_FreeType_common.cpp', '../src/ports/FontHostConfiguration_android.cpp', #TODO: include the ports/SkImageRef_ashmem.cpp for non-NDK builds ], -- cgit v1.2.3 From e483d37a35a3fe7d9cc9cefc8cf50c62461efe31 Mon Sep 17 00:00:00 2001 From: "robertphillips@google.com" Date: Thu, 23 Aug 2012 11:13:48 +0000 Subject: Refactored GrDLinkedList into SkTDLinkedList http://codereview.appspot.com/6484045/ git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@5247 2bbb7eff-a529-9590-31e7-b0007b416f81 --- core.gypi | 1 + tests.gyp | 1 + 2 files changed, 2 insertions(+) diff --git a/core.gypi b/core.gypi index 3a36987..4595b6a 100644 --- a/core.gypi +++ b/core.gypi @@ -225,6 +225,7 @@ '<(skia_include_path)/core/SkTDArray.h', '<(skia_include_path)/core/SkTDStack.h', '<(skia_include_path)/core/SkTDict.h', + '<(skia_include_path)/core/SkTDLinkedList.h', '<(skia_include_path)/core/SkTRegistry.h', '<(skia_include_path)/core/SkTScopedPtr.h', '<(skia_include_path)/core/SkTSearch.h', diff --git a/tests.gyp b/tests.gyp index fa04dce..170250e 100644 --- a/tests.gyp +++ b/tests.gyp @@ -83,6 +83,7 @@ '../tests/SrcOverTest.cpp', '../tests/StreamTest.cpp', '../tests/StringTest.cpp', + '../tests/TDLinkedListTest.cpp', '../tests/Test.cpp', '../tests/Test.h', '../tests/TestSize.cpp', -- cgit v1.2.3 From 838e0fa68dfcece80522263fb25f4656b61bac3f Mon Sep 17 00:00:00 2001 From: "bsalomon@google.com" Date: Thu, 23 Aug 2012 12:55:01 +0000 Subject: Add gpu.gypi to ease skia->chrome rolls http://codereview.appspot.com/6486043/ git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@5250 2bbb7eff-a529-9590-31e7-b0007b416f81 --- gpu.gyp | 250 +++++-------------------------------------------------------- gpu.gypi | 258 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 277 insertions(+), 231 deletions(-) create mode 100644 gpu.gypi diff --git a/gpu.gyp b/gpu.gyp index 11e1b69..58a8ade 100644 --- a/gpu.gyp +++ b/gpu.gyp @@ -110,6 +110,9 @@ { 'target_name': 'skgr', 'type': 'static_library', + 'includes': [ + 'gpu.gypi', + ], 'include_dirs': [ '../include/config', '../include/core', @@ -124,42 +127,12 @@ 'angle.gyp:*', ], 'sources': [ - '../include/gpu/SkGpuCanvas.h', - '../include/gpu/SkGpuDevice.h', - '../include/gpu/SkGr.h', - '../include/gpu/SkGrPixelRef.h', - '../include/gpu/SkGrTexturePixelRef.h', - - '../include/gpu/gl/SkGLContext.h', - '../include/gpu/gl/SkMesaGLContext.h', - '../include/gpu/gl/SkANGLEGLContext.h', - '../include/gpu/gl/SkNativeGLContext.h', - '../include/gpu/gl/SkNullGLContext.h', - '../include/gpu/gl/SkDebugGLContext.h', - - '../src/gpu/SkGpuCanvas.cpp', - '../src/gpu/SkGpuDevice.cpp', - '../src/gpu/SkGr.cpp', - '../src/gpu/SkGrFontScaler.cpp', - '../src/gpu/SkGrPixelRef.cpp', - '../src/gpu/SkGrTexturePixelRef.cpp', - - '../src/gpu/gl/SkGLContext.cpp', - '../src/gpu/gl/SkNullGLContext.cpp', - - '../src/gpu/gl/debug/SkDebugGLContext.cpp', - - '../src/gpu/gl/mac/SkNativeGLContext_mac.cpp', - - '../src/gpu/gl/win/SkNativeGLContext_win.cpp', - - '../src/gpu/gl/unix/SkNativeGLContext_unix.cpp', - - '../src/gpu/gl/mesa/SkMesaGLContext.cpp', - '../src/gpu/gl/angle/SkANGLEGLContext.cpp', - '../src/gpu/gl/angle/GrGLCreateANGLEInterface.cpp', - - '../src/gpu/android/SkNativeGLContext_android.cpp', + '<@(skgr_sources)', + '<@(skgr_native_gl_sources)', + '<@(skgr_angle_gl_sources)', + '<@(skgr_mesa_gl_sources)', + '<@(skgr_debug_gl_sources)', + '<@(skgr_null_gl_sources)', ], 'conditions': [ [ 'not skia_mesa', { @@ -184,7 +157,10 @@ { 'target_name': 'gr', 'type': 'static_library', - 'include_dirs': [ + 'includes': [ + 'gpu.gypi', + ], + 'include_dirs': [ '../include/core', '../include/config', '../include/gpu', @@ -198,200 +174,12 @@ 'angle.gyp:*', ], 'sources': [ - '../include/gpu/GrAARectRenderer.h', - '../include/gpu/GrCacheID.h', - '../include/gpu/GrClipData.h', - '../include/gpu/GrColor.h', - '../include/gpu/GrConfig.h', - '../include/gpu/GrContext.h', - '../include/gpu/GrContextFactory.h', - '../include/gpu/GrCustomStage.h', - '../include/gpu/GrCustomStageUnitTest.h', - '../include/gpu/GrFontScaler.h', - '../include/gpu/GrGlyph.h', - '../include/gpu/GrInstanceCounter.h', - '../include/gpu/GrKey.h', - '../include/gpu/GrMatrix.h', - '../include/gpu/GrNoncopyable.h', - '../include/gpu/GrPaint.h', - '../include/gpu/GrPoint.h', - '../include/gpu/GrProgramStageFactory.h', - '../include/gpu/GrRect.h', - '../include/gpu/GrRefCnt.h', - '../include/gpu/GrRenderTarget.h', - '../include/gpu/GrResource.h', - '../include/gpu/GrSamplerState.h', - '../include/gpu/GrScalar.h', - '../include/gpu/GrSurface.h', - '../include/gpu/GrTextContext.h', - '../include/gpu/GrTexture.h', - '../include/gpu/GrTypes.h', - '../include/gpu/GrUserConfig.h', - - '../include/gpu/gl/GrGLConfig.h', - '../include/gpu/gl/GrGLConfig_chrome.h', - '../include/gpu/gl/GrGLFunctions.h', - '../include/gpu/gl/GrGLInterface.h', - - '../src/gpu/GrAAHairLinePathRenderer.cpp', - '../src/gpu/GrAAHairLinePathRenderer.h', - '../src/gpu/GrAAConvexPathRenderer.cpp', - '../src/gpu/GrAAConvexPathRenderer.h', - '../src/gpu/GrAARectRenderer.cpp', - '../src/gpu/GrAddPathRenderers_default.cpp', - '../src/gpu/GrAllocator.h', - '../src/gpu/GrAllocPool.h', - '../src/gpu/GrAllocPool.cpp', - '../src/gpu/GrAtlas.cpp', - '../src/gpu/GrAtlas.h', - '../src/gpu/GrBinHashKey.h', - '../src/gpu/GrBufferAllocPool.cpp', - '../src/gpu/GrBufferAllocPool.h', - '../src/gpu/GrCacheID.cpp', - '../src/gpu/GrClipData.cpp', - '../src/gpu/GrContext.cpp', - '../src/gpu/GrCustomStage.cpp', - '../src/gpu/GrDefaultPathRenderer.cpp', - '../src/gpu/GrDefaultPathRenderer.h', - '../src/gpu/GrDrawState.h', - '../src/gpu/GrDrawTarget.cpp', - '../src/gpu/GrDrawTarget.h', - '../src/gpu/GrGeometryBuffer.h', - '../src/gpu/GrClipMaskManager.h', - '../src/gpu/GrClipMaskManager.cpp', - '../src/gpu/GrGpu.cpp', - '../src/gpu/GrGpu.h', - '../src/gpu/GrGpuFactory.cpp', - '../src/gpu/GrGpuVertex.h', - '../src/gpu/GrIndexBuffer.h', - '../src/gpu/GrInOrderDrawBuffer.cpp', - '../src/gpu/GrInOrderDrawBuffer.h', - '../src/gpu/GrMatrix.cpp', - '../src/gpu/GrMemory.cpp', - '../src/gpu/GrMemoryPool.cpp', - '../src/gpu/GrMemoryPool.h', - '../src/gpu/GrPath.h', - '../src/gpu/GrPathRendererChain.cpp', - '../src/gpu/GrPathRendererChain.h', - '../src/gpu/GrPathRenderer.cpp', - '../src/gpu/GrPathRenderer.h', - '../src/gpu/GrPathUtils.cpp', - '../src/gpu/GrPathUtils.h', - '../src/gpu/GrPlotMgr.h', - '../src/gpu/GrRandom.h', - '../src/gpu/GrRectanizer.cpp', - '../src/gpu/GrRectanizer.h', - '../src/gpu/GrRedBlackTree.h', - '../src/gpu/GrRenderTarget.cpp', - '../src/gpu/GrResource.cpp', - '../src/gpu/GrResourceCache.cpp', - '../src/gpu/GrResourceCache.h', - '../src/gpu/GrStencil.cpp', - '../src/gpu/GrStencil.h', - '../src/gpu/GrStencilAndCoverPathRenderer.cpp', - '../src/gpu/GrStencilAndCoverPathRenderer.h', - '../src/gpu/GrStencilBuffer.cpp', - '../src/gpu/GrStencilBuffer.h', - '../src/gpu/GrTBSearch.h', - '../src/gpu/GrTDArray.h', - '../src/gpu/GrSWMaskHelper.cpp', - '../src/gpu/GrSWMaskHelper.h', - '../src/gpu/GrSoftwarePathRenderer.cpp', - '../src/gpu/GrSoftwarePathRenderer.h', - '../src/gpu/GrSurface.cpp', - '../src/gpu/GrTemplates.h', - '../src/gpu/GrTextContext.cpp', - '../src/gpu/GrTextStrike.cpp', - '../src/gpu/GrTextStrike.h', - '../src/gpu/GrTextStrike_impl.h', - '../src/gpu/GrTexture.cpp', - '../src/gpu/GrTHashCache.h', - '../src/gpu/GrTLList.h', - '../src/gpu/GrVertexBuffer.h', - '../src/gpu/gr_unittests.cpp', - - '../src/gpu/effects/Gr1DKernelEffect.h', - '../src/gpu/effects/GrTextureStripAtlas.h', - '../src/gpu/effects/GrTextureStripAtlas.cpp', - '../src/gpu/effects/GrColorTableEffect.cpp', - '../src/gpu/effects/GrColorTableEffect.h', - '../src/gpu/effects/GrConvolutionEffect.cpp', - '../src/gpu/effects/GrConvolutionEffect.h', - '../src/gpu/effects/GrSingleTextureEffect.cpp', - '../src/gpu/effects/GrSingleTextureEffect.h', - '../src/gpu/effects/GrTextureDomainEffect.cpp', - '../src/gpu/effects/GrTextureDomainEffect.h', - - '../src/gpu/gl/GrGLCaps.cpp', - '../src/gpu/gl/GrGLCaps.h', - '../src/gpu/gl/GrGLContextInfo.cpp', - '../src/gpu/gl/GrGLContextInfo.h', - '../src/gpu/gl/GrGLCreateNativeInterface_none.cpp', - '../src/gpu/gl/GrGLCreateNullInterface.cpp', - '../src/gpu/gl/GrGLDefaultInterface_none.cpp', - '../src/gpu/gl/GrGLDefaultInterface_native.cpp', - '../src/gpu/gl/GrGLDefines.h', - '../src/gpu/gl/GrGLIndexBuffer.cpp', - '../src/gpu/gl/GrGLIndexBuffer.h', - '../src/gpu/gl/GrGLInterface.cpp', - '../src/gpu/gl/GrGLIRect.h', - '../src/gpu/gl/GrGLPath.cpp', - '../src/gpu/gl/GrGLPath.h', - '../src/gpu/gl/GrGLProgram.cpp', - '../src/gpu/gl/GrGLProgram.h', - '../src/gpu/gl/GrGLProgramStage.cpp', - '../src/gpu/gl/GrGLProgramStage.h', - '../src/gpu/gl/GrGLRenderTarget.cpp', - '../src/gpu/gl/GrGLRenderTarget.h', - '../src/gpu/gl/GrGLShaderBuilder.cpp', - '../src/gpu/gl/GrGLShaderBuilder.h', - '../src/gpu/gl/GrGLShaderVar.h', - '../src/gpu/gl/GrGLSL.cpp', - '../src/gpu/gl/GrGLSL.h', - '../src/gpu/gl/GrGLStencilBuffer.cpp', - '../src/gpu/gl/GrGLStencilBuffer.h', - '../src/gpu/gl/GrGLTexture.cpp', - '../src/gpu/gl/GrGLTexture.h', - '../src/gpu/gl/GrGLUtil.cpp', - '../src/gpu/gl/GrGLUtil.h', - '../src/gpu/gl/GrGLUniformManager.cpp', - '../src/gpu/gl/GrGLUniformManager.h', - '../src/gpu/gl/GrGLUniformHandle.h', - '../src/gpu/gl/GrGLVertexBuffer.cpp', - '../src/gpu/gl/GrGLVertexBuffer.h', - '../src/gpu/gl/GrGpuGL.cpp', - '../src/gpu/gl/GrGpuGL.h', - '../src/gpu/gl/GrGpuGL_program.cpp', - - '../src/gpu/gl/debug/GrGLCreateDebugInterface.cpp', - '../src/gpu/gl/debug/GrFakeRefObj.h', - '../src/gpu/gl/debug/GrBufferObj.h', - '../src/gpu/gl/debug/GrBufferObj.cpp', - '../src/gpu/gl/debug/GrFBBindableObj.h', - '../src/gpu/gl/debug/GrRenderBufferObj.h', - '../src/gpu/gl/debug/GrTextureObj.h', - '../src/gpu/gl/debug/GrTextureObj.cpp', - '../src/gpu/gl/debug/GrTextureUnitObj.h', - '../src/gpu/gl/debug/GrTextureUnitObj.cpp', - '../src/gpu/gl/debug/GrFrameBufferObj.h', - '../src/gpu/gl/debug/GrFrameBufferObj.cpp', - '../src/gpu/gl/debug/GrShaderObj.h', - '../src/gpu/gl/debug/GrShaderObj.cpp', - '../src/gpu/gl/debug/GrProgramObj.h', - '../src/gpu/gl/debug/GrProgramObj.cpp', - '../src/gpu/gl/debug/GrDebugGL.h', - '../src/gpu/gl/debug/GrDebugGL.cpp', - - '../src/gpu/gl/mac/GrGLCreateNativeInterface_mac.cpp', - - '../src/gpu/gl/win/GrGLCreateNativeInterface_win.cpp', - - '../src/gpu/gl/unix/GrGLCreateNativeInterface_unix.cpp', - - '../src/gpu/gl/mesa/GrGLCreateMesaInterface.cpp', - '../src/gpu/gl/angle/GrGLCreateANGLEInterface.cpp', - - '../src/gpu/android/GrGLCreateNativeInterface_android.cpp', + '<@(gr_sources)', + '<@(gr_native_gl_sources)', + '<@(gr_angle_gl_sources)', + '<@(gr_mesa_gl_sources)', + '<@(gr_debug_gl_sources)', + '<@(gr_null_gl_sources)', ], 'defines': [ 'GR_IMPLEMENTATION=1', diff --git a/gpu.gypi b/gpu.gypi new file mode 100644 index 0000000..dd70cf0 --- /dev/null +++ b/gpu.gypi @@ -0,0 +1,258 @@ +# Include this gypi to include all 'gr' and 'skgr' files +# The parent gyp/gypi file must define +# 'skia_src_path' e.g. skia/trunk/src +# 'skia_include_path' e.g. skia/trunk/include +# +# The skia build defines these in common_variables.gypi +# +{ + 'variables': { + 'gr_sources': [ + '<(skia_include_path)/gpu/GrAARectRenderer.h', + '<(skia_include_path)/gpu/GrCacheID.h', + '<(skia_include_path)/gpu/GrClipData.h', + '<(skia_include_path)/gpu/GrColor.h', + '<(skia_include_path)/gpu/GrConfig.h', + '<(skia_include_path)/gpu/GrContext.h', + '<(skia_include_path)/gpu/GrContextFactory.h', + '<(skia_include_path)/gpu/GrCustomStage.h', + '<(skia_include_path)/gpu/GrCustomStageUnitTest.h', + '<(skia_include_path)/gpu/GrFontScaler.h', + '<(skia_include_path)/gpu/GrGlyph.h', + '<(skia_include_path)/gpu/GrInstanceCounter.h', + '<(skia_include_path)/gpu/GrKey.h', + '<(skia_include_path)/gpu/GrMatrix.h', + '<(skia_include_path)/gpu/GrNoncopyable.h', + '<(skia_include_path)/gpu/GrPaint.h', + '<(skia_include_path)/gpu/GrPoint.h', + '<(skia_include_path)/gpu/GrProgramStageFactory.h', + '<(skia_include_path)/gpu/GrRect.h', + '<(skia_include_path)/gpu/GrRefCnt.h', + '<(skia_include_path)/gpu/GrRenderTarget.h', + '<(skia_include_path)/gpu/GrResource.h', + '<(skia_include_path)/gpu/GrSamplerState.h', + '<(skia_include_path)/gpu/GrScalar.h', + '<(skia_include_path)/gpu/GrSurface.h', + '<(skia_include_path)/gpu/GrTextContext.h', + '<(skia_include_path)/gpu/GrTexture.h', + '<(skia_include_path)/gpu/GrTypes.h', + '<(skia_include_path)/gpu/GrUserConfig.h', + + '<(skia_include_path)/gpu/gl/GrGLConfig.h', + '<(skia_include_path)/gpu/gl/GrGLFunctions.h', + '<(skia_include_path)/gpu/gl/GrGLInterface.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/GrAARectRenderer.cpp', + '<(skia_src_path)/gpu/GrAddPathRenderers_default.cpp', + '<(skia_src_path)/gpu/GrAllocator.h', + '<(skia_src_path)/gpu/GrAllocPool.h', + '<(skia_src_path)/gpu/GrAllocPool.cpp', + '<(skia_src_path)/gpu/GrAtlas.cpp', + '<(skia_src_path)/gpu/GrAtlas.h', + '<(skia_src_path)/gpu/GrBinHashKey.h', + '<(skia_src_path)/gpu/GrBufferAllocPool.cpp', + '<(skia_src_path)/gpu/GrBufferAllocPool.h', + '<(skia_src_path)/gpu/GrCacheID.cpp', + '<(skia_src_path)/gpu/GrClipData.cpp', + '<(skia_src_path)/gpu/GrContext.cpp', + '<(skia_src_path)/gpu/GrCustomStage.cpp', + '<(skia_src_path)/gpu/GrDefaultPathRenderer.cpp', + '<(skia_src_path)/gpu/GrDefaultPathRenderer.h', + '<(skia_src_path)/gpu/GrDrawState.h', + '<(skia_src_path)/gpu/GrDrawTarget.cpp', + '<(skia_src_path)/gpu/GrDrawTarget.h', + '<(skia_src_path)/gpu/GrGeometryBuffer.h', + '<(skia_src_path)/gpu/GrClipMaskManager.h', + '<(skia_src_path)/gpu/GrClipMaskManager.cpp', + '<(skia_src_path)/gpu/GrGpu.cpp', + '<(skia_src_path)/gpu/GrGpu.h', + '<(skia_src_path)/gpu/GrGpuFactory.cpp', + '<(skia_src_path)/gpu/GrGpuVertex.h', + '<(skia_src_path)/gpu/GrIndexBuffer.h', + '<(skia_src_path)/gpu/GrInOrderDrawBuffer.cpp', + '<(skia_src_path)/gpu/GrInOrderDrawBuffer.h', + '<(skia_src_path)/gpu/GrMatrix.cpp', + '<(skia_src_path)/gpu/GrMemory.cpp', + '<(skia_src_path)/gpu/GrMemoryPool.cpp', + '<(skia_src_path)/gpu/GrMemoryPool.h', + '<(skia_src_path)/gpu/GrPath.h', + '<(skia_src_path)/gpu/GrPathRendererChain.cpp', + '<(skia_src_path)/gpu/GrPathRendererChain.h', + '<(skia_src_path)/gpu/GrPathRenderer.cpp', + '<(skia_src_path)/gpu/GrPathRenderer.h', + '<(skia_src_path)/gpu/GrPathUtils.cpp', + '<(skia_src_path)/gpu/GrPathUtils.h', + '<(skia_src_path)/gpu/GrPlotMgr.h', + '<(skia_src_path)/gpu/GrRandom.h', + '<(skia_src_path)/gpu/GrRectanizer.cpp', + '<(skia_src_path)/gpu/GrRectanizer.h', + '<(skia_src_path)/gpu/GrRedBlackTree.h', + '<(skia_src_path)/gpu/GrRenderTarget.cpp', + '<(skia_src_path)/gpu/GrResource.cpp', + '<(skia_src_path)/gpu/GrResourceCache.cpp', + '<(skia_src_path)/gpu/GrResourceCache.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/GrStencilBuffer.cpp', + '<(skia_src_path)/gpu/GrStencilBuffer.h', + '<(skia_src_path)/gpu/GrTBSearch.h', + '<(skia_src_path)/gpu/GrTDArray.h', + '<(skia_src_path)/gpu/GrSWMaskHelper.cpp', + '<(skia_src_path)/gpu/GrSWMaskHelper.h', + '<(skia_src_path)/gpu/GrSoftwarePathRenderer.cpp', + '<(skia_src_path)/gpu/GrSoftwarePathRenderer.h', + '<(skia_src_path)/gpu/GrSurface.cpp', + '<(skia_src_path)/gpu/GrTemplates.h', + '<(skia_src_path)/gpu/GrTextContext.cpp', + '<(skia_src_path)/gpu/GrTextStrike.cpp', + '<(skia_src_path)/gpu/GrTextStrike.h', + '<(skia_src_path)/gpu/GrTextStrike_impl.h', + '<(skia_src_path)/gpu/GrTexture.cpp', + '<(skia_src_path)/gpu/GrTHashCache.h', + '<(skia_src_path)/gpu/GrTLList.h', + '<(skia_src_path)/gpu/GrVertexBuffer.h', + '<(skia_src_path)/gpu/gr_unittests.cpp', + + '<(skia_src_path)/gpu/effects/Gr1DKernelEffect.h', + '<(skia_src_path)/gpu/effects/GrTextureStripAtlas.h', + '<(skia_src_path)/gpu/effects/GrTextureStripAtlas.cpp', + '<(skia_src_path)/gpu/effects/GrColorTableEffect.cpp', + '<(skia_src_path)/gpu/effects/GrColorTableEffect.h', + '<(skia_src_path)/gpu/effects/GrConvolutionEffect.cpp', + '<(skia_src_path)/gpu/effects/GrConvolutionEffect.h', + '<(skia_src_path)/gpu/effects/GrSingleTextureEffect.cpp', + '<(skia_src_path)/gpu/effects/GrSingleTextureEffect.h', + '<(skia_src_path)/gpu/effects/GrTextureDomainEffect.cpp', + '<(skia_src_path)/gpu/effects/GrTextureDomainEffect.h', + + '<(skia_src_path)/gpu/gl/GrGLCaps.cpp', + '<(skia_src_path)/gpu/gl/GrGLCaps.h', + '<(skia_src_path)/gpu/gl/GrGLContextInfo.cpp', + '<(skia_src_path)/gpu/gl/GrGLContextInfo.h', + '<(skia_src_path)/gpu/gl/GrGLCreateNativeInterface_none.cpp', + '<(skia_src_path)/gpu/gl/GrGLDefaultInterface_none.cpp', + '<(skia_src_path)/gpu/gl/GrGLDefines.h', + '<(skia_src_path)/gpu/gl/GrGLIndexBuffer.cpp', + '<(skia_src_path)/gpu/gl/GrGLIndexBuffer.h', + '<(skia_src_path)/gpu/gl/GrGLInterface.cpp', + '<(skia_src_path)/gpu/gl/GrGLIRect.h', + '<(skia_src_path)/gpu/gl/GrGLPath.cpp', + '<(skia_src_path)/gpu/gl/GrGLPath.h', + '<(skia_src_path)/gpu/gl/GrGLProgram.cpp', + '<(skia_src_path)/gpu/gl/GrGLProgram.h', + '<(skia_src_path)/gpu/gl/GrGLProgramStage.cpp', + '<(skia_src_path)/gpu/gl/GrGLProgramStage.h', + '<(skia_src_path)/gpu/gl/GrGLRenderTarget.cpp', + '<(skia_src_path)/gpu/gl/GrGLRenderTarget.h', + '<(skia_src_path)/gpu/gl/GrGLShaderBuilder.cpp', + '<(skia_src_path)/gpu/gl/GrGLShaderBuilder.h', + '<(skia_src_path)/gpu/gl/GrGLShaderVar.h', + '<(skia_src_path)/gpu/gl/GrGLSL.cpp', + '<(skia_src_path)/gpu/gl/GrGLSL.h', + '<(skia_src_path)/gpu/gl/GrGLStencilBuffer.cpp', + '<(skia_src_path)/gpu/gl/GrGLStencilBuffer.h', + '<(skia_src_path)/gpu/gl/GrGLTexture.cpp', + '<(skia_src_path)/gpu/gl/GrGLTexture.h', + '<(skia_src_path)/gpu/gl/GrGLUtil.cpp', + '<(skia_src_path)/gpu/gl/GrGLUtil.h', + '<(skia_src_path)/gpu/gl/GrGLUniformManager.cpp', + '<(skia_src_path)/gpu/gl/GrGLUniformManager.h', + '<(skia_src_path)/gpu/gl/GrGLUniformHandle.h', + '<(skia_src_path)/gpu/gl/GrGLVertexBuffer.cpp', + '<(skia_src_path)/gpu/gl/GrGLVertexBuffer.h', + '<(skia_src_path)/gpu/gl/GrGpuGL.cpp', + '<(skia_src_path)/gpu/gl/GrGpuGL.h', + '<(skia_src_path)/gpu/gl/GrGpuGL_program.cpp', + ], + 'gr_native_gl_sources': [ + '<(skia_src_path)/gpu/gl/GrGLDefaultInterface_native.cpp', + '<(skia_src_path)/gpu/gl/mac/GrGLCreateNativeInterface_mac.cpp', + '<(skia_src_path)/gpu/gl/win/GrGLCreateNativeInterface_win.cpp', + '<(skia_src_path)/gpu/gl/unix/GrGLCreateNativeInterface_unix.cpp', + '<(skia_src_path)/gpu/android/GrGLCreateNativeInterface_android.cpp', + ], + 'gr_mesa_gl_sources': [ + '<(skia_src_path)/gpu/gl/mesa/GrGLCreateMesaInterface.cpp', + ], + 'gr_angle_gl_sources': [ + '<(skia_src_path)/gpu/gl/angle/GrGLCreateANGLEInterface.cpp', + ], + 'gr_debug_gl_sources': [ + '<(skia_src_path)/gpu/gl/debug/GrGLCreateDebugInterface.cpp', + '<(skia_src_path)/gpu/gl/debug/GrFakeRefObj.h', + '<(skia_src_path)/gpu/gl/debug/GrBufferObj.h', + '<(skia_src_path)/gpu/gl/debug/GrBufferObj.cpp', + '<(skia_src_path)/gpu/gl/debug/GrFBBindableObj.h', + '<(skia_src_path)/gpu/gl/debug/GrRenderBufferObj.h', + '<(skia_src_path)/gpu/gl/debug/GrTextureObj.h', + '<(skia_src_path)/gpu/gl/debug/GrTextureObj.cpp', + '<(skia_src_path)/gpu/gl/debug/GrTextureUnitObj.h', + '<(skia_src_path)/gpu/gl/debug/GrTextureUnitObj.cpp', + '<(skia_src_path)/gpu/gl/debug/GrFrameBufferObj.h', + '<(skia_src_path)/gpu/gl/debug/GrFrameBufferObj.cpp', + '<(skia_src_path)/gpu/gl/debug/GrShaderObj.h', + '<(skia_src_path)/gpu/gl/debug/GrShaderObj.cpp', + '<(skia_src_path)/gpu/gl/debug/GrProgramObj.h', + '<(skia_src_path)/gpu/gl/debug/GrProgramObj.cpp', + '<(skia_src_path)/gpu/gl/debug/GrDebugGL.h', + '<(skia_src_path)/gpu/gl/debug/GrDebugGL.cpp', + ], + 'gr_null_gl_sources': [ + '<(skia_src_path)/gpu/gl/GrGLCreateNullInterface.cpp', + ], + + 'skgr_sources': [ + '<(skia_include_path)/gpu/SkGpuCanvas.h', + '<(skia_include_path)/gpu/SkGpuDevice.h', + '<(skia_include_path)/gpu/SkGr.h', + '<(skia_include_path)/gpu/SkGrPixelRef.h', + '<(skia_include_path)/gpu/SkGrTexturePixelRef.h', + + '<(skia_include_path)/gpu/gl/SkGLContext.h', + + '<(skia_src_path)/gpu/SkGpuCanvas.cpp', + '<(skia_src_path)/gpu/SkGpuDevice.cpp', + '<(skia_src_path)/gpu/SkGr.cpp', + '<(skia_src_path)/gpu/SkGrFontScaler.cpp', + '<(skia_src_path)/gpu/SkGrPixelRef.cpp', + '<(skia_src_path)/gpu/SkGrTexturePixelRef.cpp', + + '<(skia_src_path)/gpu/gl/SkGLContext.cpp' + ], + 'skgr_native_gl_sources': [ + '<(skia_include_path)/gpu/gl/SkNativeGLContext.h', + '<(skia_src_path)/gpu/gl/mac/SkNativeGLContext_mac.cpp', + '<(skia_src_path)/gpu/gl/win/SkNativeGLContext_win.cpp', + '<(skia_src_path)/gpu/gl/unix/SkNativeGLContext_unix.cpp', + '<(skia_src_path)/gpu/android/SkNativeGLContext_android.cpp', + ], + 'skgr_angle_gl_sources': [ + '<(skia_include_path)/gpu/gl/SkANGLEGLContext.h', + '<(skia_src_path)/gpu/gl/angle/SkANGLEGLContext.cpp', + ], + 'skgr_mesa_gl_sources': [ + '<(skia_include_path)/gpu/gl/SkMesaGLContext.h', + '<(skia_src_path)/gpu/gl/mesa/SkMesaGLContext.cpp', + ], + 'skgr_debug_gl_sources': [ + '<(skia_include_path)/gpu/gl/SkDebugGLContext.h', + '<(skia_src_path)/gpu/gl/debug/SkDebugGLContext.cpp', + ], + 'skgr_null_gl_sources': [ + '<(skia_include_path)/gpu/gl/SkNullGLContext.h', + '<(skia_src_path)/gpu/gl/SkNullGLContext.cpp', + ], + }, +} + +# Local Variables: +# tab-width:2 +# indent-tabs-mode:nil +# End: +# vim: set expandtab tabstop=2 shiftwidth=2: -- cgit v1.2.3 From 436b0dd429473a7f1e445755ffc6ac68f392b42a Mon Sep 17 00:00:00 2001 From: "rmistry@google.com" Date: Thu, 23 Aug 2012 18:14:13 +0000 Subject: Result of running tools/sanitize_source_files.py (which was added in https://codereview.appspot.com/6465078/) This CL is part II of IV (I broke down the 1280 files into 4 CLs). Review URL: https://codereview.appspot.com/6474054 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@5263 2bbb7eff-a529-9590-31e7-b0007b416f81 --- FileReaderApp.gyp | 2 +- SampleApp.gyp | 8 ++++---- SimpleCocoaApp.gyp | 4 ++-- android_deps.gyp | 10 +++++----- android_system.gyp | 10 +++++----- bench.gypi | 2 +- common_variables.gypi | 2 +- gm.gyp | 2 +- gpu.gyp | 2 +- iOSSampleApp.gyp | 12 ++++++------ ports.gyp | 2 +- shapeops_demo.gyp | 2 +- utils.gyp | 2 +- 13 files changed, 30 insertions(+), 30 deletions(-) diff --git a/FileReaderApp.gyp b/FileReaderApp.gyp index 545eff2..b56460b 100644 --- a/FileReaderApp.gyp +++ b/FileReaderApp.gyp @@ -4,7 +4,7 @@ 'target_name': 'FileReaderApp', 'type': 'executable', 'mac_bundle' : 1, - + 'include_dirs' : [ '../include/pipe', '../experimental/FileReaderApp', diff --git a/SampleApp.gyp b/SampleApp.gyp index 23ab8a7..0d65e8b 100644 --- a/SampleApp.gyp +++ b/SampleApp.gyp @@ -104,7 +104,7 @@ '../samplecode/SampleXfermodes.cpp', '../samplecode/SampleXfermodesBlur.cpp', '../samplecode/TransitionView.cpp', - + # DrawingBoard #'../experimental/DrawingBoard/SkColorPalette.h', #'../experimental/DrawingBoard/SkColorPalette.cpp', @@ -112,12 +112,12 @@ #'../experimental/DrawingBoard/SkNetPipeController.cpp', #'../experimental/DrawingBoard/SampleDrawingClient.cpp', #'../experimental/DrawingBoard/SampleDrawingServer.cpp', - + # Networking #'../experimental/Networking/SampleNetPipeReader.cpp', #'../experimental/Networking/SkSockets.cpp', #'../experimental/Networking/SkSockets.h', - + # Debugger '../experimental/Debugger/DebuggerViews.h', '../experimental/Debugger/DebuggerContentView.cpp', @@ -173,7 +173,7 @@ '../src/views/mac/SampleAppDelegate.mm', '../src/views/mac/SkSampleNSView.h', '../src/views/mac/SkSampleNSView.mm', - + # Mac files '../src/views/mac/SkEventNotifier.h', '../src/views/mac/SkEventNotifier.mm', diff --git a/SimpleCocoaApp.gyp b/SimpleCocoaApp.gyp index f20c444..dd02c41 100644 --- a/SimpleCocoaApp.gyp +++ b/SimpleCocoaApp.gyp @@ -18,11 +18,11 @@ '../src/views/mac/SkOSWindow_Mac.mm', '../src/views/mac/SkTextFieldCell.h', '../src/views/mac/SkTextFieldCell.m', - + '../experimental/SimpleCocoaApp/SimpleApp-Info.plist', '../experimental/SimpleCocoaApp/SimpleApp.h', '../experimental/SimpleCocoaApp/SimpleApp.mm', - + ], 'dependencies': [ 'core.gyp:core', diff --git a/android_deps.gyp b/android_deps.gyp index 122f2c3..ea7bbf2 100644 --- a/android_deps.gyp +++ b/android_deps.gyp @@ -1,18 +1,18 @@ # This GYP file stores the dependencies necessary to build Skia on the Android # platform. The OS doesn't provide many stable libraries as part of the -# distribution so we have to build a few of them ourselves. +# distribution so we have to build a few of them ourselves. # -# We tried adding this gyp file to the android directory at the root of +# We tried adding this gyp file to the android directory at the root of # the Skia repo, but that resulted in the generated makefiles being created # outside of the intended output directory. So to avoid this we created a simple # shim here that includes the android_deps.gypi file. The actual dependencies -# are defined and maintained in that gypi file. -# +# are defined and maintained in that gypi file. +# # Also this assumes that the android directory is a sibling to the directory # that contains your primary Skia checkout. If it is not then you must manually # edit the includes below to specify the actual location of the android.gypi. # This is due to the fact that we cannot use variables in an includes as the -# variable expansion step for gyp happens after the includes are processed. +# variable expansion step for gyp happens after the includes are processed. { 'includes': [ '../../android/gyp/dependencies.gypi', diff --git a/android_system.gyp b/android_system.gyp index bbc1e69..a2a9a0a 100644 --- a/android_system.gyp +++ b/android_system.gyp @@ -1,18 +1,18 @@ # This GYP file stores the dependencies necessary to build Skia on the Android # platform. The OS doesn't provide many stable libraries as part of the -# distribution so we have to build a few of them ourselves. +# distribution so we have to build a few of them ourselves. # -# We tried adding this gyp file to the android directory at the root of +# We tried adding this gyp file to the android directory at the root of # the Skia repo, but that resulted in the generated makefiles being created # outside of the intended output directory. So to avoid this we created a simple # shim here that includes the android_system.gypi file. The actual dependencies -# are defined and maintained in that gypi file. -# +# are defined and maintained in that gypi file. +# # Also this assumes that the android directory is a sibling to the directory # that contains your primary Skia checkout. If it is not then you must manually # edit the includes below to specify the actual location of the android.gypi. # This is due to the fact that we cannot use variables in an includes as the -# variable expansion step for gyp happens after the includes are processed. +# variable expansion step for gyp happens after the includes are processed. { 'includes': [ '../../android/gyp/android.gypi', diff --git a/bench.gypi b/bench.gypi index 5d2730d..26d8b36 100644 --- a/bench.gypi +++ b/bench.gypi @@ -9,7 +9,7 @@ '../bench/AAClipBench.cpp', '../bench/BitmapBench.cpp', '../bench/BlurBench.cpp', - '../bench/ChecksumBench.cpp', + '../bench/ChecksumBench.cpp', '../bench/ChromeBench.cpp', '../bench/DashBench.cpp', '../bench/DecodeBench.cpp', diff --git a/common_variables.gypi b/common_variables.gypi index 247fe74..79c6ee5 100644 --- a/common_variables.gypi +++ b/common_variables.gypi @@ -101,4 +101,4 @@ # tab-width:2 # indent-tabs-mode:nil # End: -# vim: set expandtab tabstop=2 shiftwidth=2: \ No newline at end of file +# vim: set expandtab tabstop=2 shiftwidth=2: diff --git a/gm.gyp b/gm.gyp index 13f1976..f519824 100644 --- a/gm.gyp +++ b/gm.gyp @@ -27,7 +27,7 @@ 'images.gyp:images', 'pdf.gyp:pdf', 'ports.gyp:ports', - 'utils.gyp:utils', + 'utils.gyp:utils', ], 'conditions': [ ['skia_os == "mac"', { diff --git a/gpu.gyp b/gpu.gyp index 58a8ade..7228758 100644 --- a/gpu.gyp +++ b/gpu.gyp @@ -176,7 +176,7 @@ 'sources': [ '<@(gr_sources)', '<@(gr_native_gl_sources)', - '<@(gr_angle_gl_sources)', + '<@(gr_angle_gl_sources)', '<@(gr_mesa_gl_sources)', '<@(gr_debug_gl_sources)', '<@(gr_null_gl_sources)', diff --git a/iOSSampleApp.gyp b/iOSSampleApp.gyp index 6da247c..f9c8a58 100644 --- a/iOSSampleApp.gyp +++ b/iOSSampleApp.gyp @@ -111,11 +111,11 @@ '../samplecode/SampleVertices.cpp', '../samplecode/SampleXfermodes.cpp', '../samplecode/SampleXfermodesBlur.cpp', - + # Dependencies for the pipe code in SampleApp '../src/pipe/SkGPipeRead.cpp', '../src/pipe/SkGPipeWrite.cpp', - + # DrawingBoard '../experimental/DrawingBoard/SkColorPalette.h', '../experimental/DrawingBoard/SkColorPalette.cpp', @@ -123,12 +123,12 @@ '../experimental/DrawingBoard/SkNetPipeController.cpp', '../experimental/DrawingBoard/SampleDrawingClient.cpp', '../experimental/DrawingBoard/SampleDrawingServer.cpp', - + # Networking '../experimental/Networking/SampleNetPipeReader.cpp', '../experimental/Networking/SkSockets.cpp', '../experimental/Networking/SkSockets.h', - + # Transition '../src/utils/SkInterpolator.cpp', '../include/utils/SkInterpolator.h', @@ -192,14 +192,14 @@ '../experimental/iOSSampleApp/Shared/SkUIDetailViewController.h', '../experimental/iOSSampleApp/Shared/SkUIDetailViewController.mm', '../experimental/iOSSampleApp/Shared/main.m', - + # iPad '../experimental/iOSSampleApp/iPad/AppDelegate_iPad.h', '../experimental/iOSSampleApp/iPad/AppDelegate_iPad.mm', '../experimental/iOSSampleApp/iPad/SkUISplitViewController.h', '../experimental/iOSSampleApp/iPad/SkUISplitViewController.mm', '../experimental/iOSSampleApp/iPad/MainWindow_iPad.xib', - + # iPhone '../experimental/iOSSampleApp/iPhone/AppDelegate_iPhone.h', '../experimental/iOSSampleApp/iPhone/AppDelegate_iPhone.mm', diff --git a/ports.gyp b/ports.gyp index c286603..34c0540 100644 --- a/ports.gyp +++ b/ports.gyp @@ -116,7 +116,7 @@ 'android_deps.gyp:ft2', 'android_deps.gyp:expat', ], - }], + }], ], 'direct_dependent_settings': { 'include_dirs': [ diff --git a/shapeops_demo.gyp b/shapeops_demo.gyp index 2e594b1..910e2ec 100644 --- a/shapeops_demo.gyp +++ b/shapeops_demo.gyp @@ -78,7 +78,7 @@ }], [ 'skia_os == "mac"', { 'sources': [ - + # Mac files '../src/views/mac/SkEventNotifier.h', '../src/views/mac/SkEventNotifier.mm', diff --git a/utils.gyp b/utils.gyp index b4b8785..9cfe46e 100644 --- a/utils.gyp +++ b/utils.gyp @@ -73,7 +73,7 @@ #mac '../include/utils/mac/SkCGUtils.h', '../src/utils/mac/SkCreateCGImageRef.cpp', - + #windows '../include/utils/win/SkAutoCoInitialize.h', '../include/utils/win/SkHRESULT.h', -- cgit v1.2.3 -- cgit v1.2.3 From 7225c1d4bb89271adaa96a37cd3153bc433d9c6d Mon Sep 17 00:00:00 2001 From: "bsalomon@google.com" Date: Thu, 23 Aug 2012 19:18:29 +0000 Subject: Make gpu.gypi show up in IDE projects Review URL: http://codereview.appspot.com/6481053/ git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@5270 2bbb7eff-a529-9590-31e7-b0007b416f81 --- gpu.gyp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/gpu.gyp b/gpu.gyp index 7228758..172f84e 100644 --- a/gpu.gyp +++ b/gpu.gyp @@ -133,6 +133,7 @@ '<@(skgr_mesa_gl_sources)', '<@(skgr_debug_gl_sources)', '<@(skgr_null_gl_sources)', + 'gpu.gypi', ], 'conditions': [ [ 'not skia_mesa', { @@ -180,6 +181,7 @@ '<@(gr_mesa_gl_sources)', '<@(gr_debug_gl_sources)', '<@(gr_null_gl_sources)', + 'gpu.gypi', ], 'defines': [ 'GR_IMPLEMENTATION=1', -- cgit v1.2.3 From 8d5347be88733f5f42184c8ad7a29eb33a28d865 Mon Sep 17 00:00:00 2001 From: "bungeman@google.com" Date: Fri, 24 Aug 2012 17:46:11 +0000 Subject: Fix greenish text rendering on Linux. https://codereview.appspot.com/6484048/ git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@5280 2bbb7eff-a529-9590-31e7-b0007b416f81 --- core.gyp | 1 - ports.gyp | 17 +++++++++++++++++ 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/core.gyp b/core.gyp index 47a46ac..806626a 100644 --- a/core.gyp +++ b/core.gyp @@ -27,7 +27,6 @@ ], 'link_settings': { 'libraries': [ - '-lfreetype', '-lpthread', ], }, diff --git a/ports.gyp b/ports.gyp index 34c0540..f070ac6 100644 --- a/ports.gyp +++ b/ports.gyp @@ -37,12 +37,23 @@ ], 'conditions': [ [ 'skia_os in ["linux", "freebsd", "openbsd", "solaris"]', { + 'defines': [ + #The font host requires at least FreeType 2.3.0 at runtime. + 'SK_FONTHOST_FREETYPE_RUNTIME_VERSION=0x020300', + 'SK_CAN_USE_DLOPEN=1', + ], 'sources': [ '../src/ports/SkThread_pthread.cpp', '../src/ports/SkFontHost_FreeType.cpp', '../src/ports/SkFontHost_FreeType_common.cpp', '../src/ports/SkFontHost_linux.cpp', ], + 'link_settings': { + 'libraries': [ + '-lfreetype', + '-ldl', + ], + }, }], [ 'skia_os == "mac"', { 'include_dirs': [ @@ -100,6 +111,12 @@ ], }], [ 'skia_os == "android"', { + 'defines': [ + #Android provides at least FreeType 2.4.0 at runtime. + 'SK_FONTHOST_FREETYPE_RUNTIME_VERSION=0x020400', + #Skia should not use dlopen on Android. + 'SK_CAN_USE_DLOPEN=0', + ], 'sources!': [ '../src/ports/SkDebug_stdio.cpp', ], -- cgit v1.2.3 From 8818e579fc7f536a5f47209cde1d40d596165075 Mon Sep 17 00:00:00 2001 From: "bsalomon@google.com" Date: Mon, 27 Aug 2012 12:53:13 +0000 Subject: Do premul and r/b swap conversions in a custom effect Review URL: https://codereview.appspot.com/6473060/ git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@5284 2bbb7eff-a529-9590-31e7-b0007b416f81 --- gpu.gypi | 2 ++ 1 file changed, 2 insertions(+) diff --git a/gpu.gypi b/gpu.gypi index dd70cf0..af8bfe7 100644 --- a/gpu.gypi +++ b/gpu.gypi @@ -124,6 +124,8 @@ '<(skia_src_path)/gpu/effects/GrTextureStripAtlas.cpp', '<(skia_src_path)/gpu/effects/GrColorTableEffect.cpp', '<(skia_src_path)/gpu/effects/GrColorTableEffect.h', + '<(skia_src_path)/gpu/effects/GrConfigConversionEffect.cpp', + '<(skia_src_path)/gpu/effects/GrConfigConversionEffect.h', '<(skia_src_path)/gpu/effects/GrConvolutionEffect.cpp', '<(skia_src_path)/gpu/effects/GrConvolutionEffect.h', '<(skia_src_path)/gpu/effects/GrSingleTextureEffect.cpp', -- cgit v1.2.3 From b7558494349652326c81ebb683e215201b7501b2 Mon Sep 17 00:00:00 2001 From: "caryclark@google.com" Date: Mon, 27 Aug 2012 14:11:33 +0000 Subject: shape ops work in progress add copyrights everywhere start working on quadratic line segments (for quad intersection) git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@5286 2bbb7eff-a529-9590-31e7-b0007b416f81 --- shapeops_demo.gyp | 5 +++-- shapeops_edge.gyp | 2 ++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/shapeops_demo.gyp b/shapeops_demo.gyp index 910e2ec..b7c00f3 100644 --- a/shapeops_demo.gyp +++ b/shapeops_demo.gyp @@ -34,6 +34,8 @@ '../experimental/Intersection/QuadraticBezierClip.cpp', '../experimental/Intersection/QuadraticBounds.cpp', '../experimental/Intersection/QuadraticIntersection.cpp', + '../experimental/Intersection/QuadraticLineSegments.cpp', + '../experimental/Intersection/QuadraticParameterization.cpp', '../experimental/Intersection/QuadraticReduceOrder.cpp', '../experimental/Intersection/QuadraticSubDivide.cpp', '../experimental/Intersection/QuadraticUtilities.cpp', @@ -51,8 +53,7 @@ '../experimental/Intersection/LineIntersection.h', '../experimental/Intersection/LineParameters.h', '../experimental/Intersection/LineUtilities.h', - '../experimental/Intersection/QuadraticParameterization.cpp', - '../experimental/Intersection/QuadraticSubDivide.cpp', + '../experimental/Intersection/QuadraticLineSegments.h', '../experimental/Intersection/QuadraticUtilities.h', '../experimental/Intersection/ShapeOps.h', '../experimental/Intersection/Simplify.h', diff --git a/shapeops_edge.gyp b/shapeops_edge.gyp index 55ec5fd..8715576 100644 --- a/shapeops_edge.gyp +++ b/shapeops_edge.gyp @@ -59,6 +59,7 @@ '../experimental/Intersection/QuadraticIntersection.cpp', '../experimental/Intersection/QuadraticIntersection_Test.cpp', '../experimental/Intersection/QuadraticIntersection_TestData.cpp', + '../experimental/Intersection/QuadraticLineSegments.cpp', '../experimental/Intersection/QuadraticParameterization.cpp', '../experimental/Intersection/QuadraticParameterization_Test.cpp', '../experimental/Intersection/QuadraticReduceOrder.cpp', @@ -88,6 +89,7 @@ '../experimental/Intersection/LineUtilities.h', '../experimental/Intersection/Parameterization_Test.h', '../experimental/Intersection/QuadraticIntersection_TestData.h', + '../experimental/Intersection/QuadraticLineSegments.h', '../experimental/Intersection/QuadraticUtilities.h', '../experimental/Intersection/ShapeOps.h', '../experimental/Intersection/Simplify.h', -- cgit v1.2.3 From 7195e26e2a880c6dddb6a1f27ac74b023bf1b0fb Mon Sep 17 00:00:00 2001 From: "reed@google.com" Date: Tue, 28 Aug 2012 12:19:02 +0000 Subject: Add caching of the snapshot image form a surface Notify the surface when the canvas draws into it, so it can invalidate the cached image, and (if needed) perform a copy-on-write on the surface if it was being shared with the image. Review URL: https://codereview.appspot.com/6441115 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@5306 2bbb7eff-a529-9590-31e7-b0007b416f81 --- core.gyp | 1 + core.gypi | 13 +++++++++++++ gmslides.gypi | 1 + 3 files changed, 15 insertions(+) diff --git a/core.gyp b/core.gyp index 806626a..e23572a 100644 --- a/core.gyp +++ b/core.gyp @@ -17,6 +17,7 @@ '../include/ports', '../include/xml', '../src/core', + '../src/image', ], 'msvs_disabled_warnings': [4244, 4267,4345, 4390, 4554, 4800], 'conditions': [ diff --git a/core.gypi b/core.gypi index 4595b6a..99227a3 100644 --- a/core.gypi +++ b/core.gypi @@ -160,6 +160,19 @@ '<(skia_src_path)/core/SkUtils.cpp', '<(skia_src_path)/core/SkWriter32.cpp', '<(skia_src_path)/core/SkXfermode.cpp', + + '<(skia_src_path)/image/SkDataPixelRef.cpp', + '<(skia_src_path)/image/SkImage.cpp', + '<(skia_src_path)/image/SkImagePriv.cpp', + '<(skia_src_path)/image/SkImage_Codec.cpp', +# '<(skia_src_path)/image/SkImage_Gpu.cpp', + '<(skia_src_path)/image/SkImage_Picture.cpp', + '<(skia_src_path)/image/SkImage_Raster.cpp', + '<(skia_src_path)/image/SkSurface.cpp', +# '<(skia_src_path)/image/SkSurface_Gpu.cpp', + '<(skia_src_path)/image/SkSurface_Picture.cpp', + '<(skia_src_path)/image/SkSurface_Raster.cpp', + '<(skia_src_path)/pipe/SkGPipeRead.cpp', '<(skia_src_path)/pipe/SkGPipeWrite.cpp', diff --git a/gmslides.gypi b/gmslides.gypi index e36abf5..d80c123 100644 --- a/gmslides.gypi +++ b/gmslides.gypi @@ -39,6 +39,7 @@ '../gm/imageblur.cpp', '../gm/imagemagnifier.cpp', '../gm/lighting.cpp', + '../gm/image.cpp', '../gm/imagefiltersbase.cpp', '../gm/imagefiltersgraph.cpp', '../gm/lcdtext.cpp', -- cgit v1.2.3 From 2180dc2c43bcdfcb92032a96b4dcdd4a93d0b98a Mon Sep 17 00:00:00 2001 From: "robertphillips@google.com" Date: Wed, 29 Aug 2012 12:52:05 +0000 Subject: Moved GrClipMaskCache to its own files https://codereview.appspot.com/6496055/ git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@5331 2bbb7eff-a529-9590-31e7-b0007b416f81 --- gpu.gypi | 2 ++ 1 file changed, 2 insertions(+) diff --git a/gpu.gypi b/gpu.gypi index af8bfe7..806acaf 100644 --- a/gpu.gypi +++ b/gpu.gypi @@ -66,6 +66,8 @@ '<(skia_src_path)/gpu/GrDrawTarget.cpp', '<(skia_src_path)/gpu/GrDrawTarget.h', '<(skia_src_path)/gpu/GrGeometryBuffer.h', + '<(skia_src_path)/gpu/GrClipMaskCache.h', + '<(skia_src_path)/gpu/GrClipMaskCache.cpp', '<(skia_src_path)/gpu/GrClipMaskManager.h', '<(skia_src_path)/gpu/GrClipMaskManager.cpp', '<(skia_src_path)/gpu/GrGpu.cpp', -- cgit v1.2.3 From 64c4ce8b16177163d0f80d78ae0bfedd614474bd Mon Sep 17 00:00:00 2001 From: "scroggo@google.com" Date: Fri, 31 Aug 2012 16:15:22 +0000 Subject: Perform multi core rendering in bench_pictures. Add a flag in SkGPipeWriter for threadsafe drawing. Add a deferred pipe controller to SamplePipeControllers, which can be called to play back in multiple threads. Depends on http://codereview.appspot.com/6459105/ Review URL: https://codereview.appspot.com/6482068 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@5371 2bbb7eff-a529-9590-31e7-b0007b416f81 --- tools.gyp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tools.gyp b/tools.gyp index 347812f..02be7cf 100644 --- a/tools.gyp +++ b/tools.gyp @@ -125,12 +125,14 @@ '../src/pipe/utils/SamplePipeControllers.cpp', ], 'include_dirs': [ - '../src/pipe/utils', + '../src/pipe/utils/', + '../src/utils/', ], 'dependencies': [ 'core.gyp:core', 'images.gyp:images', 'tools.gyp:picture_utils', + 'utils.gyp:utils', ], 'export_dependent_settings': [ 'images.gyp:images', -- cgit v1.2.3 From 8f8088fdbbac12880c3eb92d59a2cda79d413a01 Mon Sep 17 00:00:00 2001 From: "robertphillips@google.com" Date: Tue, 4 Sep 2012 13:39:01 +0000 Subject: Added bench to test multiple readPixels case https://codereview.appspot.com/6501081/ git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@5381 2bbb7eff-a529-9590-31e7-b0007b416f81 --- bench.gypi | 1 + 1 file changed, 1 insertion(+) diff --git a/bench.gypi b/bench.gypi index 26d8b36..b505820 100644 --- a/bench.gypi +++ b/bench.gypi @@ -27,6 +27,7 @@ '../bench/PathIterBench.cpp', '../bench/PicturePlaybackBench.cpp', '../bench/PictureRecordBench.cpp', + '../bench/ReadPixBench.cpp', '../bench/RectBench.cpp', '../bench/RefCntBench.cpp', '../bench/RegionBench.cpp', -- cgit v1.2.3 From 8f7b75652ec3aa5d860480fc2fb30a21d464f972 Mon Sep 17 00:00:00 2001 From: "bsalomon@google.com" Date: Tue, 4 Sep 2012 14:37:12 +0000 Subject: Add effects/core.gypi to 'sources' to make them appear in VS projects Review URL: https://codereview.appspot.com/6493075/ git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@5384 2bbb7eff-a529-9590-31e7-b0007b416f81 --- core.gyp | 3 +++ effects.gyp | 3 +++ gpu.gyp | 4 ++-- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/core.gyp b/core.gyp index e23572a..1982a90 100644 --- a/core.gyp +++ b/core.gyp @@ -19,6 +19,9 @@ '../src/core', '../src/image', ], + 'sources': [ + 'core.gypi', # Makes the gypi appear in IDEs (but does not modify the build). + ], 'msvs_disabled_warnings': [4244, 4267,4345, 4390, 4554, 4800], 'conditions': [ [ 'skia_os in ["linux", "freebsd", "openbsd", "solaris"]', { diff --git a/effects.gyp b/effects.gyp index 7ea732a..b3c5bb6 100644 --- a/effects.gyp +++ b/effects.gyp @@ -18,6 +18,9 @@ 'dependencies': [ 'core.gyp:core', ], + 'sources': [ + 'effects.gypi', # Makes the gypi appear in IDEs (but does not modify the build). + ], 'conditions': [ ['skia_gpu == 1', { 'include_dirs': [ diff --git a/gpu.gyp b/gpu.gyp index 172f84e..10f1a80 100644 --- a/gpu.gyp +++ b/gpu.gyp @@ -133,7 +133,7 @@ '<@(skgr_mesa_gl_sources)', '<@(skgr_debug_gl_sources)', '<@(skgr_null_gl_sources)', - 'gpu.gypi', + 'gpu.gypi', # Makes the gypi appear in IDEs (but does not modify the build). ], 'conditions': [ [ 'not skia_mesa', { @@ -181,7 +181,7 @@ '<@(gr_mesa_gl_sources)', '<@(gr_debug_gl_sources)', '<@(gr_null_gl_sources)', - 'gpu.gypi', + 'gpu.gypi', # Makes the gypi appear in IDEs (but does not modify the build). ], 'defines': [ 'GR_IMPLEMENTATION=1', -- cgit v1.2.3 From 2831c87891e8711534d50c26329fcbc2a0f33f00 Mon Sep 17 00:00:00 2001 From: "borenet@google.com" Date: Tue, 4 Sep 2012 16:45:05 +0000 Subject: Add ANGLE to DEPS, integrate build Review URL: https://codereview.appspot.com/6494052 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@5387 2bbb7eff-a529-9590-31e7-b0007b416f81 --- angle.gyp | 30 ++++++++++++++++++++---------- common_variables.gypi | 1 - 2 files changed, 20 insertions(+), 11 deletions(-) diff --git a/angle.gyp b/angle.gyp index c181856..70ab5c2 100644 --- a/angle.gyp +++ b/angle.gyp @@ -1,25 +1,35 @@ # ANGLE is the Windows-specific translator from OGL ES 2.0 to D3D 9 { + 'conditions': [ + [ 'skia_angle', { + 'target_defaults': { + 'defines': [ + 'NOMINMAX', + ], + }, + 'variables': { + 'component': 'static_library', + }, + 'includes': [ + '../third_party/externals/angle/src/build_angle.gypi', + ], + }], + ], 'targets': [ { 'target_name': 'angle', 'type': 'none', - 'conditions': [ [ 'skia_angle', { 'direct_dependent_settings': { - 'libraries': [ - '../../third_party/externals/angle/lib/Debug/libEGL.lib', - '../../third_party/externals/angle/lib/Debug/libGLESv2.lib', - ], - 'include_dirs': [ - '../third_party/externals/angle/include' - ], + 'include_dirs': [ + '../third_party/externals/angle/include', + ], }, }], - ] - } + ], + }, ], } diff --git a/common_variables.gypi b/common_variables.gypi index 79c6ee5..4e4c43c 100644 --- a/common_variables.gypi +++ b/common_variables.gypi @@ -67,7 +67,6 @@ 'skia_scalar%': 'float', 'skia_mesa%': 0, 'skia_nv_path_rendering%': 0, - # Do not turn on 'skia_angle' - it is currently experimental 'skia_angle%': 0, 'skia_arch_type%': 'x86', 'skia_directwrite%': 0, -- cgit v1.2.3 From 28a27997ac5b2e7daa00e55dc2b201e88fcc4ba1 Mon Sep 17 00:00:00 2001 From: "borenet@google.com" Date: Tue, 4 Sep 2012 21:09:40 +0000 Subject: Add NaCl port of Skia Initial commit. This is far from done. Review URL: https://codereview.appspot.com/6428064 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@5398 2bbb7eff-a529-9590-31e7-b0007b416f81 --- common_variables.gypi | 2 ++ ports.gyp | 39 ++++++++++++++++++++++++++------------- utils.gyp | 8 ++++++++ 3 files changed, 36 insertions(+), 13 deletions(-) diff --git a/common_variables.gypi b/common_variables.gypi index 4e4c43c..3226212 100644 --- a/common_variables.gypi +++ b/common_variables.gypi @@ -71,6 +71,7 @@ 'skia_arch_type%': 'x86', 'skia_directwrite%': 0, 'android_make_apk%': 1, + 'skia_nacl%': 0, 'skia_gpu%': 1, 'skia_static_initializers%': 1, }, @@ -87,6 +88,7 @@ 'skia_arch_width%': '<(skia_arch_width)', 'skia_directwrite%': '<(skia_directwrite)', 'android_make_apk%': '<(android_make_apk)', + 'skia_nacl%': '<(skia_nacl)', 'skia_gpu%': '<(skia_gpu)', 'skia_static_initializers%': '<(skia_static_initializers)', diff --git a/ports.gyp b/ports.gyp index f070ac6..3f8140d 100644 --- a/ports.gyp +++ b/ports.gyp @@ -37,23 +37,36 @@ ], 'conditions': [ [ 'skia_os in ["linux", "freebsd", "openbsd", "solaris"]', { - 'defines': [ - #The font host requires at least FreeType 2.3.0 at runtime. - 'SK_FONTHOST_FREETYPE_RUNTIME_VERSION=0x020300', - 'SK_CAN_USE_DLOPEN=1', + 'conditions': [ + [ 'skia_nacl', { + 'defines': [ + 'SK_CAN_USE_DLOPEN=0', + ], + 'sources': [ + '../src/ports/SkFontHost_none.cpp', + ], + }, { + 'defines': [ + #The font host requires at least FreeType 2.3.0 at runtime. + 'SK_FONTHOST_FREETYPE_RUNTIME_VERSION=0x020300', + 'SK_CAN_USE_DLOPEN=1', + ], + 'sources': [ + '../src/ports/SkFontHost_FreeType.cpp', + '../src/ports/SkFontHost_FreeType_common.cpp', + '../src/ports/SkFontHost_linux.cpp', + ], + 'link_settings': { + 'libraries': [ + '-lfreetype', + '-ldl', + ], + }, + }], ], 'sources': [ '../src/ports/SkThread_pthread.cpp', - '../src/ports/SkFontHost_FreeType.cpp', - '../src/ports/SkFontHost_FreeType_common.cpp', - '../src/ports/SkFontHost_linux.cpp', ], - 'link_settings': { - 'libraries': [ - '-lfreetype', - '-ldl', - ], - }, }], [ 'skia_os == "mac"', { 'include_dirs': [ diff --git a/utils.gyp b/utils.gyp index 9cfe46e..49b4599 100644 --- a/utils.gyp +++ b/utils.gyp @@ -164,6 +164,14 @@ '../src/utils/win/SkIStream.cpp', ], }], + [ 'skia_nacl == 1', { + 'sources': [ + '../src/utils/SkThreadUtils_pthread_other.cpp', + ], + 'sources!': [ + '../src/utils/SkThreadUtils_pthread_linux.cpp', + ], + }], ], 'direct_dependent_settings': { 'include_dirs': [ -- cgit v1.2.3 From bbf93917d85d7cd4f958e1753487264902b7fdfe Mon Sep 17 00:00:00 2001 From: "rileya@google.com" Date: Wed, 5 Sep 2012 16:10:59 +0000 Subject: Add R-Tree data structure. Review URL: https://codereview.appspot.com/6489055 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@5401 2bbb7eff-a529-9590-31e7-b0007b416f81 --- core.gypi | 3 +++ tests.gyp | 1 + 2 files changed, 4 insertions(+) diff --git a/core.gypi b/core.gypi index 99227a3..9e416ac 100644 --- a/core.gypi +++ b/core.gypi @@ -14,6 +14,7 @@ '<(skia_src_path)/core/SkAdvancedTypefaceMetrics.cpp', '<(skia_src_path)/core/SkAlphaRuns.cpp', '<(skia_src_path)/core/SkAntiRun.h', + '<(skia_src_path)/core/SkBBoxHierarchy.h', '<(skia_src_path)/core/SkBitmap.cpp', '<(skia_src_path)/core/SkBitmapHeap.cpp', '<(skia_src_path)/core/SkBitmapHeap.h', @@ -127,6 +128,8 @@ '<(skia_src_path)/core/SkRegion.cpp', '<(skia_src_path)/core/SkRegionPriv.h', '<(skia_src_path)/core/SkRegion_path.cpp', + '<(skia_src_path)/core/SkRTree.h', + '<(skia_src_path)/core/SkRTree.cpp', '<(skia_src_path)/core/SkScalar.cpp', '<(skia_src_path)/core/SkScalerContext.cpp', '<(skia_src_path)/core/SkScan.cpp', diff --git a/tests.gyp b/tests.gyp index 170250e..7154638 100644 --- a/tests.gyp +++ b/tests.gyp @@ -75,6 +75,7 @@ '../tests/RefCntTest.cpp', '../tests/RefDictTest.cpp', '../tests/RegionTest.cpp', + '../tests/RTreeTest.cpp', '../tests/ScalarTest.cpp', '../tests/ShaderOpacityTest.cpp', '../tests/Sk64Test.cpp', -- cgit v1.2.3 From 7bc120e9edd1e217e0f865e4d9b2b5ed25d53476 Mon Sep 17 00:00:00 2001 From: "rileya@google.com" Date: Wed, 5 Sep 2012 18:36:17 +0000 Subject: Add R-Tree bench. Review URL: https://codereview.appspot.com/6497086 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@5404 2bbb7eff-a529-9590-31e7-b0007b416f81 --- bench.gypi | 1 + 1 file changed, 1 insertion(+) diff --git a/bench.gypi b/bench.gypi index b505820..042ccde 100644 --- a/bench.gypi +++ b/bench.gypi @@ -32,6 +32,7 @@ '../bench/RefCntBench.cpp', '../bench/RegionBench.cpp', '../bench/RepeatTileBench.cpp', + '../bench/RTreeBench.cpp', '../bench/ScalarBench.cpp', '../bench/ShaderMaskBench.cpp', '../bench/TextBench.cpp', -- cgit v1.2.3 From 2120e871d479d4e4f91cbad0f4553933b708f135 Mon Sep 17 00:00:00 2001 From: "edisonn@google.com" Date: Wed, 5 Sep 2012 19:43:46 +0000 Subject: Add efffects to the list of dependencies for bench_pictures. Required on Android. Review URL: http://codereview.appspot.com/6489078 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@5406 2bbb7eff-a529-9590-31e7-b0007b416f81 --- tools.gyp | 1 + 1 file changed, 1 insertion(+) diff --git a/tools.gyp b/tools.gyp index 02be7cf..de40dc4 100644 --- a/tools.gyp +++ b/tools.gyp @@ -92,6 +92,7 @@ ], 'dependencies': [ 'core.gyp:core', + 'effects.gyp:effects', 'ports.gyp:ports', 'tools.gyp:picture_utils', 'tools.gyp:picture_benchmark', -- cgit v1.2.3 From 7c490978a7d3d4f5a1f1ae764053d74ada92a91d Mon Sep 17 00:00:00 2001 From: "robertphillips@google.com" Date: Thu, 6 Sep 2012 18:04:07 +0000 Subject: Added 4.6.2 prefix to existing debugger moc files http://codereview.appspot.com/6488090/ git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@5416 2bbb7eff-a529-9590-31e7-b0007b416f81 --- debugger.gyp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/debugger.gyp b/debugger.gyp index d3cf674..3c72123 100644 --- a/debugger.gyp +++ b/debugger.gyp @@ -16,12 +16,12 @@ '../debugger/SkDebugger.cpp', '../debugger/SkDrawCommand.h', '../debugger/SkDrawCommand.cpp', - '../debugger/QT/moc_SkCanvasWidget.cpp', - '../debugger/QT/moc_SkDebuggerGUI.cpp', - '../debugger/QT/moc_SkInspectorWidget.cpp', - '../debugger/QT/moc_SkSettingsWidget.cpp', - '../debugger/QT/moc_SkRasterWidget.cpp', - '../debugger/QT/moc_SkGLWidget.cpp', + '../debugger/QT/moc_4.6.2_SkCanvasWidget.cpp', + '../debugger/QT/moc_4.6.2_SkDebuggerGUI.cpp', + '../debugger/QT/moc_4.6.2_SkInspectorWidget.cpp', + '../debugger/QT/moc_4.6.2_SkSettingsWidget.cpp', + '../debugger/QT/moc_4.6.2_SkRasterWidget.cpp', + '../debugger/QT/moc_4.6.2_SkGLWidget.cpp', '../debugger/QT/SkDebuggerGUI.cpp', '../debugger/QT/SkDebuggerGUI.h', '../debugger/QT/SkCanvasWidget.cpp', -- cgit v1.2.3 From f7ce2e8c2436aa375202c2b8564c046516be430b Mon Sep 17 00:00:00 2001 From: "rileya@google.com" Date: Thu, 6 Sep 2012 20:50:11 +0000 Subject: Add SkPictureRecord subclass that computes bounding boxes. Review URL: https://codereview.appspot.com/6506082 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@5423 2bbb7eff-a529-9590-31e7-b0007b416f81 --- core.gypi | 2 ++ 1 file changed, 2 insertions(+) diff --git a/core.gypi b/core.gypi index 9e416ac..2c3f4d4 100644 --- a/core.gypi +++ b/core.gypi @@ -15,6 +15,8 @@ '<(skia_src_path)/core/SkAlphaRuns.cpp', '<(skia_src_path)/core/SkAntiRun.h', '<(skia_src_path)/core/SkBBoxHierarchy.h', + '<(skia_src_path)/core/SkBBoxRecord.cpp', + '<(skia_src_path)/core/SkBBoxRecord.h', '<(skia_src_path)/core/SkBitmap.cpp', '<(skia_src_path)/core/SkBitmapHeap.cpp', '<(skia_src_path)/core/SkBitmapHeap.h', -- cgit v1.2.3 From e0ecbf1f1f83e33fbe408599a4506d34374d3ea1 Mon Sep 17 00:00:00 2001 From: "scroggo@google.com" Date: Fri, 7 Sep 2012 15:21:18 +0000 Subject: Report data from bench_pictures in the same fashion as bench. Move SkBenchLogger into separate files and make bench_pictures use it. Remove sk_tools::print_msg, since SkBenchLogger is now used instead. Combine picture_benchmark with bench_pictures, since that is the only project that uses it. Refactor the aggregator for bench timer data into its own class and make bench_pictures use it. Consolidate the various virtual PictureBenchmark::run functions into one for reuse. BUG=https://code.google.com/p/skia/issues/detail?id=822 Review URL: https://codereview.appspot.com/6488086 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@5432 2bbb7eff-a529-9590-31e7-b0007b416f81 --- bench.gypi | 5 +++++ tools.gyp | 25 ++++++------------------- 2 files changed, 11 insertions(+), 19 deletions(-) diff --git a/bench.gypi b/bench.gypi index 042ccde..81a00ed 100644 --- a/bench.gypi +++ b/bench.gypi @@ -38,6 +38,11 @@ '../bench/TextBench.cpp', '../bench/VertBench.cpp', '../bench/WriterBench.cpp', + + '../bench/SkBenchLogger.h', + '../bench/SkBenchLogger.cpp', + '../bench/TimerData.h', + '../bench/TimerData.cpp', ], } diff --git a/tools.gyp b/tools.gyp index de40dc4..45d98c2 100644 --- a/tools.gyp +++ b/tools.gyp @@ -85,7 +85,12 @@ 'target_name': 'bench_pictures', 'type': 'executable', 'sources': [ + '../bench/SkBenchLogger.h', + '../bench/SkBenchLogger.cpp', + '../bench/TimerData.h', + '../bench/TimerData.cpp', '../tools/bench_pictures_main.cpp', + '../tools/PictureBenchmark.cpp', ], 'include_dirs': [ '../bench', @@ -95,27 +100,9 @@ 'effects.gyp:effects', 'ports.gyp:ports', 'tools.gyp:picture_utils', - 'tools.gyp:picture_benchmark', - ], - }, - { - 'target_name': 'picture_benchmark', - 'type': 'static_library', - 'sources': [ - '../tools/PictureBenchmark.cpp', - ], - 'include_dirs': [ - '../bench', - ], - 'dependencies': [ - 'core.gyp:core', - 'tools.gyp:picture_utils', 'tools.gyp:picture_renderer', 'bench.gyp:bench_timer', - ], - 'export_dependent_settings': [ - 'tools.gyp:picture_renderer', - ] + ], }, { 'target_name': 'picture_renderer', -- cgit v1.2.3 From 107c91e3715c27638556221c8a7423eeab5f5bb6 Mon Sep 17 00:00:00 2001 From: "bsalomon@google.com" Date: Fri, 7 Sep 2012 15:35:06 +0000 Subject: SkPathRef: one allocation for pts+verbs, path GenID, copy-on-write Review URL: https://codereview.appspot.com/6488063/ git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@5433 2bbb7eff-a529-9590-31e7-b0007b416f81 --- core.gypi | 1 + 1 file changed, 1 insertion(+) diff --git a/core.gypi b/core.gypi index 2c3f4d4..075d915 100644 --- a/core.gypi +++ b/core.gypi @@ -109,6 +109,7 @@ '<(skia_src_path)/core/SkPathHeap.cpp', '<(skia_src_path)/core/SkPathHeap.h', '<(skia_src_path)/core/SkPathMeasure.cpp', + '<(skia_src_path)/core/SkPathRef.h', '<(skia_src_path)/core/SkPicture.cpp', '<(skia_src_path)/core/SkPictureFlat.cpp', '<(skia_src_path)/core/SkPictureFlat.h', -- cgit v1.2.3 From 2319921f71fa3a0bee0494dc57c141dc93dce039 Mon Sep 17 00:00:00 2001 From: "reed@google.com" Date: Mon, 10 Sep 2012 14:27:37 +0000 Subject: add techtalk slide for now (can remove it tomorrow) git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@5461 2bbb7eff-a529-9590-31e7-b0007b416f81 --- gmslides.gypi | 1 + 1 file changed, 1 insertion(+) diff --git a/gmslides.gypi b/gmslides.gypi index d80c123..a41b4df 100644 --- a/gmslides.gypi +++ b/gmslides.gypi @@ -62,6 +62,7 @@ '../gm/strokerects.cpp', '../gm/strokes.cpp', '../gm/tablecolorfilter.cpp', + '../gm/techtalk1.cpp', '../gm/texteffects.cpp', '../gm/testimagefilters.cpp', '../gm/texdata.cpp', -- cgit v1.2.3 From 1019e4f2f47ea77261355ee760946ff49880cb23 Mon Sep 17 00:00:00 2001 From: "borenet@google.com" Date: Mon, 10 Sep 2012 14:41:26 +0000 Subject: Fix Android build of render_pictures Review URL: https://codereview.appspot.com/6501113 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@5462 2bbb7eff-a529-9590-31e7-b0007b416f81 --- effects.gyp | 1 + 1 file changed, 1 insertion(+) diff --git a/effects.gyp b/effects.gyp index b3c5bb6..ef42cb9 100644 --- a/effects.gyp +++ b/effects.gyp @@ -28,6 +28,7 @@ ], 'dependencies': [ 'gpu.gyp:gr', + 'gpu.gyp:skgr', ], }], ], -- cgit v1.2.3 From e54a26d65f7bd34ed88b66f8dd64f25c3fa364cf Mon Sep 17 00:00:00 2001 From: "borenet@google.com" Date: Mon, 10 Sep 2012 16:20:47 +0000 Subject: Fix Android build of render_pictures (Again) picture_renderer was somehow picking up effects as a dependency, but effects was not present in the shared library on Android at load time. Review URL: https://codereview.appspot.com/6498113 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@5464 2bbb7eff-a529-9590-31e7-b0007b416f81 --- tools.gyp | 1 + 1 file changed, 1 insertion(+) diff --git a/tools.gyp b/tools.gyp index 45d98c2..28456a2 100644 --- a/tools.gyp +++ b/tools.gyp @@ -118,6 +118,7 @@ ], 'dependencies': [ 'core.gyp:core', + 'effects.gyp:effects', 'images.gyp:images', 'tools.gyp:picture_utils', 'utils.gyp:utils', -- cgit v1.2.3 From 179a5ff1d48ee0d44526136e4d513ca4665ef1f5 Mon Sep 17 00:00:00 2001 From: "robertphillips@google.com" Date: Tue, 11 Sep 2012 13:02:31 +0000 Subject: Extended instance counting to all GrResource-derived classes http://codereview.appspot.com/6489109/ git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@5480 2bbb7eff-a529-9590-31e7-b0007b416f81 --- gpu.gypi | 2 ++ 1 file changed, 2 insertions(+) diff --git a/gpu.gypi b/gpu.gypi index 806acaf..cdaa7e7 100644 --- a/gpu.gypi +++ b/gpu.gypi @@ -65,6 +65,7 @@ '<(skia_src_path)/gpu/GrDrawState.h', '<(skia_src_path)/gpu/GrDrawTarget.cpp', '<(skia_src_path)/gpu/GrDrawTarget.h', + '<(skia_src_path)/gpu/GrGeometryBuffer.cpp', '<(skia_src_path)/gpu/GrGeometryBuffer.h', '<(skia_src_path)/gpu/GrClipMaskCache.h', '<(skia_src_path)/gpu/GrClipMaskCache.cpp', @@ -81,6 +82,7 @@ '<(skia_src_path)/gpu/GrMemory.cpp', '<(skia_src_path)/gpu/GrMemoryPool.cpp', '<(skia_src_path)/gpu/GrMemoryPool.h', + '<(skia_src_path)/gpu/GrPath.cpp', '<(skia_src_path)/gpu/GrPath.h', '<(skia_src_path)/gpu/GrPathRendererChain.cpp', '<(skia_src_path)/gpu/GrPathRendererChain.h', -- cgit v1.2.3 From 9c480aab9da98f7c401ad9e0e14e90c87d7215fd Mon Sep 17 00:00:00 2001 From: "bsalomon@google.com" Date: Tue, 11 Sep 2012 13:29:29 +0000 Subject: Move GrTextureAccess decl/defn to separate files Review URL: https://codereview.appspot.com/6500104/ git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@5482 2bbb7eff-a529-9590-31e7-b0007b416f81 --- gpu.gypi | 2 ++ 1 file changed, 2 insertions(+) diff --git a/gpu.gypi b/gpu.gypi index cdaa7e7..b9ea739 100644 --- a/gpu.gypi +++ b/gpu.gypi @@ -35,6 +35,7 @@ '<(skia_include_path)/gpu/GrSurface.h', '<(skia_include_path)/gpu/GrTextContext.h', '<(skia_include_path)/gpu/GrTexture.h', + '<(skia_include_path)/gpu/GrTextureAccess.h', '<(skia_include_path)/gpu/GrTypes.h', '<(skia_include_path)/gpu/GrUserConfig.h', @@ -118,6 +119,7 @@ '<(skia_src_path)/gpu/GrTextStrike.h', '<(skia_src_path)/gpu/GrTextStrike_impl.h', '<(skia_src_path)/gpu/GrTexture.cpp', + '<(skia_src_path)/gpu/GrTextureAccess.cpp', '<(skia_src_path)/gpu/GrTHashCache.h', '<(skia_src_path)/gpu/GrTLList.h', '<(skia_src_path)/gpu/GrVertexBuffer.h', -- cgit v1.2.3 From 1205addd3645ca918f5da5e625cae9947a498177 Mon Sep 17 00:00:00 2001 From: "rileya@google.com" Date: Tue, 11 Sep 2012 14:57:33 +0000 Subject: Add helper for maintaining clip/matrix state in non-contiguous picture playback. Review URL: https://codereview.appspot.com/6509043 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@5483 2bbb7eff-a529-9590-31e7-b0007b416f81 --- core.gypi | 2 ++ 1 file changed, 2 insertions(+) diff --git a/core.gypi b/core.gypi index 075d915..80b1939 100644 --- a/core.gypi +++ b/core.gypi @@ -117,6 +117,8 @@ '<(skia_src_path)/core/SkPicturePlayback.h', '<(skia_src_path)/core/SkPictureRecord.cpp', '<(skia_src_path)/core/SkPictureRecord.h', + '<(skia_src_path)/core/SkPictureStateTree.cpp', + '<(skia_src_path)/core/SkPictureStateTree.h', '<(skia_src_path)/core/SkPixelRef.cpp', '<(skia_src_path)/core/SkPoint.cpp', '<(skia_src_path)/core/SkProcSpriteBlitter.cpp', -- cgit v1.2.3 From 916e9eef500d6368ced4d1f3fbf6621283cd3ae0 Mon Sep 17 00:00:00 2001 From: "rileya@google.com" Date: Tue, 11 Sep 2012 15:41:50 +0000 Subject: Make BBoxHierarchy ref-counted, fix leak in RTreeTest. Review URL: https://codereview.appspot.com/6489108 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@5484 2bbb7eff-a529-9590-31e7-b0007b416f81 --- core.gypi | 1 + 1 file changed, 1 insertion(+) diff --git a/core.gypi b/core.gypi index 80b1939..b30a973 100644 --- a/core.gypi +++ b/core.gypi @@ -14,6 +14,7 @@ '<(skia_src_path)/core/SkAdvancedTypefaceMetrics.cpp', '<(skia_src_path)/core/SkAlphaRuns.cpp', '<(skia_src_path)/core/SkAntiRun.h', + '<(skia_src_path)/core/SkBBoxHierarchy.cpp', '<(skia_src_path)/core/SkBBoxHierarchy.h', '<(skia_src_path)/core/SkBBoxRecord.cpp', '<(skia_src_path)/core/SkBBoxRecord.h', -- cgit v1.2.3 From 2ec73ef9ebc659c8334409afc67895a4701a9c10 Mon Sep 17 00:00:00 2001 From: "reed@google.com" Date: Tue, 11 Sep 2012 17:46:42 +0000 Subject: rm temp slides git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@5488 2bbb7eff-a529-9590-31e7-b0007b416f81 --- gmslides.gypi | 1 - 1 file changed, 1 deletion(-) diff --git a/gmslides.gypi b/gmslides.gypi index a41b4df..d80c123 100644 --- a/gmslides.gypi +++ b/gmslides.gypi @@ -62,7 +62,6 @@ '../gm/strokerects.cpp', '../gm/strokes.cpp', '../gm/tablecolorfilter.cpp', - '../gm/techtalk1.cpp', '../gm/texteffects.cpp', '../gm/testimagefilters.cpp', '../gm/texdata.cpp', -- cgit v1.2.3 From 3141bc527c69e7e2eb744890bd3d38bd5223c35d Mon Sep 17 00:00:00 2001 From: "rileya@google.com" Date: Tue, 11 Sep 2012 20:21:44 +0000 Subject: Add SkBBoxRecord subclass that builds up a BBoxHierarchy and PictureStateTree. Review URL: https://codereview.appspot.com/6490104 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@5500 2bbb7eff-a529-9590-31e7-b0007b416f81 --- core.gypi | 2 ++ 1 file changed, 2 insertions(+) diff --git a/core.gypi b/core.gypi index b30a973..d8f1715 100644 --- a/core.gypi +++ b/core.gypi @@ -18,6 +18,8 @@ '<(skia_src_path)/core/SkBBoxHierarchy.h', '<(skia_src_path)/core/SkBBoxRecord.cpp', '<(skia_src_path)/core/SkBBoxRecord.h', + '<(skia_src_path)/core/SkBBoxHierarchyRecord.cpp', + '<(skia_src_path)/core/SkBBoxHierarchyRecord.h', '<(skia_src_path)/core/SkBitmap.cpp', '<(skia_src_path)/core/SkBitmapHeap.cpp', '<(skia_src_path)/core/SkBitmapHeap.h', -- cgit v1.2.3 From 0cf72cfb0570eaee72e00687c6fa0c029e6cd246 Mon Sep 17 00:00:00 2001 From: "borenet@google.com" Date: Tue, 11 Sep 2012 21:37:28 +0000 Subject: Fix noisy Android build Review URL: https://codereview.appspot.com/6488107 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@5503 2bbb7eff-a529-9590-31e7-b0007b416f81 --- common_conditions.gypi | 1 - common_variables.gypi | 6 +++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/common_conditions.gypi b/common_conditions.gypi index b9fa429..1256ef6 100644 --- a/common_conditions.gypi +++ b/common_conditions.gypi @@ -229,7 +229,6 @@ 'defines': [ 'SK_BUILD_FOR_ANDROID', 'SK_BUILD_FOR_ANDROID_NDK', - 'SK_ALLOW_STATIC_GLOBAL_INITIALIZERS=0', ], 'configurations': { 'Debug': { diff --git a/common_variables.gypi b/common_variables.gypi index 3226212..0031f02 100644 --- a/common_variables.gypi +++ b/common_variables.gypi @@ -62,6 +62,11 @@ }, { 'skia_arch_width%': 32, }], + ['skia_os == "android"', { + 'skia_static_initializers%': 0, + }, { + 'skia_static_initializers%': 1, + }], ], 'skia_scalar%': 'float', @@ -73,7 +78,6 @@ 'android_make_apk%': 1, 'skia_nacl%': 0, 'skia_gpu%': 1, - 'skia_static_initializers%': 1, }, # Re-define all variables defined within the level-2 'variables' dict, -- cgit v1.2.3 From 4c32a27241f209fe2a5d64c30973fdd8b151e354 Mon Sep 17 00:00:00 2001 From: "wjmaclean@chromium.org" Date: Wed, 12 Sep 2012 15:53:20 +0000 Subject: Using the device scale factor for glyph positioning The master bug is http://code.google.com/p/chromium/issues/detail?id=138101 . The corresponding WebKit changes for this CL are here: https://bugs.webkit.org/show_bug.cgi?id=96137 BUG= Review URL: https://codereview.appspot.com/6506099 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@5508 2bbb7eff-a529-9590-31e7-b0007b416f81 --- common_conditions.gypi | 1 + 1 file changed, 1 insertion(+) diff --git a/common_conditions.gypi b/common_conditions.gypi index 1256ef6..2a03c00 100644 --- a/common_conditions.gypi +++ b/common_conditions.gypi @@ -3,6 +3,7 @@ { 'defines': [ 'SK_ALLOW_STATIC_GLOBAL_INITIALIZERS=<(skia_static_initializers)', + 'SK_SUPPORT_HINTING_SCALE_FACTOR', ], 'conditions' : [ ['skia_gpu == 1', -- cgit v1.2.3 From 40f74c6d15fb320e19b1f9cbc742bc905ec1a116 Mon Sep 17 00:00:00 2001 From: "reed@google.com" Date: Wed, 12 Sep 2012 18:34:49 +0000 Subject: revert 5508 -- it broke most of the builds Use http://skia.googlecode.com/svn/buildbot/buildbots.html to see the state of the build. git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@5511 2bbb7eff-a529-9590-31e7-b0007b416f81 --- common_conditions.gypi | 1 - 1 file changed, 1 deletion(-) diff --git a/common_conditions.gypi b/common_conditions.gypi index 2a03c00..1256ef6 100644 --- a/common_conditions.gypi +++ b/common_conditions.gypi @@ -3,7 +3,6 @@ { 'defines': [ 'SK_ALLOW_STATIC_GLOBAL_INITIALIZERS=<(skia_static_initializers)', - 'SK_SUPPORT_HINTING_SCALE_FACTOR', ], 'conditions' : [ ['skia_gpu == 1', -- cgit v1.2.3 From 752686a974743cf312bed5d5424e26ea0b507ead Mon Sep 17 00:00:00 2001 From: "reed@google.com" Date: Wed, 12 Sep 2012 21:08:33 +0000 Subject: re-apply 5508, but with the new compile-flag disabled for now git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@5516 2bbb7eff-a529-9590-31e7-b0007b416f81 --- common_conditions.gypi | 2 ++ 1 file changed, 2 insertions(+) diff --git a/common_conditions.gypi b/common_conditions.gypi index 1256ef6..f798360 100644 --- a/common_conditions.gypi +++ b/common_conditions.gypi @@ -3,6 +3,8 @@ { 'defines': [ 'SK_ALLOW_STATIC_GLOBAL_INITIALIZERS=<(skia_static_initializers)', + # Need to rebuild .skp files w/ this change +# 'SK_SUPPORT_HINTING_SCALE_FACTOR', ], 'conditions' : [ ['skia_gpu == 1', -- cgit v1.2.3 From 492c63c033f88b77f4bd2db1397a95dae854c7b4 Mon Sep 17 00:00:00 2001 From: "rileya@google.com" Date: Fri, 14 Sep 2012 13:53:36 +0000 Subject: Add gm to test SkRegion/clipPath bug. Review URL: https://codereview.appspot.com/6501131 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@5540 2bbb7eff-a529-9590-31e7-b0007b416f81 --- gmslides.gypi | 1 + 1 file changed, 1 insertion(+) diff --git a/gmslides.gypi b/gmslides.gypi index d80c123..17a41c8 100644 --- a/gmslides.gypi +++ b/gmslides.gypi @@ -22,6 +22,7 @@ '../gm/degeneratesegments.cpp', '../gm/dashcubics.cpp', '../gm/dashing.cpp', + '../gm/distantclip.cpp', '../gm/drawbitmaprect.cpp', '../gm/drawlooper.cpp', '../gm/extractbitmap.cpp', -- cgit v1.2.3 From bae539c806a09bb0e11a37f6f1609d5fc010b3d5 Mon Sep 17 00:00:00 2001 From: "borenet@google.com" Date: Fri, 14 Sep 2012 14:34:28 +0000 Subject: Enable automatic rescaling in bench_pictures bench_pictures with "--device gpu" is failing because we're trying to allocate too much GPU memory. Move the recently-added scaling code into picture_utils and share it between render_pictures and bench_pictures. Review URL: https://codereview.appspot.com/6495125 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@5543 2bbb7eff-a529-9590-31e7-b0007b416f81 --- tools.gyp | 1 + 1 file changed, 1 insertion(+) diff --git a/tools.gyp b/tools.gyp index 28456a2..371ecd2 100644 --- a/tools.gyp +++ b/tools.gyp @@ -143,6 +143,7 @@ 'type': 'static_library', 'sources': [ '../tools/picture_utils.cpp', + '../tools/picture_utils.h', ], 'dependencies': [ 'core.gyp:core', -- cgit v1.2.3 From 3c8d519ca3f0f42c97d020c820e298d5a684d6ce Mon Sep 17 00:00:00 2001 From: "scroggo@google.com" Date: Fri, 14 Sep 2012 17:26:37 +0000 Subject: For a picture playback with nothing written, use an empty SkData. This prevents crashing when attempting to access fOpData. BUG=https://code.google.com/p/skia/issues/detail?id=870 Review URL: https://codereview.appspot.com/6499108 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@5550 2bbb7eff-a529-9590-31e7-b0007b416f81 --- tests.gyp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tests.gyp b/tests.gyp index 7154638..dcfd1b4 100644 --- a/tests.gyp +++ b/tests.gyp @@ -64,8 +64,9 @@ '../tests/PathMeasureTest.cpp', '../tests/PathTest.cpp', '../tests/PDFPrimitivesTest.cpp', - '../tests/PipeTest.cpp', + '../tests/PictureTest.cpp', '../tests/PictureUtilsTest.cpp', + '../tests/PipeTest.cpp', '../tests/PointTest.cpp', '../tests/PremulAlphaRoundTripTest.cpp', '../tests/QuickRejectTest.cpp', -- cgit v1.2.3 From 4f5f81d9356f3753e282e58507586803629b227a Mon Sep 17 00:00:00 2001 From: "epoger@google.com" Date: Fri, 14 Sep 2012 18:42:01 +0000 Subject: Add a header file for TransitionView.cpp committed from https://codereview.appspot.com/6492119/ for Thiago Farina git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@5552 2bbb7eff-a529-9590-31e7-b0007b416f81 --- SampleApp.gyp | 1 + iOSSampleApp.gyp | 1 + 2 files changed, 2 insertions(+) diff --git a/SampleApp.gyp b/SampleApp.gyp index 0d65e8b..a2ee5c9 100644 --- a/SampleApp.gyp +++ b/SampleApp.gyp @@ -104,6 +104,7 @@ '../samplecode/SampleXfermodes.cpp', '../samplecode/SampleXfermodesBlur.cpp', '../samplecode/TransitionView.cpp', + '../samplecode/TransitionView.h', # DrawingBoard #'../experimental/DrawingBoard/SkColorPalette.h', diff --git a/iOSSampleApp.gyp b/iOSSampleApp.gyp index f9c8a58..5cd2c9c 100644 --- a/iOSSampleApp.gyp +++ b/iOSSampleApp.gyp @@ -133,6 +133,7 @@ '../src/utils/SkInterpolator.cpp', '../include/utils/SkInterpolator.h', '../samplecode/TransitionView.cpp', + '../samplecode/TransitionView.h', ], 'sources!': [ '../samplecode/SampleSkLayer.cpp', #relies on SkMatrix44 which doesn't compile -- cgit v1.2.3 From 5cf25e8fe064301e64d5b3571c7d2478f453ee9c Mon Sep 17 00:00:00 2001 From: "bsalomon@google.com" Date: Fri, 14 Sep 2012 20:30:37 +0000 Subject: Temporarily revert r5433 due to http://www.crbug.com/148637 until after M23 branch. git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@5557 2bbb7eff-a529-9590-31e7-b0007b416f81 --- core.gypi | 1 - 1 file changed, 1 deletion(-) diff --git a/core.gypi b/core.gypi index d8f1715..7a6a7dd 100644 --- a/core.gypi +++ b/core.gypi @@ -112,7 +112,6 @@ '<(skia_src_path)/core/SkPathHeap.cpp', '<(skia_src_path)/core/SkPathHeap.h', '<(skia_src_path)/core/SkPathMeasure.cpp', - '<(skia_src_path)/core/SkPathRef.h', '<(skia_src_path)/core/SkPicture.cpp', '<(skia_src_path)/core/SkPictureFlat.cpp', '<(skia_src_path)/core/SkPictureFlat.h', -- cgit v1.2.3 From ee9e24ddde050f702351c94d1cbd07d064bd1dcf Mon Sep 17 00:00:00 2001 From: "tfarina@chromium.org" Date: Tue, 18 Sep 2012 01:52:20 +0000 Subject: Add a header for OverView.cpp as well. This fixes another FIXMEs. Signed-off-by: Thiago Farina Review URL: https://codereview.appspot.com/6492125 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@5576 2bbb7eff-a529-9590-31e7-b0007b416f81 --- SampleApp.gyp | 2 +- iOSSampleApp.gyp | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/SampleApp.gyp b/SampleApp.gyp index a2ee5c9..ac5c87f 100644 --- a/SampleApp.gyp +++ b/SampleApp.gyp @@ -1,4 +1,3 @@ - { 'targets': [ { @@ -21,6 +20,7 @@ '../samplecode/GMSampleView.h', '../samplecode/ClockFaceView.cpp', '../samplecode/OverView.cpp', + '../samplecode/OverView.h', '../samplecode/Sample2PtRadial.cpp', '../samplecode/SampleAAClip.cpp', '../samplecode/SampleAARects.cpp', diff --git a/iOSSampleApp.gyp b/iOSSampleApp.gyp index 5cd2c9c..dca28c4 100644 --- a/iOSSampleApp.gyp +++ b/iOSSampleApp.gyp @@ -30,6 +30,7 @@ '../samplecode/ClockFaceView.cpp', '../samplecode/OverView.cpp', + '../samplecode/OverView.h', '../samplecode/Sample2PtRadial.cpp', '../samplecode/SampleAll.cpp', '../samplecode/SampleAnimator.cpp', -- cgit v1.2.3 From 03373f7e51fec6dd16ac88210494dbe6885cc224 Mon Sep 17 00:00:00 2001 From: "reed@google.com" Date: Tue, 18 Sep 2012 12:59:44 +0000 Subject: Change drawBitmapRect to take a float-src-rect instead of integer-src-rect. This allows the client more control over the scaling. Because of virtual overrides and wanting to keep the old call-sites up and running, this CL renames the virtual entry-point to drawBitmapRectToRect, and downgrades drawBitmapRect to a non-virtual helper function. The implementation is to use the float-rect for computing the matrix, but still cons-up an integer rect for the purposes of subsetting the original bitmap. We do this by calling float_src->roundOut(&int_src) so that we include all (partially) covered src pixels. No change needed on SkDevice, since that signature is explicitly passed the computed matrix. Review URL: https://codereview.appspot.com/6501140 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@5578 2bbb7eff-a529-9590-31e7-b0007b416f81 --- gmslides.gypi | 1 + 1 file changed, 1 insertion(+) diff --git a/gmslides.gypi b/gmslides.gypi index 17a41c8..a0d418b 100644 --- a/gmslides.gypi +++ b/gmslides.gypi @@ -8,6 +8,7 @@ '../gm/bitmapcopy.cpp', '../gm/bitmapmatrix.cpp', '../gm/bitmapfilters.cpp', + '../gm/bitmaprect.cpp', '../gm/bitmapscroll.cpp', '../gm/blend.cpp', '../gm/blurs.cpp', -- cgit v1.2.3 From 92330db05ab41d09f31b11afca008b4ab404d9bb Mon Sep 17 00:00:00 2001 From: "reed@google.com" Date: Tue, 18 Sep 2012 13:20:52 +0000 Subject: revert 5578 -- broke pipe git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@5579 2bbb7eff-a529-9590-31e7-b0007b416f81 --- gmslides.gypi | 1 - 1 file changed, 1 deletion(-) diff --git a/gmslides.gypi b/gmslides.gypi index a0d418b..17a41c8 100644 --- a/gmslides.gypi +++ b/gmslides.gypi @@ -8,7 +8,6 @@ '../gm/bitmapcopy.cpp', '../gm/bitmapmatrix.cpp', '../gm/bitmapfilters.cpp', - '../gm/bitmaprect.cpp', '../gm/bitmapscroll.cpp', '../gm/blend.cpp', '../gm/blurs.cpp', -- cgit v1.2.3 From e19cbb6ea8a7e5f2c1ba69f40367966ed6213fbe Mon Sep 17 00:00:00 2001 From: "reed@google.com" Date: Tue, 18 Sep 2012 13:47:20 +0000 Subject: re-land 5578 w/ pipe fix git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@5580 2bbb7eff-a529-9590-31e7-b0007b416f81 --- gmslides.gypi | 1 + 1 file changed, 1 insertion(+) diff --git a/gmslides.gypi b/gmslides.gypi index 17a41c8..a0d418b 100644 --- a/gmslides.gypi +++ b/gmslides.gypi @@ -8,6 +8,7 @@ '../gm/bitmapcopy.cpp', '../gm/bitmapmatrix.cpp', '../gm/bitmapfilters.cpp', + '../gm/bitmaprect.cpp', '../gm/bitmapscroll.cpp', '../gm/blend.cpp', '../gm/blurs.cpp', -- cgit v1.2.3 From eeaa8f2e5039de78f37acbe02aa0266b26bb22d8 Mon Sep 17 00:00:00 2001 From: "reed@google.com" Date: Tue, 18 Sep 2012 14:04:54 +0000 Subject: revert 5580 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@5581 2bbb7eff-a529-9590-31e7-b0007b416f81 --- gmslides.gypi | 1 - 1 file changed, 1 deletion(-) diff --git a/gmslides.gypi b/gmslides.gypi index a0d418b..17a41c8 100644 --- a/gmslides.gypi +++ b/gmslides.gypi @@ -8,7 +8,6 @@ '../gm/bitmapcopy.cpp', '../gm/bitmapmatrix.cpp', '../gm/bitmapfilters.cpp', - '../gm/bitmaprect.cpp', '../gm/bitmapscroll.cpp', '../gm/blend.cpp', '../gm/blurs.cpp', -- cgit v1.2.3 From 54d223e5c287f1c94bbfb02bc22b5873cf890e9b Mon Sep 17 00:00:00 2001 From: "reed@google.com" Date: Tue, 18 Sep 2012 15:14:33 +0000 Subject: re-re-land 5578 will follow w/ new .skp files to keep the waterfall green (I hope) git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@5584 2bbb7eff-a529-9590-31e7-b0007b416f81 --- gmslides.gypi | 1 + 1 file changed, 1 insertion(+) diff --git a/gmslides.gypi b/gmslides.gypi index 17a41c8..a0d418b 100644 --- a/gmslides.gypi +++ b/gmslides.gypi @@ -8,6 +8,7 @@ '../gm/bitmapcopy.cpp', '../gm/bitmapmatrix.cpp', '../gm/bitmapfilters.cpp', + '../gm/bitmaprect.cpp', '../gm/bitmapscroll.cpp', '../gm/blend.cpp', '../gm/blurs.cpp', -- cgit v1.2.3 From 7151577f077ebc425d12be4ee5c8a3a9a5ad406a Mon Sep 17 00:00:00 2001 From: "caryclark@google.com" Date: Tue, 18 Sep 2012 15:41:18 +0000 Subject: update gyp files to build on iOS Note that there's a hack in SkImageDecoder_CG.cpp -- the necessary defines are included directly. This is temporary until I can figure out how to include them properly. Review URL: https://codereview.appspot.com/6523044 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@5586 2bbb7eff-a529-9590-31e7-b0007b416f81 --- images.gyp | 7 ++++++- ports.gyp | 1 + xml.gyp | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/images.gyp b/images.gyp index 24c70a1..00c8377 100644 --- a/images.gyp +++ b/images.gyp @@ -73,7 +73,7 @@ '../src/ports/SkImageDecoder_WIC.cpp', ], }], - [ 'skia_os == "mac"', { + [ 'skia_os in ["mac", "ios"]', { 'sources!': [ '../src/images/SkImageDecoder_Factory.cpp', '../src/images/SkImageDecoder_libpng.cpp', @@ -116,6 +116,11 @@ 'SK_ENABLE_LIBPNG', ], }], + [ 'skia_os == "ios"', { + 'include_dirs': [ + '../include/utils/mac', + ], + }], ], 'direct_dependent_settings': { 'include_dirs': [ diff --git a/ports.gyp b/ports.gyp index 3f8140d..cc301b6 100644 --- a/ports.gyp +++ b/ports.gyp @@ -88,6 +88,7 @@ [ 'skia_os == "ios"', { 'include_dirs': [ '../include/utils/ios', + '../include/utils/mac', ], 'sources': [ '../src/ports/SkFontHost_mac_coretext.cpp', diff --git a/xml.gyp b/xml.gyp index 6650a5c..b7878e2 100644 --- a/xml.gyp +++ b/xml.gyp @@ -30,7 +30,7 @@ '../src/xml/SkXMLPullParser.cpp', #if 0 around class decl in header ], 'conditions': [ - [ 'skia_os in ["win", "mac", "linux", "freebsd", "openbsd", "solaris", "android"]', { + [ 'skia_os in ["win", "mac", "linux", "freebsd", "openbsd", "solaris", "android", "ios"]', { 'sources!': [ # no jsapi.h by default on system '../include/xml/SkJS.h', -- cgit v1.2.3 From 6541490d841d84053c4cf75707958948ce800e85 Mon Sep 17 00:00:00 2001 From: "robertphillips@google.com" Date: Tue, 18 Sep 2012 17:16:33 +0000 Subject: Added functor to GrTHashCache to allow discovery of un-reffed resources http://codereview.appspot.com/6503126/ git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@5587 2bbb7eff-a529-9590-31e7-b0007b416f81 --- tests.gyp | 1 + 1 file changed, 1 insertion(+) diff --git a/tests.gyp b/tests.gyp index dcfd1b4..874bb7f 100644 --- a/tests.gyp +++ b/tests.gyp @@ -51,6 +51,7 @@ '../tests/GrContextFactoryTest.cpp', '../tests/GradientTest.cpp', '../tests/GrMemoryPoolTest.cpp', + '../tests/HashCacheTest.cpp', '../tests/InfRectTest.cpp', '../tests/MathTest.cpp', '../tests/MatrixTest.cpp', -- cgit v1.2.3 From 12c1f15e678939e9ad9cfc56fb258d26bd67b715 Mon Sep 17 00:00:00 2001 From: "senorblanco@chromium.org" Date: Tue, 18 Sep 2012 20:32:34 +0000 Subject: Implements a matrix convolution filter (raster path only). The filtering loop is templated on the tiling mode for speed: interior pixels are unconditionally fetched; border pixels apply the appropriate tiling mode before fetching. It handles target, bias, divisor (as gain), and edge modes (named to be more skia-like). It does not handle the "preserveAlpha" semantics of feConvolveMatrix, nor "kernelUnitLength". git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@5592 2bbb7eff-a529-9590-31e7-b0007b416f81 --- bench.gypi | 1 + effects.gypi | 1 + gmslides.gypi | 1 + 3 files changed, 3 insertions(+) diff --git a/bench.gypi b/bench.gypi index 81a00ed..ecb533a 100644 --- a/bench.gypi +++ b/bench.gypi @@ -20,6 +20,7 @@ '../bench/InterpBench.cpp', '../bench/MathBench.cpp', '../bench/MatrixBench.cpp', + '../bench/MatrixConvolutionBench.cpp', '../bench/MemoryBench.cpp', '../bench/MorphologyBench.cpp', '../bench/MutexBench.cpp', diff --git a/effects.gypi b/effects.gypi index 164fc82..aef7f2c 100644 --- a/effects.gypi +++ b/effects.gypi @@ -33,6 +33,7 @@ '<(skia_src_path)/effects/SkLayerDrawLooper.cpp', '<(skia_src_path)/effects/SkLayerRasterizer.cpp', '<(skia_src_path)/effects/SkLightingImageFilter.cpp', + '<(skia_src_path)/effects/SkMatrixConvolutionImageFilter.cpp', '<(skia_src_path)/effects/SkMorphologyImageFilter.cpp', '<(skia_src_path)/effects/SkPaintFlagsDrawFilter.cpp', '<(skia_src_path)/effects/SkPixelXorXfermode.cpp', diff --git a/gmslides.gypi b/gmslides.gypi index a0d418b..003cb05 100644 --- a/gmslides.gypi +++ b/gmslides.gypi @@ -46,6 +46,7 @@ '../gm/imagefiltersgraph.cpp', '../gm/lcdtext.cpp', '../gm/linepaths.cpp', + '../gm/matrixconvolution.cpp', '../gm/morphology.cpp', '../gm/ninepatchstretch.cpp', '../gm/nocolorbleed.cpp', -- cgit v1.2.3 From 5ae5ef89eb67a870438a2675ef2d8aa85f749705 Mon Sep 17 00:00:00 2001 From: "senorblanco@chromium.org" Date: Tue, 18 Sep 2012 20:44:01 +0000 Subject: Unreviewed; build fix. Disable matrixconvolution bench until I can figure out the premul issues. git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@5593 2bbb7eff-a529-9590-31e7-b0007b416f81 --- bench.gypi | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/bench.gypi b/bench.gypi index ecb533a..03635a8 100644 --- a/bench.gypi +++ b/bench.gypi @@ -20,7 +20,8 @@ '../bench/InterpBench.cpp', '../bench/MathBench.cpp', '../bench/MatrixBench.cpp', - '../bench/MatrixConvolutionBench.cpp', + #Disable this benchmark until non-premul alpha problems are figured out + #'../bench/MatrixConvolutionBench.cpp', '../bench/MemoryBench.cpp', '../bench/MorphologyBench.cpp', '../bench/MutexBench.cpp', -- cgit v1.2.3 From e4d1fb2499367ba0b733983fbdc0aff46450b6b5 Mon Sep 17 00:00:00 2001 From: "caryclark@google.com" Date: Thu, 20 Sep 2012 15:45:41 +0000 Subject: first cut at making iOS work Replace __arm__ with SK_CPU_ARM add support for iOS simulator and device fix const warning in iOSSampleApp update gyp files https://code.google.com/p/skia/issues/detail?id=900 tracks fixing missing arm assembly Review URL: https://codereview.appspot.com/6552045 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@5606 2bbb7eff-a529-9590-31e7-b0007b416f81 --- SampleApp.gyp | 61 ++++++++++++++++++++++++++++++++++++++++++++------ common_conditions.gypi | 5 +++++ core.gyp | 29 ++++++++++++++++++------ opts.gyp | 12 +++++++--- ports.gyp | 4 ++++ 5 files changed, 94 insertions(+), 17 deletions(-) diff --git a/SampleApp.gyp b/SampleApp.gyp index ac5c87f..753d374 100644 --- a/SampleApp.gyp +++ b/SampleApp.gyp @@ -204,28 +204,75 @@ '../samplecode/SampleDecode.cpp', ], 'sources': [ - '../experimental/iOSSampleApp/SkIOSNotifier.mm', - '../experimental/iOSSampleApp/SkTime_iOS.mm', - '../experimental/iOSSampleApp/SkUIDetailViewController.mm', - '../experimental/iOSSampleApp/SkUIRootViewController.mm', - '../experimental/iOSSampleApp/SkUIView_shell.mm', - + '../src/views/mac/SkEventNotifier.h', + '../src/views/mac/SkEventNotifier.mm', + '../experimental/iOSSampleApp/SkiOSSampleApp-Base.xcconfig', + '../experimental/iOSSampleApp/SkiOSSampleApp-Debug.xcconfig', + '../experimental/iOSSampleApp/SkiOSSampleApp-Release.xcconfig', + '../experimental/iOSSampleApp/iOSSampleApp-Info.plist', '../experimental/iOSSampleApp/iOSSampleApp_Prefix.pch', - '../experimental/iOSSampleApp/Shared/main.m', + '../experimental/iOSSampleApp/Shared/SkOptionListController.h', + '../experimental/iOSSampleApp/Shared/SkOptionListController.mm', + '../experimental/iOSSampleApp/Shared/SkUIRootViewController.h', + '../experimental/iOSSampleApp/Shared/SkUIRootViewController.mm', + '../experimental/iOSSampleApp/Shared/SkOptionsTableViewController.h', + '../experimental/iOSSampleApp/Shared/SkOptionsTableViewController.mm', + '../experimental/iOSSampleApp/Shared/SkUIView.h', + '../experimental/iOSSampleApp/Shared/SkUIView.mm', + '../experimental/iOSSampleApp/Shared/SkUIDetailViewController.h', + '../experimental/iOSSampleApp/Shared/SkUIDetailViewController.mm', + '../experimental/iOSSampleApp/Shared/skia_ios.mm', + + # iPad + '../experimental/iOSSampleApp/iPad/AppDelegate_iPad.h', '../experimental/iOSSampleApp/iPad/AppDelegate_iPad.mm', + '../experimental/iOSSampleApp/iPad/SkUISplitViewController.h', '../experimental/iOSSampleApp/iPad/SkUISplitViewController.mm', + '../experimental/iOSSampleApp/iPad/MainWindow_iPad.xib', + + # iPhone + '../experimental/iOSSampleApp/iPhone/AppDelegate_iPhone.h', '../experimental/iOSSampleApp/iPhone/AppDelegate_iPhone.mm', + '../experimental/iOSSampleApp/iPhone/SkUINavigationController.h', '../experimental/iOSSampleApp/iPhone/SkUINavigationController.mm', + '../experimental/iOSSampleApp/iPhone/MainWindow_iPhone.xib', '../src/views/ios/SkOSWindow_iOS.mm', '../src/utils/ios/SkImageDecoder_iOS.mm', '../src/utils/ios/SkStream_NSData.mm', '../src/utils/ios/SkOSFile_iOS.mm', + '../include/utils/mac/SkCGUtils.h', '../src/utils/mac/SkCreateCGImageRef.cpp', '../experimental/iOSSampleApp/SkiOSSampleApp-Debug.xcconfig', '../experimental/iOSSampleApp/SkiOSSampleApp-Release.xcconfig', ], + 'link_settings': { + 'variables': { + 'ios_sdk_version%': '5.1', + }, + 'conditions' : [ + [ 'skia_arch_type == "x86"', { + 'variables': { + 'ios_sdk_dir%': '/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator', + }, + }], + [ 'skia_arch_type == "arm"', { + 'variables': { + 'ios_sdk_dir%': '/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS', + }, + }], + ], + 'libraries': [ + '<(ios_sdk_dir)<(ios_sdk_version).sdk/System/Library/Frameworks/CoreFoundation.framework', + '<(ios_sdk_dir)<(ios_sdk_version).sdk/System/Library/Frameworks/CoreGraphics.framework', + '<(ios_sdk_dir)<(ios_sdk_version).sdk/System/Library/Frameworks/CoreText.framework', + '<(ios_sdk_dir)<(ios_sdk_version).sdk/System/Library/Frameworks/UIKit.framework', + '<(ios_sdk_dir)<(ios_sdk_version).sdk/System/Library/Frameworks/Foundation.framework', + '<(ios_sdk_dir)<(ios_sdk_version).sdk/System/Library/Frameworks/QuartzCore.framework', + '<(ios_sdk_dir)<(ios_sdk_version).sdk/System/Library/Frameworks/OpenGLES.framework', + ], + }, 'include_dirs' : [ '../experimental/iOSSampleApp', '../experimental/iOSSampleApp/iPad', diff --git a/common_conditions.gypi b/common_conditions.gypi index f798360..c63095c 100644 --- a/common_conditions.gypi +++ b/common_conditions.gypi @@ -221,7 +221,12 @@ }, }, 'xcode_settings': { + 'ARCHS': 'armv7', + 'CODE_SIGNING_REQUIRED': 'NO', + 'CODE_SIGN_IDENTITY[sdk=iphoneos*]': '', 'SYMROOT': '<(DEPTH)/xcodebuild', + 'SDKROOT': 'iphoneos', + 'OTHER_CPLUSPLUSFLAGS': '-fvisibility=hidden -fvisibility-inlines-hidden', }, }, ], diff --git a/core.gyp b/core.gyp index 1982a90..b565c08 100644 --- a/core.gyp +++ b/core.gyp @@ -57,14 +57,29 @@ '../include/utils/mac/SkCGUtils.h', ], 'link_settings': { + 'variables': { + 'ios_sdk_version%': '5.1', + }, + 'conditions' : [ + [ 'skia_arch_type == "x86"', { + 'variables': { + 'ios_sdk_dir%': '/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator', + }, + }], + [ 'skia_arch_type == "arm"', { + 'variables': { + 'ios_sdk_dir%': '/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS', + }, + }], + ], 'libraries': [ - '/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS4.3.sdk/System/Library/Frameworks/CoreFoundation.framework', - '/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS4.3.sdk/System/Library/Frameworks/CoreGraphics.framework', - '/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS4.3.sdk/System/Library/Frameworks/CoreText.framework', - '/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS4.3.sdk/System/Library/Frameworks/UIKit.framework', - '/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS4.3.sdk/System/Library/Frameworks/Foundation.framework', - '/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS4.3.sdk/System/Library/Frameworks/QuartzCore.framework', - '/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS4.3.sdk/System/Library/Frameworks/OpenGLES.framework', + '<(ios_sdk_dir)<(ios_sdk_version).sdk/System/Library/Frameworks/CoreFoundation.framework', + '<(ios_sdk_dir)<(ios_sdk_version).sdk/System/Library/Frameworks/CoreGraphics.framework', + '<(ios_sdk_dir)<(ios_sdk_version).sdk/System/Library/Frameworks/CoreText.framework', + '<(ios_sdk_dir)<(ios_sdk_version).sdk/System/Library/Frameworks/UIKit.framework', + '<(ios_sdk_dir)<(ios_sdk_version).sdk/System/Library/Frameworks/Foundation.framework', + '<(ios_sdk_dir)<(ios_sdk_version).sdk/System/Library/Frameworks/QuartzCore.framework', + '<(ios_sdk_dir)<(ios_sdk_version).sdk/System/Library/Frameworks/OpenGLES.framework', ], }, }], diff --git a/opts.gyp b/opts.gyp index 2ac395c..d5a4b9d 100644 --- a/opts.gyp +++ b/opts.gyp @@ -28,7 +28,7 @@ '../src/opts', ], 'conditions': [ - [ 'skia_arch_type == "x86"', { + [ 'skia_arch_type == "x86" and skia_os != "ios"', { 'conditions': [ [ 'skia_os in ["linux", "freebsd", "openbsd", "solaris"]', { 'cflags': [ @@ -71,10 +71,16 @@ 'dependencies': [ 'opts_neon', ] - }] + }], + [ 'skia_os == "ios"', { + 'sources!': [ + # this needs to be rewritten to be xcode-friendly + '../src/opts/memset.arm.S', + ], + }], ], }], - [ 'skia_arch_type == "arm" and armv7 != 1', { + [ '(skia_arch_type == "arm" and armv7 == 0) or (skia_arch_type == "x86" and skia_os == "ios")', { 'sources': [ '../src/opts/SkBitmapProcState_opts_none.cpp', '../src/opts/SkBlitRow_opts_none.cpp', diff --git a/ports.gyp b/ports.gyp index cc301b6..1aa112f 100644 --- a/ports.gyp +++ b/ports.gyp @@ -92,8 +92,12 @@ ], 'sources': [ '../src/ports/SkFontHost_mac_coretext.cpp', + '../src/utils/mac/SkStream_mac.cpp', '../src/ports/SkThread_pthread.cpp', ], + 'sources!': [ + '../src/ports/SkFontHost_tables.cpp', + ], }], [ 'skia_os == "win"', { 'include_dirs': [ -- cgit v1.2.3 From 5ceb89c550f7ac3f5522cf117d8d2487ac8dbddd Mon Sep 17 00:00:00 2001 From: "senorblanco@chromium.org" Date: Thu, 20 Sep 2012 16:10:02 +0000 Subject: Pull SDKROOT into a gyp variable, so it can be locally overridden. This allows building on Lion or Mountain Lion using XCode 4.4. http://codereview.appspot.com/6553044/ git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@5607 2bbb7eff-a529-9590-31e7-b0007b416f81 --- common_conditions.gypi | 2 +- common_variables.gypi | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/common_conditions.gypi b/common_conditions.gypi index c63095c..934eba9 100644 --- a/common_conditions.gypi +++ b/common_conditions.gypi @@ -181,7 +181,7 @@ 'xcode_settings': { 'GCC_SYMBOLS_PRIVATE_EXTERN': 'NO', 'SYMROOT': '<(DEPTH)/xcodebuild', - 'SDKROOT': 'macosx10.6', + 'SDKROOT': '<(skia_osx_sdkroot)', # trying to get this to work, but it needs clang I think... # 'WARNING_CFLAGS': '-Wexit-time-destructors', 'CLANG_WARN_CXX0X_EXTENSIONS': 'NO', diff --git a/common_variables.gypi b/common_variables.gypi index 0031f02..ee89ca9 100644 --- a/common_variables.gypi +++ b/common_variables.gypi @@ -78,6 +78,7 @@ 'android_make_apk%': 1, 'skia_nacl%': 0, 'skia_gpu%': 1, + 'skia_osx_sdkroot%': 'macosx10.6', }, # Re-define all variables defined within the level-2 'variables' dict, @@ -94,6 +95,7 @@ 'android_make_apk%': '<(android_make_apk)', 'skia_nacl%': '<(skia_nacl)', 'skia_gpu%': '<(skia_gpu)', + 'skia_osx_sdkroot%': '<(skia_osx_sdkroot)', 'skia_static_initializers%': '<(skia_static_initializers)', # These are referenced by our .gypi files that list files (e.g. core.gypi) -- cgit v1.2.3 From ac0811d9847603653a141085053a5220a49bdaec Mon Sep 17 00:00:00 2001 From: "senorblanco@chromium.org" Date: Thu, 20 Sep 2012 17:59:49 +0000 Subject: Fix premul alpha problems w/matrix convolution filter, and re-enable the bench. http://codereview.appspot.com/6541043/ git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@5610 2bbb7eff-a529-9590-31e7-b0007b416f81 --- bench.gypi | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/bench.gypi b/bench.gypi index 03635a8..ecb533a 100644 --- a/bench.gypi +++ b/bench.gypi @@ -20,8 +20,7 @@ '../bench/InterpBench.cpp', '../bench/MathBench.cpp', '../bench/MatrixBench.cpp', - #Disable this benchmark until non-premul alpha problems are figured out - #'../bench/MatrixConvolutionBench.cpp', + '../bench/MatrixConvolutionBench.cpp', '../bench/MemoryBench.cpp', '../bench/MorphologyBench.cpp', '../bench/MutexBench.cpp', -- cgit v1.2.3 From e5c9465ec725d913b63ff2fcde665425ec2178e6 Mon Sep 17 00:00:00 2001 From: "caryclark@google.com" Date: Mon, 24 Sep 2012 19:33:57 +0000 Subject: iOS support work in progress include/core/SkTypes.h - address unsigned warning include/core/SkInstCnt.h src/core/SkInstCnt.cpp gyp/common.gypi - always define SK_ENABLE_INST_COUNT for debug builds src/views/mac/SkNSView.mm - only call glClear if there is a GL context src/ports/SkImageDecoder_CG.cpp - fix iOS hack by using proper include gyp/opts.gyp - exclude more ARM files from iOS for now (see issue 900) gyp/common_conditions.gypi - add release, more ios specific common settings gyp/bench.gyp - add iOS condition gyp/SampleApp.gyp - remove precompiled header, hardcoded SDK path - add more frameworks gyp/debugger.gyp - fix syntax error - add iOS/Android condition gyp/core.gyp - remove hardcoded SDK path, add more frameworks gyp/common_variables.gypi - add ios SDK path - add ios SDK version gyp/iOSSampleApp.gyp - remove obsolete project gyp/zlib.gyp - add ios library path Review URL: https://codereview.appspot.com/6551070 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@5649 2bbb7eff-a529-9590-31e7-b0007b416f81 --- SampleApp.gyp | 19 +--- bench.gyp | 2 +- common.gypi | 1 - common_conditions.gypi | 10 +- common_variables.gypi | 8 ++ core.gyp | 17 +-- debugger.gyp | 5 +- iOSSampleApp.gyp | 275 ------------------------------------------------- opts.gyp | 6 +- zlib.gyp | 8 ++ 10 files changed, 38 insertions(+), 313 deletions(-) delete mode 100644 iOSSampleApp.gyp diff --git a/SampleApp.gyp b/SampleApp.gyp index 753d374..e54dbe0 100644 --- a/SampleApp.gyp +++ b/SampleApp.gyp @@ -210,7 +210,6 @@ '../experimental/iOSSampleApp/SkiOSSampleApp-Debug.xcconfig', '../experimental/iOSSampleApp/SkiOSSampleApp-Release.xcconfig', '../experimental/iOSSampleApp/iOSSampleApp-Info.plist', - '../experimental/iOSSampleApp/iOSSampleApp_Prefix.pch', '../experimental/iOSSampleApp/Shared/SkOptionListController.h', '../experimental/iOSSampleApp/Shared/SkOptionListController.mm', '../experimental/iOSSampleApp/Shared/SkUIRootViewController.h', @@ -248,21 +247,6 @@ '../experimental/iOSSampleApp/SkiOSSampleApp-Release.xcconfig', ], 'link_settings': { - 'variables': { - 'ios_sdk_version%': '5.1', - }, - 'conditions' : [ - [ 'skia_arch_type == "x86"', { - 'variables': { - 'ios_sdk_dir%': '/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator', - }, - }], - [ 'skia_arch_type == "arm"', { - 'variables': { - 'ios_sdk_dir%': '/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS', - }, - }], - ], 'libraries': [ '<(ios_sdk_dir)<(ios_sdk_version).sdk/System/Library/Frameworks/CoreFoundation.framework', '<(ios_sdk_dir)<(ios_sdk_version).sdk/System/Library/Frameworks/CoreGraphics.framework', @@ -271,6 +255,8 @@ '<(ios_sdk_dir)<(ios_sdk_version).sdk/System/Library/Frameworks/Foundation.framework', '<(ios_sdk_dir)<(ios_sdk_version).sdk/System/Library/Frameworks/QuartzCore.framework', '<(ios_sdk_dir)<(ios_sdk_version).sdk/System/Library/Frameworks/OpenGLES.framework', + '<(ios_sdk_dir)<(ios_sdk_version).sdk/System/Library/Frameworks/ImageIO.framework', + '<(ios_sdk_dir)<(ios_sdk_version).sdk/System/Library/Frameworks/MobileCoreServices.framework', ], }, 'include_dirs' : [ @@ -279,7 +265,6 @@ '../experimental/iOSSampleApp/iPhone', '../include/utils/ios', ], - 'xcode_config_file': '../experimental/iOSSampleApp/SkiOSSampleApp-Base.xcconfig', 'mac_bundle_resources' : [ '../experimental/iOSSampleApp/iPad/MainWindow_iPad.xib', '../experimental/iOSSampleApp/iPhone/MainWindow_iPhone.xib', diff --git a/bench.gyp b/bench.gyp index 44ebbf2..7a413e1 100644 --- a/bench.gyp +++ b/bench.gyp @@ -57,7 +57,7 @@ 'core.gyp:core', ], 'conditions': [ - [ 'skia_os != "mac"', { + [ 'skia_os not in ["mac", "ios"]', { 'sources!': [ '../bench/BenchSysTimer_mach.h', '../bench/BenchSysTimer_mach.cpp', diff --git a/common.gypi b/common.gypi index 4b558f8..b620226 100644 --- a/common.gypi +++ b/common.gypi @@ -75,7 +75,6 @@ 'Debug': { 'defines': [ 'SK_DEBUG', - 'SK_ENABLE_INST_COUNT', 'GR_DEBUG=1', ], }, diff --git a/common_conditions.gypi b/common_conditions.gypi index 934eba9..2ec0ef8 100644 --- a/common_conditions.gypi +++ b/common_conditions.gypi @@ -219,13 +219,21 @@ 'GCC_OPTIMIZATION_LEVEL': '0', }, }, + 'Release': { + 'xcode_settings': { + 'GCC_OPTIMIZATION_LEVEL': '3', + }, + 'defines': [ 'NDEBUG' ], + }, }, 'xcode_settings': { - 'ARCHS': 'armv7', + 'ARCHS': 'armv6 armv7', 'CODE_SIGNING_REQUIRED': 'NO', 'CODE_SIGN_IDENTITY[sdk=iphoneos*]': '', + 'IPHONEOS_DEPLOYMENT_TARGET': '<(ios_sdk_version)', 'SYMROOT': '<(DEPTH)/xcodebuild', 'SDKROOT': 'iphoneos', + 'TARGETED_DEVICE_FAMILY': '1,2', 'OTHER_CPLUSPLUSFLAGS': '-fvisibility=hidden -fvisibility-inlines-hidden', }, }, diff --git a/common_variables.gypi b/common_variables.gypi index ee89ca9..8e4ab80 100644 --- a/common_variables.gypi +++ b/common_variables.gypi @@ -67,6 +67,11 @@ }, { 'skia_static_initializers%': 1, }], + [ 'skia_arch_type == "x86"', { + 'ios_sdk_dir%': '/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator', + }, { + 'ios_sdk_dir%': '/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS', + }], ], 'skia_scalar%': 'float', @@ -78,6 +83,7 @@ 'android_make_apk%': 1, 'skia_nacl%': 0, 'skia_gpu%': 1, + 'ios_sdk_version%': '5.1', 'skia_osx_sdkroot%': 'macosx10.6', }, @@ -97,6 +103,8 @@ 'skia_gpu%': '<(skia_gpu)', 'skia_osx_sdkroot%': '<(skia_osx_sdkroot)', 'skia_static_initializers%': '<(skia_static_initializers)', + 'ios_sdk_version%': '<(ios_sdk_version)', + 'ios_sdk_dir%': '<(ios_sdk_dir)', # These are referenced by our .gypi files that list files (e.g. core.gypi) # diff --git a/core.gyp b/core.gyp index b565c08..d4d6abb 100644 --- a/core.gyp +++ b/core.gyp @@ -57,21 +57,6 @@ '../include/utils/mac/SkCGUtils.h', ], 'link_settings': { - 'variables': { - 'ios_sdk_version%': '5.1', - }, - 'conditions' : [ - [ 'skia_arch_type == "x86"', { - 'variables': { - 'ios_sdk_dir%': '/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator', - }, - }], - [ 'skia_arch_type == "arm"', { - 'variables': { - 'ios_sdk_dir%': '/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS', - }, - }], - ], 'libraries': [ '<(ios_sdk_dir)<(ios_sdk_version).sdk/System/Library/Frameworks/CoreFoundation.framework', '<(ios_sdk_dir)<(ios_sdk_version).sdk/System/Library/Frameworks/CoreGraphics.framework', @@ -80,6 +65,8 @@ '<(ios_sdk_dir)<(ios_sdk_version).sdk/System/Library/Frameworks/Foundation.framework', '<(ios_sdk_dir)<(ios_sdk_version).sdk/System/Library/Frameworks/QuartzCore.framework', '<(ios_sdk_dir)<(ios_sdk_version).sdk/System/Library/Frameworks/OpenGLES.framework', + '<(ios_sdk_dir)<(ios_sdk_version).sdk/System/Library/Frameworks/ImageIO.framework', + '<(ios_sdk_dir)<(ios_sdk_version).sdk/System/Library/Frameworks/MobileCoreServices.framework', ], }, }], diff --git a/debugger.gyp b/debugger.gyp index 3c72123..9402538 100644 --- a/debugger.gyp +++ b/debugger.gyp @@ -67,7 +67,7 @@ }, }], [ 'skia_os == "mac" and skia_arch_width != 64', { - 'error': '', ], }], + [ 'skia_os == "ios"', { + 'link_settings': { + 'libraries': [ + '<(ios_sdk_dir)<(ios_sdk_version).sdk/usr/lib/libz.dylib', + ], + }, + 'defines': [ 'SK_ZLIB_INCLUDE=', ], + }], [ 'skia_os in ["linux", "freebsd", "openbsd", "solaris", "android"]', { 'link_settings': { 'libraries': [ '-lz', ], }, 'defines': [ 'SK_ZLIB_INCLUDE=', ], -- cgit v1.2.3 From 2f2708fb78a4868a116408c8c96416378ff88492 Mon Sep 17 00:00:00 2001 From: "caryclark@google.com" Date: Mon, 24 Sep 2012 19:41:43 +0000 Subject: unbreak the build move define of skia_arch_type to front git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@5650 2bbb7eff-a529-9590-31e7-b0007b416f81 --- common_variables.gypi | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/common_variables.gypi b/common_variables.gypi index 8e4ab80..b6ddb8d 100644 --- a/common_variables.gypi +++ b/common_variables.gypi @@ -51,6 +51,8 @@ # so that siblings of the level-2 'variables' dict can see them. 'skia_os%': '<(skia_os)', + 'skia_arch_type%': 'x86', + 'conditions': [ ['skia_os == "win"', { 'os_posix%': 0, @@ -78,7 +80,6 @@ 'skia_mesa%': 0, 'skia_nv_path_rendering%': 0, 'skia_angle%': 0, - 'skia_arch_type%': 'x86', 'skia_directwrite%': 0, 'android_make_apk%': 1, 'skia_nacl%': 0, -- cgit v1.2.3 From 8919bb4c0ed647108dc84a31fbb407072ca0f3de Mon Sep 17 00:00:00 2001 From: "caryclark@google.com" Date: Mon, 24 Sep 2012 20:08:43 +0000 Subject: unbreak the build part ii allow android in debugger.gyp git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@5651 2bbb7eff-a529-9590-31e7-b0007b416f81 --- debugger.gyp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debugger.gyp b/debugger.gyp index 9402538..27109dc 100644 --- a/debugger.gyp +++ b/debugger.gyp @@ -84,7 +84,7 @@ ], }, }], - [ 'skia_os in ["android", "ios"]', { + [ 'skia_os in ["ios"]', { 'error': ' Date: Mon, 24 Sep 2012 21:27:14 +0000 Subject: Build fix. Unreviewed. git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@5653 2bbb7eff-a529-9590-31e7-b0007b416f81 --- common_variables.gypi | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/common_variables.gypi b/common_variables.gypi index b6ddb8d..b59bd11 100644 --- a/common_variables.gypi +++ b/common_variables.gypi @@ -45,13 +45,13 @@ # We set it automatically based on 'OS' (the host OS), but allow the # user to override it via GYP_DEFINES if they like. 'skia_os%': '<(OS)', + 'skia_arch_type%': 'x86', }, # Re-define all variables defined within the level-3 'variables' dict, # so that siblings of the level-2 'variables' dict can see them. 'skia_os%': '<(skia_os)', - - 'skia_arch_type%': 'x86', + 'skia_arch_type%': '<(skia_arch_type)', 'conditions': [ ['skia_os == "win"', { -- cgit v1.2.3 From 1b12963e18666a367bcf86ab1af8321b71a0c5b8 Mon Sep 17 00:00:00 2001 From: "caryclark@google.com" Date: Mon, 24 Sep 2012 21:38:38 +0000 Subject: fix mac builds comment out 64 bit / mac error check git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@5654 2bbb7eff-a529-9590-31e7-b0007b416f81 --- debugger.gyp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/debugger.gyp b/debugger.gyp index 27109dc..c37c9c6 100644 --- a/debugger.gyp +++ b/debugger.gyp @@ -67,7 +67,8 @@ }, }], [ 'skia_os == "mac" and skia_arch_width != 64', { - 'error': ' Date: Tue, 25 Sep 2012 17:48:30 +0000 Subject: Delete SkListView.cpp, which has been #ifdef'ed out for 4+ years Review URL: https://codereview.appspot.com/6550062 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@5667 2bbb7eff-a529-9590-31e7-b0007b416f81 --- views_animated.gyp | 2 -- 1 file changed, 2 deletions(-) diff --git a/views_animated.gyp b/views_animated.gyp index 90d5351..f117ddc 100644 --- a/views_animated.gyp +++ b/views_animated.gyp @@ -26,7 +26,6 @@ '../src/views/animated/SkBorderView.cpp', '../src/views/animated/SkImageView.cpp', - '../src/views/animated/SkListView.cpp', '../src/views/animated/SkListWidget.cpp', '../src/views/animated/SkProgressBarView.cpp', '../src/views/animated/SkScrollBarView.cpp', @@ -34,7 +33,6 @@ '../src/views/animated/SkWidgetViews.cpp', ], 'sources!' : [ - '../src/views/animated/SkListView.cpp', #depends on missing SkListSource implementation '../src/views/animated/SkListWidget.cpp', #depends on missing SkListSource implementation ], 'conditions': [ -- cgit v1.2.3 From ad81c23a210b202a0f9a6bde3b7a7a975adb1fce Mon Sep 17 00:00:00 2001 From: "epoger@google.com" Date: Tue, 25 Sep 2012 18:24:41 +0000 Subject: Remove SkListWidget.cpp, which has not been compiled for 18 months (Our very first gyp file from https://code.google.com/p/skia/source/detail?spec=svn955&r=955 already had it turned off) Review URL: https://codereview.appspot.com/6566049 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@5668 2bbb7eff-a529-9590-31e7-b0007b416f81 --- views_animated.gyp | 5 ----- 1 file changed, 5 deletions(-) diff --git a/views_animated.gyp b/views_animated.gyp index f117ddc..1767fe1 100644 --- a/views_animated.gyp +++ b/views_animated.gyp @@ -26,15 +26,11 @@ '../src/views/animated/SkBorderView.cpp', '../src/views/animated/SkImageView.cpp', - '../src/views/animated/SkListWidget.cpp', '../src/views/animated/SkProgressBarView.cpp', '../src/views/animated/SkScrollBarView.cpp', '../src/views/animated/SkStaticTextView.cpp', '../src/views/animated/SkWidgetViews.cpp', ], - 'sources!' : [ - '../src/views/animated/SkListWidget.cpp', #depends on missing SkListSource implementation - ], 'conditions': [ [ 'skia_os == "mac"', { 'link_settings': { @@ -53,7 +49,6 @@ 'sources!': [ '../src/views/animated/SkBorderView.cpp', '../src/views/animated/SkImageView.cpp', - '../src/views/animated/SkListWidget.cpp', '../src/views/animated/SkProgressBarView.cpp', '../src/views/animated/SkScrollBarView.cpp', '../src/views/animated/SkStaticTextView.cpp', -- cgit v1.2.3 From cd15463f84064a3146d8cd266e9d5e3fb09db186 Mon Sep 17 00:00:00 2001 From: "robertphillips@google.com" Date: Tue, 25 Sep 2012 18:53:17 +0000 Subject: Remove GrTLList.h https://codereview.appspot.com/6577043/ git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@5670 2bbb7eff-a529-9590-31e7-b0007b416f81 --- gpu.gypi | 1 - 1 file changed, 1 deletion(-) diff --git a/gpu.gypi b/gpu.gypi index b9ea739..1401a59 100644 --- a/gpu.gypi +++ b/gpu.gypi @@ -121,7 +121,6 @@ '<(skia_src_path)/gpu/GrTexture.cpp', '<(skia_src_path)/gpu/GrTextureAccess.cpp', '<(skia_src_path)/gpu/GrTHashCache.h', - '<(skia_src_path)/gpu/GrTLList.h', '<(skia_src_path)/gpu/GrVertexBuffer.h', '<(skia_src_path)/gpu/gr_unittests.cpp', -- cgit v1.2.3 From ea8a4800d2725101b8e7f5f3599021219eed6d5b Mon Sep 17 00:00:00 2001 From: "bsalomon@google.com" Date: Tue, 25 Sep 2012 19:14:14 +0000 Subject: Disable warning emitted in libjpg build Review URL: https://codereview.appspot.com/6573047 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@5673 2bbb7eff-a529-9590-31e7-b0007b416f81 --- libjpeg.gyp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/libjpeg.gyp b/libjpeg.gyp index 77bc276..5780b27 100644 --- a/libjpeg.gyp +++ b/libjpeg.gyp @@ -80,7 +80,12 @@ ], }, 'conditions': [ - ['OS!="win"', {'product_name': 'jpeg'}], + ['OS!="win"', { + 'product_name': 'jpeg', + 'cflags': [ + '-Wno-main', # supresses warnings about naming things "main" + ], + }], ['OS=="android"', { 'cflags!': [ '-fno-rtti', # supresses warnings about invalid option of non-C++ code -- cgit v1.2.3 From d0794804fdda520aaa01cba7d62515e534ed50bb Mon Sep 17 00:00:00 2001 From: "mike@reedtribe.org" Date: Wed, 26 Sep 2012 03:06:55 +0000 Subject: remove SampleXfermodes.cpp (obsolete, as we have it as a GM) git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@5681 2bbb7eff-a529-9590-31e7-b0007b416f81 --- SampleApp.gyp | 1 - common_variables.gypi | 2 +- gmslides.gypi | 1 + 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/SampleApp.gyp b/SampleApp.gyp index e54dbe0..e384e13 100644 --- a/SampleApp.gyp +++ b/SampleApp.gyp @@ -101,7 +101,6 @@ '../samplecode/SampleTypeface.cpp', '../samplecode/SampleUnitMapper.cpp', '../samplecode/SampleVertices.cpp', - '../samplecode/SampleXfermodes.cpp', '../samplecode/SampleXfermodesBlur.cpp', '../samplecode/TransitionView.cpp', '../samplecode/TransitionView.h', diff --git a/common_variables.gypi b/common_variables.gypi index b59bd11..7dd5e3d 100644 --- a/common_variables.gypi +++ b/common_variables.gypi @@ -85,7 +85,7 @@ 'skia_nacl%': 0, 'skia_gpu%': 1, 'ios_sdk_version%': '5.1', - 'skia_osx_sdkroot%': 'macosx10.6', + 'skia_osx_sdkroot%': 'macosx10.8', }, # Re-define all variables defined within the level-2 'variables' dict, diff --git a/gmslides.gypi b/gmslides.gypi index 003cb05..4044bb2 100644 --- a/gmslides.gypi +++ b/gmslides.gypi @@ -1,6 +1,7 @@ # include this gypi to include all the golden master slides. { 'sources': [ + '../gm/techtalk1.cpp', '../gm/aaclip.cpp', '../gm/aarectmodes.cpp', '../gm/arithmode.cpp', -- cgit v1.2.3 From 91dbbcb39b9c73d16561e6143a54bb0734c46d60 Mon Sep 17 00:00:00 2001 From: "mike@reedtribe.org" Date: Wed, 26 Sep 2012 03:08:16 +0000 Subject: revert 5681 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@5682 2bbb7eff-a529-9590-31e7-b0007b416f81 --- SampleApp.gyp | 1 + common_variables.gypi | 2 +- gmslides.gypi | 1 - 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/SampleApp.gyp b/SampleApp.gyp index e384e13..e54dbe0 100644 --- a/SampleApp.gyp +++ b/SampleApp.gyp @@ -101,6 +101,7 @@ '../samplecode/SampleTypeface.cpp', '../samplecode/SampleUnitMapper.cpp', '../samplecode/SampleVertices.cpp', + '../samplecode/SampleXfermodes.cpp', '../samplecode/SampleXfermodesBlur.cpp', '../samplecode/TransitionView.cpp', '../samplecode/TransitionView.h', diff --git a/common_variables.gypi b/common_variables.gypi index 7dd5e3d..b59bd11 100644 --- a/common_variables.gypi +++ b/common_variables.gypi @@ -85,7 +85,7 @@ 'skia_nacl%': 0, 'skia_gpu%': 1, 'ios_sdk_version%': '5.1', - 'skia_osx_sdkroot%': 'macosx10.8', + 'skia_osx_sdkroot%': 'macosx10.6', }, # Re-define all variables defined within the level-2 'variables' dict, diff --git a/gmslides.gypi b/gmslides.gypi index 4044bb2..003cb05 100644 --- a/gmslides.gypi +++ b/gmslides.gypi @@ -1,7 +1,6 @@ # include this gypi to include all the golden master slides. { 'sources': [ - '../gm/techtalk1.cpp', '../gm/aaclip.cpp', '../gm/aarectmodes.cpp', '../gm/arithmode.cpp', -- cgit v1.2.3 From cbd38d8d36d4f2feb7f10bfe691265c927ae6dda Mon Sep 17 00:00:00 2001 From: "mike@reedtribe.org" Date: Wed, 26 Sep 2012 03:10:09 +0000 Subject: re-land 5681, but just the gyp file I wanted git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@5683 2bbb7eff-a529-9590-31e7-b0007b416f81 --- SampleApp.gyp | 1 - 1 file changed, 1 deletion(-) diff --git a/SampleApp.gyp b/SampleApp.gyp index e54dbe0..e384e13 100644 --- a/SampleApp.gyp +++ b/SampleApp.gyp @@ -101,7 +101,6 @@ '../samplecode/SampleTypeface.cpp', '../samplecode/SampleUnitMapper.cpp', '../samplecode/SampleVertices.cpp', - '../samplecode/SampleXfermodes.cpp', '../samplecode/SampleXfermodesBlur.cpp', '../samplecode/TransitionView.cpp', '../samplecode/TransitionView.h', -- cgit v1.2.3 From 4252a6799bfc5262fbf63c55251fceea9271ad00 Mon Sep 17 00:00:00 2001 From: "caryclark@google.com" Date: Wed, 26 Sep 2012 13:00:03 +0000 Subject: shape ops -- update gyp projects goodbye cruel world (updating to OS X 10.8) git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@5685 2bbb7eff-a529-9590-31e7-b0007b416f81 --- shapeops_demo.gyp | 5 +++++ shapeops_edge.gyp | 9 +++++++++ 2 files changed, 14 insertions(+) diff --git a/shapeops_demo.gyp b/shapeops_demo.gyp index b7c00f3..25ac70a 100644 --- a/shapeops_demo.gyp +++ b/shapeops_demo.gyp @@ -34,11 +34,14 @@ '../experimental/Intersection/QuadraticBezierClip.cpp', '../experimental/Intersection/QuadraticBounds.cpp', '../experimental/Intersection/QuadraticIntersection.cpp', + '../experimental/Intersection/QuadraticImplicit.cpp', '../experimental/Intersection/QuadraticLineSegments.cpp', '../experimental/Intersection/QuadraticParameterization.cpp', '../experimental/Intersection/QuadraticReduceOrder.cpp', '../experimental/Intersection/QuadraticSubDivide.cpp', '../experimental/Intersection/QuadraticUtilities.cpp', + '../experimental/Intersection/QuarticRoot.cpp', + '../experimental/Intersection/ShapeOps.cpp', '../experimental/Intersection/Simplify.cpp', '../experimental/Intersection/CubicParameterization.cpp', '../experimental/Intersection/CubicReduceOrder.cpp', @@ -54,7 +57,9 @@ '../experimental/Intersection/LineParameters.h', '../experimental/Intersection/LineUtilities.h', '../experimental/Intersection/QuadraticLineSegments.h', + '../experimental/Intersection/QuadraticParameterization.h', '../experimental/Intersection/QuadraticUtilities.h', + '../experimental/Intersection/QuarticRoot.h', '../experimental/Intersection/ShapeOps.h', '../experimental/Intersection/Simplify.h', '../experimental/Intersection/TSearch.h', diff --git a/shapeops_edge.gyp b/shapeops_edge.gyp index 8715576..cc62f3e 100644 --- a/shapeops_edge.gyp +++ b/shapeops_edge.gyp @@ -22,6 +22,7 @@ '../experimental/Intersection/CubicIntersection.cpp', '../experimental/Intersection/CubicIntersection_Test.cpp', '../experimental/Intersection/CubicIntersection_TestData.cpp', + '../experimental/Intersection/CubicLineSegments.cpp', '../experimental/Intersection/CubicParameterization.cpp', '../experimental/Intersection/CubicParameterization_Test.cpp', '../experimental/Intersection/CubicParameterizationCode.cpp', @@ -43,6 +44,7 @@ '../experimental/Intersection/Extrema.cpp', '../experimental/Intersection/Inline_Tests.cpp', '../experimental/Intersection/Intersection_Tests.cpp', + '../experimental/Intersection/Intersections.cpp', '../experimental/Intersection/IntersectionUtilities.cpp', '../experimental/Intersection/LineCubicIntersection.cpp', '../experimental/Intersection/LineCubicIntersection_Test.cpp', @@ -56,6 +58,7 @@ '../experimental/Intersection/QuadraticBezierClip.cpp', '../experimental/Intersection/QuadraticBezierClip_Test.cpp', '../experimental/Intersection/QuadraticBounds.cpp', + '../experimental/Intersection/QuadraticImplicit.cpp', '../experimental/Intersection/QuadraticIntersection.cpp', '../experimental/Intersection/QuadraticIntersection_Test.cpp', '../experimental/Intersection/QuadraticIntersection_TestData.cpp', @@ -66,6 +69,9 @@ '../experimental/Intersection/QuadraticReduceOrder_Test.cpp', '../experimental/Intersection/QuadraticSubDivide.cpp', '../experimental/Intersection/QuadraticUtilities.cpp', + '../experimental/Intersection/QuarticRoot.cpp', + '../experimental/Intersection/QuarticRoot_Test.cpp', + '../experimental/Intersection/ShapeOps.cpp', '../experimental/Intersection/Simplify.cpp', '../experimental/Intersection/SimplifyAddIntersectingTs_Test.cpp', '../experimental/Intersection/SimplifyAngle_Test.cpp', @@ -75,6 +81,7 @@ '../experimental/Intersection/SimplifyRect4x4_Test.cpp', '../experimental/Intersection/TestUtilities.cpp', '../experimental/Intersection/CubicIntersection_TestData.h', + '../experimental/Intersection/CubicLineSegments.h', '../experimental/Intersection/CubicUtilities.h', '../experimental/Intersection/CurveIntersection.h', '../experimental/Intersection/CurveUtilities.h', @@ -90,7 +97,9 @@ '../experimental/Intersection/Parameterization_Test.h', '../experimental/Intersection/QuadraticIntersection_TestData.h', '../experimental/Intersection/QuadraticLineSegments.h', + '../experimental/Intersection/QuadraticParameterization.h', '../experimental/Intersection/QuadraticUtilities.h', + '../experimental/Intersection/QuarticRoot.h', '../experimental/Intersection/ShapeOps.h', '../experimental/Intersection/Simplify.h', '../experimental/Intersection/TestUtilities.h', -- cgit v1.2.3 From 26af2da1b2df2f30718889a5efef054661c83e4c Mon Sep 17 00:00:00 2001 From: "caryclark@google.com" Date: Wed, 26 Sep 2012 13:02:37 +0000 Subject: add simple ios app update ios flavor of sample app fix utils.gyp for ios git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@5686 2bbb7eff-a529-9590-31e7-b0007b416f81 --- SampleApp.gyp | 6 +++++ SimpleiOSApp.gyp | 74 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ utils.gyp | 2 ++ 3 files changed, 82 insertions(+) create mode 100644 SimpleiOSApp.gyp diff --git a/SampleApp.gyp b/SampleApp.gyp index e384e13..6de6f70 100644 --- a/SampleApp.gyp +++ b/SampleApp.gyp @@ -205,6 +205,8 @@ 'sources': [ '../src/views/mac/SkEventNotifier.h', '../src/views/mac/SkEventNotifier.mm', + '../experimental/iOSSampleApp/SkSampleUIView.h', + '../experimental/iOSSampleApp/SkSampleUIView.mm', '../experimental/iOSSampleApp/SkiOSSampleApp-Base.xcconfig', '../experimental/iOSSampleApp/SkiOSSampleApp-Debug.xcconfig', '../experimental/iOSSampleApp/SkiOSSampleApp-Release.xcconfig', @@ -264,6 +266,10 @@ '../experimental/iOSSampleApp/iPhone', '../include/utils/ios', ], + 'xcode_settings' : { + 'INFOPLIST_FILE' : '../experimental/iOSSampleApp/iOSSampleApp-Info.plist', + }, + 'xcode_config_file': '../experimental/iOSSampleApp/SkiOSSampleApp-Base.xcconfig', 'mac_bundle_resources' : [ '../experimental/iOSSampleApp/iPad/MainWindow_iPad.xib', '../experimental/iOSSampleApp/iPhone/MainWindow_iPhone.xib', diff --git a/SimpleiOSApp.gyp b/SimpleiOSApp.gyp new file mode 100644 index 0000000..5b69e64 --- /dev/null +++ b/SimpleiOSApp.gyp @@ -0,0 +1,74 @@ +{ + 'conditions' : [ + [ 'skia_os != "ios"', { + 'error': ' Date: Wed, 26 Sep 2012 15:48:43 +0000 Subject: move the xcode setup for SYMROOT to the outermost level Review URL: https://codereview.appspot.com/6576050 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@5693 2bbb7eff-a529-9590-31e7-b0007b416f81 --- common_conditions.gypi | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/common_conditions.gypi b/common_conditions.gypi index 2ec0ef8..14026d7 100644 --- a/common_conditions.gypi +++ b/common_conditions.gypi @@ -180,7 +180,6 @@ }, 'xcode_settings': { 'GCC_SYMBOLS_PRIVATE_EXTERN': 'NO', - 'SYMROOT': '<(DEPTH)/xcodebuild', 'SDKROOT': '<(skia_osx_sdkroot)', # trying to get this to work, but it needs clang I think... # 'WARNING_CFLAGS': '-Wexit-time-destructors', @@ -231,7 +230,6 @@ 'CODE_SIGNING_REQUIRED': 'NO', 'CODE_SIGN_IDENTITY[sdk=iphoneos*]': '', 'IPHONEOS_DEPLOYMENT_TARGET': '<(ios_sdk_version)', - 'SYMROOT': '<(DEPTH)/xcodebuild', 'SDKROOT': 'iphoneos', 'TARGETED_DEVICE_FAMILY': '1,2', 'OTHER_CPLUSPLUSFLAGS': '-fvisibility=hidden -fvisibility-inlines-hidden', @@ -323,6 +321,10 @@ }], ], # end 'conditions' + # The Xcode SYMROOT must be at the root. See build/common.gypi in chromium for more details + 'xcode_settings': { + 'SYMROOT': '<(DEPTH)/xcodebuild', + }, } # Local Variables: -- cgit v1.2.3 From 636b5e365e2bd595fd46f0194443d067e722539b Mon Sep 17 00:00:00 2001 From: "fmalita@google.com" Date: Wed, 26 Sep 2012 18:32:58 +0000 Subject: Fix Xcode 4.x debugger build Adding a mac_framework_dirs entry to help Xcode find the Qt frameworks. R=djsollen@google.com BUG= Review URL: https://codereview.appspot.com/6564056 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@5702 2bbb7eff-a529-9590-31e7-b0007b416f81 --- debugger.gyp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/debugger.gyp b/debugger.gyp index c37c9c6..32afe7c 100644 --- a/debugger.gyp +++ b/debugger.gyp @@ -72,6 +72,9 @@ }], [ 'skia_os == "mac"', { 'mac_bundle' : 1, + 'mac_framework_dirs': [ + '/Library/Frameworks', + ], 'include_dirs': [ '/Library/Frameworks/QtCore.framework/Headers/', '/Library/Frameworks/QtGui.framework/Headers/', -- cgit v1.2.3 From 895f28975ddff757f0b64bd654e39c9621666b0b Mon Sep 17 00:00:00 2001 From: "fmalita@google.com" Date: Thu, 27 Sep 2012 13:34:34 +0000 Subject: Generate debugger MOCs on the fly Added gyp rules to generate Qt MOC files at build time, and removed the pre-packaged versions. Tested on Mac with Qt 4.6.4 & 4.8.3, and on Linux with Qt 4.8.1. R=caryclark@google.com,robertphillips@google.com,djsollen@google.com BUG= Review URL: https://codereview.appspot.com/6561054 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@5707 2bbb7eff-a529-9590-31e7-b0007b416f81 --- debugger.gyp | 182 +++++++++++++++++++++++++++++++++++++---------------------- 1 file changed, 113 insertions(+), 69 deletions(-) diff --git a/debugger.gyp b/debugger.gyp index 32afe7c..5552ca1 100644 --- a/debugger.gyp +++ b/debugger.gyp @@ -1,13 +1,86 @@ { + 'variables': { + 'conditions': [ + [ 'skia_os in ["linux", "freebsd", "openbsd", "solaris"]', { + # Use the systemwide Qt libs by default + 'variables': { + 'qt_sdk%': '/usr', + }, + 'qt_sdk': '<(qt_sdk)', + 'qt_moc%': 'moc', + 'qt_includes': [ + '<(qt_sdk)/include', + '<(qt_sdk)/include/QtCore', + '<(qt_sdk)/include/QtGui', + '<(qt_sdk)/include/QtOpenGL', + + # Systemwide Qt libs are not contained under a single tree, + # so we're adding package-qualified paths as a fallback. + '<(qt_sdk)/include/qt4', + '<(qt_sdk)/include/qt4/QtCore', + '<(qt_sdk)/include/qt4/QtGui', + '<(qt_sdk)/include/qt4/QtOpenGL', + ], + 'qt_libs': [ + '-lQtCore', + '-lQtGui', + '-lQtOpenGL' + ], + }], + [ 'skia_os == "mac"', { + # Use the systemwide Qt libs by default + 'variables': { + 'qt_sdk%': '/Library/Frameworks', + }, + 'qt_sdk': '<(qt_sdk)', + 'qt_moc%': 'moc', + 'qt_includes': [ + '<(qt_sdk)/QtCore.framework/Headers/', + '<(qt_sdk)/QtGui.framework/Headers/', + '<(qt_sdk)/QtOpenGL.framework/Headers/', + ], + 'qt_libs': [ + '<(qt_sdk)/QtCore.framework', + '<(qt_sdk)/QtGui.framework', + '<(qt_sdk)/QtOpenGL.framework', + ], + }], + [ 'skia_os == "win"', { + 'variables': { + # TODO: location of systemwide Qt on Win? + 'qt_sdk%': 'C:/Qt/4.6.4/', + }, + 'qt_sdk': '<(qt_sdk)', + 'qt_moc%': '<(qt_sdk)/bin/moc', + 'qt_includes': [ + '<(qt_sdk)/include', + '<(qt_sdk)/include/QtCore', + '<(qt_sdk)/include/QtGui', + '<(qt_sdk)/include/QtOpenGL', + ], + 'qt_libs': [ + '<(qt_sdk)/lib/QtCore4.lib', + '<(qt_sdk)/lib/QtGui4.lib', + '<(qt_sdk)/lib/QtOpenGL.lib', + ], + }], + ], + 'moc_src_dir': '../debugger/QT', + }, 'targets': [ { 'target_name': 'debugger', 'type': 'executable', + 'mac_bundle': 1, + 'mac_framework_dirs': [ + '/Library/Frameworks', + ], 'include_dirs' : [ '../src/core', - '../debugger', # To pull SkDebugger.h - '../debugger/QT', # For all the QT UI Goodies - '../src/gpu', # To pull gl/GrGLUtil.h + '../debugger', # To pull SkDebugger.h + '../debugger/QT', # For all the QT UI Goodies + '../src/gpu', # To pull gl/GrGLUtil.h + '<@(qt_includes)', ], 'sources': [ '../debugger/debuggermain.cpp', @@ -16,12 +89,8 @@ '../debugger/SkDebugger.cpp', '../debugger/SkDrawCommand.h', '../debugger/SkDrawCommand.cpp', - '../debugger/QT/moc_4.6.2_SkCanvasWidget.cpp', - '../debugger/QT/moc_4.6.2_SkDebuggerGUI.cpp', - '../debugger/QT/moc_4.6.2_SkInspectorWidget.cpp', - '../debugger/QT/moc_4.6.2_SkSettingsWidget.cpp', - '../debugger/QT/moc_4.6.2_SkRasterWidget.cpp', - '../debugger/QT/moc_4.6.2_SkGLWidget.cpp', + '../debugger/SkObjectParser.h', + '../debugger/SkObjectParser.cpp', '../debugger/QT/SkDebuggerGUI.cpp', '../debugger/QT/SkDebuggerGUI.h', '../debugger/QT/SkCanvasWidget.cpp', @@ -30,8 +99,6 @@ '../debugger/QT/SkInspectorWidget.cpp', '../debugger/QT/SkListWidget.h', '../debugger/QT/SkListWidget.cpp', - '../debugger/SkObjectParser.h', - '../debugger/SkObjectParser.cpp', '../debugger/QT/SkSettingsWidget.h', '../debugger/QT/SkSettingsWidget.cpp', '../debugger/QT/SkGLWidget.h', @@ -41,6 +108,14 @@ # To update this file edit SkIcons.qrc and rerun rcc to generate cpp '../debugger/QT/qrc_SkIcons.cpp', + + # Generated MOC files + '<(moc_src_dir)/moc_SkCanvasWidget.cpp', + '<(moc_src_dir)/moc_SkDebuggerGUI.cpp', + '<(moc_src_dir)/moc_SkInspectorWidget.cpp', + '<(moc_src_dir)/moc_SkSettingsWidget.cpp', + '<(moc_src_dir)/moc_SkRasterWidget.cpp', + '<(moc_src_dir)/moc_SkGLWidget.cpp', ], 'dependencies': [ 'core.gyp:core', @@ -49,65 +124,34 @@ 'effects.gyp:effects', 'gpu.gyp:gr', 'gpu.gyp:skgr', + 'debugger_mocs', + ], + 'link_settings': { + 'libraries': [ + '<@(qt_libs)', + ], + }, + }, + { + 'target_name': 'debugger_mocs', + 'type': 'none', + 'sources': [ + '<(moc_src_dir)/SkCanvasWidget.h', + '<(moc_src_dir)/SkDebuggerGUI.h', + '<(moc_src_dir)/SkInspectorWidget.h', + '<(moc_src_dir)/SkSettingsWidget.h', + '<(moc_src_dir)/SkRasterWidget.h', + '<(moc_src_dir)/SkGLWidget.h', + ], + 'rules': [ + { + 'rule_name': 'generate_moc', + 'extension': 'h', + 'outputs': [ '<(RULE_INPUT_DIRNAME)/moc_<(RULE_INPUT_ROOT).cpp' ], + 'action': [ '<(qt_moc)', '<(RULE_INPUT_PATH)', '-o', '<(moc_src_dir)/moc_<(RULE_INPUT_ROOT).cpp' ], + 'message': 'Generating <(RULE_INPUT_ROOT).cpp.', + }, ], - 'conditions': [ - [ 'skia_os in ["linux", "freebsd", "openbsd", "solaris"]', { - 'include_dirs': [ - '/usr/include/qt4', - '/usr/include/qt4/QtCore', - '/usr/include/qt4/QtGui', - '/usr/include/qt4/QtOpenGL', - ], - 'link_settings': { - 'libraries' : [ - '-lQtCore', - '-lQtGui', - '-lQtOpenGL' - ], - }, - }], - [ 'skia_os == "mac" and skia_arch_width != 64', { -# this is now mysteriously triggered for all mac builds -# 'error': ' Date: Thu, 27 Sep 2012 13:44:57 +0000 Subject: Remove deprecated SkOSWindow_wxwidgets.h It seems we never really supported WxWidgets. R=bsalomon@google.com Review URL: https://codereview.appspot.com/6569062 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@5708 2bbb7eff-a529-9590-31e7-b0007b416f81 --- views.gyp | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/views.gyp b/views.gyp index ec3fd79..db748c7 100644 --- a/views.gyp +++ b/views.gyp @@ -1,8 +1,8 @@ -#Views is the Skia windowing toolkit. -#It provides -# * a portable means of creating native windows -# * events -# * basic widgets and controls +# Views is the Skia windowing toolkit. +# It provides: +# * A portable means of creating native windows. +# * Events. +# * Basic widgets and controls. { 'targets': [ @@ -33,7 +33,6 @@ '../include/views/SkOSWindow_SDL.h', '../include/views/SkOSWindow_Unix.h', '../include/views/SkOSWindow_Win.h', - #'../include/views/SkOSWindow_wxwidgets.h', '../include/views/SkStackViewLayout.h', '../include/views/SkSystemEventTypes.h', '../include/views/SkTextBox.h', @@ -62,19 +61,19 @@ '../src/views/SkWidgets.cpp', '../src/views/SkWindow.cpp', - #mac + # Mac '../src/views/mac/SkOSWindow_Mac.mm', '../src/views/mac/skia_mac.mm', - #sdl + # SDL '../src/views/SDL/SkOSWindow_SDL.cpp', - #*nix + # *nix '../src/views/unix/SkOSWindow_Unix.cpp', '../src/views/unix/keysym2ucs.c', '../src/views/unix/skia_unix.cpp', - #windows + # Windows '../src/views/win/SkOSWindow_win.cpp', '../src/views/win/skia_win.cpp', -- cgit v1.2.3 From e041a8a50c9df6540c528db4ea427d76826fd679 Mon Sep 17 00:00:00 2001 From: "bsalomon@google.com" Date: Thu, 27 Sep 2012 16:04:54 +0000 Subject: Make SampleApp work on iPhone/iOS simulator. Several parts to this: 1) The DeviceManager subclass for iOS was rewritten because the base class changed. 2) Two old samples that rely on hardcoded paths to images are deleted. They hit assertions in SkImageRef. No one has the required images to run these anyway. 3) argv must be non-NULL. 4) The UI delegate must not be loaded from the NIB for viewDidLoad ordering reasons. So I removed an IBOutlet link from the window to the splitview controller in the iPad's NIB file. The split view is attached by the AppDelegate programmatically. This doesn't make GPU work. That will come in a later change. Review URL: https://codereview.appspot.com/6561056/ git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@5712 2bbb7eff-a529-9590-31e7-b0007b416f81 --- SampleApp.gyp | 2 -- 1 file changed, 2 deletions(-) diff --git a/SampleApp.gyp b/SampleApp.gyp index 6de6f70..c8b9ba7 100644 --- a/SampleApp.gyp +++ b/SampleApp.gyp @@ -61,8 +61,6 @@ '../samplecode/SampleHairCurves.cpp', '../samplecode/SampleHairline.cpp', '../samplecode/SampleHairModes.cpp', - '../samplecode/SampleImage.cpp', - '../samplecode/SampleImageDir.cpp', '../samplecode/SampleLayerMask.cpp', '../samplecode/SampleLayers.cpp', '../samplecode/SampleLCD.cpp', -- cgit v1.2.3 From a7344aac674debc72c063414a5408f265a443dc0 Mon Sep 17 00:00:00 2001 From: "bsalomon@google.com" Date: Fri, 28 Sep 2012 16:56:28 +0000 Subject: Make gpu work in iOS SampleApp. This includes updates to the GrGLInterface and changes to the DeviceManager subclass used on iOS. Review URL: https://codereview.appspot.com/6582043 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@5722 2bbb7eff-a529-9590-31e7-b0007b416f81 --- gpu.gyp | 2 +- gpu.gypi | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/gpu.gyp b/gpu.gyp index 10f1a80..94988ad 100644 --- a/gpu.gyp +++ b/gpu.gyp @@ -237,7 +237,7 @@ '../src/gpu/gl/mesa/GrGLCreateMesaInterface.cpp', ], }], - [ 'skia_os == "win"', { + [ 'skia_os in ["win", "ios"]', { 'sources!': [ '../src/gpu/gl/GrGLDefaultInterface_none.cpp', '../src/gpu/gl/GrGLCreateNativeInterface_none.cpp', diff --git a/gpu.gypi b/gpu.gypi index 1401a59..2d701c3 100644 --- a/gpu.gypi +++ b/gpu.gypi @@ -182,6 +182,7 @@ '<(skia_src_path)/gpu/gl/mac/GrGLCreateNativeInterface_mac.cpp', '<(skia_src_path)/gpu/gl/win/GrGLCreateNativeInterface_win.cpp', '<(skia_src_path)/gpu/gl/unix/GrGLCreateNativeInterface_unix.cpp', + '<(skia_src_path)/gpu/gl/iOS/GrGLCreateNativeInterface_iOS.cpp', '<(skia_src_path)/gpu/android/GrGLCreateNativeInterface_android.cpp', ], 'gr_mesa_gl_sources': [ -- cgit v1.2.3 From 4157cf55beb2c2c6269b2d1e609e1e182984d8df Mon Sep 17 00:00:00 2001 From: "bsalomon@google.com" Date: Fri, 28 Sep 2012 18:33:11 +0000 Subject: Disable thumb on IOS. This removes one of XCodes complaints about the generated projects. R=caryclark@google.com Review URL: https://codereview.appspot.com/6561072 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@5726 2bbb7eff-a529-9590-31e7-b0007b416f81 --- common_conditions.gypi | 1 + 1 file changed, 1 insertion(+) diff --git a/common_conditions.gypi b/common_conditions.gypi index 14026d7..30b5c60 100644 --- a/common_conditions.gypi +++ b/common_conditions.gypi @@ -233,6 +233,7 @@ 'SDKROOT': 'iphoneos', 'TARGETED_DEVICE_FAMILY': '1,2', 'OTHER_CPLUSPLUSFLAGS': '-fvisibility=hidden -fvisibility-inlines-hidden', + 'GCC_THUMB_SUPPORT': 'NO', }, }, ], -- cgit v1.2.3 From efb7e2734fe9d3d00a0dfc7447d2d88f1d319fd9 Mon Sep 17 00:00:00 2001 From: "reed@google.com" Date: Mon, 1 Oct 2012 18:06:05 +0000 Subject: delete obsolete/unused SkGpuCanvas git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@5752 2bbb7eff-a529-9590-31e7-b0007b416f81 --- gpu.gypi | 2 -- 1 file changed, 2 deletions(-) diff --git a/gpu.gypi b/gpu.gypi index 2d701c3..7731aa9 100644 --- a/gpu.gypi +++ b/gpu.gypi @@ -216,7 +216,6 @@ ], 'skgr_sources': [ - '<(skia_include_path)/gpu/SkGpuCanvas.h', '<(skia_include_path)/gpu/SkGpuDevice.h', '<(skia_include_path)/gpu/SkGr.h', '<(skia_include_path)/gpu/SkGrPixelRef.h', @@ -224,7 +223,6 @@ '<(skia_include_path)/gpu/gl/SkGLContext.h', - '<(skia_src_path)/gpu/SkGpuCanvas.cpp', '<(skia_src_path)/gpu/SkGpuDevice.cpp', '<(skia_src_path)/gpu/SkGr.cpp', '<(skia_src_path)/gpu/SkGrFontScaler.cpp', -- cgit v1.2.3 From 13cc15775a73026d9e5b15a6a13831daf2747711 Mon Sep 17 00:00:00 2001 From: "bsalomon@google.com" Date: Mon, 1 Oct 2012 19:06:57 +0000 Subject: Move android gl files from src/gpu/android to src/gpu/gl/android. R=robertphillips@google.com Review URL: https://codereview.appspot.com/6590051 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@5757 2bbb7eff-a529-9590-31e7-b0007b416f81 --- gpu.gypi | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gpu.gypi b/gpu.gypi index 7731aa9..840abf5 100644 --- a/gpu.gypi +++ b/gpu.gypi @@ -183,7 +183,7 @@ '<(skia_src_path)/gpu/gl/win/GrGLCreateNativeInterface_win.cpp', '<(skia_src_path)/gpu/gl/unix/GrGLCreateNativeInterface_unix.cpp', '<(skia_src_path)/gpu/gl/iOS/GrGLCreateNativeInterface_iOS.cpp', - '<(skia_src_path)/gpu/android/GrGLCreateNativeInterface_android.cpp', + '<(skia_src_path)/gpu/gl/android/GrGLCreateNativeInterface_android.cpp', ], 'gr_mesa_gl_sources': [ '<(skia_src_path)/gpu/gl/mesa/GrGLCreateMesaInterface.cpp', @@ -236,7 +236,7 @@ '<(skia_src_path)/gpu/gl/mac/SkNativeGLContext_mac.cpp', '<(skia_src_path)/gpu/gl/win/SkNativeGLContext_win.cpp', '<(skia_src_path)/gpu/gl/unix/SkNativeGLContext_unix.cpp', - '<(skia_src_path)/gpu/android/SkNativeGLContext_android.cpp', + '<(skia_src_path)/gpu/gl/android/SkNativeGLContext_android.cpp', ], 'skgr_angle_gl_sources': [ '<(skia_include_path)/gpu/gl/SkANGLEGLContext.h', -- cgit v1.2.3 From 30bbe6c7105c68d69db4cc97c4cb91c826039444 Mon Sep 17 00:00:00 2001 From: "bsalomon@google.com" Date: Tue, 2 Oct 2012 15:25:12 +0000 Subject: Add SkNativeGLContext implementation for iOS. R=caryclark@google.com Review URL: https://codereview.appspot.com/6589055 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@5767 2bbb7eff-a529-9590-31e7-b0007b416f81 --- gpu.gyp | 4 ++-- gpu.gypi | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/gpu.gyp b/gpu.gyp index 94988ad..98ab257 100644 --- a/gpu.gyp +++ b/gpu.gyp @@ -6,7 +6,7 @@ ], }], ['skia_os != "mac"', { - 'sources/': [ ['exclude', '_mac.(h|cpp)$'], + 'sources/': [ ['exclude', '_mac.(h|cpp|m|mm)$'], ], }], ['skia_os != "linux"', { @@ -14,7 +14,7 @@ ], }], ['skia_os != "ios"', { - 'sources/': [ ['exclude', '_iOS.(h|cpp)$'], + 'sources/': [ ['exclude', '_iOS.(h|cpp|m|mm)$'], ], }], ['skia_os != "android"', { diff --git a/gpu.gypi b/gpu.gypi index 840abf5..9afddc4 100644 --- a/gpu.gypi +++ b/gpu.gypi @@ -237,6 +237,7 @@ '<(skia_src_path)/gpu/gl/win/SkNativeGLContext_win.cpp', '<(skia_src_path)/gpu/gl/unix/SkNativeGLContext_unix.cpp', '<(skia_src_path)/gpu/gl/android/SkNativeGLContext_android.cpp', + '<(skia_src_path)/gpu/gl/iOS/SkNativeGLContext_iOS.mm', ], 'skgr_angle_gl_sources': [ '<(skia_include_path)/gpu/gl/SkANGLEGLContext.h', -- cgit v1.2.3 From 68eba6ad51309834193f677b6de9e6582ca300ce Mon Sep 17 00:00:00 2001 From: "bungeman@google.com" Date: Tue, 2 Oct 2012 15:42:21 +0000 Subject: xcode_settings OTHER_CPLUSPLUSFLAGS is a list. https://codereview.appspot.com/6588062/ git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@5769 2bbb7eff-a529-9590-31e7-b0007b416f81 --- common_conditions.gypi | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/common_conditions.gypi b/common_conditions.gypi index 30b5c60..f8f283b 100644 --- a/common_conditions.gypi +++ b/common_conditions.gypi @@ -202,7 +202,11 @@ 'GCC_WARN_UNUSED_LABEL': 'YES', 'GCC_WARN_UNUSED_VALUE': 'YES', 'GCC_WARN_UNUSED_VARIABLE': 'YES', - 'OTHER_CPLUSPLUSFLAGS': '-mssse3 -fvisibility=hidden -fvisibility-inlines-hidden', + 'OTHER_CPLUSPLUSFLAGS': [ + '-mssse3', + '-fvisibility=hidden', + '-fvisibility-inlines-hidden', + ], }, }, ], -- cgit v1.2.3 From fe30b48032fccb2446dac5a57637732ec2e176dd Mon Sep 17 00:00:00 2001 From: "caryclark@google.com" Date: Tue, 2 Oct 2012 18:33:14 +0000 Subject: build iOS with 'make all' This builds all skia tests by treating iOS tools as executable applications. A few warnings were fixed as well. Removed old trace draw code and remnants. Review URL: https://codereview.appspot.com/6597063 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@5776 2bbb7eff-a529-9590-31e7-b0007b416f81 --- apptype_console.gypi | 49 +++++++++++++++++++++++++++++++++++++++++++++++++ common_variables.gypi | 8 ++------ 2 files changed, 51 insertions(+), 6 deletions(-) diff --git a/apptype_console.gypi b/apptype_console.gypi index 229db0d..9e28061 100644 --- a/apptype_console.gypi +++ b/apptype_console.gypi @@ -17,6 +17,55 @@ 'android_deps.gyp:Android_EntryPoint', ], }], + ['skia_os == "ios"', { + 'target_conditions': [ + ['_type == "executable"', { + 'mac_bundle' : 1, + }], + ], + 'include_dirs' : [ + '../experimental/iOSSampleApp/Shared', + '../include/views', + '../include/xml', + '../include/utils/mac', + ], + 'sources': [ + '../src/views/ios/SkOSWindow_iOS.mm', + '../src/views/mac/SkEventNotifier.h', + '../src/views/mac/SkEventNotifier.mm', + '../experimental/iOSSampleApp/iPad/AppDelegate_iPad.h', + '../experimental/iOSSampleApp/iPad/AppDelegate_iPad.mm', + '../experimental/iOSSampleApp/iPhone/AppDelegate_iPhone.h', + '../experimental/iOSSampleApp/iPhone/AppDelegate_iPhone.mm', + '../experimental/iOSSampleApp/Shared/SkUIView.h', + '../experimental/iOSSampleApp/Shared/SkUIView.mm', + '../experimental/iOSSampleApp/Shared/skia_ios.mm', + '../experimental/SimpleiOSApp/SimpleApp.h', + '../experimental/SimpleiOSApp/SimpleApp.mm', + ], + 'dependencies': [ + 'views.gyp:views', + 'xml.gyp:xml', + ], + 'link_settings': { + 'libraries': [ + '<(ios_sdk_dir)<(ios_sdk_version).sdk/System/Library/Frameworks/CoreGraphics.framework', + '<(ios_sdk_dir)<(ios_sdk_version).sdk/System/Library/Frameworks/CoreText.framework', + '<(ios_sdk_dir)<(ios_sdk_version).sdk/System/Library/Frameworks/Foundation.framework', + '<(ios_sdk_dir)<(ios_sdk_version).sdk/System/Library/Frameworks/ImageIO.framework', + '<(ios_sdk_dir)<(ios_sdk_version).sdk/System/Library/Frameworks/MobileCoreServices.framework', + '<(ios_sdk_dir)<(ios_sdk_version).sdk/System/Library/Frameworks/UIKit.framework', + ], + }, + 'xcode_config_file': '../experimental/iOSSampleApp/SkiOSSampleApp-Base.xcconfig', + 'mac_bundle_resources' : [ + '../experimental/SimpleiOSApp/iPad/MainWindow_iPad.xib', + '../experimental/SimpleiOSApp/iPhone/MainWindow_iPhone.xib', + ], + 'xcode_settings' : { + 'INFOPLIST_FILE' : '../experimental/SimpleiOSApp/tool-Info.plist', + }, + }], ], }, } diff --git a/common_variables.gypi b/common_variables.gypi index b59bd11..6a0fc6b 100644 --- a/common_variables.gypi +++ b/common_variables.gypi @@ -69,11 +69,6 @@ }, { 'skia_static_initializers%': 1, }], - [ 'skia_arch_type == "x86"', { - 'ios_sdk_dir%': '/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator', - }, { - 'ios_sdk_dir%': '/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS', - }], ], 'skia_scalar%': 'float', @@ -84,7 +79,8 @@ 'android_make_apk%': 1, 'skia_nacl%': 0, 'skia_gpu%': 1, - 'ios_sdk_version%': '5.1', + 'ios_sdk_dir%': '/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS', + 'ios_sdk_version%': '6.0', 'skia_osx_sdkroot%': 'macosx10.6', }, -- cgit v1.2.3 From c1e6799cce1bfa63ed9656b86d9b669e44355bf9 Mon Sep 17 00:00:00 2001 From: "robertphillips@google.com" Date: Wed, 3 Oct 2012 13:25:13 +0000 Subject: Added bench to replicate Google spreadsheet-style table drawing https://codereview.appspot.com/6593076/ git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@5782 2bbb7eff-a529-9590-31e7-b0007b416f81 --- bench.gypi | 1 + 1 file changed, 1 insertion(+) diff --git a/bench.gypi b/bench.gypi index ecb533a..e3e70da 100644 --- a/bench.gypi +++ b/bench.gypi @@ -36,6 +36,7 @@ '../bench/RTreeBench.cpp', '../bench/ScalarBench.cpp', '../bench/ShaderMaskBench.cpp', + '../bench/TableBench.cpp', '../bench/TextBench.cpp', '../bench/VertBench.cpp', '../bench/WriterBench.cpp', -- cgit v1.2.3 From 964d2ed9f83164fdf805107835792d7c19e9c3fd Mon Sep 17 00:00:00 2001 From: "bsalomon@google.com" Date: Wed, 3 Oct 2012 13:46:20 +0000 Subject: Revert r5557 (which itself was a revert of r5433). Relands SkPathRef. Will follow with change for extra debug checks to attempt to ferret out http://www.crbug.com/148637. git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@5783 2bbb7eff-a529-9590-31e7-b0007b416f81 --- core.gypi | 1 + 1 file changed, 1 insertion(+) diff --git a/core.gypi b/core.gypi index 7a6a7dd..d8f1715 100644 --- a/core.gypi +++ b/core.gypi @@ -112,6 +112,7 @@ '<(skia_src_path)/core/SkPathHeap.cpp', '<(skia_src_path)/core/SkPathHeap.h', '<(skia_src_path)/core/SkPathMeasure.cpp', + '<(skia_src_path)/core/SkPathRef.h', '<(skia_src_path)/core/SkPicture.cpp', '<(skia_src_path)/core/SkPictureFlat.cpp', '<(skia_src_path)/core/SkPictureFlat.h', -- cgit v1.2.3 -- cgit v1.2.3 From 7c89ead27d675cce61e9d6c4710b96c4868c914c Mon Sep 17 00:00:00 2001 From: "reed@google.com" Date: Wed, 3 Oct 2012 20:17:22 +0000 Subject: add test for rotated saveLayer, to see that we clip against the specified bounds (hint: we don't at the moment) git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@5794 2bbb7eff-a529-9590-31e7-b0007b416f81 --- gmslides.gypi | 1 + 1 file changed, 1 insertion(+) diff --git a/gmslides.gypi b/gmslides.gypi index 003cb05..547aa61 100644 --- a/gmslides.gypi +++ b/gmslides.gypi @@ -57,6 +57,7 @@ '../gm/poly2poly.cpp', '../gm/quadpaths.cpp', '../gm/samplerstress.cpp', + '../gm/savelayer.cpp', '../gm/shaderbounds.cpp', '../gm/shadertext.cpp', '../gm/shadows.cpp', -- cgit v1.2.3 From 58eed82cd8ccc3ca9922b6b8dd0c884ccbfd2be3 Mon Sep 17 00:00:00 2001 From: "reed@google.com" Date: Wed, 3 Oct 2012 20:40:38 +0000 Subject: revert 5794 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@5795 2bbb7eff-a529-9590-31e7-b0007b416f81 --- gmslides.gypi | 1 - 1 file changed, 1 deletion(-) diff --git a/gmslides.gypi b/gmslides.gypi index 547aa61..003cb05 100644 --- a/gmslides.gypi +++ b/gmslides.gypi @@ -57,7 +57,6 @@ '../gm/poly2poly.cpp', '../gm/quadpaths.cpp', '../gm/samplerstress.cpp', - '../gm/savelayer.cpp', '../gm/shaderbounds.cpp', '../gm/shadertext.cpp', '../gm/shadows.cpp', -- cgit v1.2.3 From 930892f66f68c0c9fbd5af0ad3c44fe5dd8a7b25 Mon Sep 17 00:00:00 2001 From: "bsalomon@google.com" Date: Wed, 3 Oct 2012 20:58:26 +0000 Subject: Make it possible to generate the ios xcode proj by specifying only skia_os="ios" in GYP_DEFINES. R=caryclark@google.com,epoger@google.com Review URL: https://codereview.appspot.com/6601051 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@5796 2bbb7eff-a529-9590-31e7-b0007b416f81 --- common_variables.gypi | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/common_variables.gypi b/common_variables.gypi index 6a0fc6b..ae77c84 100644 --- a/common_variables.gypi +++ b/common_variables.gypi @@ -45,13 +45,11 @@ # We set it automatically based on 'OS' (the host OS), but allow the # user to override it via GYP_DEFINES if they like. 'skia_os%': '<(OS)', - 'skia_arch_type%': 'x86', }, # Re-define all variables defined within the level-3 'variables' dict, # so that siblings of the level-2 'variables' dict can see them. 'skia_os%': '<(skia_os)', - 'skia_arch_type%': '<(skia_arch_type)', 'conditions': [ ['skia_os == "win"', { @@ -92,7 +90,6 @@ 'skia_mesa%': '<(skia_mesa)', 'skia_nv_path_rendering%': '<(skia_nv_path_rendering)', 'skia_angle%': '<(skia_angle)', - 'skia_arch_type%': '<(skia_arch_type)', 'skia_arch_width%': '<(skia_arch_width)', 'skia_directwrite%': '<(skia_directwrite)', 'android_make_apk%': '<(android_make_apk)', @@ -103,6 +100,15 @@ 'ios_sdk_version%': '<(ios_sdk_version)', 'ios_sdk_dir%': '<(ios_sdk_dir)', + 'conditions': [ + ['skia_os == "ios"', { + 'skia_arch_type%': 'arm', + 'armv7%': 1, + 'arm_neon%': 0, # neon asm files known not to work with the ios build + },{ # skia_os is not ios + 'skia_arch_type%': 'x86', + }], + ], # These are referenced by our .gypi files that list files (e.g. core.gypi) # 'skia_src_path%': '../src', -- cgit v1.2.3 From 44e6060a9777c638ed04f137568afcd056339d56 Mon Sep 17 00:00:00 2001 From: "bsalomon@google.com" Date: Thu, 4 Oct 2012 12:52:03 +0000 Subject: Allow Xcode to change paths to frameworks based on whether a device or simulator was selected. R=caryclark@google.com Review URL: https://codereview.appspot.com/6590068 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@5802 2bbb7eff-a529-9590-31e7-b0007b416f81 --- SampleApp.gyp | 18 +++++++++--------- SimpleiOSApp.gyp | 12 ++++++------ apptype_console.gypi | 12 ++++++------ common_variables.gypi | 5 +---- core.gyp | 18 +++++++++--------- zlib.gyp | 2 +- 6 files changed, 32 insertions(+), 35 deletions(-) diff --git a/SampleApp.gyp b/SampleApp.gyp index c8b9ba7..3920152 100644 --- a/SampleApp.gyp +++ b/SampleApp.gyp @@ -247,15 +247,15 @@ ], 'link_settings': { 'libraries': [ - '<(ios_sdk_dir)<(ios_sdk_version).sdk/System/Library/Frameworks/CoreFoundation.framework', - '<(ios_sdk_dir)<(ios_sdk_version).sdk/System/Library/Frameworks/CoreGraphics.framework', - '<(ios_sdk_dir)<(ios_sdk_version).sdk/System/Library/Frameworks/CoreText.framework', - '<(ios_sdk_dir)<(ios_sdk_version).sdk/System/Library/Frameworks/UIKit.framework', - '<(ios_sdk_dir)<(ios_sdk_version).sdk/System/Library/Frameworks/Foundation.framework', - '<(ios_sdk_dir)<(ios_sdk_version).sdk/System/Library/Frameworks/QuartzCore.framework', - '<(ios_sdk_dir)<(ios_sdk_version).sdk/System/Library/Frameworks/OpenGLES.framework', - '<(ios_sdk_dir)<(ios_sdk_version).sdk/System/Library/Frameworks/ImageIO.framework', - '<(ios_sdk_dir)<(ios_sdk_version).sdk/System/Library/Frameworks/MobileCoreServices.framework', + '$(SDKROOT)/System/Library/Frameworks/CoreFoundation.framework', + '$(SDKROOT)/System/Library/Frameworks/CoreGraphics.framework', + '$(SDKROOT)/System/Library/Frameworks/CoreText.framework', + '$(SDKROOT)/System/Library/Frameworks/UIKit.framework', + '$(SDKROOT)/System/Library/Frameworks/Foundation.framework', + '$(SDKROOT)/System/Library/Frameworks/QuartzCore.framework', + '$(SDKROOT)/System/Library/Frameworks/OpenGLES.framework', + '$(SDKROOT)/System/Library/Frameworks/ImageIO.framework', + '$(SDKROOT)/System/Library/Frameworks/MobileCoreServices.framework', ], }, 'include_dirs' : [ diff --git a/SimpleiOSApp.gyp b/SimpleiOSApp.gyp index 5b69e64..ea702be 100644 --- a/SimpleiOSApp.gyp +++ b/SimpleiOSApp.gyp @@ -39,12 +39,12 @@ ], 'link_settings': { 'libraries': [ - '<(ios_sdk_dir)<(ios_sdk_version).sdk/System/Library/Frameworks/CoreGraphics.framework', - '<(ios_sdk_dir)<(ios_sdk_version).sdk/System/Library/Frameworks/CoreText.framework', - '<(ios_sdk_dir)<(ios_sdk_version).sdk/System/Library/Frameworks/Foundation.framework', - '<(ios_sdk_dir)<(ios_sdk_version).sdk/System/Library/Frameworks/ImageIO.framework', - '<(ios_sdk_dir)<(ios_sdk_version).sdk/System/Library/Frameworks/MobileCoreServices.framework', - '<(ios_sdk_dir)<(ios_sdk_version).sdk/System/Library/Frameworks/UIKit.framework', + '$(SDKROOT)/System/Library/Frameworks/CoreGraphics.framework', + '$(SDKROOT)/System/Library/Frameworks/CoreText.framework', + '$(SDKROOT)/System/Library/Frameworks/Foundation.framework', + '$(SDKROOT)/System/Library/Frameworks/ImageIO.framework', + '$(SDKROOT)/System/Library/Frameworks/MobileCoreServices.framework', + '$(SDKROOT)/System/Library/Frameworks/UIKit.framework', ], 'libraries!': [ #remove mac dependencies diff --git a/apptype_console.gypi b/apptype_console.gypi index 9e28061..9b42db5 100644 --- a/apptype_console.gypi +++ b/apptype_console.gypi @@ -49,12 +49,12 @@ ], 'link_settings': { 'libraries': [ - '<(ios_sdk_dir)<(ios_sdk_version).sdk/System/Library/Frameworks/CoreGraphics.framework', - '<(ios_sdk_dir)<(ios_sdk_version).sdk/System/Library/Frameworks/CoreText.framework', - '<(ios_sdk_dir)<(ios_sdk_version).sdk/System/Library/Frameworks/Foundation.framework', - '<(ios_sdk_dir)<(ios_sdk_version).sdk/System/Library/Frameworks/ImageIO.framework', - '<(ios_sdk_dir)<(ios_sdk_version).sdk/System/Library/Frameworks/MobileCoreServices.framework', - '<(ios_sdk_dir)<(ios_sdk_version).sdk/System/Library/Frameworks/UIKit.framework', + '$(SDKROOT)/System/Library/Frameworks/CoreGraphics.framework', + '$(SDKROOT)/System/Library/Frameworks/CoreText.framework', + '$(SDKROOT)/System/Library/Frameworks/Foundation.framework', + '$(SDKROOT)/System/Library/Frameworks/ImageIO.framework', + '$(SDKROOT)/System/Library/Frameworks/MobileCoreServices.framework', + '$(SDKROOT)/System/Library/Frameworks/UIKit.framework', ], }, 'xcode_config_file': '../experimental/iOSSampleApp/SkiOSSampleApp-Base.xcconfig', diff --git a/common_variables.gypi b/common_variables.gypi index ae77c84..bf6d918 100644 --- a/common_variables.gypi +++ b/common_variables.gypi @@ -77,8 +77,6 @@ 'android_make_apk%': 1, 'skia_nacl%': 0, 'skia_gpu%': 1, - 'ios_sdk_dir%': '/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS', - 'ios_sdk_version%': '6.0', 'skia_osx_sdkroot%': 'macosx10.6', }, @@ -97,8 +95,7 @@ 'skia_gpu%': '<(skia_gpu)', 'skia_osx_sdkroot%': '<(skia_osx_sdkroot)', 'skia_static_initializers%': '<(skia_static_initializers)', - 'ios_sdk_version%': '<(ios_sdk_version)', - 'ios_sdk_dir%': '<(ios_sdk_dir)', + 'ios_sdk_version%': '6.0', 'conditions': [ ['skia_os == "ios"', { diff --git a/core.gyp b/core.gyp index d4d6abb..134ca8a 100644 --- a/core.gyp +++ b/core.gyp @@ -58,15 +58,15 @@ ], 'link_settings': { 'libraries': [ - '<(ios_sdk_dir)<(ios_sdk_version).sdk/System/Library/Frameworks/CoreFoundation.framework', - '<(ios_sdk_dir)<(ios_sdk_version).sdk/System/Library/Frameworks/CoreGraphics.framework', - '<(ios_sdk_dir)<(ios_sdk_version).sdk/System/Library/Frameworks/CoreText.framework', - '<(ios_sdk_dir)<(ios_sdk_version).sdk/System/Library/Frameworks/UIKit.framework', - '<(ios_sdk_dir)<(ios_sdk_version).sdk/System/Library/Frameworks/Foundation.framework', - '<(ios_sdk_dir)<(ios_sdk_version).sdk/System/Library/Frameworks/QuartzCore.framework', - '<(ios_sdk_dir)<(ios_sdk_version).sdk/System/Library/Frameworks/OpenGLES.framework', - '<(ios_sdk_dir)<(ios_sdk_version).sdk/System/Library/Frameworks/ImageIO.framework', - '<(ios_sdk_dir)<(ios_sdk_version).sdk/System/Library/Frameworks/MobileCoreServices.framework', + '$(SDKROOT)/System/Library/Frameworks/CoreFoundation.framework', + '$(SDKROOT)/System/Library/Frameworks/CoreGraphics.framework', + '$(SDKROOT)/System/Library/Frameworks/CoreText.framework', + '$(SDKROOT)/System/Library/Frameworks/UIKit.framework', + '$(SDKROOT)/System/Library/Frameworks/Foundation.framework', + '$(SDKROOT)/System/Library/Frameworks/QuartzCore.framework', + '$(SDKROOT)/System/Library/Frameworks/OpenGLES.framework', + '$(SDKROOT)/System/Library/Frameworks/ImageIO.framework', + '$(SDKROOT)/System/Library/Frameworks/MobileCoreServices.framework', ], }, }], diff --git a/zlib.gyp b/zlib.gyp index af11169..864a059 100644 --- a/zlib.gyp +++ b/zlib.gyp @@ -24,7 +24,7 @@ [ 'skia_os == "ios"', { 'link_settings': { 'libraries': [ - '<(ios_sdk_dir)<(ios_sdk_version).sdk/usr/lib/libz.dylib', + '$(SDKROOT)/usr/lib/libz.dylib', ], }, 'defines': [ 'SK_ZLIB_INCLUDE=', ], -- cgit v1.2.3 From ff188f8be07ec39f8c5a17f9a653e0658e0363ec Mon Sep 17 00:00:00 2001 From: "robertphillips@google.com" Date: Thu, 4 Oct 2012 13:00:33 +0000 Subject: Created filter command line tool https://codereview.appspot.com/6595066/ git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@5803 2bbb7eff-a529-9590-31e7-b0007b416f81 --- tools.gyp | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/tools.gyp b/tools.gyp index 371ecd2..69c6cae 100644 --- a/tools.gyp +++ b/tools.gyp @@ -21,6 +21,7 @@ 'render_pictures', 'bench_pictures', 'pinspect', + 'filter', ], }, { @@ -163,6 +164,23 @@ 'utils.gyp:utils', ], }, + { + 'target_name': 'filter', + 'type': 'executable', + 'include_dirs' : [ + '../src/core', + ], + 'sources': [ + '../tools/filtermain.cpp', + ], + 'dependencies': [ + 'core.gyp:core', + 'effects.gyp:effects', + 'images.gyp:images', + 'ports.gyp:ports', + 'utils.gyp:utils', + ], + }, ], } -- cgit v1.2.3 From 7a9699bc1c25032370657d289ba9d609a7a5cd1d Mon Sep 17 00:00:00 2001 From: "epoger@google.com" Date: Thu, 4 Oct 2012 14:50:18 +0000 Subject: Change default skia_osx_sdkroot to "macosx" (suitable for Xcode 3.2.6+) See https://codereview.appspot.com/6553044 BUG=https://code.google.com/p/skia/issues/detail?id=796 Review URL: https://codereview.appspot.com/6598055 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@5806 2bbb7eff-a529-9590-31e7-b0007b416f81 --- common_variables.gypi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common_variables.gypi b/common_variables.gypi index bf6d918..d2a3d10 100644 --- a/common_variables.gypi +++ b/common_variables.gypi @@ -77,7 +77,7 @@ 'android_make_apk%': 1, 'skia_nacl%': 0, 'skia_gpu%': 1, - 'skia_osx_sdkroot%': 'macosx10.6', + 'skia_osx_sdkroot%': 'macosx', }, # Re-define all variables defined within the level-2 'variables' dict, -- cgit v1.2.3 From e948370f6f66844c55d61b8b7217028f9de289c7 Mon Sep 17 00:00:00 2001 From: "scroggo@google.com" Date: Thu, 4 Oct 2012 21:46:08 +0000 Subject: Add the ability to provide function pointers to SkPicture serialization and deserialization for encoding and decoding bitmaps. Remove kForceFlattenBitmapPixels_Flag, which is no longer used. When an SkOrderedReadBuffer needs to read a bitmap, if it does not have an image decoder, use a dummy bitmap. In GM, add a tolerance option for color differences, used when testing picture serialization, so it can assume two images are the same even though PNG encoding/decoding may have resulted in small differences. Create dummy implementations for SkImageDecoder and SkImageEncoder functions in SkImageDecoder_empty so that a project that does not want to include the images project it can still build. Allow ports to build without images project. In Mac's image encoder, copy 4444 to 8888 before encoding. Add SkWriter32::reservePad, to provide a pointer to write non 4 byte aligned data, padded with zeroes. In bench_ and render_ pictures, pass decode function to SkPicture creation from a stream. BUG=https://code.google.com/p/skia/issues/detail?id=842 Review URL: https://codereview.appspot.com/6551071 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@5818 2bbb7eff-a529-9590-31e7-b0007b416f81 --- images.gyp | 1 + 1 file changed, 1 insertion(+) diff --git a/images.gyp b/images.gyp index 00c8377..7824cf9 100644 --- a/images.gyp +++ b/images.gyp @@ -43,6 +43,7 @@ '../src/images/SkImageRefPool.cpp', '../src/images/SkImageRefPool.h', '../src/images/SkImageRef_GlobalPool.cpp', + '../src/images/SkImages.cpp', '../src/images/SkJpegUtility.cpp', '../src/images/SkMovie.cpp', '../src/images/SkMovie_gif.cpp', -- cgit v1.2.3 From 96209a03398f82cece1e9e94ee47cd61bcd9f752 Mon Sep 17 00:00:00 2001 From: "bsalomon@google.com" Date: Fri, 5 Oct 2012 13:23:24 +0000 Subject: Move setPaint from GrContext to GrDrawState. R=robertphillips@google.com Review URL: https://codereview.appspot.com/6624045 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@5823 2bbb7eff-a529-9590-31e7-b0007b416f81 --- gpu.gypi | 1 + 1 file changed, 1 insertion(+) diff --git a/gpu.gypi b/gpu.gypi index 9afddc4..c0a4a7b 100644 --- a/gpu.gypi +++ b/gpu.gypi @@ -63,6 +63,7 @@ '<(skia_src_path)/gpu/GrCustomStage.cpp', '<(skia_src_path)/gpu/GrDefaultPathRenderer.cpp', '<(skia_src_path)/gpu/GrDefaultPathRenderer.h', + '<(skia_src_path)/gpu/GrDrawState.cpp', '<(skia_src_path)/gpu/GrDrawState.h', '<(skia_src_path)/gpu/GrDrawTarget.cpp', '<(skia_src_path)/gpu/GrDrawTarget.h', -- cgit v1.2.3 From 04dba15539b7012ead73d0cf04379143facb674f Mon Sep 17 00:00:00 2001 From: "caryclark@google.com" Date: Tue, 9 Oct 2012 14:11:58 +0000 Subject: checkpoint for shape ops at minimum, the unit tests in SimplyNew_Test pass git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@5860 2bbb7eff-a529-9590-31e7-b0007b416f81 --- shapeops_tool.gyp | 45 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) create mode 100644 shapeops_tool.gyp diff --git a/shapeops_tool.gyp b/shapeops_tool.gyp new file mode 100644 index 0000000..3b1408a --- /dev/null +++ b/shapeops_tool.gyp @@ -0,0 +1,45 @@ +# GYP file to build unit tests. +{ + 'includes': [ + 'apptype_console.gypi', + 'common.gypi', + ], + 'targets': [ + { + 'target_name': 'addTest', + 'type': 'executable', + 'include_dirs' : [ + '../src/core', + ], + 'sources': [ + '../experimental/Intersection/AddTestOutput/main.cpp', + ], + 'dependencies': [ + 'core.gyp:core', + 'effects.gyp:effects', + 'experimental.gyp:experimental', + 'images.gyp:images', + 'ports.gyp:ports', + 'pdf.gyp:pdf', + 'utils.gyp:utils', + ], + 'conditions': [ + [ 'skia_gpu == 1', { + 'include_dirs': [ + '../src/gpu', + ], + 'dependencies': [ + 'gpu.gyp:gr', + 'gpu.gyp:skgr', + ], + }], + ], + }, + ], +} + +# Local Variables: +# tab-width:2 +# indent-tabs-mode:nil +# End: +# vim: set expandtab tabstop=2 shiftwidth=2: -- cgit v1.2.3 From a1091fea971e2458a53275dca80346f3dcd84847 Mon Sep 17 00:00:00 2001 From: "bsalomon@google.com" Date: Wed, 10 Oct 2012 13:35:23 +0000 Subject: Add a new GM: shadertext2. It tests a bitmap shader with various combinations of matrices and shader matrices. The text is drawn filled and stroked. Review URL: https://codereview.appspot.com/6639052 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@5877 2bbb7eff-a529-9590-31e7-b0007b416f81 --- gmslides.gypi | 1 + 1 file changed, 1 insertion(+) diff --git a/gmslides.gypi b/gmslides.gypi index 003cb05..e922713 100644 --- a/gmslides.gypi +++ b/gmslides.gypi @@ -59,6 +59,7 @@ '../gm/samplerstress.cpp', '../gm/shaderbounds.cpp', '../gm/shadertext.cpp', + '../gm/shadertext2.cpp', '../gm/shadows.cpp', '../gm/simpleaaclip.cpp', '../gm/strokefill.cpp', -- cgit v1.2.3 From b7e629fa3717791c632c2ddb7b78f9f66442d45d Mon Sep 17 00:00:00 2001 From: "edisonn@google.com" Date: Wed, 10 Oct 2012 15:20:34 +0000 Subject: Add an SKP to PDF rendered. test_pdfs.py will be hooked up in buildbot testing later. Review URL: https://codereview.appspot.com/6610056 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@5880 2bbb7eff-a529-9590-31e7-b0007b416f81 --- tools.gyp | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/tools.gyp b/tools.gyp index 69c6cae..eb2d31c 100644 --- a/tools.gyp +++ b/tools.gyp @@ -139,6 +139,39 @@ }], ], }, + { + 'target_name': 'render_pdfs', + 'type': 'executable', + 'sources': [ + '../tools/render_pdfs_main.cpp', + ], + 'include_dirs': [ + '../src/pipe/utils/', + ], + 'dependencies': [ + 'core.gyp:core', + 'effects.gyp:effects', + 'images.gyp:images', + 'ports.gyp:ports', + 'tools.gyp:pdf_renderer', + 'tools.gyp:picture_utils', + ], + }, + { + 'target_name': 'pdf_renderer', + 'type': 'static_library', + 'sources': [ + '../tools/PdfRenderer.cpp', + '../tools/PdfRenderer.h', + ], + 'include_dirs': [ + '../src/utils/', + ], + 'dependencies': [ + 'core.gyp:core', + 'pdf.gyp:pdf', + ], + }, { 'target_name': 'picture_utils', 'type': 'static_library', -- cgit v1.2.3 From f2759321a95e1fbd2a53c5db114b28dceb2cf3b0 Mon Sep 17 00:00:00 2001 From: "edisonn@google.com" Date: Wed, 10 Oct 2012 16:42:26 +0000 Subject: Fix build break. a cpp file was not included in the checkin list. will send to code review and check it in too git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@5885 2bbb7eff-a529-9590-31e7-b0007b416f81 --- tools.gyp | 33 --------------------------------- 1 file changed, 33 deletions(-) diff --git a/tools.gyp b/tools.gyp index eb2d31c..69c6cae 100644 --- a/tools.gyp +++ b/tools.gyp @@ -139,39 +139,6 @@ }], ], }, - { - 'target_name': 'render_pdfs', - 'type': 'executable', - 'sources': [ - '../tools/render_pdfs_main.cpp', - ], - 'include_dirs': [ - '../src/pipe/utils/', - ], - 'dependencies': [ - 'core.gyp:core', - 'effects.gyp:effects', - 'images.gyp:images', - 'ports.gyp:ports', - 'tools.gyp:pdf_renderer', - 'tools.gyp:picture_utils', - ], - }, - { - 'target_name': 'pdf_renderer', - 'type': 'static_library', - 'sources': [ - '../tools/PdfRenderer.cpp', - '../tools/PdfRenderer.h', - ], - 'include_dirs': [ - '../src/utils/', - ], - 'dependencies': [ - 'core.gyp:core', - 'pdf.gyp:pdf', - ], - }, { 'target_name': 'picture_utils', 'type': 'static_library', -- cgit v1.2.3 From 0dcb15d7481fd888e9a0e26a1d17744caccadf97 Mon Sep 17 00:00:00 2001 From: "borenet@google.com" Date: Wed, 10 Oct 2012 19:45:51 +0000 Subject: Build Skia as a static library - Roll GYP so that we get non-thin archives on Linux - Add merge_static_libs.py - Add skia_core_lib target which builds core, ports, opts*, and utils - Replace dependencies on core/ports/opts/utils with skia_core_libs - Rename exportable libraries with "skia_" Review URL: https://codereview.appspot.com/6619049 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@5889 2bbb7eff-a529-9590-31e7-b0007b416f81 --- FileReaderApp.gyp | 5 +--- SampleApp.gyp | 8 +----- SimpleCocoaApp.gyp | 5 +--- SimpleiOSApp.gyp | 5 +--- animator.gyp | 2 ++ bench.gyp | 13 ++-------- common_conditions.gypi | 1 - common_variables.gypi | 27 +++++++++++--------- core.gyp | 20 +++++++++++++++ debugger.gyp | 5 +--- effects.gyp | 8 +++--- gm.gyp | 8 +----- gpu.gyp | 4 +++ images.gyp | 2 ++ opts.gyp | 6 +++++ pdf.gyp | 6 ++--- ports.gyp | 2 ++ sfnt.gyp | 2 ++ shapeops_demo.gyp | 10 +------- shapeops_edge.gyp | 8 +----- skia_base_libs.gyp | 47 ++++++++++++++++++++++++++++++++++ svg.gyp | 2 ++ tests.gyp | 8 +----- tools.gyp | 68 ++++++++++++++++---------------------------------- utils.gyp | 7 +++--- views.gyp | 7 ++---- xml.gyp | 2 ++ xps.gyp | 5 ++-- 28 files changed, 152 insertions(+), 141 deletions(-) create mode 100644 skia_base_libs.gyp diff --git a/FileReaderApp.gyp b/FileReaderApp.gyp index b56460b..bcd0f0d 100644 --- a/FileReaderApp.gyp +++ b/FileReaderApp.gyp @@ -18,11 +18,8 @@ '../src/utils/mac/SkOSWindow_Mac.cpp', ], 'dependencies': [ - 'core.gyp:core', + 'skia_base_libs.gyp:skia_base_libs', 'effects.gyp:effects', - 'opts.gyp:opts', - 'ports.gyp:ports', - 'utils.gyp:utils', 'views.gyp:views', 'xml.gyp:xml', ], diff --git a/SampleApp.gyp b/SampleApp.gyp index 3920152..c33c67f 100644 --- a/SampleApp.gyp +++ b/SampleApp.gyp @@ -135,12 +135,10 @@ '../samplecode/SampleFontCache.cpp', ], 'dependencies': [ - 'core.gyp:core', + 'skia_base_libs.gyp:skia_base_libs', 'effects.gyp:effects', 'images.gyp:images', - 'ports.gyp:ports', 'views.gyp:views', - 'utils.gyp:utils', 'animator.gyp:animator', 'xml.gyp:xml', 'experimental.gyp:experimental', @@ -290,10 +288,6 @@ 'include_dirs': [ '../src/gpu', # To pull gl/GrGLUtil.h ], - 'dependencies': [ - 'gpu.gyp:gr', - 'gpu.gyp:skgr', - ], }], ], 'msvs_settings': { diff --git a/SimpleCocoaApp.gyp b/SimpleCocoaApp.gyp index dd02c41..3e17ad5 100644 --- a/SimpleCocoaApp.gyp +++ b/SimpleCocoaApp.gyp @@ -25,10 +25,7 @@ ], 'dependencies': [ - 'core.gyp:core', - 'opts.gyp:opts', - 'ports.gyp:ports', - 'utils.gyp:utils', + 'skia_base_libs.gyp:skia_base_libs', 'views.gyp:views', 'xml.gyp:xml', ], diff --git a/SimpleiOSApp.gyp b/SimpleiOSApp.gyp index ea702be..3678e7c 100644 --- a/SimpleiOSApp.gyp +++ b/SimpleiOSApp.gyp @@ -28,12 +28,9 @@ '../experimental/SimpleiOSApp/SimpleiOSApp-Info.plist', ], 'dependencies': [ - 'core.gyp:core', + 'skia_base_libs.gyp:skia_base_libs', 'effects.gyp:effects', 'images.gyp:images', - 'opts.gyp:opts', - 'ports.gyp:ports', - 'utils.gyp:utils', 'views.gyp:views', 'xml.gyp:xml', ], diff --git a/animator.gyp b/animator.gyp index b3c651c..942e849 100644 --- a/animator.gyp +++ b/animator.gyp @@ -6,7 +6,9 @@ 'targets': [ { 'target_name': 'animator', + 'product_name': 'skia_animator', 'type': 'static_library', + 'standalone_static_library': 1, 'include_dirs': [ '../include/config', '../include/core', diff --git a/bench.gyp b/bench.gyp index 7a413e1..1524b72 100644 --- a/bench.gyp +++ b/bench.gyp @@ -15,11 +15,9 @@ 'bench.gypi' ], 'dependencies': [ - 'core.gyp:core', + 'skia_base_libs.gyp:skia_base_libs', 'effects.gyp:effects', 'images.gyp:images', - 'ports.gyp:ports', - 'utils.gyp:utils', 'bench_timer', ], 'conditions': [ @@ -28,10 +26,6 @@ 'include_dirs' : [ '../src/gpu', ], - 'dependencies': [ - 'gpu.gyp:gr', - 'gpu.gyp:skgr', - ], }, ], ], @@ -54,7 +48,7 @@ '../src/gpu', ], 'dependencies': [ - 'core.gyp:core', + 'skia_base_libs.gyp:skia_base_libs', ], 'conditions': [ [ 'skia_os not in ["mac", "ios"]', { @@ -83,9 +77,6 @@ ], }], ['skia_gpu == 1', { - 'dependencies': [ - 'gpu.gyp:gr', - ], 'sources': [ '../bench/BenchGpuTimer_gl.h', '../bench/BenchGpuTimer_gl.cpp', diff --git a/common_conditions.gypi b/common_conditions.gypi index f8f283b..e8e2fca 100644 --- a/common_conditions.gypi +++ b/common_conditions.gypi @@ -324,7 +324,6 @@ 'SK_USE_POSIX_THREADS' ], }], - ], # end 'conditions' # The Xcode SYMROOT must be at the root. See build/common.gypi in chromium for more details 'xcode_settings': { diff --git a/common_variables.gypi b/common_variables.gypi index d2a3d10..1976dbe 100644 --- a/common_variables.gypi +++ b/common_variables.gypi @@ -52,21 +52,30 @@ 'skia_os%': '<(skia_os)', 'conditions': [ - ['skia_os == "win"', { + [ 'skia_os == "win"', { 'os_posix%': 0, }, { 'os_posix%': 1, }], - ['skia_os in ["linux", "freebsd", "openbsd", "solaris"]', { + [ 'skia_os in ["linux", "freebsd", "openbsd", "solaris"]', { 'skia_arch_width%': 64, }, { 'skia_arch_width%': 32, }], - ['skia_os == "android"', { + [ 'skia_os == "android"', { 'skia_static_initializers%': 0, }, { 'skia_static_initializers%': 1, }], + [ 'skia_os == "ios"', { + 'skia_arch_type%': 'arm', + 'armv7%': 1, + 'arm_neon%': 0, # neon asm files known not to work with the ios build + },{ # skia_os is not ios + 'skia_arch_type%': 'x86', + 'armv7%': 0, + 'arm_neon%': 0, + }], ], 'skia_scalar%': 'float', @@ -82,6 +91,8 @@ # Re-define all variables defined within the level-2 'variables' dict, # so that siblings of the level-1 'variables' dict can see them. + 'armv7%': '<(armv7)', + 'arm_neon%': '<(arm_neon)', 'skia_os%': '<(skia_os)', 'os_posix%': '<(os_posix)', 'skia_scalar%': '<(skia_scalar)', @@ -89,6 +100,7 @@ 'skia_nv_path_rendering%': '<(skia_nv_path_rendering)', 'skia_angle%': '<(skia_angle)', 'skia_arch_width%': '<(skia_arch_width)', + 'skia_arch_type%': '<(skia_arch_type)', 'skia_directwrite%': '<(skia_directwrite)', 'android_make_apk%': '<(android_make_apk)', 'skia_nacl%': '<(skia_nacl)', @@ -97,15 +109,6 @@ 'skia_static_initializers%': '<(skia_static_initializers)', 'ios_sdk_version%': '6.0', - 'conditions': [ - ['skia_os == "ios"', { - 'skia_arch_type%': 'arm', - 'armv7%': 1, - 'arm_neon%': 0, # neon asm files known not to work with the ios build - },{ # skia_os is not ios - 'skia_arch_type%': 'x86', - }], - ], # These are referenced by our .gypi files that list files (e.g. core.gypi) # 'skia_src_path%': '../src', diff --git a/core.gyp b/core.gyp index 134ca8a..228fd06 100644 --- a/core.gyp +++ b/core.gyp @@ -3,7 +3,9 @@ 'targets': [ { 'target_name': 'core', + 'product_name': 'skia_core', 'type': 'static_library', + 'standalone_static_library': 1, 'msvs_guid': 'B7760B5E-BFA8-486B-ACFD-49E3A6DE8E76', 'includes': [ @@ -100,6 +102,24 @@ '../include/pipe', 'ext', ], + 'conditions': [ + [ 'skia_os == "mac"', { + 'include_dirs': [ + '../include/utils/mac', + '../third_party/freetype/include/**', + ], + }], + [ 'skia_os == "ios"', { + 'include_dirs': [ + '../include/utils/ios', + ], + }], + [ 'skia_os == "win"', { + 'include_dirs': [ + 'config/win', + ], + }], + ], }, 'dependencies': [ 'opts.gyp:opts' diff --git a/debugger.gyp b/debugger.gyp index 5552ca1..cbaf492 100644 --- a/debugger.gyp +++ b/debugger.gyp @@ -118,12 +118,9 @@ '<(moc_src_dir)/moc_SkGLWidget.cpp', ], 'dependencies': [ - 'core.gyp:core', + 'skia_base_libs.gyp:skia_base_libs', 'images.gyp:images', - 'ports.gyp:ports', 'effects.gyp:effects', - 'gpu.gyp:gr', - 'gpu.gyp:skgr', 'debugger_mocs', ], 'link_settings': { diff --git a/effects.gyp b/effects.gyp index ef42cb9..e110c9f 100644 --- a/effects.gyp +++ b/effects.gyp @@ -2,7 +2,9 @@ 'targets': [ { 'target_name': 'effects', + 'product_name': 'skia_effects', 'type': 'static_library', + 'standalone_static_library': 1, 'includes': [ 'effects.gypi', ], @@ -16,7 +18,7 @@ ], }, 'dependencies': [ - 'core.gyp:core', + 'skia_base_libs.gyp:skia_base_libs', ], 'sources': [ 'effects.gypi', # Makes the gypi appear in IDEs (but does not modify the build). @@ -26,10 +28,6 @@ 'include_dirs': [ '../src/gpu', ], - 'dependencies': [ - 'gpu.gyp:gr', - 'gpu.gyp:skgr', - ], }], ], }, diff --git a/gm.gyp b/gm.gyp index f519824..6f0fc3d 100644 --- a/gm.gyp +++ b/gm.gyp @@ -22,12 +22,10 @@ '../src/pipe/utils/SamplePipeControllers.cpp', ], 'dependencies': [ - 'core.gyp:core', + 'skia_base_libs.gyp:skia_base_libs', 'effects.gyp:effects', 'images.gyp:images', 'pdf.gyp:pdf', - 'ports.gyp:ports', - 'utils.gyp:utils', ], 'conditions': [ ['skia_os == "mac"', { @@ -53,10 +51,6 @@ 'include_dirs': [ '../src/gpu', ], - 'dependencies': [ - 'gpu.gyp:gr', - 'gpu.gyp:skgr', - ], }], ], }, diff --git a/gpu.gyp b/gpu.gyp index 98ab257..0dc84ee 100644 --- a/gpu.gyp +++ b/gpu.gyp @@ -109,7 +109,9 @@ 'targets': [ { 'target_name': 'skgr', + 'product_name': 'skia_skgr', 'type': 'static_library', + 'standalone_static_library': 1, 'includes': [ 'gpu.gypi', ], @@ -157,7 +159,9 @@ }, { 'target_name': 'gr', + 'product_name': 'skia_gr', 'type': 'static_library', + 'standalone_static_library': 1, 'includes': [ 'gpu.gypi', ], diff --git a/images.gyp b/images.gyp index 7824cf9..2989afe 100644 --- a/images.gyp +++ b/images.gyp @@ -2,7 +2,9 @@ 'targets': [ { 'target_name': 'images', + 'product_name': 'skia_images', 'type': 'static_library', + 'standalone_static_library': 1, 'dependencies': [ 'libjpeg.gyp:*', 'utils.gyp:utils', diff --git a/opts.gyp b/opts.gyp index e5ceb36..b8d7e22 100644 --- a/opts.gyp +++ b/opts.gyp @@ -20,7 +20,9 @@ # separately as well. { 'target_name': 'opts', + 'product_name': 'skia_opts', 'type': 'static_library', + 'standalone_static_library': 1, 'include_dirs': [ '../include/config', '../include/core', @@ -97,7 +99,9 @@ # gcc to generate SSSE3 code. { 'target_name': 'opts_ssse3', + 'product_name': 'skia_opts_ssse3', 'type': 'static_library', + 'standalone_static_library': 1, 'include_dirs': [ '../include/config', '../include/core', @@ -130,7 +134,9 @@ # is very similar to the SSSE3 one. { 'target_name': 'opts_neon', + 'product_name': 'skia_opts_neon', 'type': 'static_library', + 'standalone_static_library': 1, 'include_dirs': [ '../include/config', '../include/core', diff --git a/pdf.gyp b/pdf.gyp index e7b0369..7b3b9ea 100644 --- a/pdf.gyp +++ b/pdf.gyp @@ -2,11 +2,11 @@ 'targets': [ { 'target_name': 'pdf', + 'product_name': 'skia_pdf', 'type': 'static_library', + 'standalone_static_library': 1, 'dependencies': [ - 'core.gyp:core', - 'ports.gyp:ports', - 'utils.gyp:utils', + 'skia_base_libs.gyp:skia_base_libs', 'zlib.gyp:zlib', ], 'include_dirs': [ diff --git a/ports.gyp b/ports.gyp index 1aa112f..f743ad4 100644 --- a/ports.gyp +++ b/ports.gyp @@ -3,7 +3,9 @@ 'targets': [ { 'target_name': 'ports', + 'product_name': 'skia_ports', 'type': 'static_library', + 'standalone_static_library': 1, 'dependencies': [ 'core.gyp:core', 'sfnt.gyp:sfnt', diff --git a/sfnt.gyp b/sfnt.gyp index 17dd2d8..d4d9627 100644 --- a/sfnt.gyp +++ b/sfnt.gyp @@ -2,7 +2,9 @@ 'targets': [ { 'target_name': 'sfnt', + 'product_name': 'skia_sfnt', 'type': 'static_library', + 'standalone_static_library': 1, 'dependencies': [ 'core.gyp:core', ], diff --git a/shapeops_demo.gyp b/shapeops_demo.gyp index 25ac70a..b6718cb 100644 --- a/shapeops_demo.gyp +++ b/shapeops_demo.gyp @@ -65,12 +65,10 @@ '../experimental/Intersection/TSearch.h', ], 'dependencies': [ - 'core.gyp:core', + 'skia_base_libs.gyp:skia_base_libs', 'effects.gyp:effects', 'images.gyp:images', - 'ports.gyp:ports', 'views.gyp:views', - 'utils.gyp:utils', 'animator.gyp:animator', 'xml.gyp:xml', 'svg.gyp:svg', @@ -108,12 +106,6 @@ '../experimental/Intersection/EdgeDemoApp.xib', ], }], - [ 'skia_gpu == 1', { - 'dependencies': [ - 'gpu.gyp:gr', - 'gpu.gyp:skgr', - ], - }], ], 'msvs_settings': { 'VCLinkerTool': { diff --git a/shapeops_edge.gyp b/shapeops_edge.gyp index cc62f3e..11fe4b2 100644 --- a/shapeops_edge.gyp +++ b/shapeops_edge.gyp @@ -107,23 +107,17 @@ '../experimental/Intersection/thingsToDo.txt', ], 'dependencies': [ - 'core.gyp:core', + 'skia_base_libs.gyp:skia_base_libs', 'effects.gyp:effects', 'experimental.gyp:experimental', 'images.gyp:images', - 'ports.gyp:ports', 'pdf.gyp:pdf', - 'utils.gyp:utils', ], 'conditions': [ [ 'skia_gpu == 1', { 'include_dirs': [ '../src/gpu', ], - 'dependencies': [ - 'gpu.gyp:gr', - 'gpu.gyp:skgr', - ], }], ], }, diff --git a/skia_base_libs.gyp b/skia_base_libs.gyp new file mode 100644 index 0000000..a611d30 --- /dev/null +++ b/skia_base_libs.gyp @@ -0,0 +1,47 @@ +# The minimal set of static libraries for basic Skia functionality. +{ + 'variables': { + 'component_libs': [ + 'core.gyp:core', + 'opts.gyp:opts', + 'ports.gyp:ports', + 'utils.gyp:utils', + ], + 'conditions': [ + [ 'skia_arch_type == "x86"', { + 'component_libs': [ + 'opts.gyp:opts_ssse3', + ], + }], + [ 'arm_neon == 1', { + 'component_libs': [ + 'opts.gyp:opts_neon', + ], + }], + [ 'skia_gpu', { + 'component_libs': [ + 'gpu.gyp:gr', + 'gpu.gyp:skgr', + ], + }], + ], + }, + 'targets': [ + { + 'target_name': 'skia_base_libs', + 'type': 'none', + 'dependencies': [ + '<@(component_libs)', + ], + 'export_dependent_settings': [ + '<@(component_libs)', + ], + }, + ], +} + +# Local Variables: +# tab-width:2 +# indent-tabs-mode:nil +# End: +# vim: set expandtab tabstop=2 shiftwidth=2: diff --git a/svg.gyp b/svg.gyp index 9e90f28..3952fd7 100644 --- a/svg.gyp +++ b/svg.gyp @@ -2,7 +2,9 @@ 'targets': [ { 'target_name': 'svg', + 'product_name': 'skia_svg', 'type': 'static_library', + 'standalone_static_library': 1, 'include_dirs': [ '../include/config', '../include/core', diff --git a/tests.gyp b/tests.gyp index 874bb7f..c91388c 100644 --- a/tests.gyp +++ b/tests.gyp @@ -103,24 +103,18 @@ '../src/pipe/utils/SamplePipeControllers.cpp', ], 'dependencies': [ - 'core.gyp:core', + 'skia_base_libs.gyp:skia_base_libs', 'effects.gyp:effects', 'experimental.gyp:experimental', 'images.gyp:images', - 'ports.gyp:ports', 'pdf.gyp:pdf', 'tools.gyp:picture_utils', - 'utils.gyp:utils', ], 'conditions': [ [ 'skia_gpu == 1', { 'include_dirs': [ '../src/gpu', ], - 'dependencies': [ - 'gpu.gyp:gr', - 'gpu.gyp:skgr', - ], }], ], }, diff --git a/tools.gyp b/tools.gyp index 69c6cae..f6e9a93 100644 --- a/tools.gyp +++ b/tools.gyp @@ -31,11 +31,9 @@ '../tools/skdiff_main.cpp', ], 'dependencies': [ - 'core.gyp:core', + 'skia_base_libs.gyp:skia_base_libs', 'effects.gyp:effects', 'images.gyp:images', - 'ports.gyp:ports', - 'utils.gyp:utils', ], }, { @@ -45,11 +43,9 @@ '../tools/skhello.cpp', ], 'dependencies': [ - 'core.gyp:core', + 'skia_base_libs.gyp:skia_base_libs', 'effects.gyp:effects', 'images.gyp:images', - 'ports.gyp:ports', - 'utils.gyp:utils', ], }, { @@ -59,11 +55,9 @@ '../tools/skimage_main.cpp', ], 'dependencies': [ - 'core.gyp:core', + 'skia_base_libs.gyp:skia_base_libs', 'effects.gyp:effects', 'images.gyp:images', - 'ports.gyp:ports', - 'utils.gyp:utils', ], }, { @@ -76,8 +70,7 @@ '../src/pipe/utils/', ], 'dependencies': [ - 'core.gyp:core', - 'ports.gyp:ports', + 'skia_base_libs.gyp:skia_base_libs', 'tools.gyp:picture_renderer', 'tools.gyp:picture_utils', ], @@ -97,47 +90,34 @@ '../bench', ], 'dependencies': [ - 'core.gyp:core', + 'skia_base_libs.gyp:skia_base_libs', 'effects.gyp:effects', - 'ports.gyp:ports', 'tools.gyp:picture_utils', 'tools.gyp:picture_renderer', 'bench.gyp:bench_timer', ], }, { - 'target_name': 'picture_renderer', - 'type': 'static_library', - 'sources': [ + 'target_name': 'picture_renderer', + 'type': 'static_library', + 'sources': [ '../tools/PictureRenderer.cpp', '../src/pipe/utils/SamplePipeControllers.h', '../src/pipe/utils/SamplePipeControllers.cpp', - ], - 'include_dirs': [ - '../src/pipe/utils/', - '../src/utils/', - ], - 'dependencies': [ - 'core.gyp:core', + ], + 'include_dirs': [ + '../src/pipe/utils/', + '../src/utils/', + ], + 'dependencies': [ + 'skia_base_libs.gyp:skia_base_libs', 'effects.gyp:effects', 'images.gyp:images', 'tools.gyp:picture_utils', - 'utils.gyp:utils', - ], - 'export_dependent_settings': [ - 'images.gyp:images', - ], - 'conditions': [ - ['skia_gpu == 1', { - 'dependencies': [ - 'gpu.gyp:gr', - 'gpu.gyp:skgr', - ], - 'export_dependent_settings': [ - 'gpu.gyp:gr', - ], - }], - ], + ], + 'export_dependent_settings': [ + 'images.gyp:images', + ], }, { 'target_name': 'picture_utils', @@ -147,7 +127,7 @@ '../tools/picture_utils.h', ], 'dependencies': [ - 'core.gyp:core', + 'skia_base_libs.gyp:skia_base_libs', ], }, { @@ -157,11 +137,9 @@ '../tools/pinspect.cpp', ], 'dependencies': [ - 'core.gyp:core', + 'skia_base_libs.gyp:skia_base_libs', 'effects.gyp:effects', 'images.gyp:images', - 'ports.gyp:ports', - 'utils.gyp:utils', ], }, { @@ -174,11 +152,9 @@ '../tools/filtermain.cpp', ], 'dependencies': [ - 'core.gyp:core', + 'skia_base_libs.gyp:skia_base_libs', 'effects.gyp:effects', 'images.gyp:images', - 'ports.gyp:ports', - 'utils.gyp:utils', ], }, ], diff --git a/utils.gyp b/utils.gyp index e5274ed..cc25349 100644 --- a/utils.gyp +++ b/utils.gyp @@ -2,11 +2,12 @@ 'targets': [ { 'target_name': 'utils', - 'dependencies': [ - 'core.gyp:core', - ], + 'product_name': 'skia_utils', 'type': 'static_library', + 'standalone_static_library': 1, 'include_dirs': [ + '../include/config', + '../include/core', '../include/effects', '../include/pipe', '../include/utils', diff --git a/views.gyp b/views.gyp index db748c7..ccb61e1 100644 --- a/views.gyp +++ b/views.gyp @@ -8,7 +8,9 @@ 'targets': [ { 'target_name': 'views', + 'product_name': 'skia_views', 'type': 'static_library', + 'standalone_static_library': 1, 'include_dirs': [ '../include/config', '../include/core', @@ -110,11 +112,6 @@ '../src/views/win/skia_win.cpp', ], }], - [ 'skia_gpu == 1', { - 'include_dirs': [ - '../include/gpu', - ], - }], ], 'direct_dependent_settings': { 'include_dirs': [ diff --git a/xml.gyp b/xml.gyp index b7878e2..b7fdb83 100644 --- a/xml.gyp +++ b/xml.gyp @@ -2,7 +2,9 @@ 'targets': [ { 'target_name': 'xml', + 'product_name': 'skia_xml', 'type': 'static_library', + 'standalone_static_library': 1, 'include_dirs': [ '../include/config', '../include/core', diff --git a/xps.gyp b/xps.gyp index 1337fd3..e5b7c0d 100644 --- a/xps.gyp +++ b/xps.gyp @@ -2,11 +2,12 @@ 'targets': [ { 'target_name': 'xps', + 'product_name': 'skia_xps', 'type': 'static_library', + 'standalone_static_library': 1, 'dependencies': [ - 'core.gyp:core', + 'skia_base_libs.gyp:skia_base_libs', 'images.gyp:images', - 'utils.gyp:utils', ], 'include_dirs': [ '../include/device/xps', -- cgit v1.2.3 From 9c41d945ba296740ab70f26ae1e03481a0f682c8 Mon Sep 17 00:00:00 2001 From: "bsalomon@google.com" Date: Thu, 11 Oct 2012 14:33:10 +0000 Subject: Fix Qt OpenGL lib name on Windows and change the default qt_sdk var value on windows. Over-the-shoulder review from robertphillips@google.com git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@5894 2bbb7eff-a529-9590-31e7-b0007b416f81 --- debugger.gyp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/debugger.gyp b/debugger.gyp index cbaf492..d64050f 100644 --- a/debugger.gyp +++ b/debugger.gyp @@ -47,8 +47,8 @@ }], [ 'skia_os == "win"', { 'variables': { - # TODO: location of systemwide Qt on Win? - 'qt_sdk%': 'C:/Qt/4.6.4/', + # This is the default location for the version of Qt current on 10/11/12 + 'qt_sdk%': 'C:/Qt/4.8.3/', }, 'qt_sdk': '<(qt_sdk)', 'qt_moc%': '<(qt_sdk)/bin/moc', @@ -61,7 +61,7 @@ 'qt_libs': [ '<(qt_sdk)/lib/QtCore4.lib', '<(qt_sdk)/lib/QtGui4.lib', - '<(qt_sdk)/lib/QtOpenGL.lib', + '<(qt_sdk)/lib/QtOpenGL4.lib', ], }], ], -- cgit v1.2.3 From 2c4be1f265ae53abd019fee5e1166d1f1e399653 Mon Sep 17 00:00:00 2001 From: "borenet@google.com" Date: Thu, 11 Oct 2012 19:23:46 +0000 Subject: Fix ANGLE build Removed this in r5889. Review URL: https://codereview.appspot.com/6651051 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@5904 2bbb7eff-a529-9590-31e7-b0007b416f81 --- views.gyp | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/views.gyp b/views.gyp index ccb61e1..56d9f13 100644 --- a/views.gyp +++ b/views.gyp @@ -112,6 +112,11 @@ '../src/views/win/skia_win.cpp', ], }], + [ 'skia_gpu == 1', { + 'include_dirs': [ + '../include/gpu', + ], + }], ], 'direct_dependent_settings': { 'include_dirs': [ -- cgit v1.2.3 From c9eb11fb8775acb4e6bfa7339c075f6ebf0044c7 Mon Sep 17 00:00:00 2001 From: "reed@google.com" Date: Fri, 12 Oct 2012 14:42:38 +0000 Subject: add bench for drawBitmapRectToRect git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@5915 2bbb7eff-a529-9590-31e7-b0007b416f81 --- bench.gypi | 1 + 1 file changed, 1 insertion(+) diff --git a/bench.gypi b/bench.gypi index e3e70da..6f630d6 100644 --- a/bench.gypi +++ b/bench.gypi @@ -8,6 +8,7 @@ '../bench/AAClipBench.cpp', '../bench/BitmapBench.cpp', + '../bench/BitmapRectBench.cpp', '../bench/BlurBench.cpp', '../bench/ChecksumBench.cpp', '../bench/ChromeBench.cpp', -- cgit v1.2.3 From e2865b57c18cb38a137c1565e2bffb65ef2d3d04 Mon Sep 17 00:00:00 2001 From: "senorblanco@chromium.org" Date: Fri, 12 Oct 2012 19:14:06 +0000 Subject: When two or more color matrix image filters are connected together, and the non-leaf matrices do not require clamping, we can concatenate their matrices and apply them together. Review URL: https://codereview.appspot.com/6489054 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@5931 2bbb7eff-a529-9590-31e7-b0007b416f81 --- gmslides.gypi | 1 + 1 file changed, 1 insertion(+) diff --git a/gmslides.gypi b/gmslides.gypi index e922713..313eaf6 100644 --- a/gmslides.gypi +++ b/gmslides.gypi @@ -13,6 +13,7 @@ '../gm/blend.cpp', '../gm/blurs.cpp', '../gm/circles.cpp', + '../gm/colorfilterimagefilter.cpp', '../gm/colormatrix.cpp', '../gm/complexclip.cpp', '../gm/complexclip2.cpp', -- cgit v1.2.3 From 741cf7d566a12ae186fcdedb16ce0a18ddff1078 Mon Sep 17 00:00:00 2001 From: "bsalomon@google.com" Date: Fri, 12 Oct 2012 19:26:15 +0000 Subject: Add new GM, shadertext3. It would have revealed a bug in the GPU draw-large-text-as-path code path that was recently fixed. R=reed@google.com Review URL: https://codereview.appspot.com/6638057 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@5932 2bbb7eff-a529-9590-31e7-b0007b416f81 --- gmslides.gypi | 1 + 1 file changed, 1 insertion(+) diff --git a/gmslides.gypi b/gmslides.gypi index 313eaf6..46ec34d 100644 --- a/gmslides.gypi +++ b/gmslides.gypi @@ -61,6 +61,7 @@ '../gm/shaderbounds.cpp', '../gm/shadertext.cpp', '../gm/shadertext2.cpp', + '../gm/shadertext3.cpp', '../gm/shadows.cpp', '../gm/simpleaaclip.cpp', '../gm/strokefill.cpp', -- cgit v1.2.3 From e78c270d27daf9621c8070242abb234507a7c3f0 Mon Sep 17 00:00:00 2001 From: "djsollen@google.com" Date: Fri, 12 Oct 2012 19:44:35 +0000 Subject: Remove support for building skia android apps outside of an APK. Review URL: https://codereview.appspot.com/6663043 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@5936 2bbb7eff-a529-9590-31e7-b0007b416f81 --- apptype_console.gypi | 2 +- common_variables.gypi | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/apptype_console.gypi b/apptype_console.gypi index 9b42db5..80e925d 100644 --- a/apptype_console.gypi +++ b/apptype_console.gypi @@ -12,7 +12,7 @@ }, }, 'conditions': [ - [ 'skia_os == "android" and android_make_apk == 1', { + [ 'skia_os == "android"', { 'dependencies': [ 'android_deps.gyp:Android_EntryPoint', ], diff --git a/common_variables.gypi b/common_variables.gypi index 1976dbe..3d19e62 100644 --- a/common_variables.gypi +++ b/common_variables.gypi @@ -83,7 +83,6 @@ 'skia_nv_path_rendering%': 0, 'skia_angle%': 0, 'skia_directwrite%': 0, - 'android_make_apk%': 1, 'skia_nacl%': 0, 'skia_gpu%': 1, 'skia_osx_sdkroot%': 'macosx', @@ -102,7 +101,6 @@ 'skia_arch_width%': '<(skia_arch_width)', 'skia_arch_type%': '<(skia_arch_type)', 'skia_directwrite%': '<(skia_directwrite)', - 'android_make_apk%': '<(android_make_apk)', 'skia_nacl%': '<(skia_nacl)', 'skia_gpu%': '<(skia_gpu)', 'skia_osx_sdkroot%': '<(skia_osx_sdkroot)', -- cgit v1.2.3 From 0823723658574f3849609e6f00ed48b2915fe70d Mon Sep 17 00:00:00 2001 From: "tfarina@chromium.org" Date: Fri, 12 Oct 2012 23:29:40 +0000 Subject: Delete SkWidget.cpp, which has been #ifdef'ed out for 4+ years. R=epoger@google.com Review URL: https://codereview.appspot.com/6650055 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@5942 2bbb7eff-a529-9590-31e7-b0007b416f81 --- views.gyp | 1 - 1 file changed, 1 deletion(-) diff --git a/views.gyp b/views.gyp index 56d9f13..80be87e 100644 --- a/views.gyp +++ b/views.gyp @@ -59,7 +59,6 @@ '../src/views/SkViewInflate.cpp', '../src/views/SkViewPriv.cpp', '../src/views/SkViewPriv.h', - '../src/views/SkWidget.cpp', '../src/views/SkWidgets.cpp', '../src/views/SkWindow.cpp', -- cgit v1.2.3 From 69e0e2f66042d152fde861dd31e7684a41bac79d Mon Sep 17 00:00:00 2001 From: "bungeman@google.com" Date: Mon, 15 Oct 2012 14:31:29 +0000 Subject: Generate debugger mocs into out instead of src. https://codereview.appspot.com/6674044/ git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@5953 2bbb7eff-a529-9590-31e7-b0007b416f81 --- debugger.gyp | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/debugger.gyp b/debugger.gyp index d64050f..3578223 100644 --- a/debugger.gyp +++ b/debugger.gyp @@ -66,6 +66,7 @@ }], ], 'moc_src_dir': '../debugger/QT', + 'moc_gen_dir': '<(SHARED_INTERMEDIATE_DIR)/debugger/QT', }, 'targets': [ { @@ -110,12 +111,12 @@ '../debugger/QT/qrc_SkIcons.cpp', # Generated MOC files - '<(moc_src_dir)/moc_SkCanvasWidget.cpp', - '<(moc_src_dir)/moc_SkDebuggerGUI.cpp', - '<(moc_src_dir)/moc_SkInspectorWidget.cpp', - '<(moc_src_dir)/moc_SkSettingsWidget.cpp', - '<(moc_src_dir)/moc_SkRasterWidget.cpp', - '<(moc_src_dir)/moc_SkGLWidget.cpp', + '<(moc_gen_dir)/moc_SkCanvasWidget.cpp', + '<(moc_gen_dir)/moc_SkDebuggerGUI.cpp', + '<(moc_gen_dir)/moc_SkInspectorWidget.cpp', + '<(moc_gen_dir)/moc_SkSettingsWidget.cpp', + '<(moc_gen_dir)/moc_SkRasterWidget.cpp', + '<(moc_gen_dir)/moc_SkGLWidget.cpp', ], 'dependencies': [ 'skia_base_libs.gyp:skia_base_libs', @@ -144,8 +145,8 @@ { 'rule_name': 'generate_moc', 'extension': 'h', - 'outputs': [ '<(RULE_INPUT_DIRNAME)/moc_<(RULE_INPUT_ROOT).cpp' ], - 'action': [ '<(qt_moc)', '<(RULE_INPUT_PATH)', '-o', '<(moc_src_dir)/moc_<(RULE_INPUT_ROOT).cpp' ], + 'outputs': [ '<(moc_gen_dir)/moc_<(RULE_INPUT_ROOT).cpp' ], + 'action': [ '<(qt_moc)', '<(RULE_INPUT_PATH)', '-o', '<(moc_gen_dir)/moc_<(RULE_INPUT_ROOT).cpp' ], 'message': 'Generating <(RULE_INPUT_ROOT).cpp.', }, ], -- cgit v1.2.3 From 66e226dd1d07d9b4d9b3e4c5eeebed4175df37c9 Mon Sep 17 00:00:00 2001 From: "scroggo@google.com" Date: Mon, 15 Oct 2012 18:27:25 +0000 Subject: Remove an obsolete comment. This comment is no longer true as of r5869. Review URL: https://codereview.appspot.com/6701043 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@5957 2bbb7eff-a529-9590-31e7-b0007b416f81 --- common_conditions.gypi | 1 - 1 file changed, 1 deletion(-) diff --git a/common_conditions.gypi b/common_conditions.gypi index e8e2fca..70b4566 100644 --- a/common_conditions.gypi +++ b/common_conditions.gypi @@ -3,7 +3,6 @@ { 'defines': [ 'SK_ALLOW_STATIC_GLOBAL_INITIALIZERS=<(skia_static_initializers)', - # Need to rebuild .skp files w/ this change # 'SK_SUPPORT_HINTING_SCALE_FACTOR', ], 'conditions' : [ -- cgit v1.2.3 From 30329b2652c45b450e881409a9842aee96155c37 Mon Sep 17 00:00:00 2001 From: "caryclark@google.com" Date: Tue, 16 Oct 2012 12:06:27 +0000 Subject: shape ops work in progress git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@5959 2bbb7eff-a529-9590-31e7-b0007b416f81 --- shapeops_demo.gyp | 2 +- shapeops_edge.gyp | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/shapeops_demo.gyp b/shapeops_demo.gyp index b6718cb..1279294 100644 --- a/shapeops_demo.gyp +++ b/shapeops_demo.gyp @@ -76,7 +76,7 @@ 'pdf.gyp:pdf', ], 'conditions' : [ - [ 'skia_os in ["linux", "freebsd", "openbsd", "solaris"]', { + [ 'skia_os in ["linux", "freebsd", "openbsd", "solaris"]', { }], [ 'skia_os == "win"', { }], diff --git a/shapeops_edge.gyp b/shapeops_edge.gyp index 11fe4b2..b3f63f4 100644 --- a/shapeops_edge.gyp +++ b/shapeops_edge.gyp @@ -55,6 +55,7 @@ '../experimental/Intersection/LineQuadraticIntersection.cpp', '../experimental/Intersection/LineQuadraticIntersection_Test.cpp', '../experimental/Intersection/LineUtilities.cpp', + '../experimental/Intersection/MiniSimplify_Test.cpp', '../experimental/Intersection/QuadraticBezierClip.cpp', '../experimental/Intersection/QuadraticBezierClip_Test.cpp', '../experimental/Intersection/QuadraticBounds.cpp', -- cgit v1.2.3 From 68e9c63c489fad946530a39d199e17bda8b5102c Mon Sep 17 00:00:00 2001 From: "caryclark@google.com" Date: Tue, 16 Oct 2012 12:32:33 +0000 Subject: more pixman work in progress git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@5961 2bbb7eff-a529-9590-31e7-b0007b416f81 --- pixman_test.gyp | 177 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 177 insertions(+) create mode 100644 pixman_test.gyp diff --git a/pixman_test.gyp b/pixman_test.gyp new file mode 100644 index 0000000..64c5a9c --- /dev/null +++ b/pixman_test.gyp @@ -0,0 +1,177 @@ +# GYP file to build unit tests. +{ + 'includes': [ + 'apptype_console.gypi', + 'common.gypi', + ], + 'targets': [ + { + 'target_name': 'pixman_test', + 'type': 'executable', + 'mac_bundle' : 1, + 'defines': [ + 'HAVE_CONFIG_H', + ], + 'include_dirs' : [ + '../src/core', + '../experimental/pixman', + '../experimental/SimpleCocoaApp', # needed to get SimpleApp.h + ], + 'sources': [ + '../experimental/pixman/config.h', + '../experimental/pixman/junk.cpp', +# '../../../pixman/demos/alpha-test.c', + '../../../pixman/demos/checkerboard.c', +# '../../../pixman/demos/clip-in.c', +# '../../../pixman/demos/clip-test.c', +# '../../../pixman/demos/composite-test.c', +# '../../../pixman/demos/convolution-test.c', +# '../../../pixman/demos/gradient-test.c', +# '../../../pixman/demos/gtk-utils.c', +# '../../../pixman/demos/parrot.c', +# '../../../pixman/demos/quad2quad.c', +# '../../../pixman/demos/radial-test.c', +# '../../../pixman/demos/screen-test.c', +# '../../../pixman/demos/srgb-test.c', +# '../../../pixman/demos/srgb-trap-test.c', +# '../../../pixman/demos/trap-test.c', +# '../../../pixman/demos/tri-test.c', + '../../../pixman/demos/gtk-utils.h', +# '../../../pixman/test/a1-trap-test.c', +# '../../../pixman/test/affine-test.c', +# '../../../pixman/test/alpha-loop.c', +# '../../../pixman/test/alphamap.c', +# '../../../pixman/test/blitters-test.c', +# '../../../pixman/test/combiner-test.c', +# '../../../pixman/test/composite-traps-test.c', +# '../../../pixman/test/composite.c', +# '../../../pixman/test/fetch-test.c', +# '../../../pixman/test/glyph-test.c', +# '../../../pixman/test/gradient-crash-test.c', +# '../../../pixman/test/infinite-loop.c', +# '../../../pixman/test/lowlevel-blt-bench.c', +# '../../../pixman/test/oob-test.c', +# '../../../pixman/test/pdf-op-test.c', +# '../../../pixman/test/region-contains-test.c', +# '../../../pixman/test/region-test.c', +# '../../../pixman/test/region-translate-test.c', +# '../../../pixman/test/rotate-test.c', +# '../../../pixman/test/scaling-crash-test.c', +# '../../../pixman/test/scaling-helpers-test.c', +# '../../../pixman/test/scaling-test.c', +# '../../../pixman/test/stress-test.c', +# '../../../pixman/test/trap-crasher.c', + '../../../pixman/test/utils.c', + '../../../pixman/test/utils.h', + '../../../pixman/pixman/pixman-access-accessors.c', + '../../../pixman/pixman/pixman-access.c', +# '../../../pixman/pixman/pixman-arm-neon.c', +# '../../../pixman/pixman/pixman-arm-simd.c', + '../../../pixman/pixman/pixman-arm.c', + '../../../pixman/pixman/pixman-bits-image.c', + '../../../pixman/pixman/pixman-combine-float.c', + '../../../pixman/pixman/pixman-combine32.c', + '../../../pixman/pixman/pixman-conical-gradient.c', + '../../../pixman/pixman/pixman-edge-accessors.c', + '../../../pixman/pixman/pixman-edge.c', + '../../../pixman/pixman/pixman-fast-path.c', + '../../../pixman/pixman/pixman-general.c', + '../../../pixman/pixman/pixman-glyph.c', + '../../../pixman/pixman/pixman-gradient-walker.c', + '../../../pixman/pixman/pixman-image.c', + '../../../pixman/pixman/pixman-implementation.c', + '../../../pixman/pixman/pixman-linear-gradient.c', + '../../../pixman/pixman/pixman-matrix.c', +# '../../../pixman/pixman/pixman-mips-dspr2.c', + '../../../pixman/pixman/pixman-mips.c', + '../../../pixman/pixman/pixman-mmx.c', + '../../../pixman/pixman/pixman-noop.c', + '../../../pixman/pixman/pixman-ppc.c', + '../../../pixman/pixman/pixman-radial-gradient.c', +# '../../../pixman/pixman/pixman-region.c', + '../../../pixman/pixman/pixman-region16.c', + '../../../pixman/pixman/pixman-region32.c', + '../../../pixman/pixman/pixman-solid-fill.c', + '../../../pixman/pixman/pixman-sse2.c', + '../../../pixman/pixman/pixman-timer.c', + '../../../pixman/pixman/pixman-trap.c', + '../../../pixman/pixman/pixman-utils.c', +# '../../../pixman/pixman/pixman-vmx.c', + '../../../pixman/pixman/pixman-x86.c', + '../../../pixman/pixman/pixman.c', +# '../../../pixman/pixman/pixman-arm-neon-asm-bilinear.S', +# '../../../pixman/pixman/pixman-arm-neon-asm.S', +# '../../../pixman/pixman/pixman-arm-simd-asm.S', +# '../../../pixman/pixman/pixman-mips-dspr2-asm.S', +# '../../../pixman/pixman/pixman-mips-memcpy-asm.S', + '../../../pixman/pixman/loongson-mmintrin.h', + '../../../pixman/pixman/pixman-accessor.h', + '../../../pixman/pixman/pixman-arm-common.h', + '../../../pixman/pixman/pixman-arm-neon-asm.h', + '../../../pixman/pixman/pixman-combine32.h', + '../../../pixman/pixman/pixman-compiler.h', + '../../../pixman/pixman/pixman-edge-imp.h', + '../../../pixman/pixman/pixman-inlines.h', + '../../../pixman/pixman/pixman-mips-dspr2-asm.h', + '../../../pixman/pixman/pixman-mips-dspr2.h', + '../../../pixman/pixman/pixman-private.h', + '../../../pixman/pixman/pixman.h', + ], + 'dependencies': [ + 'skia_base_libs.gyp:skia_base_libs', + 'effects.gyp:effects', + 'experimental.gyp:experimental', + 'images.gyp:images', + 'pdf.gyp:pdf', + 'views.gyp:views', + 'xml.gyp:xml', + ], + 'conditions': [ + [ 'skia_os in ["linux", "freebsd", "openbsd", "solaris"]', { + }], + [ 'skia_os == "win"', { + }], + [ 'skia_os == "mac"', { + 'sources': [ + + # Mac files + '../src/views/mac/SkEventNotifier.h', + '../src/views/mac/SkEventNotifier.mm', + '../src/views/mac/skia_mac.mm', + '../src/views/mac/SkNSView.h', + '../src/views/mac/SkNSView.mm', + '../src/views/mac/SkOptionsTableView.h', + '../src/views/mac/SkOptionsTableView.mm', + '../src/views/mac/SkOSWindow_Mac.mm', + '../src/views/mac/SkTextFieldCell.h', + '../src/views/mac/SkTextFieldCell.m', + ], + 'libraries': [ + '$(SDKROOT)/System/Library/Frameworks/QuartzCore.framework', + '$(SDKROOT)/System/Library/Frameworks/OpenGL.framework', + ], + 'xcode_settings' : { + 'INFOPLIST_FILE' : '../experimental/Intersection/EdgeDemoApp-Info.plist', + }, + 'mac_bundle_resources' : [ + '../experimental/Intersection/EdgeDemoApp.xib', + ], + }], + ], + 'msvs_settings': { + 'VCLinkerTool': { + 'SubSystem': '2', + 'AdditionalDependencies': [ + 'd3d9.lib', + ], + }, + }, + }, + ], +} + +# Local Variables: +# tab-width:2 +# indent-tabs-mode:nil +# End: +# vim: set expandtab tabstop=2 shiftwidth=2: -- cgit v1.2.3 From 738683011635218ddd94c28c8cc8d8ebc2103849 Mon Sep 17 00:00:00 2001 From: "bsalomon@google.com" Date: Wed, 17 Oct 2012 15:00:32 +0000 Subject: Make table color filter use asNewCustomStage. R=robertphillips@google.com Review URL: https://codereview.appspot.com/6713051 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@5976 2bbb7eff-a529-9590-31e7-b0007b416f81 --- gpu.gypi | 2 -- 1 file changed, 2 deletions(-) diff --git a/gpu.gypi b/gpu.gypi index c0a4a7b..8f7ac1a 100644 --- a/gpu.gypi +++ b/gpu.gypi @@ -128,8 +128,6 @@ '<(skia_src_path)/gpu/effects/Gr1DKernelEffect.h', '<(skia_src_path)/gpu/effects/GrTextureStripAtlas.h', '<(skia_src_path)/gpu/effects/GrTextureStripAtlas.cpp', - '<(skia_src_path)/gpu/effects/GrColorTableEffect.cpp', - '<(skia_src_path)/gpu/effects/GrColorTableEffect.h', '<(skia_src_path)/gpu/effects/GrConfigConversionEffect.cpp', '<(skia_src_path)/gpu/effects/GrConfigConversionEffect.h', '<(skia_src_path)/gpu/effects/GrConvolutionEffect.cpp', -- cgit v1.2.3 From 4f252af1d3adb1f77b4d49e935d77ff188f4b59d Mon Sep 17 00:00:00 2001 From: "epoger@google.com" Date: Thu, 18 Oct 2012 16:10:56 +0000 Subject: add a "most" target, and make it the default split out of https://codereview.appspot.com/6651064/ ('gyp: generate "everything" and "most" targets instead of "all"') tests: "make most" now works, "make" now calls "make most" Review URL: https://codereview.appspot.com/6740045 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@5999 2bbb7eff-a529-9590-31e7-b0007b416f81 --- most.gyp | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100644 most.gyp diff --git a/most.gyp b/most.gyp new file mode 100644 index 0000000..319547e --- /dev/null +++ b/most.gyp @@ -0,0 +1,34 @@ +# Build ALMOST everything provided by Skia; this should be the default target. +# +# This omits the following targets that many developers won't want to build: +# - debugger: this requires QT to build +# +{ + 'targets': [ + { + 'target_name': 'most', + 'type': 'none', + 'dependencies': [ + # The minimal set of static libraries for basic Skia functionality. + 'skia_base_libs.gyp:skia_base_libs', + + 'bench.gyp:bench', + 'gm.gyp:gm', + 'SampleApp.gyp:SampleApp', + 'tests.gyp:tests', + 'tools.gyp:tools', + ], + 'conditions': [ + ['skia_os == "android"', { + 'dependencies': [ 'android_system.gyp:SkiaAndroidApp' ], + }], + ], + }, + ], +} + +# Local Variables: +# tab-width:2 +# indent-tabs-mode:nil +# End: +# vim: set expandtab tabstop=2 shiftwidth=2: -- cgit v1.2.3 From fafba37466dd7d448a2d27e71ff67dd6c2991a2e Mon Sep 17 00:00:00 2001 From: "robertphillips@google.com" Date: Fri, 19 Oct 2012 01:26:18 +0000 Subject: Place r5997 (make arcto's convex) behind a compiler flag to delay day of reckoning with Webkit baselines git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@6012 2bbb7eff-a529-9590-31e7-b0007b416f81 --- common_conditions.gypi | 1 + 1 file changed, 1 insertion(+) diff --git a/common_conditions.gypi b/common_conditions.gypi index 70b4566..ac2defb 100644 --- a/common_conditions.gypi +++ b/common_conditions.gypi @@ -4,6 +4,7 @@ 'defines': [ 'SK_ALLOW_STATIC_GLOBAL_INITIALIZERS=<(skia_static_initializers)', # 'SK_SUPPORT_HINTING_SCALE_FACTOR', + 'SK_REDEFINE_ROOT2OVER2_TO_MAKE_ARCTOS_CONVEX', ], 'conditions' : [ ['skia_gpu == 1', -- cgit v1.2.3 From 9e9b130e1a8ec2c41bb57aeb44d921439767783b Mon Sep 17 00:00:00 2001 From: "bsalomon@google.com" Date: Fri, 19 Oct 2012 19:26:05 +0000 Subject: Add a GM that tests xfermode-based color filters. Review URL: https://codereview.appspot.com/6736052 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@6022 2bbb7eff-a529-9590-31e7-b0007b416f81 --- gmslides.gypi | 1 + 1 file changed, 1 insertion(+) diff --git a/gmslides.gypi b/gmslides.gypi index 46ec34d..c956150 100644 --- a/gmslides.gypi +++ b/gmslides.gypi @@ -48,6 +48,7 @@ '../gm/lcdtext.cpp', '../gm/linepaths.cpp', '../gm/matrixconvolution.cpp', + '../gm/modecolorfilters.cpp', '../gm/morphology.cpp', '../gm/ninepatchstretch.cpp', '../gm/nocolorbleed.cpp', -- cgit v1.2.3 From 48837bf5c1cc46d60d387df7a706233f0f49ace9 Mon Sep 17 00:00:00 2001 From: "mike@reedtribe.org" Date: Mon, 22 Oct 2012 03:59:34 +0000 Subject: add sample to debug in fatbits mode git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@6024 2bbb7eff-a529-9590-31e7-b0007b416f81 --- SampleApp.gyp | 1 + 1 file changed, 1 insertion(+) diff --git a/SampleApp.gyp b/SampleApp.gyp index c33c67f..3b0be1b 100644 --- a/SampleApp.gyp +++ b/SampleApp.gyp @@ -51,6 +51,7 @@ '../samplecode/SampleEmboss.cpp', '../samplecode/SampleEmptyPath.cpp', '../samplecode/SampleEncode.cpp', + '../samplecode/SampleFatBits.cpp', '../samplecode/SampleFillType.cpp', '../samplecode/SampleFilter.cpp', '../samplecode/SampleFilter2.cpp', -- cgit v1.2.3 From 27c01cf61b1829e2f41e4dba8a9a2cb7462c8276 Mon Sep 17 00:00:00 2001 From: "bsalomon@google.com" Date: Wed, 24 Oct 2012 18:28:34 +0000 Subject: CustomStage Renaming Part 1 Search and replace: GrCustomStage->GrEffect GrCustomStageTestFactory->GrEffectTestFactory renamed the cpp/h files from customStage->effect reordered gypi, #includes, forward decls to maintain alphabetical sort. manually fixed up some whitespace and linewraps deleted a commented out #include R=robertphillips@google.com Review URL: https://codereview.appspot.com/6758046 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@6076 2bbb7eff-a529-9590-31e7-b0007b416f81 --- gpu.gypi | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gpu.gypi b/gpu.gypi index 8f7ac1a..80a9753 100644 --- a/gpu.gypi +++ b/gpu.gypi @@ -15,8 +15,8 @@ '<(skia_include_path)/gpu/GrConfig.h', '<(skia_include_path)/gpu/GrContext.h', '<(skia_include_path)/gpu/GrContextFactory.h', - '<(skia_include_path)/gpu/GrCustomStage.h', '<(skia_include_path)/gpu/GrCustomStageUnitTest.h', + '<(skia_include_path)/gpu/GrEffect.h', '<(skia_include_path)/gpu/GrFontScaler.h', '<(skia_include_path)/gpu/GrGlyph.h', '<(skia_include_path)/gpu/GrInstanceCounter.h', @@ -60,13 +60,13 @@ '<(skia_src_path)/gpu/GrCacheID.cpp', '<(skia_src_path)/gpu/GrClipData.cpp', '<(skia_src_path)/gpu/GrContext.cpp', - '<(skia_src_path)/gpu/GrCustomStage.cpp', '<(skia_src_path)/gpu/GrDefaultPathRenderer.cpp', '<(skia_src_path)/gpu/GrDefaultPathRenderer.h', '<(skia_src_path)/gpu/GrDrawState.cpp', '<(skia_src_path)/gpu/GrDrawState.h', '<(skia_src_path)/gpu/GrDrawTarget.cpp', '<(skia_src_path)/gpu/GrDrawTarget.h', + '<(skia_src_path)/gpu/GrEffect.cpp', '<(skia_src_path)/gpu/GrGeometryBuffer.cpp', '<(skia_src_path)/gpu/GrGeometryBuffer.h', '<(skia_src_path)/gpu/GrClipMaskCache.h', -- cgit v1.2.3 From 22f501f5cd06405cae58e17b91a1967797352a1c Mon Sep 17 00:00:00 2001 From: "bsalomon@google.com" Date: Wed, 24 Oct 2012 19:07:10 +0000 Subject: GrCustomStage Renaming Part 2 GrSamplerState member rename GrCustomStageUnitTest rename some comment updates Review URL: https://codereview.appspot.com/6771043 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@6078 2bbb7eff-a529-9590-31e7-b0007b416f81 --- gpu.gypi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gpu.gypi b/gpu.gypi index 80a9753..1e6605b 100644 --- a/gpu.gypi +++ b/gpu.gypi @@ -15,8 +15,8 @@ '<(skia_include_path)/gpu/GrConfig.h', '<(skia_include_path)/gpu/GrContext.h', '<(skia_include_path)/gpu/GrContextFactory.h', - '<(skia_include_path)/gpu/GrCustomStageUnitTest.h', '<(skia_include_path)/gpu/GrEffect.h', + '<(skia_include_path)/gpu/GrEffectUnitTest.h', '<(skia_include_path)/gpu/GrFontScaler.h', '<(skia_include_path)/gpu/GrGlyph.h', '<(skia_include_path)/gpu/GrInstanceCounter.h', -- cgit v1.2.3 From 853513c00f6f8ee183fa6703089da82bd3fb96d5 Mon Sep 17 00:00:00 2001 From: "bsalomon@google.com" Date: Thu, 25 Oct 2012 13:22:00 +0000 Subject: GrGLProgramStage Renaming Part 1. Renamed cpp and h s/GrGLProgramStage/GrGLEffect/ Review URL: https://codereview.appspot.com/6759054 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@6090 2bbb7eff-a529-9590-31e7-b0007b416f81 --- gpu.gypi | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gpu.gypi b/gpu.gypi index 1e6605b..79cdecd 100644 --- a/gpu.gypi +++ b/gpu.gypi @@ -144,6 +144,8 @@ '<(skia_src_path)/gpu/gl/GrGLCreateNativeInterface_none.cpp', '<(skia_src_path)/gpu/gl/GrGLDefaultInterface_none.cpp', '<(skia_src_path)/gpu/gl/GrGLDefines.h', + '<(skia_src_path)/gpu/gl/GrGLEffect.cpp', + '<(skia_src_path)/gpu/gl/GrGLEffect.h', '<(skia_src_path)/gpu/gl/GrGLIndexBuffer.cpp', '<(skia_src_path)/gpu/gl/GrGLIndexBuffer.h', '<(skia_src_path)/gpu/gl/GrGLInterface.cpp', @@ -152,8 +154,6 @@ '<(skia_src_path)/gpu/gl/GrGLPath.h', '<(skia_src_path)/gpu/gl/GrGLProgram.cpp', '<(skia_src_path)/gpu/gl/GrGLProgram.h', - '<(skia_src_path)/gpu/gl/GrGLProgramStage.cpp', - '<(skia_src_path)/gpu/gl/GrGLProgramStage.h', '<(skia_src_path)/gpu/gl/GrGLRenderTarget.cpp', '<(skia_src_path)/gpu/gl/GrGLRenderTarget.h', '<(skia_src_path)/gpu/gl/GrGLShaderBuilder.cpp', -- cgit v1.2.3 From fc04ee05f3a4fbc9038f3cee6ab2eb52b0240e20 Mon Sep 17 00:00:00 2001 From: "epoger@google.com" Date: Thu, 25 Oct 2012 16:32:07 +0000 Subject: gyp: generate "everything" and "most" targets instead of "all" "make all" at the toplevel now chains to "make everything" BUG=http://code.google.com/p/skia/issues/detail?id=932 Review URL: https://codereview.appspot.com/6651064 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@6116 2bbb7eff-a529-9590-31e7-b0007b416f81 --- all.gyp | 41 ----------------------------------------- everything.gyp | 31 +++++++++++++++++++++++++++++++ 2 files changed, 31 insertions(+), 41 deletions(-) delete mode 100644 all.gyp create mode 100644 everything.gyp diff --git a/all.gyp b/all.gyp deleted file mode 100644 index 37844bb..0000000 --- a/all.gyp +++ /dev/null @@ -1,41 +0,0 @@ -# Creates a Makefile that is capable of building all executable targets. -# -# To build on Linux: -# ./gyp_skia && make all -# -# Building on other platforms not tested yet. -# - -# -# -# -# -# -# THIS IS DEPRECATED IN FAVOR OF trunk/skia.gyp !!! -# Questions? Contact epoger@google.com -# -# -# -# - -{ - 'targets': [ - { - 'target_name': 'all', - 'type': 'none', - 'dependencies': [ - 'bench.gyp:bench', - 'gm.gyp:gm', - 'SampleApp.gyp:SampleApp', - 'tests.gyp:tests', - 'tools.gyp:tools', - ], - }, - ], -} - -# Local Variables: -# tab-width:2 -# indent-tabs-mode:nil -# End: -# vim: set expandtab tabstop=2 shiftwidth=2: diff --git a/everything.gyp b/everything.gyp new file mode 100644 index 0000000..2cecd92 --- /dev/null +++ b/everything.gyp @@ -0,0 +1,31 @@ +# Build EVERYTHING provided by Skia. +# (Start with the "most" target, and then add targets that we intentionally +# left out of "most". See most.gyp for an explanation of which targets are +# left out of "most".) +# +# We used to call this the 'all' target, but in SOME cases that +# conflicted with an automatically-generated 'all' target. +# See https://code.google.com/p/skia/issues/detail?id=932 +# +{ + 'targets': [ + { + 'target_name': 'everything', + 'type': 'none', + 'dependencies': ['most.gyp:most'], + 'conditions': [ + ['skia_os == "ios" or skia_os == "android" or (skia_os == "mac" and skia_arch_width == 32)', { + # debugger is not supported on this platform + }, { + 'dependencies': [ 'debugger.gyp:debugger' ], + }], + ], + }, + ], +} + +# Local Variables: +# tab-width:2 +# indent-tabs-mode:nil +# End: +# vim: set expandtab tabstop=2 shiftwidth=2: -- cgit v1.2.3 From 8b485b8304dd7028f01d848be2c628063e0c6b78 Mon Sep 17 00:00:00 2001 From: "reed@google.com" Date: Thu, 25 Oct 2012 17:32:10 +0000 Subject: add bench for hairlines git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@6118 2bbb7eff-a529-9590-31e7-b0007b416f81 --- bench.gypi | 1 + 1 file changed, 1 insertion(+) diff --git a/bench.gypi b/bench.gypi index 6f630d6..bc90c5e 100644 --- a/bench.gypi +++ b/bench.gypi @@ -19,6 +19,7 @@ '../bench/GradientBench.cpp', '../bench/GrMemoryPoolBench.cpp', '../bench/InterpBench.cpp', + '../bench/LineBench.cpp', '../bench/MathBench.cpp', '../bench/MatrixBench.cpp', '../bench/MatrixConvolutionBench.cpp', -- cgit v1.2.3 From 79ab09a889dac0d25573e6398675e1a2464a4b67 Mon Sep 17 00:00:00 2001 From: "bsalomon@google.com" Date: Thu, 25 Oct 2012 19:00:29 +0000 Subject: Rename GrProgramStageFactory to GrBackendEffectFactory. Review URL: https://codereview.appspot.com/6773044 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@6125 2bbb7eff-a529-9590-31e7-b0007b416f81 --- gpu.gypi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gpu.gypi b/gpu.gypi index 79cdecd..5733c46 100644 --- a/gpu.gypi +++ b/gpu.gypi @@ -9,6 +9,7 @@ 'variables': { 'gr_sources': [ '<(skia_include_path)/gpu/GrAARectRenderer.h', + '<(skia_include_path)/gpu/GrBackendEffectFactory.h', '<(skia_include_path)/gpu/GrCacheID.h', '<(skia_include_path)/gpu/GrClipData.h', '<(skia_include_path)/gpu/GrColor.h', @@ -25,7 +26,6 @@ '<(skia_include_path)/gpu/GrNoncopyable.h', '<(skia_include_path)/gpu/GrPaint.h', '<(skia_include_path)/gpu/GrPoint.h', - '<(skia_include_path)/gpu/GrProgramStageFactory.h', '<(skia_include_path)/gpu/GrRect.h', '<(skia_include_path)/gpu/GrRefCnt.h', '<(skia_include_path)/gpu/GrRenderTarget.h', -- cgit v1.2.3 From bf7349decf993772f3c878206238c1a4e7c4d6c6 Mon Sep 17 00:00:00 2001 From: "bsalomon@google.com" Date: Fri, 26 Oct 2012 13:01:20 +0000 Subject: Rename GrSamplerState to GrEffectStage. R=robertphillips@google.com Review URL: https://codereview.appspot.com/6777053 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@6135 2bbb7eff-a529-9590-31e7-b0007b416f81 --- gpu.gypi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gpu.gypi b/gpu.gypi index 5733c46..8650f3c 100644 --- a/gpu.gypi +++ b/gpu.gypi @@ -17,6 +17,7 @@ '<(skia_include_path)/gpu/GrContext.h', '<(skia_include_path)/gpu/GrContextFactory.h', '<(skia_include_path)/gpu/GrEffect.h', + '<(skia_include_path)/gpu/GrEffectStage.h', '<(skia_include_path)/gpu/GrEffectUnitTest.h', '<(skia_include_path)/gpu/GrFontScaler.h', '<(skia_include_path)/gpu/GrGlyph.h', @@ -30,7 +31,6 @@ '<(skia_include_path)/gpu/GrRefCnt.h', '<(skia_include_path)/gpu/GrRenderTarget.h', '<(skia_include_path)/gpu/GrResource.h', - '<(skia_include_path)/gpu/GrSamplerState.h', '<(skia_include_path)/gpu/GrScalar.h', '<(skia_include_path)/gpu/GrSurface.h', '<(skia_include_path)/gpu/GrTextContext.h', -- cgit v1.2.3 From 5e11a577d309059887165bfc7242202e400a0274 Mon Sep 17 00:00:00 2001 From: "djsollen@google.com" Date: Mon, 29 Oct 2012 19:24:45 +0000 Subject: Allow default texture cache limit to be set within gyp. Review URL: https://codereview.appspot.com/6818051 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@6177 2bbb7eff-a529-9590-31e7-b0007b416f81 --- common_variables.gypi | 2 ++ gpu.gyp | 5 +++++ 2 files changed, 7 insertions(+) diff --git a/common_variables.gypi b/common_variables.gypi index 3d19e62..6acf5bc 100644 --- a/common_variables.gypi +++ b/common_variables.gypi @@ -81,6 +81,7 @@ 'skia_scalar%': 'float', 'skia_mesa%': 0, 'skia_nv_path_rendering%': 0, + 'skia_texture_cache_mb_limit%': 0, 'skia_angle%': 0, 'skia_directwrite%': 0, 'skia_nacl%': 0, @@ -97,6 +98,7 @@ 'skia_scalar%': '<(skia_scalar)', 'skia_mesa%': '<(skia_mesa)', 'skia_nv_path_rendering%': '<(skia_nv_path_rendering)', + 'skia_texture_cache_mb_limit%': '<(skia_texture_cache_mb_limit)', 'skia_angle%': '<(skia_angle)', 'skia_arch_width%': '<(skia_arch_width)', 'skia_arch_type%': '<(skia_arch_type)', diff --git a/gpu.gyp b/gpu.gyp index 0dc84ee..9cb0698 100644 --- a/gpu.gyp +++ b/gpu.gyp @@ -71,6 +71,11 @@ ], }, }], + [ 'skia_texture_cache_mb_limit != 0', { + 'defines': [ + 'GR_DEFAULT_TEXTURE_CACHE_MB_LIMIT=<(skia_texture_cache_mb_limit)', + ], + }], ], 'direct_dependent_settings': { 'conditions': [ -- cgit v1.2.3 From 68e6337a77f3fe425e3112bf59589f262bf95e95 Mon Sep 17 00:00:00 2001 From: "bsalomon@google.com" Date: Tue, 30 Oct 2012 20:17:54 +0000 Subject: Upstreaming changes from gpu_dev to trunk. git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@6207 2bbb7eff-a529-9590-31e7-b0007b416f81 --- gpu.gypi | 1 + 1 file changed, 1 insertion(+) diff --git a/gpu.gypi b/gpu.gypi index 8650f3c..c011747 100644 --- a/gpu.gypi +++ b/gpu.gypi @@ -33,6 +33,7 @@ '<(skia_include_path)/gpu/GrResource.h', '<(skia_include_path)/gpu/GrScalar.h', '<(skia_include_path)/gpu/GrSurface.h', + '<(skia_include_path)/gpu/GrTBackendEffectFactory.h', '<(skia_include_path)/gpu/GrTextContext.h', '<(skia_include_path)/gpu/GrTexture.h', '<(skia_include_path)/gpu/GrTextureAccess.h', -- cgit v1.2.3 From 16ec5ea2b2f7ff721c3686e832fdff2103c68281 Mon Sep 17 00:00:00 2001 From: "reed@google.com" Date: Tue, 30 Oct 2012 20:26:58 +0000 Subject: add test for bug in line drawing. fix is pending a way to handle all of the rebaselines... git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@6208 2bbb7eff-a529-9590-31e7-b0007b416f81 --- gmslides.gypi | 1 + 1 file changed, 1 insertion(+) diff --git a/gmslides.gypi b/gmslides.gypi index c956150..7e1fef5 100644 --- a/gmslides.gypi +++ b/gmslides.gypi @@ -29,6 +29,7 @@ '../gm/drawlooper.cpp', '../gm/extractbitmap.cpp', '../gm/emptypath.cpp', + '../gm/fatpathfill.cpp', '../gm/filltypes.cpp', '../gm/filltypespersp.cpp', '../gm/fontscaler.cpp', -- cgit v1.2.3 From 1440f237a73f91b5f0e55d8651735ddb8a8fd434 Mon Sep 17 00:00:00 2001 From: "robertphillips@google.com" Date: Wed, 31 Oct 2012 14:48:39 +0000 Subject: Fleshed out GPU portion of image/surface feature https://codereview.appspot.com/6813055/ git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@6214 2bbb7eff-a529-9590-31e7-b0007b416f81 --- gpu.gypi | 3 +++ 1 file changed, 3 insertions(+) diff --git a/gpu.gypi b/gpu.gypi index c011747..2febe4d 100644 --- a/gpu.gypi +++ b/gpu.gypi @@ -229,6 +229,9 @@ '<(skia_src_path)/gpu/SkGrPixelRef.cpp', '<(skia_src_path)/gpu/SkGrTexturePixelRef.cpp', + '<(skia_src_path)/image/SkImage_Gpu.cpp', + '<(skia_src_path)/image/SkSurface_Gpu.cpp', + '<(skia_src_path)/gpu/gl/SkGLContext.cpp' ], 'skgr_native_gl_sources': [ -- cgit v1.2.3 From 1b5b795aa0cb52e20d3bfecb0b91c431f0b8ea40 Mon Sep 17 00:00:00 2001 From: "scroggo@google.com" Date: Wed, 31 Oct 2012 15:52:16 +0000 Subject: Add SkThreadPool for managing threads. Skia-ized from https://codereview.appspot.com/6755043/ TODO: Use SkThread and platform independent features. Review URL: https://codereview.appspot.com/6777064 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@6217 2bbb7eff-a529-9590-31e7-b0007b416f81 --- utils.gyp | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/utils.gyp b/utils.gyp index cc25349..61cfd12 100644 --- a/utils.gyp +++ b/utils.gyp @@ -18,6 +18,15 @@ '../src/utils', ], 'sources': [ + # Classes for a threadpool. + '../include/utils/SkCondVar.h', + '../include/utils/SkCountdown.h', + '../include/utils/SkRunnable.h', + '../include/utils/SkThreadPool.h', + '../src/utils/SkCondVar.cpp', + '../src/utils/SkCountdown.cpp', + '../src/utils/SkThreadPool.cpp', + '../include/utils/SkBoundaryPatch.h', '../include/utils/SkCamera.h', '../include/utils/SkCubicInterval.h', @@ -147,6 +156,15 @@ '../src/utils/SkThreadUtils_pthread.cpp', '../src/utils/SkThreadUtils_pthread.h', '../src/utils/SkThreadUtils_pthread_other.cpp', + + # SkThreadPool and related currently depend on pthread. + '../include/utils/SkCondVar.h', + '../include/utils/SkCountdown.h', + '../include/utils/SkRunnable.h', + '../include/utils/SkThreadPool.h', + '../src/utils/SkCondVar.cpp', + '../src/utils/SkCountdown.cpp', + '../src/utils/SkThreadPool.cpp', ], },{ #else if 'skia_os != "win"' 'include_dirs!': [ -- cgit v1.2.3 From 5545ce36a5f51404634b24e574c0b19e8f47907c Mon Sep 17 00:00:00 2001 From: "scroggo@google.com" Date: Wed, 31 Oct 2012 19:29:13 +0000 Subject: Implement SkCondVar for windows. Only works on Vista or later, since it uses condition variables. Review URL: https://codereview.appspot.com/6812062 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@6225 2bbb7eff-a529-9590-31e7-b0007b416f81 --- utils.gyp | 9 --------- 1 file changed, 9 deletions(-) diff --git a/utils.gyp b/utils.gyp index 61cfd12..97f25b1 100644 --- a/utils.gyp +++ b/utils.gyp @@ -156,15 +156,6 @@ '../src/utils/SkThreadUtils_pthread.cpp', '../src/utils/SkThreadUtils_pthread.h', '../src/utils/SkThreadUtils_pthread_other.cpp', - - # SkThreadPool and related currently depend on pthread. - '../include/utils/SkCondVar.h', - '../include/utils/SkCountdown.h', - '../include/utils/SkRunnable.h', - '../include/utils/SkThreadPool.h', - '../src/utils/SkCondVar.cpp', - '../src/utils/SkCountdown.cpp', - '../src/utils/SkThreadPool.cpp', ], },{ #else if 'skia_os != "win"' 'include_dirs!': [ -- cgit v1.2.3 From a7557e14f045dbaf41695756eb299d3b3e50c413 Mon Sep 17 00:00:00 2001 From: "bsalomon@google.com" Date: Thu, 1 Nov 2012 13:50:50 +0000 Subject: Checkpoint in moving texture matrices out of GrGLProgram and into GrGLEffect. Review URL: https://codereview.appspot.com/6818064 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@6233 2bbb7eff-a529-9590-31e7-b0007b416f81 --- gpu.gypi | 2 ++ 1 file changed, 2 insertions(+) diff --git a/gpu.gypi b/gpu.gypi index 2febe4d..fae91c2 100644 --- a/gpu.gypi +++ b/gpu.gypi @@ -147,6 +147,8 @@ '<(skia_src_path)/gpu/gl/GrGLDefines.h', '<(skia_src_path)/gpu/gl/GrGLEffect.cpp', '<(skia_src_path)/gpu/gl/GrGLEffect.h', + '<(skia_src_path)/gpu/gl/GrGLEffectMatrix.cpp', + '<(skia_src_path)/gpu/gl/GrGLEffectMatrix.h', '<(skia_src_path)/gpu/gl/GrGLIndexBuffer.cpp', '<(skia_src_path)/gpu/gl/GrGLIndexBuffer.h', '<(skia_src_path)/gpu/gl/GrGLInterface.cpp', -- cgit v1.2.3 From a0e040c1198bf362eff0fd9b90196ea63722ca8d Mon Sep 17 00:00:00 2001 From: "bsalomon@google.com" Date: Thu, 1 Nov 2012 14:02:43 +0000 Subject: Revert r6233 while investigating bot failures. git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@6235 2bbb7eff-a529-9590-31e7-b0007b416f81 --- gpu.gypi | 2 -- 1 file changed, 2 deletions(-) diff --git a/gpu.gypi b/gpu.gypi index fae91c2..2febe4d 100644 --- a/gpu.gypi +++ b/gpu.gypi @@ -147,8 +147,6 @@ '<(skia_src_path)/gpu/gl/GrGLDefines.h', '<(skia_src_path)/gpu/gl/GrGLEffect.cpp', '<(skia_src_path)/gpu/gl/GrGLEffect.h', - '<(skia_src_path)/gpu/gl/GrGLEffectMatrix.cpp', - '<(skia_src_path)/gpu/gl/GrGLEffectMatrix.h', '<(skia_src_path)/gpu/gl/GrGLIndexBuffer.cpp', '<(skia_src_path)/gpu/gl/GrGLIndexBuffer.h', '<(skia_src_path)/gpu/gl/GrGLInterface.cpp', -- cgit v1.2.3 From b4100965d2504adff30d7bfb2f8f036ba9ead8dd Mon Sep 17 00:00:00 2001 From: "bsalomon@google.com" Date: Thu, 1 Nov 2012 15:40:47 +0000 Subject: Reland r6233 with fix for config conversion texture matrices. git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@6238 2bbb7eff-a529-9590-31e7-b0007b416f81 --- gpu.gypi | 2 ++ 1 file changed, 2 insertions(+) diff --git a/gpu.gypi b/gpu.gypi index 2febe4d..fae91c2 100644 --- a/gpu.gypi +++ b/gpu.gypi @@ -147,6 +147,8 @@ '<(skia_src_path)/gpu/gl/GrGLDefines.h', '<(skia_src_path)/gpu/gl/GrGLEffect.cpp', '<(skia_src_path)/gpu/gl/GrGLEffect.h', + '<(skia_src_path)/gpu/gl/GrGLEffectMatrix.cpp', + '<(skia_src_path)/gpu/gl/GrGLEffectMatrix.h', '<(skia_src_path)/gpu/gl/GrGLIndexBuffer.cpp', '<(skia_src_path)/gpu/gl/GrGLIndexBuffer.h', '<(skia_src_path)/gpu/gl/GrGLInterface.cpp', -- cgit v1.2.3 From 79ad2f865126c40e775331d3b7939d901e9283f8 Mon Sep 17 00:00:00 2001 From: "bsalomon@google.com" Date: Thu, 1 Nov 2012 15:47:55 +0000 Subject: Re-revert r6233. git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@6239 2bbb7eff-a529-9590-31e7-b0007b416f81 --- gpu.gypi | 2 -- 1 file changed, 2 deletions(-) diff --git a/gpu.gypi b/gpu.gypi index fae91c2..2febe4d 100644 --- a/gpu.gypi +++ b/gpu.gypi @@ -147,8 +147,6 @@ '<(skia_src_path)/gpu/gl/GrGLDefines.h', '<(skia_src_path)/gpu/gl/GrGLEffect.cpp', '<(skia_src_path)/gpu/gl/GrGLEffect.h', - '<(skia_src_path)/gpu/gl/GrGLEffectMatrix.cpp', - '<(skia_src_path)/gpu/gl/GrGLEffectMatrix.h', '<(skia_src_path)/gpu/gl/GrGLIndexBuffer.cpp', '<(skia_src_path)/gpu/gl/GrGLIndexBuffer.h', '<(skia_src_path)/gpu/gl/GrGLInterface.cpp', -- cgit v1.2.3 From 9584180f7d5d1758abed52619d6f4c2857f512e3 Mon Sep 17 00:00:00 2001 From: "bsalomon@google.com" Date: Thu, 1 Nov 2012 17:02:46 +0000 Subject: Reland r6233 with fix. git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@6241 2bbb7eff-a529-9590-31e7-b0007b416f81 --- gpu.gypi | 2 ++ 1 file changed, 2 insertions(+) diff --git a/gpu.gypi b/gpu.gypi index 2febe4d..fae91c2 100644 --- a/gpu.gypi +++ b/gpu.gypi @@ -147,6 +147,8 @@ '<(skia_src_path)/gpu/gl/GrGLDefines.h', '<(skia_src_path)/gpu/gl/GrGLEffect.cpp', '<(skia_src_path)/gpu/gl/GrGLEffect.h', + '<(skia_src_path)/gpu/gl/GrGLEffectMatrix.cpp', + '<(skia_src_path)/gpu/gl/GrGLEffectMatrix.h', '<(skia_src_path)/gpu/gl/GrGLIndexBuffer.cpp', '<(skia_src_path)/gpu/gl/GrGLIndexBuffer.h', '<(skia_src_path)/gpu/gl/GrGLInterface.cpp', -- cgit v1.2.3 From 545df1300b9a586b79b992c9d718c8b9d6de346d Mon Sep 17 00:00:00 2001 From: "bsalomon@google.com" Date: Thu, 1 Nov 2012 17:12:34 +0000 Subject: Remove GrScalar, replace with SkScalar. Review URL: https://codereview.appspot.com/6812064 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@6243 2bbb7eff-a529-9590-31e7-b0007b416f81 --- gpu.gypi | 1 - 1 file changed, 1 deletion(-) diff --git a/gpu.gypi b/gpu.gypi index fae91c2..0c45aa5 100644 --- a/gpu.gypi +++ b/gpu.gypi @@ -31,7 +31,6 @@ '<(skia_include_path)/gpu/GrRefCnt.h', '<(skia_include_path)/gpu/GrRenderTarget.h', '<(skia_include_path)/gpu/GrResource.h', - '<(skia_include_path)/gpu/GrScalar.h', '<(skia_include_path)/gpu/GrSurface.h', '<(skia_include_path)/gpu/GrTBackendEffectFactory.h', '<(skia_include_path)/gpu/GrTextContext.h', -- cgit v1.2.3 From a50f02d8ef2af6cab080cada57e2bdd28ba67fd5 Mon Sep 17 00:00:00 2001 From: "borenet@google.com" Date: Thu, 1 Nov 2012 17:43:44 +0000 Subject: Improve NaCl support - Add nacl_make script to build Skia targets for NaCl using gyp - Add nacl_interface for command-line apps - Add nacl_sample as front-end for SampleApp - Add freetype to DEPS - Various gyp tweaks for NaCl TODO: - Implement GL interface - Implement font host - Fix plumbing so that SampleApp works properly Review URL: https://codereview.appspot.com/6671044 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@6245 2bbb7eff-a529-9590-31e7-b0007b416f81 --- SampleApp.gyp | 5 +++ apptype_console.gypi | 5 +++ common.gypi | 22 +++++++---- common_conditions.gypi | 24 +++++++++--- common_variables.gypi | 2 - core.gyp | 2 +- everything.gyp | 2 +- freetype.gyp | 104 ++++++++++++++++++++++++++++++------------------- gpu.gyp | 12 ++++++ gpu.gypi | 1 + images.gyp | 2 +- nacl.gyp | 19 +++++++++ opts.gyp | 4 +- ports.gyp | 70 ++++++++++++++++++++------------- utils.gyp | 8 +--- views.gyp | 12 ++++++ xml.gyp | 2 +- zlib.gyp | 2 +- 18 files changed, 201 insertions(+), 97 deletions(-) create mode 100644 nacl.gyp diff --git a/SampleApp.gyp b/SampleApp.gyp index 3b0be1b..5668428 100644 --- a/SampleApp.gyp +++ b/SampleApp.gyp @@ -290,6 +290,11 @@ '../src/gpu', # To pull gl/GrGLUtil.h ], }], + [ 'skia_os == "nacl"', { + 'sources': [ + '../../nacl/src/nacl_sample.cpp', + ], + }], ], 'msvs_settings': { 'VCLinkerTool': { diff --git a/apptype_console.gypi b/apptype_console.gypi index 80e925d..a306193 100644 --- a/apptype_console.gypi +++ b/apptype_console.gypi @@ -17,6 +17,11 @@ 'android_deps.gyp:Android_EntryPoint', ], }], + [ 'skia_os == "nacl"', { + 'dependencies': [ + 'nacl.gyp:nacl_interface', + ], + }], ['skia_os == "ios"', { 'target_conditions': [ ['_type == "executable"', { diff --git a/common.gypi b/common.gypi index b620226..7dc27da 100644 --- a/common.gypi +++ b/common.gypi @@ -21,15 +21,21 @@ # situations, like building for iOS on a Mac. 'variables': { 'conditions': [ - ['skia_os != OS and not (skia_os == "ios" and OS == "mac")', - {'error': ' + '../third_party/externals/freetype/src/base/ftglyph.c', # recommended, see + + '../third_party/externals/freetype/src/base/ftbitmap.c', # optional, see + '../third_party/externals/freetype/src/base/ftfstype.c', # optional + '../third_party/externals/freetype/src/base/ftgasp.c', # optional, see + '../third_party/externals/freetype/src/base/ftlcdfil.c', # optional, see + '../third_party/externals/freetype/src/base/ftmm.c', # optional, see + '../third_party/externals/freetype/src/base/ftpatent.c', # optional + '../third_party/externals/freetype/src/base/ftstroke.c', # optional, see + '../third_party/externals/freetype/src/base/ftsynth.c', # optional, see + '../third_party/externals/freetype/src/base/fttype1.c', # optional, see + '../third_party/externals/freetype/src/base/ftwinfnt.c', # optional, see + '../third_party/externals/freetype/src/base/ftxf86.c', # optional, see + + # font drivers (optional; at least one is needed) + '../third_party/externals/freetype/src/cff/cff.c', # CFF/OpenType font driver + '../third_party/externals/freetype/src/sfnt/sfnt.c', # SFNT files support (TrueType & OpenType) + '../third_party/externals/freetype/src/truetype/truetype.c', # TrueType font driver + + # rasterizers (optional; at least one is needed for vector formats) + '../third_party/externals/freetype/src/raster/raster.c', # monochrome rasterizer + '../third_party/externals/freetype/src/smooth/smooth.c', # anti-aliasing rasterizer + + # auxiliary modules (optional) + '../third_party/externals/freetype/src/autofit/autofit.c', # auto hinting module + '../third_party/externals/freetype/src/psaux/psaux.c', # PostScript Type 1 parsing + '../third_party/externals/freetype/src/pshinter/pshinter.c', # PS hinting module + '../third_party/externals/freetype/src/psnames/psnames.c', # PostScript glyph names support ], 'include_dirs': [ - '../third_party/freetype/internal', - '../third_party/freetype/builds', - '../third_party/freetype/include', - '../third_party/freetype', + '../third_party/externals/freetype/internal', + '../third_party/externals/freetype/builds', + '../third_party/externals/freetype/include', + '../third_party/externals/freetype', ], 'cflags': [ - '-W', - '-Wall', - '-fPIC', - '-DPIC', - '-DDARWIN_NO_CARBON', '-DFT2_BUILD_LIBRARY', ], 'direct_dependent_settings': { 'include_dirs': [ - '../third_party/freetype/include', # For ft2build.h + '../third_party/externals/freetype/include', ], }, + 'conditions': [ + [ 'skia_os == "mac"', { + 'sources': [ + '../third_party/externals/freetype/src/base/ftmac.c', # only on the Macintosh + ], + }], + [ 'skia_os == "android"', { + # These flags are used by the Android OS. They are probably overkill + # for Skia, but we add them for consistency. + 'cflags': [ + '-W', + '-Wall', + '-fPIC', + '-DPIC', + '-DDARWIN_NO_CARBON', + '-DFT2_BUILD_LIBRARY', + '-O2', + ], + 'cflags!': [ + '-fno-rtti', # supress warnings about invalid option of non-C++ code + ], + }], + ], }, ], } diff --git a/gpu.gyp b/gpu.gyp index 9cb0698..d5223e4 100644 --- a/gpu.gyp +++ b/gpu.gyp @@ -21,6 +21,10 @@ 'sources/': [ ['exclude', '_android.(h|cpp)$'], ], }], + ['skia_os != "nacl"', { + 'sources/': [ ['exclude', '_nacl.(h|cpp)$'], + ], + }], [ 'skia_os == "android"', { 'defines': [ 'GR_ANDROID_BUILD=1', @@ -209,10 +213,18 @@ 'link_settings': { 'libraries': [ '-lGL', + '-lGLU', '-lX11', ], }, }], + [ 'skia_os == "nacl"', { + 'link_settings': { + 'libraries': [ + '-lppapi_gles2', + ], + }, + }], [ 'skia_mesa and skia_os == "linux"', { 'link_settings': { 'libraries': [ diff --git a/gpu.gypi b/gpu.gypi index 0c45aa5..67cf603 100644 --- a/gpu.gypi +++ b/gpu.gypi @@ -238,6 +238,7 @@ 'skgr_native_gl_sources': [ '<(skia_include_path)/gpu/gl/SkNativeGLContext.h', '<(skia_src_path)/gpu/gl/mac/SkNativeGLContext_mac.cpp', + '<(skia_src_path)/gpu/gl/nacl/SkNativeGLContext_nacl.cpp', '<(skia_src_path)/gpu/gl/win/SkNativeGLContext_win.cpp', '<(skia_src_path)/gpu/gl/unix/SkNativeGLContext_unix.cpp', '<(skia_src_path)/gpu/gl/android/SkNativeGLContext_android.cpp', diff --git a/images.gyp b/images.gyp index 2989afe..daf4c5f 100644 --- a/images.gyp +++ b/images.gyp @@ -89,7 +89,7 @@ '../src/ports/SkImageDecoder_CG.cpp', ], }], - [ 'skia_os in ["linux", "freebsd", "openbsd", "solaris"]', { + [ 'skia_os in ["linux", "freebsd", "openbsd", "solaris", "nacl"]', { 'sources!': [ '../src/images/SkImageDecoder_libgif.cpp', '../src/images/SkMovie_gif.cpp', diff --git a/nacl.gyp b/nacl.gyp new file mode 100644 index 0000000..95b2a82 --- /dev/null +++ b/nacl.gyp @@ -0,0 +1,19 @@ +# Common entry point for all Skia executables running in NaCl +{ + 'targets': [ + { + 'target_name': 'nacl_interface', + 'type': 'static_library', + 'dependencies': [ + 'skia_base_libs.gyp:skia_base_libs', + ], + 'include_dirs': [ + # For SkThreadUtils.h + '../src/utils', + ], + 'sources': [ + '../../nacl/src/nacl_interface.cpp', + ], + }, + ], +} \ No newline at end of file diff --git a/opts.gyp b/opts.gyp index b8d7e22..cd892e8 100644 --- a/opts.gyp +++ b/opts.gyp @@ -32,7 +32,7 @@ 'conditions': [ [ 'skia_arch_type == "x86" and skia_os != "ios"', { 'conditions': [ - [ 'skia_os in ["linux", "freebsd", "openbsd", "solaris"]', { + [ 'skia_os in ["linux", "freebsd", "openbsd", "solaris", "nacl"]', { 'cflags': [ '-msse2', ], @@ -108,7 +108,7 @@ '../src/core', ], 'conditions': [ - [ 'skia_os in ["linux", "freebsd", "openbsd", "solaris"]', { + [ 'skia_os in ["linux", "freebsd", "openbsd", "solaris", "nacl"]', { 'cflags': [ '-mssse3', ], diff --git a/ports.gyp b/ports.gyp index f743ad4..6403693 100644 --- a/ports.gyp +++ b/ports.gyp @@ -20,6 +20,7 @@ '../src/utils', ], 'sources': [ + '../src/ports/SkDebug_nacl.cpp', '../src/ports/SkDebug_stdio.cpp', '../src/ports/SkDebug_win.cpp', '../src/ports/SkFontDescriptor.h', @@ -39,36 +40,51 @@ ], 'conditions': [ [ 'skia_os in ["linux", "freebsd", "openbsd", "solaris"]', { - 'conditions': [ - [ 'skia_nacl', { - 'defines': [ - 'SK_CAN_USE_DLOPEN=0', - ], - 'sources': [ - '../src/ports/SkFontHost_none.cpp', - ], - }, { - 'defines': [ - #The font host requires at least FreeType 2.3.0 at runtime. - 'SK_FONTHOST_FREETYPE_RUNTIME_VERSION=0x020300', - 'SK_CAN_USE_DLOPEN=1', - ], - 'sources': [ - '../src/ports/SkFontHost_FreeType.cpp', - '../src/ports/SkFontHost_FreeType_common.cpp', - '../src/ports/SkFontHost_linux.cpp', - ], - 'link_settings': { - 'libraries': [ - '-lfreetype', - '-ldl', - ], - }, - }], + 'defines': [ + #The font host requires at least FreeType 2.3.0 at runtime. + 'SK_FONTHOST_FREETYPE_RUNTIME_VERSION=0x020300',\ + 'SK_CAN_USE_DLOPEN=1', + ], + 'link_settings': { + 'libraries': [ + '-lfreetype', + '-ldl', + ], + }, + 'sources': [ + '../src/ports/SkFontHost_FreeType.cpp', + '../src/ports/SkFontHost_FreeType_common.cpp', + '../src/ports/SkFontHost_linux.cpp', + '../src/ports/SkThread_pthread.cpp', + ], + }], + [ 'skia_os == "nacl"', { + 'dependencies': [ + # On other OS, we can dynamically link against freetype. For nacl, + # we have to include our own version since the naclports version is + # too old (<0x020300) to provide the functionality we need. + 'freetype.gyp:freetype', + ], + 'export_dependent_settings': [ + 'freetype.gyp:freetype', + ], + 'defines': [ + # We use Android's repo, which provides at least FreeType 2.4.0 + 'SK_FONTHOST_FREETYPE_RUNTIME_VERSION=0x020400',\ ], 'sources': [ + '../src/ports/SkFontHost_FreeType.cpp', + '../src/ports/SkFontHost_FreeType_common.cpp', + '../src/ports/SkFontHost_linux.cpp', '../src/ports/SkThread_pthread.cpp', ], + 'sources!': [ + '../src/ports/SkDebug_stdio.cpp', + ], + }, { + 'sources!': [ + '../src/ports/SkDebug_nacl.cpp', + ], }], [ 'skia_os == "mac"', { 'include_dirs': [ @@ -150,7 +166,7 @@ #TODO: include the ports/SkImageRef_ashmem.cpp for non-NDK builds ], 'dependencies': [ - 'android_deps.gyp:ft2', + 'freetype.gyp:freetype', 'android_deps.gyp:expat', ], }], diff --git a/utils.gyp b/utils.gyp index 97f25b1..aa3f4a3 100644 --- a/utils.gyp +++ b/utils.gyp @@ -129,12 +129,6 @@ ], }], [ 'skia_os in ["linux", "freebsd", "openbsd", "solaris"]', { - 'link_settings': { - 'libraries': [ - '-lGL', - '-lGLU', - ], - }, 'sources!': [ '../src/utils/SkThreadUtils_pthread_other.cpp', ], @@ -176,7 +170,7 @@ '../src/utils/win/SkIStream.cpp', ], }], - [ 'skia_nacl == 1', { + [ 'skia_os == "nacl"', { 'sources': [ '../src/utils/SkThreadUtils_pthread_other.cpp', ], diff --git a/views.gyp b/views.gyp index 80be87e..5f58a87 100644 --- a/views.gyp +++ b/views.gyp @@ -32,6 +32,7 @@ '../include/views/SkKey.h', '../include/views/SkOSMenu.h', '../include/views/SkOSWindow_Mac.h', + '../include/views/SkOSWindow_NaCl.h', '../include/views/SkOSWindow_SDL.h', '../include/views/SkOSWindow_Unix.h', '../include/views/SkOSWindow_Win.h', @@ -111,6 +112,17 @@ '../src/views/win/skia_win.cpp', ], }], + [ 'skia_os == "nacl"', { + 'sources!': [ + '../src/views/unix/SkOSWindow_Unix.cpp', + '../src/views/unix/keysym2ucs.c', + '../src/views/unix/skia_unix.cpp', + ], + }, { + 'sources!': [ + '../src/views/nacl/SkOSWindow_NaCl.cpp', + ], + }], [ 'skia_gpu == 1', { 'include_dirs': [ '../include/gpu', diff --git a/xml.gyp b/xml.gyp index b7fdb83..5cf0659 100644 --- a/xml.gyp +++ b/xml.gyp @@ -32,7 +32,7 @@ '../src/xml/SkXMLPullParser.cpp', #if 0 around class decl in header ], 'conditions': [ - [ 'skia_os in ["win", "mac", "linux", "freebsd", "openbsd", "solaris", "android", "ios"]', { + [ 'skia_os in ["win", "mac", "linux", "freebsd", "openbsd", "solaris", "android", "ios", "nacl"]', { 'sources!': [ # no jsapi.h by default on system '../include/xml/SkJS.h', diff --git a/zlib.gyp b/zlib.gyp index 864a059..fcd0ac3 100644 --- a/zlib.gyp +++ b/zlib.gyp @@ -29,7 +29,7 @@ }, 'defines': [ 'SK_ZLIB_INCLUDE=', ], }], - [ 'skia_os in ["linux", "freebsd", "openbsd", "solaris", "android"]', { + [ 'skia_os in ["linux", "freebsd", "openbsd", "solaris", "android", "nacl"]', { 'link_settings': { 'libraries': [ '-lz', ], }, 'defines': [ 'SK_ZLIB_INCLUDE=', ], }], -- cgit v1.2.3 From c4c869b7e491491fb51da7e8491b7ee4e10a2c90 Mon Sep 17 00:00:00 2001 From: "borenet@google.com" Date: Thu, 1 Nov 2012 18:01:08 +0000 Subject: Fix NoGPU build Some link settings were set in the wrong targets git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@6246 2bbb7eff-a529-9590-31e7-b0007b416f81 --- gpu.gyp | 1 - views.gyp | 7 +++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/gpu.gyp b/gpu.gyp index d5223e4..4f02d00 100644 --- a/gpu.gyp +++ b/gpu.gyp @@ -214,7 +214,6 @@ 'libraries': [ '-lGL', '-lGLU', - '-lX11', ], }, }], diff --git a/views.gyp b/views.gyp index 5f58a87..b0697a0 100644 --- a/views.gyp +++ b/views.gyp @@ -98,6 +98,13 @@ ], }], [ 'skia_os in ["linux", "freebsd", "openbsd", "solaris"]', { + 'link_settings': { + 'libraries': [ + '-lGL', + '-lGLU', + '-lX11', + ], + }, },{ 'sources!': [ '../src/views/unix/SkOSWindow_Unix.cpp', -- cgit v1.2.3 From 89e81d994f886fe112135bdc2e934a70a76f85e1 Mon Sep 17 00:00:00 2001 From: "bsalomon@google.com" Date: Thu, 1 Nov 2012 18:02:54 +0000 Subject: Replace GrMatrix with SkMatrix. Review URL: https://codereview.appspot.com/6814067 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@6247 2bbb7eff-a529-9590-31e7-b0007b416f81 --- gpu.gypi | 2 -- 1 file changed, 2 deletions(-) diff --git a/gpu.gypi b/gpu.gypi index 67cf603..787ffc9 100644 --- a/gpu.gypi +++ b/gpu.gypi @@ -23,7 +23,6 @@ '<(skia_include_path)/gpu/GrGlyph.h', '<(skia_include_path)/gpu/GrInstanceCounter.h', '<(skia_include_path)/gpu/GrKey.h', - '<(skia_include_path)/gpu/GrMatrix.h', '<(skia_include_path)/gpu/GrNoncopyable.h', '<(skia_include_path)/gpu/GrPaint.h', '<(skia_include_path)/gpu/GrPoint.h', @@ -80,7 +79,6 @@ '<(skia_src_path)/gpu/GrIndexBuffer.h', '<(skia_src_path)/gpu/GrInOrderDrawBuffer.cpp', '<(skia_src_path)/gpu/GrInOrderDrawBuffer.h', - '<(skia_src_path)/gpu/GrMatrix.cpp', '<(skia_src_path)/gpu/GrMemory.cpp', '<(skia_src_path)/gpu/GrMemoryPool.cpp', '<(skia_src_path)/gpu/GrMemoryPool.h', -- cgit v1.2.3 From 0ff944097db3d32a391e699eceb4d92426fea5ee Mon Sep 17 00:00:00 2001 From: "edisonn@google.com" Date: Thu, 1 Nov 2012 19:52:38 +0000 Subject: Add utility to convert skp files to pdf files. Code compatible with render_pictures_main.cpp. I could have refactored the code to avoid code duplication, but it does not seem right, and it will overcomplicate the code. Review URL: https://codereview.appspot.com/6615073 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@6253 2bbb7eff-a529-9590-31e7-b0007b416f81 --- tools.gyp | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/tools.gyp b/tools.gyp index f6e9a93..4deffc2 100644 --- a/tools.gyp +++ b/tools.gyp @@ -119,6 +119,27 @@ 'images.gyp:images', ], }, + { + 'target_name': 'render_pdfs', + 'type': 'executable', + 'sources': [ + '../tools/render_pdfs_main.cpp', + '../tools/PdfRenderer.cpp', + '../tools/PdfRenderer.h', + ], + 'include_dirs': [ + '../src/pipe/utils/', + '../src/utils/', + ], + 'dependencies': [ + 'core.gyp:core', + 'effects.gyp:effects', + 'images.gyp:images', + 'pdf.gyp:pdf', + 'ports.gyp:ports', + 'tools.gyp:picture_utils', + ], + }, { 'target_name': 'picture_utils', 'type': 'static_library', -- cgit v1.2.3 From 89102c288d84725b9f46572dc85742fccb134b61 Mon Sep 17 00:00:00 2001 From: "skia.committer@gmail.com" Date: Fri, 2 Nov 2012 02:01:24 +0000 Subject: Sanitizing source files in Skia_Periodic_House_Keeping git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@6258 2bbb7eff-a529-9590-31e7-b0007b416f81 --- nacl.gyp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nacl.gyp b/nacl.gyp index 95b2a82..5edb445 100644 --- a/nacl.gyp +++ b/nacl.gyp @@ -16,4 +16,4 @@ ], }, ], -} \ No newline at end of file +} -- cgit v1.2.3 From 686cdf2e253f8725adbd48dcba3c538b64296b5e Mon Sep 17 00:00:00 2001 From: "junov@chromium.org" Date: Fri, 2 Nov 2012 18:11:49 +0000 Subject: Adding rtree support to the bench_pictures utility Review URL: https://codereview.appspot.com/6775080 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@6267 2bbb7eff-a529-9590-31e7-b0007b416f81 --- tools.gyp | 1 + 1 file changed, 1 insertion(+) diff --git a/tools.gyp b/tools.gyp index 4deffc2..8084c7b 100644 --- a/tools.gyp +++ b/tools.gyp @@ -106,6 +106,7 @@ '../src/pipe/utils/SamplePipeControllers.cpp', ], 'include_dirs': [ + '../src/core/', '../src/pipe/utils/', '../src/utils/', ], -- cgit v1.2.3 From acb0ac247d4de06964e81f4c175375b2cdf8a005 Mon Sep 17 00:00:00 2001 From: "epoger@google.com" Date: Fri, 2 Nov 2012 18:35:04 +0000 Subject: Split off SkConsistentChecksum from SkChecksum as part of https://goto.google.com/ImprovingTheSkiaRebaseliningProcess Review URL: https://codereview.appspot.com/6820074 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@6270 2bbb7eff-a529-9590-31e7-b0007b416f81 --- tests.gyp | 2 ++ utils.gyp | 1 + 2 files changed, 3 insertions(+) diff --git a/tests.gyp b/tests.gyp index c91388c..66888dd 100644 --- a/tests.gyp +++ b/tests.gyp @@ -25,6 +25,7 @@ '../tests/BlitRowTest.cpp', '../tests/BlurTest.cpp', '../tests/CanvasTest.cpp', + '../tests/ChecksumTest.cpp', '../tests/ClampRangeTest.cpp', '../tests/ClipCacheTest.cpp', '../tests/ClipCubicTest.cpp', @@ -109,6 +110,7 @@ 'images.gyp:images', 'pdf.gyp:pdf', 'tools.gyp:picture_utils', + 'utils.gyp:utils', ], 'conditions': [ [ 'skia_gpu == 1', { diff --git a/utils.gyp b/utils.gyp index aa3f4a3..6fef668 100644 --- a/utils.gyp +++ b/utils.gyp @@ -53,6 +53,7 @@ '../src/utils/SkBitSet.h', '../src/utils/SkBoundaryPatch.cpp', '../src/utils/SkCamera.cpp', + '../src/utils/SkConsistentChecksum.h', '../src/utils/SkCubicInterval.cpp', '../src/utils/SkCullPoints.cpp', '../src/utils/SkDeferredCanvas.cpp', -- cgit v1.2.3 From 009a16a5d3668a4f5ae4d08e801c6ca662119f97 Mon Sep 17 00:00:00 2001 From: "reed@google.com" Date: Fri, 2 Nov 2012 21:11:12 +0000 Subject: add blurrect gm git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@6284 2bbb7eff-a529-9590-31e7-b0007b416f81 --- gmslides.gypi | 1 + 1 file changed, 1 insertion(+) diff --git a/gmslides.gypi b/gmslides.gypi index 7e1fef5..a5eef80 100644 --- a/gmslides.gypi +++ b/gmslides.gypi @@ -12,6 +12,7 @@ '../gm/bitmapscroll.cpp', '../gm/blend.cpp', '../gm/blurs.cpp', + '../gm/blurrect.cpp', '../gm/circles.cpp', '../gm/colorfilterimagefilter.cpp', '../gm/colormatrix.cpp', -- cgit v1.2.3 From f76e66b947e11b5cafb445074772fa582decf7cb Mon Sep 17 00:00:00 2001 From: "junov@chromium.org" Date: Tue, 6 Nov 2012 18:58:43 +0000 Subject: Adding SkTileGrid: a new subclass of BBoxHierarchy, optimized for tiled playback. Review URL: https://codereview.appspot.com/6820093 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@6314 2bbb7eff-a529-9590-31e7-b0007b416f81 --- core.gypi | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/core.gypi b/core.gypi index d8f1715..4626a72 100644 --- a/core.gypi +++ b/core.gypi @@ -159,11 +159,13 @@ '<(skia_src_path)/core/SkStroke.cpp', '<(skia_src_path)/core/SkStrokerPriv.cpp', '<(skia_src_path)/core/SkStrokerPriv.h', + '<(skia_src_path)/core/SkTemplatesPriv.h', '<(skia_src_path)/core/SkTextFormatParams.h', + '<(skia_src_path)/core/SkTileGrid.cpp', + '<(skia_src_path)/core/SkTileGrid.h', '<(skia_src_path)/core/SkTLS.cpp', '<(skia_src_path)/core/SkTSearch.cpp', '<(skia_src_path)/core/SkTSort.h', - '<(skia_src_path)/core/SkTemplatesPriv.h', '<(skia_src_path)/core/SkTypeface.cpp', '<(skia_src_path)/core/SkTypefaceCache.cpp', '<(skia_src_path)/core/SkTypefaceCache.h', -- cgit v1.2.3 From 6470fd4b51d01f735f6efe3e387937eb2ea86fe4 Mon Sep 17 00:00:00 2001 From: "senorblanco@chromium.org" Date: Tue, 6 Nov 2012 20:29:39 +0000 Subject: Break out SkOffsetImageFilter into its own file, and derive it from SkSingleInputImageFilter, to make it DAG-friendly. Review URL: https://codereview.appspot.com/6822086 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@6315 2bbb7eff-a529-9590-31e7-b0007b416f81 --- effects.gypi | 2 ++ 1 file changed, 2 insertions(+) diff --git a/effects.gypi b/effects.gypi index aef7f2c..f2a2214 100644 --- a/effects.gypi +++ b/effects.gypi @@ -33,6 +33,7 @@ '<(skia_src_path)/effects/SkLayerDrawLooper.cpp', '<(skia_src_path)/effects/SkLayerRasterizer.cpp', '<(skia_src_path)/effects/SkLightingImageFilter.cpp', + '<(skia_src_path)/effects/SkOffsetImageFilter.cpp', '<(skia_src_path)/effects/SkMatrixConvolutionImageFilter.cpp', '<(skia_src_path)/effects/SkMorphologyImageFilter.cpp', '<(skia_src_path)/effects/SkPaintFlagsDrawFilter.cpp', @@ -86,6 +87,7 @@ '<(skia_include_path)/effects/SkLayerDrawLooper.h', '<(skia_include_path)/effects/SkLayerRasterizer.h', '<(skia_include_path)/effects/SkLightingImageFilter.h', + '<(skia_include_path)/effects/SkOffsetImageFilter.h', '<(skia_include_path)/effects/SkMorphologyImageFilter.h', '<(skia_include_path)/effects/SkPaintFlagsDrawFilter.h', '<(skia_include_path)/effects/SkPixelXorXfermode.h', -- cgit v1.2.3 From 51faadf878690063165248d5b97ec48624663b6c Mon Sep 17 00:00:00 2001 From: "junov@chromium.org" Date: Wed, 7 Nov 2012 17:38:38 +0000 Subject: Unit testing for SkTileGrid Review URL: https://codereview.appspot.com/6827053 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@6331 2bbb7eff-a529-9590-31e7-b0007b416f81 --- tests.gyp | 1 + 1 file changed, 1 insertion(+) diff --git a/tests.gyp b/tests.gyp index 66888dd..18dc558 100644 --- a/tests.gyp +++ b/tests.gyp @@ -91,6 +91,7 @@ '../tests/Test.cpp', '../tests/Test.h', '../tests/TestSize.cpp', + '../tests/TileGridTest.cpp', '../tests/TLSTest.cpp', '../tests/ToUnicode.cpp', '../tests/UnicodeTest.cpp', -- cgit v1.2.3 From 3b69b4d342d6c92f587b8594e000d1e8110c5294 Mon Sep 17 00:00:00 2001 From: "scroggo@google.com" Date: Wed, 7 Nov 2012 18:01:46 +0000 Subject: Add a new PictureRenderer that draws the picture then breaks up into tiles. Review URL: https://codereview.appspot.com/6820103 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@6333 2bbb7eff-a529-9590-31e7-b0007b416f81 --- tools.gyp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tools.gyp b/tools.gyp index 8084c7b..6f41971 100644 --- a/tools.gyp +++ b/tools.gyp @@ -101,7 +101,10 @@ 'target_name': 'picture_renderer', 'type': 'static_library', 'sources': [ + '../tools/PictureRenderer.h', '../tools/PictureRenderer.cpp', + '../tools/CopyTilesRenderer.h', + '../tools/CopyTilesRenderer.cpp', '../src/pipe/utils/SamplePipeControllers.h', '../src/pipe/utils/SamplePipeControllers.cpp', ], -- cgit v1.2.3 From 3c0a3bc73747be911604c7da82ee56b1b93218dd Mon Sep 17 00:00:00 2001 From: "senorblanco@chromium.org" Date: Mon, 12 Nov 2012 20:55:02 +0000 Subject: Fix Linux link errors for some targets by adding -lX11 to gpu.gyp's dependencies. Broken out and landed separately from https://codereview.appspot.com/6826086/ git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@6388 2bbb7eff-a529-9590-31e7-b0007b416f81 --- gpu.gyp | 1 + 1 file changed, 1 insertion(+) diff --git a/gpu.gyp b/gpu.gyp index 4f02d00..d5223e4 100644 --- a/gpu.gyp +++ b/gpu.gyp @@ -214,6 +214,7 @@ 'libraries': [ '-lGL', '-lGLU', + '-lX11', ], }, }], -- cgit v1.2.3 From 619710a8d893fc91b3911d65a24cfc5fb4f93b31 Mon Sep 17 00:00:00 2001 From: "djsollen@google.com" Date: Tue, 13 Nov 2012 18:50:33 +0000 Subject: Update filter tool to allow input directory. Review URL: https://codereview.appspot.com/6847046 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@6399 2bbb7eff-a529-9590-31e7-b0007b416f81 --- tools.gyp | 1 + 1 file changed, 1 insertion(+) diff --git a/tools.gyp b/tools.gyp index 6f41971..e7c2241 100644 --- a/tools.gyp +++ b/tools.gyp @@ -180,6 +180,7 @@ 'skia_base_libs.gyp:skia_base_libs', 'effects.gyp:effects', 'images.gyp:images', + 'tools.gyp:picture_utils', ], }, ], -- cgit v1.2.3 -- cgit v1.2.3 From 805f4334e804778fef8ed0720ea41bd2fb2174c0 Mon Sep 17 00:00:00 2001 From: "reed@google.com" Date: Thu, 15 Nov 2012 13:46:47 +0000 Subject: add gm for srcmode (and clearmode) in prep for optimization work git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@6429 2bbb7eff-a529-9590-31e7-b0007b416f81 --- gmslides.gypi | 1 + 1 file changed, 1 insertion(+) diff --git a/gmslides.gypi b/gmslides.gypi index a5eef80..61b1061 100644 --- a/gmslides.gypi +++ b/gmslides.gypi @@ -67,6 +67,7 @@ '../gm/shadertext3.cpp', '../gm/shadows.cpp', '../gm/simpleaaclip.cpp', + '../gm/srcmode.cpp', '../gm/strokefill.cpp', '../gm/strokerects.cpp', '../gm/strokes.cpp', -- cgit v1.2.3 From fbdc134705b947eb2a358d9bccd080185a0c13ac Mon Sep 17 00:00:00 2001 From: "robertphillips@google.com" Date: Thu, 15 Nov 2012 14:57:57 +0000 Subject: Add profiling to debugger https://codereview.appspot.com/6817114/ git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@6430 2bbb7eff-a529-9590-31e7-b0007b416f81 --- debugger.gyp | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/debugger.gyp b/debugger.gyp index 3578223..d39a7b2 100644 --- a/debugger.gyp +++ b/debugger.gyp @@ -81,6 +81,8 @@ '../debugger', # To pull SkDebugger.h '../debugger/QT', # For all the QT UI Goodies '../src/gpu', # To pull gl/GrGLUtil.h + '../bench', + '../tools', '<@(qt_includes)', ], 'sources': [ @@ -107,6 +109,14 @@ '../debugger/QT/SkRasterWidget.h', '../debugger/QT/SkRasterWidget.cpp', + '../tools/PictureBenchmark.h', + '../tools/PictureBenchmark.cpp', + + '../bench/SkBenchLogger.h', + '../bench/SkBenchLogger.cpp', + '../bench/TimerData.h', + '../bench/TimerData.cpp', + # To update this file edit SkIcons.qrc and rerun rcc to generate cpp '../debugger/QT/qrc_SkIcons.cpp', @@ -122,6 +132,8 @@ 'skia_base_libs.gyp:skia_base_libs', 'images.gyp:images', 'effects.gyp:effects', + 'bench.gyp:bench_timer', + 'tools.gyp:picture_renderer', 'debugger_mocs', ], 'link_settings': { -- cgit v1.2.3 From 372f222871d6030636564307cb36c918db9518af Mon Sep 17 00:00:00 2001 From: "scroggo@google.com" Date: Fri, 16 Nov 2012 20:34:37 +0000 Subject: In SkBitmapHeap, defer adding owners for new bitmaps. When using an SkFlatDictionary to flatten shaders, the dictionary can try to insert a duplicate bitmap shader that uses a bitmap which has been removed from the bitmap heap. This change was originally suggested by junov in https://codereview.appspot.com/6713048/. Add a test to verify that deferring the owners works. Without the change to bitmap heap the test would fail (and crash in debug mode). Also remove an unused function from SkFlatDictionary. BUG=http://code.google.com/p/chromium/issues/detail?id=143923 Review URL: https://codereview.appspot.com/6842051 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@6471 2bbb7eff-a529-9590-31e7-b0007b416f81 --- tests.gyp | 1 + 1 file changed, 1 insertion(+) diff --git a/tests.gyp b/tests.gyp index 18dc558..d1c0f80 100644 --- a/tests.gyp +++ b/tests.gyp @@ -21,6 +21,7 @@ '../tests/AtomicTest.cpp', '../tests/BitmapCopyTest.cpp', '../tests/BitmapGetColorTest.cpp', + '../tests/BitmapHeapTest.cpp', '../tests/BitSetTest.cpp', '../tests/BlitRowTest.cpp', '../tests/BlurTest.cpp', -- cgit v1.2.3 From 46b58cf4b31dc64d3b36c790eacb16ab7d28789e Mon Sep 17 00:00:00 2001 From: "djsollen@google.com" Date: Mon, 19 Nov 2012 19:34:23 +0000 Subject: Add support for SkImageRef_ashmem. This requires copying the ashmem utility wrapper functions from a private android library into our source tree in order to be NDK compliant. Review URL: https://codereview.appspot.com/6846076 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@6488 2bbb7eff-a529-9590-31e7-b0007b416f81 --- ports.gyp | 2 +- utils.gyp | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/ports.gyp b/ports.gyp index 6403693..a84f788 100644 --- a/ports.gyp +++ b/ports.gyp @@ -163,7 +163,7 @@ '../src/ports/SkFontHost_FreeType.cpp', '../src/ports/SkFontHost_FreeType_common.cpp', '../src/ports/FontHostConfiguration_android.cpp', - #TODO: include the ports/SkImageRef_ashmem.cpp for non-NDK builds + '../src/ports/SkImageRef_ashmem.cpp', ], 'dependencies': [ 'freetype.gyp:freetype', diff --git a/utils.gyp b/utils.gyp index 6fef668..706b851 100644 --- a/utils.gyp +++ b/utils.gyp @@ -179,6 +179,11 @@ '../src/utils/SkThreadUtils_pthread_linux.cpp', ], }], + [ 'skia_os == "android"', { + 'sources': [ + '../src/utils/android/ashmem.c', + ], + }], ], 'direct_dependent_settings': { 'include_dirs': [ -- cgit v1.2.3 From 524359f2df7c26e07f6106a20f46145bef91ceab Mon Sep 17 00:00:00 2001 From: "robertphillips@google.com" Date: Mon, 19 Nov 2012 20:44:29 +0000 Subject: Breakdown profile time by command type in the overview pane https://codereview.appspot.com/6851073/ git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@6492 2bbb7eff-a529-9590-31e7-b0007b416f81 --- debugger.gyp | 8 -------- 1 file changed, 8 deletions(-) diff --git a/debugger.gyp b/debugger.gyp index d39a7b2..3d44cbc 100644 --- a/debugger.gyp +++ b/debugger.gyp @@ -109,14 +109,6 @@ '../debugger/QT/SkRasterWidget.h', '../debugger/QT/SkRasterWidget.cpp', - '../tools/PictureBenchmark.h', - '../tools/PictureBenchmark.cpp', - - '../bench/SkBenchLogger.h', - '../bench/SkBenchLogger.cpp', - '../bench/TimerData.h', - '../bench/TimerData.cpp', - # To update this file edit SkIcons.qrc and rerun rcc to generate cpp '../debugger/QT/qrc_SkIcons.cpp', -- cgit v1.2.3 From fc33a70f2f7430255554c3692a91fa1661a1aa4b Mon Sep 17 00:00:00 2001 From: "bungeman@google.com" Date: Tue, 20 Nov 2012 18:52:23 +0000 Subject: Additional OpenType tables. https://codereview.appspot.com/6850075/ git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@6509 2bbb7eff-a529-9590-31e7-b0007b416f81 --- sfnt.gyp | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/sfnt.gyp b/sfnt.gyp index d4d9627..66089e3 100644 --- a/sfnt.gyp +++ b/sfnt.gyp @@ -14,8 +14,13 @@ 'sources': [ '../src/sfnt/SkIBMFamilyClass.h', '../src/sfnt/SkOTTableTypes.h', + '../src/sfnt/SkOTTable_glyf.h', '../src/sfnt/SkOTTable_head.h', '../src/sfnt/SkOTTable_hhea.h', + '../src/sfnt/SkOTTable_loca.h', + '../src/sfnt/SkOTTable_maxp.h', + '../src/sfnt/SkOTTable_maxp_CFF.h', + '../src/sfnt/SkOTTable_maxp_TT.h', '../src/sfnt/SkOTTable_name.h', '../src/sfnt/SkOTTable_OS_2.h', '../src/sfnt/SkOTTable_OS_2_V0.h', -- cgit v1.2.3 From 439ec34877ceeab61b8899cc4e334bc352170738 Mon Sep 17 00:00:00 2001 From: "reed@google.com" Date: Tue, 20 Nov 2012 19:00:28 +0000 Subject: add specialty strokeRect() to SkStroke, which can return much cleaner results Review URL: https://codereview.appspot.com/6843093 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@6510 2bbb7eff-a529-9590-31e7-b0007b416f81 --- gmslides.gypi | 1 + tests.gyp | 1 + 2 files changed, 2 insertions(+) diff --git a/gmslides.gypi b/gmslides.gypi index 61b1061..bff8391 100644 --- a/gmslides.gypi +++ b/gmslides.gypi @@ -69,6 +69,7 @@ '../gm/simpleaaclip.cpp', '../gm/srcmode.cpp', '../gm/strokefill.cpp', + '../gm/strokerect.cpp', '../gm/strokerects.cpp', '../gm/strokes.cpp', '../gm/tablecolorfilter.cpp', diff --git a/tests.gyp b/tests.gyp index d1c0f80..85f58ea 100644 --- a/tests.gyp +++ b/tests.gyp @@ -88,6 +88,7 @@ '../tests/SrcOverTest.cpp', '../tests/StreamTest.cpp', '../tests/StringTest.cpp', + '../tests/StrokeTest.cpp', '../tests/TDLinkedListTest.cpp', '../tests/Test.cpp', '../tests/Test.h', -- cgit v1.2.3 From 6213b7f234f5b1b841bcb8c760a944f8bed508c0 Mon Sep 17 00:00:00 2001 From: "robertphillips@google.com" Date: Wed, 21 Nov 2012 17:11:02 +0000 Subject: Add drawing of paths to debugger https://codereview.appspot.com/6850082/ git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@6532 2bbb7eff-a529-9590-31e7-b0007b416f81 --- debugger.gyp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/debugger.gyp b/debugger.gyp index 3d44cbc..5c760db 100644 --- a/debugger.gyp +++ b/debugger.gyp @@ -108,6 +108,8 @@ '../debugger/QT/SkGLWidget.cpp', '../debugger/QT/SkRasterWidget.h', '../debugger/QT/SkRasterWidget.cpp', + '../debugger/QT/SkImageWidget.h', + '../debugger/QT/SkImageWidget.cpp', # To update this file edit SkIcons.qrc and rerun rcc to generate cpp '../debugger/QT/qrc_SkIcons.cpp', @@ -118,6 +120,7 @@ '<(moc_gen_dir)/moc_SkInspectorWidget.cpp', '<(moc_gen_dir)/moc_SkSettingsWidget.cpp', '<(moc_gen_dir)/moc_SkRasterWidget.cpp', + '<(moc_gen_dir)/moc_SkImageWidget.cpp', '<(moc_gen_dir)/moc_SkGLWidget.cpp', ], 'dependencies': [ @@ -143,6 +146,7 @@ '<(moc_src_dir)/SkInspectorWidget.h', '<(moc_src_dir)/SkSettingsWidget.h', '<(moc_src_dir)/SkRasterWidget.h', + '<(moc_src_dir)/SkImageWidget.h', '<(moc_src_dir)/SkGLWidget.h', ], 'rules': [ -- cgit v1.2.3 From dde1e2da7ed39784675d8fb46bda82dee87360b3 Mon Sep 17 00:00:00 2001 From: "caryclark@google.com" Date: Wed, 21 Nov 2012 21:36:34 +0000 Subject: shape ops work in progress git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@6537 2bbb7eff-a529-9590-31e7-b0007b416f81 --- shapeops_edge.gyp | 1 + 1 file changed, 1 insertion(+) diff --git a/shapeops_edge.gyp b/shapeops_edge.gyp index b3f63f4..8542876 100644 --- a/shapeops_edge.gyp +++ b/shapeops_edge.gyp @@ -73,6 +73,7 @@ '../experimental/Intersection/QuarticRoot.cpp', '../experimental/Intersection/QuarticRoot_Test.cpp', '../experimental/Intersection/ShapeOps.cpp', + '../experimental/Intersection/ShapeOpRect4x4_Test.cpp', '../experimental/Intersection/Simplify.cpp', '../experimental/Intersection/SimplifyAddIntersectingTs_Test.cpp', '../experimental/Intersection/SimplifyAngle_Test.cpp', -- cgit v1.2.3 From 30394af047abf05cb4f87ca85f29ed20fba44378 Mon Sep 17 00:00:00 2001 From: "tfarina@chromium.org" Date: Wed, 21 Nov 2012 22:38:36 +0000 Subject: Remove GrRandom API in favor of SkRandom. TEST=tests R=bsalomon@google.com Review URL: https://codereview.appspot.com/6855062 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@6539 2bbb7eff-a529-9590-31e7-b0007b416f81 --- gpu.gypi | 1 - 1 file changed, 1 deletion(-) diff --git a/gpu.gypi b/gpu.gypi index 787ffc9..018a9d6 100644 --- a/gpu.gypi +++ b/gpu.gypi @@ -91,7 +91,6 @@ '<(skia_src_path)/gpu/GrPathUtils.cpp', '<(skia_src_path)/gpu/GrPathUtils.h', '<(skia_src_path)/gpu/GrPlotMgr.h', - '<(skia_src_path)/gpu/GrRandom.h', '<(skia_src_path)/gpu/GrRectanizer.cpp', '<(skia_src_path)/gpu/GrRectanizer.h', '<(skia_src_path)/gpu/GrRedBlackTree.h', -- cgit v1.2.3 From e2e968a4357f9cc5e5260dd585cb07643683a2f1 Mon Sep 17 00:00:00 2001 From: "robertphillips@google.com" Date: Thu, 29 Nov 2012 13:24:55 +0000 Subject: SkRoundRect start https://codereview.appspot.com/6815058/ git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@6595 2bbb7eff-a529-9590-31e7-b0007b416f81 --- core.gypi | 2 ++ tests.gyp | 1 + 2 files changed, 3 insertions(+) diff --git a/core.gypi b/core.gypi index 4626a72..6251ce6 100644 --- a/core.gypi +++ b/core.gypi @@ -136,6 +136,7 @@ '<(skia_src_path)/core/SkRegion.cpp', '<(skia_src_path)/core/SkRegionPriv.h', '<(skia_src_path)/core/SkRegion_path.cpp', + '<(skia_src_path)/core/SkRRect.cpp', '<(skia_src_path)/core/SkRTree.h', '<(skia_src_path)/core/SkRTree.cpp', '<(skia_src_path)/core/SkScalar.cpp', @@ -242,6 +243,7 @@ '<(skia_include_path)/core/SkRect.h', '<(skia_include_path)/core/SkRefCnt.h', '<(skia_include_path)/core/SkRegion.h', + '<(skia_include_path)/core/SkRRect.h', '<(skia_include_path)/core/SkScalar.h', '<(skia_include_path)/core/SkScalarCompare.h', '<(skia_include_path)/core/SkShader.h', diff --git a/tests.gyp b/tests.gyp index 85f58ea..7e8a19e 100644 --- a/tests.gyp +++ b/tests.gyp @@ -79,6 +79,7 @@ '../tests/RefCntTest.cpp', '../tests/RefDictTest.cpp', '../tests/RegionTest.cpp', + '../tests/RoundRectTest.cpp', '../tests/RTreeTest.cpp', '../tests/ScalarTest.cpp', '../tests/ShaderOpacityTest.cpp', -- cgit v1.2.3 From bfe217c58d72809932bf4fa5bb4b2288b59b3a7d Mon Sep 17 00:00:00 2001 From: "djsollen@google.com" Date: Thu, 29 Nov 2012 15:09:58 +0000 Subject: Enable profiling options to be selectively enabled for a given build Review URL: https://codereview.appspot.com/6858089 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@6598 2bbb7eff-a529-9590-31e7-b0007b416f81 --- common_conditions.gypi | 3 +++ common_variables.gypi | 2 ++ opts.gyp | 3 +++ 3 files changed, 8 insertions(+) diff --git a/common_conditions.gypi b/common_conditions.gypi index 0bbd660..6d1a4f8 100644 --- a/common_conditions.gypi +++ b/common_conditions.gypi @@ -290,6 +290,9 @@ '<(android_base)/toolchains/<(android_toolchain)/sysroot/usr/include', ], 'conditions': [ + [ 'skia_profile_enabled == 1', { + 'cflags': ['-g', '-fno-omit-frame-pointer', '-marm', '-mapcs'], + }], [ 'skia_arch_type == "arm"', { 'ldflags': [ '-Wl', diff --git a/common_variables.gypi b/common_variables.gypi index 974e93b..1c900c5 100644 --- a/common_variables.gypi +++ b/common_variables.gypi @@ -86,6 +86,7 @@ 'skia_directwrite%': 0, 'skia_gpu%': 1, 'skia_osx_sdkroot%': 'macosx', + 'skia_profile_enabled%': 0, }, # Re-define all variables defined within the level-2 'variables' dict, @@ -104,6 +105,7 @@ 'skia_directwrite%': '<(skia_directwrite)', 'skia_gpu%': '<(skia_gpu)', 'skia_osx_sdkroot%': '<(skia_osx_sdkroot)', + 'skia_profile_enabled%': '<(skia_profile_enabled)', 'skia_static_initializers%': '<(skia_static_initializers)', 'ios_sdk_version%': '6.0', diff --git a/opts.gyp b/opts.gyp index cd892e8..de27b42 100644 --- a/opts.gyp +++ b/opts.gyp @@ -54,9 +54,12 @@ # ARM), the compiler doesn't like that. 'cflags!': [ '-fno-omit-frame-pointer', + '-mapcs-frame', + '-mapcs', ], 'cflags': [ '-fomit-frame-pointer', + '-mno-apcs-frame', ], 'variables': { 'arm_neon_optional%': '<(arm_neon_optional>', -- cgit v1.2.3 From ca091f49e1a28e14c4732c15d2ac913ad2f46279 Mon Sep 17 00:00:00 2001 From: "reed@google.com" Date: Thu, 29 Nov 2012 21:00:39 +0000 Subject: add SkPictureUtils::GatherPixelRefs() Review URL: https://codereview.appspot.com/6845106 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@6615 2bbb7eff-a529-9590-31e7-b0007b416f81 --- utils.gyp | 1 + 1 file changed, 1 insertion(+) diff --git a/utils.gyp b/utils.gyp index 706b851..7bbe67c 100644 --- a/utils.gyp +++ b/utils.gyp @@ -70,6 +70,7 @@ '../src/utils/SkParse.cpp', '../src/utils/SkParseColor.cpp', '../src/utils/SkParsePath.cpp', + '../src/utils/SkPictureUtils.cpp', '../src/utils/SkProxyCanvas.cpp', '../src/utils/SkThreadUtils.h', '../src/utils/SkThreadUtils_pthread.cpp', -- cgit v1.2.3 From 4fcef2c6c43e632e1f32f84aaa93c3b83cadb1aa Mon Sep 17 00:00:00 2001 From: "scroggo@google.com" Date: Thu, 29 Nov 2012 21:05:37 +0000 Subject: Create a factory to decode an SkBitmap from an SkData. Add a test and a GM for the factory, and a PNG file for it to decode. The PNG file is copyright-free, obtained from http://openclipart.org/detail/29213/paper-plane-by-ddoo In cmykjpeg, do not attempt to decode in the constructor, since it currently crashes on Mac (if you provide the correct resource path). Even when we fix this crash there is no need to do it in the constructor, since we create all of the gms in order to get their names (to determine whether to run them). Review URL: https://codereview.appspot.com/6847122 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@6618 2bbb7eff-a529-9590-31e7-b0007b416f81 --- gmslides.gypi | 1 + images.gyp | 2 ++ tests.gyp | 1 + 3 files changed, 4 insertions(+) diff --git a/gmslides.gypi b/gmslides.gypi index bff8391..6a8b5a6 100644 --- a/gmslides.gypi +++ b/gmslides.gypi @@ -31,6 +31,7 @@ '../gm/extractbitmap.cpp', '../gm/emptypath.cpp', '../gm/fatpathfill.cpp', + '../gm/factory.cpp', '../gm/filltypes.cpp', '../gm/filltypespersp.cpp', '../gm/fontscaler.cpp', diff --git a/images.gyp b/images.gyp index daf4c5f..1441359 100644 --- a/images.gyp +++ b/images.gyp @@ -18,6 +18,7 @@ '../include/images', ], 'sources': [ + '../include/images/SkBitmapFactory.h', '../include/images/SkFlipPixelRef.h', '../include/images/SkImageDecoder.h', '../include/images/SkImageEncoder.h', @@ -29,6 +30,7 @@ '../src/images/bmpdecoderhelper.cpp', '../src/images/bmpdecoderhelper.h', + '../src/images/SkBitmapFactory.cpp', '../src/images/SkFDStream.cpp', '../src/images/SkFlipPixelRef.cpp', '../src/images/SkImageDecoder.cpp', diff --git a/tests.gyp b/tests.gyp index 7e8a19e..1c64933 100644 --- a/tests.gyp +++ b/tests.gyp @@ -20,6 +20,7 @@ '../tests/AnnotationTest.cpp', '../tests/AtomicTest.cpp', '../tests/BitmapCopyTest.cpp', + '../tests/BitmapFactoryTest.cpp', '../tests/BitmapGetColorTest.cpp', '../tests/BitmapHeapTest.cpp', '../tests/BitSetTest.cpp', -- cgit v1.2.3 From 54bec49d060804470db3dac90d15e6603c3225e3 Mon Sep 17 00:00:00 2001 From: "bsalomon@google.com" Date: Mon, 3 Dec 2012 14:54:59 +0000 Subject: Rename SkTDLinkedList to SkTInternalLinked list, add some methods useful for forthcoming SkTLList. Review URL: https://codereview.appspot.com/6858101 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@6643 2bbb7eff-a529-9590-31e7-b0007b416f81 --- core.gypi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core.gypi b/core.gypi index 6251ce6..960af33 100644 --- a/core.gypi +++ b/core.gypi @@ -253,7 +253,7 @@ '<(skia_include_path)/core/SkTDArray.h', '<(skia_include_path)/core/SkTDStack.h', '<(skia_include_path)/core/SkTDict.h', - '<(skia_include_path)/core/SkTDLinkedList.h', + '<(skia_include_path)/core/SkTInternalLList.h', '<(skia_include_path)/core/SkTRegistry.h', '<(skia_include_path)/core/SkTScopedPtr.h', '<(skia_include_path)/core/SkTSearch.h', -- cgit v1.2.3 From 4f259ee60e4d0539d7d91279ec6a55ef8a3b1075 Mon Sep 17 00:00:00 2001 From: "bsalomon@google.com" Date: Mon, 3 Dec 2012 15:54:12 +0000 Subject: Add SkTLList, linked list class implemented on top of the internal llist class. R=robertphillips@google.com Review URL: https://codereview.appspot.com/6869049 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@6644 2bbb7eff-a529-9590-31e7-b0007b416f81 --- core.gypi | 1 + tests.gyp | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/core.gypi b/core.gypi index 960af33..f3402b1 100644 --- a/core.gypi +++ b/core.gypi @@ -164,6 +164,7 @@ '<(skia_src_path)/core/SkTextFormatParams.h', '<(skia_src_path)/core/SkTileGrid.cpp', '<(skia_src_path)/core/SkTileGrid.h', + '<(skia_src_path)/core/SkTLList.h', '<(skia_src_path)/core/SkTLS.cpp', '<(skia_src_path)/core/SkTSearch.cpp', '<(skia_src_path)/core/SkTSort.h', diff --git a/tests.gyp b/tests.gyp index 1c64933..3353d9a 100644 --- a/tests.gyp +++ b/tests.gyp @@ -56,6 +56,7 @@ '../tests/GrMemoryPoolTest.cpp', '../tests/HashCacheTest.cpp', '../tests/InfRectTest.cpp', + '../tests/LListTest.cpp', '../tests/MathTest.cpp', '../tests/MatrixTest.cpp', '../tests/Matrix44Test.cpp', @@ -91,7 +92,6 @@ '../tests/StreamTest.cpp', '../tests/StringTest.cpp', '../tests/StrokeTest.cpp', - '../tests/TDLinkedListTest.cpp', '../tests/Test.cpp', '../tests/Test.h', '../tests/TestSize.cpp', -- cgit v1.2.3 From 83f55ada4fd3849b61ecd266f99b419d102765d0 Mon Sep 17 00:00:00 2001 From: "bsalomon@google.com" Date: Mon, 3 Dec 2012 15:59:52 +0000 Subject: Revert change accidentally committed. git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@6645 2bbb7eff-a529-9590-31e7-b0007b416f81 --- core.gypi | 1 - tests.gyp | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/core.gypi b/core.gypi index f3402b1..960af33 100644 --- a/core.gypi +++ b/core.gypi @@ -164,7 +164,6 @@ '<(skia_src_path)/core/SkTextFormatParams.h', '<(skia_src_path)/core/SkTileGrid.cpp', '<(skia_src_path)/core/SkTileGrid.h', - '<(skia_src_path)/core/SkTLList.h', '<(skia_src_path)/core/SkTLS.cpp', '<(skia_src_path)/core/SkTSearch.cpp', '<(skia_src_path)/core/SkTSort.h', diff --git a/tests.gyp b/tests.gyp index 3353d9a..1c64933 100644 --- a/tests.gyp +++ b/tests.gyp @@ -56,7 +56,6 @@ '../tests/GrMemoryPoolTest.cpp', '../tests/HashCacheTest.cpp', '../tests/InfRectTest.cpp', - '../tests/LListTest.cpp', '../tests/MathTest.cpp', '../tests/MatrixTest.cpp', '../tests/Matrix44Test.cpp', @@ -92,6 +91,7 @@ '../tests/StreamTest.cpp', '../tests/StringTest.cpp', '../tests/StrokeTest.cpp', + '../tests/TDLinkedListTest.cpp', '../tests/Test.cpp', '../tests/Test.h', '../tests/TestSize.cpp', -- cgit v1.2.3 From 54a8eafa30b5ef064643c9db6fa5801a7d2cb4e9 Mon Sep 17 00:00:00 2001 From: "bsalomon@google.com" Date: Mon, 3 Dec 2012 18:01:45 +0000 Subject: Add SkTLList, linked list class implemented on top of the internal llist class. R=robertphillips@google.com Committed: https://code.google.com/p/skia/source/detail?r=6644 Review URL: https://codereview.appspot.com/6869049 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@6647 2bbb7eff-a529-9590-31e7-b0007b416f81 --- core.gypi | 1 + tests.gyp | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/core.gypi b/core.gypi index 960af33..f3402b1 100644 --- a/core.gypi +++ b/core.gypi @@ -164,6 +164,7 @@ '<(skia_src_path)/core/SkTextFormatParams.h', '<(skia_src_path)/core/SkTileGrid.cpp', '<(skia_src_path)/core/SkTileGrid.h', + '<(skia_src_path)/core/SkTLList.h', '<(skia_src_path)/core/SkTLS.cpp', '<(skia_src_path)/core/SkTSearch.cpp', '<(skia_src_path)/core/SkTSort.h', diff --git a/tests.gyp b/tests.gyp index 1c64933..3353d9a 100644 --- a/tests.gyp +++ b/tests.gyp @@ -56,6 +56,7 @@ '../tests/GrMemoryPoolTest.cpp', '../tests/HashCacheTest.cpp', '../tests/InfRectTest.cpp', + '../tests/LListTest.cpp', '../tests/MathTest.cpp', '../tests/MatrixTest.cpp', '../tests/Matrix44Test.cpp', @@ -91,7 +92,6 @@ '../tests/StreamTest.cpp', '../tests/StringTest.cpp', '../tests/StrokeTest.cpp', - '../tests/TDLinkedListTest.cpp', '../tests/Test.cpp', '../tests/Test.h', '../tests/TestSize.cpp', -- cgit v1.2.3 From 55df1389d8a49539b8313a2374dc9acfd405d2e7 Mon Sep 17 00:00:00 2001 From: "reed@google.com" Date: Mon, 3 Dec 2012 21:19:52 +0000 Subject: add getTypes() to SkMatrix44, to cache how complex the matrix is. add bench optimize operator== by performing 4 compares in a row before checking optimize setconcat by noting when we can write the answer directly into this At least on this macbook, I had to mark helpers like isIdentity() as inline to get them inlined. Review URL: https://codereview.appspot.com/6863053 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@6655 2bbb7eff-a529-9590-31e7-b0007b416f81 --- bench.gypi | 1 + 1 file changed, 1 insertion(+) diff --git a/bench.gypi b/bench.gypi index bc90c5e..dbb30b6 100644 --- a/bench.gypi +++ b/bench.gypi @@ -21,6 +21,7 @@ '../bench/InterpBench.cpp', '../bench/LineBench.cpp', '../bench/MathBench.cpp', + '../bench/Matrix44Bench.cpp', '../bench/MatrixBench.cpp', '../bench/MatrixConvolutionBench.cpp', '../bench/MemoryBench.cpp', -- cgit v1.2.3 From f5830737c90c007117c5dd02f01a123f38784850 Mon Sep 17 00:00:00 2001 From: "senorblanco@chromium.org" Date: Tue, 4 Dec 2012 14:18:50 +0000 Subject: Pull SkMergeImageFilter out into its own file. Review URL: https://codereview.appspot.com/6873052 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@6662 2bbb7eff-a529-9590-31e7-b0007b416f81 --- effects.gypi | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/effects.gypi b/effects.gypi index f2a2214..d981cd1 100644 --- a/effects.gypi +++ b/effects.gypi @@ -33,9 +33,10 @@ '<(skia_src_path)/effects/SkLayerDrawLooper.cpp', '<(skia_src_path)/effects/SkLayerRasterizer.cpp', '<(skia_src_path)/effects/SkLightingImageFilter.cpp', - '<(skia_src_path)/effects/SkOffsetImageFilter.cpp', '<(skia_src_path)/effects/SkMatrixConvolutionImageFilter.cpp', + '<(skia_src_path)/effects/SkMergeImageFilter.cpp', '<(skia_src_path)/effects/SkMorphologyImageFilter.cpp', + '<(skia_src_path)/effects/SkOffsetImageFilter.cpp', '<(skia_src_path)/effects/SkPaintFlagsDrawFilter.cpp', '<(skia_src_path)/effects/SkPixelXorXfermode.cpp', '<(skia_src_path)/effects/SkPorterDuff.cpp', -- cgit v1.2.3 From 12524bbb5c9760409bc713073c592a031125a737 Mon Sep 17 00:00:00 2001 From: "reed@google.com" Date: Tue, 4 Dec 2012 22:52:28 +0000 Subject: add gm/pathinterior.cpp in advance of cary's path api git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@6668 2bbb7eff-a529-9590-31e7-b0007b416f81 --- gmslides.gypi | 1 + 1 file changed, 1 insertion(+) diff --git a/gmslides.gypi b/gmslides.gypi index 6a8b5a6..047f02e 100644 --- a/gmslides.gypi +++ b/gmslides.gypi @@ -57,6 +57,7 @@ '../gm/nocolorbleed.cpp', '../gm/patheffects.cpp', '../gm/pathfill.cpp', + '../gm/pathinterior.cpp', '../gm/pathreverse.cpp', '../gm/points.cpp', '../gm/poly2poly.cpp', -- cgit v1.2.3 From ee171b8d3b4ee2c1e827b15c7aff9bfc40a0a995 Mon Sep 17 00:00:00 2001 From: "djsollen@google.com" Date: Wed, 5 Dec 2012 06:15:42 +0000 Subject: Add missing SK_API definition at request of Chromium callers Review URL: https://codereview.appspot.com/6878050 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@6671 2bbb7eff-a529-9590-31e7-b0007b416f81 --- utils.gyp | 1 + 1 file changed, 1 insertion(+) diff --git a/utils.gyp b/utils.gyp index 7bbe67c..5658f04 100644 --- a/utils.gyp +++ b/utils.gyp @@ -43,6 +43,7 @@ '../include/utils/SkParse.h', '../include/utils/SkParsePaint.h', '../include/utils/SkParsePath.h', + '../include/utils/SkPictureUtils.h', '../include/utils/SkProxyCanvas.h', '../include/utils/SkUnitMappers.h', '../include/utils/SkWGL.h', -- cgit v1.2.3 From e7481eba35cd79cfa9033f0f583320681cad0527 Mon Sep 17 00:00:00 2001 From: "rmistry@google.com" Date: Wed, 5 Dec 2012 14:56:08 +0000 Subject: The goal is to make the ClangCompile buildstep in the Housekeeping bot turn red if there is a warning. Review URL: https://codereview.appspot.com/6868055 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@6674 2bbb7eff-a529-9590-31e7-b0007b416f81 --- common_conditions.gypi | 10 ++++++++++ common_variables.gypi | 4 ++++ 2 files changed, 14 insertions(+) diff --git a/common_conditions.gypi b/common_conditions.gypi index 6d1a4f8..332d342 100644 --- a/common_conditions.gypi +++ b/common_conditions.gypi @@ -125,6 +125,11 @@ '-Wno-c++11-extensions' ], 'conditions' : [ + ['skia_warnings_as_errors == 1', { + 'cflags': [ + '-Werror', + ], + }], ['skia_arch_width == 64', { 'cflags': [ '-m64', @@ -290,6 +295,11 @@ '<(android_base)/toolchains/<(android_toolchain)/sysroot/usr/include', ], 'conditions': [ + [ 'skia_warnings_as_errors == 1', { + 'cflags': [ + '-Werror', + ], + }], [ 'skia_profile_enabled == 1', { 'cflags': ['-g', '-fno-omit-frame-pointer', '-marm', '-mapcs'], }], diff --git a/common_variables.gypi b/common_variables.gypi index 1c900c5..042340b 100644 --- a/common_variables.gypi +++ b/common_variables.gypi @@ -87,6 +87,9 @@ 'skia_gpu%': 1, 'skia_osx_sdkroot%': 'macosx', 'skia_profile_enabled%': 0, + # Note: This is currently only turned on for linux and android. + # TODO: Turn on for Win and Mac as well. + 'skia_warnings_as_errors%': 0, }, # Re-define all variables defined within the level-2 'variables' dict, @@ -106,6 +109,7 @@ 'skia_gpu%': '<(skia_gpu)', 'skia_osx_sdkroot%': '<(skia_osx_sdkroot)', 'skia_profile_enabled%': '<(skia_profile_enabled)', + 'skia_warnings_as_errors%': '<(skia_warnings_as_errors)', 'skia_static_initializers%': '<(skia_static_initializers)', 'ios_sdk_version%': '6.0', -- cgit v1.2.3 From 91b552cc6a4ffcda58f9738613cf62c70bb4a6e2 Mon Sep 17 00:00:00 2001 From: "bungeman@google.com" Date: Wed, 5 Dec 2012 20:13:12 +0000 Subject: Update skdiff. https://codereview.appspot.com/6850115/ git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@6681 2bbb7eff-a529-9590-31e7-b0007b416f81 --- tools.gyp | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/tools.gyp b/tools.gyp index e7c2241..8a31eaa 100644 --- a/tools.gyp +++ b/tools.gyp @@ -28,7 +28,31 @@ 'target_name': 'skdiff', 'type': 'executable', 'sources': [ + '../tools/skdiff.cpp', + '../tools/skdiff.h', + '../tools/skdiff_html.cpp', + '../tools/skdiff_html.h', '../tools/skdiff_main.cpp', + '../tools/skdiff_utils.cpp', + '../tools/skdiff_utils.h', + ], + 'dependencies': [ + 'skia_base_libs.gyp:skia_base_libs', + 'effects.gyp:effects', + 'images.gyp:images', + ], + }, + { + 'target_name': 'skimagediff', + 'type': 'executable', + 'sources': [ + '../tools/skdiff.cpp', + '../tools/skdiff.h', + '../tools/skdiff_html.cpp', + '../tools/skdiff_html.h', + '../tools/skdiff_image.cpp', + '../tools/skdiff_utils.cpp', + '../tools/skdiff_utils.h', ], 'dependencies': [ 'skia_base_libs.gyp:skia_base_libs', -- cgit v1.2.3 From c54828d9b7614502bebf03dd9e374d02700026d7 Mon Sep 17 00:00:00 2001 From: "bsalomon@google.com" Date: Wed, 5 Dec 2012 22:26:11 +0000 Subject: Move GrReducedClip to its own files. R=robertphillips@google.com Review URL: https://codereview.appspot.com/6891045 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@6686 2bbb7eff-a529-9590-31e7-b0007b416f81 --- gpu.gypi | 2 ++ 1 file changed, 2 insertions(+) diff --git a/gpu.gypi b/gpu.gypi index 018a9d6..3a6b1f2 100644 --- a/gpu.gypi +++ b/gpu.gypi @@ -95,6 +95,8 @@ '<(skia_src_path)/gpu/GrRectanizer.h', '<(skia_src_path)/gpu/GrRedBlackTree.h', '<(skia_src_path)/gpu/GrRenderTarget.cpp', + '<(skia_src_path)/gpu/GrReducedClip.cpp', + '<(skia_src_path)/gpu/GrReducedClip.h', '<(skia_src_path)/gpu/GrResource.cpp', '<(skia_src_path)/gpu/GrResourceCache.cpp', '<(skia_src_path)/gpu/GrResourceCache.h', -- cgit v1.2.3 From 7ad041f05be275a04e8bfd9d84b2f5a4bafe491a Mon Sep 17 00:00:00 2001 From: "epoger@google.com" Date: Fri, 7 Dec 2012 15:12:01 +0000 Subject: Replace SkConsistentChecksum with SkCityHash (now including CityHash via DEPS) Alternative to https://codereview.appspot.com/6847087/ ('Change SkConsistentChecksum to use SuperFastHash') Review URL: https://codereview.appspot.com/6867060 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@6701 2bbb7eff-a529-9590-31e7-b0007b416f81 --- utils.gyp | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/utils.gyp b/utils.gyp index 5658f04..b2833f2 100644 --- a/utils.gyp +++ b/utils.gyp @@ -5,6 +5,9 @@ 'product_name': 'skia_utils', 'type': 'static_library', 'standalone_static_library': 1, + 'dependencies': [ + 'cityhash', + ], 'include_dirs': [ '../include/config', '../include/core', @@ -23,6 +26,7 @@ '../include/utils/SkCountdown.h', '../include/utils/SkRunnable.h', '../include/utils/SkThreadPool.h', + '../src/utils/SkCityHash.cpp', '../src/utils/SkCondVar.cpp', '../src/utils/SkCountdown.cpp', '../src/utils/SkThreadPool.cpp', @@ -193,6 +197,25 @@ ], }, }, + { + 'target_name': 'cityhash', + 'type': 'static_library', + 'standalone_static_library': 1, + 'include_dirs': [ + '../include/config', + '../include/core', + '../src/utils/cityhash', + '../third_party/externals/cityhash/src', + ], + 'sources': [ + '../third_party/externals/cityhash/src/city.cc', + ], + 'direct_dependent_settings': { + 'include_dirs': [ + '../third_party/externals/cityhash/src', + ], + }, + }, ], } -- cgit v1.2.3 From cce7d85521b23e66b5b8f3eaaaf7efbe0f823cce Mon Sep 17 00:00:00 2001 From: "epoger@google.com" Date: Fri, 7 Dec 2012 19:06:11 +0000 Subject: utils.gyp: add SkCityHash.h, delete SkConsistentChecksum.h Review URL: https://codereview.appspot.com/6906050 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@6709 2bbb7eff-a529-9590-31e7-b0007b416f81 --- utils.gyp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/utils.gyp b/utils.gyp index b2833f2..bea2d09 100644 --- a/utils.gyp +++ b/utils.gyp @@ -26,7 +26,6 @@ '../include/utils/SkCountdown.h', '../include/utils/SkRunnable.h', '../include/utils/SkThreadPool.h', - '../src/utils/SkCityHash.cpp', '../src/utils/SkCondVar.cpp', '../src/utils/SkCountdown.cpp', '../src/utils/SkThreadPool.cpp', @@ -58,7 +57,8 @@ '../src/utils/SkBitSet.h', '../src/utils/SkBoundaryPatch.cpp', '../src/utils/SkCamera.cpp', - '../src/utils/SkConsistentChecksum.h', + '../src/utils/SkCityHash.cpp', + '../src/utils/SkCityHash.h', '../src/utils/SkCubicInterval.cpp', '../src/utils/SkCullPoints.cpp', '../src/utils/SkDeferredCanvas.cpp', -- cgit v1.2.3 From 98ebb94ef103c99480ed60c8b3cc21af7bbccee2 Mon Sep 17 00:00:00 2001 From: "robertphillips@google.com" Date: Fri, 7 Dec 2012 20:56:13 +0000 Subject: Update filter tool to write out paths to .cpp file https://codereview.appspot.com/6843125/ git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@6714 2bbb7eff-a529-9590-31e7-b0007b416f81 --- tools.gyp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tools.gyp b/tools.gyp index 8a31eaa..0cdb319 100644 --- a/tools.gyp +++ b/tools.gyp @@ -199,6 +199,8 @@ ], 'sources': [ '../tools/filtermain.cpp', + '../tools/path_utils.cpp', + '../tools/path_utils.h', ], 'dependencies': [ 'skia_base_libs.gyp:skia_base_libs', -- cgit v1.2.3 From 4d70dca709b4852d76bafe4039832e3d2ad5a00f Mon Sep 17 00:00:00 2001 From: "bsalomon@google.com" Date: Mon, 10 Dec 2012 19:10:17 +0000 Subject: Modifications to GrPatherRenderer(Chain) interfaces to support clip mask manager. R=robertphillips@google.com Review URL: https://codereview.appspot.com/6904069 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@6741 2bbb7eff-a529-9590-31e7-b0007b416f81 --- gpu.gypi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gpu.gypi b/gpu.gypi index 3a6b1f2..7d3c0f2 100644 --- a/gpu.gypi +++ b/gpu.gypi @@ -25,6 +25,7 @@ '<(skia_include_path)/gpu/GrKey.h', '<(skia_include_path)/gpu/GrNoncopyable.h', '<(skia_include_path)/gpu/GrPaint.h', + '<(skia_include_path)/gpu/GrPathRendererChain.h', '<(skia_include_path)/gpu/GrPoint.h', '<(skia_include_path)/gpu/GrRect.h', '<(skia_include_path)/gpu/GrRefCnt.h', @@ -85,7 +86,6 @@ '<(skia_src_path)/gpu/GrPath.cpp', '<(skia_src_path)/gpu/GrPath.h', '<(skia_src_path)/gpu/GrPathRendererChain.cpp', - '<(skia_src_path)/gpu/GrPathRendererChain.h', '<(skia_src_path)/gpu/GrPathRenderer.cpp', '<(skia_src_path)/gpu/GrPathRenderer.h', '<(skia_src_path)/gpu/GrPathUtils.cpp', -- cgit v1.2.3 From 442fb628670f4a7878cba4de49edf145f88228dd Mon Sep 17 00:00:00 2001 From: "epoger@google.com" Date: Wed, 12 Dec 2012 17:22:23 +0000 Subject: Create SkBitmapChecksummer and associated SkBitmapTransformer As needed to start capturing gm image checksums. Review URL: https://codereview.appspot.com/6920050 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@6759 2bbb7eff-a529-9590-31e7-b0007b416f81 --- tests.gyp | 1 + utils.gyp | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/tests.gyp b/tests.gyp index 3353d9a..066435c 100644 --- a/tests.gyp +++ b/tests.gyp @@ -23,6 +23,7 @@ '../tests/BitmapFactoryTest.cpp', '../tests/BitmapGetColorTest.cpp', '../tests/BitmapHeapTest.cpp', + '../tests/BitmapTransformerTest.cpp', '../tests/BitSetTest.cpp', '../tests/BlitRowTest.cpp', '../tests/BlurTest.cpp', diff --git a/utils.gyp b/utils.gyp index bea2d09..4e3f6d4 100644 --- a/utils.gyp +++ b/utils.gyp @@ -53,6 +53,10 @@ '../src/utils/SkBase64.cpp', '../src/utils/SkBase64.h', + '../src/utils/SkBitmapChecksummer.cpp', + '../src/utils/SkBitmapChecksummer.h', + '../src/utils/SkBitmapTransformer.cpp', + '../src/utils/SkBitmapTransformer.h', '../src/utils/SkBitSet.cpp', '../src/utils/SkBitSet.h', '../src/utils/SkBoundaryPatch.cpp', -- cgit v1.2.3 From fb7f8cd7cddbed50a4925e63a54b666e885e5033 Mon Sep 17 00:00:00 2001 From: "reed@google.com" Date: Thu, 13 Dec 2012 16:35:37 +0000 Subject: kill unused SkFlipPixelRef Review URL: https://codereview.appspot.com/6949043 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@6781 2bbb7eff-a529-9590-31e7-b0007b416f81 --- SampleApp.gyp | 2 -- images.gyp | 2 -- 2 files changed, 4 deletions(-) diff --git a/SampleApp.gyp b/SampleApp.gyp index 5668428..8e8fec2 100644 --- a/SampleApp.gyp +++ b/SampleApp.gyp @@ -71,7 +71,6 @@ '../samplecode/SampleMovie.cpp', '../samplecode/SampleOvalTest.cpp', '../samplecode/SampleOverflow.cpp', - '../samplecode/SamplePageFlip.cpp', '../samplecode/SamplePatch.cpp', '../samplecode/SamplePath.cpp', '../samplecode/SamplePathClip.cpp', @@ -156,7 +155,6 @@ 'sources!': [ # require UNIX functions '../samplecode/SampleEncode.cpp', - '../samplecode/SamplePageFlip.cpp', ], }], [ 'skia_os == "mac"', { diff --git a/images.gyp b/images.gyp index 1441359..1bfd2d3 100644 --- a/images.gyp +++ b/images.gyp @@ -19,7 +19,6 @@ ], 'sources': [ '../include/images/SkBitmapFactory.h', - '../include/images/SkFlipPixelRef.h', '../include/images/SkImageDecoder.h', '../include/images/SkImageEncoder.h', '../include/images/SkImageRef.h', @@ -32,7 +31,6 @@ '../src/images/bmpdecoderhelper.h', '../src/images/SkBitmapFactory.cpp', '../src/images/SkFDStream.cpp', - '../src/images/SkFlipPixelRef.cpp', '../src/images/SkImageDecoder.cpp', '../src/images/SkImageDecoder_Factory.cpp', '../src/images/SkImageDecoder_libjpeg.cpp', -- cgit v1.2.3 From 949709f1e11ae92ada01066bb0539affc605f12c Mon Sep 17 00:00:00 2001 From: "junov@chromium.org" Date: Thu, 13 Dec 2012 16:39:53 +0000 Subject: Modifying SkTileGrid to support arbitrary query rectangles. Exposing SkTileGrid functionality in the public API through SkTileGridPicture. This patch also makes TileGrid and Rtree testable in gm, which revealed errors. TEST=gm with '--tileGrid' BUG=http://code.google.com/p/chromium/issues/detail?id=164636 Review URL: https://codereview.appspot.com/6933044 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@6783 2bbb7eff-a529-9590-31e7-b0007b416f81 --- core.gypi | 2 ++ 1 file changed, 2 insertions(+) diff --git a/core.gypi b/core.gypi index f3402b1..7a67224 100644 --- a/core.gypi +++ b/core.gypi @@ -164,6 +164,7 @@ '<(skia_src_path)/core/SkTextFormatParams.h', '<(skia_src_path)/core/SkTileGrid.cpp', '<(skia_src_path)/core/SkTileGrid.h', + '<(skia_src_path)/core/SkTileGridPicture.cpp', '<(skia_src_path)/core/SkTLList.h', '<(skia_src_path)/core/SkTLS.cpp', '<(skia_src_path)/core/SkTSearch.cpp', @@ -255,6 +256,7 @@ '<(skia_include_path)/core/SkTDStack.h', '<(skia_include_path)/core/SkTDict.h', '<(skia_include_path)/core/SkTInternalLList.h', + '<(skia_include_path)/core/SkTileGridPicture.h', '<(skia_include_path)/core/SkTRegistry.h', '<(skia_include_path)/core/SkTScopedPtr.h', '<(skia_include_path)/core/SkTSearch.h', -- cgit v1.2.3 From 6f9024d31ad8e93bd2ffbf97546d77b2492ac1c9 Mon Sep 17 00:00:00 2001 From: "djsollen@google.com" Date: Thu, 13 Dec 2012 18:27:44 +0000 Subject: Fix android build by removing references to the old sampleApp Review URL: https://codereview.appspot.com/6949045 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@6786 2bbb7eff-a529-9590-31e7-b0007b416f81 --- SampleApp.gyp | 2 +- android_system.gyp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/SampleApp.gyp b/SampleApp.gyp index 8e8fec2..9bc67c2 100644 --- a/SampleApp.gyp +++ b/SampleApp.gyp @@ -280,7 +280,7 @@ 'experimental.gyp:experimental', ], 'dependencies': [ - 'android_system.gyp:SampleAppAndroid', + 'android_deps.gyp:Android_EntryPoint', ], }], [ 'skia_gpu == 1', { diff --git a/android_system.gyp b/android_system.gyp index a2a9a0a..57f973a 100644 --- a/android_system.gyp +++ b/android_system.gyp @@ -15,6 +15,6 @@ # variable expansion step for gyp happens after the includes are processed. { 'includes': [ - '../../android/gyp/android.gypi', + '../../android/gyp/skia_android.gypi', ], } -- cgit v1.2.3 From e6a465861ec453b9bbc6ff49002558779c5c69c3 Mon Sep 17 00:00:00 2001 From: "djsollen@google.com" Date: Thu, 13 Dec 2012 20:07:21 +0000 Subject: Fix Android SampleApp Review URL: https://codereview.appspot.com/6949046 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@6792 2bbb7eff-a529-9590-31e7-b0007b416f81 --- SampleApp.gyp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SampleApp.gyp b/SampleApp.gyp index 9bc67c2..715ef3b 100644 --- a/SampleApp.gyp +++ b/SampleApp.gyp @@ -280,7 +280,7 @@ 'experimental.gyp:experimental', ], 'dependencies': [ - 'android_deps.gyp:Android_EntryPoint', + 'android_deps.gyp:Android_SampleApp', ], }], [ 'skia_gpu == 1', { -- cgit v1.2.3 From 0e754a7c3dd54b356b9959ba5bfa42c5a5878c89 Mon Sep 17 00:00:00 2001 From: "mike@reedtribe.org" Date: Mon, 17 Dec 2012 02:10:42 +0000 Subject: add gm for rrect, and rrect.inset/outset git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@6832 2bbb7eff-a529-9590-31e7-b0007b416f81 --- gmslides.gypi | 1 + 1 file changed, 1 insertion(+) diff --git a/gmslides.gypi b/gmslides.gypi index 047f02e..8c026aa 100644 --- a/gmslides.gypi +++ b/gmslides.gypi @@ -62,6 +62,7 @@ '../gm/points.cpp', '../gm/poly2poly.cpp', '../gm/quadpaths.cpp', + '../gm/rrect.cpp', '../gm/samplerstress.cpp', '../gm/shaderbounds.cpp', '../gm/shadertext.cpp', -- cgit v1.2.3 From 8d7c2d79445d433e43c234a34e2e39dfbf806722 Mon Sep 17 00:00:00 2001 From: "epoger@google.com" Date: Mon, 17 Dec 2012 15:27:30 +0000 Subject: Add --writeJsonSummary option to gm This writes out a JSON file containing expected and actual checksum values for every test. Next step: allow the same checksum file to be compared against, instead of PNG files. Review URL: https://codereview.appspot.com/6940053 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@6843 2bbb7eff-a529-9590-31e7-b0007b416f81 --- gm.gyp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/gm.gyp b/gm.gyp index 6f0fc3d..2dd9aa3 100644 --- a/gm.gyp +++ b/gm.gyp @@ -10,6 +10,7 @@ 'include_dirs' : [ '../src/core', '../src/pipe/utils/', + '../src/utils/', ], 'includes': [ 'gmslides.gypi', @@ -26,6 +27,8 @@ 'effects.gyp:effects', 'images.gyp:images', 'pdf.gyp:pdf', + 'utils.gyp:utils', + '../third_party/externals/jsoncpp/jsoncpp.gyp:jsoncpp', ], 'conditions': [ ['skia_os == "mac"', { -- cgit v1.2.3 From 0b473018b27c318e9809af528fb95feee9c90c77 Mon Sep 17 00:00:00 2001 From: "epoger@google.com" Date: Mon, 17 Dec 2012 18:23:58 +0000 Subject: Roll out r6843 to hopefully fix Windows builds BUG=https://code.google.com/p/skia/issues/detail?id=1023 TBR=borenet Review URL: https://codereview.appspot.com/6942061 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@6849 2bbb7eff-a529-9590-31e7-b0007b416f81 --- gm.gyp | 3 --- 1 file changed, 3 deletions(-) diff --git a/gm.gyp b/gm.gyp index 2dd9aa3..6f0fc3d 100644 --- a/gm.gyp +++ b/gm.gyp @@ -10,7 +10,6 @@ 'include_dirs' : [ '../src/core', '../src/pipe/utils/', - '../src/utils/', ], 'includes': [ 'gmslides.gypi', @@ -27,8 +26,6 @@ 'effects.gyp:effects', 'images.gyp:images', 'pdf.gyp:pdf', - 'utils.gyp:utils', - '../third_party/externals/jsoncpp/jsoncpp.gyp:jsoncpp', ], 'conditions': [ ['skia_os == "mac"', { -- cgit v1.2.3 From dafed3ed4c777ad60d3188d02a2714a3a253c458 Mon Sep 17 00:00:00 2001 From: "sugoi@google.com" Date: Mon, 17 Dec 2012 21:16:45 +0000 Subject: Follow up on the previous patch : - Moved the SkStrokeRec class in its own file - Replaced SkStroke by SkStrokeRec in Ganesh - Moved path stroking to the Ganesh level in some cases (everytime it isn't required to do it directly in SkGpuDevice). PathEffect and MaskFilter still require path stroking at the SkGpuDevice for now. - Renamed static functions in SkPath with proper names * No functionality shold have changed with this patch. This is a step towards enabling Ganesh Path Renderers to decide whether or not to stroke the path rather than always receiving the stroked path as an input argument. BUG=chromium:135111 TEST=Try path rendering tests from the gm Review URL: https://codereview.appspot.com/6946072 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@6861 2bbb7eff-a529-9590-31e7-b0007b416f81 --- core.gypi | 2 ++ 1 file changed, 2 insertions(+) diff --git a/core.gypi b/core.gypi index 7a67224..4830645 100644 --- a/core.gypi +++ b/core.gypi @@ -158,6 +158,7 @@ '<(skia_src_path)/core/SkString.cpp', '<(skia_src_path)/core/SkStroke.h', '<(skia_src_path)/core/SkStroke.cpp', + '<(skia_src_path)/core/SkStrokeRec.cpp', '<(skia_src_path)/core/SkStrokerPriv.cpp', '<(skia_src_path)/core/SkStrokerPriv.h', '<(skia_src_path)/core/SkTemplatesPriv.h', @@ -251,6 +252,7 @@ '<(skia_include_path)/core/SkShader.h', '<(skia_include_path)/core/SkStream.h', '<(skia_include_path)/core/SkString.h', + '<(skia_include_path)/core/SkStrokeRec.h', '<(skia_include_path)/core/SkTArray.h', '<(skia_include_path)/core/SkTDArray.h', '<(skia_include_path)/core/SkTDStack.h', -- cgit v1.2.3 From c5b884d3bab4848537af069ab3f159e75f34da58 Mon Sep 17 00:00:00 2001 From: "robertphillips@google.com" Date: Mon, 17 Dec 2012 21:48:19 +0000 Subject: Add RRect GM https://codereview.appspot.com/6945063/ git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@6866 2bbb7eff-a529-9590-31e7-b0007b416f81 --- gmslides.gypi | 1 + 1 file changed, 1 insertion(+) diff --git a/gmslides.gypi b/gmslides.gypi index 8c026aa..1553e74 100644 --- a/gmslides.gypi +++ b/gmslides.gypi @@ -63,6 +63,7 @@ '../gm/poly2poly.cpp', '../gm/quadpaths.cpp', '../gm/rrect.cpp', + '../gm/rrects.cpp', '../gm/samplerstress.cpp', '../gm/shaderbounds.cpp', '../gm/shadertext.cpp', -- cgit v1.2.3 From ceb29c1c6ad9894ca412d8335d0f63e53633a36f Mon Sep 17 00:00:00 2001 From: "jvanverth@google.com" Date: Tue, 18 Dec 2012 14:13:46 +0000 Subject: Add AndroidPathRenderer to experimental gyp and get it compiling with Skia code. https://codereview.appspot.com/6938074/ git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@6874 2bbb7eff-a529-9590-31e7-b0007b416f81 --- experimental.gyp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/experimental.gyp b/experimental.gyp index 09711ac..09d5944 100644 --- a/experimental.gyp +++ b/experimental.gyp @@ -6,11 +6,13 @@ 'include_dirs': [ '../include/config', '../include/core', + '../experimental/AndroidPathRenderer', ], 'sources': [ '../experimental/SkSetPoly3To3.cpp', '../experimental/SkSetPoly3To3_A.cpp', '../experimental/SkSetPoly3To3_D.cpp', + '../experimental/AndroidPathRenderer/AndroidPathRenderer.cpp', ], 'direct_dependent_settings': { 'include_dirs': [ -- cgit v1.2.3 From 13620141f9ffc0c75bab214231aa725ffa71d78d Mon Sep 17 00:00:00 2001 From: "epoger@google.com" Date: Tue, 18 Dec 2012 19:13:49 +0000 Subject: Re-land r6843 with copied gyp file to (hopefully) fix Windows build BUG=https://code.google.com/p/skia/issues/detail?id=1023 Review URL: https://codereview.appspot.com/6943073 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@6880 2bbb7eff-a529-9590-31e7-b0007b416f81 --- gm.gyp | 3 +++ jsoncpp.gyp | 56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 59 insertions(+) create mode 100644 jsoncpp.gyp diff --git a/gm.gyp b/gm.gyp index 6f0fc3d..4f8637f 100644 --- a/gm.gyp +++ b/gm.gyp @@ -10,6 +10,7 @@ 'include_dirs' : [ '../src/core', '../src/pipe/utils/', + '../src/utils/', ], 'includes': [ 'gmslides.gypi', @@ -25,7 +26,9 @@ 'skia_base_libs.gyp:skia_base_libs', 'effects.gyp:effects', 'images.gyp:images', + 'jsoncpp.gyp:jsoncpp', 'pdf.gyp:pdf', + 'utils.gyp:utils', ], 'conditions': [ ['skia_os == "mac"', { diff --git a/jsoncpp.gyp b/jsoncpp.gyp new file mode 100644 index 0000000..71815a7 --- /dev/null +++ b/jsoncpp.gyp @@ -0,0 +1,56 @@ +# Copyright (c) 2012 The Chromium Authors. All rights reserved. +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE file. + +# TODO: This file was copied from the external dependency +# third_party/externals/jsoncpp/jsoncpp.gyp , at revision 125399, +# with directory paths modified to work at this level. +# +# It would be better for us to depend on that gypfile within the external +# dependency, but so far we have been unable to make that work reliably. +# See https://code.google.com/p/skia/issues/detail?id=1023 + +{ + 'targets': [ + { + 'target_name': 'jsoncpp', + 'type': 'static_library', + 'defines': [ + 'JSON_USE_EXCEPTION=0', + ], + 'sources': [ + '../third_party/externals/jsoncpp/source/include/json/assertions.h', + '../third_party/externals/jsoncpp/source/include/json/autolink.h', + '../third_party/externals/jsoncpp/source/include/json/config.h', + '../third_party/externals/jsoncpp/source/include/json/features.h', + '../third_party/externals/jsoncpp/source/include/json/forwards.h', + '../third_party/externals/jsoncpp/source/include/json/json.h', + '../third_party/externals/jsoncpp/source/include/json/reader.h', + '../third_party/externals/jsoncpp/overrides/include/json/value.h', + '../third_party/externals/jsoncpp/source/include/json/writer.h', + '../third_party/externals/jsoncpp/source/src/lib_json/json_batchallocator.h', + '../third_party/externals/jsoncpp/source/src/lib_json/json_reader.cpp', + '../third_party/externals/jsoncpp/source/src/lib_json/json_tool.h', + '../third_party/externals/jsoncpp/overrides/src/lib_json/json_value.cpp', + '../third_party/externals/jsoncpp/source/src/lib_json/json_writer.cpp', + ], + 'include_dirs': [ + '../third_party/externals/jsoncpp/overrides/include/', + '../third_party/externals/jsoncpp/source/include/', + '../third_party/externals/jsoncpp/source/src/lib_json/', + ], + 'direct_dependent_settings': { + 'include_dirs': [ + '../third_party/externals/jsoncpp/overrides/include/', + '../third_party/externals/jsoncpp/source/include/', + ], + }, + }, + ], +} + +# Local Variables: +# tab-width:2 +# indent-tabs-mode:nil +# End: +# vim: set expandtab tabstop=2 shiftwidth=2: -- cgit v1.2.3 From 4a1d385597c2ddb4e8226d8cc1ddf7753aa30d81 Mon Sep 17 00:00:00 2001 From: "bsalomon@google.com" Date: Thu, 20 Dec 2012 14:18:10 +0000 Subject: Simplify cache IDs and keys. R=robertphillips@google.com Review URL: https://codereview.appspot.com/6954047 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@6914 2bbb7eff-a529-9590-31e7-b0007b416f81 --- gpu.gypi | 1 - 1 file changed, 1 deletion(-) diff --git a/gpu.gypi b/gpu.gypi index 7d3c0f2..9bfe572 100644 --- a/gpu.gypi +++ b/gpu.gypi @@ -10,7 +10,6 @@ 'gr_sources': [ '<(skia_include_path)/gpu/GrAARectRenderer.h', '<(skia_include_path)/gpu/GrBackendEffectFactory.h', - '<(skia_include_path)/gpu/GrCacheID.h', '<(skia_include_path)/gpu/GrClipData.h', '<(skia_include_path)/gpu/GrColor.h', '<(skia_include_path)/gpu/GrConfig.h', -- cgit v1.2.3 From eef290eabfa90916b07fd3767afc0a68597bfed6 Mon Sep 17 00:00:00 2001 From: "bsalomon@google.com" Date: Thu, 20 Dec 2012 14:23:26 +0000 Subject: Revert 6914 to fix build issues. git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@6915 2bbb7eff-a529-9590-31e7-b0007b416f81 --- gpu.gypi | 1 + 1 file changed, 1 insertion(+) diff --git a/gpu.gypi b/gpu.gypi index 9bfe572..7d3c0f2 100644 --- a/gpu.gypi +++ b/gpu.gypi @@ -10,6 +10,7 @@ 'gr_sources': [ '<(skia_include_path)/gpu/GrAARectRenderer.h', '<(skia_include_path)/gpu/GrBackendEffectFactory.h', + '<(skia_include_path)/gpu/GrCacheID.h', '<(skia_include_path)/gpu/GrClipData.h', '<(skia_include_path)/gpu/GrColor.h', '<(skia_include_path)/gpu/GrConfig.h', -- cgit v1.2.3 From 7e1d5f3584109e4c2458744c335fcce090b0e15e Mon Sep 17 00:00:00 2001 From: "bsalomon@google.com" Date: Thu, 20 Dec 2012 15:13:01 +0000 Subject: Reland 6914 w/ fixes. git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@6916 2bbb7eff-a529-9590-31e7-b0007b416f81 --- gpu.gypi | 1 - 1 file changed, 1 deletion(-) diff --git a/gpu.gypi b/gpu.gypi index 7d3c0f2..9bfe572 100644 --- a/gpu.gypi +++ b/gpu.gypi @@ -10,7 +10,6 @@ 'gr_sources': [ '<(skia_include_path)/gpu/GrAARectRenderer.h', '<(skia_include_path)/gpu/GrBackendEffectFactory.h', - '<(skia_include_path)/gpu/GrCacheID.h', '<(skia_include_path)/gpu/GrClipData.h', '<(skia_include_path)/gpu/GrColor.h', '<(skia_include_path)/gpu/GrConfig.h', -- cgit v1.2.3 From 7681809744445c93a4c2e243aa6668dde3dae457 Mon Sep 17 00:00:00 2001 From: "mike@reedtribe.org" Date: Sat, 22 Dec 2012 20:54:18 +0000 Subject: add SampleRotatedCircles.cpp git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@6933 2bbb7eff-a529-9590-31e7-b0007b416f81 --- SampleApp.gyp | 1 + 1 file changed, 1 insertion(+) diff --git a/SampleApp.gyp b/SampleApp.gyp index 715ef3b..a831f74 100644 --- a/SampleApp.gyp +++ b/SampleApp.gyp @@ -81,6 +81,7 @@ '../samplecode/SamplePolyToPoly.cpp', '../samplecode/SampleRegion.cpp', '../samplecode/SampleRepeatTile.cpp', + '../samplecode/SampleRotateCircles.cpp', '../samplecode/SampleShaders.cpp', '../samplecode/SampleShaderText.cpp', '../samplecode/SampleSkLayer.cpp', -- cgit v1.2.3 From 12842dd2c46476c4400477ebde3bd85f82ef5643 Mon Sep 17 00:00:00 2001 From: "bsalomon@google.com" Date: Wed, 2 Jan 2013 19:57:10 +0000 Subject: Remove GrInstanceCounter. R=reed@google.com Review URL: https://codereview.appspot.com/6849125 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@6972 2bbb7eff-a529-9590-31e7-b0007b416f81 --- gpu.gypi | 1 - 1 file changed, 1 deletion(-) diff --git a/gpu.gypi b/gpu.gypi index 9bfe572..17708b1 100644 --- a/gpu.gypi +++ b/gpu.gypi @@ -20,7 +20,6 @@ '<(skia_include_path)/gpu/GrEffectUnitTest.h', '<(skia_include_path)/gpu/GrFontScaler.h', '<(skia_include_path)/gpu/GrGlyph.h', - '<(skia_include_path)/gpu/GrInstanceCounter.h', '<(skia_include_path)/gpu/GrKey.h', '<(skia_include_path)/gpu/GrNoncopyable.h', '<(skia_include_path)/gpu/GrPaint.h', -- cgit v1.2.3 From e9bc6fe3faa771fbfefbed41655c1c12b3d30af4 Mon Sep 17 00:00:00 2001 From: "caryclark@google.com" Date: Fri, 4 Jan 2013 19:41:13 +0000 Subject: shape ops work in progress git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@7031 2bbb7eff-a529-9590-31e7-b0007b416f81 --- shapeops_edge.gyp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/shapeops_edge.gyp b/shapeops_edge.gyp index 8542876..4066d4b 100644 --- a/shapeops_edge.gyp +++ b/shapeops_edge.gyp @@ -29,6 +29,8 @@ '../experimental/Intersection/CubicReduceOrder.cpp', '../experimental/Intersection/CubicReduceOrder_Test.cpp', '../experimental/Intersection/CubicSubDivide.cpp', + '../experimental/Intersection/CubicToQuadratics.cpp', + '../experimental/Intersection/CubicToQuadratics_Test.cpp', '../experimental/Intersection/CubicUtilities.cpp', '../experimental/Intersection/DataTypes.cpp', '../experimental/Intersection/EdgeMain.cpp', -- cgit v1.2.3 From 9d8008746b948fa2aace4fcf38414a9a3f38cab9 Mon Sep 17 00:00:00 2001 From: "humper@google.com" Date: Fri, 4 Jan 2013 20:29:03 +0000 Subject: Added a new function to directly generate a blurred rectangle analytically. Added two new microbenchmarks to demonstrate speedup over existing BlurSeparable approach. Added new GM tests for blurred rectangles. Review URL: https://codereview.appspot.com/7037050 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@7034 2bbb7eff-a529-9590-31e7-b0007b416f81 --- SampleApp.gyp | 1 + bench.gyp | 1 + bench.gypi | 1 + gm.gyp | 1 + 4 files changed, 4 insertions(+) diff --git a/SampleApp.gyp b/SampleApp.gyp index a831f74..02405f8 100644 --- a/SampleApp.gyp +++ b/SampleApp.gyp @@ -6,6 +6,7 @@ 'mac_bundle' : 1, 'include_dirs' : [ '../src/core', # needed to get SkConcaveToTriangle, maybe this should be moved to include dir? + '../src/effects', #needed for BlurMask.h '../gm', # needed to pull gm.h '../samplecode', # To pull SampleApp.h and SampleCode.h '../src/pipe/utils', # For TiledPipeController diff --git a/bench.gyp b/bench.gyp index 1524b72..0c19781 100644 --- a/bench.gyp +++ b/bench.gyp @@ -25,6 +25,7 @@ { 'include_dirs' : [ '../src/gpu', + '../src/effects', ], }, ], diff --git a/bench.gypi b/bench.gypi index dbb30b6..3d98619 100644 --- a/bench.gypi +++ b/bench.gypi @@ -10,6 +10,7 @@ '../bench/BitmapBench.cpp', '../bench/BitmapRectBench.cpp', '../bench/BlurBench.cpp', + '../bench/BlurRectBench.cpp', '../bench/ChecksumBench.cpp', '../bench/ChromeBench.cpp', '../bench/DashBench.cpp', diff --git a/gm.gyp b/gm.gyp index 4f8637f..4b2b1c4 100644 --- a/gm.gyp +++ b/gm.gyp @@ -9,6 +9,7 @@ 'type': 'executable', 'include_dirs' : [ '../src/core', + '../src/effects', '../src/pipe/utils/', '../src/utils/', ], -- cgit v1.2.3 From 32c025454cafbf02c5a6c98571f024ca4caca6a9 Mon Sep 17 00:00:00 2001 From: "reed@google.com" Date: Fri, 4 Jan 2013 23:06:44 +0000 Subject: move include of src/effects into general, and out of gpu-specific git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@7037 2bbb7eff-a529-9590-31e7-b0007b416f81 --- bench.gyp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bench.gyp b/bench.gyp index 0c19781..9690f32 100644 --- a/bench.gyp +++ b/bench.gyp @@ -10,6 +10,7 @@ 'type': 'executable', 'include_dirs' : [ '../src/core', + '../src/effects', ], 'includes': [ 'bench.gypi' @@ -25,7 +26,6 @@ { 'include_dirs' : [ '../src/gpu', - '../src/effects', ], }, ], -- cgit v1.2.3 From 54626a18eb2d9ba77cf0f1a074c79fa641d87fd7 Mon Sep 17 00:00:00 2001 From: "sugoi@google.com" Date: Mon, 7 Jan 2013 14:26:40 +0000 Subject: This CL introduces a new path renderer. Here are the characteristics : - It uses the original path, before stroking - It supports traight lines only (no curves) - It supports butt or square caps only - It supports miter or bevel joins only - No AA support Support for these will be added step by step later on. A first pass at the benchmarks on my linux machine gave me these approximate speed improvements (running all bench with the option '--forceAA 0') : path_stroke_small_long_line 4X path_stroke_small_sawtooth 4X path_stroke_big_rect 4X path_stroke_small_rect 6X path_stroke_big_triangle 4X path_stroke_small_triangle 10X lines_1_BW 1.5X dashline_2_square 1.5X dashline_1_square 1.5X Also note that I can't submit this code until GrDrawTarget::isOpaque() is implemented, unless I just disable my renderer completely for now. BUG=chromium:135111 TEST=The following gms are affected and may require rebaselining : lineclosepath, linepath, strokes_poly Review URL: https://codereview.appspot.com/7026049 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@7047 2bbb7eff-a529-9590-31e7-b0007b416f81 --- common_variables.gypi | 2 ++ gpu.gyp | 9 +++++++++ 2 files changed, 11 insertions(+) diff --git a/common_variables.gypi b/common_variables.gypi index 042340b..fc2b3a9 100644 --- a/common_variables.gypi +++ b/common_variables.gypi @@ -81,6 +81,7 @@ 'skia_scalar%': 'float', 'skia_mesa%': 0, 'skia_nv_path_rendering%': 0, + 'skia_stroke_path_rendering%': 0, 'skia_texture_cache_mb_limit%': 0, 'skia_angle%': 0, 'skia_directwrite%': 0, @@ -101,6 +102,7 @@ 'skia_scalar%': '<(skia_scalar)', 'skia_mesa%': '<(skia_mesa)', 'skia_nv_path_rendering%': '<(skia_nv_path_rendering)', + 'skia_stroke_path_rendering%': '<(skia_stroke_path_rendering)', 'skia_texture_cache_mb_limit%': '<(skia_texture_cache_mb_limit)', 'skia_angle%': '<(skia_angle)', 'skia_arch_width%': '<(skia_arch_width)', diff --git a/gpu.gyp b/gpu.gyp index d5223e4..474bdc1 100644 --- a/gpu.gyp +++ b/gpu.gyp @@ -205,6 +205,15 @@ 'GR_GL_USE_NV_PATH_RENDERING=1', ], }], + [ 'skia_stroke_path_rendering', { + 'sources': [ + '../experimental/StrokePathRenderer/GrStrokePathRenderer.h', + '../experimental/StrokePathRenderer/GrStrokePathRenderer.cpp', + ], + 'defines': [ + 'GR_STROKE_PATH_RENDERING=1', + ], + }], [ 'skia_os == "linux"', { 'sources!': [ '../src/gpu/gl/GrGLDefaultInterface_none.cpp', -- cgit v1.2.3 From 6fec68961482d5a213f5ab4c1df2598862734b36 Mon Sep 17 00:00:00 2001 From: "humper@google.com" Date: Mon, 7 Jan 2013 15:48:19 +0000 Subject: Show the paint's typeface information in the details pane of the debugger. Also add a convenience constructor for SkMemoryStream that takes the SkData directly (instead of having to construct an empty one and call setData). Review URL: https://codereview.appspot.com/7065045 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@7048 2bbb7eff-a529-9590-31e7-b0007b416f81 --- debugger.gyp | 1 + 1 file changed, 1 insertion(+) diff --git a/debugger.gyp b/debugger.gyp index 5c760db..40ce090 100644 --- a/debugger.gyp +++ b/debugger.gyp @@ -81,6 +81,7 @@ '../debugger', # To pull SkDebugger.h '../debugger/QT', # For all the QT UI Goodies '../src/gpu', # To pull gl/GrGLUtil.h + '../src/ports', # To pull SkFontDescriptor.h '../bench', '../tools', '<@(qt_includes)', -- cgit v1.2.3 From 64cc85d0f6733613ba2af6cd696fa65fe87379f7 Mon Sep 17 00:00:00 2001 From: "humper@google.com" Date: Mon, 7 Jan 2013 16:47:43 +0000 Subject: eliminate all warnings in non-thirdparty code on mac Most of these issues were due to functions whose definitions appear in header files; I changed those functions to be 'static inline' instead of just 'static' or 'inline', which kills the warning for such functions. Other functions that were static or anonymous-namespaced but were unused in cpp files were probably called at some point but are no longer; someone who knows more than I do should probably scrub all the functions I either deleted or #if 0'ed out and make sure that the right thing is happening here. Lots of unused variables removed, and one nasty const issue handled. There remains a single warning in thirdparty/externals/cityhash/src/city.cc on line 146 related to a signed/unsigned mismatch. I don't know if we have control over this library so I didn't fix this one, but perhaps someone could do something about that one. BUG= Review URL: https://codereview.appspot.com/7067044 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@7051 2bbb7eff-a529-9590-31e7-b0007b416f81 --- common_conditions.gypi | 1 + utils.gyp | 5 +++++ 2 files changed, 6 insertions(+) diff --git a/common_conditions.gypi b/common_conditions.gypi index 332d342..c15ee47 100644 --- a/common_conditions.gypi +++ b/common_conditions.gypi @@ -222,6 +222,7 @@ 'GCC_WARN_UNUSED_VALUE': 'YES', 'GCC_WARN_UNUSED_VARIABLE': 'YES', 'OTHER_CPLUSPLUSFLAGS': [ + '-Werror', '-mssse3', '-fvisibility=hidden', '-fvisibility-inlines-hidden', diff --git a/utils.gyp b/utils.gyp index 4e3f6d4..8d87d15 100644 --- a/utils.gyp +++ b/utils.gyp @@ -211,6 +211,11 @@ '../src/utils/cityhash', '../third_party/externals/cityhash/src', ], + 'xcode_settings': { + 'OTHER_CPLUSPLUSFLAGS!': [ + '-Werror', + ] + }, 'sources': [ '../third_party/externals/cityhash/src/city.cc', ], -- cgit v1.2.3 From 9815db1a4b179d2875f43a8399b2c059b86f4d0b Mon Sep 17 00:00:00 2001 From: "bsalomon@google.com" Date: Mon, 7 Jan 2013 17:23:00 +0000 Subject: Remove GrTDArray. Two dynamic array classes is enough. R=reed@google.com Review URL: https://codereview.appspot.com/7069047 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@7053 2bbb7eff-a529-9590-31e7-b0007b416f81 --- gpu.gypi | 1 - 1 file changed, 1 deletion(-) diff --git a/gpu.gypi b/gpu.gypi index 17708b1..3248f03 100644 --- a/gpu.gypi +++ b/gpu.gypi @@ -105,7 +105,6 @@ '<(skia_src_path)/gpu/GrStencilBuffer.cpp', '<(skia_src_path)/gpu/GrStencilBuffer.h', '<(skia_src_path)/gpu/GrTBSearch.h', - '<(skia_src_path)/gpu/GrTDArray.h', '<(skia_src_path)/gpu/GrSWMaskHelper.cpp', '<(skia_src_path)/gpu/GrSWMaskHelper.h', '<(skia_src_path)/gpu/GrSoftwarePathRenderer.cpp', -- cgit v1.2.3 From 35991ed9917824d711e32ac7cd32b4163a88a557 Mon Sep 17 00:00:00 2001 From: "humper@google.com" Date: Mon, 7 Jan 2013 19:02:46 +0000 Subject: hopefully fix gyp mistake for iOS BUG= Review URL: https://codereview.appspot.com/7065052 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@7058 2bbb7eff-a529-9590-31e7-b0007b416f81 --- utils.gyp | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/utils.gyp b/utils.gyp index 8d87d15..c76bb7e 100644 --- a/utils.gyp +++ b/utils.gyp @@ -211,11 +211,6 @@ '../src/utils/cityhash', '../third_party/externals/cityhash/src', ], - 'xcode_settings': { - 'OTHER_CPLUSPLUSFLAGS!': [ - '-Werror', - ] - }, 'sources': [ '../third_party/externals/cityhash/src/city.cc', ], @@ -224,6 +219,15 @@ '../third_party/externals/cityhash/src', ], }, + 'conditions': [ + [ 'skia_os == "mac"', { + 'xcode_settings': { + 'OTHER_CPLUSPLUSFLAGS!': [ + '-Werror', + ] + }, + }], + ], }, ], } -- cgit v1.2.3 From 0c167b3ce2712329262672d328a451743a7c047c Mon Sep 17 00:00:00 2001 From: "humper@google.com" Date: Mon, 7 Jan 2013 20:28:16 +0000 Subject: disable werror on 64 bit BUG= Review URL: https://codereview.appspot.com/7057057 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@7066 2bbb7eff-a529-9590-31e7-b0007b416f81 --- common_conditions.gypi | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/common_conditions.gypi b/common_conditions.gypi index c15ee47..a14be76 100644 --- a/common_conditions.gypi +++ b/common_conditions.gypi @@ -181,6 +181,9 @@ ['skia_arch_width == 32', { 'xcode_settings': { 'ARCHS': 'i386', + 'OTHER_CPLUSPLUSFLAGS': [ + '-Werror', + ], }, }], ], @@ -222,7 +225,6 @@ 'GCC_WARN_UNUSED_VALUE': 'YES', 'GCC_WARN_UNUSED_VARIABLE': 'YES', 'OTHER_CPLUSPLUSFLAGS': [ - '-Werror', '-mssse3', '-fvisibility=hidden', '-fvisibility-inlines-hidden', -- cgit v1.2.3 From 56b73be0642e21e71cb823388b67065c90e59fb7 Mon Sep 17 00:00:00 2001 From: "reed@google.com" Date: Mon, 7 Jan 2013 20:51:13 +0000 Subject: disable warnings-as-error for JSON code, which has warnings (at least on mac) Review URL: https://codereview.appspot.com/7064053 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@7068 2bbb7eff-a529-9590-31e7-b0007b416f81 --- jsoncpp.gyp | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/jsoncpp.gyp b/jsoncpp.gyp index 71815a7..f9f5eef 100644 --- a/jsoncpp.gyp +++ b/jsoncpp.gyp @@ -45,6 +45,15 @@ '../third_party/externals/jsoncpp/source/include/', ], }, + 'conditions': [ + [ 'skia_os == "mac"', { + 'xcode_settings': { + 'OTHER_CPLUSPLUSFLAGS!': [ + '-Werror', + ] + }, + }], + ], }, ], } -- cgit v1.2.3 From 6840cd0d1861ba22ac51e6cef86e8db497428379 Mon Sep 17 00:00:00 2001 From: "bsalomon@google.com" Date: Tue, 8 Jan 2013 20:31:53 +0000 Subject: Enable warnings-as-errors on Windows. Review URL: https://codereview.appspot.com/7066054 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@7094 2bbb7eff-a529-9590-31e7-b0007b416f81 --- common_conditions.gypi | 2 +- jsoncpp.gyp | 7 +++++++ utils.gyp | 7 +++++++ 3 files changed, 15 insertions(+), 1 deletion(-) diff --git a/common_conditions.gypi b/common_conditions.gypi index a14be76..e28985f 100644 --- a/common_conditions.gypi +++ b/common_conditions.gypi @@ -30,7 +30,7 @@ 'msvs_settings': { 'VCCLCompilerTool': { 'WarningLevel': '1', - 'WarnAsError': 'false', + 'WarnAsError': 'true', 'DebugInformationFormat': '3', 'AdditionalOptions': [ '/MP' ], }, diff --git a/jsoncpp.gyp b/jsoncpp.gyp index f9f5eef..34f05e5 100644 --- a/jsoncpp.gyp +++ b/jsoncpp.gyp @@ -53,6 +53,13 @@ ] }, }], + [ 'skia_os == "win"', { + 'msvs_settings': { + 'VCCLCompilerTool': { + 'WarnAsError': 'false', + }, + }, + }], ], }, ], diff --git a/utils.gyp b/utils.gyp index c76bb7e..cd44769 100644 --- a/utils.gyp +++ b/utils.gyp @@ -227,6 +227,13 @@ ] }, }], + [ 'skia_os == "win"', { + 'msvs_settings': { + 'VCCLCompilerTool': { + 'WarnAsError': 'false', + }, + }, + }], ], }, ], -- cgit v1.2.3 From d23163a1d1ac9a09e546e5dd55da298046b0c66f Mon Sep 17 00:00:00 2001 From: "bsalomon@google.com" Date: Tue, 8 Jan 2013 20:40:22 +0000 Subject: Turn off warnings-as-error on 64bit windows build due to many size_t-related warnings. git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@7095 2bbb7eff-a529-9590-31e7-b0007b416f81 --- common_conditions.gypi | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/common_conditions.gypi b/common_conditions.gypi index e28985f..51865bf 100644 --- a/common_conditions.gypi +++ b/common_conditions.gypi @@ -30,7 +30,6 @@ 'msvs_settings': { 'VCCLCompilerTool': { 'WarningLevel': '1', - 'WarnAsError': 'true', 'DebugInformationFormat': '3', 'AdditionalOptions': [ '/MP' ], }, @@ -89,10 +88,20 @@ }, 'conditions' : [ ['skia_arch_width == 64', { - 'msvs_configuration_platform': 'x64' + 'msvs_configuration_platform': 'x64', + 'msvs_settings': { + 'VCCLCompilerTool': { + 'WarnAsError': 'false', + }, + }, }], ['skia_arch_width == 32', { 'msvs_configuration_platform': 'Win32', + 'msvs_settings': { + 'VCCLCompilerTool': { + 'WarnAsError': 'true', + }, + }, }], ], }, -- cgit v1.2.3 From ddf324280b90c1017d24ab35fc496a7a969b0fc6 Mon Sep 17 00:00:00 2001 From: "bsalomon@google.com" Date: Tue, 8 Jan 2013 21:46:05 +0000 Subject: Turn off WarnAsError when building ANGLE projects on windows. git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@7096 2bbb7eff-a529-9590-31e7-b0007b416f81 --- angle.gyp | 1 + common_conditions.gypi | 28 +++++++++++++++++++++++----- 2 files changed, 24 insertions(+), 5 deletions(-) diff --git a/angle.gyp b/angle.gyp index 70ab5c2..088895b 100644 --- a/angle.gyp +++ b/angle.gyp @@ -10,6 +10,7 @@ }, 'variables': { 'component': 'static_library', + 'skia_building_angle': 1, # See comment in common_conditions.gypi. }, 'includes': [ '../third_party/externals/angle/src/build_angle.gypi', diff --git a/common_conditions.gypi b/common_conditions.gypi index 51865bf..0e13333 100644 --- a/common_conditions.gypi +++ b/common_conditions.gypi @@ -96,12 +96,30 @@ }, }], ['skia_arch_width == 32', { - 'msvs_configuration_platform': 'Win32', - 'msvs_settings': { - 'VCCLCompilerTool': { - 'WarnAsError': 'true', - }, + # This gypi file will be included directly into the gyp(i) files in the angle repo by + # our gyp_skia script. We don't want force WarnAsError on angle. So angle.gyp defines + # skia_building_angle=1 and here we select whether to enable WarnAsError based on that + # var's value. Here it defaults to 0. + 'variables' : { + 'skia_building_angle%': 0, }, + 'conditions' : [ + ['skia_building_angle', { + 'msvs_configuration_platform': 'Win32', + 'msvs_settings': { + 'VCCLCompilerTool': { + 'WarnAsError': 'false', + }, + }, + },{ # not angle + 'msvs_configuration_platform': 'Win32', + 'msvs_settings': { + 'VCCLCompilerTool': { + 'WarnAsError': 'true', + }, + }, + }], + ], }], ], }, -- cgit v1.2.3 From a586b3d2521ec38bf100247f0f5f7a842cf56556 Mon Sep 17 00:00:00 2001 From: "jvanverth@google.com" Date: Wed, 9 Jan 2013 21:04:52 +0000 Subject: This takes the convex path tesselator from the Android code and hooks it into a GrPathRenderer. GrAndroidPathRenderer is activated by gyp flag 'skia_android_path_rendering'. A few changes to get this to work: - Had to change SkPaint* param to SkStrokeRec& in ConvexPathVertices() - Had to copy the vertex buffer created by the Android code to GrDrawTarget-generated vertex buffer, and convert float alpha to GrColor for AA paths git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@7110 2bbb7eff-a529-9590-31e7-b0007b416f81 --- common_variables.gypi | 2 ++ experimental.gyp | 2 -- gpu.gyp | 12 ++++++++++++ 3 files changed, 14 insertions(+), 2 deletions(-) diff --git a/common_variables.gypi b/common_variables.gypi index fc2b3a9..5aca19c 100644 --- a/common_variables.gypi +++ b/common_variables.gypi @@ -82,6 +82,7 @@ 'skia_mesa%': 0, 'skia_nv_path_rendering%': 0, 'skia_stroke_path_rendering%': 0, + 'skia_android_path_rendering%': 0, 'skia_texture_cache_mb_limit%': 0, 'skia_angle%': 0, 'skia_directwrite%': 0, @@ -103,6 +104,7 @@ 'skia_mesa%': '<(skia_mesa)', 'skia_nv_path_rendering%': '<(skia_nv_path_rendering)', 'skia_stroke_path_rendering%': '<(skia_stroke_path_rendering)', + 'skia_android_path_rendering%': '<(skia_android_path_rendering)', 'skia_texture_cache_mb_limit%': '<(skia_texture_cache_mb_limit)', 'skia_angle%': '<(skia_angle)', 'skia_arch_width%': '<(skia_arch_width)', diff --git a/experimental.gyp b/experimental.gyp index 09d5944..09711ac 100644 --- a/experimental.gyp +++ b/experimental.gyp @@ -6,13 +6,11 @@ 'include_dirs': [ '../include/config', '../include/core', - '../experimental/AndroidPathRenderer', ], 'sources': [ '../experimental/SkSetPoly3To3.cpp', '../experimental/SkSetPoly3To3_A.cpp', '../experimental/SkSetPoly3To3_D.cpp', - '../experimental/AndroidPathRenderer/AndroidPathRenderer.cpp', ], 'direct_dependent_settings': { 'include_dirs': [ diff --git a/gpu.gyp b/gpu.gyp index 474bdc1..7438bab 100644 --- a/gpu.gyp +++ b/gpu.gyp @@ -214,6 +214,18 @@ 'GR_STROKE_PATH_RENDERING=1', ], }], + [ 'skia_android_path_rendering', { + 'sources': [ + '../experimental/AndroidPathRenderer/GrAndroidPathRenderer.cpp', + '../experimental/AndroidPathRenderer/GrAndroidPathRenderer.h', + '../experimental/AndroidPathRenderer/AndroidPathRenderer.cpp', + '../experimental/AndroidPathRenderer/AndroidPathRenderer.h', + '../experimental/AndroidPathRenderer/Vertex.h', + ], + 'defines': [ + 'GR_ANDROID_PATH_RENDERING=1', + ], + }], [ 'skia_os == "linux"', { 'sources!': [ '../src/gpu/gl/GrGLDefaultInterface_none.cpp', -- cgit v1.2.3 From 032ca788409f58002d22689a3785e621305cd234 Mon Sep 17 00:00:00 2001 From: "bsalomon@google.com" Date: Mon, 14 Jan 2013 16:46:26 +0000 Subject: Change signature of SkShader::asNewEffect(), implement for SkBitmapProcShader. Review URL: https://codereview.appspot.com/7086051 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@7153 2bbb7eff-a529-9590-31e7-b0007b416f81 --- core.gyp | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/core.gyp b/core.gyp index 14b14b0..eddb940 100644 --- a/core.gyp +++ b/core.gyp @@ -93,6 +93,12 @@ '../src/core/SkUtilsArm.h', ], }], + ['skia_gpu == 1', { + 'include_dirs': [ + '../include/gpu', + '../src/gpu', + ], + }], ], 'direct_dependent_settings': { 'include_dirs': [ -- cgit v1.2.3 From 72288f4d4730d43a43335256229c9294ec95b5f3 Mon Sep 17 00:00:00 2001 From: "humper@google.com" Date: Mon, 14 Jan 2013 18:49:19 +0000 Subject: Runtime configuration system for skia. This will allow developers to control settings at launch time without relying on compile-time flags or recompilation. It can be used to turn features on and off, as well as to control numeric quantities to 'tune' algorithms. Once I make sure it's working across all platforms I'll send out a quick tutorial on its use. Review URL: https://codereview.appspot.com/7098051 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@7158 2bbb7eff-a529-9590-31e7-b0007b416f81 --- common.gypi | 7 +++++++ core.gyp | 1 + gpu.gyp | 2 ++ utils.gyp | 2 ++ 4 files changed, 12 insertions(+) diff --git a/common.gypi b/common.gypi index 7dc27da..810a0f8 100644 --- a/common.gypi +++ b/common.gypi @@ -82,6 +82,7 @@ 'defines': [ 'SK_DEBUG', 'GR_DEBUG=1', + 'SK_DEVELOPER=1', ], }, 'Release': { @@ -90,6 +91,12 @@ 'GR_RELEASE=1', ], }, + 'Release_Developer': { + 'inherit_from': ['Release'], + 'defines': [ + 'SK_DEVELOPER=1', + ], + }, }, }, # end 'target_defaults' } diff --git a/core.gyp b/core.gyp index eddb940..7e7640c 100644 --- a/core.gyp +++ b/core.gyp @@ -17,6 +17,7 @@ '../include/core', '../include/pipe', '../include/ports', + '../include/utils', '../include/xml', '../src/core', '../src/image', diff --git a/gpu.gyp b/gpu.gyp index 7438bab..6c599e1 100644 --- a/gpu.gyp +++ b/gpu.gyp @@ -127,6 +127,7 @@ 'include_dirs': [ '../include/config', '../include/core', + '../include/utils', '../src/core', '../include/gpu', '../src/gpu', @@ -177,6 +178,7 @@ 'include_dirs': [ '../include/core', '../include/config', + '../include/utils', '../include/gpu', '../src/core', # SkRasterClip.h '../src/gpu' diff --git a/utils.gyp b/utils.gyp index cd44769..d4942d7 100644 --- a/utils.gyp +++ b/utils.gyp @@ -47,6 +47,7 @@ '../include/utils/SkParsePaint.h', '../include/utils/SkParsePath.h', '../include/utils/SkPictureUtils.h', + '../include/utils/SkRTConf.h', '../include/utils/SkProxyCanvas.h', '../include/utils/SkUnitMappers.h', '../include/utils/SkWGL.h', @@ -81,6 +82,7 @@ '../src/utils/SkParsePath.cpp', '../src/utils/SkPictureUtils.cpp', '../src/utils/SkProxyCanvas.cpp', + '../src/utils/SkRTConf.cpp', '../src/utils/SkThreadUtils.h', '../src/utils/SkThreadUtils_pthread.cpp', '../src/utils/SkThreadUtils_pthread.h', -- cgit v1.2.3 From a40f5e547ed40b0168e5950a2881267676082741 Mon Sep 17 00:00:00 2001 From: "sugoi@google.com" Date: Tue, 15 Jan 2013 15:40:19 +0000 Subject: Implementation of the displacement effect (both CPU and GPU) TEST=Added new GM called "displacement" Review URL: https://codereview.appspot.com/7058075 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@7182 2bbb7eff-a529-9590-31e7-b0007b416f81 --- effects.gypi | 2 ++ gmslides.gypi | 1 + 2 files changed, 3 insertions(+) diff --git a/effects.gypi b/effects.gypi index d981cd1..b8defb4 100644 --- a/effects.gypi +++ b/effects.gypi @@ -25,6 +25,7 @@ '<(skia_src_path)/effects/SkCornerPathEffect.cpp', '<(skia_src_path)/effects/SkDashPathEffect.cpp', '<(skia_src_path)/effects/SkDiscretePathEffect.cpp', + '<(skia_src_path)/effects/SkDisplacementMapEffect.cpp', '<(skia_src_path)/effects/SkEmbossMask.cpp', '<(skia_src_path)/effects/SkEmbossMask.h', '<(skia_src_path)/effects/SkEmbossMask_Table.h', @@ -81,6 +82,7 @@ '<(skia_include_path)/effects/SkCornerPathEffect.h', '<(skia_include_path)/effects/SkDashPathEffect.h', '<(skia_include_path)/effects/SkDiscretePathEffect.h', + '<(skia_include_path)/effects/SkDisplacementMapEffect.h', '<(skia_include_path)/effects/SkDrawExtraPathEffect.h', '<(skia_include_path)/effects/SkEmbossMaskFilter.h', '<(skia_include_path)/effects/SkGradientShader.h', diff --git a/gmslides.gypi b/gmslides.gypi index 1553e74..5aa75f6 100644 --- a/gmslides.gypi +++ b/gmslides.gypi @@ -26,6 +26,7 @@ '../gm/dashcubics.cpp', '../gm/dashing.cpp', '../gm/distantclip.cpp', + '../gm/displacement.cpp', '../gm/drawbitmaprect.cpp', '../gm/drawlooper.cpp', '../gm/extractbitmap.cpp', -- cgit v1.2.3 From 1d8f9992892470db185e533b2cd592e97d58efbe Mon Sep 17 00:00:00 2001 From: "epoger@google.com" Date: Tue, 15 Jan 2013 17:16:51 +0000 Subject: Separate our jsoncpp dependency from Chromium's jsoncpp overrides. BUG=https://code.google.com/p/skia/issues/detail?id=909 Review URL: https://codereview.appspot.com/7098047 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@7187 2bbb7eff-a529-9590-31e7-b0007b416f81 --- jsoncpp.gyp | 41 +++++++++++++++++++++-------------------- 1 file changed, 21 insertions(+), 20 deletions(-) diff --git a/jsoncpp.gyp b/jsoncpp.gyp index 34f05e5..1ee33fd 100644 --- a/jsoncpp.gyp +++ b/jsoncpp.gyp @@ -3,12 +3,13 @@ # found in the LICENSE file. # TODO: This file was copied from the external dependency -# third_party/externals/jsoncpp/jsoncpp.gyp , at revision 125399, +# third_party/externals/jsoncpp-chromium/jsoncpp.gyp , at revision 125399, # with directory paths modified to work at this level. # # It would be better for us to depend on that gypfile within the external # dependency, but so far we have been unable to make that work reliably. # See https://code.google.com/p/skia/issues/detail?id=1023 +# and https://code.google.com/p/skia/source/detail?r=7115 { 'targets': [ @@ -19,30 +20,30 @@ 'JSON_USE_EXCEPTION=0', ], 'sources': [ - '../third_party/externals/jsoncpp/source/include/json/assertions.h', - '../third_party/externals/jsoncpp/source/include/json/autolink.h', - '../third_party/externals/jsoncpp/source/include/json/config.h', - '../third_party/externals/jsoncpp/source/include/json/features.h', - '../third_party/externals/jsoncpp/source/include/json/forwards.h', - '../third_party/externals/jsoncpp/source/include/json/json.h', - '../third_party/externals/jsoncpp/source/include/json/reader.h', - '../third_party/externals/jsoncpp/overrides/include/json/value.h', - '../third_party/externals/jsoncpp/source/include/json/writer.h', - '../third_party/externals/jsoncpp/source/src/lib_json/json_batchallocator.h', - '../third_party/externals/jsoncpp/source/src/lib_json/json_reader.cpp', - '../third_party/externals/jsoncpp/source/src/lib_json/json_tool.h', - '../third_party/externals/jsoncpp/overrides/src/lib_json/json_value.cpp', - '../third_party/externals/jsoncpp/source/src/lib_json/json_writer.cpp', + '../third_party/externals/jsoncpp/include/json/assertions.h', + '../third_party/externals/jsoncpp/include/json/autolink.h', + '../third_party/externals/jsoncpp/include/json/config.h', + '../third_party/externals/jsoncpp/include/json/features.h', + '../third_party/externals/jsoncpp/include/json/forwards.h', + '../third_party/externals/jsoncpp/include/json/json.h', + '../third_party/externals/jsoncpp/include/json/reader.h', + '../third_party/externals/jsoncpp-chromium/overrides/include/json/value.h', + '../third_party/externals/jsoncpp/include/json/writer.h', + '../third_party/externals/jsoncpp/src/lib_json/json_batchallocator.h', + '../third_party/externals/jsoncpp/src/lib_json/json_reader.cpp', + '../third_party/externals/jsoncpp/src/lib_json/json_tool.h', + '../third_party/externals/jsoncpp-chromium/overrides/src/lib_json/json_value.cpp', + '../third_party/externals/jsoncpp/src/lib_json/json_writer.cpp', ], 'include_dirs': [ - '../third_party/externals/jsoncpp/overrides/include/', - '../third_party/externals/jsoncpp/source/include/', - '../third_party/externals/jsoncpp/source/src/lib_json/', + '../third_party/externals/jsoncpp-chromium/overrides/include/', + '../third_party/externals/jsoncpp/include/', + '../third_party/externals/jsoncpp/src/lib_json/', ], 'direct_dependent_settings': { 'include_dirs': [ - '../third_party/externals/jsoncpp/overrides/include/', - '../third_party/externals/jsoncpp/source/include/', + '../third_party/externals/jsoncpp-chromium/overrides/include/', + '../third_party/externals/jsoncpp/include/', ], }, 'conditions': [ -- cgit v1.2.3 From 4e2c64932711228b427f94d262945bc03b78097f Mon Sep 17 00:00:00 2001 From: "reed@google.com" Date: Wed, 16 Jan 2013 18:54:15 +0000 Subject: add gm for comparing drawSprite and drawBitmap git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@7235 2bbb7eff-a529-9590-31e7-b0007b416f81 --- gmslides.gypi | 1 + 1 file changed, 1 insertion(+) diff --git a/gmslides.gypi b/gmslides.gypi index 5aa75f6..a50d084 100644 --- a/gmslides.gypi +++ b/gmslides.gypi @@ -72,6 +72,7 @@ '../gm/shadertext3.cpp', '../gm/shadows.cpp', '../gm/simpleaaclip.cpp', + '../gm/spritebitmap.cpp', '../gm/srcmode.cpp', '../gm/strokefill.cpp', '../gm/strokerect.cpp', -- cgit v1.2.3 From 86ce514f5d6199778e9a1c156574f2f34375b47f Mon Sep 17 00:00:00 2001 From: "djsollen@google.com" Date: Thu, 17 Jan 2013 13:20:01 +0000 Subject: Remove unused debugger code from SampleApp. Review URL: https://codereview.appspot.com/7133049 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@7244 2bbb7eff-a529-9590-31e7-b0007b416f81 --- SampleApp.gyp | 8 -------- 1 file changed, 8 deletions(-) diff --git a/SampleApp.gyp b/SampleApp.gyp index 02405f8..7ed08b2 100644 --- a/SampleApp.gyp +++ b/SampleApp.gyp @@ -118,14 +118,6 @@ #'../experimental/Networking/SkSockets.cpp', #'../experimental/Networking/SkSockets.h', - # Debugger - '../experimental/Debugger/DebuggerViews.h', - '../experimental/Debugger/DebuggerContentView.cpp', - '../experimental/Debugger/DebuggerCommandsView.cpp', - '../experimental/Debugger/DebuggerStateView.cpp', - '../experimental/Debugger/SkDebugDumper.cpp', - '../experimental/Debugger/SkDebugDumper.h', - # TiledPipeController '../src/pipe/utils/SamplePipeControllers.h', '../src/pipe/utils/SamplePipeControllers.cpp', -- cgit v1.2.3 From f84543bc31a254b02444e6248314b8bbf2d37220 Mon Sep 17 00:00:00 2001 From: "bsalomon@google.com" Date: Thu, 17 Jan 2013 16:50:08 +0000 Subject: Remove default implementation of GrEffect::isEqual. Make GrSingleTextureEffect abstract. Review URL: https://codereview.appspot.com/7142049 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@7254 2bbb7eff-a529-9590-31e7-b0007b416f81 --- gpu.gypi | 2 ++ 1 file changed, 2 insertions(+) diff --git a/gpu.gypi b/gpu.gypi index 3248f03..bf301bb 100644 --- a/gpu.gypi +++ b/gpu.gypi @@ -128,6 +128,8 @@ '<(skia_src_path)/gpu/effects/GrConfigConversionEffect.h', '<(skia_src_path)/gpu/effects/GrConvolutionEffect.cpp', '<(skia_src_path)/gpu/effects/GrConvolutionEffect.h', + '<(skia_src_path)/gpu/effects/GrSimpleTextureEffect.cpp', + '<(skia_src_path)/gpu/effects/GrSimpleTextureEffect.h', '<(skia_src_path)/gpu/effects/GrSingleTextureEffect.cpp', '<(skia_src_path)/gpu/effects/GrSingleTextureEffect.h', '<(skia_src_path)/gpu/effects/GrTextureDomainEffect.cpp', -- cgit v1.2.3 From 2dc0f5ee0784dc69b7834d0856e01f59e2ac45da Mon Sep 17 00:00:00 2001 From: "robertphillips@google.com" Date: Thu, 17 Jan 2013 19:51:41 +0000 Subject: Added new bench to test out 1xN BitmapProcShaders https://codereview.appspot.com/7160043/ git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@7264 2bbb7eff-a529-9590-31e7-b0007b416f81 --- bench.gypi | 1 + 1 file changed, 1 insertion(+) diff --git a/bench.gypi b/bench.gypi index 3d98619..6d27618 100644 --- a/bench.gypi +++ b/bench.gypi @@ -42,6 +42,7 @@ '../bench/ShaderMaskBench.cpp', '../bench/TableBench.cpp', '../bench/TextBench.cpp', + '../bench/TileBench.cpp', '../bench/VertBench.cpp', '../bench/WriterBench.cpp', -- cgit v1.2.3 From f373c621891ec554e540b067d0ec680cba7c2a43 Mon Sep 17 00:00:00 2001 From: "djsollen@google.com" Date: Fri, 18 Jan 2013 15:21:54 +0000 Subject: Fix gyp files when building Android for x86 BUG=606 Review URL: https://codereview.appspot.com/7086053 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@7271 2bbb7eff-a529-9590-31e7-b0007b416f81 --- opts.gyp | 8 +++++--- skia_base_libs.gyp | 2 +- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/opts.gyp b/opts.gyp index de27b42..af54f6e 100644 --- a/opts.gyp +++ b/opts.gyp @@ -37,6 +37,11 @@ '-msse2', ], }], + [ 'skia_os != "android"', { + 'dependencies': [ + 'opts_ssse3', + ], + }], ], 'sources': [ '../src/opts/opts_check_SSE2.cpp', @@ -45,9 +50,6 @@ '../src/opts/SkBlitRect_opts_SSE2.cpp', '../src/opts/SkUtils_opts_SSE2.cpp', ], - 'dependencies': [ - 'opts_ssse3', - ], }], [ 'skia_arch_type == "arm" and armv7 == 1', { # The assembly uses the frame pointer register (r7 in Thumb/r11 in diff --git a/skia_base_libs.gyp b/skia_base_libs.gyp index a611d30..245babb 100644 --- a/skia_base_libs.gyp +++ b/skia_base_libs.gyp @@ -8,7 +8,7 @@ 'utils.gyp:utils', ], 'conditions': [ - [ 'skia_arch_type == "x86"', { + [ 'skia_arch_type == "x86" and skia_os != "android"', { 'component_libs': [ 'opts.gyp:opts_ssse3', ], -- cgit v1.2.3 From 0596c8c39667af2dede1c4161419c3304e099be2 Mon Sep 17 00:00:00 2001 From: "edisonn@google.com" Date: Fri, 18 Jan 2013 17:24:33 +0000 Subject: Build render_pdfs on buildbot. Review URL: https://codereview.appspot.com/7134055 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@7274 2bbb7eff-a529-9590-31e7-b0007b416f81 --- tools.gyp | 1 + 1 file changed, 1 insertion(+) diff --git a/tools.gyp b/tools.gyp index 0cdb319..1d3e559 100644 --- a/tools.gyp +++ b/tools.gyp @@ -19,6 +19,7 @@ 'skhello', 'skimage', 'render_pictures', + 'render_pdfs', 'bench_pictures', 'pinspect', 'filter', -- cgit v1.2.3 From c5adf589726743382173c4e337d4d4d8b9e6f2a3 Mon Sep 17 00:00:00 2001 From: "senorblanco@chromium.org" Date: Fri, 18 Jan 2013 17:29:15 +0000 Subject: Implement a bicubic resampling image filter, with raster and GPU backends. In order to get this to work on the GPU side, I had to modify the width and height of the drawn texture in drawSprite() and drawDevice() to use the filtered texture's dimensions, instead of the source texture. (This wasn't a problem before since all other image filters produce results the same dimensions as their input texture.) For now, this implementation only does axis-aligned scaling (same as the Lanczos-3 implementation in Chrome). It's also done for correctness and clarity, not speed, so there are lots of opportunities for speedups. Review URL: https://codereview.appspot.com/7033049 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@7275 2bbb7eff-a529-9590-31e7-b0007b416f81 --- effects.gypi | 1 + gmslides.gypi | 1 + 2 files changed, 2 insertions(+) diff --git a/effects.gypi b/effects.gypi index b8defb4..8c61c34 100644 --- a/effects.gypi +++ b/effects.gypi @@ -11,6 +11,7 @@ '<(skia_src_path)/effects/Sk2DPathEffect.cpp', '<(skia_src_path)/effects/SkAvoidXfermode.cpp', '<(skia_src_path)/effects/SkArithmeticMode.cpp', + '<(skia_src_path)/effects/SkBicubicImageFilter.cpp', '<(skia_src_path)/effects/SkBitmapSource.cpp', '<(skia_src_path)/effects/SkBlendImageFilter.cpp', '<(skia_src_path)/effects/SkBlurDrawLooper.cpp', diff --git a/gmslides.gypi b/gmslides.gypi index a50d084..8d772f3 100644 --- a/gmslides.gypi +++ b/gmslides.gypi @@ -4,6 +4,7 @@ '../gm/aaclip.cpp', '../gm/aarectmodes.cpp', '../gm/arithmode.cpp', + '../gm/bicubicfilter.cpp', '../gm/bigmatrix.cpp', '../gm/bitmapcopy.cpp', '../gm/bitmapmatrix.cpp', -- cgit v1.2.3 From 53099b9e1f6334763d8dee69d4dc968519eaf1c9 Mon Sep 17 00:00:00 2001 From: "edisonn@google.com" Date: Fri, 18 Jan 2013 18:06:22 +0000 Subject: tools.gyp: dependencies in apfabetical order Review URL: https://codereview.appspot.com/7127055 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@7281 2bbb7eff-a529-9590-31e7-b0007b416f81 --- tools.gyp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/tools.gyp b/tools.gyp index 1d3e559..259ae67 100644 --- a/tools.gyp +++ b/tools.gyp @@ -15,14 +15,14 @@ 'target_name': 'tools', 'type': 'none', 'dependencies': [ + 'bench_pictures', + 'filter', + 'pinspect', + 'render_pdfs', + 'render_pictures', 'skdiff', 'skhello', 'skimage', - 'render_pictures', - 'render_pdfs', - 'bench_pictures', - 'pinspect', - 'filter', ], }, { -- cgit v1.2.3 From 22d765768d2af4110c561ecdb75003a956959216 Mon Sep 17 00:00:00 2001 From: "robertphillips@google.com" Date: Fri, 18 Jan 2013 19:20:52 +0000 Subject: Reverting chain of SkBicubicImageFilter changes (7275, 7276, 7280 & 7283) git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@7285 2bbb7eff-a529-9590-31e7-b0007b416f81 --- effects.gypi | 1 - gmslides.gypi | 1 - 2 files changed, 2 deletions(-) diff --git a/effects.gypi b/effects.gypi index 8c61c34..b8defb4 100644 --- a/effects.gypi +++ b/effects.gypi @@ -11,7 +11,6 @@ '<(skia_src_path)/effects/Sk2DPathEffect.cpp', '<(skia_src_path)/effects/SkAvoidXfermode.cpp', '<(skia_src_path)/effects/SkArithmeticMode.cpp', - '<(skia_src_path)/effects/SkBicubicImageFilter.cpp', '<(skia_src_path)/effects/SkBitmapSource.cpp', '<(skia_src_path)/effects/SkBlendImageFilter.cpp', '<(skia_src_path)/effects/SkBlurDrawLooper.cpp', diff --git a/gmslides.gypi b/gmslides.gypi index 8d772f3..a50d084 100644 --- a/gmslides.gypi +++ b/gmslides.gypi @@ -4,7 +4,6 @@ '../gm/aaclip.cpp', '../gm/aarectmodes.cpp', '../gm/arithmode.cpp', - '../gm/bicubicfilter.cpp', '../gm/bigmatrix.cpp', '../gm/bitmapcopy.cpp', '../gm/bitmapmatrix.cpp', -- cgit v1.2.3 From 4cb33b16ea91ac93a2e326690bd210545cf6e007 Mon Sep 17 00:00:00 2001 From: "senorblanco@chromium.org" Date: Fri, 18 Jan 2013 20:48:20 +0000 Subject: (Relanding r7275 with assert fix, plus fixes from r7276, r7280, r7283.) Implement a bicubic resampling image filter, with raster and GPU backends. In order to get this to work on the GPU side, I had to modify the width and height of the drawn texture in drawSprite() and drawDevice() to use the filtered texture's dimensions, instead of the source texture. (This wasn't a problem before since all other image filters produce results the same dimensions as their input texture.) For now, this implementation only does axis-aligned scaling (same as the Lanczos-3 implementation in Chrome). It's also done for correctness and clarity, not speed, so there are lots of opportunities for speedups. Committed: https://code.google.com/p/skia/source/detail?r=7275 Review URL: https://codereview.appspot.com/7033049 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@7287 2bbb7eff-a529-9590-31e7-b0007b416f81 --- effects.gypi | 1 + gmslides.gypi | 1 + 2 files changed, 2 insertions(+) diff --git a/effects.gypi b/effects.gypi index b8defb4..8c61c34 100644 --- a/effects.gypi +++ b/effects.gypi @@ -11,6 +11,7 @@ '<(skia_src_path)/effects/Sk2DPathEffect.cpp', '<(skia_src_path)/effects/SkAvoidXfermode.cpp', '<(skia_src_path)/effects/SkArithmeticMode.cpp', + '<(skia_src_path)/effects/SkBicubicImageFilter.cpp', '<(skia_src_path)/effects/SkBitmapSource.cpp', '<(skia_src_path)/effects/SkBlendImageFilter.cpp', '<(skia_src_path)/effects/SkBlurDrawLooper.cpp', diff --git a/gmslides.gypi b/gmslides.gypi index a50d084..8d772f3 100644 --- a/gmslides.gypi +++ b/gmslides.gypi @@ -4,6 +4,7 @@ '../gm/aaclip.cpp', '../gm/aarectmodes.cpp', '../gm/arithmode.cpp', + '../gm/bicubicfilter.cpp', '../gm/bigmatrix.cpp', '../gm/bitmapcopy.cpp', '../gm/bitmapmatrix.cpp', -- cgit v1.2.3 From a72b31c495e2835aaf73333e07288f5cf3e4c57c Mon Sep 17 00:00:00 2001 From: "bungeman@google.com" Date: Tue, 22 Jan 2013 19:25:14 +0000 Subject: Expose geometry and gamma on device. https://codereview.appspot.com/6499101/ git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@7317 2bbb7eff-a529-9590-31e7-b0007b416f81 --- core.gypi | 2 ++ 1 file changed, 2 insertions(+) diff --git a/core.gypi b/core.gypi index 4830645..1dc1392 100644 --- a/core.gypi +++ b/core.gypi @@ -141,6 +141,7 @@ '<(skia_src_path)/core/SkRTree.cpp', '<(skia_src_path)/core/SkScalar.cpp', '<(skia_src_path)/core/SkScalerContext.cpp', + '<(skia_src_path)/core/SkScalerContext.h', '<(skia_src_path)/core/SkScan.cpp', '<(skia_src_path)/core/SkScan.h', '<(skia_src_path)/core/SkScanPriv.h', @@ -210,6 +211,7 @@ '<(skia_include_path)/core/SkData.h', '<(skia_include_path)/core/SkDeque.h', '<(skia_include_path)/core/SkDevice.h', + '<(skia_include_path)/core/SkDeviceProperties.h', '<(skia_include_path)/core/SkDither.h', '<(skia_include_path)/core/SkDraw.h', '<(skia_include_path)/core/SkDrawFilter.h', -- cgit v1.2.3 From d417f3a77de3eb4847c06b85d92f930489b5cf74 Mon Sep 17 00:00:00 2001 From: "mike@reedtribe.org" Date: Wed, 23 Jan 2013 02:23:40 +0000 Subject: add bench for sorting git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@7330 2bbb7eff-a529-9590-31e7-b0007b416f81 --- bench.gypi | 1 + 1 file changed, 1 insertion(+) diff --git a/bench.gypi b/bench.gypi index 6d27618..27e307c 100644 --- a/bench.gypi +++ b/bench.gypi @@ -40,6 +40,7 @@ '../bench/RTreeBench.cpp', '../bench/ScalarBench.cpp', '../bench/ShaderMaskBench.cpp', + '../bench/SortBench.cpp', '../bench/TableBench.cpp', '../bench/TextBench.cpp', '../bench/TileBench.cpp', -- cgit v1.2.3 From 5e0a194bdaa512ae553829dc0701e71186b0b509 Mon Sep 17 00:00:00 2001 From: "djsollen@google.com" Date: Wed, 23 Jan 2013 18:56:38 +0000 Subject: Update Android toolchain to NDK r8d with GCC 4.7 Review URL: https://codereview.appspot.com/7201045 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@7343 2bbb7eff-a529-9590-31e7-b0007b416f81 --- common_conditions.gypi | 17 ++++------------- opts.gyp | 4 ++++ 2 files changed, 8 insertions(+), 13 deletions(-) diff --git a/common_conditions.gypi b/common_conditions.gypi index 0e13333..ff4caf8 100644 --- a/common_conditions.gypi +++ b/common_conditions.gypi @@ -315,14 +315,6 @@ '-fno-exceptions', '-fno-rtti', '-fuse-ld=gold', - '--sysroot=<(android_base)/toolchains/<(android_toolchain)/sysroot', - ], - 'include_dirs' : [ - '<(android_base)/toolchains/<(android_toolchain)/lib/gcc/arm-linux-androideabi/4.6.x-google/include', - '<(android_base)/toolchains/<(android_toolchain)/lib/gcc/arm-linux-androideabi/4.6.x-google/include-fixed', - '<(android_base)/toolchains/<(android_toolchain)/arm-linux-androideabi/include/c++/4.6', - '<(android_base)/toolchains/<(android_toolchain)/arm-linux-androideabi/include/c++/4.6/arm-linux-androideabi', - '<(android_base)/toolchains/<(android_toolchain)/sysroot/usr/include', ], 'conditions': [ [ 'skia_warnings_as_errors == 1', { @@ -333,11 +325,6 @@ [ 'skia_profile_enabled == 1', { 'cflags': ['-g', '-fno-omit-frame-pointer', '-marm', '-mapcs'], }], - [ 'skia_arch_type == "arm"', { - 'ldflags': [ - '-Wl', - ], - }], [ 'skia_arch_type == "arm" and arm_thumb == 1', { 'cflags': [ '-mthumb', @@ -362,6 +349,10 @@ 'cflags': [ '-mfpu=neon', ], + 'ldflags': [ + '-march=armv7-a', + '-Wl,--fix-cortex-a8', + ], }], [ 'arm_neon_optional == 1', { 'defines': [ diff --git a/opts.gyp b/opts.gyp index af54f6e..30f464f 100644 --- a/opts.gyp +++ b/opts.gyp @@ -158,6 +158,10 @@ '-mfpu=neon', '-fomit-frame-pointer', ], + 'ldflags': [ + '-march=armv7-a', + '-Wl,--fix-cortex-a8', + ], 'sources': [ '../src/opts/memset16_neon.S', '../src/opts/memset32_neon.S', -- cgit v1.2.3 From ee0285f8992f2a4118b03efab651c577f91018b8 Mon Sep 17 00:00:00 2001 From: "robertphillips@google.com" Date: Wed, 23 Jan 2013 20:45:26 +0000 Subject: Reverse sense of convex-quad-fix compiler flag https://codereview.appspot.com/7206045/ git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@7349 2bbb7eff-a529-9590-31e7-b0007b416f81 --- common_conditions.gypi | 1 - 1 file changed, 1 deletion(-) diff --git a/common_conditions.gypi b/common_conditions.gypi index ff4caf8..d61cc94 100644 --- a/common_conditions.gypi +++ b/common_conditions.gypi @@ -4,7 +4,6 @@ 'defines': [ 'SK_ALLOW_STATIC_GLOBAL_INITIALIZERS=<(skia_static_initializers)', # 'SK_SUPPORT_HINTING_SCALE_FACTOR', - 'SK_REDEFINE_ROOT2OVER2_TO_MAKE_ARCTOS_CONVEX', ], 'conditions' : [ ['skia_gpu == 1', -- cgit v1.2.3 From c116412533ad2a4326c204d41658a2acebd0d28b Mon Sep 17 00:00:00 2001 From: "junov@chromium.org" Date: Thu, 24 Jan 2013 14:38:23 +0000 Subject: Move code in isPaintOpaque from SkDeferredCanvas.cpp to SkPaintPriv The purpose of this code move is to make it re-usable in order to implement occlusion culling optimizations in SkPicture similar to what we have now in SkDeferredCanvas. BUG=https://code.google.com/p/chromium/issues/detail?id=164530 Review URL: https://codereview.appspot.com/7196046 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@7361 2bbb7eff-a529-9590-31e7-b0007b416f81 --- core.gypi | 2 ++ utils.gyp | 1 + 2 files changed, 3 insertions(+) diff --git a/core.gypi b/core.gypi index 1dc1392..be3bc8e 100644 --- a/core.gypi +++ b/core.gypi @@ -107,6 +107,8 @@ '<(skia_src_path)/core/SkOrderedWriteBuffer.cpp', '<(skia_src_path)/core/SkPackBits.cpp', '<(skia_src_path)/core/SkPaint.cpp', + '<(skia_src_path)/core/SkPaintPriv.cpp', + '<(skia_src_path)/core/SkPaintPriv.h', '<(skia_src_path)/core/SkPath.cpp', '<(skia_src_path)/core/SkPathEffect.cpp', '<(skia_src_path)/core/SkPathHeap.cpp', diff --git a/utils.gyp b/utils.gyp index d4942d7..28910e4 100644 --- a/utils.gyp +++ b/utils.gyp @@ -18,6 +18,7 @@ '../include/utils/unix', '../include/utils/win', '../include/xml', + '../src/core', '../src/utils', ], 'sources': [ -- cgit v1.2.3 From fb0591ca2c6a5abca54eaee258e25e8a255c2985 Mon Sep 17 00:00:00 2001 From: "bungeman@google.com" Date: Thu, 24 Jan 2013 22:31:01 +0000 Subject: Remove ConcaveToTriangles. git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@7383 2bbb7eff-a529-9590-31e7-b0007b416f81 --- SampleApp.gyp | 3 +-- core.gypi | 2 -- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/SampleApp.gyp b/SampleApp.gyp index 7ed08b2..b7b39a8 100644 --- a/SampleApp.gyp +++ b/SampleApp.gyp @@ -5,7 +5,7 @@ 'type': 'executable', 'mac_bundle' : 1, 'include_dirs' : [ - '../src/core', # needed to get SkConcaveToTriangle, maybe this should be moved to include dir? + '../src/core', '../src/effects', #needed for BlurMask.h '../gm', # needed to pull gm.h '../samplecode', # To pull SampleApp.h and SampleCode.h @@ -97,7 +97,6 @@ '../samplecode/SampleTextureDomain.cpp', '../samplecode/SampleTiling.cpp', '../samplecode/SampleTinyBitmap.cpp', - '../samplecode/SampleTriangles.cpp', '../samplecode/SampleTypeface.cpp', '../samplecode/SampleUnitMapper.cpp', '../samplecode/SampleVertices.cpp', diff --git a/core.gypi b/core.gypi index be3bc8e..578f904 100644 --- a/core.gypi +++ b/core.gypi @@ -57,8 +57,6 @@ '<(skia_src_path)/core/SkColorFilter.cpp', '<(skia_src_path)/core/SkColorTable.cpp', '<(skia_src_path)/core/SkComposeShader.cpp', - '<(skia_src_path)/core/SkConcaveToTriangles.cpp', - '<(skia_src_path)/core/SkConcaveToTriangles.h', '<(skia_src_path)/core/SkConfig8888.cpp', '<(skia_src_path)/core/SkConfig8888.h', '<(skia_src_path)/core/SkCordic.cpp', -- cgit v1.2.3 From 5526891fb5c583b0a6dd1c41f50c90ef67b91981 Mon Sep 17 00:00:00 2001 From: "skia.committer@gmail.com" Date: Fri, 25 Jan 2013 07:06:46 +0000 Subject: Sanitizing source files in Skia_Periodic_House_Keeping git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@7385 2bbb7eff-a529-9590-31e7-b0007b416f81 --- SampleApp.gyp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SampleApp.gyp b/SampleApp.gyp index b7b39a8..d635535 100644 --- a/SampleApp.gyp +++ b/SampleApp.gyp @@ -5,7 +5,7 @@ 'type': 'executable', 'mac_bundle' : 1, 'include_dirs' : [ - '../src/core', + '../src/core', '../src/effects', #needed for BlurMask.h '../gm', # needed to pull gm.h '../samplecode', # To pull SampleApp.h and SampleCode.h -- cgit v1.2.3 From 4362dd4e5cdf14d7b84114d81ad68fedcf99f3d3 Mon Sep 17 00:00:00 2001 From: "bsalomon@google.com" Date: Fri, 25 Jan 2013 17:49:03 +0000 Subject: Move random from core to utils Review URL: https://codereview.appspot.com/7193064 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@7395 2bbb7eff-a529-9590-31e7-b0007b416f81 --- core.gypi | 1 - utils.gyp | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/core.gypi b/core.gypi index 578f904..82b9623 100644 --- a/core.gypi +++ b/core.gypi @@ -242,7 +242,6 @@ '<(skia_include_path)/core/SkPicture.h', '<(skia_include_path)/core/SkPixelRef.h', '<(skia_include_path)/core/SkPoint.h', - '<(skia_include_path)/core/SkRandom.h', '<(skia_include_path)/core/SkRasterizer.h', '<(skia_include_path)/core/SkReader32.h', '<(skia_include_path)/core/SkRect.h', diff --git a/utils.gyp b/utils.gyp index 28910e4..b4469ba 100644 --- a/utils.gyp +++ b/utils.gyp @@ -48,6 +48,7 @@ '../include/utils/SkParsePaint.h', '../include/utils/SkParsePath.h', '../include/utils/SkPictureUtils.h', + '../include/utils/SkRandom.h', '../include/utils/SkRTConf.h', '../include/utils/SkProxyCanvas.h', '../include/utils/SkUnitMappers.h', -- cgit v1.2.3 From eb4368875655a74b57ac36de6d04ce250079a9f2 Mon Sep 17 00:00:00 2001 From: "robertphillips@google.com" Date: Mon, 28 Jan 2013 20:21:59 +0000 Subject: Added toString to SkDrawLooper-derived classes https://codereview.appspot.com/7195054/ git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@7422 2bbb7eff-a529-9590-31e7-b0007b416f81 --- core.gypi | 2 ++ 1 file changed, 2 insertions(+) diff --git a/core.gypi b/core.gypi index 82b9623..8c75c1f 100644 --- a/core.gypi +++ b/core.gypi @@ -157,6 +157,7 @@ '<(skia_src_path)/core/SkSpriteBlitterTemplate.h', '<(skia_src_path)/core/SkStream.cpp', '<(skia_src_path)/core/SkString.cpp', + '<(skia_src_path)/core/SkStringUtils.cpp', '<(skia_src_path)/core/SkStroke.h', '<(skia_src_path)/core/SkStroke.cpp', '<(skia_src_path)/core/SkStrokeRec.cpp', @@ -253,6 +254,7 @@ '<(skia_include_path)/core/SkShader.h', '<(skia_include_path)/core/SkStream.h', '<(skia_include_path)/core/SkString.h', + '<(skia_include_path)/core/SkStringUtils.h', '<(skia_include_path)/core/SkStrokeRec.h', '<(skia_include_path)/core/SkTArray.h', '<(skia_include_path)/core/SkTDArray.h', -- cgit v1.2.3 From af2434465ab560eba531121321c96840c358d41c Mon Sep 17 00:00:00 2001 From: "caryclark@google.com" Date: Tue, 29 Jan 2013 14:34:03 +0000 Subject: shape ops work in progress update gyp files git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@7445 2bbb7eff-a529-9590-31e7-b0007b416f81 --- shapeops_demo.gyp | 6 ++---- shapeops_edge.gyp | 2 -- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/shapeops_demo.gyp b/shapeops_demo.gyp index 1279294..6a06f86 100644 --- a/shapeops_demo.gyp +++ b/shapeops_demo.gyp @@ -19,6 +19,7 @@ '../experimental/Intersection/CubicIntersection.cpp', '../experimental/Intersection/CubicReduceOrder.cpp', '../experimental/Intersection/CubicSubDivide.cpp', + '../experimental/Intersection/CubicToQuadratics.cpp', '../experimental/Intersection/CubicUtilities.cpp', '../experimental/Intersection/DataTypes.cpp', '../experimental/Intersection/EdgeDemo.cpp', @@ -26,6 +27,7 @@ '../experimental/Intersection/EdgeWalker.cpp', '../experimental/Intersection/EdgeWalker_TestUtility.cpp', '../experimental/Intersection/Extrema.cpp', + '../experimental/Intersection/Intersections.cpp', '../experimental/Intersection/LineCubicIntersection.cpp', '../experimental/Intersection/LineIntersection.cpp', '../experimental/Intersection/LineParameterization.cpp', @@ -69,11 +71,7 @@ 'effects.gyp:effects', 'images.gyp:images', 'views.gyp:views', - 'animator.gyp:animator', 'xml.gyp:xml', - 'svg.gyp:svg', - 'experimental.gyp:experimental', - 'pdf.gyp:pdf', ], 'conditions' : [ [ 'skia_os in ["linux", "freebsd", "openbsd", "solaris"]', { diff --git a/shapeops_edge.gyp b/shapeops_edge.gyp index 4066d4b..32b5c6e 100644 --- a/shapeops_edge.gyp +++ b/shapeops_edge.gyp @@ -113,9 +113,7 @@ 'dependencies': [ 'skia_base_libs.gyp:skia_base_libs', 'effects.gyp:effects', - 'experimental.gyp:experimental', 'images.gyp:images', - 'pdf.gyp:pdf', ], 'conditions': [ [ 'skia_gpu == 1', { -- cgit v1.2.3 From 6e6e29712256ccb657a44920660e4c4714f2a564 Mon Sep 17 00:00:00 2001 From: "caryclark@google.com" Date: Tue, 29 Jan 2013 20:28:49 +0000 Subject: shape ops work in progress git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@7453 2bbb7eff-a529-9590-31e7-b0007b416f81 --- shapeops_edge.gyp | 1 + 1 file changed, 1 insertion(+) diff --git a/shapeops_edge.gyp b/shapeops_edge.gyp index 32b5c6e..34d60f4 100644 --- a/shapeops_edge.gyp +++ b/shapeops_edge.gyp @@ -75,6 +75,7 @@ '../experimental/Intersection/QuarticRoot.cpp', '../experimental/Intersection/QuarticRoot_Test.cpp', '../experimental/Intersection/ShapeOps.cpp', + '../experimental/Intersection/ShapeOpCubic4x4_Test.cpp', '../experimental/Intersection/ShapeOpRect4x4_Test.cpp', '../experimental/Intersection/Simplify.cpp', '../experimental/Intersection/SimplifyAddIntersectingTs_Test.cpp', -- cgit v1.2.3 From fedae79c30f1fd03abbac8461a420a26632e3350 Mon Sep 17 00:00:00 2001 From: "senorblanco@chromium.org" Date: Wed, 30 Jan 2013 19:08:47 +0000 Subject: This changes the signature of SkImageFilter::filterImageGPU() to use SkBitmaps for input and output, and removes the rect param. This allows us to return textures which are larger than the actual result, such as when GrAutoScratchTextures are used. The SkBitmap's size represents the active region, while the GrTexture's size is the full texture size. This fixes the bicubic image filter GM on the GPU, which otherwise draws garbage outside the filtered region. It also moves us closer to unifying the signatures of SkImageFilter::onFilterImage() and SkImageFilter::filterImageGPU(). Review URL: https://codereview.appspot.com/7180048 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@7467 2bbb7eff-a529-9590-31e7-b0007b416f81 --- effects.gypi | 1 + 1 file changed, 1 insertion(+) diff --git a/effects.gypi b/effects.gypi index 8c61c34..2d0ec51 100644 --- a/effects.gypi +++ b/effects.gypi @@ -31,6 +31,7 @@ '<(skia_src_path)/effects/SkEmbossMask.h', '<(skia_src_path)/effects/SkEmbossMask_Table.h', '<(skia_src_path)/effects/SkEmbossMaskFilter.cpp', + '<(skia_src_path)/effects/SkImageFilterUtils.cpp', '<(skia_src_path)/effects/SkKernel33MaskFilter.cpp', '<(skia_src_path)/effects/SkLayerDrawLooper.cpp', '<(skia_src_path)/effects/SkLayerRasterizer.cpp', -- cgit v1.2.3 From 18ccae55f4e47f81d25f49f279c9fe907da26a87 Mon Sep 17 00:00:00 2001 From: "robertphillips@google.com" Date: Thu, 31 Jan 2013 00:03:27 +0000 Subject: Add SkImageFilterUtils.h to effects.gypi git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@7479 2bbb7eff-a529-9590-31e7-b0007b416f81 --- effects.gypi | 1 + 1 file changed, 1 insertion(+) diff --git a/effects.gypi b/effects.gypi index 2d0ec51..44d846a 100644 --- a/effects.gypi +++ b/effects.gypi @@ -88,6 +88,7 @@ '<(skia_include_path)/effects/SkDrawExtraPathEffect.h', '<(skia_include_path)/effects/SkEmbossMaskFilter.h', '<(skia_include_path)/effects/SkGradientShader.h', + '<(skia_include_path)/effects/SkImageFilterUtils.h', '<(skia_include_path)/effects/SkKernel33MaskFilter.h', '<(skia_include_path)/effects/SkLayerDrawLooper.h', '<(skia_include_path)/effects/SkLayerRasterizer.h', -- cgit v1.2.3 From c3ecbf141cd74fdc2a8d216e1972c535be1ae0fa Mon Sep 17 00:00:00 2001 From: "reed@google.com" Date: Thu, 31 Jan 2013 15:24:24 +0000 Subject: optimize region::intersect when one wholly contains the other clone of https://codereview.appspot.com/7237055/ git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@7491 2bbb7eff-a529-9590-31e7-b0007b416f81 --- bench.gypi | 1 + 1 file changed, 1 insertion(+) diff --git a/bench.gypi b/bench.gypi index 27e307c..cf5c02e 100644 --- a/bench.gypi +++ b/bench.gypi @@ -36,6 +36,7 @@ '../bench/RectBench.cpp', '../bench/RefCntBench.cpp', '../bench/RegionBench.cpp', + '../bench/RegionContainBench.cpp', '../bench/RepeatTileBench.cpp', '../bench/RTreeBench.cpp', '../bench/ScalarBench.cpp', -- cgit v1.2.3 From cae69d5a38df6fe71946293e1c56a140a5c0bb9b Mon Sep 17 00:00:00 2001 From: "robertphillips@google.com" Date: Thu, 31 Jan 2013 15:56:22 +0000 Subject: Update filter tool to allow more flexible filtering https://codereview.appspot.com/7227055/ git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@7492 2bbb7eff-a529-9590-31e7-b0007b416f81 --- core.gypi | 2 ++ ports.gyp | 2 -- tools.gyp | 9 ++++++++- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/core.gypi b/core.gypi index 8c75c1f..d5f76a3 100644 --- a/core.gypi +++ b/core.gypi @@ -85,6 +85,8 @@ '<(skia_src_path)/core/SkFloat.h', '<(skia_src_path)/core/SkFloatBits.cpp', '<(skia_src_path)/core/SkFontHost.cpp', + '<(skia_src_path)/core/SkFontDescriptor.cpp', + '<(skia_src_path)/core/SkFontDescriptor.h', '<(skia_src_path)/core/SkGeometry.cpp', '<(skia_src_path)/core/SkGlyphCache.cpp', '<(skia_src_path)/core/SkGlyphCache.h', diff --git a/ports.gyp b/ports.gyp index a84f788..0b298d1 100644 --- a/ports.gyp +++ b/ports.gyp @@ -23,8 +23,6 @@ '../src/ports/SkDebug_nacl.cpp', '../src/ports/SkDebug_stdio.cpp', '../src/ports/SkDebug_win.cpp', - '../src/ports/SkFontDescriptor.h', - '../src/ports/SkFontDescriptor.cpp', '../src/ports/SkFontHost_sandbox_none.cpp', '../src/ports/SkFontHost_win.cpp', '../src/ports/SkFontHost_win_dw.cpp', diff --git a/tools.gyp b/tools.gyp index 259ae67..8148358 100644 --- a/tools.gyp +++ b/tools.gyp @@ -197,11 +197,18 @@ 'type': 'executable', 'include_dirs' : [ '../src/core', + '../debugger', ], 'sources': [ '../tools/filtermain.cpp', - '../tools/path_utils.cpp', '../tools/path_utils.h', + '../tools/path_utils.cpp', + '../debugger/SkDrawCommand.h', + '../debugger/SkDrawCommand.cpp', + '../debugger/SkDebugCanvas.h', + '../debugger/SkDebugCanvas.cpp', + '../debugger/SkObjectParser.h', + '../debugger/SkObjectParser.cpp', ], 'dependencies': [ 'skia_base_libs.gyp:skia_base_libs', -- cgit v1.2.3 From 4d228bcce703a0ff0ea2b96c993d84bf25618a77 Mon Sep 17 00:00:00 2001 From: "bungeman@google.com" Date: Thu, 31 Jan 2013 19:47:48 +0000 Subject: Add SHA1 and MD5 to utils. https://codereview.appspot.com/7071055/ git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@7496 2bbb7eff-a529-9590-31e7-b0007b416f81 --- bench.gyp | 1 + tests.gyp | 2 ++ utils.gyp | 4 ++++ 3 files changed, 7 insertions(+) diff --git a/bench.gyp b/bench.gyp index 9690f32..be768f0 100644 --- a/bench.gyp +++ b/bench.gyp @@ -11,6 +11,7 @@ 'include_dirs' : [ '../src/core', '../src/effects', + '../src/utils', ], 'includes': [ 'bench.gypi' diff --git a/tests.gyp b/tests.gyp index 066435c..10e99d2 100644 --- a/tests.gyp +++ b/tests.gyp @@ -58,6 +58,7 @@ '../tests/HashCacheTest.cpp', '../tests/InfRectTest.cpp', '../tests/LListTest.cpp', + '../tests/MD5Test.cpp', '../tests/MathTest.cpp', '../tests/MatrixTest.cpp', '../tests/Matrix44Test.cpp', @@ -84,6 +85,7 @@ '../tests/RegionTest.cpp', '../tests/RoundRectTest.cpp', '../tests/RTreeTest.cpp', + '../tests/SHA1Test.cpp', '../tests/ScalarTest.cpp', '../tests/ShaderOpacityTest.cpp', '../tests/Sk64Test.cpp', diff --git a/utils.gyp b/utils.gyp index b4469ba..c62657d 100644 --- a/utils.gyp +++ b/utils.gyp @@ -74,6 +74,8 @@ '../src/utils/SkInterpolator.cpp', '../src/utils/SkLayer.cpp', '../src/utils/SkMatrix44.cpp', + '../src/utils/SkMD5.cpp', + '../src/utils/SkMD5.h', '../src/utils/SkMeshUtils.cpp', '../src/utils/SkNinePatch.cpp', '../src/utils/SkNWayCanvas.cpp', @@ -84,6 +86,8 @@ '../src/utils/SkParsePath.cpp', '../src/utils/SkPictureUtils.cpp', '../src/utils/SkProxyCanvas.cpp', + '../src/utils/SkSHA1.cpp', + '../src/utils/SkSHA1.h', '../src/utils/SkRTConf.cpp', '../src/utils/SkThreadUtils.h', '../src/utils/SkThreadUtils_pthread.cpp', -- cgit v1.2.3 From 5d71a8fc1b0dbc6a4efa73fada21584393e906ef Mon Sep 17 00:00:00 2001 From: "bsalomon@google.com" Date: Fri, 1 Feb 2013 14:19:27 +0000 Subject: Make drawIndexedInstances non-virtual and rewrite GrIODB's drawRect on top of drawIndexedInstances. R=robertphillips@google.com Review URL: https://codereview.appspot.com/7221078 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@7508 2bbb7eff-a529-9590-31e7-b0007b416f81 --- SampleApp.gyp | 1 + 1 file changed, 1 insertion(+) diff --git a/SampleApp.gyp b/SampleApp.gyp index d635535..8d833dd 100644 --- a/SampleApp.gyp +++ b/SampleApp.gyp @@ -67,6 +67,7 @@ '../samplecode/SampleLayers.cpp', '../samplecode/SampleLCD.cpp', '../samplecode/SampleLines.cpp', + '../samplecode/SampleManyRects.cpp', '../samplecode/SampleMeasure.cpp', '../samplecode/SampleMipMap.cpp', '../samplecode/SampleMovie.cpp', -- cgit v1.2.3 From ae5359b074bdb438d64175097a911211dc799c7d Mon Sep 17 00:00:00 2001 From: "djsollen@google.com" Date: Fri, 1 Feb 2013 15:57:13 +0000 Subject: Fix android errors when unflattening an SkImageRef_ashmem object. Review URL: https://codereview.appspot.com/7228071 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@7514 2bbb7eff-a529-9590-31e7-b0007b416f81 --- images.gyp | 10 +++++++++- ports.gyp | 1 - 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/images.gyp b/images.gyp index 1bfd2d3..8c4690e 100644 --- a/images.gyp +++ b/images.gyp @@ -44,6 +44,8 @@ '../src/images/SkImageRef.cpp', '../src/images/SkImageRefPool.cpp', '../src/images/SkImageRefPool.h', + '../src/images/SkImageRef_ashmem.h', + '../src/images/SkImageRef_ashmem.cpp', '../src/images/SkImageRef_GlobalPool.cpp', '../src/images/SkImages.cpp', '../src/images/SkJpegUtility.cpp', @@ -109,7 +111,8 @@ # end libpng stuff }], [ 'skia_os == "android"', { - 'sources!': [ + 'include_dirs': [ + '../src/utils', ], 'dependencies': [ 'android_deps.gyp:gif', @@ -118,6 +121,11 @@ 'defines': [ 'SK_ENABLE_LIBPNG', ], + },{ #else if skia_os != android + 'sources!': [ + '../src/images/SkImageRef_ashmem.h', + '../src/images/SkImageRef_ashmem.cpp', + ], }], [ 'skia_os == "ios"', { 'include_dirs': [ diff --git a/ports.gyp b/ports.gyp index 0b298d1..219bf3e 100644 --- a/ports.gyp +++ b/ports.gyp @@ -161,7 +161,6 @@ '../src/ports/SkFontHost_FreeType.cpp', '../src/ports/SkFontHost_FreeType_common.cpp', '../src/ports/FontHostConfiguration_android.cpp', - '../src/ports/SkImageRef_ashmem.cpp', ], 'dependencies': [ 'freetype.gyp:freetype', -- cgit v1.2.3 From 725c0d5c00746eb9d57b3d180eec080b8276b652 Mon Sep 17 00:00:00 2001 From: "reed@google.com" Date: Mon, 4 Feb 2013 14:57:28 +0000 Subject: add benchmark for stroked drawRect/drawOval/drawRRect, to prepare for optimizing those based on special-casing stroking for single-contour-convex shapes. git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@7537 2bbb7eff-a529-9590-31e7-b0007b416f81 --- bench.gypi | 1 + 1 file changed, 1 insertion(+) diff --git a/bench.gypi b/bench.gypi index cf5c02e..46dfad8 100644 --- a/bench.gypi +++ b/bench.gypi @@ -42,6 +42,7 @@ '../bench/ScalarBench.cpp', '../bench/ShaderMaskBench.cpp', '../bench/SortBench.cpp', + '../bench/StrokeBench.cpp', '../bench/TableBench.cpp', '../bench/TextBench.cpp', '../bench/TileBench.cpp', -- cgit v1.2.3 From 329521665352314ce9b400e6ba8886554ba76a8e Mon Sep 17 00:00:00 2001 From: "reed@google.com" Date: Mon, 4 Feb 2013 16:56:15 +0000 Subject: add new gms for shallow_gradient, in preparation for improving their quality git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@7544 2bbb7eff-a529-9590-31e7-b0007b416f81 --- gmslides.gypi | 1 + 1 file changed, 1 insertion(+) diff --git a/gmslides.gypi b/gmslides.gypi index 8d772f3..70a77d2 100644 --- a/gmslides.gypi +++ b/gmslides.gypi @@ -72,6 +72,7 @@ '../gm/shadertext2.cpp', '../gm/shadertext3.cpp', '../gm/shadows.cpp', + '../gm/shallowgradient.cpp', '../gm/simpleaaclip.cpp', '../gm/spritebitmap.cpp', '../gm/srcmode.cpp', -- cgit v1.2.3 From 1cc9e5d5d6b9293c0b877eff16be5ab59b05bc94 Mon Sep 17 00:00:00 2001 From: "bsalomon@google.com" Date: Mon, 4 Feb 2013 22:17:13 +0000 Subject: Use XQuartz's version of OSMesa rather than Mac SDK's. It is newer and has a fix for a bug that unit tests and GM trigger. git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@7561 2bbb7eff-a529-9590-31e7-b0007b416f81 --- gpu.gyp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gpu.gyp b/gpu.gyp index 6c599e1..69e0815 100644 --- a/gpu.gyp +++ b/gpu.gyp @@ -155,7 +155,7 @@ }], [ 'skia_mesa and skia_os == "mac"', { 'include_dirs': [ - '$(SDKROOT)/usr/X11/include/', + '/opt/X11/include/', ], }], [ 'not skia_angle', { @@ -269,11 +269,11 @@ [ 'skia_mesa and skia_os == "mac"', { 'link_settings': { 'libraries': [ - '$(SDKROOT)/usr/X11/lib/libOSMesa.dylib', + '/opt/X11/lib/libOSMesa.dylib', ], }, 'include_dirs': [ - '$(SDKROOT)/usr/X11/include/', + '/opt/X11/include/', ], }], [ 'not skia_mesa', { -- cgit v1.2.3 From fe3fcc063bfae18b9c2f8eb640023f6a41053cf8 Mon Sep 17 00:00:00 2001 From: "senorblanco@chromium.org" Date: Mon, 4 Feb 2013 22:57:21 +0000 Subject: Nuke SkSingleInputImageFilter. 99% of its functionality was refactored into SkImageFilterUtils in https://code.google.com/p/skia/source/detail?r=7467, so it has outlived its usefulness. Review URL: https://codereview.appspot.com/7277055 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@7563 2bbb7eff-a529-9590-31e7-b0007b416f81 --- effects.gypi | 2 -- 1 file changed, 2 deletions(-) diff --git a/effects.gypi b/effects.gypi index 44d846a..31584df 100644 --- a/effects.gypi +++ b/effects.gypi @@ -43,7 +43,6 @@ '<(skia_src_path)/effects/SkPaintFlagsDrawFilter.cpp', '<(skia_src_path)/effects/SkPixelXorXfermode.cpp', '<(skia_src_path)/effects/SkPorterDuff.cpp', - '<(skia_src_path)/effects/SkSingleInputImageFilter.cpp', '<(skia_src_path)/effects/SkStippleMaskFilter.cpp', '<(skia_src_path)/effects/SkTableColorFilter.cpp', '<(skia_src_path)/effects/SkTableMaskFilter.cpp', @@ -98,7 +97,6 @@ '<(skia_include_path)/effects/SkPaintFlagsDrawFilter.h', '<(skia_include_path)/effects/SkPixelXorXfermode.h', '<(skia_include_path)/effects/SkPorterDuff.h', - '<(skia_include_path)/effects/SkSingleInputImageFilter.h', '<(skia_include_path)/effects/SkStippleMaskFilter.h', '<(skia_include_path)/effects/SkTableColorFilter.h', '<(skia_include_path)/effects/SkTableMaskFilter.h', -- cgit v1.2.3 From c5cd30418f76078e5a5571ded517bc4450b8ddad Mon Sep 17 00:00:00 2001 From: "edisonn@google.com" Date: Wed, 6 Feb 2013 18:54:13 +0000 Subject: Add a true Set class. Current use case is to be used with Pdf generator. Review URL: https://codereview.appspot.com/6749054 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@7626 2bbb7eff-a529-9590-31e7-b0007b416f81 --- tests.gyp | 1 + 1 file changed, 1 insertion(+) diff --git a/tests.gyp b/tests.gyp index 10e99d2..8544a15 100644 --- a/tests.gyp +++ b/tests.gyp @@ -100,6 +100,7 @@ '../tests/TestSize.cpp', '../tests/TileGridTest.cpp', '../tests/TLSTest.cpp', + '../tests/TSetTest.cpp', '../tests/ToUnicode.cpp', '../tests/UnicodeTest.cpp', '../tests/UtilsTest.cpp', -- cgit v1.2.3 From 5ff2fad9ed48c2ba2512990be28d5d354271d7a3 Mon Sep 17 00:00:00 2001 From: "edisonn@google.com" Date: Wed, 6 Feb 2013 21:42:34 +0000 Subject: rver r7626, might trigger for some strange reason a heap corruption git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@7631 2bbb7eff-a529-9590-31e7-b0007b416f81 --- tests.gyp | 1 - 1 file changed, 1 deletion(-) diff --git a/tests.gyp b/tests.gyp index 8544a15..10e99d2 100644 --- a/tests.gyp +++ b/tests.gyp @@ -100,7 +100,6 @@ '../tests/TestSize.cpp', '../tests/TileGridTest.cpp', '../tests/TLSTest.cpp', - '../tests/TSetTest.cpp', '../tests/ToUnicode.cpp', '../tests/UnicodeTest.cpp', '../tests/UtilsTest.cpp', -- cgit v1.2.3 From 421a60d001da8982516c5847b472dac6a509666b Mon Sep 17 00:00:00 2001 From: "caryclark@google.com" Date: Thu, 7 Feb 2013 13:13:41 +0000 Subject: shape ops work in progress git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@7637 2bbb7eff-a529-9590-31e7-b0007b416f81 --- shapeops_demo.gyp | 4 +++- shapeops_edge.gyp | 2 ++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/shapeops_demo.gyp b/shapeops_demo.gyp index 6a06f86..4537c01 100644 --- a/shapeops_demo.gyp +++ b/shapeops_demo.gyp @@ -45,6 +45,7 @@ '../experimental/Intersection/QuarticRoot.cpp', '../experimental/Intersection/ShapeOps.cpp', '../experimental/Intersection/Simplify.cpp', + '../experimental/Intersection/TriangleUtilities.cpp', '../experimental/Intersection/CubicParameterization.cpp', '../experimental/Intersection/CubicReduceOrder.cpp', '../experimental/Intersection/CubicSubDivide.cpp', @@ -65,7 +66,8 @@ '../experimental/Intersection/ShapeOps.h', '../experimental/Intersection/Simplify.h', '../experimental/Intersection/TSearch.h', - ], + '../experimental/Intersection/TriangleUtilities.h', + ], 'dependencies': [ 'skia_base_libs.gyp:skia_base_libs', 'effects.gyp:effects', diff --git a/shapeops_edge.gyp b/shapeops_edge.gyp index 34d60f4..c8fdd61 100644 --- a/shapeops_edge.gyp +++ b/shapeops_edge.gyp @@ -85,6 +85,7 @@ '../experimental/Intersection/SimplifyNew_Test.cpp', '../experimental/Intersection/SimplifyRect4x4_Test.cpp', '../experimental/Intersection/TestUtilities.cpp', + '../experimental/Intersection/TriangleUtilities.cpp', '../experimental/Intersection/CubicIntersection_TestData.h', '../experimental/Intersection/CubicLineSegments.h', '../experimental/Intersection/CubicUtilities.h', @@ -108,6 +109,7 @@ '../experimental/Intersection/ShapeOps.h', '../experimental/Intersection/Simplify.h', '../experimental/Intersection/TestUtilities.h', + '../experimental/Intersection/TriangleUtilities.h', '../experimental/Intersection/TSearch.h', '../experimental/Intersection/thingsToDo.txt', ], -- cgit v1.2.3 From 9c566d8b5d04173353a7a1e2ef019f821b0b298d Mon Sep 17 00:00:00 2001 From: "djsollen@google.com" Date: Thu, 7 Feb 2013 18:58:35 +0000 Subject: Fix errors when compiling with -Wall -Werror on Android. This CL also turns those features on by default on Android Review URL: https://codereview.appspot.com/7313049 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@7645 2bbb7eff-a529-9590-31e7-b0007b416f81 --- common_conditions.gypi | 2 ++ jsoncpp.gyp | 6 ++++++ libjpeg.gyp | 2 ++ utils.gyp | 8 +++++++- 4 files changed, 17 insertions(+), 1 deletion(-) diff --git a/common_conditions.gypi b/common_conditions.gypi index d61cc94..d1368dd 100644 --- a/common_conditions.gypi +++ b/common_conditions.gypi @@ -311,8 +311,10 @@ '-llog', ], 'cflags': [ + '-Wall', '-fno-exceptions', '-fno-rtti', + '-fstrict-aliasing', '-fuse-ld=gold', ], 'conditions': [ diff --git a/jsoncpp.gyp b/jsoncpp.gyp index 1ee33fd..07507d4 100644 --- a/jsoncpp.gyp +++ b/jsoncpp.gyp @@ -61,6 +61,12 @@ }, }, }], + [ 'skia_os == "android"', { + 'cflags!': [ + '-Wall', + '-Werror', + ], + }], ], }, ], diff --git a/libjpeg.gyp b/libjpeg.gyp index 5780b27..a9d6aef 100644 --- a/libjpeg.gyp +++ b/libjpeg.gyp @@ -89,6 +89,8 @@ ['OS=="android"', { 'cflags!': [ '-fno-rtti', # supresses warnings about invalid option of non-C++ code + '-Wall', + '-Werror', ], }], ], diff --git a/utils.gyp b/utils.gyp index c62657d..7c445d0 100644 --- a/utils.gyp +++ b/utils.gyp @@ -199,7 +199,7 @@ }], [ 'skia_os == "android"', { 'sources': [ - '../src/utils/android/ashmem.c', + '../src/utils/android/ashmem.cpp', ], }], ], @@ -242,6 +242,12 @@ }, }, }], + [ 'skia_os == "android"', { + 'cflags!': [ + '-Wall', + '-Werror', + ], + }], ], }, ], -- cgit v1.2.3 From 3e95628bd6ac702ce95c0060639fd22dd02e50bc Mon Sep 17 00:00:00 2001 From: "robertphillips@google.com" Date: Thu, 7 Feb 2013 19:45:46 +0000 Subject: Enhance GL error checking for non-Ganesh GL calls https://codereview.appspot.com/7312057/ git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@7647 2bbb7eff-a529-9590-31e7-b0007b416f81 --- tools.gyp | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/tools.gyp b/tools.gyp index 8148358..121779b 100644 --- a/tools.gyp +++ b/tools.gyp @@ -144,6 +144,15 @@ 'images.gyp:images', 'tools.gyp:picture_utils', ], + 'conditions': [ + ['skia_gpu == 1', + { + 'include_dirs' : [ + '../src/gpu', + ], + }, + ], + ], 'export_dependent_settings': [ 'images.gyp:images', ], -- cgit v1.2.3 From 2a9705d5b73929d78de2efe79ddf79a096409d1d Mon Sep 17 00:00:00 2001 From: "bsalomon@google.com" Date: Thu, 7 Feb 2013 22:00:29 +0000 Subject: Remove compile time option to use different types for text vertices. Review URL: https://codereview.appspot.com/7309060 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@7658 2bbb7eff-a529-9590-31e7-b0007b416f81 --- gpu.gypi | 1 - 1 file changed, 1 deletion(-) diff --git a/gpu.gypi b/gpu.gypi index bf301bb..62137a0 100644 --- a/gpu.gypi +++ b/gpu.gypi @@ -74,7 +74,6 @@ '<(skia_src_path)/gpu/GrGpu.cpp', '<(skia_src_path)/gpu/GrGpu.h', '<(skia_src_path)/gpu/GrGpuFactory.cpp', - '<(skia_src_path)/gpu/GrGpuVertex.h', '<(skia_src_path)/gpu/GrIndexBuffer.h', '<(skia_src_path)/gpu/GrInOrderDrawBuffer.cpp', '<(skia_src_path)/gpu/GrInOrderDrawBuffer.h', -- cgit v1.2.3 From 94e101cccb55d1900ee5cdc83c94e35ebe24eee9 Mon Sep 17 00:00:00 2001 From: "senorblanco@chromium.org" Date: Fri, 8 Feb 2013 16:40:14 +0000 Subject: Add a bench for SkBicubicImageFilter. Review URL: https://codereview.appspot.com/7312056 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@7668 2bbb7eff-a529-9590-31e7-b0007b416f81 --- bench.gypi | 1 + 1 file changed, 1 insertion(+) diff --git a/bench.gypi b/bench.gypi index 46dfad8..6372cf3 100644 --- a/bench.gypi +++ b/bench.gypi @@ -7,6 +7,7 @@ '../bench/SkBenchmark.cpp', '../bench/AAClipBench.cpp', + '../bench/BicubicBench.cpp', '../bench/BitmapBench.cpp', '../bench/BitmapRectBench.cpp', '../bench/BlurBench.cpp', -- cgit v1.2.3 From 7b2a0471c7f429d502c2cbf6edafe330fbe17a19 Mon Sep 17 00:00:00 2001 From: "jvanverth@google.com" Date: Fri, 8 Feb 2013 17:13:09 +0000 Subject: Add Random unit tests. https://codereview.appspot.com/7306066/ git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@7670 2bbb7eff-a529-9590-31e7-b0007b416f81 --- tests.gyp | 1 + 1 file changed, 1 insertion(+) diff --git a/tests.gyp b/tests.gyp index 10e99d2..082336f 100644 --- a/tests.gyp +++ b/tests.gyp @@ -77,6 +77,7 @@ '../tests/PointTest.cpp', '../tests/PremulAlphaRoundTripTest.cpp', '../tests/QuickRejectTest.cpp', + '../tests/RandomTest.cpp', '../tests/Reader32Test.cpp', '../tests/ReadPixelsTest.cpp', '../tests/ReadWriteAlphaTest.cpp', -- cgit v1.2.3 From fe4f566a6c8cd5aa23f34cece2f85c61fd68cbdc Mon Sep 17 00:00:00 2001 From: "humper@google.com" Date: Fri, 8 Feb 2013 21:45:33 +0000 Subject: match chromium's approach for locating the most appropriate macos SDK to use By doing this, the ninja generator for gyp works great on macos, resulting in faster (I think) and much, much terser builds. BUG= Review URL: https://codereview.appspot.com/7142047 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@7684 2bbb7eff-a529-9590-31e7-b0007b416f81 --- common_conditions.gypi | 11 ++++++++++- common_variables.gypi | 2 +- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/common_conditions.gypi b/common_conditions.gypi index d1368dd..cfcc7f2 100644 --- a/common_conditions.gypi +++ b/common_conditions.gypi @@ -195,6 +195,9 @@ ['skia_os == "mac"', { + 'variables': { + 'mac_sdk%': ' Date: Wed, 13 Feb 2013 20:12:21 +0000 Subject: Fix moc generation with SK_SUPPORT_GPU defined https://codereview.appspot.com/7305088/ git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@7725 2bbb7eff-a529-9590-31e7-b0007b416f81 --- debugger.gyp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debugger.gyp b/debugger.gyp index 40ce090..9f8b5b3 100644 --- a/debugger.gyp +++ b/debugger.gyp @@ -155,7 +155,7 @@ 'rule_name': 'generate_moc', 'extension': 'h', 'outputs': [ '<(moc_gen_dir)/moc_<(RULE_INPUT_ROOT).cpp' ], - 'action': [ '<(qt_moc)', '<(RULE_INPUT_PATH)', '-o', '<(moc_gen_dir)/moc_<(RULE_INPUT_ROOT).cpp' ], + 'action': [ '<(qt_moc)', '-DSK_SUPPORT_GPU=<(skia_gpu)', '<(RULE_INPUT_PATH)', '-o', '<(moc_gen_dir)/moc_<(RULE_INPUT_ROOT).cpp' ], 'message': 'Generating <(RULE_INPUT_ROOT).cpp.', }, ], -- cgit v1.2.3 From d5f44277cf13a6e35f3ae27890a4e6aa561c3089 Mon Sep 17 00:00:00 2001 From: "bsalomon@google.com" Date: Wed, 13 Feb 2013 21:22:13 +0000 Subject: Add animated line chart sample R=robertphillips@google.com Review URL: https://codereview.appspot.com/7307117 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@7727 2bbb7eff-a529-9590-31e7-b0007b416f81 --- SampleApp.gyp | 1 + 1 file changed, 1 insertion(+) diff --git a/SampleApp.gyp b/SampleApp.gyp index 8d833dd..d93155a 100644 --- a/SampleApp.gyp +++ b/SampleApp.gyp @@ -37,6 +37,7 @@ '../samplecode/SampleBitmapRect.cpp', '../samplecode/SampleBlur.cpp', '../samplecode/SampleCamera.cpp', + '../samplecode/SampleChart.cpp', '../samplecode/SampleCircle.cpp', '../samplecode/SampleClip.cpp', '../samplecode/SampleCode.h', -- cgit v1.2.3 From ec349ece47a7ab67e68bdd76732008aadb803f7e Mon Sep 17 00:00:00 2001 From: "caryclark@google.com" Date: Thu, 14 Feb 2013 15:29:11 +0000 Subject: shape ops work in progress git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@7738 2bbb7eff-a529-9590-31e7-b0007b416f81 --- shapeops_edge.gyp | 1 + 1 file changed, 1 insertion(+) diff --git a/shapeops_edge.gyp b/shapeops_edge.gyp index c8fdd61..2cbc813 100644 --- a/shapeops_edge.gyp +++ b/shapeops_edge.gyp @@ -19,6 +19,7 @@ '../experimental/Intersection/CubicBezierClip.cpp', '../experimental/Intersection/CubicBezierClip_Test.cpp', '../experimental/Intersection/CubicBounds.cpp', + '../experimental/Intersection/CubicConvexHull.cpp', '../experimental/Intersection/CubicIntersection.cpp', '../experimental/Intersection/CubicIntersection_Test.cpp', '../experimental/Intersection/CubicIntersection_TestData.cpp', -- cgit v1.2.3 From 29e967e3381c09f4788f539c2d1792d45fb4436f Mon Sep 17 00:00:00 2001 From: "humper@google.com" Date: Thu, 14 Feb 2013 18:57:59 +0000 Subject: debug dump functions for mathematica visualization BUG= Review URL: https://codereview.appspot.com/7322078 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@7743 2bbb7eff-a529-9590-31e7-b0007b416f81 --- utils.gyp | 1 + 1 file changed, 1 insertion(+) diff --git a/utils.gyp b/utils.gyp index 7c445d0..3b129d3 100644 --- a/utils.gyp +++ b/utils.gyp @@ -35,6 +35,7 @@ '../include/utils/SkCamera.h', '../include/utils/SkCubicInterval.h', '../include/utils/SkCullPoints.h', + '../include/utils/SkDebugUtils.h', '../include/utils/SkDeferredCanvas.h', '../include/utils/SkDumpCanvas.h', '../include/utils/SkInterpolator.h', -- cgit v1.2.3 From 5189b7a4a413702eac9e9e373506df062b62bb22 Mon Sep 17 00:00:00 2001 From: "bsalomon@google.com" Date: Wed, 20 Feb 2013 19:33:20 +0000 Subject: Add GrGLBufferImpl to unify implementation of GrGLVertexBuffer and GrGLIndexBuffer. Review URL: https://codereview.appspot.com/7346055 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@7798 2bbb7eff-a529-9590-31e7-b0007b416f81 --- gpu.gypi | 2 ++ 1 file changed, 2 insertions(+) diff --git a/gpu.gypi b/gpu.gypi index 62137a0..93ccd42 100644 --- a/gpu.gypi +++ b/gpu.gypi @@ -134,6 +134,8 @@ '<(skia_src_path)/gpu/effects/GrTextureDomainEffect.cpp', '<(skia_src_path)/gpu/effects/GrTextureDomainEffect.h', + '<(skia_src_path)/gpu/gl/GrGLBufferImpl.cpp', + '<(skia_src_path)/gpu/gl/GrGLBufferImpl.h', '<(skia_src_path)/gpu/gl/GrGLCaps.cpp', '<(skia_src_path)/gpu/gl/GrGLCaps.h', '<(skia_src_path)/gpu/gl/GrGLContextInfo.cpp', -- cgit v1.2.3 From 8fb4b8446274358473b45fc71c61465954efa716 Mon Sep 17 00:00:00 2001 From: "sugoi@google.com" Date: Thu, 21 Feb 2013 15:02:28 +0000 Subject: New SkRectShaderImageFilter image filter This new changelist also introduces a new image filter called SkRectShaderImageFilter which is make to simply apply a shader on a region without using any inputs. TEST=Added ShaderImageFilter test Review URL: https://codereview.appspot.com/7300046 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@7808 2bbb7eff-a529-9590-31e7-b0007b416f81 --- effects.gypi | 2 ++ tests.gyp | 1 + 2 files changed, 3 insertions(+) diff --git a/effects.gypi b/effects.gypi index 31584df..7dede6e 100644 --- a/effects.gypi +++ b/effects.gypi @@ -43,6 +43,7 @@ '<(skia_src_path)/effects/SkPaintFlagsDrawFilter.cpp', '<(skia_src_path)/effects/SkPixelXorXfermode.cpp', '<(skia_src_path)/effects/SkPorterDuff.cpp', + '<(skia_src_path)/effects/SkRectShaderImageFilter.cpp', '<(skia_src_path)/effects/SkStippleMaskFilter.cpp', '<(skia_src_path)/effects/SkTableColorFilter.cpp', '<(skia_src_path)/effects/SkTableMaskFilter.cpp', @@ -97,6 +98,7 @@ '<(skia_include_path)/effects/SkPaintFlagsDrawFilter.h', '<(skia_include_path)/effects/SkPixelXorXfermode.h', '<(skia_include_path)/effects/SkPorterDuff.h', + '<(skia_include_path)/effects/SkRectShaderImageFilter.h', '<(skia_include_path)/effects/SkStippleMaskFilter.h', '<(skia_include_path)/effects/SkTableColorFilter.h', '<(skia_include_path)/effects/SkTableMaskFilter.h', diff --git a/tests.gyp b/tests.gyp index 082336f..247148b 100644 --- a/tests.gyp +++ b/tests.gyp @@ -88,6 +88,7 @@ '../tests/RTreeTest.cpp', '../tests/SHA1Test.cpp', '../tests/ScalarTest.cpp', + '../tests/ShaderImageFilterTest.cpp', '../tests/ShaderOpacityTest.cpp', '../tests/Sk64Test.cpp', '../tests/skia_test.cpp', -- cgit v1.2.3 From 2da0220e12010bd581861fd1f07f16b7f7d554da Mon Sep 17 00:00:00 2001 From: "bsalomon@google.com" Date: Fri, 22 Feb 2013 15:10:36 +0000 Subject: Add chart bench. Review URL: https://codereview.appspot.com/7368051 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@7821 2bbb7eff-a529-9590-31e7-b0007b416f81 --- bench.gypi | 1 + 1 file changed, 1 insertion(+) diff --git a/bench.gypi b/bench.gypi index 6372cf3..a18ace8 100644 --- a/bench.gypi +++ b/bench.gypi @@ -13,6 +13,7 @@ '../bench/BlurBench.cpp', '../bench/BlurRectBench.cpp', '../bench/ChecksumBench.cpp', + '../bench/ChartBench.cpp', '../bench/ChromeBench.cpp', '../bench/DashBench.cpp', '../bench/DecodeBench.cpp', -- cgit v1.2.3 From c720674dc5dfe3bdbd889c6a45038bbe57185d2e Mon Sep 17 00:00:00 2001 From: "scroggo@google.com" Date: Fri, 22 Feb 2013 21:38:35 +0000 Subject: Create SkLazyPixelRef which performs lazy decoding. The new pixel ref behaves similarly to SkImageRef, with some key differences: It does not depend on the images project. It requires an SkImageCache, which handles allocation and caching of the pixel memory. It takes a function signature for decoding which decodes into already allocated pixel memory rather than into an SkBitmap. Add two implementations of SkImageCache: SkLruImageCache and SkAshmemImageCache. Replace SkSerializationHelpers::DecodeBitmap with SkPicture::InstallPixelRefProc, and update sites that referenced it. SkBitmapFactory now sets the pixel ref to a new object of the new class SkLazyPixelRef, provided it has an SkImageCache for caching. Provide an option to do lazy decodes in render_pictures and bench_pictures. SkPicture: Eliminate the default parameters in the constructor. If a proc for decoding bitmaps is installed, use it to decode any encoded data in subpictures. When parsing deserializing subpictures, check for success. When serializing subpictures, pass the picture's bitmap encoder to the subpicture's call to serialize. Update BitmapFactoryTest to test its new behavior. BUG=https://code.google.com/p/skia/issues/detail?id=1008 BUG=https://code.google.com/p/skia/issues/detail?id=1009 Review URL: https://codereview.appspot.com/7060052 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@7835 2bbb7eff-a529-9590-31e7-b0007b416f81 --- animator.gyp | 7 ++++--- core.gyp | 2 ++ core.gypi | 10 ++++++++++ images.gyp | 6 ++++-- ports.gyp | 3 +++ tests.gyp | 1 + views.gyp | 9 +++++---- views_animated.gyp | 13 +++++++------ 8 files changed, 36 insertions(+), 15 deletions(-) diff --git a/animator.gyp b/animator.gyp index 942e849..a462ca4 100644 --- a/animator.gyp +++ b/animator.gyp @@ -10,14 +10,15 @@ 'type': 'static_library', 'standalone_static_library': 1, 'include_dirs': [ + '../include/animator', '../include/config', '../include/core', '../include/effects', - '../include/animator', + '../include/images', + '../include/lazy', + '../include/utils', '../include/views', '../include/xml', - '../include/utils', - '../include/images', '../src/utils', ], 'sources': [ diff --git a/core.gyp b/core.gyp index 7e7640c..76994e1 100644 --- a/core.gyp +++ b/core.gyp @@ -15,6 +15,7 @@ 'include_dirs': [ '../include/config', '../include/core', + '../include/lazy', '../include/pipe', '../include/ports', '../include/utils', @@ -106,6 +107,7 @@ 'config', '../include/config', '../include/core', + '../include/lazy', '../include/pipe', 'ext', ], diff --git a/core.gypi b/core.gypi index d5f76a3..9831bbb 100644 --- a/core.gypi +++ b/core.gypi @@ -281,6 +281,16 @@ '<(skia_include_path)/core/SkWeakRefCnt.h', '<(skia_include_path)/core/SkWriter32.h', '<(skia_include_path)/core/SkXfermode.h', + + # Lazy decoding: + '<(skia_include_path)/lazy/SkBitmapFactory.h', + '<(skia_include_path)/lazy/SkImageCache.h', + '<(skia_include_path)/lazy/SkLruImageCache.h', + + '<(skia_src_path)/lazy/SkBitmapFactory.cpp', + '<(skia_src_path)/lazy/SkLazyPixelRef.h', + '<(skia_src_path)/lazy/SkLazyPixelRef.cpp', + '<(skia_src_path)/lazy/SkLruImageCache.cpp', ], } diff --git a/images.gyp b/images.gyp index 8c4690e..2f007ff 100644 --- a/images.gyp +++ b/images.gyp @@ -16,9 +16,11 @@ '../include/config', '../include/core', '../include/images', + '../include/lazy', + # for access to SkImagePriv.h + '../src/image/', ], 'sources': [ - '../include/images/SkBitmapFactory.h', '../include/images/SkImageDecoder.h', '../include/images/SkImageEncoder.h', '../include/images/SkImageRef.h', @@ -29,7 +31,6 @@ '../src/images/bmpdecoderhelper.cpp', '../src/images/bmpdecoderhelper.h', - '../src/images/SkBitmapFactory.cpp', '../src/images/SkFDStream.cpp', '../src/images/SkImageDecoder.cpp', '../src/images/SkImageDecoder_Factory.cpp', @@ -136,6 +137,7 @@ 'direct_dependent_settings': { 'include_dirs': [ '../include/images', + '../include/lazy', ], }, }, diff --git a/ports.gyp b/ports.gyp index 219bf3e..814441a 100644 --- a/ports.gyp +++ b/ports.gyp @@ -155,12 +155,15 @@ '../src/ports/SkDebug_stdio.cpp', ], 'sources': [ + '../include/ports/SkAshmemImageCache.h', + '../src/ports/SkDebug_android.cpp', '../src/ports/SkThread_pthread.cpp', '../src/ports/SkFontHost_android.cpp', '../src/ports/SkFontHost_FreeType.cpp', '../src/ports/SkFontHost_FreeType_common.cpp', '../src/ports/FontHostConfiguration_android.cpp', + '../src/ports/SkAshmemImageCache.cpp', ], 'dependencies': [ 'freetype.gyp:freetype', diff --git a/tests.gyp b/tests.gyp index 247148b..6362352 100644 --- a/tests.gyp +++ b/tests.gyp @@ -10,6 +10,7 @@ 'include_dirs' : [ '../src/core', '../src/effects', + '../src/lazy', '../src/pdf', '../src/pipe/utils', '../src/utils', diff --git a/views.gyp b/views.gyp index b0697a0..aca3bb3 100644 --- a/views.gyp +++ b/views.gyp @@ -14,12 +14,13 @@ 'include_dirs': [ '../include/config', '../include/core', - '../include/views', - '../include/xml', - '../include/utils', - '../include/images', '../include/effects', + '../include/images', + '../include/lazy', + '../include/utils', + '../include/views', '../include/views/unix', + '../include/xml', ], 'dependencies': [ 'angle.gyp:*', diff --git a/views_animated.gyp b/views_animated.gyp index 1767fe1..29e981d 100644 --- a/views_animated.gyp +++ b/views_animated.gyp @@ -6,16 +6,17 @@ 'target_name': 'views_animated', 'type': 'static_library', 'include_dirs': [ + '../include/animator', '../include/config', '../include/core', - '../include/views', - '../include/xml', - '../include/utils', - '../include/images', - '../include/animator', '../include/effects', - '../include/views/unix', + '../include/images', + '../include/lazy', + '../include/utils', + '../include/views', '../include/views/animated', + '../include/views/unix', + '../include/xml', ], 'sources': [ '../include/views/animated/SkBorderView.h', -- cgit v1.2.3 From a7f4e3d1232c64fc8318d298192d60950fbff667 Mon Sep 17 00:00:00 2001 From: "reed@google.com" Date: Mon, 25 Feb 2013 18:17:12 +0000 Subject: move SkFDStream out of images into core git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@7846 2bbb7eff-a529-9590-31e7-b0007b416f81 --- core.gypi | 1 + images.gyp | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/core.gypi b/core.gypi index 9831bbb..590cac2 100644 --- a/core.gypi +++ b/core.gypi @@ -76,6 +76,7 @@ '<(skia_src_path)/core/SkEdgeClipper.cpp', '<(skia_src_path)/core/SkEdge.cpp', '<(skia_src_path)/core/SkEdge.h', + '<(skia_src_path)/core/SkFDStream.cpp', '<(skia_src_path)/core/SkFP.h', '<(skia_src_path)/core/SkFilterProc.cpp', '<(skia_src_path)/core/SkFilterProc.h', diff --git a/images.gyp b/images.gyp index 2f007ff..4560980 100644 --- a/images.gyp +++ b/images.gyp @@ -31,7 +31,6 @@ '../src/images/bmpdecoderhelper.cpp', '../src/images/bmpdecoderhelper.h', - '../src/images/SkFDStream.cpp', '../src/images/SkImageDecoder.cpp', '../src/images/SkImageDecoder_Factory.cpp', '../src/images/SkImageDecoder_libjpeg.cpp', -- cgit v1.2.3 From 8a7b690699254a6da54ae88fd6531e4be980a374 Mon Sep 17 00:00:00 2001 From: "edisonn@google.com" Date: Mon, 25 Feb 2013 20:07:24 +0000 Subject: Add an SkSet class to be used by Pdf only, for now - reverted because of triggering heap corruption on Win7, original coe review: https://codereview.appspot.com/6749054 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@7849 2bbb7eff-a529-9590-31e7-b0007b416f81 --- tests.gyp | 1 + 1 file changed, 1 insertion(+) diff --git a/tests.gyp b/tests.gyp index 6362352..6d6998b 100644 --- a/tests.gyp +++ b/tests.gyp @@ -103,6 +103,7 @@ '../tests/TestSize.cpp', '../tests/TileGridTest.cpp', '../tests/TLSTest.cpp', + '../tests/TSetTest.cpp', '../tests/ToUnicode.cpp', '../tests/UnicodeTest.cpp', '../tests/UtilsTest.cpp', -- cgit v1.2.3 From 76733afac8083e8522157385f59f668338929c69 Mon Sep 17 00:00:00 2001 From: "bsalomon@google.com" Date: Tue, 26 Feb 2013 14:34:43 +0000 Subject: Consolidate functions common the the null and debug GL interfaces. R=robertphillips@google.com Review URL: https://codereview.appspot.com/7400053 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@7860 2bbb7eff-a529-9590-31e7-b0007b416f81 --- gpu.gypi | 2 ++ 1 file changed, 2 insertions(+) diff --git a/gpu.gypi b/gpu.gypi index 93ccd42..e3529b9 100644 --- a/gpu.gypi +++ b/gpu.gypi @@ -151,6 +151,8 @@ '<(skia_src_path)/gpu/gl/GrGLIndexBuffer.h', '<(skia_src_path)/gpu/gl/GrGLInterface.cpp', '<(skia_src_path)/gpu/gl/GrGLIRect.h', + '<(skia_src_path)/gpu/gl/GrGLNoOpInterface.cpp', + '<(skia_src_path)/gpu/gl/GrGLNoOpInterface.h', '<(skia_src_path)/gpu/gl/GrGLPath.cpp', '<(skia_src_path)/gpu/gl/GrGLPath.h', '<(skia_src_path)/gpu/gl/GrGLProgram.cpp', -- cgit v1.2.3 From 155850ca7cc863f0b25cf0752d7aa991d5438336 Mon Sep 17 00:00:00 2001 From: "reed@google.com" Date: Tue, 26 Feb 2013 16:57:16 +0000 Subject: move SampleTypeface into gm/typefacestyles git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@7867 2bbb7eff-a529-9590-31e7-b0007b416f81 --- SampleApp.gyp | 1 - 1 file changed, 1 deletion(-) diff --git a/SampleApp.gyp b/SampleApp.gyp index d93155a..b4104ed 100644 --- a/SampleApp.gyp +++ b/SampleApp.gyp @@ -99,7 +99,6 @@ '../samplecode/SampleTextureDomain.cpp', '../samplecode/SampleTiling.cpp', '../samplecode/SampleTinyBitmap.cpp', - '../samplecode/SampleTypeface.cpp', '../samplecode/SampleUnitMapper.cpp', '../samplecode/SampleVertices.cpp', '../samplecode/SampleXfermodesBlur.cpp', -- cgit v1.2.3 From 6acd48f68d5a160e69af7d707a077f27db5e6b5e Mon Sep 17 00:00:00 2001 From: "bsalomon@google.com" Date: Tue, 26 Feb 2013 21:46:32 +0000 Subject: Use glGetStringi to get extensions when available. Review URL: https://codereview.chromium.org/12328111 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@7872 2bbb7eff-a529-9590-31e7-b0007b416f81 --- gpu.gypi | 2 ++ 1 file changed, 2 insertions(+) diff --git a/gpu.gypi b/gpu.gypi index e3529b9..dffc07d 100644 --- a/gpu.gypi +++ b/gpu.gypi @@ -38,6 +38,7 @@ '<(skia_include_path)/gpu/GrUserConfig.h', '<(skia_include_path)/gpu/gl/GrGLConfig.h', + '<(skia_include_path)/gpu/gl/GrGLExtensions.h', '<(skia_include_path)/gpu/gl/GrGLFunctions.h', '<(skia_include_path)/gpu/gl/GrGLInterface.h', @@ -145,6 +146,7 @@ '<(skia_src_path)/gpu/gl/GrGLDefines.h', '<(skia_src_path)/gpu/gl/GrGLEffect.cpp', '<(skia_src_path)/gpu/gl/GrGLEffect.h', + '<(skia_src_path)/gpu/gl/GrGLExtensions.cpp', '<(skia_src_path)/gpu/gl/GrGLEffectMatrix.cpp', '<(skia_src_path)/gpu/gl/GrGLEffectMatrix.h', '<(skia_src_path)/gpu/gl/GrGLIndexBuffer.cpp', -- cgit v1.2.3 From 3d8320ed48b59fc7d39fd7d60a3bb03b3d1c1526 Mon Sep 17 00:00:00 2001 From: "borenet@google.com" Date: Wed, 27 Feb 2013 14:12:55 +0000 Subject: Build freetype as a standalone_static_library Needed by external applications which don't use our libraries in-place. Review URL: https://codereview.chromium.org/12328138 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@7879 2bbb7eff-a529-9590-31e7-b0007b416f81 --- freetype.gyp | 1 + 1 file changed, 1 insertion(+) diff --git a/freetype.gyp b/freetype.gyp index db61742..1742697 100644 --- a/freetype.gyp +++ b/freetype.gyp @@ -3,6 +3,7 @@ { 'target_name': 'freetype', 'type': 'static_library', + 'standalone_static_library': 1, 'sources': [ # base components (required) '../third_party/externals/freetype/src/base/ftsystem.c', -- cgit v1.2.3 From c3bb3a4d57e899d211caeb4be5d25817e445d8d9 Mon Sep 17 00:00:00 2001 From: "edisonn@google.com" Date: Wed, 27 Feb 2013 16:54:44 +0000 Subject: Use SkSet to fix issue when pdf generates an exp number of resources. The problem fixed - http://code.google.com/p/skia/issues/detail?id=940 - is that getResources will recursively obtain all child resource recursively without checking for duplicates. If we have lots of duplicates, then we try to build a very large vector (exponential with the number of nodes usually) and sooner or later we end up using too much memory and crash. A possible solution could have been to make sure resources do not have duplicates, but that requirement is impractical, and it this leaves the solution fragile, if there is any issue in the tree, we crash. When we emit the pdf, the large number of duplicates is not an issue, because SkPDFCatalog::addObject will deal with duplicates. I have run the gm with --config pdf, and the images are 100% same bits, while the pdfs have the same size but some very small changes, the order of some objects. Review URL: https://codereview.appspot.com/6744050 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@7883 2bbb7eff-a529-9590-31e7-b0007b416f81 --- pdf.gyp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pdf.gyp b/pdf.gyp index 7b3b9ea..081df01 100644 --- a/pdf.gyp +++ b/pdf.gyp @@ -12,6 +12,7 @@ 'include_dirs': [ '../include/config', '../include/core', + '../include/images', '../include/pdf', '../src/core', # needed to get SkGlyphCache.h and SkTextFormatParams.h '../src/utils', # needed to get SkBitSet.h @@ -43,6 +44,7 @@ '../src/pdf/SkPDFTypes.h', '../src/pdf/SkPDFUtils.cpp', '../src/pdf/SkPDFUtils.h', + '../src/pdf/SkTSet.h', ], # This section makes all targets that depend on this target # #define SK_SUPPORT_PDF and have access to the pdf header files. -- cgit v1.2.3 From 94c857b088c29eff20f9d98de28540fae509c24a Mon Sep 17 00:00:00 2001 From: "edisonn@google.com" Date: Wed, 27 Feb 2013 17:46:09 +0000 Subject: Revert r7883 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@7884 2bbb7eff-a529-9590-31e7-b0007b416f81 --- pdf.gyp | 2 -- 1 file changed, 2 deletions(-) diff --git a/pdf.gyp b/pdf.gyp index 081df01..7b3b9ea 100644 --- a/pdf.gyp +++ b/pdf.gyp @@ -12,7 +12,6 @@ 'include_dirs': [ '../include/config', '../include/core', - '../include/images', '../include/pdf', '../src/core', # needed to get SkGlyphCache.h and SkTextFormatParams.h '../src/utils', # needed to get SkBitSet.h @@ -44,7 +43,6 @@ '../src/pdf/SkPDFTypes.h', '../src/pdf/SkPDFUtils.cpp', '../src/pdf/SkPDFUtils.h', - '../src/pdf/SkTSet.h', ], # This section makes all targets that depend on this target # #define SK_SUPPORT_PDF and have access to the pdf header files. -- cgit v1.2.3 From 5800c385f7778495f927ee1d24a02101fee7f5f6 Mon Sep 17 00:00:00 2001 From: "reed@google.com" Date: Wed, 27 Feb 2013 19:06:52 +0000 Subject: enable fontconfig by default in ports.gyp git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@7888 2bbb7eff-a529-9590-31e7-b0007b416f81 --- ports.gyp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/ports.gyp b/ports.gyp index 814441a..2da18a7 100644 --- a/ports.gyp +++ b/ports.gyp @@ -46,13 +46,15 @@ 'link_settings': { 'libraries': [ '-lfreetype', + '-lfontconfig', '-ldl', ], }, 'sources': [ '../src/ports/SkFontHost_FreeType.cpp', '../src/ports/SkFontHost_FreeType_common.cpp', - '../src/ports/SkFontHost_linux.cpp', + '../src/ports/SkFontHost_fontconfig.cpp', + '../src/ports/SkFontConfigInterface_direct.cpp', '../src/ports/SkThread_pthread.cpp', ], }], -- cgit v1.2.3 From 840ed68ceb521d711e92a9b3047d7aa46472eafd Mon Sep 17 00:00:00 2001 From: "reed@google.com" Date: Wed, 27 Feb 2013 19:17:07 +0000 Subject: revert fontconfig gyp change for now (need to install it on housekeeper and chromeos bots) git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@7890 2bbb7eff-a529-9590-31e7-b0007b416f81 --- ports.gyp | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/ports.gyp b/ports.gyp index 2da18a7..814441a 100644 --- a/ports.gyp +++ b/ports.gyp @@ -46,15 +46,13 @@ 'link_settings': { 'libraries': [ '-lfreetype', - '-lfontconfig', '-ldl', ], }, 'sources': [ '../src/ports/SkFontHost_FreeType.cpp', '../src/ports/SkFontHost_FreeType_common.cpp', - '../src/ports/SkFontHost_fontconfig.cpp', - '../src/ports/SkFontConfigInterface_direct.cpp', + '../src/ports/SkFontHost_linux.cpp', '../src/ports/SkThread_pthread.cpp', ], }], -- cgit v1.2.3 From e97263195e7ad088f54d0287858aea0747f13fc8 Mon Sep 17 00:00:00 2001 From: "edisonn@google.com" Date: Wed, 27 Feb 2013 19:45:11 +0000 Subject: resubmit after fixing assert issue: https://codereview.appspot.com/6744050 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@7892 2bbb7eff-a529-9590-31e7-b0007b416f81 --- pdf.gyp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pdf.gyp b/pdf.gyp index 7b3b9ea..081df01 100644 --- a/pdf.gyp +++ b/pdf.gyp @@ -12,6 +12,7 @@ 'include_dirs': [ '../include/config', '../include/core', + '../include/images', '../include/pdf', '../src/core', # needed to get SkGlyphCache.h and SkTextFormatParams.h '../src/utils', # needed to get SkBitSet.h @@ -43,6 +44,7 @@ '../src/pdf/SkPDFTypes.h', '../src/pdf/SkPDFUtils.cpp', '../src/pdf/SkPDFUtils.h', + '../src/pdf/SkTSet.h', ], # This section makes all targets that depend on this target # #define SK_SUPPORT_PDF and have access to the pdf header files. -- cgit v1.2.3 From 3b54ad12d56a205087d7986888f8d7f3ec908a1f Mon Sep 17 00:00:00 2001 From: "edisonn@google.com" Date: Thu, 28 Feb 2013 14:01:44 +0000 Subject: revert r7892 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@7896 2bbb7eff-a529-9590-31e7-b0007b416f81 --- pdf.gyp | 2 -- 1 file changed, 2 deletions(-) diff --git a/pdf.gyp b/pdf.gyp index 081df01..7b3b9ea 100644 --- a/pdf.gyp +++ b/pdf.gyp @@ -12,7 +12,6 @@ 'include_dirs': [ '../include/config', '../include/core', - '../include/images', '../include/pdf', '../src/core', # needed to get SkGlyphCache.h and SkTextFormatParams.h '../src/utils', # needed to get SkBitSet.h @@ -44,7 +43,6 @@ '../src/pdf/SkPDFTypes.h', '../src/pdf/SkPDFUtils.cpp', '../src/pdf/SkPDFUtils.h', - '../src/pdf/SkTSet.h', ], # This section makes all targets that depend on this target # #define SK_SUPPORT_PDF and have access to the pdf header files. -- cgit v1.2.3 From 44c50bc3d5386ee09302a1f54a6b12d963f1f733 Mon Sep 17 00:00:00 2001 From: "robertphillips@google.com" Date: Thu, 28 Feb 2013 20:16:25 +0000 Subject: Split GrGLContextInfo into GrGLContext & GrGLContextInfo https://codereview.appspot.com/7436045/ git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@7905 2bbb7eff-a529-9590-31e7-b0007b416f81 --- gpu.gypi | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/gpu.gypi b/gpu.gypi index dffc07d..a1c1727 100644 --- a/gpu.gypi +++ b/gpu.gypi @@ -139,8 +139,8 @@ '<(skia_src_path)/gpu/gl/GrGLBufferImpl.h', '<(skia_src_path)/gpu/gl/GrGLCaps.cpp', '<(skia_src_path)/gpu/gl/GrGLCaps.h', - '<(skia_src_path)/gpu/gl/GrGLContextInfo.cpp', - '<(skia_src_path)/gpu/gl/GrGLContextInfo.h', + '<(skia_src_path)/gpu/gl/GrGLContext.cpp', + '<(skia_src_path)/gpu/gl/GrGLContext.h', '<(skia_src_path)/gpu/gl/GrGLCreateNativeInterface_none.cpp', '<(skia_src_path)/gpu/gl/GrGLDefaultInterface_none.cpp', '<(skia_src_path)/gpu/gl/GrGLDefines.h', @@ -225,7 +225,7 @@ '<(skia_include_path)/gpu/SkGrPixelRef.h', '<(skia_include_path)/gpu/SkGrTexturePixelRef.h', - '<(skia_include_path)/gpu/gl/SkGLContext.h', + '<(skia_include_path)/gpu/gl/SkGLContextHelper.h', '<(skia_src_path)/gpu/SkGpuDevice.cpp', '<(skia_src_path)/gpu/SkGr.cpp', @@ -236,7 +236,7 @@ '<(skia_src_path)/image/SkImage_Gpu.cpp', '<(skia_src_path)/image/SkSurface_Gpu.cpp', - '<(skia_src_path)/gpu/gl/SkGLContext.cpp' + '<(skia_src_path)/gpu/gl/SkGLContextHelper.cpp' ], 'skgr_native_gl_sources': [ '<(skia_include_path)/gpu/gl/SkNativeGLContext.h', -- cgit v1.2.3 From baf508eea39d78ba5b921f142846578e3c72a87c Mon Sep 17 00:00:00 2001 From: "bsalomon@google.com" Date: Fri, 1 Mar 2013 14:37:18 +0000 Subject: Add support to GrGLInterface for vertex array objects Review URL: https://codereview.chromium.org/12379025 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@7919 2bbb7eff-a529-9590-31e7-b0007b416f81 --- gpu.gypi | 1 + 1 file changed, 1 insertion(+) diff --git a/gpu.gypi b/gpu.gypi index a1c1727..8d3347b 100644 --- a/gpu.gypi +++ b/gpu.gypi @@ -214,6 +214,7 @@ '<(skia_src_path)/gpu/gl/debug/GrProgramObj.cpp', '<(skia_src_path)/gpu/gl/debug/GrDebugGL.h', '<(skia_src_path)/gpu/gl/debug/GrDebugGL.cpp', + '<(skia_src_path)/gpu/gl/debug/GrVetexArrayObj.h', ], 'gr_null_gl_sources': [ '<(skia_src_path)/gpu/gl/GrGLCreateNullInterface.cpp', -- cgit v1.2.3 From 830bb6525b0437b0e1a3ff8f9c91f2c382ad3249 Mon Sep 17 00:00:00 2001 From: "commit-bot@chromium.org" Date: Fri, 1 Mar 2013 15:32:34 +0000 Subject: gm self-test: use a pathologically simple test case instead of dashing2 BUG=https://code.google.com/p/skia/issues/detail?id=677 Review URL: https://chromiumcodereview.appspot.com/12381038 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@7922 2bbb7eff-a529-9590-31e7-b0007b416f81 --- gmslides.gypi | 1 + 1 file changed, 1 insertion(+) diff --git a/gmslides.gypi b/gmslides.gypi index 70a77d2..0b42eed 100644 --- a/gmslides.gypi +++ b/gmslides.gypi @@ -68,6 +68,7 @@ '../gm/rrects.cpp', '../gm/samplerstress.cpp', '../gm/shaderbounds.cpp', + '../gm/selftest.cpp', '../gm/shadertext.cpp', '../gm/shadertext2.cpp', '../gm/shadertext3.cpp', -- cgit v1.2.3 From aa4e9cd57d44bd009db392bc31da054f56bdaf88 Mon Sep 17 00:00:00 2001 From: "bsalomon@google.com" Date: Fri, 1 Mar 2013 15:32:49 +0000 Subject: Revert 7919 and 7920 (committed wrong version of r7919.) git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@7923 2bbb7eff-a529-9590-31e7-b0007b416f81 --- gpu.gypi | 1 - 1 file changed, 1 deletion(-) diff --git a/gpu.gypi b/gpu.gypi index 8d3347b..a1c1727 100644 --- a/gpu.gypi +++ b/gpu.gypi @@ -214,7 +214,6 @@ '<(skia_src_path)/gpu/gl/debug/GrProgramObj.cpp', '<(skia_src_path)/gpu/gl/debug/GrDebugGL.h', '<(skia_src_path)/gpu/gl/debug/GrDebugGL.cpp', - '<(skia_src_path)/gpu/gl/debug/GrVetexArrayObj.h', ], 'gr_null_gl_sources': [ '<(skia_src_path)/gpu/gl/GrGLCreateNullInterface.cpp', -- cgit v1.2.3 From 750cdc781541ef311c3672b45a76ec2cffce5c6d Mon Sep 17 00:00:00 2001 From: "bsalomon@google.com" Date: Fri, 1 Mar 2013 15:36:02 +0000 Subject: Add support to GrGLInterface for vertex array objects Committed: https://code.google.com/p/skia/source/detail?r=7919 Review URL: https://codereview.chromium.org/12379025 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@7924 2bbb7eff-a529-9590-31e7-b0007b416f81 --- gpu.gypi | 1 + 1 file changed, 1 insertion(+) diff --git a/gpu.gypi b/gpu.gypi index a1c1727..a2644b7 100644 --- a/gpu.gypi +++ b/gpu.gypi @@ -214,6 +214,7 @@ '<(skia_src_path)/gpu/gl/debug/GrProgramObj.cpp', '<(skia_src_path)/gpu/gl/debug/GrDebugGL.h', '<(skia_src_path)/gpu/gl/debug/GrDebugGL.cpp', + '<(skia_src_path)/gpu/gl/debug/GrVertexArrayObj.h', ], 'gr_null_gl_sources': [ '<(skia_src_path)/gpu/gl/GrGLCreateNullInterface.cpp', -- cgit v1.2.3 From 804bfb542507442a830298666a72bc03ec90a9c0 Mon Sep 17 00:00:00 2001 From: "borenet@google.com" Date: Fri, 1 Mar 2013 20:28:57 +0000 Subject: Add freetype to skia_base_libs when building for NaCl External users need access to libfreetype.a when they use skia_base_libs. Review URL: https://codereview.chromium.org/12383022 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@7934 2bbb7eff-a529-9590-31e7-b0007b416f81 --- skia_base_libs.gyp | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/skia_base_libs.gyp b/skia_base_libs.gyp index 245babb..83cc7c7 100644 --- a/skia_base_libs.gyp +++ b/skia_base_libs.gyp @@ -24,6 +24,11 @@ 'gpu.gyp:skgr', ], }], + [ 'skia_os == "nacl"', { + 'component_libs': [ + 'freetype.gyp:freetype', + ], + }], ], }, 'targets': [ -- cgit v1.2.3 From af025fe45e06430b0a00fd0bfdeb91426c23233a Mon Sep 17 00:00:00 2001 From: "mike@reedtribe.org" Date: Sun, 3 Mar 2013 03:50:09 +0000 Subject: eliminate atsuii/coretext distinction, and rename to just _mac git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@7947 2bbb7eff-a529-9590-31e7-b0007b416f81 --- ports.gyp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ports.gyp b/ports.gyp index 814441a..7373bd5 100644 --- a/ports.gyp +++ b/ports.gyp @@ -90,7 +90,7 @@ '../third_party/freetype/include/**', ], 'sources': [ - '../src/ports/SkFontHost_mac_coretext.cpp', + '../src/ports/SkFontHost_mac.cpp', '../src/utils/mac/SkStream_mac.cpp', # '../src/ports/SkFontHost_FreeType.cpp', # '../src/ports/SkFontHost_FreeType_common.cpp', @@ -107,7 +107,7 @@ '../include/utils/mac', ], 'sources': [ - '../src/ports/SkFontHost_mac_coretext.cpp', + '../src/ports/SkFontHost_mac.cpp', '../src/utils/mac/SkStream_mac.cpp', '../src/ports/SkThread_pthread.cpp', ], -- cgit v1.2.3 From 1b47e655fd8e84f6be2c0a95a6916406b7a0fc2e Mon Sep 17 00:00:00 2001 From: "reed@google.com" Date: Mon, 4 Mar 2013 14:45:29 +0000 Subject: enable fontconfig backend for fonthost on linux git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@7955 2bbb7eff-a529-9590-31e7-b0007b416f81 --- ports.gyp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/ports.gyp b/ports.gyp index 7373bd5..bc03ccf 100644 --- a/ports.gyp +++ b/ports.gyp @@ -46,13 +46,15 @@ 'link_settings': { 'libraries': [ '-lfreetype', + '-lfontconfig', '-ldl', ], }, 'sources': [ '../src/ports/SkFontHost_FreeType.cpp', '../src/ports/SkFontHost_FreeType_common.cpp', - '../src/ports/SkFontHost_linux.cpp', + '../src/ports/SkFontHost_fontconfig.cpp', + '../src/ports/SkFontConfigInterface_direct.cpp', '../src/ports/SkThread_pthread.cpp', ], }], -- cgit v1.2.3 From ea45f0628fdd116ce55bdeb3e58a2e1f1bb968f1 Mon Sep 17 00:00:00 2001 From: "reed@google.com" Date: Mon, 4 Mar 2013 15:16:06 +0000 Subject: refactor fonthost_tables into wrapper (fonthost) and impl (fontstream) git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@7958 2bbb7eff-a529-9590-31e7-b0007b416f81 --- core.gypi | 2 ++ 1 file changed, 2 insertions(+) diff --git a/core.gypi b/core.gypi index 590cac2..e6f917f 100644 --- a/core.gypi +++ b/core.gypi @@ -88,6 +88,8 @@ '<(skia_src_path)/core/SkFontHost.cpp', '<(skia_src_path)/core/SkFontDescriptor.cpp', '<(skia_src_path)/core/SkFontDescriptor.h', + '<(skia_src_path)/core/SkFontStream.cpp', + '<(skia_src_path)/core/SkFontStream.h', '<(skia_src_path)/core/SkGeometry.cpp', '<(skia_src_path)/core/SkGlyphCache.cpp', '<(skia_src_path)/core/SkGlyphCache.h', -- cgit v1.2.3 From 59797e23eeb0e6b556db05c1f439725b4d61319a Mon Sep 17 00:00:00 2001 From: "reed@google.com" Date: Mon, 4 Mar 2013 16:28:33 +0000 Subject: implement fonthost table methods directly in fontconfig backend, _tables now relegated to android and windows... Review URL: https://codereview.chromium.org/12395015 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@7959 2bbb7eff-a529-9590-31e7-b0007b416f81 --- ports.gyp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/ports.gyp b/ports.gyp index bc03ccf..827318d 100644 --- a/ports.gyp +++ b/ports.gyp @@ -57,6 +57,9 @@ '../src/ports/SkFontConfigInterface_direct.cpp', '../src/ports/SkThread_pthread.cpp', ], + 'sources!': [ + '../src/ports/SkFontHost_tables.cpp', + ], }], [ 'skia_os == "nacl"', { 'dependencies': [ -- cgit v1.2.3 From a001060e80365781f9f922dabfdecd0a2e9024ac Mon Sep 17 00:00:00 2001 From: "scroggo@google.com" Date: Mon, 4 Mar 2013 16:41:06 +0000 Subject: Created my own flag parser, based off of gflags. Share common code between bench_ and render_ to set up the PictureRenderer. Fix an include error in SkPictureRenderer.h. Simplified parameter passing in render_pictures_main. Switch to using an SkAutoTUnref for the PictureRenderer. I also changed the input format somewhat, so the buildbots need to be updated as well: https://codereview.appspot.com/7441044/ Fixed a bug in PictureBenchmark where calling setTimeIndividualTiles(false) sets the member variable to true. Removed setDeviceType from PictureBenchmark, since only the PictureRenderer needs to know which device type to use. Some changes to the input format: '--logPerIter' no longer takes a 1 or 0. Instead, '--logPerIter' turns it on and '--nologPerIter' turns it off (with off as the default). (Note that this is for bench_pictures; bench still uses the old format) Change '--device' to '--config' and 'bitmap' to '8888' to be the same as gm. Requires '--r' before inputs (to match gm), though there can be multiple inputs following it. Changed --enable-deferred-image-decoding (which no one uses but me yet anyway) to --deferImageDecoding, since the former is incompatible with the flag parser. Changes to behavior: Show a short error message on failure (rather than the explanation of all flags). BUG=https://code.google.com/p/skia/issues/detail?id=1094 Review URL: https://codereview.appspot.com/7230053 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@7961 2bbb7eff-a529-9590-31e7-b0007b416f81 --- tools.gyp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tools.gyp b/tools.gyp index 121779b..074efd1 100644 --- a/tools.gyp +++ b/tools.gyp @@ -128,8 +128,12 @@ 'sources': [ '../tools/PictureRenderer.h', '../tools/PictureRenderer.cpp', + '../tools/PictureRenderingFlags.h', + '../tools/PictureRenderingFlags.cpp', '../tools/CopyTilesRenderer.h', '../tools/CopyTilesRenderer.cpp', + '../tools/SkFlags.h', + '../tools/SkFlags.cpp', '../src/pipe/utils/SamplePipeControllers.h', '../src/pipe/utils/SamplePipeControllers.cpp', ], -- cgit v1.2.3 From 199b96788ef328f0f30d673cd8cee8bccba87e68 Mon Sep 17 00:00:00 2001 From: "scroggo@google.com" Date: Mon, 4 Mar 2013 19:56:21 +0000 Subject: Add a way to monitor cache hits and misses for deferred decoding. Adds a new flag to bench_pictures in order to do this. Also fix a warning. Review URL: https://codereview.chromium.org/12393046 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@7965 2bbb7eff-a529-9590-31e7-b0007b416f81 --- tools.gyp | 1 + 1 file changed, 1 insertion(+) diff --git a/tools.gyp b/tools.gyp index 074efd1..7e5d79e 100644 --- a/tools.gyp +++ b/tools.gyp @@ -113,6 +113,7 @@ ], 'include_dirs': [ '../bench', + '../src/lazy/', ], 'dependencies': [ 'skia_base_libs.gyp:skia_base_libs', -- cgit v1.2.3 From d3f839364bd450c9207ea3452a6e8c0ed55e6fe4 Mon Sep 17 00:00:00 2001 From: "commit-bot@chromium.org" Date: Mon, 4 Mar 2013 20:58:01 +0000 Subject: Convert skhello tool to SkFlags API. BUG=https://code.google.com/p/skia/issues/detail?id=1094 R=scroggo@google.com Signed-off-by: Thiago Farina Review URL: https://chromiumcodereview.appspot.com/12381087 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@7968 2bbb7eff-a529-9590-31e7-b0007b416f81 --- tools.gyp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tools.gyp b/tools.gyp index 7e5d79e..e5d6cd3 100644 --- a/tools.gyp +++ b/tools.gyp @@ -66,6 +66,8 @@ 'type': 'executable', 'sources': [ '../tools/skhello.cpp', + '../tools/SkFlags.h', + '../tools/SkFlags.cpp', ], 'dependencies': [ 'skia_base_libs.gyp:skia_base_libs', -- cgit v1.2.3 From c762a0ab4d40479c1905d51d460a8a64c7251310 Mon Sep 17 00:00:00 2001 From: "epoger@google.com" Date: Wed, 6 Mar 2013 00:05:13 +0000 Subject: PDF: add support for named destinations Imported from https://codereview.appspot.com/7374052/ on behalf of dml@google.com Review URL: https://codereview.chromium.org/12466008 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@8000 2bbb7eff-a529-9590-31e7-b0007b416f81 --- gmslides.gypi | 1 + 1 file changed, 1 insertion(+) diff --git a/gmslides.gypi b/gmslides.gypi index 0b42eed..ae36de0 100644 --- a/gmslides.gypi +++ b/gmslides.gypi @@ -50,6 +50,7 @@ '../gm/image.cpp', '../gm/imagefiltersbase.cpp', '../gm/imagefiltersgraph.cpp', + '../gm/internal_links.cpp', '../gm/lcdtext.cpp', '../gm/linepaths.cpp', '../gm/matrixconvolution.cpp', -- cgit v1.2.3 From 6493158a5e20cda3fb94d720307bdb3cd02ea81f Mon Sep 17 00:00:00 2001 From: "epoger@google.com" Date: Wed, 6 Mar 2013 00:47:22 +0000 Subject: Revert r8000 due to failures on some buildbots git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@8001 2bbb7eff-a529-9590-31e7-b0007b416f81 --- gmslides.gypi | 1 - 1 file changed, 1 deletion(-) diff --git a/gmslides.gypi b/gmslides.gypi index ae36de0..0b42eed 100644 --- a/gmslides.gypi +++ b/gmslides.gypi @@ -50,7 +50,6 @@ '../gm/image.cpp', '../gm/imagefiltersbase.cpp', '../gm/imagefiltersgraph.cpp', - '../gm/internal_links.cpp', '../gm/lcdtext.cpp', '../gm/linepaths.cpp', '../gm/matrixconvolution.cpp', -- cgit v1.2.3 From 789cb050e0582e95aee3d28d6798f586a53ad2fd Mon Sep 17 00:00:00 2001 From: "borenet@google.com" Date: Thu, 7 Mar 2013 15:33:28 +0000 Subject: Gyp changes for NaCl debugger Review URL: https://codereview.chromium.org/12544011 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@8015 2bbb7eff-a529-9590-31e7-b0007b416f81 --- core.gyp | 4 +- debugger.gyp | 140 ++++++++++++++++++++++++++++++++++----------------------- everything.gyp | 2 +- images.gyp | 1 + tests.gyp | 9 ++++ utils.gyp | 9 ++++ 6 files changed, 106 insertions(+), 59 deletions(-) diff --git a/core.gyp b/core.gyp index 76994e1..479e673 100644 --- a/core.gyp +++ b/core.gyp @@ -83,9 +83,9 @@ '../src/core/SkMMapStream.cpp', ], }], - [ 'skia_os == "android"', { + [ 'skia_os in ("android", "nacl")', { 'dependencies': [ - 'freetype.gyp:freetype', + 'freetype.gyp:freetype', ], }], [ 'skia_os == "android" and skia_arch_type == "arm" and armv7 == 1', { diff --git a/debugger.gyp b/debugger.gyp index 9f8b5b3..f2de60e 100644 --- a/debugger.gyp +++ b/debugger.gyp @@ -79,15 +79,12 @@ 'include_dirs' : [ '../src/core', '../debugger', # To pull SkDebugger.h - '../debugger/QT', # For all the QT UI Goodies '../src/gpu', # To pull gl/GrGLUtil.h '../src/ports', # To pull SkFontDescriptor.h '../bench', '../tools', - '<@(qt_includes)', ], 'sources': [ - '../debugger/debuggermain.cpp', '../debugger/SkDebugCanvas.h', '../debugger/SkDebugCanvas.cpp', '../debugger/SkDebugger.cpp', @@ -95,34 +92,6 @@ '../debugger/SkDrawCommand.cpp', '../debugger/SkObjectParser.h', '../debugger/SkObjectParser.cpp', - '../debugger/QT/SkDebuggerGUI.cpp', - '../debugger/QT/SkDebuggerGUI.h', - '../debugger/QT/SkCanvasWidget.cpp', - '../debugger/QT/SkCanvasWidget.h', - '../debugger/QT/SkInspectorWidget.h', - '../debugger/QT/SkInspectorWidget.cpp', - '../debugger/QT/SkListWidget.h', - '../debugger/QT/SkListWidget.cpp', - '../debugger/QT/SkSettingsWidget.h', - '../debugger/QT/SkSettingsWidget.cpp', - '../debugger/QT/SkGLWidget.h', - '../debugger/QT/SkGLWidget.cpp', - '../debugger/QT/SkRasterWidget.h', - '../debugger/QT/SkRasterWidget.cpp', - '../debugger/QT/SkImageWidget.h', - '../debugger/QT/SkImageWidget.cpp', - - # To update this file edit SkIcons.qrc and rerun rcc to generate cpp - '../debugger/QT/qrc_SkIcons.cpp', - - # Generated MOC files - '<(moc_gen_dir)/moc_SkCanvasWidget.cpp', - '<(moc_gen_dir)/moc_SkDebuggerGUI.cpp', - '<(moc_gen_dir)/moc_SkInspectorWidget.cpp', - '<(moc_gen_dir)/moc_SkSettingsWidget.cpp', - '<(moc_gen_dir)/moc_SkRasterWidget.cpp', - '<(moc_gen_dir)/moc_SkImageWidget.cpp', - '<(moc_gen_dir)/moc_SkGLWidget.cpp', ], 'dependencies': [ 'skia_base_libs.gyp:skia_base_libs', @@ -130,36 +99,95 @@ 'effects.gyp:effects', 'bench.gyp:bench_timer', 'tools.gyp:picture_renderer', - 'debugger_mocs', ], - 'link_settings': { - 'libraries': [ - '<@(qt_libs)', - ], - }, - }, - { - 'target_name': 'debugger_mocs', - 'type': 'none', - 'sources': [ - '<(moc_src_dir)/SkCanvasWidget.h', - '<(moc_src_dir)/SkDebuggerGUI.h', - '<(moc_src_dir)/SkInspectorWidget.h', - '<(moc_src_dir)/SkSettingsWidget.h', - '<(moc_src_dir)/SkRasterWidget.h', - '<(moc_src_dir)/SkImageWidget.h', - '<(moc_src_dir)/SkGLWidget.h', + 'conditions': [ + [ 'skia_os == "nacl"', { + 'dependencies': [ + 'utils.gyp:utils', # For SkBase64.h + ], + 'include_dirs': [ + '../src/utils', + ], + 'sources': [ + '../../nacl/src/nacl_debugger.cpp', + ], + }, { # skia_os != "nacl" + 'include_dirs': [ + '../debugger/QT', # For all the QT UI Goodies + '<@(qt_includes)', + ], + 'sources': [ + '../debugger/debuggermain.cpp', + '../debugger/QT/SkDebuggerGUI.cpp', + '../debugger/QT/SkDebuggerGUI.h', + '../debugger/QT/SkCanvasWidget.cpp', + '../debugger/QT/SkCanvasWidget.h', + '../debugger/QT/SkInspectorWidget.h', + '../debugger/QT/SkInspectorWidget.cpp', + '../debugger/QT/SkListWidget.h', + '../debugger/QT/SkListWidget.cpp', + '../debugger/QT/SkSettingsWidget.h', + '../debugger/QT/SkSettingsWidget.cpp', + '../debugger/QT/SkGLWidget.h', + '../debugger/QT/SkGLWidget.cpp', + '../debugger/QT/SkRasterWidget.h', + '../debugger/QT/SkRasterWidget.cpp', + '../debugger/QT/SkImageWidget.h', + '../debugger/QT/SkImageWidget.cpp', + + # To update this file edit SkIcons.qrc and rerun rcc to generate cpp + '../debugger/QT/qrc_SkIcons.cpp', + + # Generated MOC files + '<(moc_gen_dir)/moc_SkCanvasWidget.cpp', + '<(moc_gen_dir)/moc_SkDebuggerGUI.cpp', + '<(moc_gen_dir)/moc_SkInspectorWidget.cpp', + '<(moc_gen_dir)/moc_SkSettingsWidget.cpp', + '<(moc_gen_dir)/moc_SkRasterWidget.cpp', + '<(moc_gen_dir)/moc_SkImageWidget.cpp', + '<(moc_gen_dir)/moc_SkGLWidget.cpp', + ], + 'dependencies': [ + 'debugger_qt_mocs', + ], + 'link_settings': { + 'libraries': [ + '<@(qt_libs)', + ], + }, + }], ], - 'rules': [ + }, + ], + 'conditions': [ + [ 'skia_os != "nacl"', { + 'targets': [ { - 'rule_name': 'generate_moc', - 'extension': 'h', - 'outputs': [ '<(moc_gen_dir)/moc_<(RULE_INPUT_ROOT).cpp' ], - 'action': [ '<(qt_moc)', '-DSK_SUPPORT_GPU=<(skia_gpu)', '<(RULE_INPUT_PATH)', '-o', '<(moc_gen_dir)/moc_<(RULE_INPUT_ROOT).cpp' ], - 'message': 'Generating <(RULE_INPUT_ROOT).cpp.', + 'target_name': 'debugger_qt_mocs', + 'type': 'none', + 'sources': [ + '<(moc_src_dir)/SkCanvasWidget.h', + '<(moc_src_dir)/SkDebuggerGUI.h', + '<(moc_src_dir)/SkInspectorWidget.h', + '<(moc_src_dir)/SkSettingsWidget.h', + '<(moc_src_dir)/SkRasterWidget.h', + '<(moc_src_dir)/SkImageWidget.h', + '<(moc_src_dir)/SkGLWidget.h', + ], + 'rules': [ + { + 'rule_name': 'generate_moc', + 'extension': 'h', + 'outputs': [ '<(moc_gen_dir)/moc_<(RULE_INPUT_ROOT).cpp' ], + 'action': [ '<(qt_moc)', '-DSK_SUPPORT_GPU=<(skia_gpu)', + '<(RULE_INPUT_PATH)', + '-o', '<(moc_gen_dir)/moc_<(RULE_INPUT_ROOT).cpp' ], + 'message': 'Generating <(RULE_INPUT_ROOT).cpp.', + }, + ], }, ], - }, + }], ], } diff --git a/everything.gyp b/everything.gyp index e1d516d..000bb78 100644 --- a/everything.gyp +++ b/everything.gyp @@ -14,7 +14,7 @@ 'type': 'none', 'dependencies': ['most.gyp:most'], 'conditions': [ - ['skia_os in ("ios", "android", "nacl") or (skia_os == "mac" and skia_arch_width == 32)', { + ['skia_os in ("ios", "android") or (skia_os == "mac" and skia_arch_width == 32)', { # debugger is not supported on this platform }, { 'dependencies': [ 'debugger.gyp:debugger' ], diff --git a/images.gyp b/images.gyp index 4560980..b5447a2 100644 --- a/images.gyp +++ b/images.gyp @@ -106,6 +106,7 @@ ], 'libraries': [ '-lpng', + '-lz', ], }, # end libpng stuff diff --git a/tests.gyp b/tests.gyp index 6d6998b..dbf27fa 100644 --- a/tests.gyp +++ b/tests.gyp @@ -130,6 +130,15 @@ '../src/gpu', ], }], + [ 'skia_os == "nacl"', { + # CityHash is not supported on NaCl because the NaCl toolchain is + # missing byteswap.h which is needed by CityHash. + # TODO(borenet): Find a way to either provide this dependency or + # replace it. + 'sources!': [ + '../tests/ChecksumTest.cpp', + ], + }], ], }, ], diff --git a/utils.gyp b/utils.gyp index 3b129d3..ab725df 100644 --- a/utils.gyp +++ b/utils.gyp @@ -196,6 +196,15 @@ ], 'sources!': [ '../src/utils/SkThreadUtils_pthread_linux.cpp', + '../src/utils/SkCityHash.cpp', + '../src/utils/SkCityHash.h', + ], + 'dependencies!': [ + # CityHash is not supported on NaCl because the NaCl toolchain is + # missing byteswap.h which is needed by CityHash. + # TODO(borenet): Find a way to either provide this dependency or + # replace it. + 'cityhash', ], }], [ 'skia_os == "android"', { -- cgit v1.2.3 From 81b80e67d9fdc4d2c599316c842595c97819ef25 Mon Sep 17 00:00:00 2001 From: "bsalomon@google.com" Date: Thu, 7 Mar 2013 19:09:11 +0000 Subject: Use vertex array objects on core profiles. Review URL: https://codereview.chromium.org/12533007 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@8024 2bbb7eff-a529-9590-31e7-b0007b416f81 --- gpu.gypi | 2 ++ 1 file changed, 2 insertions(+) diff --git a/gpu.gypi b/gpu.gypi index a2644b7..41f0f09 100644 --- a/gpu.gypi +++ b/gpu.gypi @@ -175,6 +175,8 @@ '<(skia_src_path)/gpu/gl/GrGLUniformManager.cpp', '<(skia_src_path)/gpu/gl/GrGLUniformManager.h', '<(skia_src_path)/gpu/gl/GrGLUniformHandle.h', + '<(skia_src_path)/gpu/gl/GrGLVertexArray.cpp', + '<(skia_src_path)/gpu/gl/GrGLVertexArray.h', '<(skia_src_path)/gpu/gl/GrGLVertexBuffer.cpp', '<(skia_src_path)/gpu/gl/GrGLVertexBuffer.h', '<(skia_src_path)/gpu/gl/GrGpuGL.cpp', -- cgit v1.2.3 From ee1bf6e73f690a2e3dd304b6ba6352cdb17797a1 Mon Sep 17 00:00:00 2001 From: "sugoi@google.com" Date: Thu, 7 Mar 2013 20:52:59 +0000 Subject: Fixing some warnings on Linux There were only a few warnings left, so I fixed them and enabled the unused variable warning by removing the "-Wno-unused" flag. Only the -Wno-unused-parameter remains for now (could be removed later). Review URL: https://codereview.chromium.org/12480002 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@8030 2bbb7eff-a529-9590-31e7-b0007b416f81 --- common_conditions.gypi | 1 - 1 file changed, 1 deletion(-) diff --git a/common_conditions.gypi b/common_conditions.gypi index cfcc7f2..e379f27 100644 --- a/common_conditions.gypi +++ b/common_conditions.gypi @@ -145,7 +145,6 @@ #'-Werror', '-Wall', '-Wextra', - '-Wno-unused', # suppressions below here were added for clang '-Wno-unused-parameter', '-Wno-c++11-extensions' -- cgit v1.2.3 From ddc3c4f7cf4083a76c510e39306f7c7349f5e678 Mon Sep 17 00:00:00 2001 From: "skia.committer@gmail.com" Date: Fri, 8 Mar 2013 07:01:25 +0000 Subject: Sanitizing source files in Skia_Periodic_House_Keeping git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@8033 2bbb7eff-a529-9590-31e7-b0007b416f81 --- debugger.gyp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debugger.gyp b/debugger.gyp index f2de60e..40c0f35 100644 --- a/debugger.gyp +++ b/debugger.gyp @@ -134,10 +134,10 @@ '../debugger/QT/SkRasterWidget.cpp', '../debugger/QT/SkImageWidget.h', '../debugger/QT/SkImageWidget.cpp', - + # To update this file edit SkIcons.qrc and rerun rcc to generate cpp '../debugger/QT/qrc_SkIcons.cpp', - + # Generated MOC files '<(moc_gen_dir)/moc_SkCanvasWidget.cpp', '<(moc_gen_dir)/moc_SkDebuggerGUI.cpp', -- cgit v1.2.3 From 7eae9a6d858f283e07bacdd85671999851928438 Mon Sep 17 00:00:00 2001 From: "epoger@google.com" Date: Fri, 8 Mar 2013 09:09:10 +0000 Subject: PDF: add support for named destinations. Landing patchset 7 from https://codereview.appspot.com/7374052 for dml@google.com Review URL: https://codereview.chromium.org/12533009 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@8034 2bbb7eff-a529-9590-31e7-b0007b416f81 --- gmslides.gypi | 1 + 1 file changed, 1 insertion(+) diff --git a/gmslides.gypi b/gmslides.gypi index 0b42eed..ae36de0 100644 --- a/gmslides.gypi +++ b/gmslides.gypi @@ -50,6 +50,7 @@ '../gm/image.cpp', '../gm/imagefiltersbase.cpp', '../gm/imagefiltersgraph.cpp', + '../gm/internal_links.cpp', '../gm/lcdtext.cpp', '../gm/linepaths.cpp', '../gm/matrixconvolution.cpp', -- cgit v1.2.3 From a1a976bf06703bd223a25b41cc986cb9377af1a2 Mon Sep 17 00:00:00 2001 From: "edisonn@google.com" Date: Fri, 8 Mar 2013 18:00:16 +0000 Subject: Collect minidump and print callstack if an app chrashes. Review URL: https://codereview.chromium.org/12387018 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@8044 2bbb7eff-a529-9590-31e7-b0007b416f81 --- common.gypi | 7 +++++++ common_variables.gypi | 2 ++ tools.gyp | 46 ++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 55 insertions(+) diff --git a/common.gypi b/common.gypi index 810a0f8..d3e1498 100644 --- a/common.gypi +++ b/common.gypi @@ -76,6 +76,13 @@ ], }, }], + [ 'skia_win_debuggers_path and skia_os == "win"', + { + 'defines': [ + 'SK_USE_CDB', + ], + }, + ], ], 'configurations': { 'Debug': { diff --git a/common_variables.gypi b/common_variables.gypi index 13e681d..8ddbbb4 100644 --- a/common_variables.gypi +++ b/common_variables.gypi @@ -92,6 +92,7 @@ # Note: This is currently only turned on for linux and android. # TODO: Turn on for Win and Mac as well. 'skia_warnings_as_errors%': 0, + 'skia_win_debuggers_path%': '', }, # Re-define all variables defined within the level-2 'variables' dict, @@ -116,6 +117,7 @@ 'skia_warnings_as_errors%': '<(skia_warnings_as_errors)', 'skia_static_initializers%': '<(skia_static_initializers)', 'ios_sdk_version%': '6.0', + 'skia_win_debuggers_path%': '<(skia_win_debuggers_path)', # These are referenced by our .gypi files that list files (e.g. core.gypi) # diff --git a/tools.gyp b/tools.gyp index e5d6cd3..5ae9e1c 100644 --- a/tools.gyp +++ b/tools.gyp @@ -184,6 +184,41 @@ 'ports.gyp:ports', 'tools.gyp:picture_utils', ], + 'conditions': [ + ['skia_win_debuggers_path and skia_os == "win"', + { + 'dependencies': [ + 'tools.gyp:win_dbghelp', + ], + }, + ], + # VS static libraries don't have a linker option. We must set a global + # project linker option, or add it to each executable. + ['skia_win_debuggers_path and skia_os == "win" and ' + 'skia_arch_width == 64', + { + 'msvs_settings': { + 'VCLinkerTool': { + 'AdditionalDependencies': [ + '<(skia_win_debuggers_path)/x64/DbgHelp.lib', + ], + }, + }, + }, + ], + ['skia_win_debuggers_path and skia_os == "win" and ' + 'skia_arch_width == 32', + { + 'msvs_settings': { + 'VCLinkerTool': { + 'AdditionalDependencies': [ + '<(skia_win_debuggers_path)/DbgHelp.lib', + ], + }, + }, + }, + ], + ], }, { 'target_name': 'picture_utils', @@ -233,6 +268,17 @@ 'tools.gyp:picture_utils', ], }, + { + 'target_name': 'win_dbghelp', + 'type': 'static_library', + 'defines': [ + 'SK_CDB_PATH="<(skia_win_debuggers_path)"', + ], + 'sources': [ + '../tools/win_dbghelp.h', + '../tools/win_dbghelp.cpp', + ], + }, ], } -- cgit v1.2.3 From dd1afe6232e86201c62a625c65b040c1d6391080 Mon Sep 17 00:00:00 2001 From: "edisonn@google.com" Date: Fri, 8 Mar 2013 18:43:35 +0000 Subject: Add build condition not to build in iOS an unused lib (failing to build empty lib in iOS). Unreviewed. Review URL: https://codereview.chromium.org/12639008 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@8047 2bbb7eff-a529-9590-31e7-b0007b416f81 --- tools.gyp | 30 +++++++++++++++++++----------- 1 file changed, 19 insertions(+), 11 deletions(-) diff --git a/tools.gyp b/tools.gyp index 5ae9e1c..4e3bc53 100644 --- a/tools.gyp +++ b/tools.gyp @@ -268,17 +268,25 @@ 'tools.gyp:picture_utils', ], }, - { - 'target_name': 'win_dbghelp', - 'type': 'static_library', - 'defines': [ - 'SK_CDB_PATH="<(skia_win_debuggers_path)"', - ], - 'sources': [ - '../tools/win_dbghelp.h', - '../tools/win_dbghelp.cpp', - ], - }, + ], + 'conditions': [ + ['skia_win_debuggers_path and skia_os == "win"', + { + 'targets': [ + { + 'target_name': 'win_dbghelp', + 'type': 'static_library', + 'defines': [ + 'SK_CDB_PATH="<(skia_win_debuggers_path)"', + ], + 'sources': [ + '../tools/win_dbghelp.h', + '../tools/win_dbghelp.cpp', + ], + }, + ], + }, + ], ], } -- cgit v1.2.3 From d740e4ae94238e6ebc440e0f72451c0362d1a4d2 Mon Sep 17 00:00:00 2001 From: "borenet@google.com" Date: Fri, 8 Mar 2013 22:14:32 +0000 Subject: Fix Windows build Temporarily disable skia_win_debuggers_path gyp variable. Unreviewed. git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@8056 2bbb7eff-a529-9590-31e7-b0007b416f81 --- common_variables.gypi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common_variables.gypi b/common_variables.gypi index 8ddbbb4..1934082 100644 --- a/common_variables.gypi +++ b/common_variables.gypi @@ -92,7 +92,7 @@ # Note: This is currently only turned on for linux and android. # TODO: Turn on for Win and Mac as well. 'skia_warnings_as_errors%': 0, - 'skia_win_debuggers_path%': '', + 'skia_win_debuggers_path': '', }, # Re-define all variables defined within the level-2 'variables' dict, -- cgit v1.2.3 From 373cc5d47cb20906dde0a1f47cabae14bfaed94d Mon Sep 17 00:00:00 2001 From: "borenet@google.com" Date: Fri, 8 Mar 2013 22:22:44 +0000 Subject: Fix build Disable r8044 differently. Unreviewed git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@8057 2bbb7eff-a529-9590-31e7-b0007b416f81 --- common_variables.gypi | 2 +- tools.gyp | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/common_variables.gypi b/common_variables.gypi index 1934082..8ddbbb4 100644 --- a/common_variables.gypi +++ b/common_variables.gypi @@ -92,7 +92,7 @@ # Note: This is currently only turned on for linux and android. # TODO: Turn on for Win and Mac as well. 'skia_warnings_as_errors%': 0, - 'skia_win_debuggers_path': '', + 'skia_win_debuggers_path%': '', }, # Re-define all variables defined within the level-2 'variables' dict, diff --git a/tools.gyp b/tools.gyp index 4e3bc53..63ef258 100644 --- a/tools.gyp +++ b/tools.gyp @@ -185,7 +185,7 @@ 'tools.gyp:picture_utils', ], 'conditions': [ - ['skia_win_debuggers_path and skia_os == "win"', + ['skia_os == "disable" and skia_win_debuggers_path and skia_os == "win"', { 'dependencies': [ 'tools.gyp:win_dbghelp', @@ -195,7 +195,7 @@ # VS static libraries don't have a linker option. We must set a global # project linker option, or add it to each executable. ['skia_win_debuggers_path and skia_os == "win" and ' - 'skia_arch_width == 64', + 'skia_arch_width == 64 and skia_os == "disable"', { 'msvs_settings': { 'VCLinkerTool': { @@ -207,7 +207,7 @@ }, ], ['skia_win_debuggers_path and skia_os == "win" and ' - 'skia_arch_width == 32', + 'skia_arch_width == 32 and skia_os == "disable"', { 'msvs_settings': { 'VCLinkerTool': { @@ -270,7 +270,7 @@ }, ], 'conditions': [ - ['skia_win_debuggers_path and skia_os == "win"', + ['skia_os == "disable" and skia_win_debuggers_path and skia_os == "win"', { 'targets': [ { -- cgit v1.2.3 From 6b5e02d3a76e5ae9ac176afcf629bc5a2ca57f3f Mon Sep 17 00:00:00 2001 From: "borenet@google.com" Date: Fri, 8 Mar 2013 23:13:33 +0000 Subject: Fix Windows build - revert r8056 and r8057 TBR=epoger,edisonn Review URL: https://codereview.chromium.org/12421010 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@8058 2bbb7eff-a529-9590-31e7-b0007b416f81 --- tools.gyp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tools.gyp b/tools.gyp index 63ef258..4e3bc53 100644 --- a/tools.gyp +++ b/tools.gyp @@ -185,7 +185,7 @@ 'tools.gyp:picture_utils', ], 'conditions': [ - ['skia_os == "disable" and skia_win_debuggers_path and skia_os == "win"', + ['skia_win_debuggers_path and skia_os == "win"', { 'dependencies': [ 'tools.gyp:win_dbghelp', @@ -195,7 +195,7 @@ # VS static libraries don't have a linker option. We must set a global # project linker option, or add it to each executable. ['skia_win_debuggers_path and skia_os == "win" and ' - 'skia_arch_width == 64 and skia_os == "disable"', + 'skia_arch_width == 64', { 'msvs_settings': { 'VCLinkerTool': { @@ -207,7 +207,7 @@ }, ], ['skia_win_debuggers_path and skia_os == "win" and ' - 'skia_arch_width == 32 and skia_os == "disable"', + 'skia_arch_width == 32', { 'msvs_settings': { 'VCLinkerTool': { @@ -270,7 +270,7 @@ }, ], 'conditions': [ - ['skia_os == "disable" and skia_win_debuggers_path and skia_os == "win"', + ['skia_win_debuggers_path and skia_os == "win"', { 'targets': [ { -- cgit v1.2.3 From ed0f39e00341b1c978a74362d138afc565aafd76 Mon Sep 17 00:00:00 2001 From: "sugoi@google.com" Date: Mon, 11 Mar 2013 18:45:12 +0000 Subject: Turning on warning as error on Linux Fixed the few remaining warnings and turned on warning as error on Linux. Explicitly turned off warning as error in libjpeg, cityhash and json. Review URL: https://codereview.chromium.org/12521010 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@8067 2bbb7eff-a529-9590-31e7-b0007b416f81 --- common_conditions.gypi | 4 +--- jsoncpp.gyp | 5 +++++ libjpeg.gyp | 5 +++++ utils.gyp | 5 +++++ 4 files changed, 16 insertions(+), 3 deletions(-) diff --git a/common_conditions.gypi b/common_conditions.gypi index e379f27..90662d1 100644 --- a/common_conditions.gypi +++ b/common_conditions.gypi @@ -140,9 +140,7 @@ }, }, 'cflags': [ - # TODO(tony): Enable -Werror once all the strict-aliasing problems - # are fixed. - #'-Werror', + '-Werror', '-Wall', '-Wextra', # suppressions below here were added for clang diff --git a/jsoncpp.gyp b/jsoncpp.gyp index 07507d4..2549639 100644 --- a/jsoncpp.gyp +++ b/jsoncpp.gyp @@ -67,6 +67,11 @@ '-Werror', ], }], + ['skia_os in ["linux", "freebsd", "openbsd", "solaris", "nacl"]', { + 'cflags!': [ + '-Werror', + ], + }], ], }, ], diff --git a/libjpeg.gyp b/libjpeg.gyp index a9d6aef..394f2ee 100644 --- a/libjpeg.gyp +++ b/libjpeg.gyp @@ -93,6 +93,11 @@ '-Werror', ], }], + ['OS in ["linux", "freebsd", "openbsd", "solaris", "nacl"]', { + 'cflags!': [ + '-Werror', + ], + }], ], }, ], diff --git a/utils.gyp b/utils.gyp index ab725df..f98e6fc 100644 --- a/utils.gyp +++ b/utils.gyp @@ -258,6 +258,11 @@ '-Werror', ], }], + ['skia_os in ["linux", "freebsd", "openbsd", "solaris", "nacl"]', { + 'cflags!': [ + '-Werror', + ], + }], ], }, ], -- cgit v1.2.3 From f70ee2435ea7f317cf66c5bb97aa904cc6cf09d0 Mon Sep 17 00:00:00 2001 From: "sugoi@google.com" Date: Mon, 11 Mar 2013 20:35:19 +0000 Subject: Adding more warning in core I figured out the reason for the lack of warnings on Linux that caused the Mac build break. Some warnings were explicitly disabled in "core" on Linux. I re-enabled them. Review URL: https://codereview.chromium.org/12667012 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@8080 2bbb7eff-a529-9590-31e7-b0007b416f81 --- core.gyp | 4 ---- 1 file changed, 4 deletions(-) diff --git a/core.gyp b/core.gyp index 479e673..57f31ba 100644 --- a/core.gyp +++ b/core.gyp @@ -29,10 +29,6 @@ 'msvs_disabled_warnings': [4244, 4267,4345, 4390, 4554, 4800], 'conditions': [ [ 'skia_os in ["linux", "freebsd", "openbsd", "solaris"]', { - 'cflags': [ - '-Wno-unused', - '-Wno-unused-function', - ], 'link_settings': { 'libraries': [ '-lpthread', -- cgit v1.2.3 From 138f31474baa6438d94f43a6fd1ab63fb8e2efbe Mon Sep 17 00:00:00 2001 From: "humper@google.com" Date: Mon, 11 Mar 2013 22:18:54 +0000 Subject: add proper support for solid style, and temporarily turn off my change so the bots can go green | git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@8085 2bbb7eff-a529-9590-31e7-b0007b416f81 --- effects.gyp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/effects.gyp b/effects.gyp index e110c9f..fa9fd27 100644 --- a/effects.gyp +++ b/effects.gyp @@ -23,6 +23,9 @@ 'sources': [ 'effects.gypi', # Makes the gypi appear in IDEs (but does not modify the build). ], + 'defines': [ + 'SK_IGNORE_FAST_RECT_BLUR=1', + ], 'conditions': [ ['skia_gpu == 1', { 'include_dirs': [ -- cgit v1.2.3 From fc0039ed6489f4d7309e4ada71bb015fb2deb844 Mon Sep 17 00:00:00 2001 From: "humper@google.com" Date: Mon, 11 Mar 2013 22:42:30 +0000 Subject: re-enable fast blur so I can rebaseline git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@8086 2bbb7eff-a529-9590-31e7-b0007b416f81 --- effects.gyp | 3 --- 1 file changed, 3 deletions(-) diff --git a/effects.gyp b/effects.gyp index fa9fd27..e110c9f 100644 --- a/effects.gyp +++ b/effects.gyp @@ -23,9 +23,6 @@ 'sources': [ 'effects.gypi', # Makes the gypi appear in IDEs (but does not modify the build). ], - 'defines': [ - 'SK_IGNORE_FAST_RECT_BLUR=1', - ], 'conditions': [ ['skia_gpu == 1', { 'include_dirs': [ -- cgit v1.2.3 From 65fb334093bd6a0df4db613b3c16abe1c057a01f Mon Sep 17 00:00:00 2001 From: "commit-bot@chromium.org" Date: Tue, 12 Mar 2013 12:26:08 +0000 Subject: Add GrEllipseEdgeEffect. Adds the effect that replaces the old oval rendering code. Also hooks in code to set attribute names and indices for effects. Author: jvanverth@google.com Review URL: https://chromiumcodereview.appspot.com/12462008 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@8092 2bbb7eff-a529-9590-31e7-b0007b416f81 --- gpu.gypi | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/gpu.gypi b/gpu.gypi index 41f0f09..d9b4b22 100644 --- a/gpu.gypi +++ b/gpu.gypi @@ -122,19 +122,21 @@ '<(skia_src_path)/gpu/gr_unittests.cpp', '<(skia_src_path)/gpu/effects/Gr1DKernelEffect.h', - '<(skia_src_path)/gpu/effects/GrTextureStripAtlas.h', - '<(skia_src_path)/gpu/effects/GrTextureStripAtlas.cpp', '<(skia_src_path)/gpu/effects/GrConfigConversionEffect.cpp', '<(skia_src_path)/gpu/effects/GrConfigConversionEffect.h', '<(skia_src_path)/gpu/effects/GrConvolutionEffect.cpp', '<(skia_src_path)/gpu/effects/GrConvolutionEffect.h', + '<(skia_src_path)/gpu/effects/GrEllipseEdgeEffect.cpp', + '<(skia_src_path)/gpu/effects/GrEllipseEdgeEffect.h', '<(skia_src_path)/gpu/effects/GrSimpleTextureEffect.cpp', '<(skia_src_path)/gpu/effects/GrSimpleTextureEffect.h', '<(skia_src_path)/gpu/effects/GrSingleTextureEffect.cpp', '<(skia_src_path)/gpu/effects/GrSingleTextureEffect.h', '<(skia_src_path)/gpu/effects/GrTextureDomainEffect.cpp', '<(skia_src_path)/gpu/effects/GrTextureDomainEffect.h', - + '<(skia_src_path)/gpu/effects/GrTextureStripAtlas.cpp', + '<(skia_src_path)/gpu/effects/GrTextureStripAtlas.h', + '<(skia_src_path)/gpu/gl/GrGLBufferImpl.cpp', '<(skia_src_path)/gpu/gl/GrGLBufferImpl.h', '<(skia_src_path)/gpu/gl/GrGLCaps.cpp', -- cgit v1.2.3 From 67f9db4b810f52180c8cf9ccf97d105d85715f43 Mon Sep 17 00:00:00 2001 From: "skia.committer@gmail.com" Date: Wed, 13 Mar 2013 07:01:04 +0000 Subject: Sanitizing source files in Skia_Periodic_House_Keeping git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@8120 2bbb7eff-a529-9590-31e7-b0007b416f81 --- gpu.gypi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gpu.gypi b/gpu.gypi index d9b4b22..d964f20 100644 --- a/gpu.gypi +++ b/gpu.gypi @@ -136,7 +136,7 @@ '<(skia_src_path)/gpu/effects/GrTextureDomainEffect.h', '<(skia_src_path)/gpu/effects/GrTextureStripAtlas.cpp', '<(skia_src_path)/gpu/effects/GrTextureStripAtlas.h', - + '<(skia_src_path)/gpu/gl/GrGLBufferImpl.cpp', '<(skia_src_path)/gpu/gl/GrGLBufferImpl.h', '<(skia_src_path)/gpu/gl/GrGLCaps.cpp', -- cgit v1.2.3 From fbc8f03fdd3fd680a53805a3bb0f3efbfde556a5 Mon Sep 17 00:00:00 2001 From: "commit-bot@chromium.org" Date: Wed, 13 Mar 2013 12:48:26 +0000 Subject: refactor android defines to implicitly assume NDK compliance unless it is explicitly marked as being specific to the android framework. Author: djsollen@google.com Reviewed By: reed@google.com,borenet@google.com Review URL: https://chromiumcodereview.appspot.com/12739007 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@8124 2bbb7eff-a529-9590-31e7-b0007b416f81 --- common_conditions.gypi | 1 - 1 file changed, 1 deletion(-) diff --git a/common_conditions.gypi b/common_conditions.gypi index 90662d1..673ed7d 100644 --- a/common_conditions.gypi +++ b/common_conditions.gypi @@ -300,7 +300,6 @@ { 'defines': [ 'SK_BUILD_FOR_ANDROID', - 'SK_BUILD_FOR_ANDROID_NDK', ], 'configurations': { 'Debug': { -- cgit v1.2.3 From 81006176ad3ae90430dcf2beb57fa5641c14f32f Mon Sep 17 00:00:00 2001 From: "caryclark@google.com" Date: Wed, 13 Mar 2013 20:29:41 +0000 Subject: shape ops work in progress git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@8137 2bbb7eff-a529-9590-31e7-b0007b416f81 --- shapeops_edge.gyp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/shapeops_edge.gyp b/shapeops_edge.gyp index 2cbc813..8c67cf7 100644 --- a/shapeops_edge.gyp +++ b/shapeops_edge.gyp @@ -33,6 +33,7 @@ '../experimental/Intersection/CubicToQuadratics.cpp', '../experimental/Intersection/CubicToQuadratics_Test.cpp', '../experimental/Intersection/CubicUtilities.cpp', + '../experimental/Intersection/CubicUtilities_Test.cpp', '../experimental/Intersection/DataTypes.cpp', '../experimental/Intersection/EdgeMain.cpp', '../experimental/Intersection/EdgeWalker.cpp', @@ -63,7 +64,6 @@ '../experimental/Intersection/QuadraticBezierClip_Test.cpp', '../experimental/Intersection/QuadraticBounds.cpp', '../experimental/Intersection/QuadraticImplicit.cpp', - '../experimental/Intersection/QuadraticIntersection.cpp', '../experimental/Intersection/QuadraticIntersection_Test.cpp', '../experimental/Intersection/QuadraticIntersection_TestData.cpp', '../experimental/Intersection/QuadraticLineSegments.cpp', -- cgit v1.2.3 From d67812734f98fd4d4a6e6ddf401d00b1cfdeb1f5 Mon Sep 17 00:00:00 2001 From: "commit-bot@chromium.org" Date: Thu, 14 Mar 2013 13:58:40 +0000 Subject: Update Android Release build to use -O3. Author: djsollen@google.com Reviewed By: borenet@google.com Review URL: https://chromiumcodereview.appspot.com/12784006 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@8153 2bbb7eff-a529-9590-31e7-b0007b416f81 --- common_conditions.gypi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common_conditions.gypi b/common_conditions.gypi index 673ed7d..df13425 100644 --- a/common_conditions.gypi +++ b/common_conditions.gypi @@ -306,7 +306,7 @@ 'cflags': ['-g'] }, 'Release': { - 'cflags': ['-O2'], + 'cflags': ['-O3'], 'defines': [ 'NDEBUG' ], }, }, -- cgit v1.2.3 From abfba028939d8d72b1da00e8a3c3af35d1e4d22e Mon Sep 17 00:00:00 2001 From: "commit-bot@chromium.org" Date: Thu, 14 Mar 2013 14:42:18 +0000 Subject: Upstream Android modifications to the image encoders/decoders. This CL does not update the libjpeg as that change is large enough to warrant its own CL. Author: djsollen@google.com Reviewed By: reed@google.com,robertphillips@google.com,scroggo@google.com Review URL: https://chromiumcodereview.appspot.com/12604006 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@8155 2bbb7eff-a529-9590-31e7-b0007b416f81 --- images.gyp | 7 ++- libwebp.gyp | 174 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 180 insertions(+), 1 deletion(-) create mode 100644 libwebp.gyp diff --git a/images.gyp b/images.gyp index b5447a2..32c7459 100644 --- a/images.gyp +++ b/images.gyp @@ -7,6 +7,7 @@ 'standalone_static_library': 1, 'dependencies': [ 'libjpeg.gyp:*', + 'libwebp.gyp:libwebp', 'utils.gyp:utils', ], 'export_dependent_settings': [ @@ -31,13 +32,17 @@ '../src/images/bmpdecoderhelper.cpp', '../src/images/bmpdecoderhelper.h', + + '../src/images/SkBitmapRegionDecoder.cpp', + '../src/images/SkImageDecoder.cpp', '../src/images/SkImageDecoder_Factory.cpp', - '../src/images/SkImageDecoder_libjpeg.cpp', '../src/images/SkImageDecoder_libbmp.cpp', '../src/images/SkImageDecoder_libgif.cpp', '../src/images/SkImageDecoder_libico.cpp', + '../src/images/SkImageDecoder_libjpeg.cpp', '../src/images/SkImageDecoder_libpng.cpp', + '../src/images/SkImageDecoder_libwebp.cpp', '../src/images/SkImageDecoder_wbmp.cpp', '../src/images/SkImageEncoder.cpp', '../src/images/SkImageEncoder_Factory.cpp', diff --git a/libwebp.gyp b/libwebp.gyp new file mode 100644 index 0000000..ad3f47a --- /dev/null +++ b/libwebp.gyp @@ -0,0 +1,174 @@ +# Copyright (c) 2012 The Chromium Authors. All rights reserved. +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE file. + +{ + 'variables': { + 'use_system_libwebp%': 0, + }, + 'conditions': [ + ['use_system_libwebp==0', { + 'targets': [ + { + 'target_name': 'libwebp_dec', + 'type': 'static_library', + 'include_dirs': [ + '../third_party/externals/libwebp', + ], + 'sources': [ + '../third_party/externals/libwebp/dec/alpha.c', + '../third_party/externals/libwebp/dec/buffer.c', + '../third_party/externals/libwebp/dec/frame.c', + '../third_party/externals/libwebp/dec/idec.c', + '../third_party/externals/libwebp/dec/io.c', + '../third_party/externals/libwebp/dec/layer.c', + '../third_party/externals/libwebp/dec/quant.c', + '../third_party/externals/libwebp/dec/tree.c', + '../third_party/externals/libwebp/dec/vp8.c', + '../third_party/externals/libwebp/dec/vp8l.c', + '../third_party/externals/libwebp/dec/webp.c', + ], + 'cflags!': [ + '-fno-rtti', # supresses warnings about invalid option of non-C++ code + ], + }, + { + 'target_name': 'libwebp_dsp', + 'type': 'static_library', + 'include_dirs': [ + '../third_party/externals/libwebp', + ], + 'sources': [ + '../third_party/externals/libwebp/dsp/cpu.c', + '../third_party/externals/libwebp/dsp/dec.c', + '../third_party/externals/libwebp/dsp/dec_sse2.c', + '../third_party/externals/libwebp/dsp/enc.c', + '../third_party/externals/libwebp/dsp/enc_sse2.c', + '../third_party/externals/libwebp/dsp/lossless.c', + '../third_party/externals/libwebp/dsp/upsampling.c', + '../third_party/externals/libwebp/dsp/upsampling_sse2.c', + '../third_party/externals/libwebp/dsp/yuv.c', + ], + 'cflags!': [ + '-fno-rtti', # supresses warnings about invalid option of non-C++ code + ], + 'conditions': [ + ['skia_os == "android"', { + 'dependencies' : [ + 'android_deps.gyp:cpu_features', + ], + }], + ], + }, + { + 'target_name': 'libwebp_dsp_neon', + 'conditions': [ + ['armv7 == 1', { + 'type': 'static_library', + 'include_dirs': [ + '../third_party/externals/libwebp', + ], + 'sources': [ + '../third_party/externals/libwebp/dsp/dec_neon.c', + ], + # behavior similar dsp_neon.c.neon in an Android.mk + 'cflags!': [ + '-mfpu=vfpv3-d16', + '-fno-rtti', # supresses warnings about invalid option of non-C++ code + ], + 'cflags': [ '-mfpu=neon' ], + },{ # "armv7 != 1" + 'type': 'none', + }], + ], + }, + { + 'target_name': 'libwebp_enc', + 'type': 'static_library', + 'include_dirs': [ + '../third_party/externals/libwebp', + ], + 'sources': [ + '../third_party/externals/libwebp/enc/alpha.c', + '../third_party/externals/libwebp/enc/analysis.c', + '../third_party/externals/libwebp/enc/backward_references.c', + '../third_party/externals/libwebp/enc/config.c', + '../third_party/externals/libwebp/enc/cost.c', + '../third_party/externals/libwebp/enc/filter.c', + '../third_party/externals/libwebp/enc/frame.c', + '../third_party/externals/libwebp/enc/histogram.c', + '../third_party/externals/libwebp/enc/iterator.c', + '../third_party/externals/libwebp/enc/layer.c', + '../third_party/externals/libwebp/enc/picture.c', + '../third_party/externals/libwebp/enc/quant.c', + '../third_party/externals/libwebp/enc/syntax.c', + '../third_party/externals/libwebp/enc/tree.c', + '../third_party/externals/libwebp/enc/vp8l.c', + '../third_party/externals/libwebp/enc/webpenc.c', + ], + 'cflags!': [ + '-fno-rtti', # supresses warnings about invalid option of non-C++ code + ], + }, + { + 'target_name': 'libwebp_utils', + 'type': 'static_library', + 'include_dirs': [ + '../third_party/externals/libwebp', + ], + 'sources': [ + '../third_party/externals/libwebp/utils/bit_reader.c', + '../third_party/externals/libwebp/utils/bit_writer.c', + '../third_party/externals/libwebp/utils/color_cache.c', + '../third_party/externals/libwebp/utils/filters.c', + '../third_party/externals/libwebp/utils/huffman.c', + '../third_party/externals/libwebp/utils/huffman_encode.c', + '../third_party/externals/libwebp/utils/quant_levels.c', + '../third_party/externals/libwebp/utils/rescaler.c', + '../third_party/externals/libwebp/utils/thread.c', + '../third_party/externals/libwebp/utils/utils.c', + ], + 'cflags!': [ + '-fno-rtti', # supresses warnings about invalid option of non-C++ code + ], + }, + { + 'target_name': 'libwebp', + 'type': 'none', + 'dependencies' : [ + 'libwebp_dec', + 'libwebp_dsp', + 'libwebp_dsp_neon', + 'libwebp_enc', + 'libwebp_utils', + ], + 'direct_dependent_settings': { + 'include_dirs': [ + '../third_party/externals/libwebp', + ], + }, + 'conditions': [ + ['OS!="win"', {'product_name': 'webp'}], + ], + }, + ], + }, { + 'targets': [ + { + 'target_name': 'libwebp', + 'type': 'none', + 'direct_dependent_settings': { + 'defines': [ + 'ENABLE_WEBP', + ], + }, + 'link_settings': { + 'libraries': [ + '-lwebp', + ], + }, + } + ], + }], + ], +} -- cgit v1.2.3 From 1da3192de9f358288b2f8852e15b557c34de1524 Mon Sep 17 00:00:00 2001 From: "skia.committer@gmail.com" Date: Fri, 15 Mar 2013 07:05:19 +0000 Subject: Sanitizing source files in Skia_Periodic_House_Keeping git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@8168 2bbb7eff-a529-9590-31e7-b0007b416f81 --- libwebp.gyp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libwebp.gyp b/libwebp.gyp index ad3f47a..b4c9f22 100644 --- a/libwebp.gyp +++ b/libwebp.gyp @@ -72,7 +72,7 @@ '../third_party/externals/libwebp/dsp/dec_neon.c', ], # behavior similar dsp_neon.c.neon in an Android.mk - 'cflags!': [ + 'cflags!': [ '-mfpu=vfpv3-d16', '-fno-rtti', # supresses warnings about invalid option of non-C++ code ], -- cgit v1.2.3 From 3c97bcf078412fedb5867f92977995b9bac9cda0 Mon Sep 17 00:00:00 2001 From: "scroggo@google.com" Date: Fri, 15 Mar 2013 18:08:09 +0000 Subject: Create a platform-dependent object for accessing purgeable memory. Siphoned off from https://codereview.chromium.org/12433020/ Create a Skia class which can provide purgeable memory in a platform- dependent way. Include an implementation for Ashmem and Mac/iOS. Review URL: https://codereview.chromium.org/12645006 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@8176 2bbb7eff-a529-9590-31e7-b0007b416f81 --- core.gypi | 2 ++ ports.gyp | 17 +++++++++++------ 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/core.gypi b/core.gypi index e6f917f..3c2be39 100644 --- a/core.gypi +++ b/core.gypi @@ -294,6 +294,8 @@ '<(skia_src_path)/lazy/SkLazyPixelRef.h', '<(skia_src_path)/lazy/SkLazyPixelRef.cpp', '<(skia_src_path)/lazy/SkLruImageCache.cpp', + '<(skia_src_path)/lazy/SkPurgeableMemoryBlock.h', + '<(skia_src_path)/lazy/SkPurgeableMemoryBlock_common.cpp', ], } diff --git a/ports.gyp b/ports.gyp index 827318d..ca141fb 100644 --- a/ports.gyp +++ b/ports.gyp @@ -12,11 +12,12 @@ 'utils.gyp:utils', ], 'include_dirs': [ - '../include/images', '../include/effects', + '../include/images', '../include/ports', '../include/xml', '../src/core', + '../src/lazy', '../src/utils', ], 'sources': [ @@ -27,6 +28,7 @@ '../src/ports/SkFontHost_win.cpp', '../src/ports/SkFontHost_win_dw.cpp', '../src/ports/SkGlobalInitialization_default.cpp', + '../src/ports/SkPurgeableMemoryBlock_none.cpp', '../src/ports/SkThread_win.cpp', '../src/ports/SkFontHost_tables.cpp', @@ -96,13 +98,15 @@ ], 'sources': [ '../src/ports/SkFontHost_mac.cpp', - '../src/utils/mac/SkStream_mac.cpp', # '../src/ports/SkFontHost_FreeType.cpp', # '../src/ports/SkFontHost_FreeType_common.cpp', # '../src/ports/SkFontHost_freetype_mac.cpp', + '../src/ports/SkPurgeableMemoryBlock_mac.cpp', '../src/ports/SkThread_pthread.cpp', + '../src/utils/mac/SkStream_mac.cpp', ], 'sources!': [ + '../src/ports/SkPurgeableMemoryBlock_none.cpp', '../src/ports/SkFontHost_tables.cpp', ], }], @@ -113,10 +117,12 @@ ], 'sources': [ '../src/ports/SkFontHost_mac.cpp', - '../src/utils/mac/SkStream_mac.cpp', + '../src/ports/SkPurgeableMemoryBlock_mac.cpp', '../src/ports/SkThread_pthread.cpp', + '../src/utils/mac/SkStream_mac.cpp', ], 'sources!': [ + '../src/ports/SkPurgeableMemoryBlock_none.cpp', '../src/ports/SkFontHost_tables.cpp', ], }], @@ -158,17 +164,16 @@ ], 'sources!': [ '../src/ports/SkDebug_stdio.cpp', + '../src/ports/SkPurgeableMemoryBlock_none.cpp', ], 'sources': [ - '../include/ports/SkAshmemImageCache.h', - '../src/ports/SkDebug_android.cpp', '../src/ports/SkThread_pthread.cpp', '../src/ports/SkFontHost_android.cpp', '../src/ports/SkFontHost_FreeType.cpp', '../src/ports/SkFontHost_FreeType_common.cpp', + '../src/ports/SkPurgeableMemoryBlock_android.cpp', '../src/ports/FontHostConfiguration_android.cpp', - '../src/ports/SkAshmemImageCache.cpp', ], 'dependencies': [ 'freetype.gyp:freetype', -- cgit v1.2.3 From ad8b7effc628004295e1af57726319e7c8662bc5 Mon Sep 17 00:00:00 2001 From: "robertphillips@google.com" Date: Sun, 17 Mar 2013 15:40:59 +0000 Subject: Fix android build https://codereview.chromium.org/12896002/ git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@8178 2bbb7eff-a529-9590-31e7-b0007b416f81 --- ports.gyp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/ports.gyp b/ports.gyp index ca141fb..7814148 100644 --- a/ports.gyp +++ b/ports.gyp @@ -167,6 +167,8 @@ '../src/ports/SkPurgeableMemoryBlock_none.cpp', ], 'sources': [ + '../include/ports/SkAshmemImageCache.h', + '../src/ports/SkDebug_android.cpp', '../src/ports/SkThread_pthread.cpp', '../src/ports/SkFontHost_android.cpp', @@ -174,6 +176,7 @@ '../src/ports/SkFontHost_FreeType_common.cpp', '../src/ports/SkPurgeableMemoryBlock_android.cpp', '../src/ports/FontHostConfiguration_android.cpp', + '../src/ports/SkAshmemImageCache.cpp', ], 'dependencies': [ 'freetype.gyp:freetype', -- cgit v1.2.3 From 8f7bde7c8bd2405058385e420dc5a36cdbe953ca Mon Sep 17 00:00:00 2001 From: "reed@google.com" Date: Mon, 18 Mar 2013 19:08:46 +0000 Subject: move SK_MMAP_SUPPORT into SkPreConfig, so we can know about its availability throughout the code. Add SkData::NewFromMMap() help factory. Refactor (now gone) SkMMapStream into SkStream::NewFromFile() factory Review URL: https://codereview.chromium.org/12919013 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@8200 2bbb7eff-a529-9590-31e7-b0007b416f81 --- core.gyp | 4 ---- core.gypi | 1 - 2 files changed, 5 deletions(-) diff --git a/core.gyp b/core.gyp index 57f31ba..5f99fd9 100644 --- a/core.gyp +++ b/core.gyp @@ -74,10 +74,6 @@ 'include_dirs': [ 'config/win', ], - 'sources!': [ - '../include/core/SkMMapStream.h', - '../src/core/SkMMapStream.cpp', - ], }], [ 'skia_os in ("android", "nacl")', { 'dependencies': [ diff --git a/core.gypi b/core.gypi index 3c2be39..23a652a 100644 --- a/core.gypi +++ b/core.gypi @@ -105,7 +105,6 @@ '<(skia_src_path)/core/SkMath.cpp', '<(skia_src_path)/core/SkMatrix.cpp', '<(skia_src_path)/core/SkMetaData.cpp', - '<(skia_src_path)/core/SkMMapStream.cpp', '<(skia_src_path)/core/SkOrderedReadBuffer.cpp', '<(skia_src_path)/core/SkOrderedWriteBuffer.cpp', '<(skia_src_path)/core/SkPackBits.cpp', -- cgit v1.2.3 From c85b9ee2ccdc3255a7bc37d9895b6cf296cbd0bf Mon Sep 17 00:00:00 2001 From: "reed@google.com" Date: Mon, 18 Mar 2013 19:32:58 +0000 Subject: revert 8200 to figure out android break git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@8201 2bbb7eff-a529-9590-31e7-b0007b416f81 --- core.gyp | 4 ++++ core.gypi | 1 + 2 files changed, 5 insertions(+) diff --git a/core.gyp b/core.gyp index 5f99fd9..57f31ba 100644 --- a/core.gyp +++ b/core.gyp @@ -74,6 +74,10 @@ 'include_dirs': [ 'config/win', ], + 'sources!': [ + '../include/core/SkMMapStream.h', + '../src/core/SkMMapStream.cpp', + ], }], [ 'skia_os in ("android", "nacl")', { 'dependencies': [ diff --git a/core.gypi b/core.gypi index 23a652a..3c2be39 100644 --- a/core.gypi +++ b/core.gypi @@ -105,6 +105,7 @@ '<(skia_src_path)/core/SkMath.cpp', '<(skia_src_path)/core/SkMatrix.cpp', '<(skia_src_path)/core/SkMetaData.cpp', + '<(skia_src_path)/core/SkMMapStream.cpp', '<(skia_src_path)/core/SkOrderedReadBuffer.cpp', '<(skia_src_path)/core/SkOrderedWriteBuffer.cpp', '<(skia_src_path)/core/SkPackBits.cpp', -- cgit v1.2.3 From 70556ad4fb98df5860775b03ee60fdd56349a666 Mon Sep 17 00:00:00 2001 From: "reed@google.com" Date: Mon, 18 Mar 2013 20:49:28 +0000 Subject: reland 8200 w/ fix for android (need fullpath instead of path) git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@8204 2bbb7eff-a529-9590-31e7-b0007b416f81 --- core.gyp | 4 ---- core.gypi | 1 - 2 files changed, 5 deletions(-) diff --git a/core.gyp b/core.gyp index 57f31ba..5f99fd9 100644 --- a/core.gyp +++ b/core.gyp @@ -74,10 +74,6 @@ 'include_dirs': [ 'config/win', ], - 'sources!': [ - '../include/core/SkMMapStream.h', - '../src/core/SkMMapStream.cpp', - ], }], [ 'skia_os in ("android", "nacl")', { 'dependencies': [ diff --git a/core.gypi b/core.gypi index 3c2be39..23a652a 100644 --- a/core.gypi +++ b/core.gypi @@ -105,7 +105,6 @@ '<(skia_src_path)/core/SkMath.cpp', '<(skia_src_path)/core/SkMatrix.cpp', '<(skia_src_path)/core/SkMetaData.cpp', - '<(skia_src_path)/core/SkMMapStream.cpp', '<(skia_src_path)/core/SkOrderedReadBuffer.cpp', '<(skia_src_path)/core/SkOrderedWriteBuffer.cpp', '<(skia_src_path)/core/SkPackBits.cpp', -- cgit v1.2.3 From 10234201fda399cf7c92b4737f82b0a879bae669 Mon Sep 17 00:00:00 2001 From: "reed@google.com" Date: Mon, 18 Mar 2013 20:53:49 +0000 Subject: revert 8204 -- what is happening??? git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@8205 2bbb7eff-a529-9590-31e7-b0007b416f81 --- core.gyp | 4 ++++ core.gypi | 1 + 2 files changed, 5 insertions(+) diff --git a/core.gyp b/core.gyp index 5f99fd9..57f31ba 100644 --- a/core.gyp +++ b/core.gyp @@ -74,6 +74,10 @@ 'include_dirs': [ 'config/win', ], + 'sources!': [ + '../include/core/SkMMapStream.h', + '../src/core/SkMMapStream.cpp', + ], }], [ 'skia_os in ("android", "nacl")', { 'dependencies': [ diff --git a/core.gypi b/core.gypi index 23a652a..3c2be39 100644 --- a/core.gypi +++ b/core.gypi @@ -105,6 +105,7 @@ '<(skia_src_path)/core/SkMath.cpp', '<(skia_src_path)/core/SkMatrix.cpp', '<(skia_src_path)/core/SkMetaData.cpp', + '<(skia_src_path)/core/SkMMapStream.cpp', '<(skia_src_path)/core/SkOrderedReadBuffer.cpp', '<(skia_src_path)/core/SkOrderedWriteBuffer.cpp', '<(skia_src_path)/core/SkPackBits.cpp', -- cgit v1.2.3 From 5de357b1de70176b9321c18b6a64e9e99dec8d34 Mon Sep 17 00:00:00 2001 From: "reed@google.com" Date: Mon, 18 Mar 2013 21:08:46 +0000 Subject: reland 8200 w/ fix for android (use fullpath instead of path) Review URL: https://codereview.chromium.org/12921003 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@8206 2bbb7eff-a529-9590-31e7-b0007b416f81 --- core.gyp | 4 ---- core.gypi | 1 - 2 files changed, 5 deletions(-) diff --git a/core.gyp b/core.gyp index 57f31ba..5f99fd9 100644 --- a/core.gyp +++ b/core.gyp @@ -74,10 +74,6 @@ 'include_dirs': [ 'config/win', ], - 'sources!': [ - '../include/core/SkMMapStream.h', - '../src/core/SkMMapStream.cpp', - ], }], [ 'skia_os in ("android", "nacl")', { 'dependencies': [ diff --git a/core.gypi b/core.gypi index 3c2be39..23a652a 100644 --- a/core.gypi +++ b/core.gypi @@ -105,7 +105,6 @@ '<(skia_src_path)/core/SkMath.cpp', '<(skia_src_path)/core/SkMatrix.cpp', '<(skia_src_path)/core/SkMetaData.cpp', - '<(skia_src_path)/core/SkMMapStream.cpp', '<(skia_src_path)/core/SkOrderedReadBuffer.cpp', '<(skia_src_path)/core/SkOrderedWriteBuffer.cpp', '<(skia_src_path)/core/SkPackBits.cpp', -- cgit v1.2.3 From 2f48ef9d40de4959cc27e4caf5c76632bf7c365b Mon Sep 17 00:00:00 2001 From: "scroggo@google.com" Date: Mon, 18 Mar 2013 21:37:39 +0000 Subject: Improvements/additions to SkImageCache/SkLazyPixelRef. SkPurgeableImageCache: New image cache that uses virtual memory to store the pixels. Combines features of SkAshmemImageCache (which has been removed) with SkPurgeableMemoryBlock, which has android and Mac versions. SkImageCache: Modified the API. pinCache now returns a status out parameter which states whether the pinned memory retained the old data. This allows allocAndPinCache to only be used for allocations. Add a new debug only interface to purge unpinned data. Updates to documentation, clarifying behavior. Changed CachedStatus to MemoryStatus SkLruImageCache: Implement the new function purgeAllUnpinnedCaches and change implementation of pinCache for the new behavior. SkLazyPixelRef: Rewrite onLockPixels to account for the new behavior of pinCache. BitmapFactoryTest: Test the new SkPurgeableImageCache. Write tests which directly test the SkImageCaches. Create a larger bitmap, since some of the SkImageCaches are designed to handle large bitmaps. bench_ and render_pictures: Consolidate lazy_decode_bitmap into one function. Allow using a flag to specify using the purgeable image cache. Clean up some #includes. Review URL: https://codereview.chromium.org/12433020 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@8207 2bbb7eff-a529-9590-31e7-b0007b416f81 --- core.gypi | 2 ++ ports.gyp | 5 +---- tools.gyp | 2 ++ 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/core.gypi b/core.gypi index 23a652a..3810334 100644 --- a/core.gypi +++ b/core.gypi @@ -288,6 +288,7 @@ '<(skia_include_path)/lazy/SkBitmapFactory.h', '<(skia_include_path)/lazy/SkImageCache.h', '<(skia_include_path)/lazy/SkLruImageCache.h', + '<(skia_include_path)/lazy/SkPurgeableImageCache.h', '<(skia_src_path)/lazy/SkBitmapFactory.cpp', '<(skia_src_path)/lazy/SkLazyPixelRef.h', @@ -295,6 +296,7 @@ '<(skia_src_path)/lazy/SkLruImageCache.cpp', '<(skia_src_path)/lazy/SkPurgeableMemoryBlock.h', '<(skia_src_path)/lazy/SkPurgeableMemoryBlock_common.cpp', + '<(skia_src_path)/lazy/SkPurgeableImageCache.cpp', ], } diff --git a/ports.gyp b/ports.gyp index 7814148..db4ea7a 100644 --- a/ports.gyp +++ b/ports.gyp @@ -167,16 +167,13 @@ '../src/ports/SkPurgeableMemoryBlock_none.cpp', ], 'sources': [ - '../include/ports/SkAshmemImageCache.h', - + '../src/ports/FontHostConfiguration_android.cpp', '../src/ports/SkDebug_android.cpp', '../src/ports/SkThread_pthread.cpp', '../src/ports/SkFontHost_android.cpp', '../src/ports/SkFontHost_FreeType.cpp', '../src/ports/SkFontHost_FreeType_common.cpp', '../src/ports/SkPurgeableMemoryBlock_android.cpp', - '../src/ports/FontHostConfiguration_android.cpp', - '../src/ports/SkAshmemImageCache.cpp', ], 'dependencies': [ 'freetype.gyp:freetype', diff --git a/tools.gyp b/tools.gyp index 4e3bc53..9cbaf93 100644 --- a/tools.gyp +++ b/tools.gyp @@ -100,6 +100,7 @@ 'skia_base_libs.gyp:skia_base_libs', 'tools.gyp:picture_renderer', 'tools.gyp:picture_utils', + 'ports.gyp:ports', ], }, { @@ -123,6 +124,7 @@ 'tools.gyp:picture_utils', 'tools.gyp:picture_renderer', 'bench.gyp:bench_timer', + 'ports.gyp:ports', ], }, { -- cgit v1.2.3 From a24b2ae5cb3f02353478299784b4ae7d119ac33a Mon Sep 17 00:00:00 2001 From: "robertphillips@google.com" Date: Tue, 19 Mar 2013 12:29:06 +0000 Subject: Remove SkMMapStream.h from core.gypi git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@8214 2bbb7eff-a529-9590-31e7-b0007b416f81 --- core.gypi | 1 - 1 file changed, 1 deletion(-) diff --git a/core.gypi b/core.gypi index 3810334..811f89b 100644 --- a/core.gypi +++ b/core.gypi @@ -237,7 +237,6 @@ '<(skia_include_path)/core/SkMath.h', '<(skia_include_path)/core/SkMatrix.h', '<(skia_include_path)/core/SkMetaData.h', - '<(skia_include_path)/core/SkMMapStream.h', '<(skia_include_path)/core/SkOSFile.h', '<(skia_include_path)/core/SkPackBits.h', '<(skia_include_path)/core/SkPaint.h', -- cgit v1.2.3 From aeef410f6c6d90f9a25ba57427f77e5b0680d686 Mon Sep 17 00:00:00 2001 From: "robertphillips@google.com" Date: Tue, 19 Mar 2013 14:11:15 +0000 Subject: Adding rects-specific GM https://codereview.chromium.org/12934003/ git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@8218 2bbb7eff-a529-9590-31e7-b0007b416f81 --- gmslides.gypi | 1 + 1 file changed, 1 insertion(+) diff --git a/gmslides.gypi b/gmslides.gypi index ae36de0..826bac8 100644 --- a/gmslides.gypi +++ b/gmslides.gypi @@ -65,6 +65,7 @@ '../gm/points.cpp', '../gm/poly2poly.cpp', '../gm/quadpaths.cpp', + '../gm/rects.cpp', '../gm/rrect.cpp', '../gm/rrects.cpp', '../gm/samplerstress.cpp', -- cgit v1.2.3 From 521b3c0d28a237bf2e48019b29267327b8266c9c Mon Sep 17 00:00:00 2001 From: "edisonn@google.com" Date: Tue, 19 Mar 2013 17:19:05 +0000 Subject: resubmit https://code.google.com/p/skia/source/detail?r=7883 (in the meantime we added capability to collect minidump and callstack if buildbot fails with heap coruption in windows. a few minor conflicts have been resolved) Review URL: https://codereview.chromium.org/12840004 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@8233 2bbb7eff-a529-9590-31e7-b0007b416f81 --- pdf.gyp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pdf.gyp b/pdf.gyp index 7b3b9ea..081df01 100644 --- a/pdf.gyp +++ b/pdf.gyp @@ -12,6 +12,7 @@ 'include_dirs': [ '../include/config', '../include/core', + '../include/images', '../include/pdf', '../src/core', # needed to get SkGlyphCache.h and SkTextFormatParams.h '../src/utils', # needed to get SkBitSet.h @@ -43,6 +44,7 @@ '../src/pdf/SkPDFTypes.h', '../src/pdf/SkPDFUtils.cpp', '../src/pdf/SkPDFUtils.h', + '../src/pdf/SkTSet.h', ], # This section makes all targets that depend on this target # #define SK_SUPPORT_PDF and have access to the pdf header files. -- cgit v1.2.3 From 0589664a3b1363451aa651b041d6c4a6863fae27 Mon Sep 17 00:00:00 2001 From: "scroggo@google.com" Date: Tue, 19 Mar 2013 17:28:10 +0000 Subject: Make gm use SkFlags. Make flag parser its own project. It is still in the tools folder, but can now be used by other projects. Some changes to behavior in order to work with SkFlags: enable-missing-warning and disable-missing-warning have become enableMissingWarning and noenableMissingWarning. exclude-config is now excludeConfig --config now can only be listed once, but all configs listed after it will be included (same with excludeConfig and match). In addition, writeJsonSummary has been changed to writeJsonSummaryPath for consistency with other path flags. Provide an option to SkFlags to provide a short name, and use it for the flags which have short names. --tileGridReplayScales now takes space separated arguments, like other inputs. BUG=https://code.google.com/p/skia/issues/detail?id=1094 Review URL: https://codereview.chromium.org/12632015 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@8235 2bbb7eff-a529-9590-31e7-b0007b416f81 --- flags.gyp | 29 +++++++++++++++++++++++++++++ gm.gyp | 1 + tools.gyp | 8 ++------ 3 files changed, 32 insertions(+), 6 deletions(-) create mode 100644 flags.gyp diff --git a/flags.gyp b/flags.gyp new file mode 100644 index 0000000..712a04b --- /dev/null +++ b/flags.gyp @@ -0,0 +1,29 @@ +# GYP file to build flag parser +# +{ + 'targets': [ + { + 'target_name': 'flags', + 'type': 'static_library', + 'sources': [ + '../tools/SkFlags.h', + '../tools/SkFlags.cpp', + ], + 'dependencies': [ + 'skia_base_libs.gyp:skia_base_libs', + 'core.gyp:core', + ], + 'direct_dependent_settings': { + 'include_dirs': [ + '../tools/', + ], + } + }, + ], +} + +# Local Variables: +# tab-width:2 +# indent-tabs-mode:nil +# End: +# vim: set expandtab tabstop=2 shiftwidth=2: diff --git a/gm.gyp b/gm.gyp index 4b2b1c4..940ab84 100644 --- a/gm.gyp +++ b/gm.gyp @@ -26,6 +26,7 @@ 'dependencies': [ 'skia_base_libs.gyp:skia_base_libs', 'effects.gyp:effects', + 'flags.gyp:flags', 'images.gyp:images', 'jsoncpp.gyp:jsoncpp', 'pdf.gyp:pdf', diff --git a/tools.gyp b/tools.gyp index 9cbaf93..9ed7d68 100644 --- a/tools.gyp +++ b/tools.gyp @@ -3,8 +3,6 @@ # To build on Linux: # ./gyp_skia tools.gyp && make tools # -# Building on other platforms not tested yet. -# { 'includes': [ 'apptype_console.gypi', @@ -66,12 +64,11 @@ 'type': 'executable', 'sources': [ '../tools/skhello.cpp', - '../tools/SkFlags.h', - '../tools/SkFlags.cpp', ], 'dependencies': [ 'skia_base_libs.gyp:skia_base_libs', 'effects.gyp:effects', + 'flags.gyp:flags', 'images.gyp:images', ], }, @@ -137,8 +134,6 @@ '../tools/PictureRenderingFlags.cpp', '../tools/CopyTilesRenderer.h', '../tools/CopyTilesRenderer.cpp', - '../tools/SkFlags.h', - '../tools/SkFlags.cpp', '../src/pipe/utils/SamplePipeControllers.h', '../src/pipe/utils/SamplePipeControllers.cpp', ], @@ -152,6 +147,7 @@ 'effects.gyp:effects', 'images.gyp:images', 'tools.gyp:picture_utils', + 'flags.gyp:flags', ], 'conditions': [ ['skia_gpu == 1', -- cgit v1.2.3 From 39e7bf7ebee542f283edca8cce2871da308a4640 Mon Sep 17 00:00:00 2001 From: "scroggo@google.com" Date: Tue, 19 Mar 2013 17:38:50 +0000 Subject: Revert "Make gm use SkFlags." Fix the build. This reverts commit 6f1fe2aee39308fc56854b062be244a904c209e7. Review URL: https://codereview.chromium.org/12709005 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@8236 2bbb7eff-a529-9590-31e7-b0007b416f81 --- flags.gyp | 29 ----------------------------- gm.gyp | 1 - tools.gyp | 8 ++++++-- 3 files changed, 6 insertions(+), 32 deletions(-) delete mode 100644 flags.gyp diff --git a/flags.gyp b/flags.gyp deleted file mode 100644 index 712a04b..0000000 --- a/flags.gyp +++ /dev/null @@ -1,29 +0,0 @@ -# GYP file to build flag parser -# -{ - 'targets': [ - { - 'target_name': 'flags', - 'type': 'static_library', - 'sources': [ - '../tools/SkFlags.h', - '../tools/SkFlags.cpp', - ], - 'dependencies': [ - 'skia_base_libs.gyp:skia_base_libs', - 'core.gyp:core', - ], - 'direct_dependent_settings': { - 'include_dirs': [ - '../tools/', - ], - } - }, - ], -} - -# Local Variables: -# tab-width:2 -# indent-tabs-mode:nil -# End: -# vim: set expandtab tabstop=2 shiftwidth=2: diff --git a/gm.gyp b/gm.gyp index 940ab84..4b2b1c4 100644 --- a/gm.gyp +++ b/gm.gyp @@ -26,7 +26,6 @@ 'dependencies': [ 'skia_base_libs.gyp:skia_base_libs', 'effects.gyp:effects', - 'flags.gyp:flags', 'images.gyp:images', 'jsoncpp.gyp:jsoncpp', 'pdf.gyp:pdf', diff --git a/tools.gyp b/tools.gyp index 9ed7d68..9cbaf93 100644 --- a/tools.gyp +++ b/tools.gyp @@ -3,6 +3,8 @@ # To build on Linux: # ./gyp_skia tools.gyp && make tools # +# Building on other platforms not tested yet. +# { 'includes': [ 'apptype_console.gypi', @@ -64,11 +66,12 @@ 'type': 'executable', 'sources': [ '../tools/skhello.cpp', + '../tools/SkFlags.h', + '../tools/SkFlags.cpp', ], 'dependencies': [ 'skia_base_libs.gyp:skia_base_libs', 'effects.gyp:effects', - 'flags.gyp:flags', 'images.gyp:images', ], }, @@ -134,6 +137,8 @@ '../tools/PictureRenderingFlags.cpp', '../tools/CopyTilesRenderer.h', '../tools/CopyTilesRenderer.cpp', + '../tools/SkFlags.h', + '../tools/SkFlags.cpp', '../src/pipe/utils/SamplePipeControllers.h', '../src/pipe/utils/SamplePipeControllers.cpp', ], @@ -147,7 +152,6 @@ 'effects.gyp:effects', 'images.gyp:images', 'tools.gyp:picture_utils', - 'flags.gyp:flags', ], 'conditions': [ ['skia_gpu == 1', -- cgit v1.2.3 From 2ea56f35a660d59016803e645ee2582708f05222 Mon Sep 17 00:00:00 2001 From: "jvanverth@google.com" Date: Tue, 19 Mar 2013 18:51:02 +0000 Subject: Add stroked ovals and CircleEdgeEffect. Adds some optimizations to the circle and ellipse shaders, static effect instances for their GrEffects, and some minor changes to GrDrawState::setEffect to make GrEffect setup faster. git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@8238 2bbb7eff-a529-9590-31e7-b0007b416f81 --- gpu.gypi | 2 ++ 1 file changed, 2 insertions(+) diff --git a/gpu.gypi b/gpu.gypi index d964f20..6b039d0 100644 --- a/gpu.gypi +++ b/gpu.gypi @@ -122,6 +122,8 @@ '<(skia_src_path)/gpu/gr_unittests.cpp', '<(skia_src_path)/gpu/effects/Gr1DKernelEffect.h', + '<(skia_src_path)/gpu/effects/GrCircleEdgeEffect.cpp', + '<(skia_src_path)/gpu/effects/GrCircleEdgeEffect.h', '<(skia_src_path)/gpu/effects/GrConfigConversionEffect.cpp', '<(skia_src_path)/gpu/effects/GrConfigConversionEffect.h', '<(skia_src_path)/gpu/effects/GrConvolutionEffect.cpp', -- cgit v1.2.3 From 6c6aa5a57bce258efa5d5da0fa8be099a4f13329 Mon Sep 17 00:00:00 2001 From: "scroggo@google.com" Date: Wed, 20 Mar 2013 14:20:18 +0000 Subject: Reland r8235 "Switch gm to use SkFlags." This time, using #if guards for gpuCacheSize consistently. Also fix some warnings. BUG=https://code.google.com/p/skia/issues/detail?id=1094 Review URL: https://codereview.chromium.org/12440052 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@8254 2bbb7eff-a529-9590-31e7-b0007b416f81 --- flags.gyp | 29 +++++++++++++++++++++++++++++ gm.gyp | 1 + tools.gyp | 8 ++------ 3 files changed, 32 insertions(+), 6 deletions(-) create mode 100644 flags.gyp diff --git a/flags.gyp b/flags.gyp new file mode 100644 index 0000000..712a04b --- /dev/null +++ b/flags.gyp @@ -0,0 +1,29 @@ +# GYP file to build flag parser +# +{ + 'targets': [ + { + 'target_name': 'flags', + 'type': 'static_library', + 'sources': [ + '../tools/SkFlags.h', + '../tools/SkFlags.cpp', + ], + 'dependencies': [ + 'skia_base_libs.gyp:skia_base_libs', + 'core.gyp:core', + ], + 'direct_dependent_settings': { + 'include_dirs': [ + '../tools/', + ], + } + }, + ], +} + +# Local Variables: +# tab-width:2 +# indent-tabs-mode:nil +# End: +# vim: set expandtab tabstop=2 shiftwidth=2: diff --git a/gm.gyp b/gm.gyp index 4b2b1c4..940ab84 100644 --- a/gm.gyp +++ b/gm.gyp @@ -26,6 +26,7 @@ 'dependencies': [ 'skia_base_libs.gyp:skia_base_libs', 'effects.gyp:effects', + 'flags.gyp:flags', 'images.gyp:images', 'jsoncpp.gyp:jsoncpp', 'pdf.gyp:pdf', diff --git a/tools.gyp b/tools.gyp index 9cbaf93..9ed7d68 100644 --- a/tools.gyp +++ b/tools.gyp @@ -3,8 +3,6 @@ # To build on Linux: # ./gyp_skia tools.gyp && make tools # -# Building on other platforms not tested yet. -# { 'includes': [ 'apptype_console.gypi', @@ -66,12 +64,11 @@ 'type': 'executable', 'sources': [ '../tools/skhello.cpp', - '../tools/SkFlags.h', - '../tools/SkFlags.cpp', ], 'dependencies': [ 'skia_base_libs.gyp:skia_base_libs', 'effects.gyp:effects', + 'flags.gyp:flags', 'images.gyp:images', ], }, @@ -137,8 +134,6 @@ '../tools/PictureRenderingFlags.cpp', '../tools/CopyTilesRenderer.h', '../tools/CopyTilesRenderer.cpp', - '../tools/SkFlags.h', - '../tools/SkFlags.cpp', '../src/pipe/utils/SamplePipeControllers.h', '../src/pipe/utils/SamplePipeControllers.cpp', ], @@ -152,6 +147,7 @@ 'effects.gyp:effects', 'images.gyp:images', 'tools.gyp:picture_utils', + 'flags.gyp:flags', ], 'conditions': [ ['skia_gpu == 1', -- cgit v1.2.3 From 508e004c081a3f75b31b95a20d62f4c5f7f183c0 Mon Sep 17 00:00:00 2001 From: "robertphillips@google.com" Date: Wed, 20 Mar 2013 14:42:51 +0000 Subject: Reverting r8233 (Use SkSet in PDF) git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@8255 2bbb7eff-a529-9590-31e7-b0007b416f81 --- pdf.gyp | 2 -- 1 file changed, 2 deletions(-) diff --git a/pdf.gyp b/pdf.gyp index 081df01..7b3b9ea 100644 --- a/pdf.gyp +++ b/pdf.gyp @@ -12,7 +12,6 @@ 'include_dirs': [ '../include/config', '../include/core', - '../include/images', '../include/pdf', '../src/core', # needed to get SkGlyphCache.h and SkTextFormatParams.h '../src/utils', # needed to get SkBitSet.h @@ -44,7 +43,6 @@ '../src/pdf/SkPDFTypes.h', '../src/pdf/SkPDFUtils.cpp', '../src/pdf/SkPDFUtils.h', - '../src/pdf/SkTSet.h', ], # This section makes all targets that depend on this target # #define SK_SUPPORT_PDF and have access to the pdf header files. -- cgit v1.2.3 From 46ff642dbff04b269a02096d88f07d1a99b4916e Mon Sep 17 00:00:00 2001 From: "djsollen@google.com" Date: Wed, 20 Mar 2013 16:07:37 +0000 Subject: Remove SK_ENABLE_LIBPNG define as it is no longer needed by Android. Review URL: https://codereview.chromium.org/12958002 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@8262 2bbb7eff-a529-9590-31e7-b0007b416f81 --- images.gyp | 3 --- 1 file changed, 3 deletions(-) diff --git a/images.gyp b/images.gyp index 32c7459..88f2447 100644 --- a/images.gyp +++ b/images.gyp @@ -124,9 +124,6 @@ 'android_deps.gyp:gif', 'android_deps.gyp:png', ], - 'defines': [ - 'SK_ENABLE_LIBPNG', - ], },{ #else if skia_os != android 'sources!': [ '../src/images/SkImageRef_ashmem.h', -- cgit v1.2.3 From 905eeddea4e71bb5c64afc6233cb84013e85542f Mon Sep 17 00:00:00 2001 From: "djsollen@google.com" Date: Wed, 20 Mar 2013 17:45:27 +0000 Subject: Upstream changes from Android for decoding jpeg images. Review URL: https://codereview.chromium.org/12438025 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@8267 2bbb7eff-a529-9590-31e7-b0007b416f81 --- libjpeg.gyp | 211 ++++++++++++++++++++++++++++++++---------------------------- 1 file changed, 114 insertions(+), 97 deletions(-) diff --git a/libjpeg.gyp b/libjpeg.gyp index 394f2ee..f668310 100644 --- a/libjpeg.gyp +++ b/libjpeg.gyp @@ -13,110 +13,127 @@ 'use_system_libjpeg%': 0, }, 'conditions': [ - ['use_system_libjpeg==0', { + ['skia_os == "android"', { 'targets': [ { 'target_name': 'libjpeg', - 'type': 'static_library', - 'sources': [ - '../third_party/externals/libjpeg/jcapimin.c', - '../third_party/externals/libjpeg/jcapistd.c', - '../third_party/externals/libjpeg/jccoefct.c', - '../third_party/externals/libjpeg/jccolor.c', - '../third_party/externals/libjpeg/jcdctmgr.c', - '../third_party/externals/libjpeg/jchuff.c', - '../third_party/externals/libjpeg/jchuff.h', - '../third_party/externals/libjpeg/jcinit.c', - '../third_party/externals/libjpeg/jcmainct.c', - '../third_party/externals/libjpeg/jcmarker.c', - '../third_party/externals/libjpeg/jcmaster.c', - '../third_party/externals/libjpeg/jcomapi.c', - '../third_party/externals/libjpeg/jconfig.h', - '../third_party/externals/libjpeg/jcparam.c', - '../third_party/externals/libjpeg/jcphuff.c', - '../third_party/externals/libjpeg/jcprepct.c', - '../third_party/externals/libjpeg/jcsample.c', - '../third_party/externals/libjpeg/jdapimin.c', - '../third_party/externals/libjpeg/jdapistd.c', - '../third_party/externals/libjpeg/jdatadst.c', - '../third_party/externals/libjpeg/jdatasrc.c', - '../third_party/externals/libjpeg/jdcoefct.c', - '../third_party/externals/libjpeg/jdcolor.c', - '../third_party/externals/libjpeg/jdct.h', - '../third_party/externals/libjpeg/jddctmgr.c', - '../third_party/externals/libjpeg/jdhuff.c', - '../third_party/externals/libjpeg/jdhuff.h', - '../third_party/externals/libjpeg/jdinput.c', - '../third_party/externals/libjpeg/jdmainct.c', - '../third_party/externals/libjpeg/jdmarker.c', - '../third_party/externals/libjpeg/jdmaster.c', - '../third_party/externals/libjpeg/jdmerge.c', - '../third_party/externals/libjpeg/jdphuff.c', - '../third_party/externals/libjpeg/jdpostct.c', - '../third_party/externals/libjpeg/jdsample.c', - '../third_party/externals/libjpeg/jerror.c', - '../third_party/externals/libjpeg/jerror.h', - '../third_party/externals/libjpeg/jfdctflt.c', - '../third_party/externals/libjpeg/jfdctfst.c', - '../third_party/externals/libjpeg/jfdctint.c', - '../third_party/externals/libjpeg/jidctflt.c', - '../third_party/externals/libjpeg/jidctfst.c', - '../third_party/externals/libjpeg/jidctint.c', - '../third_party/externals/libjpeg/jinclude.h', - '../third_party/externals/libjpeg/jmemmgr.c', - '../third_party/externals/libjpeg/jmemnobs.c', - '../third_party/externals/libjpeg/jmemsys.h', - '../third_party/externals/libjpeg/jmorecfg.h', - '../third_party/externals/libjpeg/jpegint.h', - '../third_party/externals/libjpeg/jpeglib.h', - '../third_party/externals/libjpeg/jquant1.c', - '../third_party/externals/libjpeg/jquant2.c', - '../third_party/externals/libjpeg/jutils.c', - '../third_party/externals/libjpeg/jversion.h', + 'type': 'none', + 'dependencies': [ + 'android_deps.gyp:jpeg', ], - 'direct_dependent_settings': { - 'include_dirs': [ - '../third_party/externals/libjpeg', - ], - }, - 'conditions': [ - ['OS!="win"', { - 'product_name': 'jpeg', - 'cflags': [ - '-Wno-main', # supresses warnings about naming things "main" - ], - }], - ['OS=="android"', { - 'cflags!': [ - '-fno-rtti', # supresses warnings about invalid option of non-C++ code - '-Wall', - '-Werror', - ], - }], - ['OS in ["linux", "freebsd", "openbsd", "solaris", "nacl"]', { - 'cflags!': [ - '-Werror', - ], - }], + 'export_dependent_settings': [ + 'android_deps.gyp:jpeg', ], }, ], - }, { - 'targets': [ - { - 'target_name': 'libjpeg', - 'type': 'none', - 'direct_dependent_settings': { - 'defines': [ - 'USE_SYSTEM_LIBJPEG', - ], - }, - 'link_settings': { - 'libraries': [ - '-ljpeg', - ], - }, - } + }, { # skia_os != android + 'conditions': [ + ['use_system_libjpeg==0', { + 'targets': [ + { + 'target_name': 'libjpeg', + 'type': 'static_library', + 'sources': [ + '../third_party/externals/libjpeg/jcapimin.c', + '../third_party/externals/libjpeg/jcapistd.c', + '../third_party/externals/libjpeg/jccoefct.c', + '../third_party/externals/libjpeg/jccolor.c', + '../third_party/externals/libjpeg/jcdctmgr.c', + '../third_party/externals/libjpeg/jchuff.c', + '../third_party/externals/libjpeg/jchuff.h', + '../third_party/externals/libjpeg/jcinit.c', + '../third_party/externals/libjpeg/jcmainct.c', + '../third_party/externals/libjpeg/jcmarker.c', + '../third_party/externals/libjpeg/jcmaster.c', + '../third_party/externals/libjpeg/jcomapi.c', + '../third_party/externals/libjpeg/jconfig.h', + '../third_party/externals/libjpeg/jcparam.c', + '../third_party/externals/libjpeg/jcphuff.c', + '../third_party/externals/libjpeg/jcprepct.c', + '../third_party/externals/libjpeg/jcsample.c', + '../third_party/externals/libjpeg/jdapimin.c', + '../third_party/externals/libjpeg/jdapistd.c', + '../third_party/externals/libjpeg/jdatadst.c', + '../third_party/externals/libjpeg/jdatasrc.c', + '../third_party/externals/libjpeg/jdcoefct.c', + '../third_party/externals/libjpeg/jdcolor.c', + '../third_party/externals/libjpeg/jdct.h', + '../third_party/externals/libjpeg/jddctmgr.c', + '../third_party/externals/libjpeg/jdhuff.c', + '../third_party/externals/libjpeg/jdhuff.h', + '../third_party/externals/libjpeg/jdinput.c', + '../third_party/externals/libjpeg/jdmainct.c', + '../third_party/externals/libjpeg/jdmarker.c', + '../third_party/externals/libjpeg/jdmaster.c', + '../third_party/externals/libjpeg/jdmerge.c', + '../third_party/externals/libjpeg/jdphuff.c', + '../third_party/externals/libjpeg/jdpostct.c', + '../third_party/externals/libjpeg/jdsample.c', + '../third_party/externals/libjpeg/jerror.c', + '../third_party/externals/libjpeg/jerror.h', + '../third_party/externals/libjpeg/jfdctflt.c', + '../third_party/externals/libjpeg/jfdctfst.c', + '../third_party/externals/libjpeg/jfdctint.c', + '../third_party/externals/libjpeg/jidctflt.c', + '../third_party/externals/libjpeg/jidctfst.c', + '../third_party/externals/libjpeg/jidctint.c', + '../third_party/externals/libjpeg/jinclude.h', + '../third_party/externals/libjpeg/jmemmgr.c', + '../third_party/externals/libjpeg/jmemnobs.c', + '../third_party/externals/libjpeg/jmemsys.h', + '../third_party/externals/libjpeg/jmorecfg.h', + '../third_party/externals/libjpeg/jpegint.h', + '../third_party/externals/libjpeg/jpeglib.h', + '../third_party/externals/libjpeg/jquant1.c', + '../third_party/externals/libjpeg/jquant2.c', + '../third_party/externals/libjpeg/jutils.c', + '../third_party/externals/libjpeg/jversion.h', + ], + 'direct_dependent_settings': { + 'include_dirs': [ + '../third_party/externals/libjpeg', + ], + }, + 'conditions': [ + ['OS!="win"', { + 'product_name': 'jpeg', + 'cflags': [ + '-Wno-main', # supresses warnings about naming things "main" + ], + }], + ['OS=="android"', { + 'cflags!': [ + '-fno-rtti', # supresses warnings about invalid option of non-C++ code + '-Wall', + '-Werror', + ], + }], + ['OS in ["linux", "freebsd", "openbsd", "solaris", "nacl"]', { + 'cflags!': [ + '-Werror', + ], + }], + ], + }, + ], + }, { + 'targets': [ + { + 'target_name': 'libjpeg', + 'type': 'none', + 'direct_dependent_settings': { + 'defines': [ + 'USE_SYSTEM_LIBJPEG', + ], + }, + 'link_settings': { + 'libraries': [ + '-ljpeg', + ], + }, + } + ], + }], ], }], ], -- cgit v1.2.3 -- cgit v1.2.3 From efcbca236751a73487d93117578e3b770d68d52f Mon Sep 17 00:00:00 2001 From: "reed@google.com" Date: Thu, 21 Mar 2013 18:46:35 +0000 Subject: Use function-ptr instead of SkFontHost api to allow client to handle loading GDI font data for fonts. Review URL: https://codereview.chromium.org/12938004 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@8301 2bbb7eff-a529-9590-31e7-b0007b416f81 --- ports.gyp | 1 - 1 file changed, 1 deletion(-) diff --git a/ports.gyp b/ports.gyp index db4ea7a..83c6c51 100644 --- a/ports.gyp +++ b/ports.gyp @@ -24,7 +24,6 @@ '../src/ports/SkDebug_nacl.cpp', '../src/ports/SkDebug_stdio.cpp', '../src/ports/SkDebug_win.cpp', - '../src/ports/SkFontHost_sandbox_none.cpp', '../src/ports/SkFontHost_win.cpp', '../src/ports/SkFontHost_win_dw.cpp', '../src/ports/SkGlobalInitialization_default.cpp', -- cgit v1.2.3 From 1a0ead01f7942809cd384057e16ebbb040c0c79e Mon Sep 17 00:00:00 2001 From: "scroggo@google.com" Date: Thu, 21 Mar 2013 19:43:15 +0000 Subject: Change the name of SkFlags to SkCommandLineFlags. This name is more specific to what it actually does. Also move the code into tools/flags, to (slightly) better organize the massive tools folder. Update the programs that use it to use the new names. No functionality changes. BUG=https://code.google.com/p/skia/issues/detail?id=1173 Review URL: https://codereview.chromium.org/12440067 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@8304 2bbb7eff-a529-9590-31e7-b0007b416f81 --- flags.gyp | 6 +++--- tools.gyp | 2 ++ 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/flags.gyp b/flags.gyp index 712a04b..aa83ea9 100644 --- a/flags.gyp +++ b/flags.gyp @@ -6,8 +6,8 @@ 'target_name': 'flags', 'type': 'static_library', 'sources': [ - '../tools/SkFlags.h', - '../tools/SkFlags.cpp', + '../tools/flags/SkCommandLineFlags.h', + '../tools/flags/SkCommandLineFlags.cpp', ], 'dependencies': [ 'skia_base_libs.gyp:skia_base_libs', @@ -15,7 +15,7 @@ ], 'direct_dependent_settings': { 'include_dirs': [ - '../tools/', + '../tools/flags', ], } }, diff --git a/tools.gyp b/tools.gyp index 9ed7d68..70591af 100644 --- a/tools.gyp +++ b/tools.gyp @@ -98,6 +98,7 @@ 'tools.gyp:picture_renderer', 'tools.gyp:picture_utils', 'ports.gyp:ports', + 'flags.gyp:flags', ], }, { @@ -122,6 +123,7 @@ 'tools.gyp:picture_renderer', 'bench.gyp:bench_timer', 'ports.gyp:ports', + 'flags.gyp:flags', ], }, { -- cgit v1.2.3 From f7e715b99e33861f63eec577c7049bf0d7e61fe8 Mon Sep 17 00:00:00 2001 From: "bsalomon@google.com" Date: Thu, 21 Mar 2013 20:29:05 +0000 Subject: Enable init'ed but unused var warning on windows for closer parity with mac/linux warnings. Review URL: https://codereview.chromium.org/12536008 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@8307 2bbb7eff-a529-9590-31e7-b0007b416f81 --- common_conditions.gypi | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/common_conditions.gypi b/common_conditions.gypi index df13425..2c7b16b 100644 --- a/common_conditions.gypi +++ b/common_conditions.gypi @@ -28,9 +28,11 @@ 'msvs_cygwin_shell': 0, 'msvs_settings': { 'VCCLCompilerTool': { - 'WarningLevel': '1', + 'WarningLevel': '3', + 'ProgramDataBaseFileName': '$(OutDir)\\$(ProjectName).pdb', 'DebugInformationFormat': '3', - 'AdditionalOptions': [ '/MP' ], + 'ExceptionHandling': '0', + 'AdditionalOptions': [ '/MP', ], }, 'VCLinkerTool': { 'AdditionalDependencies': [ @@ -44,13 +46,10 @@ 'msvs_settings': { 'VCCLCompilerTool': { 'DebugInformationFormat': '4', # editAndContiue (/ZI) - 'ProgramDataBaseFileName': '$(OutDir)\\$(ProjectName).pdb', 'Optimization': '0', # optimizeDisabled (/Od) 'PreprocessorDefinitions': ['_DEBUG'], 'RuntimeLibrary': '3', # rtMultiThreadedDebugDLL (/MDd) - 'ExceptionHandling': '0', 'RuntimeTypeInfo': 'false', # /GR- - 'WarningLevel': '3', # level3 (/W3) }, 'VCLinkerTool': { 'GenerateDebugInformation': 'true', # /DEBUG @@ -62,7 +61,6 @@ 'msvs_settings': { 'VCCLCompilerTool': { 'DebugInformationFormat': '3', # programDatabase (/Zi) - 'ProgramDataBaseFileName': '$(OutDir)\\$(ProjectName).pdb', 'Optimization': '3', # full (/Ox) 'WholeProgramOptimization': 'true', #/GL # Changing the floating point model requires rebaseling gm images @@ -70,10 +68,8 @@ 'FavorSizeOrSpeed': '1', # speed (/Ot) 'PreprocessorDefinitions': ['NDEBUG'], 'RuntimeLibrary': '2', # rtMultiThreadedDLL (/MD) - 'ExceptionHandling': '0', 'EnableEnhancedInstructionSet': '2',# /arch:SSE2 'RuntimeTypeInfo': 'false', # /GR- - 'WarningLevel': '3', # level3 (/W3) }, 'VCLinkerTool': { 'GenerateDebugInformation': 'true', # /DEBUG @@ -115,6 +111,9 @@ 'msvs_settings': { 'VCCLCompilerTool': { 'WarnAsError': 'true', + 'AdditionalOptions': [ + '/we4189', # initialized but unused var warning + ], }, }, }], -- cgit v1.2.3 From e99d4c772fcd29dfc9886f5fccc6612eec8b7ce9 Mon Sep 17 00:00:00 2001 From: "reed@google.com" Date: Thu, 21 Mar 2013 20:34:27 +0000 Subject: remove GetTable* APIs from SkFontHost, and rely on SkTypeface::onGetTable* default impls call SkFontStream, and rely on SkTypeface::onOpenStream Review URL: https://codereview.chromium.org/13001002 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@8310 2bbb7eff-a529-9590-31e7-b0007b416f81 --- ports.gyp | 4 ---- 1 file changed, 4 deletions(-) diff --git a/ports.gyp b/ports.gyp index 83c6c51..49b278d 100644 --- a/ports.gyp +++ b/ports.gyp @@ -30,7 +30,6 @@ '../src/ports/SkPurgeableMemoryBlock_none.cpp', '../src/ports/SkThread_win.cpp', - '../src/ports/SkFontHost_tables.cpp', '../src/ports/SkMemory_malloc.cpp', '../src/ports/SkOSFile_stdio.cpp', '../src/ports/SkTime_Unix.cpp', @@ -58,9 +57,6 @@ '../src/ports/SkFontConfigInterface_direct.cpp', '../src/ports/SkThread_pthread.cpp', ], - 'sources!': [ - '../src/ports/SkFontHost_tables.cpp', - ], }], [ 'skia_os == "nacl"', { 'dependencies': [ -- cgit v1.2.3 From da71f3e5064a1052e8dab0b2c73bfa50632bb90f Mon Sep 17 00:00:00 2001 From: "sugoi@google.com" Date: Thu, 21 Mar 2013 21:01:07 +0000 Subject: New SVG turbulence in Skia This cl contains the code for both CPU and GPU generation of noise. Both codepaths yield equivalent results. TEST:Added 'perlinnoise' gm Review URL: https://codereview.appspot.com/7322060 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@8313 2bbb7eff-a529-9590-31e7-b0007b416f81 --- effects.gypi | 2 ++ gmslides.gypi | 1 + 2 files changed, 3 insertions(+) diff --git a/effects.gypi b/effects.gypi index 7dede6e..e3f4bf5 100644 --- a/effects.gypi +++ b/effects.gypi @@ -41,6 +41,7 @@ '<(skia_src_path)/effects/SkMorphologyImageFilter.cpp', '<(skia_src_path)/effects/SkOffsetImageFilter.cpp', '<(skia_src_path)/effects/SkPaintFlagsDrawFilter.cpp', + '<(skia_src_path)/effects/SkPerlinNoiseShader.cpp', '<(skia_src_path)/effects/SkPixelXorXfermode.cpp', '<(skia_src_path)/effects/SkPorterDuff.cpp', '<(skia_src_path)/effects/SkRectShaderImageFilter.cpp', @@ -96,6 +97,7 @@ '<(skia_include_path)/effects/SkOffsetImageFilter.h', '<(skia_include_path)/effects/SkMorphologyImageFilter.h', '<(skia_include_path)/effects/SkPaintFlagsDrawFilter.h', + '<(skia_include_path)/effects/SkPerlinNoiseShader.h', '<(skia_include_path)/effects/SkPixelXorXfermode.h', '<(skia_include_path)/effects/SkPorterDuff.h', '<(skia_include_path)/effects/SkRectShaderImageFilter.h', diff --git a/gmslides.gypi b/gmslides.gypi index 826bac8..2ea056c 100644 --- a/gmslides.gypi +++ b/gmslides.gypi @@ -62,6 +62,7 @@ '../gm/pathfill.cpp', '../gm/pathinterior.cpp', '../gm/pathreverse.cpp', + '../gm/perlinnoise.cpp', '../gm/points.cpp', '../gm/poly2poly.cpp', '../gm/quadpaths.cpp', -- cgit v1.2.3 From 269c8b9ae93f7719908fbc99284c9dd7e95cc0d0 Mon Sep 17 00:00:00 2001 From: "robertphillips@google.com" Date: Thu, 21 Mar 2013 21:22:03 +0000 Subject: Reverting 8313 (SVG turbulence) due to Ubuntu failures git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@8316 2bbb7eff-a529-9590-31e7-b0007b416f81 --- effects.gypi | 2 -- gmslides.gypi | 1 - 2 files changed, 3 deletions(-) diff --git a/effects.gypi b/effects.gypi index e3f4bf5..7dede6e 100644 --- a/effects.gypi +++ b/effects.gypi @@ -41,7 +41,6 @@ '<(skia_src_path)/effects/SkMorphologyImageFilter.cpp', '<(skia_src_path)/effects/SkOffsetImageFilter.cpp', '<(skia_src_path)/effects/SkPaintFlagsDrawFilter.cpp', - '<(skia_src_path)/effects/SkPerlinNoiseShader.cpp', '<(skia_src_path)/effects/SkPixelXorXfermode.cpp', '<(skia_src_path)/effects/SkPorterDuff.cpp', '<(skia_src_path)/effects/SkRectShaderImageFilter.cpp', @@ -97,7 +96,6 @@ '<(skia_include_path)/effects/SkOffsetImageFilter.h', '<(skia_include_path)/effects/SkMorphologyImageFilter.h', '<(skia_include_path)/effects/SkPaintFlagsDrawFilter.h', - '<(skia_include_path)/effects/SkPerlinNoiseShader.h', '<(skia_include_path)/effects/SkPixelXorXfermode.h', '<(skia_include_path)/effects/SkPorterDuff.h', '<(skia_include_path)/effects/SkRectShaderImageFilter.h', diff --git a/gmslides.gypi b/gmslides.gypi index 2ea056c..826bac8 100644 --- a/gmslides.gypi +++ b/gmslides.gypi @@ -62,7 +62,6 @@ '../gm/pathfill.cpp', '../gm/pathinterior.cpp', '../gm/pathreverse.cpp', - '../gm/perlinnoise.cpp', '../gm/points.cpp', '../gm/poly2poly.cpp', '../gm/quadpaths.cpp', -- cgit v1.2.3 From e6a2f2b55292c12e2bc154f2e842d84189bb3a2c Mon Sep 17 00:00:00 2001 From: "borenet@google.com" Date: Fri, 22 Mar 2013 13:16:06 +0000 Subject: Refactor skia_warnings_as_errors Review URL: https://codereview.chromium.org/12963002 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@8330 2bbb7eff-a529-9590-31e7-b0007b416f81 --- angle.gyp | 2 +- cityhash.gyp | 33 +++++++++++++++++++ common_conditions.gypi | 86 +++++++++++++++++++++++--------------------------- common_variables.gypi | 14 +++++--- jsoncpp.gyp | 23 ++------------ libjpeg.gyp | 15 ++------- utils.gyp | 50 ++--------------------------- 7 files changed, 91 insertions(+), 132 deletions(-) create mode 100644 cityhash.gyp diff --git a/angle.gyp b/angle.gyp index 088895b..2a88d56 100644 --- a/angle.gyp +++ b/angle.gyp @@ -10,7 +10,7 @@ }, 'variables': { 'component': 'static_library', - 'skia_building_angle': 1, # See comment in common_conditions.gypi. + 'skia_warnings_as_errors': 0, }, 'includes': [ '../third_party/externals/angle/src/build_angle.gypi', diff --git a/cityhash.gyp b/cityhash.gyp new file mode 100644 index 0000000..f35f1f0 --- /dev/null +++ b/cityhash.gyp @@ -0,0 +1,33 @@ +{ + 'variables': { + 'skia_warnings_as_errors': 0, + }, + 'targets': [ + { + 'target_name': 'cityhash', + 'type': 'static_library', + 'standalone_static_library': 1, + 'include_dirs': [ + '../include/config', + '../include/core', + '../src/utils/cityhash', + '../third_party/externals/cityhash/src', + ], + 'sources': [ + '../third_party/externals/cityhash/src/city.cc', + ], + 'direct_dependent_settings': { + 'include_dirs': [ + '../third_party/externals/cityhash/src', + ], + }, + 'conditions': [ + [ 'skia_os == "android"', { + 'cflags!': [ + '-Wall', + ], + }], + ], + }, + ], +} diff --git a/common_conditions.gypi b/common_conditions.gypi index 2c7b16b..360fed7 100644 --- a/common_conditions.gypi +++ b/common_conditions.gypi @@ -6,7 +6,7 @@ # 'SK_SUPPORT_HINTING_SCALE_FACTOR', ], 'conditions' : [ - ['skia_gpu == 1', + [ 'skia_gpu == 1', { 'defines': [ 'SK_SUPPORT_GPU=1', @@ -17,7 +17,7 @@ ], }, ], - ['skia_os == "win"', + [ 'skia_os == "win"', { 'defines': [ 'SK_BUILD_FOR_WIN32', @@ -82,48 +82,27 @@ }, }, 'conditions' : [ - ['skia_arch_width == 64', { + [ 'skia_arch_width == 64', { 'msvs_configuration_platform': 'x64', + }], + [ 'skia_arch_width == 32', { + 'msvs_configuration_platform': 'Win32', + }], + [ 'skia_warnings_as_errors', { 'msvs_settings': { 'VCCLCompilerTool': { - 'WarnAsError': 'false', + 'WarnAsError': 'true', + 'AdditionalOptions': [ + '/we4189', # initialized but unused var warning + ], }, }, }], - ['skia_arch_width == 32', { - # This gypi file will be included directly into the gyp(i) files in the angle repo by - # our gyp_skia script. We don't want force WarnAsError on angle. So angle.gyp defines - # skia_building_angle=1 and here we select whether to enable WarnAsError based on that - # var's value. Here it defaults to 0. - 'variables' : { - 'skia_building_angle%': 0, - }, - 'conditions' : [ - ['skia_building_angle', { - 'msvs_configuration_platform': 'Win32', - 'msvs_settings': { - 'VCCLCompilerTool': { - 'WarnAsError': 'false', - }, - }, - },{ # not angle - 'msvs_configuration_platform': 'Win32', - 'msvs_settings': { - 'VCCLCompilerTool': { - 'WarnAsError': 'true', - 'AdditionalOptions': [ - '/we4189', # initialized but unused var warning - ], - }, - }, - }], - ], - }], ], }, ], - ['skia_os in ["linux", "freebsd", "openbsd", "solaris", "nacl"]', + [ 'skia_os in ["linux", "freebsd", "openbsd", "solaris", "nacl"]', { 'defines': [ 'SK_SAMPLES_FOR_X', @@ -139,7 +118,6 @@ }, }, 'cflags': [ - '-Werror', '-Wall', '-Wextra', # suppressions below here were added for clang @@ -147,12 +125,12 @@ '-Wno-c++11-extensions' ], 'conditions' : [ - ['skia_warnings_as_errors == 1', { + [ 'skia_warnings_as_errors', { 'cflags': [ '-Werror', ], }], - ['skia_arch_width == 64', { + [ 'skia_arch_width == 64', { 'cflags': [ '-m64', ], @@ -160,7 +138,7 @@ '-m64', ], }], - ['skia_arch_width == 32', { + [ 'skia_arch_width == 32', { 'cflags': [ '-m32', ], @@ -189,7 +167,7 @@ }, ], - ['skia_os == "mac"', + [ 'skia_os == "mac"', { 'variables': { 'mac_sdk%': ' Date: Fri, 22 Mar 2013 16:44:14 +0000 Subject: Update gyp\images.gyp for move of SkJpegUtility.h from include\images to src\images (in r8267) git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@8341 2bbb7eff-a529-9590-31e7-b0007b416f81 --- images.gyp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images.gyp b/images.gyp index 88f2447..b5d0334 100644 --- a/images.gyp +++ b/images.gyp @@ -26,7 +26,7 @@ '../include/images/SkImageEncoder.h', '../include/images/SkImageRef.h', '../include/images/SkImageRef_GlobalPool.h', - '../include/images/SkJpegUtility.h', + '../src/images/SkJpegUtility.h', '../include/images/SkMovie.h', '../include/images/SkPageFlipper.h', -- cgit v1.2.3 From 9a5c3d779e433775025967fc003285857bf51366 Mon Sep 17 00:00:00 2001 From: "reed@google.com" Date: Fri, 22 Mar 2013 17:21:59 +0000 Subject: remove SkFontHost::OpenStream(), now subsumed by SkTypeface::openStream() remove obsolete/abandoned SkFontHost_freetype_mac.cpp Review URL: https://codereview.chromium.org/13008019 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@8342 2bbb7eff-a529-9590-31e7-b0007b416f81 --- ports.gyp | 1 - 1 file changed, 1 deletion(-) diff --git a/ports.gyp b/ports.gyp index 49b278d..bd2b909 100644 --- a/ports.gyp +++ b/ports.gyp @@ -95,7 +95,6 @@ '../src/ports/SkFontHost_mac.cpp', # '../src/ports/SkFontHost_FreeType.cpp', # '../src/ports/SkFontHost_FreeType_common.cpp', -# '../src/ports/SkFontHost_freetype_mac.cpp', '../src/ports/SkPurgeableMemoryBlock_mac.cpp', '../src/ports/SkThread_pthread.cpp', '../src/utils/mac/SkStream_mac.cpp', -- cgit v1.2.3 From 4195762c60d167daef0cf77b41b2d5440fe1ac3a Mon Sep 17 00:00:00 2001 From: "commit-bot@chromium.org" Date: Fri, 22 Mar 2013 18:34:09 +0000 Subject: Move oval rendering code to GrOvalRenderer. Author: jvanverth@google.com Reviewed By: bsalomon@google.com,robertphillips@google.com Review URL: https://chromiumcodereview.appspot.com/12657003 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@8345 2bbb7eff-a529-9590-31e7-b0007b416f81 --- gpu.gypi | 2 ++ 1 file changed, 2 insertions(+) diff --git a/gpu.gypi b/gpu.gypi index 6b039d0..1e88416 100644 --- a/gpu.gypi +++ b/gpu.gypi @@ -22,6 +22,7 @@ '<(skia_include_path)/gpu/GrGlyph.h', '<(skia_include_path)/gpu/GrKey.h', '<(skia_include_path)/gpu/GrNoncopyable.h', + '<(skia_include_path)/gpu/GrOvalRenderer.h', '<(skia_include_path)/gpu/GrPaint.h', '<(skia_include_path)/gpu/GrPathRendererChain.h', '<(skia_include_path)/gpu/GrPoint.h', @@ -81,6 +82,7 @@ '<(skia_src_path)/gpu/GrMemory.cpp', '<(skia_src_path)/gpu/GrMemoryPool.cpp', '<(skia_src_path)/gpu/GrMemoryPool.h', + '<(skia_src_path)/gpu/GrOvalRenderer.cpp', '<(skia_src_path)/gpu/GrPath.cpp', '<(skia_src_path)/gpu/GrPath.h', '<(skia_src_path)/gpu/GrPathRendererChain.cpp', -- cgit v1.2.3 -- cgit v1.2.3 From 394f6131e0d3fe935895c0510b2d9750b677b396 Mon Sep 17 00:00:00 2001 From: "bsalomon@google.com" Date: Mon, 25 Mar 2013 18:19:00 +0000 Subject: Move nested class GrDrawTarget::Caps out as GrDrawTargetCaps. Pass caps to GrEffect::TestCreate() functions so that they can return effects that will work with the capabilities. Review URL: https://codereview.chromium.org/12965018 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@8369 2bbb7eff-a529-9590-31e7-b0007b416f81 --- gpu.gypi | 1 + 1 file changed, 1 insertion(+) diff --git a/gpu.gypi b/gpu.gypi index 1e88416..5374976 100644 --- a/gpu.gypi +++ b/gpu.gypi @@ -66,6 +66,7 @@ '<(skia_src_path)/gpu/GrDrawState.h', '<(skia_src_path)/gpu/GrDrawTarget.cpp', '<(skia_src_path)/gpu/GrDrawTarget.h', + '<(skia_src_path)/gpu/GrDrawTargetCaps.h', '<(skia_src_path)/gpu/GrEffect.cpp', '<(skia_src_path)/gpu/GrGeometryBuffer.cpp', '<(skia_src_path)/gpu/GrGeometryBuffer.h', -- cgit v1.2.3 From c03474ca0b63bba78fa2c14330c36105f097dee9 Mon Sep 17 00:00:00 2001 From: "sugoi@google.com" Date: Mon, 25 Mar 2013 19:31:04 +0000 Subject: New SVG turbulence in Skia This cl contains the code for both CPU and GPU generation of noise. Both codepaths yield equivalent results. TEST:Added 'perlinnoise' gm Review URL: https://codereview.chromium.org/13047005 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@8371 2bbb7eff-a529-9590-31e7-b0007b416f81 --- effects.gypi | 2 ++ gmslides.gypi | 1 + 2 files changed, 3 insertions(+) diff --git a/effects.gypi b/effects.gypi index 7dede6e..e3f4bf5 100644 --- a/effects.gypi +++ b/effects.gypi @@ -41,6 +41,7 @@ '<(skia_src_path)/effects/SkMorphologyImageFilter.cpp', '<(skia_src_path)/effects/SkOffsetImageFilter.cpp', '<(skia_src_path)/effects/SkPaintFlagsDrawFilter.cpp', + '<(skia_src_path)/effects/SkPerlinNoiseShader.cpp', '<(skia_src_path)/effects/SkPixelXorXfermode.cpp', '<(skia_src_path)/effects/SkPorterDuff.cpp', '<(skia_src_path)/effects/SkRectShaderImageFilter.cpp', @@ -96,6 +97,7 @@ '<(skia_include_path)/effects/SkOffsetImageFilter.h', '<(skia_include_path)/effects/SkMorphologyImageFilter.h', '<(skia_include_path)/effects/SkPaintFlagsDrawFilter.h', + '<(skia_include_path)/effects/SkPerlinNoiseShader.h', '<(skia_include_path)/effects/SkPixelXorXfermode.h', '<(skia_include_path)/effects/SkPorterDuff.h', '<(skia_include_path)/effects/SkRectShaderImageFilter.h', diff --git a/gmslides.gypi b/gmslides.gypi index 826bac8..2ea056c 100644 --- a/gmslides.gypi +++ b/gmslides.gypi @@ -62,6 +62,7 @@ '../gm/pathfill.cpp', '../gm/pathinterior.cpp', '../gm/pathreverse.cpp', + '../gm/perlinnoise.cpp', '../gm/points.cpp', '../gm/poly2poly.cpp', '../gm/quadpaths.cpp', -- cgit v1.2.3 From bcd910383650e5821abefab217ebff3662cd9bf1 Mon Sep 17 00:00:00 2001 From: "robertphillips@google.com" Date: Mon, 25 Mar 2013 22:16:02 +0000 Subject: Reverting r8376, r8373 and r8371 due to Android shader compilation failures git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@8378 2bbb7eff-a529-9590-31e7-b0007b416f81 --- effects.gypi | 2 -- gmslides.gypi | 1 - 2 files changed, 3 deletions(-) diff --git a/effects.gypi b/effects.gypi index e3f4bf5..7dede6e 100644 --- a/effects.gypi +++ b/effects.gypi @@ -41,7 +41,6 @@ '<(skia_src_path)/effects/SkMorphologyImageFilter.cpp', '<(skia_src_path)/effects/SkOffsetImageFilter.cpp', '<(skia_src_path)/effects/SkPaintFlagsDrawFilter.cpp', - '<(skia_src_path)/effects/SkPerlinNoiseShader.cpp', '<(skia_src_path)/effects/SkPixelXorXfermode.cpp', '<(skia_src_path)/effects/SkPorterDuff.cpp', '<(skia_src_path)/effects/SkRectShaderImageFilter.cpp', @@ -97,7 +96,6 @@ '<(skia_include_path)/effects/SkOffsetImageFilter.h', '<(skia_include_path)/effects/SkMorphologyImageFilter.h', '<(skia_include_path)/effects/SkPaintFlagsDrawFilter.h', - '<(skia_include_path)/effects/SkPerlinNoiseShader.h', '<(skia_include_path)/effects/SkPixelXorXfermode.h', '<(skia_include_path)/effects/SkPorterDuff.h', '<(skia_include_path)/effects/SkRectShaderImageFilter.h', diff --git a/gmslides.gypi b/gmslides.gypi index 2ea056c..826bac8 100644 --- a/gmslides.gypi +++ b/gmslides.gypi @@ -62,7 +62,6 @@ '../gm/pathfill.cpp', '../gm/pathinterior.cpp', '../gm/pathreverse.cpp', - '../gm/perlinnoise.cpp', '../gm/points.cpp', '../gm/poly2poly.cpp', '../gm/quadpaths.cpp', -- cgit v1.2.3 From 62941eb6565d23de76574ca5c1e6864b2700a498 Mon Sep 17 00:00:00 2001 From: "bsalomon@google.com" Date: Tue, 26 Mar 2013 14:45:27 +0000 Subject: Replace edge types with GrEdgeEffect. This strips out last of the edge types and the fixed function edge attribute and replaces them with using GrEdgeEffect. Also fixes a minor bug when checking attribute counts -- it was using kAttribIndexCount instead of kVertexAttribCnt. Original Author: jvanverth@google.com Review URL: https://codereview.chromium.org/13069003 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@8392 2bbb7eff-a529-9590-31e7-b0007b416f81 --- gpu.gypi | 2 ++ 1 file changed, 2 insertions(+) diff --git a/gpu.gypi b/gpu.gypi index 5374976..c28045d 100644 --- a/gpu.gypi +++ b/gpu.gypi @@ -131,6 +131,8 @@ '<(skia_src_path)/gpu/effects/GrConfigConversionEffect.h', '<(skia_src_path)/gpu/effects/GrConvolutionEffect.cpp', '<(skia_src_path)/gpu/effects/GrConvolutionEffect.h', + '<(skia_src_path)/gpu/effects/GrEdgeEffect.cpp', + '<(skia_src_path)/gpu/effects/GrEdgeEffect.h', '<(skia_src_path)/gpu/effects/GrEllipseEdgeEffect.cpp', '<(skia_src_path)/gpu/effects/GrEllipseEdgeEffect.h', '<(skia_src_path)/gpu/effects/GrSimpleTextureEffect.cpp', -- cgit v1.2.3 From 808f67c00153bb454d65f038d2d5da4e37f6d899 Mon Sep 17 00:00:00 2001 From: "bsalomon@google.com" Date: Wed, 27 Mar 2013 18:14:57 +0000 Subject: Move GrGLProgram::Desc out of GrGLProgram. Review URL: https://codereview.chromium.org/12942014 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@8411 2bbb7eff-a529-9590-31e7-b0007b416f81 --- gpu.gypi | 1 + 1 file changed, 1 insertion(+) diff --git a/gpu.gypi b/gpu.gypi index c28045d..e41cb8e 100644 --- a/gpu.gypi +++ b/gpu.gypi @@ -168,6 +168,7 @@ '<(skia_src_path)/gpu/gl/GrGLPath.h', '<(skia_src_path)/gpu/gl/GrGLProgram.cpp', '<(skia_src_path)/gpu/gl/GrGLProgram.h', + '<(skia_src_path)/gpu/gl/GrGLProgramDesc.h', '<(skia_src_path)/gpu/gl/GrGLRenderTarget.cpp', '<(skia_src_path)/gpu/gl/GrGLRenderTarget.h', '<(skia_src_path)/gpu/gl/GrGLShaderBuilder.cpp', -- cgit v1.2.3 From 62eb6d86d3c9b3c25ecd022c3e7e385658dcb7b9 Mon Sep 17 00:00:00 2001 From: "bsalomon@google.com" Date: Wed, 27 Mar 2013 19:50:27 +0000 Subject: Move GrGLProgramDesc::Build to new cpp file. Review URL: https://codereview.chromium.org/13097007 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@8414 2bbb7eff-a529-9590-31e7-b0007b416f81 --- gpu.gypi | 1 + 1 file changed, 1 insertion(+) diff --git a/gpu.gypi b/gpu.gypi index e41cb8e..5887d93 100644 --- a/gpu.gypi +++ b/gpu.gypi @@ -168,6 +168,7 @@ '<(skia_src_path)/gpu/gl/GrGLPath.h', '<(skia_src_path)/gpu/gl/GrGLProgram.cpp', '<(skia_src_path)/gpu/gl/GrGLProgram.h', + '<(skia_src_path)/gpu/gl/GrGLProgramDesc.cpp', '<(skia_src_path)/gpu/gl/GrGLProgramDesc.h', '<(skia_src_path)/gpu/gl/GrGLRenderTarget.cpp', '<(skia_src_path)/gpu/gl/GrGLRenderTarget.h', -- cgit v1.2.3 From f39674482227a97dc1f3bdfa92b1e12829d4e90d Mon Sep 17 00:00:00 2001 From: "reed@google.com" Date: Thu, 28 Mar 2013 13:39:35 +0000 Subject: add gm for experimental fontmgr api git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@8426 2bbb7eff-a529-9590-31e7-b0007b416f81 --- gmslides.gypi | 1 + 1 file changed, 1 insertion(+) diff --git a/gmslides.gypi b/gmslides.gypi index 826bac8..430eaa3 100644 --- a/gmslides.gypi +++ b/gmslides.gypi @@ -36,6 +36,7 @@ '../gm/factory.cpp', '../gm/filltypes.cpp', '../gm/filltypespersp.cpp', + '../gm/fontmgr.cpp', '../gm/fontscaler.cpp', '../gm/gammatext.cpp', '../gm/getpostextpath.cpp', -- cgit v1.2.3 From 5d56789664b5cc2cdeaad3d88e630e10b6bc9e30 Mon Sep 17 00:00:00 2001 From: "junov@chromium.org" Date: Thu, 28 Mar 2013 13:49:22 +0000 Subject: Adding unit test for verifying copy on write in SkSurface + bug fix in SkCanvas::clear Review URL: https://codereview.chromium.org/13116018 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@8429 2bbb7eff-a529-9590-31e7-b0007b416f81 --- tests.gyp | 1 + 1 file changed, 1 insertion(+) diff --git a/tests.gyp b/tests.gyp index dbf27fa..335f1bc 100644 --- a/tests.gyp +++ b/tests.gyp @@ -98,6 +98,7 @@ '../tests/StreamTest.cpp', '../tests/StringTest.cpp', '../tests/StrokeTest.cpp', + '../tests/SurfaceTest.cpp', '../tests/Test.cpp', '../tests/Test.h', '../tests/TestSize.cpp', -- cgit v1.2.3 From 16926099766c4a5c003cdd832dd23a6df0b5612e Mon Sep 17 00:00:00 2001 From: "commit-bot@chromium.org" Date: Mon, 1 Apr 2013 12:51:34 +0000 Subject: Add Xfermode bench. Also clear before rendering in bench (rather than after). Author: bsalomon@google.com Reviewed By: robertphillips@google.com Review URL: https://chromiumcodereview.appspot.com/13334011 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@8454 2bbb7eff-a529-9590-31e7-b0007b416f81 --- bench.gypi | 1 + 1 file changed, 1 insertion(+) diff --git a/bench.gypi b/bench.gypi index a18ace8..f5aa1e3 100644 --- a/bench.gypi +++ b/bench.gypi @@ -50,6 +50,7 @@ '../bench/TileBench.cpp', '../bench/VertBench.cpp', '../bench/WriterBench.cpp', + '../bench/XfermodeBench.cpp', '../bench/SkBenchLogger.h', '../bench/SkBenchLogger.cpp', -- cgit v1.2.3 From 7f09742ca8e4e38dc0bf282b2c9d68f5a97cd5b1 Mon Sep 17 00:00:00 2001 From: "bsalomon@google.com" Date: Mon, 1 Apr 2013 18:02:55 +0000 Subject: Add GM mixed_xfermodes. This is a work in progress and will be used to test fixes for GPU Xfermodes effects. Review URL: https://codereview.chromium.org/13365005 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@8461 2bbb7eff-a529-9590-31e7-b0007b416f81 --- gmslides.gypi | 1 + 1 file changed, 1 insertion(+) diff --git a/gmslides.gypi b/gmslides.gypi index 430eaa3..caff5a4 100644 --- a/gmslides.gypi +++ b/gmslides.gypi @@ -55,6 +55,7 @@ '../gm/lcdtext.cpp', '../gm/linepaths.cpp', '../gm/matrixconvolution.cpp', + '../gm/mixedxfermodes.cpp', '../gm/modecolorfilters.cpp', '../gm/morphology.cpp', '../gm/ninepatchstretch.cpp', -- cgit v1.2.3 From eec28579571bb5882541463f9b1e743cf520bcd8 Mon Sep 17 00:00:00 2001 From: "bungeman@google.com" Date: Tue, 2 Apr 2013 14:12:38 +0000 Subject: Name table iterator. https://codereview.appspot.com/8180043/ git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@8480 2bbb7eff-a529-9590-31e7-b0007b416f81 --- sfnt.gyp | 1 + tests.gyp | 2 ++ tools.gyp | 13 +++++++++++++ 3 files changed, 16 insertions(+) diff --git a/sfnt.gyp b/sfnt.gyp index 66089e3..1abae53 100644 --- a/sfnt.gyp +++ b/sfnt.gyp @@ -36,6 +36,7 @@ '../src/sfnt/SkSFNTHeader.h', '../src/sfnt/SkTypedEnum.h', + '../src/sfnt/SkOTTable_name.cpp', '../src/sfnt/SkOTUtils.cpp', ], 'direct_dependent_settings': { diff --git a/tests.gyp b/tests.gyp index 335f1bc..cd9e1b8 100644 --- a/tests.gyp +++ b/tests.gyp @@ -49,6 +49,7 @@ '../tests/FlateTest.cpp', '../tests/FontHostStreamTest.cpp', '../tests/FontHostTest.cpp', + '../tests/FontNamesTest.cpp', '../tests/GeometryTest.cpp', '../tests/GLInterfaceValidation.cpp', '../tests/GLProgramsTest.cpp', @@ -124,6 +125,7 @@ 'pdf.gyp:pdf', 'tools.gyp:picture_utils', 'utils.gyp:utils', + 'sfnt.gyp:sfnt', ], 'conditions': [ [ 'skia_gpu == 1', { diff --git a/tools.gyp b/tools.gyp index 70591af..4a4a1da 100644 --- a/tools.gyp +++ b/tools.gyp @@ -287,6 +287,19 @@ ], }, ], + ['skia_os == "win"', + { + 'targets': [ + { + 'target_name': 'win_lcid', + 'type': 'executable', + 'sources': [ + '../tools/win_lcid.cpp', + ], + }, + ], + }, + ], ], } -- cgit v1.2.3 From b11b4d40eb1ad17f4910819e91e90f0838e3a051 Mon Sep 17 00:00:00 2001 From: "edisonn@google.com" Date: Tue, 2 Apr 2013 15:33:08 +0000 Subject: resubmit https://code.google.com/p/skia/source/detail?r=7883 (in the meantime we added capability to collect minidump and callstack if buildbot fails with heap coruption in windows, and a NPE bug was fixed in SkPDFDocument, when document was destroyed without ever beeing used and a field was NULL + a few minor conflicts have been resolved) git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@8487 2bbb7eff-a529-9590-31e7-b0007b416f81 --- pdf.gyp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pdf.gyp b/pdf.gyp index 7b3b9ea..081df01 100644 --- a/pdf.gyp +++ b/pdf.gyp @@ -12,6 +12,7 @@ 'include_dirs': [ '../include/config', '../include/core', + '../include/images', '../include/pdf', '../src/core', # needed to get SkGlyphCache.h and SkTextFormatParams.h '../src/utils', # needed to get SkBitSet.h @@ -43,6 +44,7 @@ '../src/pdf/SkPDFTypes.h', '../src/pdf/SkPDFUtils.cpp', '../src/pdf/SkPDFUtils.h', + '../src/pdf/SkTSet.h', ], # This section makes all targets that depend on this target # #define SK_SUPPORT_PDF and have access to the pdf header files. -- cgit v1.2.3 From 3e80c9be0cf7d9639cded6085398890fd0ac9900 Mon Sep 17 00:00:00 2001 From: "commit-bot@chromium.org" Date: Tue, 2 Apr 2013 17:36:30 +0000 Subject: Revert Skia to use -02. There was no clear speed improvement and the increase in binary size was substantial. Author: djsollen@google.com Reviewed By: borenet@google.com Review URL: https://chromiumcodereview.appspot.com/13468010 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@8492 2bbb7eff-a529-9590-31e7-b0007b416f81 --- common_conditions.gypi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common_conditions.gypi b/common_conditions.gypi index 360fed7..feb364f 100644 --- a/common_conditions.gypi +++ b/common_conditions.gypi @@ -299,7 +299,7 @@ 'cflags': ['-g'] }, 'Release': { - 'cflags': ['-O3'], + 'cflags': ['-O2'], 'defines': [ 'NDEBUG' ], }, }, -- cgit v1.2.3 From 897e6175315ae6991467c9c07841884e8fef96ec Mon Sep 17 00:00:00 2001 From: "commit-bot@chromium.org" Date: Tue, 2 Apr 2013 17:57:21 +0000 Subject: Move edge GrEffects to locally defined classes. This removes the general GrEdgeEffect and the specialized oval GrEffects and declares them within the renderer files that use them. It also splits GrEdgeEffect into three different GrEffects. Author: jvanverth@google.com Reviewed By: robertphillips@google.com Review URL: https://chromiumcodereview.appspot.com/13344002 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@8493 2bbb7eff-a529-9590-31e7-b0007b416f81 --- gpu.gypi | 6 ------ 1 file changed, 6 deletions(-) diff --git a/gpu.gypi b/gpu.gypi index 5887d93..259bd01 100644 --- a/gpu.gypi +++ b/gpu.gypi @@ -125,16 +125,10 @@ '<(skia_src_path)/gpu/gr_unittests.cpp', '<(skia_src_path)/gpu/effects/Gr1DKernelEffect.h', - '<(skia_src_path)/gpu/effects/GrCircleEdgeEffect.cpp', - '<(skia_src_path)/gpu/effects/GrCircleEdgeEffect.h', '<(skia_src_path)/gpu/effects/GrConfigConversionEffect.cpp', '<(skia_src_path)/gpu/effects/GrConfigConversionEffect.h', '<(skia_src_path)/gpu/effects/GrConvolutionEffect.cpp', '<(skia_src_path)/gpu/effects/GrConvolutionEffect.h', - '<(skia_src_path)/gpu/effects/GrEdgeEffect.cpp', - '<(skia_src_path)/gpu/effects/GrEdgeEffect.h', - '<(skia_src_path)/gpu/effects/GrEllipseEdgeEffect.cpp', - '<(skia_src_path)/gpu/effects/GrEllipseEdgeEffect.h', '<(skia_src_path)/gpu/effects/GrSimpleTextureEffect.cpp', '<(skia_src_path)/gpu/effects/GrSimpleTextureEffect.h', '<(skia_src_path)/gpu/effects/GrSingleTextureEffect.cpp', -- cgit v1.2.3 From 21193b4858e70c5be2f7254df0a9836435522eff Mon Sep 17 00:00:00 2001 From: "djsollen@google.com" Date: Tue, 2 Apr 2013 18:14:21 +0000 Subject: Revert Skia to use -02. There was no clear speed improvement and the increase in binary size was substantial. Committed: http://code.google.com/p/skia/source/detail?r=8492 Review URL: https://codereview.chromium.org/13468010 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@8494 2bbb7eff-a529-9590-31e7-b0007b416f81 --- common_conditions.gypi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common_conditions.gypi b/common_conditions.gypi index feb364f..360fed7 100644 --- a/common_conditions.gypi +++ b/common_conditions.gypi @@ -299,7 +299,7 @@ 'cflags': ['-g'] }, 'Release': { - 'cflags': ['-O2'], + 'cflags': ['-O3'], 'defines': [ 'NDEBUG' ], }, }, -- cgit v1.2.3 From d4172347ffca5bd29cacb0fdb99d109f1f6e0540 Mon Sep 17 00:00:00 2001 From: "bsalomon@google.com" Date: Wed, 3 Apr 2013 19:49:13 +0000 Subject: Remove GrTexture::releaseRenderTarget() and add GrSurface::isSameAs(). Review URL: https://codereview.chromium.org/13414006 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@8525 2bbb7eff-a529-9590-31e7-b0007b416f81 --- tests.gyp | 1 + 1 file changed, 1 insertion(+) diff --git a/tests.gyp b/tests.gyp index cd9e1b8..8914edd 100644 --- a/tests.gyp +++ b/tests.gyp @@ -57,6 +57,7 @@ '../tests/GrContextFactoryTest.cpp', '../tests/GradientTest.cpp', '../tests/GrMemoryPoolTest.cpp', + '../tests/GrSurfaceTest.cpp', '../tests/HashCacheTest.cpp', '../tests/InfRectTest.cpp', '../tests/LListTest.cpp', -- cgit v1.2.3 From 187254f64cffb4955e36b1d937aa21a386e55258 Mon Sep 17 00:00:00 2001 From: "bsalomon@google.com" Date: Wed, 3 Apr 2013 21:06:42 +0000 Subject: Revert 8525,8526 pending investigation of bench_pictures crashes. git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@8527 2bbb7eff-a529-9590-31e7-b0007b416f81 --- tests.gyp | 1 - 1 file changed, 1 deletion(-) diff --git a/tests.gyp b/tests.gyp index 8914edd..cd9e1b8 100644 --- a/tests.gyp +++ b/tests.gyp @@ -57,7 +57,6 @@ '../tests/GrContextFactoryTest.cpp', '../tests/GradientTest.cpp', '../tests/GrMemoryPoolTest.cpp', - '../tests/GrSurfaceTest.cpp', '../tests/HashCacheTest.cpp', '../tests/InfRectTest.cpp', '../tests/LListTest.cpp', -- cgit v1.2.3 From 53e0f3d3a759c1ccd6e06d7a698139dab60c52fd Mon Sep 17 00:00:00 2001 From: "djsollen@google.com" Date: Thu, 4 Apr 2013 19:42:51 +0000 Subject: Revert Skia to use -02. There was no clear speed improvement and the increase in binary size was substantial. Committed: http://code.google.com/p/skia/source/detail?r=8492 Committed: https://code.google.com/p/skia/source/detail?r=8494 Review URL: https://codereview.chromium.org/13468010 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@8539 2bbb7eff-a529-9590-31e7-b0007b416f81 --- common_conditions.gypi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common_conditions.gypi b/common_conditions.gypi index 360fed7..feb364f 100644 --- a/common_conditions.gypi +++ b/common_conditions.gypi @@ -299,7 +299,7 @@ 'cflags': ['-g'] }, 'Release': { - 'cflags': ['-O3'], + 'cflags': ['-O2'], 'defines': [ 'NDEBUG' ], }, }, -- cgit v1.2.3 From ef550e38a69ebed426282de3945ecea3a32aaffa Mon Sep 17 00:00:00 2001 From: "sugoi@google.com" Date: Fri, 5 Apr 2013 13:47:09 +0000 Subject: New SVG turbulence in Skia This cl contains the code for CPU generation of noise. TEST:Added 'perlinnoise' gm Review URL: https://codereview.chromium.org/13094003 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@8541 2bbb7eff-a529-9590-31e7-b0007b416f81 --- effects.gypi | 2 ++ gmslides.gypi | 1 + 2 files changed, 3 insertions(+) diff --git a/effects.gypi b/effects.gypi index 7dede6e..e3f4bf5 100644 --- a/effects.gypi +++ b/effects.gypi @@ -41,6 +41,7 @@ '<(skia_src_path)/effects/SkMorphologyImageFilter.cpp', '<(skia_src_path)/effects/SkOffsetImageFilter.cpp', '<(skia_src_path)/effects/SkPaintFlagsDrawFilter.cpp', + '<(skia_src_path)/effects/SkPerlinNoiseShader.cpp', '<(skia_src_path)/effects/SkPixelXorXfermode.cpp', '<(skia_src_path)/effects/SkPorterDuff.cpp', '<(skia_src_path)/effects/SkRectShaderImageFilter.cpp', @@ -96,6 +97,7 @@ '<(skia_include_path)/effects/SkOffsetImageFilter.h', '<(skia_include_path)/effects/SkMorphologyImageFilter.h', '<(skia_include_path)/effects/SkPaintFlagsDrawFilter.h', + '<(skia_include_path)/effects/SkPerlinNoiseShader.h', '<(skia_include_path)/effects/SkPixelXorXfermode.h', '<(skia_include_path)/effects/SkPorterDuff.h', '<(skia_include_path)/effects/SkRectShaderImageFilter.h', diff --git a/gmslides.gypi b/gmslides.gypi index caff5a4..f04098c 100644 --- a/gmslides.gypi +++ b/gmslides.gypi @@ -64,6 +64,7 @@ '../gm/pathfill.cpp', '../gm/pathinterior.cpp', '../gm/pathreverse.cpp', + '../gm/perlinnoise.cpp', '../gm/points.cpp', '../gm/poly2poly.cpp', '../gm/quadpaths.cpp', -- cgit v1.2.3 From 06f7d038315606e9742b7d08d23e187b85d4a9fe Mon Sep 17 00:00:00 2001 From: "caryclark@google.com" Date: Mon, 8 Apr 2013 11:50:46 +0000 Subject: Add implementation of path ops This CL depends on https://codereview.chromium.org/12880016/ "Add intersections for path ops" Given a path, iterate through its contour, and construct an array of segments containing its curves. Intersect each curve with every other curve, and for cubics, with itself. Given the set of intersections, find one with the smallest y and sort the curves eminating from the intersection. Assign each curve a winding value. Operate on the curves, keeping and discarding them according to the current operation and the sum of the winding values. Assemble the kept curves into an output path. Review URL: https://codereview.chromium.org/13094010 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@8553 2bbb7eff-a529-9590-31e7-b0007b416f81 --- pathops_unittest.gyp | 137 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 137 insertions(+) create mode 100644 pathops_unittest.gyp diff --git a/pathops_unittest.gyp b/pathops_unittest.gyp new file mode 100644 index 0000000..e595c86 --- /dev/null +++ b/pathops_unittest.gyp @@ -0,0 +1,137 @@ +# GYP file to build unit tests. +{ + 'includes': [ + 'apptype_console.gypi', + ], + 'targets': [ + { + 'target_name': 'pathops_unittest', + 'type': 'executable', + 'include_dirs' : [ + '../include/pathops', + '../src/core', + '../src/effects', + '../src/lazy', + '../src/pathops', + '../src/pdf', + '../src/pipe/utils', + '../src/utils', + '../tools/', + ], + 'sources': [ + '../include/pathops/SkPathOps.h', + '../src/pathops/SkAddIntersections.cpp', + '../src/pathops/SkDCubicIntersection.cpp', + '../src/pathops/SkDCubicLineIntersection.cpp', + '../src/pathops/SkDCubicToQuads.cpp', + '../src/pathops/SkDLineIntersection.cpp', + '../src/pathops/SkDQuadImplicit.cpp', + '../src/pathops/SkDQuadIntersection.cpp', + '../src/pathops/SkDQuadLineIntersection.cpp', + '../src/pathops/SkIntersections.cpp', + '../src/pathops/SkOpAngle.cpp', + '../src/pathops/SkOpContour.cpp', + '../src/pathops/SkOpEdgeBuilder.cpp', + '../src/pathops/SkOpSegment.cpp', + '../src/pathops/SkPathOpsBounds.cpp', + '../src/pathops/SkPathOpsCommon.cpp', + '../src/pathops/SkPathOpsCubic.cpp', + '../src/pathops/SkPathOpsDebug.cpp', + '../src/pathops/SkPathOpsLine.cpp', + '../src/pathops/SkPathOpsOp.cpp', + '../src/pathops/SkPathOpsPoint.cpp', + '../src/pathops/SkPathOpsQuad.cpp', + '../src/pathops/SkPathOpsRect.cpp', + '../src/pathops/SkPathOpsSimplify.cpp', + '../src/pathops/SkPathOpsTriangle.cpp', + '../src/pathops/SkPathOpsTypes.cpp', + '../src/pathops/SkPathWriter.cpp', + '../src/pathops/SkQuarticRoot.cpp', + '../src/pathops/SkReduceOrder.cpp', + '../src/pathops/SkAddIntersections.h', + '../src/pathops/SkDQuadImplicit.h', + '../src/pathops/SkIntersectionHelper.h', + '../src/pathops/SkIntersections.h', + '../src/pathops/SkLineParameters.h', + '../src/pathops/SkOpAngle.h', + '../src/pathops/SkOpContour.h', + '../src/pathops/SkOpEdgeBuilder.h', + '../src/pathops/SkOpSegment.h', + '../src/pathops/SkOpSpan.h', + '../src/pathops/SkPathOpsBounds.h', + '../src/pathops/SkPathOpsCommon.h', + '../src/pathops/SkPathOpsCubic.h', + '../src/pathops/SkPathOpsCurve.h', + '../src/pathops/SkPathOpsDebug.h', + '../src/pathops/SkPathOpsLine.h', + '../src/pathops/SkPathOpsPoint.h', + '../src/pathops/SkPathOpsQuad.h', + '../src/pathops/SkPathOpsRect.h', + '../src/pathops/SkPathOpsSpan.h', + '../src/pathops/SkPathOpsTriangle.h', + '../src/pathops/SkPathOpsTypes.h', + '../src/pathops/SkPathWriter.h', + '../src/pathops/SkQuarticRoot.h', + '../src/pathops/SkReduceOrder.h', + '../src/pathops/TSearch.h', + '../tests/PathOpsBoundsTest.cpp', + '../tests/PathOpsCubicIntersectionTest.cpp', + '../tests/PathOpsCubicIntersectionTestData.cpp', + '../tests/PathOpsCubicLineIntersectionTest.cpp', + '../tests/PathOpsCubicReduceOrderTest.cpp', + '../tests/PathOpsCubicToQuadsTest.cpp', + '../tests/PathOpsDCubicTest.cpp', + '../tests/PathOpsDLineTest.cpp', + '../tests/PathOpsDPointTest.cpp', + '../tests/PathOpsDQuadTest.cpp', + '../tests/PathOpsDRectTest.cpp', + '../tests/PathOpsDTriangleTest.cpp', + '../tests/PathOpsDVectorTest.cpp', + '../tests/PathOpsExtendedTest.cpp', + '../tests/PathOpsLineIntersectionTest.cpp', + '../tests/PathOpsLineParametetersTest.cpp', + '../tests/PathOpsOpCubicThreadedTest.cpp', + '../tests/PathOpsOpRectThreadedTest.cpp', + '../tests/PathOpsOpTest.cpp', + '../tests/PathOpsQuadIntersectionTest.cpp', + '../tests/PathOpsQuadIntersectionTestData.cpp', + '../tests/PathOpsQuadLineIntersectionTest.cpp', + '../tests/PathOpsQuadLineIntersectionThreadedTest.cpp', + '../tests/PathOpsQuadParameterizationTest.cpp', + '../tests/PathOpsSimplifyDegenerateThreadedTest.cpp', + '../tests/PathOpsSimplifyQuadralateralsThreadedTest.cpp', + '../tests/PathOpsSimplifyQuadThreadedTest.cpp', + '../tests/PathOpsSimplifyRectThreadedTest.cpp', + '../tests/PathOpsSimplifyTest.cpp', + '../tests/PathOpsSimplifyTrianglesThreadedTest.cpp', + '../tests/PathOpsTestCommon.cpp', + '../tests/PathOpsCubicIntersectionTestData.h', + '../tests/PathOpsExtendedTest.h', + '../tests/PathOpsQuadIntersectionTestData.h', + '../tests/PathOpsTestCommon.h', + '../tests/Test.cpp', + '../tests/skia_test.cpp', + '../tests/Test.h', + ], + 'dependencies': [ + 'skia_base_libs.gyp:skia_base_libs', + 'effects.gyp:effects', + 'images.gyp:images', + 'utils.gyp:utils', + ], + 'conditions': [ + [ 'skia_gpu == 1', { + 'include_dirs': [ + '../src/gpu', + ], + }], + ], + }, + ], +} + +# Local Variables: +# tab-width:2 +# indent-tabs-mode:nil +# End: +# vim: set expandtab tabstop=2 shiftwidth=2: -- cgit v1.2.3 From a3c19e43dd1a058b732939006e5abbe3cae95e85 Mon Sep 17 00:00:00 2001 From: "senorblanco@chromium.org" Date: Mon, 8 Apr 2013 19:43:22 +0000 Subject: Allow single-pass filters (which use asNewEffect()) to participate in the image filter DAG. This was done by introducing the SkSinglePassImageFilter abstract base class, which implements canFilterImageGPU() and filterImageGPU() on behalf of the derived class. The derived class still only needs to asNewEffect(). This allows us to recurse on the filter input in SkSinglePassImageFilter::onFilterImageGPU(). It also allows us to remove any knowledge of single-pass image filters from SkGpuDevice and from the SkImageFilter base class as well. BUG= Review URL: https://codereview.chromium.org/13602013 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@8563 2bbb7eff-a529-9590-31e7-b0007b416f81 --- core.gypi | 2 ++ effects.gypi | 2 -- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/core.gypi b/core.gypi index 811f89b..3fc5263 100644 --- a/core.gypi +++ b/core.gypi @@ -96,6 +96,7 @@ '<(skia_src_path)/core/SkGraphics.cpp', '<(skia_src_path)/core/SkInstCnt.cpp', '<(skia_src_path)/core/SkImageFilter.cpp', + '<(skia_src_path)/core/SkImageFilterUtils.cpp', '<(skia_src_path)/core/SkLineClipper.cpp', '<(skia_src_path)/core/SkMallocPixelRef.cpp', '<(skia_src_path)/core/SkMask.cpp', @@ -230,6 +231,7 @@ '<(skia_include_path)/core/SkGeometry.h', '<(skia_include_path)/core/SkGraphics.h', '<(skia_include_path)/core/SkImageFilter.h', + '<(skia_include_path)/core/SkImageFilterUtils.h', '<(skia_include_path)/core/SkInstCnt.h', '<(skia_include_path)/core/SkMallocPixelRef.h', '<(skia_include_path)/core/SkMask.h', diff --git a/effects.gypi b/effects.gypi index e3f4bf5..3eb0d95 100644 --- a/effects.gypi +++ b/effects.gypi @@ -31,7 +31,6 @@ '<(skia_src_path)/effects/SkEmbossMask.h', '<(skia_src_path)/effects/SkEmbossMask_Table.h', '<(skia_src_path)/effects/SkEmbossMaskFilter.cpp', - '<(skia_src_path)/effects/SkImageFilterUtils.cpp', '<(skia_src_path)/effects/SkKernel33MaskFilter.cpp', '<(skia_src_path)/effects/SkLayerDrawLooper.cpp', '<(skia_src_path)/effects/SkLayerRasterizer.cpp', @@ -89,7 +88,6 @@ '<(skia_include_path)/effects/SkDrawExtraPathEffect.h', '<(skia_include_path)/effects/SkEmbossMaskFilter.h', '<(skia_include_path)/effects/SkGradientShader.h', - '<(skia_include_path)/effects/SkImageFilterUtils.h', '<(skia_include_path)/effects/SkKernel33MaskFilter.h', '<(skia_include_path)/effects/SkLayerDrawLooper.h', '<(skia_include_path)/effects/SkLayerRasterizer.h', -- cgit v1.2.3 From bf581da0427b7b4a6f083a54dcbeb2ae6c8f3496 Mon Sep 17 00:00:00 2001 From: "caryclark@google.com" Date: Mon, 8 Apr 2013 20:37:35 +0000 Subject: saving the old before blowing away git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@8565 2bbb7eff-a529-9590-31e7-b0007b416f81 --- pathops_unittest.gyp | 1 + 1 file changed, 1 insertion(+) diff --git a/pathops_unittest.gyp b/pathops_unittest.gyp index e595c86..44ed336 100644 --- a/pathops_unittest.gyp +++ b/pathops_unittest.gyp @@ -98,6 +98,7 @@ '../tests/PathOpsQuadLineIntersectionTest.cpp', '../tests/PathOpsQuadLineIntersectionThreadedTest.cpp', '../tests/PathOpsQuadParameterizationTest.cpp', + '../tests/PathOpsQuadReduceOrderTest.cpp', '../tests/PathOpsSimplifyDegenerateThreadedTest.cpp', '../tests/PathOpsSimplifyQuadralateralsThreadedTest.cpp', '../tests/PathOpsSimplifyQuadThreadedTest.cpp', -- cgit v1.2.3 From 14a31903134134e39fac1f9080ebde87f2607052 Mon Sep 17 00:00:00 2001 From: "humper@google.com" Date: Mon, 8 Apr 2013 21:44:11 +0000 Subject: Error checking / reporting API Review URL: https://codereview.chromium.org/13699004 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@8566 2bbb7eff-a529-9590-31e7-b0007b416f81 --- core.gypi | 3 +++ tests.gyp | 1 + 2 files changed, 4 insertions(+) diff --git a/core.gypi b/core.gypi index 3fc5263..ac66eed 100644 --- a/core.gypi +++ b/core.gypi @@ -76,6 +76,8 @@ '<(skia_src_path)/core/SkEdgeClipper.cpp', '<(skia_src_path)/core/SkEdge.cpp', '<(skia_src_path)/core/SkEdge.h', + '<(skia_src_path)/core/SkError.cpp', + '<(skia_src_path)/core/SkErrorInternals.h', '<(skia_src_path)/core/SkFDStream.cpp', '<(skia_src_path)/core/SkFP.h', '<(skia_src_path)/core/SkFilterProc.cpp', @@ -223,6 +225,7 @@ '<(skia_include_path)/core/SkDrawFilter.h', '<(skia_include_path)/core/SkDrawLooper.h', '<(skia_include_path)/core/SkEndian.h', + '<(skia_include_path)/core/SkError.h', '<(skia_include_path)/core/SkFixed.h', '<(skia_include_path)/core/SkFlattenable.h', '<(skia_include_path)/core/SkFloatBits.h', diff --git a/tests.gyp b/tests.gyp index cd9e1b8..4f9fefe 100644 --- a/tests.gyp +++ b/tests.gyp @@ -44,6 +44,7 @@ '../tests/DrawPathTest.cpp', '../tests/DrawTextTest.cpp', '../tests/EmptyPathTest.cpp', + '../tests/ErrorTest.cpp', '../tests/FillPathTest.cpp', '../tests/FlatDataTest.cpp', '../tests/FlateTest.cpp', -- cgit v1.2.3 -- cgit v1.2.3 From a070aaf1b748db4faca260cf00cfa05d5fa945d0 Mon Sep 17 00:00:00 2001 From: "bsalomon@google.com" Date: Tue, 9 Apr 2013 15:04:12 +0000 Subject: Reland of 8525 with fix for case when GrRT outlives GrTexture. Review URL: https://codereview.chromium.org/13814015 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@8573 2bbb7eff-a529-9590-31e7-b0007b416f81 --- tests.gyp | 1 + 1 file changed, 1 insertion(+) diff --git a/tests.gyp b/tests.gyp index 4f9fefe..3853c17 100644 --- a/tests.gyp +++ b/tests.gyp @@ -58,6 +58,7 @@ '../tests/GrContextFactoryTest.cpp', '../tests/GradientTest.cpp', '../tests/GrMemoryPoolTest.cpp', + '../tests/GrSurfaceTest.cpp', '../tests/HashCacheTest.cpp', '../tests/InfRectTest.cpp', '../tests/LListTest.cpp', -- cgit v1.2.3 From b1f68fb5f44b0710270402309ea340d46f18cd75 Mon Sep 17 00:00:00 2001 From: "caryclark@google.com" Date: Wed, 10 Apr 2013 15:55:37 +0000 Subject: Make parallel unit testing work on windows Review URL: https://codereview.chromium.org/14072002 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@8594 2bbb7eff-a529-9590-31e7-b0007b416f81 --- pathops_unittest.gyp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pathops_unittest.gyp b/pathops_unittest.gyp index 44ed336..d3bb3bc 100644 --- a/pathops_unittest.gyp +++ b/pathops_unittest.gyp @@ -106,10 +106,12 @@ '../tests/PathOpsSimplifyTest.cpp', '../tests/PathOpsSimplifyTrianglesThreadedTest.cpp', '../tests/PathOpsTestCommon.cpp', + '../tests/PathOpsThreadedCommon.cpp', '../tests/PathOpsCubicIntersectionTestData.h', '../tests/PathOpsExtendedTest.h', '../tests/PathOpsQuadIntersectionTestData.h', '../tests/PathOpsTestCommon.h', + '../tests/PathOpsThreadedCommon.h', '../tests/Test.cpp', '../tests/skia_test.cpp', '../tests/Test.h', -- cgit v1.2.3 From 9f41adbf988681020bc41cce30ab068a169c3c3e Mon Sep 17 00:00:00 2001 From: "caryclark@google.com" Date: Thu, 11 Apr 2013 12:33:23 +0000 Subject: shape ops test fixes - fix rand for Android - build unit test on linux - use atomic inc in test count - add casting for Android git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@8610 2bbb7eff-a529-9590-31e7-b0007b416f81 --- most.gyp | 1 + pathops_unittest.gyp | 1 + 2 files changed, 2 insertions(+) diff --git a/most.gyp b/most.gyp index 319547e..d32987f 100644 --- a/most.gyp +++ b/most.gyp @@ -17,6 +17,7 @@ 'SampleApp.gyp:SampleApp', 'tests.gyp:tests', 'tools.gyp:tools', + 'pathops_unittest.gyp:*', ], 'conditions': [ ['skia_os == "android"', { diff --git a/pathops_unittest.gyp b/pathops_unittest.gyp index d3bb3bc..1721389 100644 --- a/pathops_unittest.gyp +++ b/pathops_unittest.gyp @@ -7,6 +7,7 @@ { 'target_name': 'pathops_unittest', 'type': 'executable', + 'suppress_wildcard': '1', 'include_dirs' : [ '../include/pathops', '../src/core', -- cgit v1.2.3 From 40e53f5e08ba43fd537f7084465aa06151dddac0 Mon Sep 17 00:00:00 2001 From: "scroggo@google.com" Date: Thu, 11 Apr 2013 15:53:35 +0000 Subject: Updates for the skimage tool. Allow passing files or folders on the command line. Group the output to show all successes together, all failures together, etc. When writing a new png, do not make its file type ".png.png" if the original was a png. Force linking for JPEG decoder. Use SkCommandLineFlags. Review URL: https://codereview.chromium.org/14089002 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@8615 2bbb7eff-a529-9590-31e7-b0007b416f81 --- tools.gyp | 1 + 1 file changed, 1 insertion(+) diff --git a/tools.gyp b/tools.gyp index 4a4a1da..7f79dc4 100644 --- a/tools.gyp +++ b/tools.gyp @@ -82,6 +82,7 @@ 'skia_base_libs.gyp:skia_base_libs', 'effects.gyp:effects', 'images.gyp:images', + 'flags.gyp:flags', ], }, { -- cgit v1.2.3 From 67edf0d6ca4e7a20e17f125af4e194955c6e7d70 Mon Sep 17 00:00:00 2001 From: "commit-bot@chromium.org" Date: Thu, 11 Apr 2013 16:54:09 +0000 Subject: use commandlineflags for tests/ Author: reed@google.com Reviewed By: scroggo@google.com Review URL: https://chromiumcodereview.appspot.com/14047009 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@8616 2bbb7eff-a529-9590-31e7-b0007b416f81 --- tests.gyp | 1 + 1 file changed, 1 insertion(+) diff --git a/tests.gyp b/tests.gyp index 3853c17..9a05ed4 100644 --- a/tests.gyp +++ b/tests.gyp @@ -122,6 +122,7 @@ 'dependencies': [ 'skia_base_libs.gyp:skia_base_libs', 'effects.gyp:effects', + 'flags.gyp:flags', 'experimental.gyp:experimental', 'images.gyp:images', 'pdf.gyp:pdf', -- cgit v1.2.3 From cfd908778e198d204e92da8bf6d55f32ad4381be Mon Sep 17 00:00:00 2001 From: "reed@google.com" Date: Thu, 11 Apr 2013 18:31:25 +0000 Subject: add fontmgr tests, and optional --verboseFontMgr flag (or -vfm) for more output git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@8626 2bbb7eff-a529-9590-31e7-b0007b416f81 --- tests.gyp | 1 + 1 file changed, 1 insertion(+) diff --git a/tests.gyp b/tests.gyp index 9a05ed4..683255e 100644 --- a/tests.gyp +++ b/tests.gyp @@ -50,6 +50,7 @@ '../tests/FlateTest.cpp', '../tests/FontHostStreamTest.cpp', '../tests/FontHostTest.cpp', + '../tests/FontMgrTest.cpp', '../tests/FontNamesTest.cpp', '../tests/GeometryTest.cpp', '../tests/GLInterfaceValidation.cpp', -- cgit v1.2.3 From c257cd9684cad9252da01e8617f9f355eed604a6 Mon Sep 17 00:00:00 2001 From: "scroggo@google.com" Date: Thu, 11 Apr 2013 18:32:01 +0000 Subject: Include gif image decoding in images/ on linux. Build SkImageDecoder_libgif in images project and link against libgif on linux. Ensure that the GIF decoder is used in skimage. Requires a new dependency on libgif-dev when building on linux. Review URL: https://codereview.chromium.org/14029011 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@8627 2bbb7eff-a529-9590-31e7-b0007b416f81 --- images.gyp | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/images.gyp b/images.gyp index b5d0334..93e95a4 100644 --- a/images.gyp +++ b/images.gyp @@ -97,12 +97,7 @@ ], }], [ 'skia_os in ["linux", "freebsd", "openbsd", "solaris", "nacl"]', { - 'sources!': [ - '../src/images/SkImageDecoder_libgif.cpp', - '../src/images/SkMovie_gif.cpp', - ], - # libpng stuff: - # Any targets that depend on this target should link in libpng and + # Any targets that depend on this target should link in libpng, libgif, and # our code that calls it. # See http://code.google.com/p/gyp/wiki/InputFormatReference#Dependent_Settings 'link_settings': { @@ -110,11 +105,12 @@ '../src/images/SkImageDecoder_libpng.cpp', ], 'libraries': [ + '-lgif', '-lpng', '-lz', ], }, - # end libpng stuff + # end libpng/libgif stuff }], [ 'skia_os == "android"', { 'include_dirs': [ -- cgit v1.2.3 From 41ffb47801f3d859d4dd5d3109c9261898cbe43d Mon Sep 17 00:00:00 2001 From: "scroggo@google.com" Date: Thu, 11 Apr 2013 20:11:40 +0000 Subject: Better fix for the patched build. skia_test is also built on Android in pathops_unittest, which needed to also depend on the flags project. Remove the hack in skia_test of providing the full path. Review URL: https://codereview.chromium.org/14177002 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@8632 2bbb7eff-a529-9590-31e7-b0007b416f81 --- pathops_unittest.gyp | 1 + 1 file changed, 1 insertion(+) diff --git a/pathops_unittest.gyp b/pathops_unittest.gyp index 1721389..b7fca5e 100644 --- a/pathops_unittest.gyp +++ b/pathops_unittest.gyp @@ -120,6 +120,7 @@ 'dependencies': [ 'skia_base_libs.gyp:skia_base_libs', 'effects.gyp:effects', + 'flags.gyp:flags', 'images.gyp:images', 'utils.gyp:utils', ], -- cgit v1.2.3 From 366056adc0ecbe7c28da400977a477571e12fd77 Mon Sep 17 00:00:00 2001 From: "scroggo@google.com" Date: Thu, 11 Apr 2013 22:24:35 +0000 Subject: Fix the NaCl build. Do not attempt to build our gif files or link gif in Nacl. Review URL: https://codereview.chromium.org/14201002 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@8635 2bbb7eff-a529-9590-31e7-b0007b416f81 --- images.gyp | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/images.gyp b/images.gyp index 93e95a4..40d6426 100644 --- a/images.gyp +++ b/images.gyp @@ -96,7 +96,7 @@ '../src/ports/SkImageDecoder_CG.cpp', ], }], - [ 'skia_os in ["linux", "freebsd", "openbsd", "solaris", "nacl"]', { + [ 'skia_os in ["linux", "freebsd", "openbsd", "solaris"]', { # Any targets that depend on this target should link in libpng, libgif, and # our code that calls it. # See http://code.google.com/p/gyp/wiki/InputFormatReference#Dependent_Settings @@ -112,6 +112,24 @@ }, # end libpng/libgif stuff }], + # FIXME: NaCl should be just like linux, etc, above, but it currently is separated out + # to remove gif. Once gif is supported by naclports, this can be merged into the above + # condition. + [ 'skia_os == "nacl"', { + 'sources!': [ + '../src/images/SkImageDecoder_libgif.cpp', + '../src/images/SkMovie_gif.cpp', + ], + 'link_settings': { + 'sources': [ + '../src/images/SkImageDecoder_libpng.cpp', + ], + 'libraries': [ + '-lpng', + '-lz', + ], + }, + }], [ 'skia_os == "android"', { 'include_dirs': [ '../src/utils', -- cgit v1.2.3 From 08a31589c3e41de0150c6131b52b422399f27996 Mon Sep 17 00:00:00 2001 From: "epoger@google.com" Date: Fri, 12 Apr 2013 02:23:55 +0000 Subject: rename SkBitmapChecksummer as SkBitmapHasher, and prepare for it to possibly use some algorithm other than CityHash Review URL: https://codereview.chromium.org/14170010 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@8639 2bbb7eff-a529-9590-31e7-b0007b416f81 --- tests.gyp | 2 ++ utils.gyp | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/tests.gyp b/tests.gyp index 683255e..68764cd 100644 --- a/tests.gyp +++ b/tests.gyp @@ -23,6 +23,7 @@ '../tests/BitmapCopyTest.cpp', '../tests/BitmapFactoryTest.cpp', '../tests/BitmapGetColorTest.cpp', + '../tests/BitmapHasherTest.cpp', '../tests/BitmapHeapTest.cpp', '../tests/BitmapTransformerTest.cpp', '../tests/BitSetTest.cpp', @@ -143,6 +144,7 @@ # TODO(borenet): Find a way to either provide this dependency or # replace it. 'sources!': [ + '../tests/BitmapHasherTest.cpp', '../tests/ChecksumTest.cpp', ], }], diff --git a/utils.gyp b/utils.gyp index 0048111..a14f585 100644 --- a/utils.gyp +++ b/utils.gyp @@ -57,8 +57,8 @@ '../src/utils/SkBase64.cpp', '../src/utils/SkBase64.h', - '../src/utils/SkBitmapChecksummer.cpp', - '../src/utils/SkBitmapChecksummer.h', + '../src/utils/SkBitmapHasher.cpp', + '../src/utils/SkBitmapHasher.h', '../src/utils/SkBitmapTransformer.cpp', '../src/utils/SkBitmapTransformer.h', '../src/utils/SkBitSet.cpp', -- cgit v1.2.3 From 79f7939179db34d4e284dfca459285cbfdc19cab Mon Sep 17 00:00:00 2001 From: "caryclark@google.com" Date: Fri, 12 Apr 2013 11:59:41 +0000 Subject: turn on pathops unit test This temporarily disables SK_ENABLE_INST_COUNT ( skbug.com/1219 ) This fixes a linktime error on VS2012 in PathTest.cpp; -SK_ScalarInfinity should be SK_ScalarNegativeInfinity instead. This adds pathops and pathops unit tests to the main unit tests. Should this change destabilize anything, it should be sufficient to comment out the pathops gypi includes. at test.gyp:18,21. Review URL: https://codereview.chromium.org/14137010 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@8644 2bbb7eff-a529-9590-31e7-b0007b416f81 --- pathops.gypi | 63 +++++++++++++++++++++++++++++++++ pathops_unittest.gyp | 97 +++------------------------------------------------ pathops_unittest.gypi | 42 ++++++++++++++++++++++ tests.gyp | 4 +++ 4 files changed, 113 insertions(+), 93 deletions(-) create mode 100644 pathops.gypi create mode 100644 pathops_unittest.gypi diff --git a/pathops.gypi b/pathops.gypi new file mode 100644 index 0000000..75c166f --- /dev/null +++ b/pathops.gypi @@ -0,0 +1,63 @@ +{ + 'include_dirs' : [ + '../include/pathops', + '../src/pathops', + ], + 'sources': [ + '../include/pathops/SkPathOps.h', + '../src/pathops/SkAddIntersections.cpp', + '../src/pathops/SkDCubicIntersection.cpp', + '../src/pathops/SkDCubicLineIntersection.cpp', + '../src/pathops/SkDCubicToQuads.cpp', + '../src/pathops/SkDLineIntersection.cpp', + '../src/pathops/SkDQuadImplicit.cpp', + '../src/pathops/SkDQuadIntersection.cpp', + '../src/pathops/SkDQuadLineIntersection.cpp', + '../src/pathops/SkIntersections.cpp', + '../src/pathops/SkOpAngle.cpp', + '../src/pathops/SkOpContour.cpp', + '../src/pathops/SkOpEdgeBuilder.cpp', + '../src/pathops/SkOpSegment.cpp', + '../src/pathops/SkPathOpsBounds.cpp', + '../src/pathops/SkPathOpsCommon.cpp', + '../src/pathops/SkPathOpsCubic.cpp', + '../src/pathops/SkPathOpsDebug.cpp', + '../src/pathops/SkPathOpsLine.cpp', + '../src/pathops/SkPathOpsOp.cpp', + '../src/pathops/SkPathOpsPoint.cpp', + '../src/pathops/SkPathOpsQuad.cpp', + '../src/pathops/SkPathOpsRect.cpp', + '../src/pathops/SkPathOpsSimplify.cpp', + '../src/pathops/SkPathOpsTriangle.cpp', + '../src/pathops/SkPathOpsTypes.cpp', + '../src/pathops/SkPathWriter.cpp', + '../src/pathops/SkQuarticRoot.cpp', + '../src/pathops/SkReduceOrder.cpp', + '../src/pathops/SkAddIntersections.h', + '../src/pathops/SkDQuadImplicit.h', + '../src/pathops/SkIntersectionHelper.h', + '../src/pathops/SkIntersections.h', + '../src/pathops/SkLineParameters.h', + '../src/pathops/SkOpAngle.h', + '../src/pathops/SkOpContour.h', + '../src/pathops/SkOpEdgeBuilder.h', + '../src/pathops/SkOpSegment.h', + '../src/pathops/SkOpSpan.h', + '../src/pathops/SkPathOpsBounds.h', + '../src/pathops/SkPathOpsCommon.h', + '../src/pathops/SkPathOpsCubic.h', + '../src/pathops/SkPathOpsCurve.h', + '../src/pathops/SkPathOpsDebug.h', + '../src/pathops/SkPathOpsLine.h', + '../src/pathops/SkPathOpsPoint.h', + '../src/pathops/SkPathOpsQuad.h', + '../src/pathops/SkPathOpsRect.h', + '../src/pathops/SkPathOpsSpan.h', + '../src/pathops/SkPathOpsTriangle.h', + '../src/pathops/SkPathOpsTypes.h', + '../src/pathops/SkPathWriter.h', + '../src/pathops/SkQuarticRoot.h', + '../src/pathops/SkReduceOrder.h', + '../src/pathops/TSearch.h', + ], +} diff --git a/pathops_unittest.gyp b/pathops_unittest.gyp index b7fca5e..81d4c22 100644 --- a/pathops_unittest.gyp +++ b/pathops_unittest.gyp @@ -19,100 +19,11 @@ '../src/utils', '../tools/', ], + 'includes': [ + 'pathops.gypi', + 'pathops_unittest.gypi', + ], 'sources': [ - '../include/pathops/SkPathOps.h', - '../src/pathops/SkAddIntersections.cpp', - '../src/pathops/SkDCubicIntersection.cpp', - '../src/pathops/SkDCubicLineIntersection.cpp', - '../src/pathops/SkDCubicToQuads.cpp', - '../src/pathops/SkDLineIntersection.cpp', - '../src/pathops/SkDQuadImplicit.cpp', - '../src/pathops/SkDQuadIntersection.cpp', - '../src/pathops/SkDQuadLineIntersection.cpp', - '../src/pathops/SkIntersections.cpp', - '../src/pathops/SkOpAngle.cpp', - '../src/pathops/SkOpContour.cpp', - '../src/pathops/SkOpEdgeBuilder.cpp', - '../src/pathops/SkOpSegment.cpp', - '../src/pathops/SkPathOpsBounds.cpp', - '../src/pathops/SkPathOpsCommon.cpp', - '../src/pathops/SkPathOpsCubic.cpp', - '../src/pathops/SkPathOpsDebug.cpp', - '../src/pathops/SkPathOpsLine.cpp', - '../src/pathops/SkPathOpsOp.cpp', - '../src/pathops/SkPathOpsPoint.cpp', - '../src/pathops/SkPathOpsQuad.cpp', - '../src/pathops/SkPathOpsRect.cpp', - '../src/pathops/SkPathOpsSimplify.cpp', - '../src/pathops/SkPathOpsTriangle.cpp', - '../src/pathops/SkPathOpsTypes.cpp', - '../src/pathops/SkPathWriter.cpp', - '../src/pathops/SkQuarticRoot.cpp', - '../src/pathops/SkReduceOrder.cpp', - '../src/pathops/SkAddIntersections.h', - '../src/pathops/SkDQuadImplicit.h', - '../src/pathops/SkIntersectionHelper.h', - '../src/pathops/SkIntersections.h', - '../src/pathops/SkLineParameters.h', - '../src/pathops/SkOpAngle.h', - '../src/pathops/SkOpContour.h', - '../src/pathops/SkOpEdgeBuilder.h', - '../src/pathops/SkOpSegment.h', - '../src/pathops/SkOpSpan.h', - '../src/pathops/SkPathOpsBounds.h', - '../src/pathops/SkPathOpsCommon.h', - '../src/pathops/SkPathOpsCubic.h', - '../src/pathops/SkPathOpsCurve.h', - '../src/pathops/SkPathOpsDebug.h', - '../src/pathops/SkPathOpsLine.h', - '../src/pathops/SkPathOpsPoint.h', - '../src/pathops/SkPathOpsQuad.h', - '../src/pathops/SkPathOpsRect.h', - '../src/pathops/SkPathOpsSpan.h', - '../src/pathops/SkPathOpsTriangle.h', - '../src/pathops/SkPathOpsTypes.h', - '../src/pathops/SkPathWriter.h', - '../src/pathops/SkQuarticRoot.h', - '../src/pathops/SkReduceOrder.h', - '../src/pathops/TSearch.h', - '../tests/PathOpsBoundsTest.cpp', - '../tests/PathOpsCubicIntersectionTest.cpp', - '../tests/PathOpsCubicIntersectionTestData.cpp', - '../tests/PathOpsCubicLineIntersectionTest.cpp', - '../tests/PathOpsCubicReduceOrderTest.cpp', - '../tests/PathOpsCubicToQuadsTest.cpp', - '../tests/PathOpsDCubicTest.cpp', - '../tests/PathOpsDLineTest.cpp', - '../tests/PathOpsDPointTest.cpp', - '../tests/PathOpsDQuadTest.cpp', - '../tests/PathOpsDRectTest.cpp', - '../tests/PathOpsDTriangleTest.cpp', - '../tests/PathOpsDVectorTest.cpp', - '../tests/PathOpsExtendedTest.cpp', - '../tests/PathOpsLineIntersectionTest.cpp', - '../tests/PathOpsLineParametetersTest.cpp', - '../tests/PathOpsOpCubicThreadedTest.cpp', - '../tests/PathOpsOpRectThreadedTest.cpp', - '../tests/PathOpsOpTest.cpp', - '../tests/PathOpsQuadIntersectionTest.cpp', - '../tests/PathOpsQuadIntersectionTestData.cpp', - '../tests/PathOpsQuadLineIntersectionTest.cpp', - '../tests/PathOpsQuadLineIntersectionThreadedTest.cpp', - '../tests/PathOpsQuadParameterizationTest.cpp', - '../tests/PathOpsQuadReduceOrderTest.cpp', - '../tests/PathOpsSimplifyDegenerateThreadedTest.cpp', - '../tests/PathOpsSimplifyQuadralateralsThreadedTest.cpp', - '../tests/PathOpsSimplifyQuadThreadedTest.cpp', - '../tests/PathOpsSimplifyRectThreadedTest.cpp', - '../tests/PathOpsSimplifyTest.cpp', - '../tests/PathOpsSimplifyTrianglesThreadedTest.cpp', - '../tests/PathOpsTestCommon.cpp', - '../tests/PathOpsThreadedCommon.cpp', - '../tests/PathOpsCubicIntersectionTestData.h', - '../tests/PathOpsExtendedTest.h', - '../tests/PathOpsQuadIntersectionTestData.h', - '../tests/PathOpsTestCommon.h', - '../tests/PathOpsThreadedCommon.h', '../tests/Test.cpp', '../tests/skia_test.cpp', '../tests/Test.h', diff --git a/pathops_unittest.gypi b/pathops_unittest.gypi new file mode 100644 index 0000000..fb26c6a --- /dev/null +++ b/pathops_unittest.gypi @@ -0,0 +1,42 @@ +{ + 'sources': [ + '../tests/PathOpsBoundsTest.cpp', + '../tests/PathOpsCubicIntersectionTest.cpp', + '../tests/PathOpsCubicIntersectionTestData.cpp', + '../tests/PathOpsCubicLineIntersectionTest.cpp', + '../tests/PathOpsCubicReduceOrderTest.cpp', + '../tests/PathOpsCubicToQuadsTest.cpp', + '../tests/PathOpsDCubicTest.cpp', + '../tests/PathOpsDLineTest.cpp', + '../tests/PathOpsDPointTest.cpp', + '../tests/PathOpsDQuadTest.cpp', + '../tests/PathOpsDRectTest.cpp', + '../tests/PathOpsDTriangleTest.cpp', + '../tests/PathOpsDVectorTest.cpp', + '../tests/PathOpsExtendedTest.cpp', + '../tests/PathOpsLineIntersectionTest.cpp', + '../tests/PathOpsLineParametetersTest.cpp', + '../tests/PathOpsOpCubicThreadedTest.cpp', + '../tests/PathOpsOpRectThreadedTest.cpp', + '../tests/PathOpsOpTest.cpp', + '../tests/PathOpsQuadIntersectionTest.cpp', + '../tests/PathOpsQuadIntersectionTestData.cpp', + '../tests/PathOpsQuadLineIntersectionTest.cpp', + '../tests/PathOpsQuadLineIntersectionThreadedTest.cpp', + '../tests/PathOpsQuadParameterizationTest.cpp', + '../tests/PathOpsQuadReduceOrderTest.cpp', + '../tests/PathOpsSimplifyDegenerateThreadedTest.cpp', + '../tests/PathOpsSimplifyQuadralateralsThreadedTest.cpp', + '../tests/PathOpsSimplifyQuadThreadedTest.cpp', + '../tests/PathOpsSimplifyRectThreadedTest.cpp', + '../tests/PathOpsSimplifyTest.cpp', + '../tests/PathOpsSimplifyTrianglesThreadedTest.cpp', + '../tests/PathOpsTestCommon.cpp', + '../tests/PathOpsThreadedCommon.cpp', + '../tests/PathOpsCubicIntersectionTestData.h', + '../tests/PathOpsExtendedTest.h', + '../tests/PathOpsQuadIntersectionTestData.h', + '../tests/PathOpsTestCommon.h', + '../tests/PathOpsThreadedCommon.h', + ], +} diff --git a/tests.gyp b/tests.gyp index 68764cd..b95b4a6 100644 --- a/tests.gyp +++ b/tests.gyp @@ -16,6 +16,10 @@ '../src/utils', '../tools/', ], + 'includes': [ + 'pathops.gypi', + 'pathops_unittest.gypi', + ], 'sources': [ '../tests/AAClipTest.cpp', '../tests/AnnotationTest.cpp', -- cgit v1.2.3 From 3b8ce07f7b3f546387e129d66b7a31b624b41d53 Mon Sep 17 00:00:00 2001 From: "caryclark@google.com" Date: Fri, 12 Apr 2013 12:12:09 +0000 Subject: revert path ops unit test until errors are fixed git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@8645 2bbb7eff-a529-9590-31e7-b0007b416f81 --- tests.gyp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tests.gyp b/tests.gyp index b95b4a6..5ec9556 100644 --- a/tests.gyp +++ b/tests.gyp @@ -16,10 +16,10 @@ '../src/utils', '../tools/', ], - 'includes': [ - 'pathops.gypi', - 'pathops_unittest.gypi', - ], +# 'includes': [ +# 'pathops.gypi', +# 'pathops_unittest.gypi', +# ], 'sources': [ '../tests/AAClipTest.cpp', '../tests/AnnotationTest.cpp', -- cgit v1.2.3 From 95cbea5e46077e066f05a8b4a4ad839971658855 Mon Sep 17 00:00:00 2001 From: "robertphillips@google.com" Date: Fri, 12 Apr 2013 14:53:29 +0000 Subject: Add testing of optimizations to GM https://codereview.chromium.org/12843028/ git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@8654 2bbb7eff-a529-9590-31e7-b0007b416f81 --- SampleApp.gyp | 8 ++++++++ gm.gyp | 9 +++++++++ gmslides.gypi | 1 + 3 files changed, 18 insertions(+) diff --git a/SampleApp.gyp b/SampleApp.gyp index b4104ed..9c2b643 100644 --- a/SampleApp.gyp +++ b/SampleApp.gyp @@ -5,6 +5,7 @@ 'type': 'executable', 'mac_bundle' : 1, 'include_dirs' : [ + '../debugger', '../src/core', '../src/effects', #needed for BlurMask.h '../gm', # needed to pull gm.h @@ -15,6 +16,13 @@ 'gmslides.gypi', ], 'sources': [ + '../debugger/SkDrawCommand.h', + '../debugger/SkDrawCommand.cpp', + '../debugger/SkDebugCanvas.h', + '../debugger/SkDebugCanvas.cpp', + '../debugger/SkObjectParser.h', + '../debugger/SkObjectParser.cpp', + '../gm/gm.cpp', '../gm/gm.h', diff --git a/gm.gyp b/gm.gyp index 940ab84..3458107 100644 --- a/gm.gyp +++ b/gm.gyp @@ -8,6 +8,7 @@ 'target_name': 'gm', 'type': 'executable', 'include_dirs' : [ + '../debugger', '../src/core', '../src/effects', '../src/pipe/utils/', @@ -17,9 +18,17 @@ 'gmslides.gypi', ], 'sources': [ + '../debugger/SkDrawCommand.h', + '../debugger/SkDrawCommand.cpp', + '../debugger/SkDebugCanvas.h', + '../debugger/SkDebugCanvas.cpp', + '../debugger/SkObjectParser.h', + '../debugger/SkObjectParser.cpp', + '../gm/gm.cpp', '../gm/gmmain.cpp', '../gm/system_preferences_default.cpp', + '../src/pipe/utils/SamplePipeControllers.h', '../src/pipe/utils/SamplePipeControllers.cpp', ], diff --git a/gmslides.gypi b/gmslides.gypi index f04098c..6bd07bd 100644 --- a/gmslides.gypi +++ b/gmslides.gypi @@ -60,6 +60,7 @@ '../gm/morphology.cpp', '../gm/ninepatchstretch.cpp', '../gm/nocolorbleed.cpp', + '../gm/optimizations.cpp', '../gm/patheffects.cpp', '../gm/pathfill.cpp', '../gm/pathinterior.cpp', -- cgit v1.2.3 From 85d609da1f9f1d6fdf13cd3365641749a6510598 Mon Sep 17 00:00:00 2001 From: "robertphillips@google.com" Date: Fri, 12 Apr 2013 14:59:02 +0000 Subject: Reverting r8654 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@8655 2bbb7eff-a529-9590-31e7-b0007b416f81 --- SampleApp.gyp | 8 -------- gm.gyp | 9 --------- gmslides.gypi | 1 - 3 files changed, 18 deletions(-) diff --git a/SampleApp.gyp b/SampleApp.gyp index 9c2b643..b4104ed 100644 --- a/SampleApp.gyp +++ b/SampleApp.gyp @@ -5,7 +5,6 @@ 'type': 'executable', 'mac_bundle' : 1, 'include_dirs' : [ - '../debugger', '../src/core', '../src/effects', #needed for BlurMask.h '../gm', # needed to pull gm.h @@ -16,13 +15,6 @@ 'gmslides.gypi', ], 'sources': [ - '../debugger/SkDrawCommand.h', - '../debugger/SkDrawCommand.cpp', - '../debugger/SkDebugCanvas.h', - '../debugger/SkDebugCanvas.cpp', - '../debugger/SkObjectParser.h', - '../debugger/SkObjectParser.cpp', - '../gm/gm.cpp', '../gm/gm.h', diff --git a/gm.gyp b/gm.gyp index 3458107..940ab84 100644 --- a/gm.gyp +++ b/gm.gyp @@ -8,7 +8,6 @@ 'target_name': 'gm', 'type': 'executable', 'include_dirs' : [ - '../debugger', '../src/core', '../src/effects', '../src/pipe/utils/', @@ -18,17 +17,9 @@ 'gmslides.gypi', ], 'sources': [ - '../debugger/SkDrawCommand.h', - '../debugger/SkDrawCommand.cpp', - '../debugger/SkDebugCanvas.h', - '../debugger/SkDebugCanvas.cpp', - '../debugger/SkObjectParser.h', - '../debugger/SkObjectParser.cpp', - '../gm/gm.cpp', '../gm/gmmain.cpp', '../gm/system_preferences_default.cpp', - '../src/pipe/utils/SamplePipeControllers.h', '../src/pipe/utils/SamplePipeControllers.cpp', ], diff --git a/gmslides.gypi b/gmslides.gypi index 6bd07bd..f04098c 100644 --- a/gmslides.gypi +++ b/gmslides.gypi @@ -60,7 +60,6 @@ '../gm/morphology.cpp', '../gm/ninepatchstretch.cpp', '../gm/nocolorbleed.cpp', - '../gm/optimizations.cpp', '../gm/patheffects.cpp', '../gm/pathfill.cpp', '../gm/pathinterior.cpp', -- cgit v1.2.3 From d810635bf4a738cbb08176265211f435372bad40 Mon Sep 17 00:00:00 2001 From: "robertphillips@google.com" Date: Fri, 12 Apr 2013 15:13:35 +0000 Subject: Add testing of optimizations to GM https://codereview.chromium.org/12843028/ git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@8658 2bbb7eff-a529-9590-31e7-b0007b416f81 --- SampleApp.gyp | 8 ++++++++ gm.gyp | 9 +++++++++ gmslides.gypi | 1 + 3 files changed, 18 insertions(+) diff --git a/SampleApp.gyp b/SampleApp.gyp index b4104ed..9c2b643 100644 --- a/SampleApp.gyp +++ b/SampleApp.gyp @@ -5,6 +5,7 @@ 'type': 'executable', 'mac_bundle' : 1, 'include_dirs' : [ + '../debugger', '../src/core', '../src/effects', #needed for BlurMask.h '../gm', # needed to pull gm.h @@ -15,6 +16,13 @@ 'gmslides.gypi', ], 'sources': [ + '../debugger/SkDrawCommand.h', + '../debugger/SkDrawCommand.cpp', + '../debugger/SkDebugCanvas.h', + '../debugger/SkDebugCanvas.cpp', + '../debugger/SkObjectParser.h', + '../debugger/SkObjectParser.cpp', + '../gm/gm.cpp', '../gm/gm.h', diff --git a/gm.gyp b/gm.gyp index 940ab84..3458107 100644 --- a/gm.gyp +++ b/gm.gyp @@ -8,6 +8,7 @@ 'target_name': 'gm', 'type': 'executable', 'include_dirs' : [ + '../debugger', '../src/core', '../src/effects', '../src/pipe/utils/', @@ -17,9 +18,17 @@ 'gmslides.gypi', ], 'sources': [ + '../debugger/SkDrawCommand.h', + '../debugger/SkDrawCommand.cpp', + '../debugger/SkDebugCanvas.h', + '../debugger/SkDebugCanvas.cpp', + '../debugger/SkObjectParser.h', + '../debugger/SkObjectParser.cpp', + '../gm/gm.cpp', '../gm/gmmain.cpp', '../gm/system_preferences_default.cpp', + '../src/pipe/utils/SamplePipeControllers.h', '../src/pipe/utils/SamplePipeControllers.cpp', ], diff --git a/gmslides.gypi b/gmslides.gypi index f04098c..6bd07bd 100644 --- a/gmslides.gypi +++ b/gmslides.gypi @@ -60,6 +60,7 @@ '../gm/morphology.cpp', '../gm/ninepatchstretch.cpp', '../gm/nocolorbleed.cpp', + '../gm/optimizations.cpp', '../gm/patheffects.cpp', '../gm/pathfill.cpp', '../gm/pathinterior.cpp', -- cgit v1.2.3 From ad3cea565d1ab002cb9ccd9322f6435b3922d844 Mon Sep 17 00:00:00 2001 From: "skia.committer@gmail.com" Date: Sat, 13 Apr 2013 07:01:15 +0000 Subject: Sanitizing source files in Skia_Periodic_House_Keeping git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@8670 2bbb7eff-a529-9590-31e7-b0007b416f81 --- SampleApp.gyp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SampleApp.gyp b/SampleApp.gyp index 9c2b643..a240f32 100644 --- a/SampleApp.gyp +++ b/SampleApp.gyp @@ -22,7 +22,7 @@ '../debugger/SkDebugCanvas.cpp', '../debugger/SkObjectParser.h', '../debugger/SkObjectParser.cpp', - + '../gm/gm.cpp', '../gm/gm.h', -- cgit v1.2.3 From 1e3ff7fc6682af99275ce5ecfd45404f9c0831c7 Mon Sep 17 00:00:00 2001 From: "djsollen@google.com" Date: Mon, 15 Apr 2013 14:02:32 +0000 Subject: Remove freetype dependency from core.gyp Review URL: https://codereview.chromium.org/13975014 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@8677 2bbb7eff-a529-9590-31e7-b0007b416f81 --- core.gyp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core.gyp b/core.gyp index 5f99fd9..cc5cfbd 100644 --- a/core.gyp +++ b/core.gyp @@ -75,7 +75,7 @@ 'config/win', ], }], - [ 'skia_os in ("android", "nacl")', { + [ 'skia_os == "nacl"', { 'dependencies': [ 'freetype.gyp:freetype', ], -- cgit v1.2.3 From 85efbe24ce0276e7959368435c357facba66cd85 Mon Sep 17 00:00:00 2001 From: "djsollen@google.com" Date: Mon, 15 Apr 2013 14:37:28 +0000 Subject: Remove freetype dependency from core.gyp Committed: https://code.google.com/p/skia/source/detail?r=8677 Review URL: https://codereview.chromium.org/13975014 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@8678 2bbb7eff-a529-9590-31e7-b0007b416f81 --- core.gyp | 5 ----- 1 file changed, 5 deletions(-) diff --git a/core.gyp b/core.gyp index cc5cfbd..0a38ede 100644 --- a/core.gyp +++ b/core.gyp @@ -75,11 +75,6 @@ 'config/win', ], }], - [ 'skia_os == "nacl"', { - 'dependencies': [ - 'freetype.gyp:freetype', - ], - }], [ 'skia_os == "android" and skia_arch_type == "arm" and armv7 == 1', { # The code in SkUtilsArm.cpp can be used on an ARM-based Linux system, not only Android. 'sources': [ -- cgit v1.2.3 From e98515ba0fdcbb751b1b62d25d32b35d4994871f Mon Sep 17 00:00:00 2001 From: "caryclark@google.com" Date: Mon, 15 Apr 2013 19:13:59 +0000 Subject: path ops work in progress standardize tests use SK_ARRAY_COUNT everywhere debug why x87 differs from SIMD 64 various platform specific fixes git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@8689 2bbb7eff-a529-9590-31e7-b0007b416f81 --- pathops_unittest.gyp | 2 -- pathops_unittest.gypi | 1 + 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/pathops_unittest.gyp b/pathops_unittest.gyp index 81d4c22..2cb8172 100644 --- a/pathops_unittest.gyp +++ b/pathops_unittest.gyp @@ -9,11 +9,9 @@ 'type': 'executable', 'suppress_wildcard': '1', 'include_dirs' : [ - '../include/pathops', '../src/core', '../src/effects', '../src/lazy', - '../src/pathops', '../src/pdf', '../src/pipe/utils', '../src/utils', diff --git a/pathops_unittest.gypi b/pathops_unittest.gypi index fb26c6a..ebe1d5b 100644 --- a/pathops_unittest.gypi +++ b/pathops_unittest.gypi @@ -1,5 +1,6 @@ { 'sources': [ + '../tests/PathOpsAngleTest.cpp', '../tests/PathOpsBoundsTest.cpp', '../tests/PathOpsCubicIntersectionTest.cpp', '../tests/PathOpsCubicIntersectionTestData.cpp', -- cgit v1.2.3 From 5fe408f0c78f58c9a4e5bab40fd4f512ea1ccbac Mon Sep 17 00:00:00 2001 From: "reed@google.com" Date: Tue, 16 Apr 2013 16:55:38 +0000 Subject: add gm to test edge case in drawBitmapRectToRect git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@8698 2bbb7eff-a529-9590-31e7-b0007b416f81 --- gmslides.gypi | 1 + 1 file changed, 1 insertion(+) diff --git a/gmslides.gypi b/gmslides.gypi index 6bd07bd..09e73b7 100644 --- a/gmslides.gypi +++ b/gmslides.gypi @@ -10,6 +10,7 @@ '../gm/bitmapmatrix.cpp', '../gm/bitmapfilters.cpp', '../gm/bitmaprect.cpp', + '../gm/bitmaprecttest.cpp', '../gm/bitmapscroll.cpp', '../gm/blend.cpp', '../gm/blurs.cpp', -- cgit v1.2.3 From 0953ff7204cbe7ae0261e739ce33371ea2a2f886 Mon Sep 17 00:00:00 2001 From: "junov@chromium.org" Date: Wed, 17 Apr 2013 13:43:04 +0000 Subject: Benchmark to measure SkSurface copy on write performance Review URL: https://codereview.chromium.org/14297008 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@8718 2bbb7eff-a529-9590-31e7-b0007b416f81 --- bench.gypi | 1 + 1 file changed, 1 insertion(+) diff --git a/bench.gypi b/bench.gypi index f5aa1e3..614f147 100644 --- a/bench.gypi +++ b/bench.gypi @@ -18,6 +18,7 @@ '../bench/DashBench.cpp', '../bench/DecodeBench.cpp', '../bench/DeferredCanvasBench.cpp', + '../bench/DeferredSurfaceCopyBench.cpp', '../bench/FontScalerBench.cpp', '../bench/GradientBench.cpp', '../bench/GrMemoryPoolBench.cpp', -- cgit v1.2.3 From 520877c21d46fc0f4247890418f1942c5375cd4d Mon Sep 17 00:00:00 2001 From: "sugoi@google.com" Date: Wed, 17 Apr 2013 13:46:56 +0000 Subject: Perlin noise adjustments 1 ) Added GPU simplex noise as a comparison to GPU Perlin noise. It can be enabled simply by using a #define (SK_USE_SIMPLEX_NOISE) 2 ) Enabled GPU Perlin noise tests 3 ) Added a small benchmark for noise 4 ) Disabled GPU Perlin noise on Android based on benchmarks Review URL: https://codereview.chromium.org/14087002 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@8719 2bbb7eff-a529-9590-31e7-b0007b416f81 --- bench.gypi | 1 + 1 file changed, 1 insertion(+) diff --git a/bench.gypi b/bench.gypi index 614f147..74964c3 100644 --- a/bench.gypi +++ b/bench.gypi @@ -33,6 +33,7 @@ '../bench/MutexBench.cpp', '../bench/PathBench.cpp', '../bench/PathIterBench.cpp', + '../bench/PerlinNoiseBench.cpp', '../bench/PicturePlaybackBench.cpp', '../bench/PictureRecordBench.cpp', '../bench/ReadPixBench.cpp', -- cgit v1.2.3 From 12acda19c81dd1de45e3ac26347d774ecc5d3331 Mon Sep 17 00:00:00 2001 From: "bsalomon@google.com" Date: Wed, 17 Apr 2013 14:19:44 +0000 Subject: Add xfermodes2 GM. Tests all xfer modes with two gradient bitmaps Review URL: https://codereview.chromium.org/13912017 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@8721 2bbb7eff-a529-9590-31e7-b0007b416f81 --- gmslides.gypi | 1 + 1 file changed, 1 insertion(+) diff --git a/gmslides.gypi b/gmslides.gypi index 09e73b7..579c7ea 100644 --- a/gmslides.gypi +++ b/gmslides.gypi @@ -100,6 +100,7 @@ '../gm/verttext2.cpp', '../gm/verylargebitmap.cpp', '../gm/xfermodes.cpp', + '../gm/xfermodes2.cpp', ], } -- cgit v1.2.3 From 05efd1c3bd46d6c05597ac87400e1322bf7112e8 Mon Sep 17 00:00:00 2001 From: "scroggo@google.com" Date: Wed, 17 Apr 2013 21:07:55 +0000 Subject: Updates to images project. Use the SkImageEncoder_Factory on all platforms. On Windows and Mac, register the platform's image encoder as an option for SkImageEncoder::Create. Also add more types that can be decoded. Update comments for SkImageDecoder to be more accurate. Add more types to SkImageEncoder::Type, and return the correct type of encoder, if it exists. Use a custom version of SkImageDecoder::Factory on Windows and Mac to check the stream for registered decoders before defaulting to the platform's version. Share code with the existing SkImageDecoder::Factory method. Preparation for testing decoders and encoders: BUG=https://code.google.com/p/skia/issues/detail?id=1241 Review URL: https://codereview.chromium.org/14298010 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@8730 2bbb7eff-a529-9590-31e7-b0007b416f81 --- images.gyp | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/images.gyp b/images.gyp index 40d6426..85b689d 100644 --- a/images.gyp +++ b/images.gyp @@ -1,4 +1,4 @@ -{ +{ 'targets': [ { 'target_name': 'images', @@ -36,7 +36,8 @@ '../src/images/SkBitmapRegionDecoder.cpp', '../src/images/SkImageDecoder.cpp', - '../src/images/SkImageDecoder_Factory.cpp', + '../src/images/SkImageDecoder_FactoryDefault.cpp', + '../src/images/SkImageDecoder_FactoryRegistrar.cpp', '../src/images/SkImageDecoder_libbmp.cpp', '../src/images/SkImageDecoder_libgif.cpp', '../src/images/SkImageDecoder_libico.cpp', @@ -67,10 +68,9 @@ [ 'skia_os == "win"', { 'sources!': [ '../src/images/SkFDStream.cpp', - '../src/images/SkImageDecoder_Factory.cpp', + '../src/images/SkImageDecoder_FactoryDefault.cpp', '../src/images/SkImageDecoder_libgif.cpp', '../src/images/SkImageDecoder_libpng.cpp', - '../src/images/SkImageEncoder_Factory.cpp', '../src/images/SkMovie_gif.cpp', ], 'link_settings': { @@ -85,10 +85,9 @@ }], [ 'skia_os in ["mac", "ios"]', { 'sources!': [ - '../src/images/SkImageDecoder_Factory.cpp', + '../src/images/SkImageDecoder_FactoryDefault.cpp', '../src/images/SkImageDecoder_libpng.cpp', '../src/images/SkImageDecoder_libgif.cpp', - '../src/images/SkImageEncoder_Factory.cpp', '../src/images/SkMovie_gif.cpp', ], },{ #else if skia_os != mac -- cgit v1.2.3 From d4b044e7efebc3b81c03512597b6bdc7f5be0689 Mon Sep 17 00:00:00 2001 From: "jvanverth@google.com" Date: Thu, 18 Apr 2013 13:59:04 +0000 Subject: Add a GM to test ovals with a variety of paint settings, matrices and sizes. Review URL: https://codereview.chromium.org/14329008/ git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@8737 2bbb7eff-a529-9590-31e7-b0007b416f81 --- gmslides.gypi | 1 + 1 file changed, 1 insertion(+) diff --git a/gmslides.gypi b/gmslides.gypi index 579c7ea..f836193 100644 --- a/gmslides.gypi +++ b/gmslides.gypi @@ -62,6 +62,7 @@ '../gm/ninepatchstretch.cpp', '../gm/nocolorbleed.cpp', '../gm/optimizations.cpp', + '../gm/ovals.cpp', '../gm/patheffects.cpp', '../gm/pathfill.cpp', '../gm/pathinterior.cpp', -- cgit v1.2.3 From 9a1a5c6cdd79cb2cb6a67ed908edb75fe7aba1b8 Mon Sep 17 00:00:00 2001 From: "caryclark@google.com" Date: Thu, 18 Apr 2013 19:02:56 +0000 Subject: Enable path ops Path ops work (to my knowledge) on all platforms. Turning it on will use the bots to expose failing combinations I don't know about. Review URL: https://codereview.chromium.org/14057014 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@8751 2bbb7eff-a529-9590-31e7-b0007b416f81 --- tests.gyp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tests.gyp b/tests.gyp index 5ec9556..b95b4a6 100644 --- a/tests.gyp +++ b/tests.gyp @@ -16,10 +16,10 @@ '../src/utils', '../tools/', ], -# 'includes': [ -# 'pathops.gypi', -# 'pathops_unittest.gypi', -# ], + 'includes': [ + 'pathops.gypi', + 'pathops_unittest.gypi', + ], 'sources': [ '../tests/AAClipTest.cpp', '../tests/AnnotationTest.cpp', -- cgit v1.2.3 From ce3def5e65ff1609efad90fa422367261e013187 Mon Sep 17 00:00:00 2001 From: "bungeman@google.com" Date: Thu, 18 Apr 2013 19:18:19 +0000 Subject: Remove exclude of file which no longer exists. git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@8753 2bbb7eff-a529-9590-31e7-b0007b416f81 --- images.gyp | 1 - 1 file changed, 1 deletion(-) diff --git a/images.gyp b/images.gyp index 85b689d..d062d09 100644 --- a/images.gyp +++ b/images.gyp @@ -67,7 +67,6 @@ 'conditions': [ [ 'skia_os == "win"', { 'sources!': [ - '../src/images/SkFDStream.cpp', '../src/images/SkImageDecoder_FactoryDefault.cpp', '../src/images/SkImageDecoder_libgif.cpp', '../src/images/SkImageDecoder_libpng.cpp', -- cgit v1.2.3 From aff8c3a7de1dd27dfda689b4068039d6051f3a92 Mon Sep 17 00:00:00 2001 From: "caryclark@google.com" Date: Thu, 18 Apr 2013 19:21:06 +0000 Subject: disabling path ops Default single-threaded variant may wait forever. Review URL: https://codereview.chromium.org/13874014 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@8754 2bbb7eff-a529-9590-31e7-b0007b416f81 --- tests.gyp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tests.gyp b/tests.gyp index b95b4a6..5ec9556 100644 --- a/tests.gyp +++ b/tests.gyp @@ -16,10 +16,10 @@ '../src/utils', '../tools/', ], - 'includes': [ - 'pathops.gypi', - 'pathops_unittest.gypi', - ], +# 'includes': [ +# 'pathops.gypi', +# 'pathops_unittest.gypi', +# ], 'sources': [ '../tests/AAClipTest.cpp', '../tests/AnnotationTest.cpp', -- cgit v1.2.3 From 65b7ac8ce8b6666b18c2860ab500f9f0f7ad9d58 Mon Sep 17 00:00:00 2001 From: "bsalomon@google.com" Date: Thu, 18 Apr 2013 19:36:09 +0000 Subject: Expand modulate, add, subtract, extract component glsl helpers. Review URL: https://codereview.chromium.org/13895006 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@8755 2bbb7eff-a529-9590-31e7-b0007b416f81 --- gpu.gypi | 1 + 1 file changed, 1 insertion(+) diff --git a/gpu.gypi b/gpu.gypi index 259bd01..f5800e8 100644 --- a/gpu.gypi +++ b/gpu.gypi @@ -171,6 +171,7 @@ '<(skia_src_path)/gpu/gl/GrGLShaderVar.h', '<(skia_src_path)/gpu/gl/GrGLSL.cpp', '<(skia_src_path)/gpu/gl/GrGLSL.h', + '<(skia_src_path)/gpu/gl/GrGLSL_impl.h', '<(skia_src_path)/gpu/gl/GrGLStencilBuffer.cpp', '<(skia_src_path)/gpu/gl/GrGLStencilBuffer.h', '<(skia_src_path)/gpu/gl/GrGLTexture.cpp', -- cgit v1.2.3 From 44bc9fb79d57176dec6f94c8a6253cf8fc016700 Mon Sep 17 00:00:00 2001 From: "caryclark@google.com" Date: Fri, 19 Apr 2013 11:45:56 +0000 Subject: enable path ops in unit tests git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@8760 2bbb7eff-a529-9590-31e7-b0007b416f81 --- tests.gyp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tests.gyp b/tests.gyp index 5ec9556..b95b4a6 100644 --- a/tests.gyp +++ b/tests.gyp @@ -16,10 +16,10 @@ '../src/utils', '../tools/', ], -# 'includes': [ -# 'pathops.gypi', -# 'pathops_unittest.gypi', -# ], + 'includes': [ + 'pathops.gypi', + 'pathops_unittest.gypi', + ], 'sources': [ '../tests/AAClipTest.cpp', '../tests/AnnotationTest.cpp', -- cgit v1.2.3 From 2376cc8c4e22ba03ceeb4e1c4ada5b2d75d0cbd5 Mon Sep 17 00:00:00 2001 From: "bsalomon@google.com" Date: Fri, 19 Apr 2013 13:25:28 +0000 Subject: silence && || parens clang warning. git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@8764 2bbb7eff-a529-9590-31e7-b0007b416f81 --- common_conditions.gypi | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/common_conditions.gypi b/common_conditions.gypi index feb364f..3ebe8eb 100644 --- a/common_conditions.gypi +++ b/common_conditions.gypi @@ -62,7 +62,7 @@ 'VCCLCompilerTool': { 'DebugInformationFormat': '3', # programDatabase (/Zi) 'Optimization': '3', # full (/Ox) - 'WholeProgramOptimization': 'true', #/GL +#'WholeProgramOptimization': 'true', #/GL # Changing the floating point model requires rebaseling gm images #'FloatingPointModel': '2', # fast (/fp:fast) 'FavorSizeOrSpeed': '1', # speed (/Ot) @@ -73,10 +73,10 @@ }, 'VCLinkerTool': { 'GenerateDebugInformation': 'true', # /DEBUG - 'LinkTimeCodeGeneration': '1', # useLinkTimeCodeGeneration /LTCG +#'LinkTimeCodeGeneration': '1', # useLinkTimeCodeGeneration /LTCG }, 'VCLibrarianTool': { - 'LinkTimeCodeGeneration': 'true', # useLinkTimeCodeGeneration /LTCG +# 'LinkTimeCodeGeneration': 'true', # useLinkTimeCodeGeneration /LTCG }, }, }, -- cgit v1.2.3 From d954c3d2efe80e8180b709504ad7058bd1b1166f Mon Sep 17 00:00:00 2001 From: "reed@google.com" Date: Fri, 19 Apr 2013 20:16:01 +0000 Subject: add SkDataTable, to efficiently store an immutable array. Includes a builder helper class. Review URL: https://codereview.chromium.org/14188049 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@8779 2bbb7eff-a529-9590-31e7-b0007b416f81 --- core.gypi | 1 + 1 file changed, 1 insertion(+) diff --git a/core.gypi b/core.gypi index ac66eed..c694091 100644 --- a/core.gypi +++ b/core.gypi @@ -65,6 +65,7 @@ '<(skia_src_path)/core/SkCubicClipper.cpp', '<(skia_src_path)/core/SkCubicClipper.h', '<(skia_src_path)/core/SkData.cpp', + '<(skia_src_path)/core/SkDataTable.cpp', '<(skia_src_path)/core/SkDebug.cpp', '<(skia_src_path)/core/SkDeque.cpp', '<(skia_src_path)/core/SkDevice.cpp', -- cgit v1.2.3 From 08123fb2ddeed2f964acc54e4cce2cb463d20819 Mon Sep 17 00:00:00 2001 From: "caryclark@google.com" Date: Mon, 22 Apr 2013 14:37:05 +0000 Subject: path ops : add support for inverse fill add inverse fill, reverse diff, and gm tests cleaned up some interfaces Review URL: https://codereview.chromium.org/14371011 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@8798 2bbb7eff-a529-9590-31e7-b0007b416f81 --- gmslides.gypi | 4 ++++ pathops_unittest.gypi | 1 + 2 files changed, 5 insertions(+) diff --git a/gmslides.gypi b/gmslides.gypi index f836193..e1daaf8 100644 --- a/gmslides.gypi +++ b/gmslides.gypi @@ -1,5 +1,8 @@ # include this gypi to include all the golden master slides. { + 'includes': [ + 'pathops.gypi', + ], 'sources': [ '../gm/aaclip.cpp', '../gm/aarectmodes.cpp', @@ -66,6 +69,7 @@ '../gm/patheffects.cpp', '../gm/pathfill.cpp', '../gm/pathinterior.cpp', + '../gm/pathopsinverse.cpp', '../gm/pathreverse.cpp', '../gm/perlinnoise.cpp', '../gm/points.cpp', diff --git a/pathops_unittest.gypi b/pathops_unittest.gypi index ebe1d5b..21fb929 100644 --- a/pathops_unittest.gypi +++ b/pathops_unittest.gypi @@ -15,6 +15,7 @@ '../tests/PathOpsDTriangleTest.cpp', '../tests/PathOpsDVectorTest.cpp', '../tests/PathOpsExtendedTest.cpp', + '../tests/PathOpsInverseTest.cpp', '../tests/PathOpsLineIntersectionTest.cpp', '../tests/PathOpsLineParametetersTest.cpp', '../tests/PathOpsOpCubicThreadedTest.cpp', -- cgit v1.2.3 From 1030389907a2d065c739e42df99b4fdc1262c9e0 Mon Sep 17 00:00:00 2001 From: "bsalomon@google.com" Date: Mon, 22 Apr 2013 14:56:50 +0000 Subject: Revert accidentally changed msvs settings in r8764. git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@8800 2bbb7eff-a529-9590-31e7-b0007b416f81 --- common_conditions.gypi | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/common_conditions.gypi b/common_conditions.gypi index 3ebe8eb..feb364f 100644 --- a/common_conditions.gypi +++ b/common_conditions.gypi @@ -62,7 +62,7 @@ 'VCCLCompilerTool': { 'DebugInformationFormat': '3', # programDatabase (/Zi) 'Optimization': '3', # full (/Ox) -#'WholeProgramOptimization': 'true', #/GL + 'WholeProgramOptimization': 'true', #/GL # Changing the floating point model requires rebaseling gm images #'FloatingPointModel': '2', # fast (/fp:fast) 'FavorSizeOrSpeed': '1', # speed (/Ot) @@ -73,10 +73,10 @@ }, 'VCLinkerTool': { 'GenerateDebugInformation': 'true', # /DEBUG -#'LinkTimeCodeGeneration': '1', # useLinkTimeCodeGeneration /LTCG + 'LinkTimeCodeGeneration': '1', # useLinkTimeCodeGeneration /LTCG }, 'VCLibrarianTool': { -# 'LinkTimeCodeGeneration': 'true', # useLinkTimeCodeGeneration /LTCG + 'LinkTimeCodeGeneration': 'true', # useLinkTimeCodeGeneration /LTCG }, }, }, -- cgit v1.2.3 From 5fdb746025f35740efbcbd2a7172b83ca691c966 Mon Sep 17 00:00:00 2001 From: "commit-bot@chromium.org" Date: Mon, 22 Apr 2013 18:05:19 +0000 Subject: Add new roundrect GM R=bsalomon@google.com Author: jvanverth@google.com Review URL: https://chromiumcodereview.appspot.com/14348022 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@8806 2bbb7eff-a529-9590-31e7-b0007b416f81 --- gmslides.gypi | 1 + 1 file changed, 1 insertion(+) diff --git a/gmslides.gypi b/gmslides.gypi index e1daaf8..4386d64 100644 --- a/gmslides.gypi +++ b/gmslides.gypi @@ -78,6 +78,7 @@ '../gm/rects.cpp', '../gm/rrect.cpp', '../gm/rrects.cpp', + '../gm/roundrects.cpp', '../gm/samplerstress.cpp', '../gm/shaderbounds.cpp', '../gm/selftest.cpp', -- cgit v1.2.3 From 8ab2896c61855993919d0a8de7e344dc57580926 Mon Sep 17 00:00:00 2001 From: "caryclark@google.com" Date: Mon, 22 Apr 2013 20:09:23 +0000 Subject: remove deleted file from gyp git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@8811 2bbb7eff-a529-9590-31e7-b0007b416f81 --- pathops.gypi | 1 - 1 file changed, 1 deletion(-) diff --git a/pathops.gypi b/pathops.gypi index 75c166f..5daa0fd 100644 --- a/pathops.gypi +++ b/pathops.gypi @@ -58,6 +58,5 @@ '../src/pathops/SkPathWriter.h', '../src/pathops/SkQuarticRoot.h', '../src/pathops/SkReduceOrder.h', - '../src/pathops/TSearch.h', ], } -- cgit v1.2.3 From b05079bb1fdb2f92389018d46ecf97d354e92657 Mon Sep 17 00:00:00 2001 From: "commit-bot@chromium.org" Date: Mon, 22 Apr 2013 20:26:44 +0000 Subject: Fix gyp files to allow ninja to build 64 bit on Mac. Fix warnings that cropped up building as 64-bit. BUG= R=bsalomon@google.com, bungeman@google.com Author: mtklein@google.com Review URL: https://chromiumcodereview.appspot.com/13852013 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@8814 2bbb7eff-a529-9590-31e7-b0007b416f81 --- common_conditions.gypi | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/common_conditions.gypi b/common_conditions.gypi index feb364f..81c958a 100644 --- a/common_conditions.gypi +++ b/common_conditions.gypi @@ -178,12 +178,12 @@ 'conditions' : [ [ 'skia_arch_width == 64', { 'xcode_settings': { - 'ARCHS': 'x86_64', + 'ARCHS': ['x86_64'], }, }], [ 'skia_arch_width == 32', { 'xcode_settings': { - 'ARCHS': 'i386', + 'ARCHS': ['i386'], }, }], [ 'skia_warnings_as_errors', { @@ -274,7 +274,7 @@ }, }, 'xcode_settings': { - 'ARCHS': 'armv6 armv7', + 'ARCHS': ['armv6', 'armv7'], 'CODE_SIGNING_REQUIRED': 'NO', 'CODE_SIGN_IDENTITY[sdk=iphoneos*]': '', 'IPHONEOS_DEPLOYMENT_TARGET': '<(ios_sdk_version)', -- cgit v1.2.3 From 3b51b7d13f1e389a92dc5025c897fc003877b125 Mon Sep 17 00:00:00 2001 From: "sugoi@google.com" Date: Tue, 23 Apr 2013 14:20:45 +0000 Subject: Added a few bench for some image filters Review URL: https://codereview.chromium.org/14234019 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@8824 2bbb7eff-a529-9590-31e7-b0007b416f81 --- bench.gypi | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/bench.gypi b/bench.gypi index 74964c3..8bae9b7 100644 --- a/bench.gypi +++ b/bench.gypi @@ -10,25 +10,30 @@ '../bench/BicubicBench.cpp', '../bench/BitmapBench.cpp', '../bench/BitmapRectBench.cpp', + '../bench/BlendBench.cpp', '../bench/BlurBench.cpp', '../bench/BlurRectBench.cpp', '../bench/ChecksumBench.cpp', '../bench/ChartBench.cpp', '../bench/ChromeBench.cpp', + '../bench/ColorFilterBench.cpp', '../bench/DashBench.cpp', '../bench/DecodeBench.cpp', '../bench/DeferredCanvasBench.cpp', '../bench/DeferredSurfaceCopyBench.cpp', + '../bench/DisplacementBench.cpp', '../bench/FontScalerBench.cpp', '../bench/GradientBench.cpp', '../bench/GrMemoryPoolBench.cpp', '../bench/InterpBench.cpp', '../bench/LineBench.cpp', + '../bench/MagnifierBench.cpp', '../bench/MathBench.cpp', '../bench/Matrix44Bench.cpp', '../bench/MatrixBench.cpp', '../bench/MatrixConvolutionBench.cpp', '../bench/MemoryBench.cpp', + '../bench/MergeBench.cpp', '../bench/MorphologyBench.cpp', '../bench/MutexBench.cpp', '../bench/PathBench.cpp', -- cgit v1.2.3 From ed9f52c99f1621be9783ad671df218586300bbe2 Mon Sep 17 00:00:00 2001 From: "bungeman@google.com" Date: Tue, 23 Apr 2013 18:06:23 +0000 Subject: ARGB image encoder for checksums. https://codereview.chromium.org/14267031/ git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@8831 2bbb7eff-a529-9590-31e7-b0007b416f81 --- images.gyp | 1 + tests.gyp | 2 +- utils.gyp | 3 +-- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/images.gyp b/images.gyp index d062d09..c96ff4d 100644 --- a/images.gyp +++ b/images.gyp @@ -47,6 +47,7 @@ '../src/images/SkImageDecoder_wbmp.cpp', '../src/images/SkImageEncoder.cpp', '../src/images/SkImageEncoder_Factory.cpp', + '../src/images/SkImageEncoder_argb.cpp', '../src/images/SkImageRef.cpp', '../src/images/SkImageRefPool.cpp', '../src/images/SkImageRefPool.h', diff --git a/tests.gyp b/tests.gyp index b95b4a6..ef6994e 100644 --- a/tests.gyp +++ b/tests.gyp @@ -23,13 +23,13 @@ 'sources': [ '../tests/AAClipTest.cpp', '../tests/AnnotationTest.cpp', + '../tests/ARGBImageEncoderTest.cpp', '../tests/AtomicTest.cpp', '../tests/BitmapCopyTest.cpp', '../tests/BitmapFactoryTest.cpp', '../tests/BitmapGetColorTest.cpp', '../tests/BitmapHasherTest.cpp', '../tests/BitmapHeapTest.cpp', - '../tests/BitmapTransformerTest.cpp', '../tests/BitSetTest.cpp', '../tests/BlitRowTest.cpp', '../tests/BlurTest.cpp', diff --git a/utils.gyp b/utils.gyp index a14f585..169bfbf 100644 --- a/utils.gyp +++ b/utils.gyp @@ -12,6 +12,7 @@ '../include/config', '../include/core', '../include/effects', + '../include/images', '../include/pipe', '../include/utils', '../include/utils/mac', @@ -59,8 +60,6 @@ '../src/utils/SkBase64.h', '../src/utils/SkBitmapHasher.cpp', '../src/utils/SkBitmapHasher.h', - '../src/utils/SkBitmapTransformer.cpp', - '../src/utils/SkBitmapTransformer.h', '../src/utils/SkBitSet.cpp', '../src/utils/SkBitSet.h', '../src/utils/SkBoundaryPatch.cpp', -- cgit v1.2.3 From 3541a8afc958cdbb73aab61ae68b66e88699492f Mon Sep 17 00:00:00 2001 From: "edisonn@google.com" Date: Wed, 24 Apr 2013 13:01:01 +0000 Subject: Encode images with DCTDecode (JPEG) in PDFs if it makes sense. Fallback to FlateDecode (zip) if it makes sense. Otherewise include uncompressed stream. This change will reduce the size of PDFs to 50% (in the case of the existing SKPs, we reduce the total size of PDFs from 105MB to 50MB) Review URL: https://codereview.appspot.com/7068055 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@8835 2bbb7eff-a529-9590-31e7-b0007b416f81 --- pdf.gyp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pdf.gyp b/pdf.gyp index 081df01..0e75914 100644 --- a/pdf.gyp +++ b/pdf.gyp @@ -34,6 +34,8 @@ '../src/pdf/SkPDFGraphicState.h', '../src/pdf/SkPDFImage.cpp', '../src/pdf/SkPDFImage.h', + '../src/pdf/SkPDFImageStream.cpp', + '../src/pdf/SkPDFImageStream.h', '../src/pdf/SkPDFPage.cpp', '../src/pdf/SkPDFPage.h', '../src/pdf/SkPDFShader.cpp', -- cgit v1.2.3 From 2f0f2715f0fa8f50cb64d88f8ff700c88caef285 Mon Sep 17 00:00:00 2001 From: "sugoi@google.com" Date: Wed, 24 Apr 2013 19:36:44 +0000 Subject: Adding new bench tests for lighting and blur Review URL: https://codereview.chromium.org/14474004 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@8846 2bbb7eff-a529-9590-31e7-b0007b416f81 --- bench.gypi | 2 ++ 1 file changed, 2 insertions(+) diff --git a/bench.gypi b/bench.gypi index 8bae9b7..baf7d44 100644 --- a/bench.gypi +++ b/bench.gypi @@ -12,6 +12,7 @@ '../bench/BitmapRectBench.cpp', '../bench/BlendBench.cpp', '../bench/BlurBench.cpp', + '../bench/BlurImageFilterBench.cpp', '../bench/BlurRectBench.cpp', '../bench/ChecksumBench.cpp', '../bench/ChartBench.cpp', @@ -27,6 +28,7 @@ '../bench/GrMemoryPoolBench.cpp', '../bench/InterpBench.cpp', '../bench/LineBench.cpp', + '../bench/LightingBench.cpp', '../bench/MagnifierBench.cpp', '../bench/MathBench.cpp', '../bench/Matrix44Bench.cpp', -- cgit v1.2.3 From 092bb7dc80919e1010486f708de32ee91dc36d7d Mon Sep 17 00:00:00 2001 From: "caryclark@google.com" Date: Thu, 25 Apr 2013 13:34:40 +0000 Subject: path ops : make it real Add an option to SkCanvas to turn on path ops when combining clips. Allow Op() to use one of the input paths as an output path. Fix a bug in Op() when the minuend is empty and the subtrahend is not (for difference). Change the build to allow core to depend on pathops. Review URL: https://codereview.chromium.org/14474002 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@8855 2bbb7eff-a529-9590-31e7-b0007b416f81 --- core.gyp | 2 ++ core.gypi | 57 ++++++++++++++++++++++++++++++++++++++++++++++++++++ gmslides.gypi | 4 +--- pathops_unittest.gyp | 1 - tests.gyp | 2 +- 5 files changed, 61 insertions(+), 5 deletions(-) diff --git a/core.gyp b/core.gyp index 0a38ede..7d9c9d7 100644 --- a/core.gyp +++ b/core.gyp @@ -16,6 +16,7 @@ '../include/config', '../include/core', '../include/lazy', + '../include/pathops', '../include/pipe', '../include/ports', '../include/utils', @@ -95,6 +96,7 @@ '../include/config', '../include/core', '../include/lazy', + '../include/pathops', '../include/pipe', 'ext', ], diff --git a/core.gypi b/core.gypi index c694091..4dbbdd6 100644 --- a/core.gypi +++ b/core.gypi @@ -302,6 +302,63 @@ '<(skia_src_path)/lazy/SkPurgeableMemoryBlock.h', '<(skia_src_path)/lazy/SkPurgeableMemoryBlock_common.cpp', '<(skia_src_path)/lazy/SkPurgeableImageCache.cpp', + + # Path ops + '<(skia_include_path)/pathops/SkPathOps.h', + + '<(skia_src_path)/pathops/SkAddIntersections.cpp', + '<(skia_src_path)/pathops/SkDCubicIntersection.cpp', + '<(skia_src_path)/pathops/SkDCubicLineIntersection.cpp', + '<(skia_src_path)/pathops/SkDCubicToQuads.cpp', + '<(skia_src_path)/pathops/SkDLineIntersection.cpp', + '<(skia_src_path)/pathops/SkDQuadImplicit.cpp', + '<(skia_src_path)/pathops/SkDQuadIntersection.cpp', + '<(skia_src_path)/pathops/SkDQuadLineIntersection.cpp', + '<(skia_src_path)/pathops/SkIntersections.cpp', + '<(skia_src_path)/pathops/SkOpAngle.cpp', + '<(skia_src_path)/pathops/SkOpContour.cpp', + '<(skia_src_path)/pathops/SkOpEdgeBuilder.cpp', + '<(skia_src_path)/pathops/SkOpSegment.cpp', + '<(skia_src_path)/pathops/SkPathOpsBounds.cpp', + '<(skia_src_path)/pathops/SkPathOpsCommon.cpp', + '<(skia_src_path)/pathops/SkPathOpsCubic.cpp', + '<(skia_src_path)/pathops/SkPathOpsDebug.cpp', + '<(skia_src_path)/pathops/SkPathOpsLine.cpp', + '<(skia_src_path)/pathops/SkPathOpsOp.cpp', + '<(skia_src_path)/pathops/SkPathOpsPoint.cpp', + '<(skia_src_path)/pathops/SkPathOpsQuad.cpp', + '<(skia_src_path)/pathops/SkPathOpsRect.cpp', + '<(skia_src_path)/pathops/SkPathOpsSimplify.cpp', + '<(skia_src_path)/pathops/SkPathOpsTriangle.cpp', + '<(skia_src_path)/pathops/SkPathOpsTypes.cpp', + '<(skia_src_path)/pathops/SkPathWriter.cpp', + '<(skia_src_path)/pathops/SkQuarticRoot.cpp', + '<(skia_src_path)/pathops/SkReduceOrder.cpp', + '<(skia_src_path)/pathops/SkAddIntersections.h', + '<(skia_src_path)/pathops/SkDQuadImplicit.h', + '<(skia_src_path)/pathops/SkIntersectionHelper.h', + '<(skia_src_path)/pathops/SkIntersections.h', + '<(skia_src_path)/pathops/SkLineParameters.h', + '<(skia_src_path)/pathops/SkOpAngle.h', + '<(skia_src_path)/pathops/SkOpContour.h', + '<(skia_src_path)/pathops/SkOpEdgeBuilder.h', + '<(skia_src_path)/pathops/SkOpSegment.h', + '<(skia_src_path)/pathops/SkOpSpan.h', + '<(skia_src_path)/pathops/SkPathOpsBounds.h', + '<(skia_src_path)/pathops/SkPathOpsCommon.h', + '<(skia_src_path)/pathops/SkPathOpsCubic.h', + '<(skia_src_path)/pathops/SkPathOpsCurve.h', + '<(skia_src_path)/pathops/SkPathOpsDebug.h', + '<(skia_src_path)/pathops/SkPathOpsLine.h', + '<(skia_src_path)/pathops/SkPathOpsPoint.h', + '<(skia_src_path)/pathops/SkPathOpsQuad.h', + '<(skia_src_path)/pathops/SkPathOpsRect.h', + '<(skia_src_path)/pathops/SkPathOpsSpan.h', + '<(skia_src_path)/pathops/SkPathOpsTriangle.h', + '<(skia_src_path)/pathops/SkPathOpsTypes.h', + '<(skia_src_path)/pathops/SkPathWriter.h', + '<(skia_src_path)/pathops/SkQuarticRoot.h', + '<(skia_src_path)/pathops/SkReduceOrder.h', ], } diff --git a/gmslides.gypi b/gmslides.gypi index 4386d64..c46c534 100644 --- a/gmslides.gypi +++ b/gmslides.gypi @@ -1,8 +1,5 @@ # include this gypi to include all the golden master slides. { - 'includes': [ - 'pathops.gypi', - ], 'sources': [ '../gm/aaclip.cpp', '../gm/aarectmodes.cpp', @@ -70,6 +67,7 @@ '../gm/pathfill.cpp', '../gm/pathinterior.cpp', '../gm/pathopsinverse.cpp', + '../gm/pathopsskpclip.cpp', '../gm/pathreverse.cpp', '../gm/perlinnoise.cpp', '../gm/points.cpp', diff --git a/pathops_unittest.gyp b/pathops_unittest.gyp index 2cb8172..d3a1eab 100644 --- a/pathops_unittest.gyp +++ b/pathops_unittest.gyp @@ -18,7 +18,6 @@ '../tools/', ], 'includes': [ - 'pathops.gypi', 'pathops_unittest.gypi', ], 'sources': [ diff --git a/tests.gyp b/tests.gyp index ef6994e..8e82d1b 100644 --- a/tests.gyp +++ b/tests.gyp @@ -11,13 +11,13 @@ '../src/core', '../src/effects', '../src/lazy', + '../src/pathops', '../src/pdf', '../src/pipe/utils', '../src/utils', '../tools/', ], 'includes': [ - 'pathops.gypi', 'pathops_unittest.gypi', ], 'sources': [ -- cgit v1.2.3 From 560093bb220601bbe1d7215c0f2af8998116ce59 Mon Sep 17 00:00:00 2001 From: "caryclark@google.com" Date: Thu, 25 Apr 2013 14:28:14 +0000 Subject: fix build : add src\pathops to pathops_unittest git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@8856 2bbb7eff-a529-9590-31e7-b0007b416f81 --- pathops_unittest.gyp | 1 + 1 file changed, 1 insertion(+) diff --git a/pathops_unittest.gyp b/pathops_unittest.gyp index d3a1eab..a3ae936 100644 --- a/pathops_unittest.gyp +++ b/pathops_unittest.gyp @@ -12,6 +12,7 @@ '../src/core', '../src/effects', '../src/lazy', + '../src/pathops', '../src/pdf', '../src/pipe/utils', '../src/utils', -- cgit v1.2.3 From 75a895e4de89f047cea57f1793e290bca2e9162c Mon Sep 17 00:00:00 2001 From: "scroggo@google.com" Date: Thu, 25 Apr 2013 17:33:51 +0000 Subject: Updates to skimage tool to use it for testing. skimage_main.cpp: More changes in the interest of testing our decoders. force_all_opaque before writing PNG files. Test reencoding the image to its original type (if possible), and then test redecoding it (to make sure the encoding was successful). Add an option to turn off this behavior. Merge decodeFileAndWrite with decodeFile. SkImageDecoder: Add kUnknown_Type to SkImageEncoder::Types. Add a static function to get the Format of an SkStream. In getFormatName(), remove an incorrect assert. When calling the flavor of DecodeStream that returns the Format, check the stream if the decoder returns kUnknown_Format. BUG=https://code.google.com/p/skia/issues/detail?id=1241 Review URL: https://codereview.chromium.org/14363003 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@8862 2bbb7eff-a529-9590-31e7-b0007b416f81 --- images.gyp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/images.gyp b/images.gyp index c96ff4d..bb1b92c 100644 --- a/images.gyp +++ b/images.gyp @@ -18,6 +18,8 @@ '../include/core', '../include/images', '../include/lazy', + # for access to SkErrorInternals.h + '../src/core/', # for access to SkImagePriv.h '../src/image/', ], -- cgit v1.2.3 From 4007d67e06d6872c04836c9761b39f9eab001b9b Mon Sep 17 00:00:00 2001 From: "epoger@google.com" Date: Fri, 26 Apr 2013 15:06:44 +0000 Subject: GM: specify that currently used checksums are CityHashes of SkBitmaps (distinct from other hash algorithms we may switch to, or hashes of files such as PDFs that cannot be read into an SkBitmap) Review URL: https://codereview.chromium.org/14284018 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@8877 2bbb7eff-a529-9590-31e7-b0007b416f81 --- gm.gyp | 1 + 1 file changed, 1 insertion(+) diff --git a/gm.gyp b/gm.gyp index 3458107..f0e466d 100644 --- a/gm.gyp +++ b/gm.gyp @@ -26,6 +26,7 @@ '../debugger/SkObjectParser.cpp', '../gm/gm.cpp', + '../gm/gm_expectations.cpp', '../gm/gmmain.cpp', '../gm/system_preferences_default.cpp', -- cgit v1.2.3 From 91af34b4f282dd054d2a7dc12e39be6d3df0a90b Mon Sep 17 00:00:00 2001 From: "caryclark@google.com" Date: Fri, 26 Apr 2013 19:51:16 +0000 Subject: path ops -- handle non-finite numbers Op() and Simplify() do nothing if the input is non-finite. Add code and tests. Review URL: https://codereview.chromium.org/14407006 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@8882 2bbb7eff-a529-9590-31e7-b0007b416f81 --- pathops_unittest.gypi | 1 + 1 file changed, 1 insertion(+) diff --git a/pathops_unittest.gypi b/pathops_unittest.gypi index 21fb929..271edbf 100644 --- a/pathops_unittest.gypi +++ b/pathops_unittest.gypi @@ -28,6 +28,7 @@ '../tests/PathOpsQuadParameterizationTest.cpp', '../tests/PathOpsQuadReduceOrderTest.cpp', '../tests/PathOpsSimplifyDegenerateThreadedTest.cpp', + '../tests/PathOpsSimplifyFailTest.cpp', '../tests/PathOpsSimplifyQuadralateralsThreadedTest.cpp', '../tests/PathOpsSimplifyQuadThreadedTest.cpp', '../tests/PathOpsSimplifyRectThreadedTest.cpp', -- cgit v1.2.3 From 69bd56bc69ec1c1e0c72bf554644b45c768444e2 Mon Sep 17 00:00:00 2001 From: "scroggo@google.com" Date: Wed, 1 May 2013 21:17:27 +0000 Subject: Force linking with image decoders for images project. Previously, each tool that wanted to use image decoders but did not specifically reference them had to create a dummy function that references them in order to ensure they are not stripped by the linker. Instead of making each tool reference each image decoder, do it once in SkImageDecoder.cpp. Now each tool will have image decoders linked in, assuming it includes the images project. This fixes a bug where SKPs with encoded data could not be read by bench_ or render_pictures. R=djsollen@google.com, robertphillips@google.com Review URL: https://codereview.chromium.org/14678003 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@8941 2bbb7eff-a529-9590-31e7-b0007b416f81 --- images.gyp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/images.gyp b/images.gyp index bb1b92c..03bae3e 100644 --- a/images.gyp +++ b/images.gyp @@ -40,6 +40,9 @@ '../src/images/SkImageDecoder.cpp', '../src/images/SkImageDecoder_FactoryDefault.cpp', '../src/images/SkImageDecoder_FactoryRegistrar.cpp', + # If decoders are added/removed to/from (all/individual) + # platform(s), be sure to update SkImageDecoder.cpp:force_linking + # so the right decoders will be forced to link. '../src/images/SkImageDecoder_libbmp.cpp', '../src/images/SkImageDecoder_libgif.cpp', '../src/images/SkImageDecoder_libico.cpp', -- cgit v1.2.3 From adc18d5783e7f20b0c82746b8e50e223b7496954 Mon Sep 17 00:00:00 2001 From: "robertphillips@google.com" Date: Thu, 2 May 2013 00:12:03 +0000 Subject: Hamfistedly removed core dependence on images https://codereview.chromium.org/14805002/ git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@8947 2bbb7eff-a529-9590-31e7-b0007b416f81 --- core.gypi | 2 +- gmslides.gypi | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/core.gypi b/core.gypi index 4dbbdd6..4008a18 100644 --- a/core.gypi +++ b/core.gypi @@ -191,7 +191,7 @@ '<(skia_src_path)/image/SkDataPixelRef.cpp', '<(skia_src_path)/image/SkImage.cpp', '<(skia_src_path)/image/SkImagePriv.cpp', - '<(skia_src_path)/image/SkImage_Codec.cpp', +# '<(skia_src_path)/image/SkImage_Codec.cpp', # '<(skia_src_path)/image/SkImage_Gpu.cpp', '<(skia_src_path)/image/SkImage_Picture.cpp', '<(skia_src_path)/image/SkImage_Raster.cpp', diff --git a/gmslides.gypi b/gmslides.gypi index c46c534..6e1c88a 100644 --- a/gmslides.gypi +++ b/gmslides.gypi @@ -49,6 +49,7 @@ '../gm/imageblur.cpp', '../gm/imagemagnifier.cpp', '../gm/lighting.cpp', + '../src/image/SkImage_Codec.cpp', '../gm/image.cpp', '../gm/imagefiltersbase.cpp', '../gm/imagefiltersgraph.cpp', -- cgit v1.2.3 From e481d6fe24cb6528d00d139c9952a6eb4afba636 Mon Sep 17 00:00:00 2001 From: "djsollen@google.com" Date: Thu, 2 May 2013 12:27:21 +0000 Subject: Update DEPS and GYP to use the copy of Android in platform_tools. R=borenet@google.com Review URL: https://codereview.chromium.org/13898019 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@8951 2bbb7eff-a529-9590-31e7-b0007b416f81 --- android_deps.gyp | 2 +- android_system.gyp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/android_deps.gyp b/android_deps.gyp index ea7bbf2..cd5b1b0 100644 --- a/android_deps.gyp +++ b/android_deps.gyp @@ -15,6 +15,6 @@ # variable expansion step for gyp happens after the includes are processed. { 'includes': [ - '../../android/gyp/dependencies.gypi', + '../platform_tools/android/gyp/dependencies.gypi', ], } diff --git a/android_system.gyp b/android_system.gyp index 57f973a..af2492c 100644 --- a/android_system.gyp +++ b/android_system.gyp @@ -15,6 +15,6 @@ # variable expansion step for gyp happens after the includes are processed. { 'includes': [ - '../../android/gyp/skia_android.gypi', + '../platform_tools/android/gyp/skia_android.gypi', ], } -- cgit v1.2.3 From 5d792b8ed972cb64e167c21e12b7d13058d01612 Mon Sep 17 00:00:00 2001 From: "djsollen@google.com" Date: Fri, 3 May 2013 14:00:34 +0000 Subject: Exclude angle dependency on non-angle builds R=bsalomon@google.com Review URL: https://codereview.chromium.org/14200018 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@8983 2bbb7eff-a529-9590-31e7-b0007b416f81 --- gpu.gyp | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/gpu.gyp b/gpu.gyp index 69e0815..efe757d 100644 --- a/gpu.gyp +++ b/gpu.gyp @@ -160,9 +160,13 @@ }], [ 'not skia_angle', { 'sources!': [ - '../include/gpu/gl/SkANGLEGLContext.h', - '../src/gpu/gl/angle/SkANGLEGLContext.cpp', - '../src/gpu/gl/angle/GrGLCreateANGLEInterface.cpp', + '<@(skgr_angle_gl_sources)', + ], + 'dependencies!': [ + 'angle.gyp:*', + ], + 'export_dependent_settings!': [ + 'angle.gyp:*', ], }], ], @@ -289,10 +293,13 @@ }], [ 'not skia_angle', { 'sources!': [ - '../include/gpu/gl/SkANGLEGLContext.h', - - '../src/gpu/gl/angle/GrGLCreateANGLEInterface.cpp', - '../src/gpu/gl/angle/SkANGLEGLContext.cpp', + '<@(gr_angle_gl_sources)', + ], + 'dependencies!': [ + 'angle.gyp:*', + ], + 'export_dependent_settings!': [ + 'angle.gyp:*', ], }], [ 'skia_os == "android"', { -- cgit v1.2.3 From 4dc225588d1f1bbcf435a969913be60597dd639c Mon Sep 17 00:00:00 2001 From: "borenet@google.com" Date: Mon, 6 May 2013 12:50:00 +0000 Subject: Copy NaCl directory into trunk/platform_tools, adjust paths (SkipBuildbotRuns) R=djsollen@google.com Review URL: https://codereview.chromium.org/14771017 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@9008 2bbb7eff-a529-9590-31e7-b0007b416f81 --- debugger.gyp | 2 +- nacl.gyp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/debugger.gyp b/debugger.gyp index 40c0f35..b935fb0 100644 --- a/debugger.gyp +++ b/debugger.gyp @@ -109,7 +109,7 @@ '../src/utils', ], 'sources': [ - '../../nacl/src/nacl_debugger.cpp', + '../platform_tools/nacl/src/nacl_debugger.cpp', ], }, { # skia_os != "nacl" 'include_dirs': [ diff --git a/nacl.gyp b/nacl.gyp index 5edb445..484570b 100644 --- a/nacl.gyp +++ b/nacl.gyp @@ -12,7 +12,7 @@ '../src/utils', ], 'sources': [ - '../../nacl/src/nacl_interface.cpp', + '../platform_tools/nacl/src/nacl_interface.cpp', ], }, ], -- cgit v1.2.3 From 602676ab82740f49b59fb4749772f5098e890885 Mon Sep 17 00:00:00 2001 From: "commit-bot@chromium.org" Date: Mon, 6 May 2013 22:23:08 +0000 Subject: Mask orientation and layout correctly. R=reed@google.com, clefru@google.com Author: bungeman@google.com Review URL: https://chromiumcodereview.appspot.com/14884010 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@9022 2bbb7eff-a529-9590-31e7-b0007b416f81 --- gmslides.gypi | 1 + 1 file changed, 1 insertion(+) diff --git a/gmslides.gypi b/gmslides.gypi index 6e1c88a..641ef22 100644 --- a/gmslides.gypi +++ b/gmslides.gypi @@ -27,6 +27,7 @@ '../gm/degeneratesegments.cpp', '../gm/dashcubics.cpp', '../gm/dashing.cpp', + '../gm/deviceproperties.cpp', '../gm/distantclip.cpp', '../gm/displacement.cpp', '../gm/drawbitmaprect.cpp', -- cgit v1.2.3 From ce1d89ca3ef06dd12b4bea7d70affd4dbf3cfccd Mon Sep 17 00:00:00 2001 From: "commit-bot@chromium.org" Date: Tue, 7 May 2013 15:28:15 +0000 Subject: XPS ttc handling. R=reed@google.com Author: bungeman@google.com Review URL: https://chromiumcodereview.appspot.com/14873006 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@9037 2bbb7eff-a529-9590-31e7-b0007b416f81 --- sfnt.gyp | 1 + xps.gyp | 1 + 2 files changed, 2 insertions(+) diff --git a/sfnt.gyp b/sfnt.gyp index 1abae53..438f33e 100644 --- a/sfnt.gyp +++ b/sfnt.gyp @@ -34,6 +34,7 @@ '../src/sfnt/SkOTUtils.h', '../src/sfnt/SkPreprocessorSeq.h', '../src/sfnt/SkSFNTHeader.h', + '../src/sfnt/SkTTCFHeader.h', '../src/sfnt/SkTypedEnum.h', '../src/sfnt/SkOTTable_name.cpp', diff --git a/xps.gyp b/xps.gyp index e5b7c0d..3768742 100644 --- a/xps.gyp +++ b/xps.gyp @@ -8,6 +8,7 @@ 'dependencies': [ 'skia_base_libs.gyp:skia_base_libs', 'images.gyp:images', + 'sfnt.gyp:sfnt', ], 'include_dirs': [ '../include/device/xps', -- cgit v1.2.3 From b7a3ed4a36844d594f75f7b3fefef981f84fa0b7 Mon Sep 17 00:00:00 2001 From: "caryclark@google.com" Date: Tue, 7 May 2013 18:51:31 +0000 Subject: path ops -- fix skp bugs This fixes a series of bugs discovered by running the small set of Skia skp files through pathops to flatten the clips. Review URL: https://codereview.chromium.org/14798004 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@9042 2bbb7eff-a529-9590-31e7-b0007b416f81 --- pathops_unittest.gypi | 1 + 1 file changed, 1 insertion(+) diff --git a/pathops_unittest.gypi b/pathops_unittest.gypi index 271edbf..dfbc89c 100644 --- a/pathops_unittest.gypi +++ b/pathops_unittest.gypi @@ -5,6 +5,7 @@ '../tests/PathOpsCubicIntersectionTest.cpp', '../tests/PathOpsCubicIntersectionTestData.cpp', '../tests/PathOpsCubicLineIntersectionTest.cpp', + '../tests/PathOpsCubicQuadIntersectionTest.cpp', '../tests/PathOpsCubicReduceOrderTest.cpp', '../tests/PathOpsCubicToQuadsTest.cpp', '../tests/PathOpsDCubicTest.cpp', -- cgit v1.2.3 From b7e6940513910a7d3dde25807976bd4020269f44 Mon Sep 17 00:00:00 2001 From: "epoger@google.com" Date: Wed, 8 May 2013 14:49:50 +0000 Subject: Remove third-party cityhash, unused since r8992 R=djsollen@google.com Review URL: https://codereview.chromium.org/15027013 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@9059 2bbb7eff-a529-9590-31e7-b0007b416f81 --- cityhash.gyp | 33 --------------------------------- utils.gyp | 14 -------------- 2 files changed, 47 deletions(-) delete mode 100644 cityhash.gyp diff --git a/cityhash.gyp b/cityhash.gyp deleted file mode 100644 index f35f1f0..0000000 --- a/cityhash.gyp +++ /dev/null @@ -1,33 +0,0 @@ -{ - 'variables': { - 'skia_warnings_as_errors': 0, - }, - 'targets': [ - { - 'target_name': 'cityhash', - 'type': 'static_library', - 'standalone_static_library': 1, - 'include_dirs': [ - '../include/config', - '../include/core', - '../src/utils/cityhash', - '../third_party/externals/cityhash/src', - ], - 'sources': [ - '../third_party/externals/cityhash/src/city.cc', - ], - 'direct_dependent_settings': { - 'include_dirs': [ - '../third_party/externals/cityhash/src', - ], - }, - 'conditions': [ - [ 'skia_os == "android"', { - 'cflags!': [ - '-Wall', - ], - }], - ], - }, - ], -} diff --git a/utils.gyp b/utils.gyp index 169bfbf..a1820c0 100644 --- a/utils.gyp +++ b/utils.gyp @@ -5,9 +5,6 @@ 'product_name': 'skia_utils', 'type': 'static_library', 'standalone_static_library': 1, - 'dependencies': [ - 'cityhash.gyp:cityhash', - ], 'include_dirs': [ '../include/config', '../include/core', @@ -64,8 +61,6 @@ '../src/utils/SkBitSet.h', '../src/utils/SkBoundaryPatch.cpp', '../src/utils/SkCamera.cpp', - '../src/utils/SkCityHash.cpp', - '../src/utils/SkCityHash.h', '../src/utils/SkCubicInterval.cpp', '../src/utils/SkCullPoints.cpp', '../src/utils/SkDeferredCanvas.cpp', @@ -195,15 +190,6 @@ ], 'sources!': [ '../src/utils/SkThreadUtils_pthread_linux.cpp', - '../src/utils/SkCityHash.cpp', - '../src/utils/SkCityHash.h', - ], - 'dependencies!': [ - # CityHash is not supported on NaCl because the NaCl toolchain is - # missing byteswap.h which is needed by CityHash. - # TODO(borenet): Find a way to either provide this dependency or - # replace it. - 'cityhash.gyp:cityhash', ], }], [ 'skia_os == "android"', { -- cgit v1.2.3 From bfef0af17a059b272d6643274b1a59d48635a665 Mon Sep 17 00:00:00 2001 From: "epoger@google.com" Date: Wed, 8 May 2013 15:22:36 +0000 Subject: Roll out r9059 to unbreak bots git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@9060 2bbb7eff-a529-9590-31e7-b0007b416f81 --- cityhash.gyp | 33 +++++++++++++++++++++++++++++++++ utils.gyp | 14 ++++++++++++++ 2 files changed, 47 insertions(+) create mode 100644 cityhash.gyp diff --git a/cityhash.gyp b/cityhash.gyp new file mode 100644 index 0000000..f35f1f0 --- /dev/null +++ b/cityhash.gyp @@ -0,0 +1,33 @@ +{ + 'variables': { + 'skia_warnings_as_errors': 0, + }, + 'targets': [ + { + 'target_name': 'cityhash', + 'type': 'static_library', + 'standalone_static_library': 1, + 'include_dirs': [ + '../include/config', + '../include/core', + '../src/utils/cityhash', + '../third_party/externals/cityhash/src', + ], + 'sources': [ + '../third_party/externals/cityhash/src/city.cc', + ], + 'direct_dependent_settings': { + 'include_dirs': [ + '../third_party/externals/cityhash/src', + ], + }, + 'conditions': [ + [ 'skia_os == "android"', { + 'cflags!': [ + '-Wall', + ], + }], + ], + }, + ], +} diff --git a/utils.gyp b/utils.gyp index a1820c0..169bfbf 100644 --- a/utils.gyp +++ b/utils.gyp @@ -5,6 +5,9 @@ 'product_name': 'skia_utils', 'type': 'static_library', 'standalone_static_library': 1, + 'dependencies': [ + 'cityhash.gyp:cityhash', + ], 'include_dirs': [ '../include/config', '../include/core', @@ -61,6 +64,8 @@ '../src/utils/SkBitSet.h', '../src/utils/SkBoundaryPatch.cpp', '../src/utils/SkCamera.cpp', + '../src/utils/SkCityHash.cpp', + '../src/utils/SkCityHash.h', '../src/utils/SkCubicInterval.cpp', '../src/utils/SkCullPoints.cpp', '../src/utils/SkDeferredCanvas.cpp', @@ -190,6 +195,15 @@ ], 'sources!': [ '../src/utils/SkThreadUtils_pthread_linux.cpp', + '../src/utils/SkCityHash.cpp', + '../src/utils/SkCityHash.h', + ], + 'dependencies!': [ + # CityHash is not supported on NaCl because the NaCl toolchain is + # missing byteswap.h which is needed by CityHash. + # TODO(borenet): Find a way to either provide this dependency or + # replace it. + 'cityhash.gyp:cityhash', ], }], [ 'skia_os == "android"', { -- cgit v1.2.3 From e7328f70db47da13fde5373dd0aa2769e6e824ea Mon Sep 17 00:00:00 2001 From: "reed@google.com" Date: Wed, 8 May 2013 15:32:41 +0000 Subject: remove dead code (SkBitmapSampler) git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@9062 2bbb7eff-a529-9590-31e7-b0007b416f81 --- core.gypi | 3 --- 1 file changed, 3 deletions(-) diff --git a/core.gypi b/core.gypi index 4008a18..1c31e19 100644 --- a/core.gypi +++ b/core.gypi @@ -30,9 +30,6 @@ '<(skia_src_path)/core/SkBitmapProcState_matrix.h', '<(skia_src_path)/core/SkBitmapProcState_matrixProcs.cpp', '<(skia_src_path)/core/SkBitmapProcState_sample.h', - '<(skia_src_path)/core/SkBitmapSampler.cpp', - '<(skia_src_path)/core/SkBitmapSampler.h', - '<(skia_src_path)/core/SkBitmapSamplerTemplate.h', '<(skia_src_path)/core/SkBitmapShader16BilerpTemplate.h', '<(skia_src_path)/core/SkBitmapShaderTemplate.h', '<(skia_src_path)/core/SkBitmap_scroll.cpp', -- cgit v1.2.3 From b63f2cdef8c8cee7e2ec7155e2e2a20ef1116c4b Mon Sep 17 00:00:00 2001 From: "epoger@google.com" Date: Wed, 8 May 2013 16:04:02 +0000 Subject: Re-land r9059 with empty cityhash.gyp, instead of deleted cityhash.gyp R=rmistry@google.com Review URL: https://codereview.chromium.org/15060008/ git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@9064 2bbb7eff-a529-9590-31e7-b0007b416f81 --- cityhash.gyp | 34 +++------------------------------- utils.gyp | 14 -------------- 2 files changed, 3 insertions(+), 45 deletions(-) diff --git a/cityhash.gyp b/cityhash.gyp index f35f1f0..461c8cc 100644 --- a/cityhash.gyp +++ b/cityhash.gyp @@ -1,33 +1,5 @@ +# Do-nothing gypfile, to keep the buildbots green. +# See https://code.google.com/p/skia/issues/detail?id=1286 +# ('removing cityhash.gyp broke SOME but not ALL buildbots') { - 'variables': { - 'skia_warnings_as_errors': 0, - }, - 'targets': [ - { - 'target_name': 'cityhash', - 'type': 'static_library', - 'standalone_static_library': 1, - 'include_dirs': [ - '../include/config', - '../include/core', - '../src/utils/cityhash', - '../third_party/externals/cityhash/src', - ], - 'sources': [ - '../third_party/externals/cityhash/src/city.cc', - ], - 'direct_dependent_settings': { - 'include_dirs': [ - '../third_party/externals/cityhash/src', - ], - }, - 'conditions': [ - [ 'skia_os == "android"', { - 'cflags!': [ - '-Wall', - ], - }], - ], - }, - ], } diff --git a/utils.gyp b/utils.gyp index 169bfbf..a1820c0 100644 --- a/utils.gyp +++ b/utils.gyp @@ -5,9 +5,6 @@ 'product_name': 'skia_utils', 'type': 'static_library', 'standalone_static_library': 1, - 'dependencies': [ - 'cityhash.gyp:cityhash', - ], 'include_dirs': [ '../include/config', '../include/core', @@ -64,8 +61,6 @@ '../src/utils/SkBitSet.h', '../src/utils/SkBoundaryPatch.cpp', '../src/utils/SkCamera.cpp', - '../src/utils/SkCityHash.cpp', - '../src/utils/SkCityHash.h', '../src/utils/SkCubicInterval.cpp', '../src/utils/SkCullPoints.cpp', '../src/utils/SkDeferredCanvas.cpp', @@ -195,15 +190,6 @@ ], 'sources!': [ '../src/utils/SkThreadUtils_pthread_linux.cpp', - '../src/utils/SkCityHash.cpp', - '../src/utils/SkCityHash.h', - ], - 'dependencies!': [ - # CityHash is not supported on NaCl because the NaCl toolchain is - # missing byteswap.h which is needed by CityHash. - # TODO(borenet): Find a way to either provide this dependency or - # replace it. - 'cityhash.gyp:cityhash', ], }], [ 'skia_os == "android"', { -- cgit v1.2.3 From e6cee4812e0405a88b88fb6dac494bdfccb519c8 Mon Sep 17 00:00:00 2001 From: "scroggo@google.com" Date: Wed, 8 May 2013 19:14:23 +0000 Subject: Write/compare against expectations in skimage tool. skimage: Add two new modes: one to write expectations to a json file, and another to compare results against expectations. Use SkPATH_SEPARATOR instead of '/'. gm_expectations: Split into a static library so it can be used by skimage. Make functions non static and move function definitions into source file. Capitalize static member functions to follow the coding style guidelines. BUG=https://code.google.com/p/skia/issues/detail?id=1241 R=epoger@google.com Review URL: https://codereview.chromium.org/14670021 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@9069 2bbb7eff-a529-9590-31e7-b0007b416f81 --- gm.gyp | 26 +++++++++++++++++++++++++- tools.gyp | 9 ++++++++- 2 files changed, 33 insertions(+), 2 deletions(-) diff --git a/gm.gyp b/gm.gyp index f0e466d..fa413c3 100644 --- a/gm.gyp +++ b/gm.gyp @@ -4,6 +4,30 @@ 'apptype_console.gypi', ], 'targets': [ + { + 'target_name': 'gm_expectations', + 'type': 'static_library', + 'include_dirs' : [ + '../include/core/', + '../src/utils/', + ], + 'sources': [ + '../gm/gm_expectations.h', + '../gm/gm_expectations.cpp', + ], + 'dependencies': [ + 'skia_base_libs.gyp:skia_base_libs', + 'core.gyp:core', + 'images.gyp:images', + 'jsoncpp.gyp:jsoncpp', + 'utils.gyp:utils', + ], + 'direct_dependent_settings': { + 'include_dirs': [ + '../gm/', + ], + }, + }, { 'target_name': 'gm', 'type': 'executable', @@ -26,7 +50,6 @@ '../debugger/SkObjectParser.cpp', '../gm/gm.cpp', - '../gm/gm_expectations.cpp', '../gm/gmmain.cpp', '../gm/system_preferences_default.cpp', @@ -37,6 +60,7 @@ 'skia_base_libs.gyp:skia_base_libs', 'effects.gyp:effects', 'flags.gyp:flags', + 'gm.gyp:gm_expectations', 'images.gyp:images', 'jsoncpp.gyp:jsoncpp', 'pdf.gyp:pdf', diff --git a/tools.gyp b/tools.gyp index 7f79dc4..ec521cf 100644 --- a/tools.gyp +++ b/tools.gyp @@ -78,11 +78,18 @@ 'sources': [ '../tools/skimage_main.cpp', ], + 'include_dirs': [ + # For SkBitmapHasher.h + '../src/utils/', + ], 'dependencies': [ 'skia_base_libs.gyp:skia_base_libs', 'effects.gyp:effects', - 'images.gyp:images', 'flags.gyp:flags', + 'gm.gyp:gm_expectations', + 'images.gyp:images', + 'jsoncpp.gyp:jsoncpp', + 'utils.gyp:utils', ], }, { -- cgit v1.2.3 From ebc4563bb1cb8aaeaf8c94d1e81d6ab34917f759 Mon Sep 17 00:00:00 2001 From: "robertphillips@google.com" Date: Thu, 9 May 2013 19:03:48 +0000 Subject: Added game-like bench marks https://codereview.chromium.org/14772019/ git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@9078 2bbb7eff-a529-9590-31e7-b0007b416f81 --- bench.gypi | 1 + 1 file changed, 1 insertion(+) diff --git a/bench.gypi b/bench.gypi index baf7d44..ce4f94b 100644 --- a/bench.gypi +++ b/bench.gypi @@ -24,6 +24,7 @@ '../bench/DeferredSurfaceCopyBench.cpp', '../bench/DisplacementBench.cpp', '../bench/FontScalerBench.cpp', + '../bench/GameBench.cpp', '../bench/GradientBench.cpp', '../bench/GrMemoryPoolBench.cpp', '../bench/InterpBench.cpp', -- cgit v1.2.3 From 16fa6ad48fa0615fc96ec78d8a5ce43746400b88 Mon Sep 17 00:00:00 2001 From: "commit-bot@chromium.org" Date: Thu, 9 May 2013 20:54:20 +0000 Subject: API modifications needed to upstream Android font changes. R=reed@google.com Author: djsollen@google.com Review URL: https://chromiumcodereview.appspot.com/14761003 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@9083 2bbb7eff-a529-9590-31e7-b0007b416f81 --- core.gyp | 1 + 1 file changed, 1 insertion(+) diff --git a/core.gyp b/core.gyp index 7d9c9d7..9e0792b 100644 --- a/core.gyp +++ b/core.gyp @@ -79,6 +79,7 @@ [ 'skia_os == "android" and skia_arch_type == "arm" and armv7 == 1', { # The code in SkUtilsArm.cpp can be used on an ARM-based Linux system, not only Android. 'sources': [ + '../src/core/SkPaintOptionsAndroid.cpp', '../src/core/SkUtilsArm.cpp', '../src/core/SkUtilsArm.h', ], -- cgit v1.2.3 From 70216904b47e3930f95ba9ea2a0dbdc6d85945e5 Mon Sep 17 00:00:00 2001 From: "robertphillips@google.com" Date: Thu, 9 May 2013 22:47:33 +0000 Subject: Reverting 9083 & 9084 due to Android failures git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@9085 2bbb7eff-a529-9590-31e7-b0007b416f81 --- core.gyp | 1 - 1 file changed, 1 deletion(-) diff --git a/core.gyp b/core.gyp index 9e0792b..7d9c9d7 100644 --- a/core.gyp +++ b/core.gyp @@ -79,7 +79,6 @@ [ 'skia_os == "android" and skia_arch_type == "arm" and armv7 == 1', { # The code in SkUtilsArm.cpp can be used on an ARM-based Linux system, not only Android. 'sources': [ - '../src/core/SkPaintOptionsAndroid.cpp', '../src/core/SkUtilsArm.cpp', '../src/core/SkUtilsArm.h', ], -- cgit v1.2.3 From f57904e2868a0856e080852c134d93b670e0d549 Mon Sep 17 00:00:00 2001 From: "commit-bot@chromium.org" Date: Mon, 13 May 2013 14:09:13 +0000 Subject: API modifications needed to upstream Android font changes. Committed: http://code.google.com/p/skia/source/detail?r=9083 R=reed@google.com Author: djsollen@google.com Review URL: https://chromiumcodereview.appspot.com/14761003 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@9107 2bbb7eff-a529-9590-31e7-b0007b416f81 --- core.gyp | 1 + 1 file changed, 1 insertion(+) diff --git a/core.gyp b/core.gyp index 7d9c9d7..9e0792b 100644 --- a/core.gyp +++ b/core.gyp @@ -79,6 +79,7 @@ [ 'skia_os == "android" and skia_arch_type == "arm" and armv7 == 1', { # The code in SkUtilsArm.cpp can be used on an ARM-based Linux system, not only Android. 'sources': [ + '../src/core/SkPaintOptionsAndroid.cpp', '../src/core/SkUtilsArm.cpp', '../src/core/SkUtilsArm.h', ], -- cgit v1.2.3 From e50e884576b0c044929ff687009fd23d01436503 Mon Sep 17 00:00:00 2001 From: "robertphillips@google.com" Date: Mon, 13 May 2013 14:10:31 +0000 Subject: add bench for blurred rectori case https://codereview.chromium.org/14690014/ git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@9108 2bbb7eff-a529-9590-31e7-b0007b416f81 --- bench.gypi | 1 + 1 file changed, 1 insertion(+) diff --git a/bench.gypi b/bench.gypi index ce4f94b..7f4772d 100644 --- a/bench.gypi +++ b/bench.gypi @@ -46,6 +46,7 @@ '../bench/PictureRecordBench.cpp', '../bench/ReadPixBench.cpp', '../bench/RectBench.cpp', + '../bench/RectoriBench.cpp', '../bench/RefCntBench.cpp', '../bench/RegionBench.cpp', '../bench/RegionContainBench.cpp', -- cgit v1.2.3 From fbe2d2ab8188ae3d19fa34437e3b06c46dc33ece Mon Sep 17 00:00:00 2001 From: "reed@google.com" Date: Mon, 13 May 2013 19:43:59 +0000 Subject: add separate impl file for SkFontMgr_fontconfig, so we don't polute SkFontHost_fontconfig, which should be sharable w/ android. Eventaully we will remove that FontHost file completely, and just use the SkFontMgr. R=djsollen@google.com Review URL: https://codereview.chromium.org/15077008 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@9114 2bbb7eff-a529-9590-31e7-b0007b416f81 --- ports.gyp | 1 + 1 file changed, 1 insertion(+) diff --git a/ports.gyp b/ports.gyp index bd2b909..6a99268 100644 --- a/ports.gyp +++ b/ports.gyp @@ -51,6 +51,7 @@ ], }, 'sources': [ + '../src/fonts/SkFontMgr_fontconfig.cpp', '../src/ports/SkFontHost_FreeType.cpp', '../src/ports/SkFontHost_FreeType_common.cpp', '../src/ports/SkFontHost_fontconfig.cpp', -- cgit v1.2.3 From 758f83cbac81b2741dcc0b1a65b5a296f71c0334 Mon Sep 17 00:00:00 2001 From: "robertphillips@google.com" Date: Tue, 14 May 2013 16:37:31 +0000 Subject: Add GM to track thin rectangle rendering https://codereview.chromium.org/15012024/ git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@9120 2bbb7eff-a529-9590-31e7-b0007b416f81 --- gmslides.gypi | 1 + 1 file changed, 1 insertion(+) diff --git a/gmslides.gypi b/gmslides.gypi index 641ef22..96c252d 100644 --- a/gmslides.gypi +++ b/gmslides.gypi @@ -98,6 +98,7 @@ '../gm/texteffects.cpp', '../gm/testimagefilters.cpp', '../gm/texdata.cpp', + '../gm/thinrects.cpp', '../gm/tilemodes.cpp', '../gm/tinybitmap.cpp', '../gm/twopointradial.cpp', -- cgit v1.2.3 From b0714102a7152c8df4fb3743a9d81bf7c025fea1 Mon Sep 17 00:00:00 2001 From: "reed@google.com" Date: Wed, 15 May 2013 19:34:20 +0000 Subject: add SkLuaCanvas add lua 5.2 to third_party BUG= R=bungeman@google.com Review URL: https://codereview.chromium.org/14907017 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@9149 2bbb7eff-a529-9590-31e7-b0007b416f81 --- lua.gyp | 68 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ tools.gyp | 20 +++++++++++++++++++ 2 files changed, 88 insertions(+) create mode 100644 lua.gyp diff --git a/lua.gyp b/lua.gyp new file mode 100644 index 0000000..a8f1ba6 --- /dev/null +++ b/lua.gyp @@ -0,0 +1,68 @@ +# +# Copyright 2013 Google Inc. +# +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE file. +# + + +{ + 'targets': [ + { + 'target_name': 'lua', + 'type': 'static_library', + 'suppress_wildcard': '1', + 'sources': [ + # core + '../third_party/lua/src/lapi.c', + '../third_party/lua/src/lcode.c', + '../third_party/lua/src/lctype.c', + '../third_party/lua/src/ldebug.c', + '../third_party/lua/src/ldo.c', + '../third_party/lua/src/ldump.c', + '../third_party/lua/src/lfunc.c', + '../third_party/lua/src/lgc.c', + '../third_party/lua/src/llex.c', + '../third_party/lua/src/lmem.c', + '../third_party/lua/src/lobject.c', + '../third_party/lua/src/lopcodes.c', + '../third_party/lua/src/lparser.c', + '../third_party/lua/src/lstate.c', + '../third_party/lua/src/lstring.c', + '../third_party/lua/src/ltable.c', + '../third_party/lua/src/ltm.c', + '../third_party/lua/src/lundump.c', + '../third_party/lua/src/lvm.c', + '../third_party/lua/src/lzio.c', + + # libraries + '../third_party/lua/src/lauxlib.c', + '../third_party/lua/src/lbaselib.c', + '../third_party/lua/src/lbitlib.c', + '../third_party/lua/src/lcorolib.c', + '../third_party/lua/src/ldblib.c', + '../third_party/lua/src/liolib.c', + '../third_party/lua/src/lmathlib.c', + '../third_party/lua/src/loslib.c', + '../third_party/lua/src/lstrlib.c', + '../third_party/lua/src/ltablib.c', + '../third_party/lua/src/loadlib.c', + '../third_party/lua/src/linit.c', + ], + 'include_dirs': [ + '../third_party/lua/src/', + ], + 'all_dependent_settings': { + 'include_dirs': [ + '../third_party/lua/src/', + ], + }, + }, + ], +} + +# Local Variables: +# tab-width:2 +# indent-tabs-mode:nil +# End: +# vim: set expandtab tabstop=2 shiftwidth=2: diff --git a/tools.gyp b/tools.gyp index ec521cf..4ece77c 100644 --- a/tools.gyp +++ b/tools.gyp @@ -15,6 +15,7 @@ 'dependencies': [ 'bench_pictures', 'filter', + 'lua_pictures', 'pinspect', 'render_pdfs', 'render_pictures', @@ -92,6 +93,25 @@ 'utils.gyp:utils', ], }, + { + 'target_name': 'lua_pictures', + 'type': 'executable', + 'sources': [ + '../tools/lua/lua_pictures.cpp', + '../src/utils/SkLuaCanvas.cpp', + ], + 'dependencies': [ + 'skia_base_libs.gyp:skia_base_libs', + 'effects.gyp:effects', + 'utils.gyp:utils', + 'images.gyp:images', + 'tools.gyp:picture_renderer', + 'tools.gyp:picture_utils', + 'ports.gyp:ports', + 'flags.gyp:flags', + 'lua.gyp:lua', + ], + }, { 'target_name': 'render_pictures', 'type': 'executable', -- cgit v1.2.3 From 1a07951934a64b3fc9fdcc9fe67eca6aa13e66c2 Mon Sep 17 00:00:00 2001 From: "reed@google.com" Date: Wed, 15 May 2013 19:42:16 +0000 Subject: disable lua_pictures tool from make for now git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@9150 2bbb7eff-a529-9590-31e7-b0007b416f81 --- tools.gyp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools.gyp b/tools.gyp index 4ece77c..e28991e 100644 --- a/tools.gyp +++ b/tools.gyp @@ -15,7 +15,7 @@ 'dependencies': [ 'bench_pictures', 'filter', - 'lua_pictures', +# 'lua_pictures', 'pinspect', 'render_pdfs', 'render_pictures', -- cgit v1.2.3 From b7f18aa0a2dba78e42ad7bb5448acfd858730167 Mon Sep 17 00:00:00 2001 From: "reed@google.com" Date: Wed, 15 May 2013 20:01:07 +0000 Subject: add direct_dependencies for picture_utils, and add cflags_cc for android's gypi Review URL: https://codereview.chromium.org/14620020 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@9152 2bbb7eff-a529-9590-31e7-b0007b416f81 --- common_conditions.gypi | 4 +++- tools.gyp | 7 ++++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/common_conditions.gypi b/common_conditions.gypi index 81c958a..fda1222 100644 --- a/common_conditions.gypi +++ b/common_conditions.gypi @@ -311,10 +311,12 @@ 'cflags': [ '-Wall', '-fno-exceptions', - '-fno-rtti', '-fstrict-aliasing', '-fuse-ld=gold', ], + 'cflags_cc': [ + '-fno-rtti', + ], 'conditions': [ [ 'skia_warnings_as_errors', { 'cflags': [ diff --git a/tools.gyp b/tools.gyp index e28991e..3cc70df 100644 --- a/tools.gyp +++ b/tools.gyp @@ -15,7 +15,7 @@ 'dependencies': [ 'bench_pictures', 'filter', -# 'lua_pictures', + 'lua_pictures', 'pinspect', 'render_pdfs', 'render_pictures', @@ -258,6 +258,11 @@ 'dependencies': [ 'skia_base_libs.gyp:skia_base_libs', ], + 'direct_dependent_settings': { + 'include_dirs': [ + '../tools/picture_utils.h', + ], + }, }, { 'target_name': 'pinspect', -- cgit v1.2.3 From 3694463c485f549e7bf2eca6ac167e087d9ed5b6 Mon Sep 17 00:00:00 2001 From: "reed@google.com" Date: Wed, 15 May 2013 20:07:22 +0000 Subject: fix typo in dependency line (don't name file, just dir) git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@9153 2bbb7eff-a529-9590-31e7-b0007b416f81 --- tools.gyp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools.gyp b/tools.gyp index 3cc70df..aa27b45 100644 --- a/tools.gyp +++ b/tools.gyp @@ -260,7 +260,7 @@ ], 'direct_dependent_settings': { 'include_dirs': [ - '../tools/picture_utils.h', + '../tools/', ], }, }, -- cgit v1.2.3 From 5841b7dbb5282e9a75dc56b2602f6af7a11e1419 Mon Sep 17 00:00:00 2001 From: "reed@google.com" Date: Wed, 15 May 2013 20:16:20 +0000 Subject: lua not building on android ??? disabling for now git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@9156 2bbb7eff-a529-9590-31e7-b0007b416f81 --- tools.gyp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools.gyp b/tools.gyp index aa27b45..6d95e10 100644 --- a/tools.gyp +++ b/tools.gyp @@ -15,7 +15,7 @@ 'dependencies': [ 'bench_pictures', 'filter', - 'lua_pictures', +# 'lua_pictures', 'pinspect', 'render_pdfs', 'render_pictures', -- cgit v1.2.3 From f3cb2456212bc911e7d7f67edd8c737934571cf0 Mon Sep 17 00:00:00 2001 From: "reed@google.com" Date: Wed, 15 May 2013 20:55:49 +0000 Subject: use define to work-around localeconf() missingness in android BUG= Review URL: https://codereview.chromium.org/14689008 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@9157 2bbb7eff-a529-9590-31e7-b0007b416f81 --- lua.gyp | 3 +++ tools.gyp | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/lua.gyp b/lua.gyp index a8f1ba6..280b94c 100644 --- a/lua.gyp +++ b/lua.gyp @@ -57,6 +57,9 @@ '../third_party/lua/src/', ], }, + 'defines': [ + "getlocaledecpoint()='.'" + ], }, ], } diff --git a/tools.gyp b/tools.gyp index 6d95e10..aa27b45 100644 --- a/tools.gyp +++ b/tools.gyp @@ -15,7 +15,7 @@ 'dependencies': [ 'bench_pictures', 'filter', -# 'lua_pictures', + 'lua_pictures', 'pinspect', 'render_pdfs', 'render_pictures', -- cgit v1.2.3 -- cgit v1.2.3 From e52e7cf88da537b58a51f81bc999ba63e3f438c4 Mon Sep 17 00:00:00 2001 From: "commit-bot@chromium.org" Date: Thu, 16 May 2013 14:53:28 +0000 Subject: Remove the fno-rtti excluders now that fno-rtti is only passed to c++ files. R=djsollen@google.com Author: bungeman@google.com Review URL: https://chromiumcodereview.appspot.com/15210003 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@9165 2bbb7eff-a529-9590-31e7-b0007b416f81 --- freetype.gyp | 3 --- libwebp.gyp | 13 ------------- 2 files changed, 16 deletions(-) diff --git a/freetype.gyp b/freetype.gyp index 1742697..f72c29c 100644 --- a/freetype.gyp +++ b/freetype.gyp @@ -73,9 +73,6 @@ '-DFT2_BUILD_LIBRARY', '-O2', ], - 'cflags!': [ - '-fno-rtti', # supress warnings about invalid option of non-C++ code - ], }], ], }, diff --git a/libwebp.gyp b/libwebp.gyp index b4c9f22..e20f004 100644 --- a/libwebp.gyp +++ b/libwebp.gyp @@ -28,9 +28,6 @@ '../third_party/externals/libwebp/dec/vp8l.c', '../third_party/externals/libwebp/dec/webp.c', ], - 'cflags!': [ - '-fno-rtti', # supresses warnings about invalid option of non-C++ code - ], }, { 'target_name': 'libwebp_dsp', @@ -49,9 +46,6 @@ '../third_party/externals/libwebp/dsp/upsampling_sse2.c', '../third_party/externals/libwebp/dsp/yuv.c', ], - 'cflags!': [ - '-fno-rtti', # supresses warnings about invalid option of non-C++ code - ], 'conditions': [ ['skia_os == "android"', { 'dependencies' : [ @@ -74,7 +68,6 @@ # behavior similar dsp_neon.c.neon in an Android.mk 'cflags!': [ '-mfpu=vfpv3-d16', - '-fno-rtti', # supresses warnings about invalid option of non-C++ code ], 'cflags': [ '-mfpu=neon' ], },{ # "armv7 != 1" @@ -106,9 +99,6 @@ '../third_party/externals/libwebp/enc/vp8l.c', '../third_party/externals/libwebp/enc/webpenc.c', ], - 'cflags!': [ - '-fno-rtti', # supresses warnings about invalid option of non-C++ code - ], }, { 'target_name': 'libwebp_utils', @@ -128,9 +118,6 @@ '../third_party/externals/libwebp/utils/thread.c', '../third_party/externals/libwebp/utils/utils.c', ], - 'cflags!': [ - '-fno-rtti', # supresses warnings about invalid option of non-C++ code - ], }, { 'target_name': 'libwebp', -- cgit v1.2.3 From 2341c09900540c5401d018e1ea8405fb637b2dc0 Mon Sep 17 00:00:00 2001 From: "scroggo@google.com" Date: Mon, 20 May 2013 22:15:32 +0000 Subject: Add a comment to the top of images.gyp. Tells vi to color it properly. Review URL: https://codereview.chromium.org/15502002 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@9203 2bbb7eff-a529-9590-31e7-b0007b416f81 --- images.gyp | 1 + 1 file changed, 1 insertion(+) diff --git a/images.gyp b/images.gyp index 03bae3e..d63a594 100644 --- a/images.gyp +++ b/images.gyp @@ -1,3 +1,4 @@ +# GYP file for images project. { 'targets': [ { -- cgit v1.2.3 From c2d2beac89d591d665a6168aeaa826689fa0f3fe Mon Sep 17 00:00:00 2001 From: "commit-bot@chromium.org" Date: Mon, 20 May 2013 23:57:38 +0000 Subject: Move SkImage::encode to SkImage_Codec.cpp. Chrome depends on SkImage.cpp, but does not include SkImageDecoder, so having SkImage::encode in SkImage.cpp breaks chromium. Temporarily fix the problem by moving the implementation into SkImage_Codec.cpp. The larger fix will be to solve https://code.google.com/p/skia/issues/detail?id=1275 R=reed@google.com, robertphillips@google.com Author: scroggo@google.com Review URL: https://chromiumcodereview.appspot.com/15314004 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@9204 2bbb7eff-a529-9590-31e7-b0007b416f81 --- tools.gyp | 1 + 1 file changed, 1 insertion(+) diff --git a/tools.gyp b/tools.gyp index aa27b45..1fe564e 100644 --- a/tools.gyp +++ b/tools.gyp @@ -65,6 +65,7 @@ 'type': 'executable', 'sources': [ '../tools/skhello.cpp', + '../src/image/SkImage_Codec.cpp', ], 'dependencies': [ 'skia_base_libs.gyp:skia_base_libs', -- cgit v1.2.3 From f26b2f501c8aa449ada62e9ee12ae5f621142ecd Mon Sep 17 00:00:00 2001 From: "djsollen@google.com" Date: Tue, 21 May 2013 16:53:50 +0000 Subject: Add a fontConfig interface for android. The contents of this CL are based on the SkFontHost_android.cpp found in the android repository. BUG= R=reed@google.com Review URL: https://codereview.chromium.org/14731025 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@9219 2bbb7eff-a529-9590-31e7-b0007b416f81 --- ports.gyp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/ports.gyp b/ports.gyp index 6a99268..abbe16b 100644 --- a/ports.gyp +++ b/ports.gyp @@ -162,12 +162,13 @@ '../src/ports/SkPurgeableMemoryBlock_none.cpp', ], 'sources': [ - '../src/ports/FontHostConfiguration_android.cpp', '../src/ports/SkDebug_android.cpp', '../src/ports/SkThread_pthread.cpp', - '../src/ports/SkFontHost_android.cpp', + '../src/ports/SkFontConfigInterface_android.cpp', + '../src/ports/SkFontConfigParser_android.cpp', '../src/ports/SkFontHost_FreeType.cpp', '../src/ports/SkFontHost_FreeType_common.cpp', + '../src/ports/SkFontHost_fontconfig.cpp', '../src/ports/SkPurgeableMemoryBlock_android.cpp', ], 'dependencies': [ -- cgit v1.2.3 From 3ced8c95deb96f17eacd6a1a411151b642fbe6b3 Mon Sep 17 00:00:00 2001 From: "reed@google.com" Date: Tue, 21 May 2013 21:33:11 +0000 Subject: add SkLerpXfermode BUG= R=bsalomon@google.com Review URL: https://codereview.chromium.org/15602003 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@9229 2bbb7eff-a529-9590-31e7-b0007b416f81 --- effects.gypi | 2 ++ gmslides.gypi | 1 + 2 files changed, 3 insertions(+) diff --git a/effects.gypi b/effects.gypi index 3eb0d95..1730ffc 100644 --- a/effects.gypi +++ b/effects.gypi @@ -34,6 +34,7 @@ '<(skia_src_path)/effects/SkKernel33MaskFilter.cpp', '<(skia_src_path)/effects/SkLayerDrawLooper.cpp', '<(skia_src_path)/effects/SkLayerRasterizer.cpp', + '<(skia_src_path)/effects/SkLerpXfermode.cpp', '<(skia_src_path)/effects/SkLightingImageFilter.cpp', '<(skia_src_path)/effects/SkMatrixConvolutionImageFilter.cpp', '<(skia_src_path)/effects/SkMergeImageFilter.cpp', @@ -91,6 +92,7 @@ '<(skia_include_path)/effects/SkKernel33MaskFilter.h', '<(skia_include_path)/effects/SkLayerDrawLooper.h', '<(skia_include_path)/effects/SkLayerRasterizer.h', + '<(skia_include_path)/effects/SkLerpXfermode.h', '<(skia_include_path)/effects/SkLightingImageFilter.h', '<(skia_include_path)/effects/SkOffsetImageFilter.h', '<(skia_include_path)/effects/SkMorphologyImageFilter.h', diff --git a/gmslides.gypi b/gmslides.gypi index 96c252d..d07820d 100644 --- a/gmslides.gypi +++ b/gmslides.gypi @@ -49,6 +49,7 @@ '../gm/hittestpath.cpp', '../gm/imageblur.cpp', '../gm/imagemagnifier.cpp', + '../gm/lerpmode.cpp', '../gm/lighting.cpp', '../src/image/SkImage_Codec.cpp', '../gm/image.cpp', -- cgit v1.2.3 From 9b3ebfd8eb523f5cff6017dbf75cd819e98856eb Mon Sep 17 00:00:00 2001 From: "reed@google.com" Date: Tue, 21 May 2013 21:52:03 +0000 Subject: disable lerpmode gm until we fix serialization BUG= Review URL: https://codereview.chromium.org/15462004 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@9230 2bbb7eff-a529-9590-31e7-b0007b416f81 --- gmslides.gypi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gmslides.gypi b/gmslides.gypi index d07820d..860c2f5 100644 --- a/gmslides.gypi +++ b/gmslides.gypi @@ -49,7 +49,7 @@ '../gm/hittestpath.cpp', '../gm/imageblur.cpp', '../gm/imagemagnifier.cpp', - '../gm/lerpmode.cpp', +# '../gm/lerpmode.cpp', '../gm/lighting.cpp', '../src/image/SkImage_Codec.cpp', '../gm/image.cpp', -- cgit v1.2.3 From a2ca61cd592b2032e951b411bad96f0493696efa Mon Sep 17 00:00:00 2001 From: "commit-bot@chromium.org" Date: Wed, 22 May 2013 12:35:50 +0000 Subject: Add methods to SkLayerDrawLooper to allow adding layers on top as well as on the bottom. This is more convenient for some callers who generate layers from a data structure in bottom-to-top, rather than top-to-bottom, order. BUG=242529 R=tomhudson@chromium.org Author: jbroman@chromium.org Review URL: https://chromiumcodereview.appspot.com/15314003 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@9233 2bbb7eff-a529-9590-31e7-b0007b416f81 --- tests.gyp | 1 + 1 file changed, 1 insertion(+) diff --git a/tests.gyp b/tests.gyp index 8e82d1b..a15671d 100644 --- a/tests.gyp +++ b/tests.gyp @@ -68,6 +68,7 @@ '../tests/HashCacheTest.cpp', '../tests/InfRectTest.cpp', '../tests/LListTest.cpp', + '../tests/LayerDrawLooperTest.cpp', '../tests/MD5Test.cpp', '../tests/MathTest.cpp', '../tests/MatrixTest.cpp', -- cgit v1.2.3 From e9e0aa88c751c62894f2a5e23b0878b3b149cf95 Mon Sep 17 00:00:00 2001 From: "reed@google.com" Date: Wed, 22 May 2013 13:21:32 +0000 Subject: reenable lerpmode in gms, now that I think we fixed the global-initialization BUG= Review URL: https://codereview.chromium.org/15737004 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@9234 2bbb7eff-a529-9590-31e7-b0007b416f81 --- gmslides.gypi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gmslides.gypi b/gmslides.gypi index 860c2f5..d07820d 100644 --- a/gmslides.gypi +++ b/gmslides.gypi @@ -49,7 +49,7 @@ '../gm/hittestpath.cpp', '../gm/imageblur.cpp', '../gm/imagemagnifier.cpp', -# '../gm/lerpmode.cpp', + '../gm/lerpmode.cpp', '../gm/lighting.cpp', '../src/image/SkImage_Codec.cpp', '../gm/image.cpp', -- cgit v1.2.3 From f4dc5e93c7dc1b65db440eaa47eae266f8b59cf6 Mon Sep 17 00:00:00 2001 From: "reed@google.com" Date: Wed, 22 May 2013 15:13:18 +0000 Subject: add dumpops.lua as a sample scraper that just dumps the arguments add SkLua.h for common utilities BUG= R=rmistry@google.com Review URL: https://codereview.chromium.org/15737010 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@9242 2bbb7eff-a529-9590-31e7-b0007b416f81 --- tools.gyp | 1 + 1 file changed, 1 insertion(+) diff --git a/tools.gyp b/tools.gyp index 1fe564e..7e0a03b 100644 --- a/tools.gyp +++ b/tools.gyp @@ -100,6 +100,7 @@ 'sources': [ '../tools/lua/lua_pictures.cpp', '../src/utils/SkLuaCanvas.cpp', + '../src/utils/SkLua.cpp', ], 'dependencies': [ 'skia_base_libs.gyp:skia_base_libs', -- cgit v1.2.3 From 0866a9ec58355fc3686aaebac862cbbdb72870b8 Mon Sep 17 00:00:00 2001 From: "reed@google.com" Date: Wed, 22 May 2013 20:12:50 +0000 Subject: expand SkLua to handle creation of its own State add lua sample BUG= R=robertphillips@google.com Review URL: https://codereview.chromium.org/15742009 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@9247 2bbb7eff-a529-9590-31e7-b0007b416f81 --- SampleApp.gyp | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/SampleApp.gyp b/SampleApp.gyp index a240f32..5531605 100644 --- a/SampleApp.gyp +++ b/SampleApp.gyp @@ -76,6 +76,7 @@ '../samplecode/SampleLayers.cpp', '../samplecode/SampleLCD.cpp', '../samplecode/SampleLines.cpp', + '../samplecode/SampleLua.cpp', '../samplecode/SampleManyRects.cpp', '../samplecode/SampleMeasure.cpp', '../samplecode/SampleMipMap.cpp', @@ -129,6 +130,10 @@ # TiledPipeController '../src/pipe/utils/SamplePipeControllers.h', '../src/pipe/utils/SamplePipeControllers.cpp', + + # Lua + '../src/utils/SkLuaCanvas.cpp', + '../src/utils/SkLua.cpp', ], 'sources!': [ '../samplecode/SampleSkLayer.cpp', #relies on SkMatrix44 which doesn't compile @@ -146,6 +151,7 @@ 'experimental.gyp:experimental', 'pdf.gyp:pdf', 'views_animated.gyp:views_animated', + 'lua.gyp:lua', ], 'conditions' : [ [ 'skia_os in ["linux", "freebsd", "openbsd", "solaris"]', { -- cgit v1.2.3 From 2e8fdc6881352fb58c236dcbe13c4dcbe6298687 Mon Sep 17 00:00:00 2001 From: "reed@google.com" Date: Thu, 23 May 2013 20:11:56 +0000 Subject: clone of https://codereview.chromium.org/15316014/ with teaks BUG= Review URL: https://codereview.chromium.org/15904005 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@9264 2bbb7eff-a529-9590-31e7-b0007b416f81 --- core.gypi | 1 + 1 file changed, 1 insertion(+) diff --git a/core.gypi b/core.gypi index 1c31e19..0a2de91 100644 --- a/core.gypi +++ b/core.gypi @@ -27,6 +27,7 @@ '<(skia_src_path)/core/SkBitmapProcShader.h', '<(skia_src_path)/core/SkBitmapProcState.cpp', '<(skia_src_path)/core/SkBitmapProcState.h', + '<(skia_src_path)/core/SkBitmapProcBicubic.cpp', '<(skia_src_path)/core/SkBitmapProcState_matrix.h', '<(skia_src_path)/core/SkBitmapProcState_matrixProcs.cpp', '<(skia_src_path)/core/SkBitmapProcState_sample.h', -- cgit v1.2.3 From 91f87a401a4433ac3b6ad3a8dec520746855e568 Mon Sep 17 00:00:00 2001 From: "commit-bot@chromium.org" Date: Fri, 24 May 2013 14:57:53 +0000 Subject: Move SkDrawLooper implementation to its own file. It previously lived in SkPaint.cpp. BUG= R=reed@google.com, tomhudson@chromium.org, jbroman@chromium.org Author: jbroman@chromium.org Review URL: https://chromiumcodereview.appspot.com/15896004 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@9272 2bbb7eff-a529-9590-31e7-b0007b416f81 --- core.gypi | 1 + 1 file changed, 1 insertion(+) diff --git a/core.gypi b/core.gypi index 0a2de91..d472c6d 100644 --- a/core.gypi +++ b/core.gypi @@ -70,6 +70,7 @@ '<(skia_src_path)/core/SkDeviceProfile.cpp', '<(skia_src_path)/core/SkDither.cpp', '<(skia_src_path)/core/SkDraw.cpp', + '<(skia_src_path)/core/SkDrawLooper.cpp', '<(skia_src_path)/core/SkDrawProcs.h', '<(skia_src_path)/core/SkEdgeBuilder.cpp', '<(skia_src_path)/core/SkEdgeClipper.cpp', -- cgit v1.2.3 From a7d761c242956f4670a1d02c13f73c282c12f53b Mon Sep 17 00:00:00 2001 From: "reed@google.com" Date: Fri, 24 May 2013 14:58:44 +0000 Subject: Add flag to gradients to interpolate colors in premul space. Experimental API to encapsulate the shared parameters for all gradients into a struct. BUG= R=bsalomon@google.com Review URL: https://codereview.chromium.org/15893002 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@9273 2bbb7eff-a529-9590-31e7-b0007b416f81 --- gmslides.gypi | 1 + 1 file changed, 1 insertion(+) diff --git a/gmslides.gypi b/gmslides.gypi index d07820d..2cc188a 100644 --- a/gmslides.gypi +++ b/gmslides.gypi @@ -3,6 +3,7 @@ 'sources': [ '../gm/aaclip.cpp', '../gm/aarectmodes.cpp', + '../gm/alphagradients.cpp', '../gm/arithmode.cpp', '../gm/bicubicfilter.cpp', '../gm/bigmatrix.cpp', -- cgit v1.2.3 From f0314174994ef1ba7d2cd96ed25443e6bbd5498c Mon Sep 17 00:00:00 2001 From: "scroggo@google.com" Date: Fri, 24 May 2013 18:12:17 +0000 Subject: Add path utils, plus a test for it. SkOSFile: Added class SkOSPath with functions for modifying strings representing path names. OSPathTest.cpp: Test of the new utilities. factory.cpp: Use SkPathJoin. gmmain and gm_expectations: Use SkOSPath::SkPathJoin instead of a local version. skimage_main.cpp: Use the new location of SkPathJoin and SkBasename. R=epoger@google.com Review URL: https://codereview.chromium.org/15747004 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@9277 2bbb7eff-a529-9590-31e7-b0007b416f81 --- tests.gyp | 1 + 1 file changed, 1 insertion(+) diff --git a/tests.gyp b/tests.gyp index a15671d..10a4ba4 100644 --- a/tests.gyp +++ b/tests.gyp @@ -75,6 +75,7 @@ '../tests/Matrix44Test.cpp', '../tests/MemsetTest.cpp', '../tests/MetaDataTest.cpp', + '../tests/OSPathTest.cpp', '../tests/PackBitsTest.cpp', '../tests/PaintTest.cpp', '../tests/ParsePathTest.cpp', -- cgit v1.2.3 From a35f59e0856f719af2f7a15dfecddb234a9c281e Mon Sep 17 00:00:00 2001 From: "scroggo@google.com" Date: Fri, 24 May 2013 18:28:57 +0000 Subject: Revert "Add path utils, plus a test for it." This reverts commit d172374b46cae0bd5d7c024b9848f5bdafcc6a16. This CL broke on Windows. Review URL: https://codereview.chromium.org/15986004 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@9278 2bbb7eff-a529-9590-31e7-b0007b416f81 --- tests.gyp | 1 - 1 file changed, 1 deletion(-) diff --git a/tests.gyp b/tests.gyp index 10a4ba4..a15671d 100644 --- a/tests.gyp +++ b/tests.gyp @@ -75,7 +75,6 @@ '../tests/Matrix44Test.cpp', '../tests/MemsetTest.cpp', '../tests/MetaDataTest.cpp', - '../tests/OSPathTest.cpp', '../tests/PackBitsTest.cpp', '../tests/PaintTest.cpp', '../tests/ParsePathTest.cpp', -- cgit v1.2.3 From 379e9931ddfaf9aed47fc765027476f9202c6d51 Mon Sep 17 00:00:00 2001 From: "commit-bot@chromium.org" Date: Fri, 24 May 2013 18:51:55 +0000 Subject: Fix degenerate and near-degenerate hairlines on the gpu R=robertphillips@google.com, bsalomon@google.com Author: bsalomon@google.com Review URL: https://chromiumcodereview.appspot.com/16035002 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@9279 2bbb7eff-a529-9590-31e7-b0007b416f81 --- gmslides.gypi | 1 + 1 file changed, 1 insertion(+) diff --git a/gmslides.gypi b/gmslides.gypi index 2cc188a..607fc37 100644 --- a/gmslides.gypi +++ b/gmslides.gypi @@ -46,6 +46,7 @@ '../gm/giantbitmap.cpp', '../gm/gradients.cpp', '../gm/gradtext.cpp', + '../gm/hairlines.cpp', '../gm/hairmodes.cpp', '../gm/hittestpath.cpp', '../gm/imageblur.cpp', -- cgit v1.2.3 From d5c3a21aa3bf31a848ab62b643d64bdc3c33264c Mon Sep 17 00:00:00 2001 From: "reed@google.com" Date: Tue, 28 May 2013 15:29:25 +0000 Subject: add new gm for bicubic filtering BUG= Review URL: https://codereview.chromium.org/16123003 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@9291 2bbb7eff-a529-9590-31e7-b0007b416f81 --- gmslides.gypi | 1 + 1 file changed, 1 insertion(+) diff --git a/gmslides.gypi b/gmslides.gypi index 607fc37..b37154c 100644 --- a/gmslides.gypi +++ b/gmslides.gypi @@ -39,6 +39,7 @@ '../gm/factory.cpp', '../gm/filltypes.cpp', '../gm/filltypespersp.cpp', + '../gm/filterbitmap.cpp', '../gm/fontmgr.cpp', '../gm/fontscaler.cpp', '../gm/gammatext.cpp', -- cgit v1.2.3 From 0e33c150a1342a6e9891a22d0b0ec6ca07b86705 Mon Sep 17 00:00:00 2001 From: "scroggo@google.com" Date: Tue, 28 May 2013 16:45:07 +0000 Subject: Reland 'Add path utils, plus a test for it.' Build SkPathJoin and SkBasename on windows also. Previous CL did not build on Windows because the two functions were accidentally placed inside an ifdef that did not include windows. Move the functions to the top of the file, and add a comment by the endif for clarity. Previously reviewed at https://codereview.chromium.org/15747004/ Review URL: https://codereview.chromium.org/15740024 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@9295 2bbb7eff-a529-9590-31e7-b0007b416f81 --- tests.gyp | 1 + 1 file changed, 1 insertion(+) diff --git a/tests.gyp b/tests.gyp index a15671d..10a4ba4 100644 --- a/tests.gyp +++ b/tests.gyp @@ -75,6 +75,7 @@ '../tests/Matrix44Test.cpp', '../tests/MemsetTest.cpp', '../tests/MetaDataTest.cpp', + '../tests/OSPathTest.cpp', '../tests/PackBitsTest.cpp', '../tests/PaintTest.cpp', '../tests/ParsePathTest.cpp', -- cgit v1.2.3 From 865b67b056074bededd58f61f7a8c1c0846f1d53 Mon Sep 17 00:00:00 2001 From: "bungeman@google.com" Date: Wed, 29 May 2013 13:43:31 +0000 Subject: Change SkStream. https://codereview.chromium.org/15298009/ git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@9312 2bbb7eff-a529-9590-31e7-b0007b416f81 --- core.gypi | 1 - ports.gyp | 4 ++++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/core.gypi b/core.gypi index d472c6d..ab73ede 100644 --- a/core.gypi +++ b/core.gypi @@ -78,7 +78,6 @@ '<(skia_src_path)/core/SkEdge.h', '<(skia_src_path)/core/SkError.cpp', '<(skia_src_path)/core/SkErrorInternals.h', - '<(skia_src_path)/core/SkFDStream.cpp', '<(skia_src_path)/core/SkFP.h', '<(skia_src_path)/core/SkFilterProc.cpp', '<(skia_src_path)/core/SkFilterProc.h', diff --git a/ports.gyp b/ports.gyp index abbe16b..fc9bb9b 100644 --- a/ports.gyp +++ b/ports.gyp @@ -31,7 +31,9 @@ '../src/ports/SkThread_win.cpp', '../src/ports/SkMemory_malloc.cpp', + '../src/ports/SkOSFile_posix.cpp', '../src/ports/SkOSFile_stdio.cpp', + '../src/ports/SkOSFile_win.cpp', '../src/ports/SkTime_Unix.cpp', '../src/ports/SkTime_win.cpp', '../src/ports/SkXMLParser_empty.cpp', @@ -140,12 +142,14 @@ 'sources!': [ # these are used everywhere but windows '../src/ports/SkDebug_stdio.cpp', '../src/ports/SkTime_Unix.cpp', + '../src/ports/SkOSFile_posix.cpp', ], }, { # else !win 'sources!': [ '../src/ports/SkDebug_win.cpp', '../src/ports/SkFontHost_win.cpp', '../src/ports/SkFontHost_win_dw.cpp', + '../src/ports/SkOSFile_win.cpp', '../src/ports/SkThread_win.cpp', '../src/ports/SkTime_win.cpp', ], -- cgit v1.2.3 From 3702c9f62f983e8c1163a0ff656754bbeb3a56dc Mon Sep 17 00:00:00 2001 From: "scroggo@google.com" Date: Fri, 31 May 2013 14:00:10 +0000 Subject: Separate core and images project. SkImage calls functions on SkImageDecoder and SkImageEncoder. This is desired behavior, and it is also desired to include SkImage as a part of core. In order to keep core from depending on images, update SkImageDecoder_empty.cpp to implement all of SkImageDecoder and SkImageEncoder. This file will be built by chrome (in https://codereview.chromium.org/15960015). Move force_linking from SkImageDecoder.cpp to its own file. It must be called to force linking with the image decoders if desired. Call the function in tools that need it: sk_image render_pictures render_pdfs sk_hello filter bench_pictures debugger SkImageDecoder: Derive from SkNoncopyable, instead of duplicating its hiding of constructors. skhello: Return rather than trying to write a null SkData to the stream. Revert "Hamfistedly removed core dependence on images" (commit 0f05f682a90bc125323677abf3476e1027d174f5) and "Move SkImage::encode to SkImage_Codec.cpp." (commit 83e47a954d0bf65439f3d9c0c93213063dd70da3.) These two commits were temporary fixes that this change cleans up. SkSnapshot.cpp: Check for a NULL encoder returned by SkImageEncoder::Create. BUG=https://code.google.com/p/skia/issues/detail?id=1275 R=djsollen@google.com, robertphillips@google.com Review URL: https://codereview.chromium.org/15806010 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@9364 2bbb7eff-a529-9590-31e7-b0007b416f81 --- core.gypi | 4 +++- gmslides.gypi | 1 - images.gyp | 6 +++--- tools.gyp | 1 - 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/core.gypi b/core.gypi index ab73ede..534c888 100644 --- a/core.gypi +++ b/core.gypi @@ -189,7 +189,7 @@ '<(skia_src_path)/image/SkDataPixelRef.cpp', '<(skia_src_path)/image/SkImage.cpp', '<(skia_src_path)/image/SkImagePriv.cpp', -# '<(skia_src_path)/image/SkImage_Codec.cpp', + '<(skia_src_path)/image/SkImage_Codec.cpp', # '<(skia_src_path)/image/SkImage_Gpu.cpp', '<(skia_src_path)/image/SkImage_Picture.cpp', '<(skia_src_path)/image/SkImage_Raster.cpp', @@ -232,6 +232,8 @@ '<(skia_include_path)/core/SkFontHost.h', '<(skia_include_path)/core/SkGeometry.h', '<(skia_include_path)/core/SkGraphics.h', + '<(skia_include_path)/core/SkImageDecoder.h', + '<(skia_include_path)/core/SkImageEncoder.h', '<(skia_include_path)/core/SkImageFilter.h', '<(skia_include_path)/core/SkImageFilterUtils.h', '<(skia_include_path)/core/SkInstCnt.h', diff --git a/gmslides.gypi b/gmslides.gypi index b37154c..ca833a5 100644 --- a/gmslides.gypi +++ b/gmslides.gypi @@ -54,7 +54,6 @@ '../gm/imagemagnifier.cpp', '../gm/lerpmode.cpp', '../gm/lighting.cpp', - '../src/image/SkImage_Codec.cpp', '../gm/image.cpp', '../gm/imagefiltersbase.cpp', '../gm/imagefiltersgraph.cpp', diff --git a/images.gyp b/images.gyp index d63a594..44f944c 100644 --- a/images.gyp +++ b/images.gyp @@ -25,8 +25,7 @@ '../src/image/', ], 'sources': [ - '../include/images/SkImageDecoder.h', - '../include/images/SkImageEncoder.h', + '../include/images/SkForceLinking.h', '../include/images/SkImageRef.h', '../include/images/SkImageRef_GlobalPool.h', '../src/images/SkJpegUtility.h', @@ -38,11 +37,12 @@ '../src/images/SkBitmapRegionDecoder.cpp', + '../src/images/SkForceLinking.cpp', '../src/images/SkImageDecoder.cpp', '../src/images/SkImageDecoder_FactoryDefault.cpp', '../src/images/SkImageDecoder_FactoryRegistrar.cpp', # If decoders are added/removed to/from (all/individual) - # platform(s), be sure to update SkImageDecoder.cpp:force_linking + # platform(s), be sure to update SkForceLinking.cpp # so the right decoders will be forced to link. '../src/images/SkImageDecoder_libbmp.cpp', '../src/images/SkImageDecoder_libgif.cpp', diff --git a/tools.gyp b/tools.gyp index 7e0a03b..ede028a 100644 --- a/tools.gyp +++ b/tools.gyp @@ -65,7 +65,6 @@ 'type': 'executable', 'sources': [ '../tools/skhello.cpp', - '../src/image/SkImage_Codec.cpp', ], 'dependencies': [ 'skia_base_libs.gyp:skia_base_libs', -- cgit v1.2.3 From ba078211e42390d1489440d5c2f77abe6a639601 Mon Sep 17 00:00:00 2001 From: "senorblanco@chromium.org" Date: Fri, 31 May 2013 17:49:12 +0000 Subject: Implement SkXfermode image filter. This required changing the signature of SkXfermode::asNewEffectOrCoeffs(), to add an optional background texture. For the raster path, we do a straightforward 2-pass method: draw background, then composite the foreground over it. For the GPU path, if the xfermode can be expressed as an effect, we build an effect with the background texture incorporated, then do a single-pass draw fetching both foreground and background textures, and compositing to the result. If the xfermode is expressed as src/dst coefficients, we do a 2-pass draw as in the raster path and use fixed-function blending. R=bsalomon@google.com, reed@google.com Review URL: https://codereview.chromium.org/16125008 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@9373 2bbb7eff-a529-9590-31e7-b0007b416f81 --- effects.gypi | 8 +++++--- gmslides.gypi | 1 + 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/effects.gypi b/effects.gypi index 1730ffc..36638eb 100644 --- a/effects.gypi +++ b/effects.gypi @@ -9,8 +9,8 @@ 'sources': [ '<(skia_src_path)/effects/Sk1DPathEffect.cpp', '<(skia_src_path)/effects/Sk2DPathEffect.cpp', - '<(skia_src_path)/effects/SkAvoidXfermode.cpp', '<(skia_src_path)/effects/SkArithmeticMode.cpp', + '<(skia_src_path)/effects/SkAvoidXfermode.cpp', '<(skia_src_path)/effects/SkBicubicImageFilter.cpp', '<(skia_src_path)/effects/SkBitmapSource.cpp', '<(skia_src_path)/effects/SkBlendImageFilter.cpp', @@ -36,6 +36,7 @@ '<(skia_src_path)/effects/SkLayerRasterizer.cpp', '<(skia_src_path)/effects/SkLerpXfermode.cpp', '<(skia_src_path)/effects/SkLightingImageFilter.cpp', + '<(skia_src_path)/effects/SkMagnifierImageFilter.cpp', '<(skia_src_path)/effects/SkMatrixConvolutionImageFilter.cpp', '<(skia_src_path)/effects/SkMergeImageFilter.cpp', '<(skia_src_path)/effects/SkMorphologyImageFilter.cpp', @@ -50,7 +51,7 @@ '<(skia_src_path)/effects/SkTableMaskFilter.cpp', '<(skia_src_path)/effects/SkTestImageFilters.cpp', '<(skia_src_path)/effects/SkTransparentShader.cpp', - '<(skia_src_path)/effects/SkMagnifierImageFilter.cpp', + '<(skia_src_path)/effects/SkXfermodeImageFilter.cpp', '<(skia_src_path)/effects/gradients/SkBitmapCache.cpp', '<(skia_src_path)/effects/gradients/SkBitmapCache.h', @@ -72,8 +73,9 @@ '<(skia_include_path)/effects/Sk1DPathEffect.h', '<(skia_include_path)/effects/Sk2DPathEffect.h', - '<(skia_include_path)/effects/SkAvoidXfermode.h', + '<(skia_include_path)/effects/SkXfermodeImageFilter.h', '<(skia_include_path)/effects/SkArithmeticMode.h', + '<(skia_include_path)/effects/SkAvoidXfermode.h', '<(skia_include_path)/effects/SkBitmapSource.h', '<(skia_include_path)/effects/SkBlendImageFilter.h', '<(skia_include_path)/effects/SkBlurDrawLooper.h', diff --git a/gmslides.gypi b/gmslides.gypi index ca833a5..e56d62b 100644 --- a/gmslides.gypi +++ b/gmslides.gypi @@ -109,6 +109,7 @@ '../gm/verttext.cpp', '../gm/verttext2.cpp', '../gm/verylargebitmap.cpp', + '../gm/xfermodeimagefilter.cpp', '../gm/xfermodes.cpp', '../gm/xfermodes2.cpp', ], -- cgit v1.2.3 From 81adca913fa0ea905d997c8d18fbc9528dde1655 Mon Sep 17 00:00:00 2001 From: "djsollen@google.com" Date: Fri, 31 May 2013 20:02:56 +0000 Subject: prepare skia for shared library build on android R=borenet@google.com, djsollen@google.com Review URL: https://codereview.chromium.org/15855006 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@9378 2bbb7eff-a529-9590-31e7-b0007b416f81 --- FileReaderApp.gyp | 3 +-- SampleApp.gyp | 4 +-- SimpleCocoaApp.gyp | 2 +- SimpleiOSApp.gyp | 4 +-- bench.gyp | 6 ++--- common.gypi | 9 +++++++ common_conditions.gypi | 11 ++++++++ common_variables.gypi | 2 ++ core.gyp | 8 +++--- debugger.gyp | 7 +---- effects.gyp | 7 ++--- flags.gyp | 3 +-- gm.gyp | 7 ++--- most.gyp | 2 +- nacl.gyp | 2 +- pathops_unittest.gyp | 5 +--- pdf.gyp | 2 +- pixman_test.gyp | 4 +-- ports.gyp | 9 +++---- sfnt.gyp | 5 ++-- shapeops_demo.gyp | 4 +-- shapeops_edge.gyp | 4 +-- shapeops_tool.gyp | 10 +------ skia_base_libs.gyp | 52 ------------------------------------ skia_lib.gyp | 72 ++++++++++++++++++++++++++++++++++++++++++++++++++ tests.gyp | 6 +---- tools.gyp | 47 +++++++++----------------------- xps.gyp | 3 +-- 28 files changed, 141 insertions(+), 159 deletions(-) delete mode 100644 skia_base_libs.gyp create mode 100644 skia_lib.gyp diff --git a/FileReaderApp.gyp b/FileReaderApp.gyp index bcd0f0d..f590ffe 100644 --- a/FileReaderApp.gyp +++ b/FileReaderApp.gyp @@ -18,8 +18,7 @@ '../src/utils/mac/SkOSWindow_Mac.cpp', ], 'dependencies': [ - 'skia_base_libs.gyp:skia_base_libs', - 'effects.gyp:effects', + 'skia_lib.gyp:skia_lib', 'views.gyp:views', 'xml.gyp:xml', ], diff --git a/SampleApp.gyp b/SampleApp.gyp index 5531605..59d2f84 100644 --- a/SampleApp.gyp +++ b/SampleApp.gyp @@ -142,9 +142,7 @@ '../samplecode/SampleFontCache.cpp', ], 'dependencies': [ - 'skia_base_libs.gyp:skia_base_libs', - 'effects.gyp:effects', - 'images.gyp:images', + 'skia_lib.gyp:skia_lib', 'views.gyp:views', 'animator.gyp:animator', 'xml.gyp:xml', diff --git a/SimpleCocoaApp.gyp b/SimpleCocoaApp.gyp index 3e17ad5..6d7b925 100644 --- a/SimpleCocoaApp.gyp +++ b/SimpleCocoaApp.gyp @@ -25,7 +25,7 @@ ], 'dependencies': [ - 'skia_base_libs.gyp:skia_base_libs', + 'skia_lib.gyp:skia_lib', 'views.gyp:views', 'xml.gyp:xml', ], diff --git a/SimpleiOSApp.gyp b/SimpleiOSApp.gyp index 3678e7c..cb00f81 100644 --- a/SimpleiOSApp.gyp +++ b/SimpleiOSApp.gyp @@ -28,9 +28,7 @@ '../experimental/SimpleiOSApp/SimpleiOSApp-Info.plist', ], 'dependencies': [ - 'skia_base_libs.gyp:skia_base_libs', - 'effects.gyp:effects', - 'images.gyp:images', + 'skia_lib.gyp:skia_lib', 'views.gyp:views', 'xml.gyp:xml', ], diff --git a/bench.gyp b/bench.gyp index be768f0..49e6c2c 100644 --- a/bench.gyp +++ b/bench.gyp @@ -17,9 +17,7 @@ 'bench.gypi' ], 'dependencies': [ - 'skia_base_libs.gyp:skia_base_libs', - 'effects.gyp:effects', - 'images.gyp:images', + 'skia_lib.gyp:skia_lib', 'bench_timer', ], 'conditions': [ @@ -50,7 +48,7 @@ '../src/gpu', ], 'dependencies': [ - 'skia_base_libs.gyp:skia_base_libs', + 'skia_lib.gyp:skia_lib', ], 'conditions': [ [ 'skia_os not in ["mac", "ios"]', { diff --git a/common.gypi b/common.gypi index d3e1498..2be8bb8 100644 --- a/common.gypi +++ b/common.gypi @@ -39,6 +39,15 @@ }], ], }, + # Validate the 'skia_os' setting against 'skia_shared_lib', because shared + # library build is only supported on Android. + 'variables': { + 'conditions': [ + [ 'skia_os != "android" and skia_shared_lib', { + 'error': ' Date: Fri, 31 May 2013 20:09:47 +0000 Subject: prepare skia for shared library build on android R=borenet@google.com, djsollen@google.com Committed: https://code.google.com/p/skia/source/detail?r=9378 Review URL: https://codereview.chromium.org/15855006 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@9379 2bbb7eff-a529-9590-31e7-b0007b416f81 --- FileReaderApp.gyp | 3 ++- SampleApp.gyp | 4 ++- SimpleCocoaApp.gyp | 2 +- SimpleiOSApp.gyp | 4 ++- bench.gyp | 6 +++-- common.gypi | 9 ------- common_conditions.gypi | 11 -------- common_variables.gypi | 2 -- core.gyp | 8 +++--- debugger.gyp | 7 ++++- effects.gyp | 7 +++-- flags.gyp | 3 ++- gm.gyp | 7 +++-- most.gyp | 2 +- nacl.gyp | 2 +- pathops_unittest.gyp | 5 +++- pdf.gyp | 2 +- pixman_test.gyp | 4 ++- ports.gyp | 9 ++++--- sfnt.gyp | 5 ++-- shapeops_demo.gyp | 4 ++- shapeops_edge.gyp | 4 ++- shapeops_tool.gyp | 10 ++++++- skia_base_libs.gyp | 52 ++++++++++++++++++++++++++++++++++++ skia_lib.gyp | 72 -------------------------------------------------- tests.gyp | 6 ++++- tools.gyp | 47 +++++++++++++++++++++++--------- xps.gyp | 3 ++- 28 files changed, 159 insertions(+), 141 deletions(-) create mode 100644 skia_base_libs.gyp delete mode 100644 skia_lib.gyp diff --git a/FileReaderApp.gyp b/FileReaderApp.gyp index f590ffe..bcd0f0d 100644 --- a/FileReaderApp.gyp +++ b/FileReaderApp.gyp @@ -18,7 +18,8 @@ '../src/utils/mac/SkOSWindow_Mac.cpp', ], 'dependencies': [ - 'skia_lib.gyp:skia_lib', + 'skia_base_libs.gyp:skia_base_libs', + 'effects.gyp:effects', 'views.gyp:views', 'xml.gyp:xml', ], diff --git a/SampleApp.gyp b/SampleApp.gyp index 59d2f84..5531605 100644 --- a/SampleApp.gyp +++ b/SampleApp.gyp @@ -142,7 +142,9 @@ '../samplecode/SampleFontCache.cpp', ], 'dependencies': [ - 'skia_lib.gyp:skia_lib', + 'skia_base_libs.gyp:skia_base_libs', + 'effects.gyp:effects', + 'images.gyp:images', 'views.gyp:views', 'animator.gyp:animator', 'xml.gyp:xml', diff --git a/SimpleCocoaApp.gyp b/SimpleCocoaApp.gyp index 6d7b925..3e17ad5 100644 --- a/SimpleCocoaApp.gyp +++ b/SimpleCocoaApp.gyp @@ -25,7 +25,7 @@ ], 'dependencies': [ - 'skia_lib.gyp:skia_lib', + 'skia_base_libs.gyp:skia_base_libs', 'views.gyp:views', 'xml.gyp:xml', ], diff --git a/SimpleiOSApp.gyp b/SimpleiOSApp.gyp index cb00f81..3678e7c 100644 --- a/SimpleiOSApp.gyp +++ b/SimpleiOSApp.gyp @@ -28,7 +28,9 @@ '../experimental/SimpleiOSApp/SimpleiOSApp-Info.plist', ], 'dependencies': [ - 'skia_lib.gyp:skia_lib', + 'skia_base_libs.gyp:skia_base_libs', + 'effects.gyp:effects', + 'images.gyp:images', 'views.gyp:views', 'xml.gyp:xml', ], diff --git a/bench.gyp b/bench.gyp index 49e6c2c..be768f0 100644 --- a/bench.gyp +++ b/bench.gyp @@ -17,7 +17,9 @@ 'bench.gypi' ], 'dependencies': [ - 'skia_lib.gyp:skia_lib', + 'skia_base_libs.gyp:skia_base_libs', + 'effects.gyp:effects', + 'images.gyp:images', 'bench_timer', ], 'conditions': [ @@ -48,7 +50,7 @@ '../src/gpu', ], 'dependencies': [ - 'skia_lib.gyp:skia_lib', + 'skia_base_libs.gyp:skia_base_libs', ], 'conditions': [ [ 'skia_os not in ["mac", "ios"]', { diff --git a/common.gypi b/common.gypi index 2be8bb8..d3e1498 100644 --- a/common.gypi +++ b/common.gypi @@ -39,15 +39,6 @@ }], ], }, - # Validate the 'skia_os' setting against 'skia_shared_lib', because shared - # library build is only supported on Android. - 'variables': { - 'conditions': [ - [ 'skia_os != "android" and skia_shared_lib', { - 'error': ' Date: Fri, 31 May 2013 20:17:57 +0000 Subject: start a wrapper for color fonts BUG= R=bungeman@google.com Review URL: https://codereview.chromium.org/14890016 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@9381 2bbb7eff-a529-9590-31e7-b0007b416f81 --- gmslides.gypi | 1 + utils.gyp | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/gmslides.gypi b/gmslides.gypi index e56d62b..641e9e0 100644 --- a/gmslides.gypi +++ b/gmslides.gypi @@ -19,6 +19,7 @@ '../gm/circles.cpp', '../gm/colorfilterimagefilter.cpp', '../gm/colormatrix.cpp', + '../gm/colortype.cpp', '../gm/complexclip.cpp', '../gm/complexclip2.cpp', '../gm/composeshader.cpp', diff --git a/utils.gyp b/utils.gyp index a1820c0..0791e19 100644 --- a/utils.gyp +++ b/utils.gyp @@ -111,6 +111,10 @@ '../src/utils/win/SkHRESULT.cpp', '../src/utils/win/SkIStream.cpp', '../src/utils/win/SkWGL_win.cpp', + + #testing + '../src/fonts/SkGScalerContext.cpp', + '../src/fonts/SkGScalerContext.h', ], 'sources!': [ '../src/utils/SDL/SkOSWindow_SDL.cpp', -- cgit v1.2.3 From 5b1e0c76b7153282f902913f3c1aadeb22d2471d Mon Sep 17 00:00:00 2001 From: "skia.committer@gmail.com" Date: Sat, 1 Jun 2013 07:01:39 +0000 Subject: Sanitizing source files in Housekeeper-Nightly git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@9387 2bbb7eff-a529-9590-31e7-b0007b416f81 --- utils.gyp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/utils.gyp b/utils.gyp index 0791e19..ef2a0d8 100644 --- a/utils.gyp +++ b/utils.gyp @@ -111,7 +111,7 @@ '../src/utils/win/SkHRESULT.cpp', '../src/utils/win/SkIStream.cpp', '../src/utils/win/SkWGL_win.cpp', - + #testing '../src/fonts/SkGScalerContext.cpp', '../src/fonts/SkGScalerContext.h', -- cgit v1.2.3 From ecc51327fcebb3be499bd1f17535014007cdf6c4 Mon Sep 17 00:00:00 2001 From: "robertphillips@google.com" Date: Sun, 2 Jun 2013 15:01:06 +0000 Subject: Disable colortype GM due to crash git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@9392 2bbb7eff-a529-9590-31e7-b0007b416f81 --- gmslides.gypi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gmslides.gypi b/gmslides.gypi index 641e9e0..1de9b28 100644 --- a/gmslides.gypi +++ b/gmslides.gypi @@ -19,7 +19,7 @@ '../gm/circles.cpp', '../gm/colorfilterimagefilter.cpp', '../gm/colormatrix.cpp', - '../gm/colortype.cpp', +# '../gm/colortype.cpp', '../gm/complexclip.cpp', '../gm/complexclip2.cpp', '../gm/composeshader.cpp', -- cgit v1.2.3 From 250779685197bce5655ca68982697ff1dec567bf Mon Sep 17 00:00:00 2001 From: "djsollen@google.com" Date: Mon, 3 Jun 2013 12:10:19 +0000 Subject: Prepare skia for shared library build on android This reapplies revision 9378 after the buildbot has been updated. R=borenet@google.com, djsollen@google.com Review URL: https://codereview.chromium.org/15855006 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@9395 2bbb7eff-a529-9590-31e7-b0007b416f81 --- FileReaderApp.gyp | 3 +-- SampleApp.gyp | 4 +-- SimpleCocoaApp.gyp | 2 +- SimpleiOSApp.gyp | 4 +-- bench.gyp | 6 ++--- common.gypi | 9 +++++++ common_conditions.gypi | 11 ++++++++ common_variables.gypi | 2 ++ core.gyp | 8 +++--- debugger.gyp | 7 +---- effects.gyp | 7 ++--- flags.gyp | 3 +-- gm.gyp | 7 ++--- most.gyp | 2 +- nacl.gyp | 2 +- pathops_unittest.gyp | 5 +--- pdf.gyp | 2 +- pixman_test.gyp | 4 +-- ports.gyp | 9 +++---- sfnt.gyp | 5 ++-- shapeops_demo.gyp | 4 +-- shapeops_edge.gyp | 4 +-- shapeops_tool.gyp | 10 +------ skia_base_libs.gyp | 52 ------------------------------------ skia_lib.gyp | 72 ++++++++++++++++++++++++++++++++++++++++++++++++++ tests.gyp | 6 +---- tools.gyp | 47 +++++++++----------------------- xps.gyp | 3 +-- 28 files changed, 141 insertions(+), 159 deletions(-) delete mode 100644 skia_base_libs.gyp create mode 100644 skia_lib.gyp diff --git a/FileReaderApp.gyp b/FileReaderApp.gyp index bcd0f0d..f590ffe 100644 --- a/FileReaderApp.gyp +++ b/FileReaderApp.gyp @@ -18,8 +18,7 @@ '../src/utils/mac/SkOSWindow_Mac.cpp', ], 'dependencies': [ - 'skia_base_libs.gyp:skia_base_libs', - 'effects.gyp:effects', + 'skia_lib.gyp:skia_lib', 'views.gyp:views', 'xml.gyp:xml', ], diff --git a/SampleApp.gyp b/SampleApp.gyp index 5531605..59d2f84 100644 --- a/SampleApp.gyp +++ b/SampleApp.gyp @@ -142,9 +142,7 @@ '../samplecode/SampleFontCache.cpp', ], 'dependencies': [ - 'skia_base_libs.gyp:skia_base_libs', - 'effects.gyp:effects', - 'images.gyp:images', + 'skia_lib.gyp:skia_lib', 'views.gyp:views', 'animator.gyp:animator', 'xml.gyp:xml', diff --git a/SimpleCocoaApp.gyp b/SimpleCocoaApp.gyp index 3e17ad5..6d7b925 100644 --- a/SimpleCocoaApp.gyp +++ b/SimpleCocoaApp.gyp @@ -25,7 +25,7 @@ ], 'dependencies': [ - 'skia_base_libs.gyp:skia_base_libs', + 'skia_lib.gyp:skia_lib', 'views.gyp:views', 'xml.gyp:xml', ], diff --git a/SimpleiOSApp.gyp b/SimpleiOSApp.gyp index 3678e7c..cb00f81 100644 --- a/SimpleiOSApp.gyp +++ b/SimpleiOSApp.gyp @@ -28,9 +28,7 @@ '../experimental/SimpleiOSApp/SimpleiOSApp-Info.plist', ], 'dependencies': [ - 'skia_base_libs.gyp:skia_base_libs', - 'effects.gyp:effects', - 'images.gyp:images', + 'skia_lib.gyp:skia_lib', 'views.gyp:views', 'xml.gyp:xml', ], diff --git a/bench.gyp b/bench.gyp index be768f0..49e6c2c 100644 --- a/bench.gyp +++ b/bench.gyp @@ -17,9 +17,7 @@ 'bench.gypi' ], 'dependencies': [ - 'skia_base_libs.gyp:skia_base_libs', - 'effects.gyp:effects', - 'images.gyp:images', + 'skia_lib.gyp:skia_lib', 'bench_timer', ], 'conditions': [ @@ -50,7 +48,7 @@ '../src/gpu', ], 'dependencies': [ - 'skia_base_libs.gyp:skia_base_libs', + 'skia_lib.gyp:skia_lib', ], 'conditions': [ [ 'skia_os not in ["mac", "ios"]', { diff --git a/common.gypi b/common.gypi index d3e1498..2be8bb8 100644 --- a/common.gypi +++ b/common.gypi @@ -39,6 +39,15 @@ }], ], }, + # Validate the 'skia_os' setting against 'skia_shared_lib', because shared + # library build is only supported on Android. + 'variables': { + 'conditions': [ + [ 'skia_os != "android" and skia_shared_lib', { + 'error': ' Date: Mon, 3 Jun 2013 14:44:52 +0000 Subject: Fix broken include path for directwrite backend R=borenet@google.com Review URL: https://codereview.chromium.org/16325006 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@9400 2bbb7eff-a529-9590-31e7-b0007b416f81 --- ports.gyp | 1 + 1 file changed, 1 insertion(+) diff --git a/ports.gyp b/ports.gyp index 3422b8e..af6229e 100644 --- a/ports.gyp +++ b/ports.gyp @@ -13,6 +13,7 @@ '../include/images', '../include/ports', '../include/utils', + '../include/utils/win', '../include/xml', '../src/core', '../src/lazy', -- cgit v1.2.3 From e94431d47ef9482d55d10e91cd7f3dab149d98f3 Mon Sep 17 00:00:00 2001 From: "djsollen@google.com" Date: Mon, 3 Jun 2013 15:56:44 +0000 Subject: fix gm on android R=borenet@google.com Review URL: https://codereview.chromium.org/15927011 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@9403 2bbb7eff-a529-9590-31e7-b0007b416f81 --- gm.gyp | 3 --- 1 file changed, 3 deletions(-) diff --git a/gm.gyp b/gm.gyp index a8b1533..699dcb7 100644 --- a/gm.gyp +++ b/gm.gyp @@ -17,10 +17,7 @@ ], 'dependencies': [ 'skia_lib.gyp:skia_lib', - 'core.gyp:core', - 'images.gyp:images', 'jsoncpp.gyp:jsoncpp', - 'utils.gyp:utils', ], 'direct_dependent_settings': { 'include_dirs': [ -- cgit v1.2.3 From 015bf542c06cbd8438529e3e78940cc51ac4e7f7 Mon Sep 17 00:00:00 2001 From: "reed@google.com" Date: Mon, 3 Jun 2013 16:54:10 +0000 Subject: add bench for sk_memset16/32 BUG= Review URL: https://codereview.chromium.org/16336009 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@9405 2bbb7eff-a529-9590-31e7-b0007b416f81 --- bench.gypi | 1 + 1 file changed, 1 insertion(+) diff --git a/bench.gypi b/bench.gypi index 7f4772d..9937140 100644 --- a/bench.gypi +++ b/bench.gypi @@ -36,6 +36,7 @@ '../bench/MatrixBench.cpp', '../bench/MatrixConvolutionBench.cpp', '../bench/MemoryBench.cpp', + '../bench/MemsetBench.cpp', '../bench/MergeBench.cpp', '../bench/MorphologyBench.cpp', '../bench/MutexBench.cpp', -- cgit v1.2.3 From 4ccf0fd9006373fa34094a4dd4fe8573cf2ddf96 Mon Sep 17 00:00:00 2001 From: "robertphillips@google.com" Date: Mon, 3 Jun 2013 17:13:25 +0000 Subject: Added megalooper GM https://codereview.chromium.org/16004011/ git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@9409 2bbb7eff-a529-9590-31e7-b0007b416f81 --- gmslides.gypi | 1 + 1 file changed, 1 insertion(+) diff --git a/gmslides.gypi b/gmslides.gypi index 1de9b28..4930245 100644 --- a/gmslides.gypi +++ b/gmslides.gypi @@ -62,6 +62,7 @@ '../gm/lcdtext.cpp', '../gm/linepaths.cpp', '../gm/matrixconvolution.cpp', + '../gm/megalooper.cpp', '../gm/mixedxfermodes.cpp', '../gm/modecolorfilters.cpp', '../gm/morphology.cpp', -- cgit v1.2.3 From 797bb80c40f481c62068c88560827c663b3c0d75 Mon Sep 17 00:00:00 2001 From: "reed@google.com" Date: Mon, 3 Jun 2013 17:49:37 +0000 Subject: reenable colortype gm git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@9413 2bbb7eff-a529-9590-31e7-b0007b416f81 --- gmslides.gypi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gmslides.gypi b/gmslides.gypi index 4930245..c67c2d1 100644 --- a/gmslides.gypi +++ b/gmslides.gypi @@ -19,7 +19,7 @@ '../gm/circles.cpp', '../gm/colorfilterimagefilter.cpp', '../gm/colormatrix.cpp', -# '../gm/colortype.cpp', + '../gm/colortype.cpp', '../gm/complexclip.cpp', '../gm/complexclip2.cpp', '../gm/composeshader.cpp', -- cgit v1.2.3 From e2e4061b6a983c0d90fb43c8a41b8e3db1610501 Mon Sep 17 00:00:00 2001 From: "reed@google.com" Date: Wed, 5 Jun 2013 18:00:30 +0000 Subject: call through to the device from SkDraw BUG= R=robertphillips@google.com Review URL: https://codereview.chromium.org/16378003 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@9449 2bbb7eff-a529-9590-31e7-b0007b416f81 --- gmslides.gypi | 1 + 1 file changed, 1 insertion(+) diff --git a/gmslides.gypi b/gmslides.gypi index c67c2d1..632a275 100644 --- a/gmslides.gypi +++ b/gmslides.gypi @@ -7,6 +7,7 @@ '../gm/arithmode.cpp', '../gm/bicubicfilter.cpp', '../gm/bigmatrix.cpp', + '../gm/bigtext.cpp', '../gm/bitmapcopy.cpp', '../gm/bitmapmatrix.cpp', '../gm/bitmapfilters.cpp', -- cgit v1.2.3 From 12f51902ca80a73806e19dfb94021b05132c90c3 Mon Sep 17 00:00:00 2001 From: "bungeman@google.com" Date: Wed, 5 Jun 2013 18:35:22 +0000 Subject: Update gyp from 1563 to 1643 (take two). Re-land 9445 (reverted 9448), but add back the libs no longer provided by gyp. git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@9450 2bbb7eff-a529-9590-31e7-b0007b416f81 --- common_conditions.gypi | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/common_conditions.gypi b/common_conditions.gypi index 64e7c13..a53de0e 100644 --- a/common_conditions.gypi +++ b/common_conditions.gypi @@ -38,6 +38,20 @@ 'AdditionalDependencies': [ 'OpenGL32.lib', 'usp10.lib', + + # Prior to gyp r1584, the following were included automatically. + 'kernel32.lib', + 'gdi32.lib', + 'winspool.lib', + 'comdlg32.lib', + 'advapi32.lib', + 'shell32.lib', + 'ole32.lib', + 'oleaut32.lib', + 'user32.lib', + 'uuid.lib', + 'odbc32.lib', + 'odbccp32.lib', ], }, }, -- cgit v1.2.3 From cc6ea7d91ef89d5cac3bcf9eb4075e1763b632eb Mon Sep 17 00:00:00 2001 From: "bsalomon@google.com" Date: Thu, 6 Jun 2013 18:34:13 +0000 Subject: Fix ninja/angle build with new gyp rev. git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@9463 2bbb7eff-a529-9590-31e7-b0007b416f81 --- common_conditions.gypi | 1 + 1 file changed, 1 insertion(+) diff --git a/common_conditions.gypi b/common_conditions.gypi index a53de0e..48025af 100644 --- a/common_conditions.gypi +++ b/common_conditions.gypi @@ -52,6 +52,7 @@ 'uuid.lib', 'odbc32.lib', 'odbccp32.lib', + 'DelayImp.lib', ], }, }, -- cgit v1.2.3 From cd95b207d429e89a0ccce36615ebd64c1dfb9ef7 Mon Sep 17 00:00:00 2001 From: "reed@google.com" Date: Fri, 7 Jun 2013 20:30:16 +0000 Subject: SkDocument base for pdf, xps, etc. R=scroggo@google.com Review URL: https://codereview.chromium.org/16660002 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@9476 2bbb7eff-a529-9590-31e7-b0007b416f81 --- core.gypi | 2 ++ pdf.gyp | 2 ++ tools.gyp | 1 + 3 files changed, 5 insertions(+) diff --git a/core.gypi b/core.gypi index 534c888..a88f722 100644 --- a/core.gypi +++ b/core.gypi @@ -186,6 +186,8 @@ '<(skia_src_path)/core/SkWriter32.cpp', '<(skia_src_path)/core/SkXfermode.cpp', + '<(skia_src_path)/doc/SkDocument.cpp', + '<(skia_src_path)/image/SkDataPixelRef.cpp', '<(skia_src_path)/image/SkImage.cpp', '<(skia_src_path)/image/SkImagePriv.cpp', diff --git a/pdf.gyp b/pdf.gyp index 31b48db..f89df93 100644 --- a/pdf.gyp +++ b/pdf.gyp @@ -47,6 +47,8 @@ '../src/pdf/SkPDFUtils.cpp', '../src/pdf/SkPDFUtils.h', '../src/pdf/SkTSet.h', + + '../src/doc/SkDocument_PDF.cpp', ], # This section makes all targets that depend on this target # #define SK_SUPPORT_PDF and have access to the pdf header files. diff --git a/tools.gyp b/tools.gyp index 25aa1db..62bbbd0 100644 --- a/tools.gyp +++ b/tools.gyp @@ -64,6 +64,7 @@ ], 'dependencies': [ 'skia_lib.gyp:skia_lib', + 'pdf.gyp:pdf', 'flags.gyp:flags', ], }, -- cgit v1.2.3 From a9b2cc62e0cb21ae19502b16c9c433fab8e13c81 Mon Sep 17 00:00:00 2001 From: "mike@reedtribe.org" Date: Sat, 8 Jun 2013 16:39:44 +0000 Subject: add pdf lib to lua_pictures to fix linker error Revert "Revert "add document and textAlign support to lua"" This reverts commit f603260d7df6315788af3eadb18db556daf41c13. git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@9482 2bbb7eff-a529-9590-31e7-b0007b416f81 --- tools.gyp | 1 + 1 file changed, 1 insertion(+) diff --git a/tools.gyp b/tools.gyp index 62bbbd0..aeeafef 100644 --- a/tools.gyp +++ b/tools.gyp @@ -101,6 +101,7 @@ 'images.gyp:images', 'tools.gyp:picture_renderer', 'tools.gyp:picture_utils', + 'pdf.gyp:pdf', 'ports.gyp:ports', 'flags.gyp:flags', 'lua.gyp:lua', -- cgit v1.2.3 From 8000ae3089e5e3e9deec833be8e3acf70647feda Mon Sep 17 00:00:00 2001 From: "mike@reedtribe.org" Date: Sun, 9 Jun 2013 01:54:56 +0000 Subject: more paint methods to lua git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@9483 2bbb7eff-a529-9590-31e7-b0007b416f81 --- tools.gyp | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/tools.gyp b/tools.gyp index aeeafef..67ea8b4 100644 --- a/tools.gyp +++ b/tools.gyp @@ -16,6 +16,7 @@ 'bench_pictures', 'filter', 'lua_pictures', + 'lua_app', 'pinspect', 'render_pdfs', 'render_pictures', @@ -86,6 +87,23 @@ 'utils.gyp:utils', ], }, + { + 'target_name': 'lua_app', + 'type': 'executable', + 'sources': [ + '../tools/lua/lua_app.cpp', + '../src/utils/SkLua.cpp', + ], + 'dependencies': [ + 'skia_lib.gyp:skia_lib', + 'effects.gyp:effects', + 'utils.gyp:utils', + 'images.gyp:images', + 'pdf.gyp:pdf', + 'ports.gyp:ports', + 'lua.gyp:lua', + ], + }, { 'target_name': 'lua_pictures', 'type': 'executable', -- cgit v1.2.3 From 2045833406979cfda0b5eda597898e6ef87109b3 Mon Sep 17 00:00:00 2001 From: "djsollen@google.com" Date: Mon, 10 Jun 2013 15:19:33 +0000 Subject: Update DEPS to use only googlesource.com repositories. R=borenet@google.com, scroggo@google.com Review URL: https://codereview.chromium.org/16136013 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@9488 2bbb7eff-a529-9590-31e7-b0007b416f81 --- libjpeg.gyp | 6 ++++ libwebp.gyp | 109 ++++++++++++++++++++++++++++++++++-------------------------- 2 files changed, 67 insertions(+), 48 deletions(-) diff --git a/libjpeg.gyp b/libjpeg.gyp index da2b9de..c365941 100644 --- a/libjpeg.gyp +++ b/libjpeg.gyp @@ -35,6 +35,10 @@ 'target_name': 'libjpeg', 'type': 'static_library', 'sources': [ + # we currently build skia's version of libjpeg-turbo without + # SIMD optimizations for simplicity + '../third_party/externals/libjpeg/jsimd_none.c', + '../third_party/externals/libjpeg/jcapimin.c', '../third_party/externals/libjpeg/jcapistd.c', '../third_party/externals/libjpeg/jccoefct.c', @@ -78,6 +82,7 @@ '../third_party/externals/libjpeg/jidctflt.c', '../third_party/externals/libjpeg/jidctfst.c', '../third_party/externals/libjpeg/jidctint.c', + '../third_party/externals/libjpeg/jidctred.c', '../third_party/externals/libjpeg/jinclude.h', '../third_party/externals/libjpeg/jmemmgr.c', '../third_party/externals/libjpeg/jmemnobs.c', @@ -85,6 +90,7 @@ '../third_party/externals/libjpeg/jmorecfg.h', '../third_party/externals/libjpeg/jpegint.h', '../third_party/externals/libjpeg/jpeglib.h', + '../third_party/externals/libjpeg/jpeglibmangler.h', '../third_party/externals/libjpeg/jquant1.c', '../third_party/externals/libjpeg/jquant2.c', '../third_party/externals/libjpeg/jutils.c', diff --git a/libwebp.gyp b/libwebp.gyp index e20f004..a2f5cfd 100644 --- a/libwebp.gyp +++ b/libwebp.gyp @@ -16,17 +16,27 @@ '../third_party/externals/libwebp', ], 'sources': [ - '../third_party/externals/libwebp/dec/alpha.c', - '../third_party/externals/libwebp/dec/buffer.c', - '../third_party/externals/libwebp/dec/frame.c', - '../third_party/externals/libwebp/dec/idec.c', - '../third_party/externals/libwebp/dec/io.c', - '../third_party/externals/libwebp/dec/layer.c', - '../third_party/externals/libwebp/dec/quant.c', - '../third_party/externals/libwebp/dec/tree.c', - '../third_party/externals/libwebp/dec/vp8.c', - '../third_party/externals/libwebp/dec/vp8l.c', - '../third_party/externals/libwebp/dec/webp.c', + '../third_party/externals/libwebp/src/dec/alpha.c', + '../third_party/externals/libwebp/src/dec/buffer.c', + '../third_party/externals/libwebp/src/dec/frame.c', + '../third_party/externals/libwebp/src/dec/idec.c', + '../third_party/externals/libwebp/src/dec/io.c', + '../third_party/externals/libwebp/src/dec/layer.c', + '../third_party/externals/libwebp/src/dec/quant.c', + '../third_party/externals/libwebp/src/dec/tree.c', + '../third_party/externals/libwebp/src/dec/vp8.c', + '../third_party/externals/libwebp/src/dec/vp8l.c', + '../third_party/externals/libwebp/src/dec/webp.c', + ], + }, + { + 'target_name': 'libwebp_demux', + 'type': 'static_library', + 'include_dirs': [ + '../third_party/externals/libwebp', + ], + 'sources': [ + '../third_party/externals/libwebp/src/demux/demux.c', ], }, { @@ -36,15 +46,15 @@ '../third_party/externals/libwebp', ], 'sources': [ - '../third_party/externals/libwebp/dsp/cpu.c', - '../third_party/externals/libwebp/dsp/dec.c', - '../third_party/externals/libwebp/dsp/dec_sse2.c', - '../third_party/externals/libwebp/dsp/enc.c', - '../third_party/externals/libwebp/dsp/enc_sse2.c', - '../third_party/externals/libwebp/dsp/lossless.c', - '../third_party/externals/libwebp/dsp/upsampling.c', - '../third_party/externals/libwebp/dsp/upsampling_sse2.c', - '../third_party/externals/libwebp/dsp/yuv.c', + '../third_party/externals/libwebp/src/dsp/cpu.c', + '../third_party/externals/libwebp/src/dsp/dec.c', + '../third_party/externals/libwebp/src/dsp/dec_sse2.c', + '../third_party/externals/libwebp/src/dsp/enc.c', + '../third_party/externals/libwebp/src/dsp/enc_sse2.c', + '../third_party/externals/libwebp/src/dsp/lossless.c', + '../third_party/externals/libwebp/src/dsp/upsampling.c', + '../third_party/externals/libwebp/src/dsp/upsampling_sse2.c', + '../third_party/externals/libwebp/src/dsp/yuv.c', ], 'conditions': [ ['skia_os == "android"', { @@ -63,7 +73,7 @@ '../third_party/externals/libwebp', ], 'sources': [ - '../third_party/externals/libwebp/dsp/dec_neon.c', + '../third_party/externals/libwebp/src/dsp/dec_neon.c', ], # behavior similar dsp_neon.c.neon in an Android.mk 'cflags!': [ @@ -82,22 +92,23 @@ '../third_party/externals/libwebp', ], 'sources': [ - '../third_party/externals/libwebp/enc/alpha.c', - '../third_party/externals/libwebp/enc/analysis.c', - '../third_party/externals/libwebp/enc/backward_references.c', - '../third_party/externals/libwebp/enc/config.c', - '../third_party/externals/libwebp/enc/cost.c', - '../third_party/externals/libwebp/enc/filter.c', - '../third_party/externals/libwebp/enc/frame.c', - '../third_party/externals/libwebp/enc/histogram.c', - '../third_party/externals/libwebp/enc/iterator.c', - '../third_party/externals/libwebp/enc/layer.c', - '../third_party/externals/libwebp/enc/picture.c', - '../third_party/externals/libwebp/enc/quant.c', - '../third_party/externals/libwebp/enc/syntax.c', - '../third_party/externals/libwebp/enc/tree.c', - '../third_party/externals/libwebp/enc/vp8l.c', - '../third_party/externals/libwebp/enc/webpenc.c', + '../third_party/externals/libwebp/src/enc/alpha.c', + '../third_party/externals/libwebp/src/enc/analysis.c', + '../third_party/externals/libwebp/src/enc/backward_references.c', + '../third_party/externals/libwebp/src/enc/config.c', + '../third_party/externals/libwebp/src/enc/cost.c', + '../third_party/externals/libwebp/src/enc/filter.c', + '../third_party/externals/libwebp/src/enc/frame.c', + '../third_party/externals/libwebp/src/enc/histogram.c', + '../third_party/externals/libwebp/src/enc/iterator.c', + '../third_party/externals/libwebp/src/enc/layer.c', + '../third_party/externals/libwebp/src/enc/picture.c', + '../third_party/externals/libwebp/src/enc/quant.c', + '../third_party/externals/libwebp/src/enc/syntax.c', + '../third_party/externals/libwebp/src/enc/token.c', + '../third_party/externals/libwebp/src/enc/tree.c', + '../third_party/externals/libwebp/src/enc/vp8l.c', + '../third_party/externals/libwebp/src/enc/webpenc.c', ], }, { @@ -107,16 +118,17 @@ '../third_party/externals/libwebp', ], 'sources': [ - '../third_party/externals/libwebp/utils/bit_reader.c', - '../third_party/externals/libwebp/utils/bit_writer.c', - '../third_party/externals/libwebp/utils/color_cache.c', - '../third_party/externals/libwebp/utils/filters.c', - '../third_party/externals/libwebp/utils/huffman.c', - '../third_party/externals/libwebp/utils/huffman_encode.c', - '../third_party/externals/libwebp/utils/quant_levels.c', - '../third_party/externals/libwebp/utils/rescaler.c', - '../third_party/externals/libwebp/utils/thread.c', - '../third_party/externals/libwebp/utils/utils.c', + '../third_party/externals/libwebp/src/utils/bit_reader.c', + '../third_party/externals/libwebp/src/utils/bit_writer.c', + '../third_party/externals/libwebp/src/utils/color_cache.c', + '../third_party/externals/libwebp/src/utils/filters.c', + '../third_party/externals/libwebp/src/utils/huffman.c', + '../third_party/externals/libwebp/src/utils/huffman_encode.c', + '../third_party/externals/libwebp/src/utils/quant_levels.c', + '../third_party/externals/libwebp/src/utils/quant_levels_dec.c', + '../third_party/externals/libwebp/src/utils/rescaler.c', + '../third_party/externals/libwebp/src/utils/thread.c', + '../third_party/externals/libwebp/src/utils/utils.c', ], }, { @@ -124,6 +136,7 @@ 'type': 'none', 'dependencies' : [ 'libwebp_dec', + 'libwebp_demux', 'libwebp_dsp', 'libwebp_dsp_neon', 'libwebp_enc', @@ -131,7 +144,7 @@ ], 'direct_dependent_settings': { 'include_dirs': [ - '../third_party/externals/libwebp', + '../third_party/externals/libwebp/src', ], }, 'conditions': [ -- cgit v1.2.3 From ccbaca267ba4157b9b1ed72eb5644859d966ea2b Mon Sep 17 00:00:00 2001 From: "djsollen@google.com" Date: Mon, 10 Jun 2013 16:50:18 +0000 Subject: Add 2 missing neon files for the android build R=borenet@google.com Review URL: https://codereview.chromium.org/16404009 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@9490 2bbb7eff-a529-9590-31e7-b0007b416f81 --- libwebp.gyp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libwebp.gyp b/libwebp.gyp index a2f5cfd..4b36fbb 100644 --- a/libwebp.gyp +++ b/libwebp.gyp @@ -74,6 +74,8 @@ ], 'sources': [ '../third_party/externals/libwebp/src/dsp/dec_neon.c', + '../third_party/externals/libwebp/src/dsp/enc_neon.c', + '../third_party/externals/libwebp/src/dsp/upsampling_neon.c', ], # behavior similar dsp_neon.c.neon in an Android.mk 'cflags!': [ -- cgit v1.2.3 From 4672bbd50ba7961f095d700aad10406d964d5b91 Mon Sep 17 00:00:00 2001 From: "edisonn@google.com" Date: Mon, 10 Jun 2013 20:44:45 +0000 Subject: simple podofo and skia based pdf viewer Review URL: https://codereview.chromium.org/16295031 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@9494 2bbb7eff-a529-9590-31e7-b0007b416f81 --- most.gyp | 3 +++ pdfviewer.gyp | 70 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 73 insertions(+) create mode 100644 pdfviewer.gyp diff --git a/most.gyp b/most.gyp index 1ad25ef..c7f0608 100644 --- a/most.gyp +++ b/most.gyp @@ -23,6 +23,9 @@ ['skia_os == "android"', { 'dependencies': [ 'android_system.gyp:SkiaAndroidApp' ], }], + ['skia_os == "linux"', { + 'dependencies': [ 'pdfviewer.gyp:pdfviewer' ], + }], ], }, ], diff --git a/pdfviewer.gyp b/pdfviewer.gyp new file mode 100644 index 0000000..ab84e7f --- /dev/null +++ b/pdfviewer.gyp @@ -0,0 +1,70 @@ +# GYP file to build pdfviewer. +# +# To build on Linux: +# ./gyp_skia pdfviewer.gyp && make pdfviewer +# +{ + 'variables': { + 'skia_warnings_as_errors': 0, + }, + 'includes': [ + 'apptype_console.gypi', + ], + 'targets': [ + { + 'target_name': 'pdfviewer', + 'type': 'executable', + 'cflags': ['-fexceptions'], + 'cflags_cc': ['-fexceptions'], + 'cflags!': [ '-fno-exceptions' ], + 'cflags_cc!': [ '-fno-exceptions' ], + 'sources': [ + '../experimental/PdfViewer/pdf_viewer_main.cpp', + ], + 'include_dirs': [ + '../third_party/externals/podofo/src/base', + '../third_party/externals/podofo/src', + '../third_party/externals/podofo', + '../tools', + '../experimental/PdfViewer', + ], + 'dependencies': [ + 'core.gyp:core', + 'effects.gyp:effects', + 'images.gyp:images', + 'pdf.gyp:pdf', + 'ports.gyp:ports', + 'tools.gyp:picture_utils', + '../third_party/externals/podofo/podofo.gyp:podofo', + ], + 'link_settings': { + 'libraries': [ + ], + }, + 'defines': [ + 'BUILDING_PODOFO', + ], + }, + ], + 'conditions': [ + ['skia_os == "win"', + { + 'targets': [ + { + 'target_name': 'win_lcid', + 'type': 'executable', + 'sources': [ + '../tools/win_lcid.cpp', + ], + }, + ], + }, + ], + ], +} + +# Local Variables: +# tab-width:2 +# indent-tabs-mode:nil +# End: +# vim: set expandtab tabstop=2 shiftwidth=2: -- cgit v1.2.3 From 3613856b8fb4684c48ddce02f73d7599b894dfed Mon Sep 17 00:00:00 2001 From: "edisonn@google.com" Date: Mon, 10 Jun 2013 21:10:50 +0000 Subject: Compile pdf viewer manaully only, disable on build bots. Review URL: https://codereview.chromium.org/15942013 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@9497 2bbb7eff-a529-9590-31e7-b0007b416f81 --- most.gyp | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/most.gyp b/most.gyp index c7f0608..bc6810a 100644 --- a/most.gyp +++ b/most.gyp @@ -18,14 +18,12 @@ 'tests.gyp:tests', 'tools.gyp:tools', 'pathops_unittest.gyp:*', +# 'pdfviewer.gyp:pdfviewer', ], 'conditions': [ ['skia_os == "android"', { 'dependencies': [ 'android_system.gyp:SkiaAndroidApp' ], }], - ['skia_os == "linux"', { - 'dependencies': [ 'pdfviewer.gyp:pdfviewer' ], - }], ], }, ], -- cgit v1.2.3 From f5384d9cdb6e00ae44db91f3bc16e009c143faa9 Mon Sep 17 00:00:00 2001 From: "skia.committer@gmail.com" Date: Tue, 11 Jun 2013 07:01:17 +0000 Subject: Sanitizing source files in Housekeeper-Nightly git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@9501 2bbb7eff-a529-9590-31e7-b0007b416f81 --- libjpeg.gyp | 2 +- pdfviewer.gyp | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/libjpeg.gyp b/libjpeg.gyp index c365941..975831b 100644 --- a/libjpeg.gyp +++ b/libjpeg.gyp @@ -38,7 +38,7 @@ # we currently build skia's version of libjpeg-turbo without # SIMD optimizations for simplicity '../third_party/externals/libjpeg/jsimd_none.c', - + '../third_party/externals/libjpeg/jcapimin.c', '../third_party/externals/libjpeg/jcapistd.c', '../third_party/externals/libjpeg/jccoefct.c', diff --git a/pdfviewer.gyp b/pdfviewer.gyp index ab84e7f..fd5eccb 100644 --- a/pdfviewer.gyp +++ b/pdfviewer.gyp @@ -17,7 +17,7 @@ 'cflags': ['-fexceptions'], 'cflags_cc': ['-fexceptions'], 'cflags!': [ '-fno-exceptions' ], - 'cflags_cc!': [ '-fno-exceptions' ], + 'cflags_cc!': [ '-fno-exceptions' ], 'sources': [ '../experimental/PdfViewer/pdf_viewer_main.cpp', ], @@ -40,7 +40,7 @@ 'link_settings': { 'libraries': [ ], - }, + }, 'defines': [ 'BUILDING_PODOFO', ], @@ -60,7 +60,7 @@ ], }, ], - ], + ], } # Local Variables: -- cgit v1.2.3 From 881ed1e16a5ba46427557a2b03e7d699f1cb291c Mon Sep 17 00:00:00 2001 From: "borenet@google.com" Date: Tue, 11 Jun 2013 15:52:19 +0000 Subject: GYP Changes and Scripts for Compiling Skia for ChromeOS For now, this requires having a complete ChromeOS checkout. R=djsollen@google.com Review URL: https://codereview.chromium.org/16099011 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@9505 2bbb7eff-a529-9590-31e7-b0007b416f81 --- SampleApp.gyp | 2 +- bench.gyp | 4 ++-- chromeos_deps.gyp | 9 +++++++++ common.gypi | 6 ++++++ common_conditions.gypi | 44 +++++++++++++++++++++++++++----------------- common_variables.gypi | 2 ++ core.gyp | 2 +- debugger.gyp | 2 +- gpu.gyp | 6 +++--- images.gyp | 10 ++++++++++ opts.gyp | 4 ++-- pixman_test.gyp | 2 +- ports.gyp | 2 +- shapeops_demo.gyp | 2 +- utils.gyp | 4 ++-- views.gyp | 2 +- xml.gyp | 2 +- 17 files changed, 71 insertions(+), 34 deletions(-) create mode 100644 chromeos_deps.gyp diff --git a/SampleApp.gyp b/SampleApp.gyp index 59d2f84..94dd37b 100644 --- a/SampleApp.gyp +++ b/SampleApp.gyp @@ -152,7 +152,7 @@ 'lua.gyp:lua', ], 'conditions' : [ - [ 'skia_os in ["linux", "freebsd", "openbsd", "solaris"]', { + [ 'skia_os in ["linux", "freebsd", "openbsd", "solaris", "chromeos"]', { 'sources!': [ '../samplecode/SampleDecode.cpp', ], diff --git a/bench.gyp b/bench.gyp index 49e6c2c..27f80ce 100644 --- a/bench.gyp +++ b/bench.gyp @@ -57,13 +57,13 @@ '../bench/BenchSysTimer_mach.cpp', ], }], - [ 'skia_os not in ["linux", "freebsd", "openbsd", "solaris", "android"]', { + [ 'skia_os not in ["linux", "freebsd", "openbsd", "solaris", "android", "chromeos"]', { 'sources!': [ '../bench/BenchSysTimer_posix.h', '../bench/BenchSysTimer_posix.cpp', ], }], - [ 'skia_os in ["linux", "freebsd", "openbsd", "solaris"]', { + [ 'skia_os in ["linux", "freebsd", "openbsd", "solaris", "chromeos"]', { 'link_settings': { 'libraries': [ '-lrt', diff --git a/chromeos_deps.gyp b/chromeos_deps.gyp new file mode 100644 index 0000000..8863791 --- /dev/null +++ b/chromeos_deps.gyp @@ -0,0 +1,9 @@ +# This GYP file stores the dependencies necessary to build Skia on the Chrome OS +# platform. The OS doesn't provide many stable libraries as part of the +# distribution so we have to build a few of them ourselves. + +{ + 'includes': [ + '../platform_tools/chromeos/gyp/dependencies.gypi', + ], +} diff --git a/common.gypi b/common.gypi index 2be8bb8..05fdbf4 100644 --- a/common.gypi +++ b/common.gypi @@ -37,6 +37,12 @@ [ 'skia_os == "nacl" and OS != "linux"', { 'error': ' Date: Tue, 11 Jun 2013 19:18:44 +0000 Subject: add bench for fontcache performance (measurement) BUG= Review URL: https://codereview.chromium.org/16374009 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@9508 2bbb7eff-a529-9590-31e7-b0007b416f81 --- bench.gypi | 1 + 1 file changed, 1 insertion(+) diff --git a/bench.gypi b/bench.gypi index 9937140..5ae472b 100644 --- a/bench.gypi +++ b/bench.gypi @@ -23,6 +23,7 @@ '../bench/DeferredCanvasBench.cpp', '../bench/DeferredSurfaceCopyBench.cpp', '../bench/DisplacementBench.cpp', + '../bench/FontCacheBench.cpp', '../bench/FontScalerBench.cpp', '../bench/GameBench.cpp', '../bench/GradientBench.cpp', -- cgit v1.2.3 From 12abdc715f4aa83e92b0a85167847a6249f9e90b Mon Sep 17 00:00:00 2001 From: "commit-bot@chromium.org" Date: Wed, 12 Jun 2013 18:28:36 +0000 Subject: Small change that eliminates Parse Errors with encoded skps. R=reed@google.com, caryclark@google.com, scroggo@google.com Author: sglez@google.com Review URL: https://chromiumcodereview.appspot.com/16034015 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@9538 2bbb7eff-a529-9590-31e7-b0007b416f81 --- tools.gyp | 1 + 1 file changed, 1 insertion(+) diff --git a/tools.gyp b/tools.gyp index 67ea8b4..552dfc8 100644 --- a/tools.gyp +++ b/tools.gyp @@ -274,6 +274,7 @@ ], 'dependencies': [ 'skia_lib.gyp:skia_lib', + 'tools.gyp:picture_renderer', ], }, { -- cgit v1.2.3 From ea31d2d6be5db3ac90faac5c68cc00084f6a7647 Mon Sep 17 00:00:00 2001 From: "commit-bot@chromium.org" Date: Wed, 12 Jun 2013 21:33:02 +0000 Subject: Fixed a bug with linear gradient PDF matrices and added test cases R=vandebo@chromium.org, reed@google.com Author: richardlin@chromium.org Review URL: https://chromiumcodereview.appspot.com/16094020 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@9553 2bbb7eff-a529-9590-31e7-b0007b416f81 --- gmslides.gypi | 1 + 1 file changed, 1 insertion(+) diff --git a/gmslides.gypi b/gmslides.gypi index 632a275..8ccd816 100644 --- a/gmslides.gypi +++ b/gmslides.gypi @@ -48,6 +48,7 @@ '../gm/getpostextpath.cpp', '../gm/giantbitmap.cpp', '../gm/gradients.cpp', + '../gm/gradient_matrix.cpp', '../gm/gradtext.cpp', '../gm/hairlines.cpp', '../gm/hairmodes.cpp', -- cgit v1.2.3 From 83622d741936f8b00533b26587b7ae8cd6fc7357 Mon Sep 17 00:00:00 2001 From: "commit-bot@chromium.org" Date: Thu, 13 Jun 2013 10:18:02 +0000 Subject: Add benchmark for PremultiplyAlpha and UnpremultiplyAlpha in Skia BUG=248549 R=tomhudson@chromium.org, bsalomon@chromium.org, reed@google.com, noel@chromium.org, tomhudson@google.com Author: jun.a.jiang@intel.com Review URL: https://chromiumcodereview.appspot.com/16654004 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@9569 2bbb7eff-a529-9590-31e7-b0007b416f81 --- bench.gypi | 1 + 1 file changed, 1 insertion(+) diff --git a/bench.gypi b/bench.gypi index 5ae472b..c7f0c11 100644 --- a/bench.gypi +++ b/bench.gypi @@ -47,6 +47,7 @@ '../bench/PicturePlaybackBench.cpp', '../bench/PictureRecordBench.cpp', '../bench/ReadPixBench.cpp', + '../bench/PremulAndUnpremulAlphaOpsBench.cpp', '../bench/RectBench.cpp', '../bench/RectoriBench.cpp', '../bench/RefCntBench.cpp', -- cgit v1.2.3 From 11cb8a86e283b03638acce626bcb54e85c233b79 Mon Sep 17 00:00:00 2001 From: "fmalita@google.com" Date: Thu, 13 Jun 2013 20:59:14 +0000 Subject: Expose debugger backend classes externally. SkDebugCanvas & friends are useful beyond the Qt debugger app - Chromium's picture inspector (in development) is at the point where it could take advantage of it. This patch moves SkDrawCommand, SkDebugCanvas & SkObjectParser from trunk/debugger to trunk/src/utils (since several tools already use these, this seems appropriate), and makes SkDrawCommand & SkDebugCanvas' symbols visible externally (SK_API). R=reed@google.com Review URL: https://codereview.chromium.org/16638014 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@9598 2bbb7eff-a529-9590-31e7-b0007b416f81 --- SampleApp.gyp | 12 ++++++------ debugger.gyp | 12 ++++++------ gm.gyp | 14 +++++++------- tools.gyp | 12 ++++++------ 4 files changed, 25 insertions(+), 25 deletions(-) diff --git a/SampleApp.gyp b/SampleApp.gyp index 94dd37b..29787c7 100644 --- a/SampleApp.gyp +++ b/SampleApp.gyp @@ -16,12 +16,12 @@ 'gmslides.gypi', ], 'sources': [ - '../debugger/SkDrawCommand.h', - '../debugger/SkDrawCommand.cpp', - '../debugger/SkDebugCanvas.h', - '../debugger/SkDebugCanvas.cpp', - '../debugger/SkObjectParser.h', - '../debugger/SkObjectParser.cpp', + '../src/utils/debugger/SkDrawCommand.h', + '../src/utils/debugger/SkDrawCommand.cpp', + '../src/utils/debugger/SkDebugCanvas.h', + '../src/utils/debugger/SkDebugCanvas.cpp', + '../src/utils/debugger/SkObjectParser.h', + '../src/utils/debugger/SkObjectParser.cpp', '../gm/gm.cpp', '../gm/gm.h', diff --git a/debugger.gyp b/debugger.gyp index fcaa6c6..fa7c6f7 100644 --- a/debugger.gyp +++ b/debugger.gyp @@ -85,13 +85,13 @@ '../tools', ], 'sources': [ - '../debugger/SkDebugCanvas.h', - '../debugger/SkDebugCanvas.cpp', '../debugger/SkDebugger.cpp', - '../debugger/SkDrawCommand.h', - '../debugger/SkDrawCommand.cpp', - '../debugger/SkObjectParser.h', - '../debugger/SkObjectParser.cpp', + '../src/utils/debugger/SkDebugCanvas.h', + '../src/utils/debugger/SkDebugCanvas.cpp', + '../src/utils/debugger/SkDrawCommand.h', + '../src/utils/debugger/SkDrawCommand.cpp', + '../src/utils/debugger/SkObjectParser.h', + '../src/utils/debugger/SkObjectParser.cpp', ], 'dependencies': [ 'skia_lib.gyp:skia_lib', diff --git a/gm.gyp b/gm.gyp index 699dcb7..2f280af 100644 --- a/gm.gyp +++ b/gm.gyp @@ -39,19 +39,19 @@ 'gmslides.gypi', ], 'sources': [ - '../debugger/SkDrawCommand.h', - '../debugger/SkDrawCommand.cpp', - '../debugger/SkDebugCanvas.h', - '../debugger/SkDebugCanvas.cpp', - '../debugger/SkObjectParser.h', - '../debugger/SkObjectParser.cpp', - '../gm/gm.cpp', '../gm/gmmain.cpp', '../gm/system_preferences_default.cpp', '../src/pipe/utils/SamplePipeControllers.h', '../src/pipe/utils/SamplePipeControllers.cpp', + + '../src/utils/debugger/SkDrawCommand.h', + '../src/utils/debugger/SkDrawCommand.cpp', + '../src/utils/debugger/SkDebugCanvas.h', + '../src/utils/debugger/SkDebugCanvas.cpp', + '../src/utils/debugger/SkObjectParser.h', + '../src/utils/debugger/SkObjectParser.cpp', ], 'dependencies': [ 'skia_lib.gyp:skia_lib', diff --git a/tools.gyp b/tools.gyp index 552dfc8..cb7d4ac 100644 --- a/tools.gyp +++ b/tools.gyp @@ -288,12 +288,12 @@ '../tools/filtermain.cpp', '../tools/path_utils.h', '../tools/path_utils.cpp', - '../debugger/SkDrawCommand.h', - '../debugger/SkDrawCommand.cpp', - '../debugger/SkDebugCanvas.h', - '../debugger/SkDebugCanvas.cpp', - '../debugger/SkObjectParser.h', - '../debugger/SkObjectParser.cpp', + '../src/utils/debugger/SkDrawCommand.h', + '../src/utils/debugger/SkDrawCommand.cpp', + '../src/utils/debugger/SkDebugCanvas.h', + '../src/utils/debugger/SkDebugCanvas.cpp', + '../src/utils/debugger/SkObjectParser.h', + '../src/utils/debugger/SkObjectParser.cpp', ], 'dependencies': [ 'skia_lib.gyp:skia_lib', -- cgit v1.2.3 From ceed2e203659ee04c7c347a10c8b80d35747ac31 Mon Sep 17 00:00:00 2001 From: "fmalita@google.com" Date: Thu, 13 Jun 2013 21:25:45 +0000 Subject: Build fix after r9598. Updated include paths for debugger backend classes. R=bungeman@google.com Review URL: https://codereview.chromium.org/16866017 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@9600 2bbb7eff-a529-9590-31e7-b0007b416f81 --- SampleApp.gyp | 2 +- debugger.gyp | 1 + gm.gyp | 2 +- tools.gyp | 2 +- 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/SampleApp.gyp b/SampleApp.gyp index 29787c7..8b64cbd 100644 --- a/SampleApp.gyp +++ b/SampleApp.gyp @@ -5,12 +5,12 @@ 'type': 'executable', 'mac_bundle' : 1, 'include_dirs' : [ - '../debugger', '../src/core', '../src/effects', #needed for BlurMask.h '../gm', # needed to pull gm.h '../samplecode', # To pull SampleApp.h and SampleCode.h '../src/pipe/utils', # For TiledPipeController + '../src/utils/debugger', ], 'includes': [ 'gmslides.gypi', diff --git a/debugger.gyp b/debugger.gyp index fa7c6f7..3a972c2 100644 --- a/debugger.gyp +++ b/debugger.gyp @@ -78,6 +78,7 @@ ], 'include_dirs' : [ '../src/core', + '../src/utils/debugger', '../debugger', # To pull SkDebugger.h '../src/gpu', # To pull gl/GrGLUtil.h '../src/ports', # To pull SkFontDescriptor.h diff --git a/gm.gyp b/gm.gyp index 2f280af..3fdfb8e 100644 --- a/gm.gyp +++ b/gm.gyp @@ -29,11 +29,11 @@ 'target_name': 'gm', 'type': 'executable', 'include_dirs' : [ - '../debugger', '../src/core', '../src/effects', '../src/pipe/utils/', '../src/utils/', + '../src/utils/debugger', ], 'includes': [ 'gmslides.gypi', diff --git a/tools.gyp b/tools.gyp index cb7d4ac..2b0550a 100644 --- a/tools.gyp +++ b/tools.gyp @@ -282,7 +282,7 @@ 'type': 'executable', 'include_dirs' : [ '../src/core', - '../debugger', + '../src/utils/debugger', ], 'sources': [ '../tools/filtermain.cpp', -- cgit v1.2.3 From c7037a7669eb5a127fa8069fa6481ec31b2bba7f Mon Sep 17 00:00:00 2001 From: "scroggo@google.com" Date: Fri, 14 Jun 2013 15:33:20 +0000 Subject: Add an option to create unpremultiplied bitmaps. Currently they cannot be used directly by Skia, but the pixels can be used elsewhere. SkImageDecoder: Add functions to require unpremultiplied output and query the presence of the requirement SkImageDecoder_libpng: SkImageDecoder_libwebp: SkImageDecoder_WIC: Respect the requirement for unpremultiplied output. TODO: Fix SkImageDecoder_CG. SkScaledBitmapSampler: Add procs to skip premultiplication and a boolean parameter to use those procs. ImageDecodingTest: Test unpremultiplied bitmap decoding. SampleUnpremul: Add a sample which allows visually comparing between the unpremultiplied version (copied into a premultiplied bitmap, since drawing unpremultiplied is not currently supported) and a premultiplied version of image files. gm.h: Add a getter for the resource path, so Samples can use it. As of patch set 13, https://codereview.chromium.org/16816016/ and https://codereview.chromium.org/16983004/, which were approved separately. R=reed@google.com Review URL: https://codereview.chromium.org/16410009 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@9612 2bbb7eff-a529-9590-31e7-b0007b416f81 --- SampleApp.gyp | 1 + bench.gypi | 1 + tests.gyp | 1 + 3 files changed, 3 insertions(+) diff --git a/SampleApp.gyp b/SampleApp.gyp index 8b64cbd..644121f 100644 --- a/SampleApp.gyp +++ b/SampleApp.gyp @@ -109,6 +109,7 @@ '../samplecode/SampleTiling.cpp', '../samplecode/SampleTinyBitmap.cpp', '../samplecode/SampleUnitMapper.cpp', + '../samplecode/SampleUnpremul.cpp', '../samplecode/SampleVertices.cpp', '../samplecode/SampleXfermodesBlur.cpp', '../samplecode/TransitionView.cpp', diff --git a/bench.gypi b/bench.gypi index c7f0c11..2be3f22 100644 --- a/bench.gypi +++ b/bench.gypi @@ -28,6 +28,7 @@ '../bench/GameBench.cpp', '../bench/GradientBench.cpp', '../bench/GrMemoryPoolBench.cpp', + '../bench/ImageDecodeBench.cpp', '../bench/InterpBench.cpp', '../bench/LineBench.cpp', '../bench/LightingBench.cpp', diff --git a/tests.gyp b/tests.gyp index 557fea5..3bdf18d 100644 --- a/tests.gyp +++ b/tests.gyp @@ -66,6 +66,7 @@ '../tests/GrMemoryPoolTest.cpp', '../tests/GrSurfaceTest.cpp', '../tests/HashCacheTest.cpp', + '../tests/ImageDecodingTest.cpp', '../tests/InfRectTest.cpp', '../tests/LListTest.cpp', '../tests/LayerDrawLooperTest.cpp', -- cgit v1.2.3 From 2e9b883139f5abbd1bbd0e106072b69f75147760 Mon Sep 17 00:00:00 2001 From: "commit-bot@chromium.org" Date: Fri, 14 Jun 2013 17:10:09 +0000 Subject: Add skia_exceptinos gyp define R=robertphillips@google.com Author: borenet@google.com Review URL: https://chromiumcodereview.appspot.com/17094003 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@9615 2bbb7eff-a529-9590-31e7-b0007b416f81 --- common_conditions.gypi | 9 +++++++++ common_variables.gypi | 1 + 2 files changed, 10 insertions(+) diff --git a/common_conditions.gypi b/common_conditions.gypi index cceb556..cf8cbde 100644 --- a/common_conditions.gypi +++ b/common_conditions.gypi @@ -113,6 +113,15 @@ }, }, }], + [ 'skia_win_exceptions', { + 'msvs_settings': { + 'VCCLCompilerTool': { + 'AdditionalOptions': [ + '/EHsc', + ], + }, + }, + }], ], }, ], diff --git a/common_variables.gypi b/common_variables.gypi index 9f65b34..9b44e41 100644 --- a/common_variables.gypi +++ b/common_variables.gypi @@ -120,6 +120,7 @@ 'skia_arch_type%': '<(skia_arch_type)', 'skia_directwrite%': '<(skia_directwrite)', 'skia_gpu%': '<(skia_gpu)', + 'skia_win_exceptions%': 0, 'skia_osx_sdkroot%': '<(skia_osx_sdkroot)', 'skia_profile_enabled%': '<(skia_profile_enabled)', 'skia_shared_lib%': '<(skia_shared_lib)', -- cgit v1.2.3 From c0212bd379667d29c1886ccfe44e7887b2380e5f Mon Sep 17 00:00:00 2001 From: "borenet@google.com" Date: Mon, 17 Jun 2013 15:39:43 +0000 Subject: SkHello for NaCl Not ready to submit. R=reed@google.com Review URL: https://codereview.chromium.org/16904003 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@9639 2bbb7eff-a529-9590-31e7-b0007b416f81 --- tools.gyp | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/tools.gyp b/tools.gyp index 2b0550a..d960cdc 100644 --- a/tools.gyp +++ b/tools.gyp @@ -60,13 +60,23 @@ { 'target_name': 'skhello', 'type': 'executable', - 'sources': [ - '../tools/skhello.cpp', - ], 'dependencies': [ 'skia_lib.gyp:skia_lib', - 'pdf.gyp:pdf', - 'flags.gyp:flags', + ], + 'conditions': [ + [ 'skia_os == "nacl"', { + 'sources': [ + '../platform_tools/nacl/src/nacl_hello.cpp', + ], + }, { + 'sources': [ + '../tools/skhello.cpp', + ], + 'dependencies': [ + 'pdf.gyp:pdf', + 'flags.gyp:flags', + ], + }], ], }, { -- cgit v1.2.3 From a2c3b802f1e3ecc17604c63774ccdf8aa73d0184 Mon Sep 17 00:00:00 2001 From: "robertphillips@google.com" Date: Tue, 18 Jun 2013 14:43:53 +0000 Subject: Fuse skgr & gr targets in gyp files https://codereview.chromium.org/17101010/ git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@9653 2bbb7eff-a529-9590-31e7-b0007b416f81 --- gpu.gyp | 84 ++++++++++------------------------------------------- gpu.gypi | 95 ++++++++++++++++++++++++++++++------------------------------ skia_lib.gyp | 3 +- 3 files changed, 63 insertions(+), 119 deletions(-) diff --git a/gpu.gyp b/gpu.gyp index efd0242..de0babd 100644 --- a/gpu.gyp +++ b/gpu.gyp @@ -117,8 +117,8 @@ }, 'targets': [ { - 'target_name': 'skgr', - 'product_name': 'skia_skgr', + 'target_name': 'skgpu', + 'product_name': 'skia_skgpu', 'type': 'static_library', 'standalone_static_library': 1, 'includes': [ @@ -139,67 +139,12 @@ 'angle.gyp:*', ], 'sources': [ - '<@(skgr_sources)', - '<@(skgr_native_gl_sources)', - '<@(skgr_angle_gl_sources)', - '<@(skgr_mesa_gl_sources)', - '<@(skgr_debug_gl_sources)', - '<@(skgr_null_gl_sources)', - 'gpu.gypi', # Makes the gypi appear in IDEs (but does not modify the build). - ], - 'conditions': [ - [ 'not skia_mesa', { - 'sources!': [ - '../src/gpu/gl/mesa/SkMesaGLContext.cpp', - ], - }], - [ 'skia_mesa and skia_os == "mac"', { - 'include_dirs': [ - '/opt/X11/include/', - ], - }], - [ 'not skia_angle', { - 'sources!': [ - '<@(skgr_angle_gl_sources)', - ], - 'dependencies!': [ - 'angle.gyp:*', - ], - 'export_dependent_settings!': [ - 'angle.gyp:*', - ], - }], - ], - }, - { - 'target_name': 'gr', - 'product_name': 'skia_gr', - 'type': 'static_library', - 'standalone_static_library': 1, - 'includes': [ - 'gpu.gypi', - ], - 'include_dirs': [ - '../include/core', - '../include/config', - '../include/utils', - '../include/gpu', - '../src/core', # SkRasterClip.h - '../src/gpu' - ], - 'dependencies': [ - 'angle.gyp:*', - ], - 'export_dependent_settings': [ - 'angle.gyp:*', - ], - 'sources': [ - '<@(gr_sources)', - '<@(gr_native_gl_sources)', - '<@(gr_angle_gl_sources)', - '<@(gr_mesa_gl_sources)', - '<@(gr_debug_gl_sources)', - '<@(gr_null_gl_sources)', + '<@(skgpu_sources)', + '<@(skgpu_native_gl_sources)', + '<@(skgpu_angle_gl_sources)', + '<@(skgpu_mesa_gl_sources)', + '<@(skgpu_debug_gl_sources)', + '<@(skgpu_null_gl_sources)', 'gpu.gypi', # Makes the gypi appear in IDEs (but does not modify the build). ], 'defines': [ @@ -270,6 +215,12 @@ '../src/gpu/gl/GrGLCreateNativeInterface_none.cpp', ], }], + [ 'not skia_mesa', { + 'sources!': [ + '../src/gpu/gl/mesa/SkMesaGLContext.cpp', + '../src/gpu/gl/mesa/GrGLCreateMesaInterface.cpp', + ], + }], [ 'skia_mesa and skia_os == "mac"', { 'link_settings': { 'libraries': [ @@ -280,11 +231,6 @@ '/opt/X11/include/', ], }], - [ 'not skia_mesa', { - 'sources!': [ - '../src/gpu/gl/mesa/GrGLCreateMesaInterface.cpp', - ], - }], [ 'skia_os in ["win", "ios"]', { 'sources!': [ '../src/gpu/gl/GrGLDefaultInterface_none.cpp', @@ -293,7 +239,7 @@ }], [ 'not skia_angle', { 'sources!': [ - '<@(gr_angle_gl_sources)', + '<@(skgpu_angle_gl_sources)', ], 'dependencies!': [ 'angle.gyp:*', diff --git a/gpu.gypi b/gpu.gypi index f5800e8..2191ff2 100644 --- a/gpu.gypi +++ b/gpu.gypi @@ -1,4 +1,4 @@ -# Include this gypi to include all 'gr' and 'skgr' files +# Include this gypi to include all 'gpu' files # The parent gyp/gypi file must define # 'skia_src_path' e.g. skia/trunk/src # 'skia_include_path' e.g. skia/trunk/include @@ -7,7 +7,7 @@ # { 'variables': { - 'gr_sources': [ + 'skgpu_sources': [ '<(skia_include_path)/gpu/GrAARectRenderer.h', '<(skia_include_path)/gpu/GrBackendEffectFactory.h', '<(skia_include_path)/gpu/GrClipData.h', @@ -188,22 +188,58 @@ '<(skia_src_path)/gpu/gl/GrGpuGL.cpp', '<(skia_src_path)/gpu/gl/GrGpuGL.h', '<(skia_src_path)/gpu/gl/GrGpuGL_program.cpp', + + # Sk files + '<(skia_include_path)/gpu/SkGpuDevice.h', + '<(skia_include_path)/gpu/SkGr.h', + '<(skia_include_path)/gpu/SkGrPixelRef.h', + '<(skia_include_path)/gpu/SkGrTexturePixelRef.h', + + '<(skia_include_path)/gpu/gl/SkGLContextHelper.h', + + '<(skia_src_path)/gpu/SkGpuDevice.cpp', + '<(skia_src_path)/gpu/SkGr.cpp', + '<(skia_src_path)/gpu/SkGrFontScaler.cpp', + '<(skia_src_path)/gpu/SkGrPixelRef.cpp', + '<(skia_src_path)/gpu/SkGrTexturePixelRef.cpp', + + '<(skia_src_path)/image/SkImage_Gpu.cpp', + '<(skia_src_path)/image/SkSurface_Gpu.cpp', + + '<(skia_src_path)/gpu/gl/SkGLContextHelper.cpp' ], - 'gr_native_gl_sources': [ + 'skgpu_native_gl_sources': [ '<(skia_src_path)/gpu/gl/GrGLDefaultInterface_native.cpp', '<(skia_src_path)/gpu/gl/mac/GrGLCreateNativeInterface_mac.cpp', '<(skia_src_path)/gpu/gl/win/GrGLCreateNativeInterface_win.cpp', '<(skia_src_path)/gpu/gl/unix/GrGLCreateNativeInterface_unix.cpp', '<(skia_src_path)/gpu/gl/iOS/GrGLCreateNativeInterface_iOS.cpp', '<(skia_src_path)/gpu/gl/android/GrGLCreateNativeInterface_android.cpp', + + # Sk files + '<(skia_include_path)/gpu/gl/SkNativeGLContext.h', + '<(skia_src_path)/gpu/gl/mac/SkNativeGLContext_mac.cpp', + '<(skia_src_path)/gpu/gl/nacl/SkNativeGLContext_nacl.cpp', + '<(skia_src_path)/gpu/gl/win/SkNativeGLContext_win.cpp', + '<(skia_src_path)/gpu/gl/unix/SkNativeGLContext_unix.cpp', + '<(skia_src_path)/gpu/gl/android/SkNativeGLContext_android.cpp', + '<(skia_src_path)/gpu/gl/iOS/SkNativeGLContext_iOS.mm', ], - 'gr_mesa_gl_sources': [ + 'skgpu_mesa_gl_sources': [ '<(skia_src_path)/gpu/gl/mesa/GrGLCreateMesaInterface.cpp', + + # Sk files + '<(skia_include_path)/gpu/gl/SkMesaGLContext.h', + '<(skia_src_path)/gpu/gl/mesa/SkMesaGLContext.cpp', ], - 'gr_angle_gl_sources': [ + 'skgpu_angle_gl_sources': [ '<(skia_src_path)/gpu/gl/angle/GrGLCreateANGLEInterface.cpp', + + # Sk files + '<(skia_include_path)/gpu/gl/SkANGLEGLContext.h', + '<(skia_src_path)/gpu/gl/angle/SkANGLEGLContext.cpp', ], - 'gr_debug_gl_sources': [ + 'skgpu_debug_gl_sources': [ '<(skia_src_path)/gpu/gl/debug/GrGLCreateDebugInterface.cpp', '<(skia_src_path)/gpu/gl/debug/GrFakeRefObj.h', '<(skia_src_path)/gpu/gl/debug/GrBufferObj.h', @@ -223,52 +259,15 @@ '<(skia_src_path)/gpu/gl/debug/GrDebugGL.h', '<(skia_src_path)/gpu/gl/debug/GrDebugGL.cpp', '<(skia_src_path)/gpu/gl/debug/GrVertexArrayObj.h', - ], - 'gr_null_gl_sources': [ - '<(skia_src_path)/gpu/gl/GrGLCreateNullInterface.cpp', - ], - 'skgr_sources': [ - '<(skia_include_path)/gpu/SkGpuDevice.h', - '<(skia_include_path)/gpu/SkGr.h', - '<(skia_include_path)/gpu/SkGrPixelRef.h', - '<(skia_include_path)/gpu/SkGrTexturePixelRef.h', - - '<(skia_include_path)/gpu/gl/SkGLContextHelper.h', - - '<(skia_src_path)/gpu/SkGpuDevice.cpp', - '<(skia_src_path)/gpu/SkGr.cpp', - '<(skia_src_path)/gpu/SkGrFontScaler.cpp', - '<(skia_src_path)/gpu/SkGrPixelRef.cpp', - '<(skia_src_path)/gpu/SkGrTexturePixelRef.cpp', - - '<(skia_src_path)/image/SkImage_Gpu.cpp', - '<(skia_src_path)/image/SkSurface_Gpu.cpp', - - '<(skia_src_path)/gpu/gl/SkGLContextHelper.cpp' - ], - 'skgr_native_gl_sources': [ - '<(skia_include_path)/gpu/gl/SkNativeGLContext.h', - '<(skia_src_path)/gpu/gl/mac/SkNativeGLContext_mac.cpp', - '<(skia_src_path)/gpu/gl/nacl/SkNativeGLContext_nacl.cpp', - '<(skia_src_path)/gpu/gl/win/SkNativeGLContext_win.cpp', - '<(skia_src_path)/gpu/gl/unix/SkNativeGLContext_unix.cpp', - '<(skia_src_path)/gpu/gl/android/SkNativeGLContext_android.cpp', - '<(skia_src_path)/gpu/gl/iOS/SkNativeGLContext_iOS.mm', - ], - 'skgr_angle_gl_sources': [ - '<(skia_include_path)/gpu/gl/SkANGLEGLContext.h', - '<(skia_src_path)/gpu/gl/angle/SkANGLEGLContext.cpp', - ], - 'skgr_mesa_gl_sources': [ - '<(skia_include_path)/gpu/gl/SkMesaGLContext.h', - '<(skia_src_path)/gpu/gl/mesa/SkMesaGLContext.cpp', - ], - 'skgr_debug_gl_sources': [ + # Sk files '<(skia_include_path)/gpu/gl/SkDebugGLContext.h', '<(skia_src_path)/gpu/gl/debug/SkDebugGLContext.cpp', ], - 'skgr_null_gl_sources': [ + 'skgpu_null_gl_sources': [ + '<(skia_src_path)/gpu/gl/GrGLCreateNullInterface.cpp', + + # Sk files '<(skia_include_path)/gpu/gl/SkNullGLContext.h', '<(skia_src_path)/gpu/gl/SkNullGLContext.cpp', ], diff --git a/skia_lib.gyp b/skia_lib.gyp index f85c5ad..d4cd00e 100644 --- a/skia_lib.gyp +++ b/skia_lib.gyp @@ -24,8 +24,7 @@ }], [ 'skia_gpu', { 'component_libs': [ - 'gpu.gyp:gr', - 'gpu.gyp:skgr', + 'gpu.gyp:skgpu', ], }], [ 'skia_os == "nacl"', { -- cgit v1.2.3 From 81d52f138e2f42ae71fd46e54f59f0e25659f74a Mon Sep 17 00:00:00 2001 From: "commit-bot@chromium.org" Date: Tue, 18 Jun 2013 15:37:27 +0000 Subject: Smallest possible desktop application that uses Skia to render stuff. Small Hello World smaple. Subclasses SkOSWindow. R=caryclark@google.com Author: sglez@google.com Review URL: https://chromiumcodereview.appspot.com/16337012 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@9657 2bbb7eff-a529-9590-31e7-b0007b416f81 --- SkiaExamples.gyp | 76 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 76 insertions(+) create mode 100644 SkiaExamples.gyp diff --git a/SkiaExamples.gyp b/SkiaExamples.gyp new file mode 100644 index 0000000..8f26a8a --- /dev/null +++ b/SkiaExamples.gyp @@ -0,0 +1,76 @@ +{ + 'targets' : [ + { + 'target_name': 'SkiaExamples', + 'type': 'executable', + 'mac_bundle' : 1, + 'include_dirs' : [], + 'includes': [], + 'sources': [ + '../experimental/SkiaExamples/HelloSkiaExample.cpp', + '../experimental/SkiaExamples/BaseExample.h', + '../experimental/SkiaExamples/BaseExample.cpp', + ], + 'dependencies': [ + 'skia_lib.gyp:skia_lib', + 'views.gyp:views', + 'xml.gyp:xml', + ], + 'conditions' : [ + [ 'skia_gpu == 1', { + 'include_dirs' : [ + '../src/gpu', #gl/GrGLUtil.h + ] + }], + [ 'skia_os == "win"', { + 'sources' : [ + '../src/views/win/SkOSWindow_Win.cpp', + '../src/views/win/skia_win.cpp', + ], + }, + ], + + [ 'skia_os == "mac"', { + 'sources': [ + +# SkiaExamples specific files + '../experimental/SkiaExamples/SkiaExamples-Info.plist', + '../experimental/SkiaExamples/SkExampleNSView.h', + '../experimental/SkiaExamples/SkExampleNSView.mm', + +# Mac files + '../src/views/mac/SampleAppDelegate.h', + '../src/views/mac/SampleAppDelegate.mm', + '../src/views/mac/SkEventNotifier.mm', + '../src/views/mac/skia_mac.mm', + '../src/views/mac/SkNSView.h', + '../src/views/mac/SkNSView.mm', + '../src/views/mac/SkOptionsTableView.h', + '../src/views/mac/SkOptionsTableView.mm', + '../src/views/mac/SkOSWindow_Mac.mm', + '../src/views/mac/SkTextFieldCell.h', + '../src/views/mac/SkTextFieldCell.m', + ], + 'include_dirs' : [ + '../src/views/mac/' + ], + 'link_settings': { + }, + 'xcode_settings' : { + 'INFOPLIST_FILE' : '../experimental/SkiaExamples/SkiaExamples-Info.plist', + }, + 'mac_bundle_resources' : [ + '../experimental/SkiaExamples/SkiaExamples.xib' + ], + } + ], + ], + } + ], +} + +# Local Variables: +# tab-width:2 +# indent-tabs-mode:nil +# End: +# vim: set expandtab tabstop=2 shiftwidth=2: -- cgit v1.2.3 From f7d47c27f31fb00f1ba545f5720b8ae89f898008 Mon Sep 17 00:00:00 2001 From: "commit-bot@chromium.org" Date: Tue, 18 Jun 2013 20:06:36 +0000 Subject: remove double including of libpng decoder R=bungeman@google.com Author: zachr@google.com Review URL: https://chromiumcodereview.appspot.com/17408002 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@9666 2bbb7eff-a529-9590-31e7-b0007b416f81 --- images.gyp | 6 ------ 1 file changed, 6 deletions(-) diff --git a/images.gyp b/images.gyp index df22026..b2b404f 100644 --- a/images.gyp +++ b/images.gyp @@ -106,9 +106,6 @@ # our code that calls it. # See http://code.google.com/p/gyp/wiki/InputFormatReference#Dependent_Settings 'link_settings': { - 'sources': [ - '../src/images/SkImageDecoder_libpng.cpp', - ], 'libraries': [ '-lgif', '-lpng', @@ -126,9 +123,6 @@ '../src/images/SkMovie_gif.cpp', ], 'link_settings': { - 'sources': [ - '../src/images/SkImageDecoder_libpng.cpp', - ], 'libraries': [ '-lpng', '-lz', -- cgit v1.2.3 From ab5e5d956eb10ee59101a8ea64fa4e4ed4d605b3 Mon Sep 17 00:00:00 2001 From: "borenet@google.com" Date: Wed, 19 Jun 2013 15:13:32 +0000 Subject: Use "Simple Chrome for Chrome OS Workflow" to build Skia for ChromeOS (SkipBuildbotRuns) since this isn't used yet. R=djsollen@google.com Review URL: https://codereview.chromium.org/17412007 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@9681 2bbb7eff-a529-9590-31e7-b0007b416f81 --- common_conditions.gypi | 1 - 1 file changed, 1 deletion(-) diff --git a/common_conditions.gypi b/common_conditions.gypi index cf8cbde..54e4ad6 100644 --- a/common_conditions.gypi +++ b/common_conditions.gypi @@ -173,7 +173,6 @@ }], [ 'skia_os == "chromeos"', { 'ldflags': [ - '--sysroot=/build/<(skia_cros_target)', '-lstdc++', '-lm', ], -- cgit v1.2.3 From a08afd9646c5a68d34d2bab9ac1d0d42e8b70dfb Mon Sep 17 00:00:00 2001 From: "egdaniel@google.com" Date: Thu, 20 Jun 2013 16:54:31 +0000 Subject: Add GM to test conic path rendering R=reed@google.com Review URL: https://codereview.chromium.org/17365006 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@9702 2bbb7eff-a529-9590-31e7-b0007b416f81 --- gmslides.gypi | 1 + 1 file changed, 1 insertion(+) diff --git a/gmslides.gypi b/gmslides.gypi index 8ccd816..5d73ac4 100644 --- a/gmslides.gypi +++ b/gmslides.gypi @@ -24,6 +24,7 @@ '../gm/complexclip.cpp', '../gm/complexclip2.cpp', '../gm/composeshader.cpp', + '../gm/conicpaths.cpp', '../gm/convexpaths.cpp', '../gm/cubicpaths.cpp', '../gm/cmykjpeg.cpp', -- cgit v1.2.3 From b8db424db7ad16da9142526180f97ea6813cca37 Mon Sep 17 00:00:00 2001 From: "zachr@google.com" Date: Thu, 20 Jun 2013 17:15:05 +0000 Subject: enable shared lib support in linux for lua R=bungeman@google.com, reed@google.com Review URL: https://codereview.chromium.org/16099014 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@9703 2bbb7eff-a529-9590-31e7-b0007b416f81 --- common.gypi | 9 --------- common_conditions.gypi | 11 +++++++++++ tools.gyp | 44 ++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 55 insertions(+), 9 deletions(-) diff --git a/common.gypi b/common.gypi index 05fdbf4..54c14cd 100644 --- a/common.gypi +++ b/common.gypi @@ -45,15 +45,6 @@ }], ], }, - # Validate the 'skia_os' setting against 'skia_shared_lib', because shared - # library build is only supported on Android. - 'variables': { - 'conditions': [ - [ 'skia_os != "android" and skia_shared_lib', { - 'error': ' Date: Thu, 20 Jun 2013 18:05:31 +0000 Subject: Turn off conic GM for now BUG= Review URL: https://codereview.chromium.org/17500004 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@9707 2bbb7eff-a529-9590-31e7-b0007b416f81 --- gmslides.gypi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gmslides.gypi b/gmslides.gypi index 5d73ac4..eeb3c92 100644 --- a/gmslides.gypi +++ b/gmslides.gypi @@ -24,7 +24,7 @@ '../gm/complexclip.cpp', '../gm/complexclip2.cpp', '../gm/composeshader.cpp', - '../gm/conicpaths.cpp', + #'../gm/conicpaths.cpp', '../gm/convexpaths.cpp', '../gm/cubicpaths.cpp', '../gm/cmykjpeg.cpp', -- cgit v1.2.3 From 42a8cdd9c32bc9092f36d94213fae944ddc9fe18 Mon Sep 17 00:00:00 2001 From: "commit-bot@chromium.org" Date: Thu, 20 Jun 2013 20:28:54 +0000 Subject: Add gyp define for optimization level R=tomhudson@google.com, djsollen@google.com, epoger@google.com, bungeman@google.com Author: borenet@google.com Review URL: https://chromiumcodereview.appspot.com/17370005 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@9710 2bbb7eff-a529-9590-31e7-b0007b416f81 --- common_conditions.gypi | 11 +++++++---- common_variables.gypi | 17 +++++++++++++++-- 2 files changed, 22 insertions(+), 6 deletions(-) diff --git a/common_conditions.gypi b/common_conditions.gypi index 3a49f14..4aa503d 100644 --- a/common_conditions.gypi +++ b/common_conditions.gypi @@ -76,7 +76,7 @@ 'msvs_settings': { 'VCCLCompilerTool': { 'DebugInformationFormat': '3', # programDatabase (/Zi) - 'Optimization': '3', # full (/Ox) + 'Optimization': '<(skia_release_optimization_level)', 'WholeProgramOptimization': 'true', #/GL # Changing the floating point model requires rebaseling gm images #'FloatingPointModel': '2', # fast (/fp:fast) @@ -137,7 +137,10 @@ 'cflags': ['-g'] }, 'Release': { - 'cflags': ['-O3 -g'], + 'cflags': [ + '-O<(skia_release_optimization_level)', + '-g', + ], 'defines': [ 'NDEBUG' ], }, }, @@ -246,7 +249,7 @@ }, 'Release': { 'xcode_settings': { - 'GCC_OPTIMIZATION_LEVEL': '3', + 'GCC_OPTIMIZATION_LEVEL': '<(skia_release_optimization_level)', }, 'defines': [ 'NDEBUG' ], }, @@ -312,7 +315,7 @@ }, 'Release': { 'xcode_settings': { - 'GCC_OPTIMIZATION_LEVEL': '3', + 'GCC_OPTIMIZATION_LEVEL': '<(skia_release_optimization_level)', }, 'defines': [ 'NDEBUG' ], }, diff --git a/common_variables.gypi b/common_variables.gypi index 9b44e41..3a42fdc 100644 --- a/common_variables.gypi +++ b/common_variables.gypi @@ -91,6 +91,11 @@ 'skia_profile_enabled%': 0, 'skia_win_debuggers_path%': '', 'skia_shared_lib%': 0, + + # These variables determine the default optimization level for different + # compilers. + 'skia_default_vs_optimization_level': 3, # full (/Ox) + 'skia_default_gcc_optimization_level': 3, # -O3 }, 'conditions': [ @@ -101,6 +106,16 @@ }, { 'skia_warnings_as_errors%': 0, }], + + # This variable allows the user to customize the optimization level used + # by the compiler. The user should be aware that this has different + # meanings for different compilers and should exercise caution when + # overriding it. + [ 'skia_os == "win"', { + 'skia_release_optimization_level%': '<(skia_default_vs_optimization_level)', + }, { + 'skia_release_optimization_level%': '<(skia_default_gcc_optimization_level)', + }], ], # Re-define all variables defined within the level-2 'variables' dict, @@ -128,8 +143,6 @@ 'ios_sdk_version%': '6.0', 'skia_win_debuggers_path%': '<(skia_win_debuggers_path)', - 'skia_cros_target%': '', - # These are referenced by our .gypi files that list files (e.g. core.gypi) # 'skia_src_path%': '../src', -- cgit v1.2.3 From f5d335e235288474839d7bc3687c5a09e59eaa41 Mon Sep 17 00:00:00 2001 From: "reed@google.com" Date: Fri, 21 Jun 2013 18:30:53 +0000 Subject: remove dst/rendertarget support for kARGB_4444_Config BUG= Review URL: https://codereview.chromium.org/17335008 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@9727 2bbb7eff-a529-9590-31e7-b0007b416f81 --- SampleApp.gyp | 1 - core.gypi | 2 -- 2 files changed, 3 deletions(-) diff --git a/SampleApp.gyp b/SampleApp.gyp index 644121f..f8ba962 100644 --- a/SampleApp.gyp +++ b/SampleApp.gyp @@ -99,7 +99,6 @@ '../samplecode/SampleSkLayer.cpp', '../samplecode/SampleSlides.cpp', '../samplecode/SampleStrokePath.cpp', - '../samplecode/SampleStrokeText.cpp', '../samplecode/SampleTests.cpp', '../samplecode/SampleText.cpp', '../samplecode/SampleTextAlpha.cpp', diff --git a/core.gypi b/core.gypi index a88f722..2703231 100644 --- a/core.gypi +++ b/core.gypi @@ -38,10 +38,8 @@ '<(skia_src_path)/core/SkBlitMask_D32.cpp', '<(skia_src_path)/core/SkBlitRow_D16.cpp', '<(skia_src_path)/core/SkBlitRow_D32.cpp', - '<(skia_src_path)/core/SkBlitRow_D4444.cpp', '<(skia_src_path)/core/SkBlitter.h', '<(skia_src_path)/core/SkBlitter.cpp', - '<(skia_src_path)/core/SkBlitter_4444.cpp', '<(skia_src_path)/core/SkBlitter_A1.cpp', '<(skia_src_path)/core/SkBlitter_A8.cpp', '<(skia_src_path)/core/SkBlitter_ARGB32.cpp', -- cgit v1.2.3 From a37023fec8f180b86c70609bd67195287d461d52 Mon Sep 17 00:00:00 2001 From: "borenet@google.com" Date: Mon, 24 Jun 2013 19:31:58 +0000 Subject: Use a single cros_toolchain tarball for ChromeOS build It's stored in our GS bucket, so we won't need two sets of credentials. (SkipBuildbotRuns) since this isn't in use. Review URL: https://codereview.chromium.org/17608003 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@9743 2bbb7eff-a529-9590-31e7-b0007b416f81 --- common.gypi | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/common.gypi b/common.gypi index 54c14cd..2173d90 100644 --- a/common.gypi +++ b/common.gypi @@ -22,7 +22,8 @@ 'variables': { 'conditions': [ [ 'skia_os != OS and not ((skia_os == "ios" and OS == "mac") or \ - (skia_os == "nacl" and OS == "linux"))', { + (skia_os == "nacl" and OS == "linux") or \ + (skia_os == "chromeos" and OS == "linux"))', { 'error': ' Date: Tue, 25 Jun 2013 20:45:40 +0000 Subject: Basic support for Type3 Fonts in Pdf + various refactorings Review URL: https://codereview.chromium.org/17748002 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@9757 2bbb7eff-a529-9590-31e7-b0007b416f81 --- pdfviewer.gyp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pdfviewer.gyp b/pdfviewer.gyp index fd5eccb..b8e605f 100644 --- a/pdfviewer.gyp +++ b/pdfviewer.gyp @@ -20,6 +20,7 @@ 'cflags_cc!': [ '-fno-exceptions' ], 'sources': [ '../experimental/PdfViewer/pdf_viewer_main.cpp', + #'../experimental/PdfViewer/SkPdfFont.cpp', ], 'include_dirs': [ '../third_party/externals/podofo/src/base', @@ -27,6 +28,7 @@ '../third_party/externals/podofo', '../tools', '../experimental/PdfViewer', + '../experimental/PdfViewer/autogen', ], 'dependencies': [ 'core.gyp:core', -- cgit v1.2.3 From db7e4117fc7c58797aaafaad68e74b0daae9c82c Mon Sep 17 00:00:00 2001 From: "robertphillips@google.com" Date: Wed, 26 Jun 2013 17:06:45 +0000 Subject: Add a new GM for very thin stroke widths git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@9770 2bbb7eff-a529-9590-31e7-b0007b416f81 --- gmslides.gypi | 1 + 1 file changed, 1 insertion(+) diff --git a/gmslides.gypi b/gmslides.gypi index eeb3c92..69516c0 100644 --- a/gmslides.gypi +++ b/gmslides.gypi @@ -107,6 +107,7 @@ '../gm/testimagefilters.cpp', '../gm/texdata.cpp', '../gm/thinrects.cpp', + '../gm/thinstrokedrects.cpp', '../gm/tilemodes.cpp', '../gm/tinybitmap.cpp', '../gm/twopointradial.cpp', -- cgit v1.2.3 From 4327639890f4d8704a4607e9c5cd19c8df69ab47 Mon Sep 17 00:00:00 2001 From: "edisonn@google.com" Date: Wed, 26 Jun 2013 17:48:12 +0000 Subject: refactoring for pdf viewer lib Review URL: https://codereview.chromium.org/17856004 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@9773 2bbb7eff-a529-9590-31e7-b0007b416f81 --- pdfviewer.gyp | 51 ++++++++++++++++++++++++++++++++------------------- 1 file changed, 32 insertions(+), 19 deletions(-) diff --git a/pdfviewer.gyp b/pdfviewer.gyp index b8e605f..967002c 100644 --- a/pdfviewer.gyp +++ b/pdfviewer.gyp @@ -12,15 +12,19 @@ ], 'targets': [ { - 'target_name': 'pdfviewer', - 'type': 'executable', + 'target_name': 'libpdfviewer', + 'type': 'static_library', 'cflags': ['-fexceptions'], 'cflags_cc': ['-fexceptions'], 'cflags!': [ '-fno-exceptions' ], 'cflags_cc!': [ '-fno-exceptions' ], 'sources': [ - '../experimental/PdfViewer/pdf_viewer_main.cpp', - #'../experimental/PdfViewer/SkPdfFont.cpp', + '../experimental/PdfViewer/SkPdfBasics.cpp', + '../experimental/PdfViewer/SkPdfFont.cpp', + '../experimental/PdfViewer/SkPdfParser.cpp', + '../experimental/PdfViewer/SkPdfUtils.cpp', + '../experimental/PdfViewer/autogen/SkPdfPodofoMapper_autogen.cpp', + '../experimental/PdfViewer/autogen/SkPdfHeaders_autogen.cpp', ], 'include_dirs': [ '../third_party/externals/podofo/src/base', @@ -47,21 +51,30 @@ 'BUILDING_PODOFO', ], }, - ], - 'conditions': [ - ['skia_os == "win"', - { - 'targets': [ - { - 'target_name': 'win_lcid', - 'type': 'executable', - 'sources': [ - '../tools/win_lcid.cpp', - ], - }, - ], - }, - ], + { + 'target_name': 'pdfviewer', + 'type': 'executable', + 'cflags': ['-fexceptions'], + 'cflags_cc': ['-fexceptions'], + 'cflags!': [ '-fno-exceptions' ], + 'cflags_cc!': [ '-fno-exceptions' ], + 'sources': [ + '../experimental/PdfViewer/pdf_viewer_main.cpp', + ], + 'include_dirs': [ + '../third_party/externals/podofo/src/base', + '../third_party/externals/podofo/src', + '../third_party/externals/podofo', + '../tools', + '../experimental/PdfViewer', + '../experimental/PdfViewer/autogen', + ], + 'dependencies': [ + 'core.gyp:core', + 'images.gyp:images', + 'libpdfviewer', + ], + }, ], } -- cgit v1.2.3 From 44334e8e495a72b2cdf61cd171eaa70eca468f03 Mon Sep 17 00:00:00 2001 From: "scroggo@google.com" Date: Fri, 28 Jun 2013 21:32:00 +0000 Subject: Replace SkPicture(SkStream) constructors with a factory. SkPicture: Remove the constructors which take an SkStream as an argument. Rather than having to check a variable for success, the factory will return NULL on failure. Add a protected function for determining if an SkStream is an SKP to share code with SkTimedPicture. In the factory, check for a NULL SkStream. Use a default decoder (from BUG: https://code.google.com/p/skia/issues/detail?id=1325) SkDebuggerGUI: Call SkPicture::CreateFromStream when necessary. Write a factory for creating SkTimedPictures and use it. Use the factory throughout tools. Add include/lazy to utils and effects gyp include_dirs so SkPicture.h can reference SkImageDecoder.h which references SkBitmapFactory.h (in include/lazy). Changes code Chromium uses, so this will require a temporary Skia and then a change to Chromium to use the new Skia code. TODO: Create a decoder that does nothing to be used by pinspect, lua pictures, etc, and allow it to not assert in SkOrderedReadBuffer. R=reed@google.com Review URL: https://codereview.chromium.org/17113004 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@9822 2bbb7eff-a529-9590-31e7-b0007b416f81 --- effects.gyp | 2 ++ utils.gyp | 2 ++ 2 files changed, 4 insertions(+) diff --git a/effects.gyp b/effects.gyp index 91458eb..d69c820 100644 --- a/effects.gyp +++ b/effects.gyp @@ -1,3 +1,4 @@ +# Gyp file for effects { 'targets': [ { @@ -12,6 +13,7 @@ '../include/config', '../include/core', '../include/effects', + '../include/lazy', '../include/utils', '../src/core', ], diff --git a/utils.gyp b/utils.gyp index 4ac9284..1b51b18 100644 --- a/utils.gyp +++ b/utils.gyp @@ -1,3 +1,4 @@ +# Gyp for utils. { 'targets': [ { @@ -10,6 +11,7 @@ '../include/core', '../include/effects', '../include/images', + '../include/lazy', '../include/pipe', '../include/utils', '../include/utils/mac', -- cgit v1.2.3 From 0abfd226fe5c6ea6dfb1a905dd4c520864b584fc Mon Sep 17 00:00:00 2001 From: "edisonn@google.com" Date: Fri, 28 Jun 2013 22:01:06 +0000 Subject: refactor folders to make prepare for native pdf parser Review URL: https://codereview.chromium.org/18179007 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@9825 2bbb7eff-a529-9590-31e7-b0007b416f81 --- pdfviewer.gyp | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/pdfviewer.gyp b/pdfviewer.gyp index 967002c..3f78a48 100644 --- a/pdfviewer.gyp +++ b/pdfviewer.gyp @@ -23,8 +23,8 @@ '../experimental/PdfViewer/SkPdfFont.cpp', '../experimental/PdfViewer/SkPdfParser.cpp', '../experimental/PdfViewer/SkPdfUtils.cpp', - '../experimental/PdfViewer/autogen/SkPdfPodofoMapper_autogen.cpp', - '../experimental/PdfViewer/autogen/SkPdfHeaders_autogen.cpp', + '../experimental/PdfViewer/pdfparser/podofo/autogen/SkPdfPodofoMapper_autogen.cpp', + '../experimental/PdfViewer/pdfparser/podofo/autogen/SkPdfHeaders_autogen.cpp', ], 'include_dirs': [ '../third_party/externals/podofo/src/base', @@ -32,7 +32,11 @@ '../third_party/externals/podofo', '../tools', '../experimental/PdfViewer', - '../experimental/PdfViewer/autogen', + '../experimental/PdfViewer/pdfparser', + '../experimental/PdfViewer/pdfparser/podofo', + '../experimental/PdfViewer/pdfparser/podofo/autogen', + #'../experimental/PdfViewer/pdfparser/native', + #'../experimental/PdfViewer/pdfparser/native/autogen', ], 'dependencies': [ 'core.gyp:core', -- cgit v1.2.3 From e45146f26bb8bd5ac2a0ec354b93577d9c578feb Mon Sep 17 00:00:00 2001 From: "commit-bot@chromium.org" Date: Mon, 1 Jul 2013 17:50:29 +0000 Subject: Adding my Bitmap2Path sample for 1on1 meeting. BUG= R=reed@google.com, borenet@google.com Author: dierk@google.com Review URL: https://chromiumcodereview.appspot.com/16829003 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@9843 2bbb7eff-a529-9590-31e7-b0007b416f81 --- SampleApp.gyp | 1 + bench.gypi | 1 + tests.gyp | 1 + utils.gyp | 2 ++ 4 files changed, 5 insertions(+) diff --git a/SampleApp.gyp b/SampleApp.gyp index f8ba962..fcf8016 100644 --- a/SampleApp.gyp +++ b/SampleApp.gyp @@ -86,6 +86,7 @@ '../samplecode/SamplePatch.cpp', '../samplecode/SamplePath.cpp', '../samplecode/SamplePathClip.cpp', + '../samplecode/SamplePathUtils.cpp', '../samplecode/SamplePathEffects.cpp', '../samplecode/SamplePicture.cpp', '../samplecode/SamplePictFile.cpp', diff --git a/bench.gypi b/bench.gypi index 2be3f22..7c5e1a3 100644 --- a/bench.gypi +++ b/bench.gypi @@ -44,6 +44,7 @@ '../bench/MutexBench.cpp', '../bench/PathBench.cpp', '../bench/PathIterBench.cpp', + '../bench/PathUtilsBench.cpp', '../bench/PerlinNoiseBench.cpp', '../bench/PicturePlaybackBench.cpp', '../bench/PictureRecordBench.cpp', diff --git a/tests.gyp b/tests.gyp index 3bdf18d..bcc61b5 100644 --- a/tests.gyp +++ b/tests.gyp @@ -83,6 +83,7 @@ '../tests/PathCoverageTest.cpp', '../tests/PathMeasureTest.cpp', '../tests/PathTest.cpp', + '../tests/PathUtilsTest.cpp', '../tests/PDFPrimitivesTest.cpp', '../tests/PictureTest.cpp', '../tests/PictureUtilsTest.cpp', diff --git a/utils.gyp b/utils.gyp index 1b51b18..07f8921 100644 --- a/utils.gyp +++ b/utils.gyp @@ -12,6 +12,7 @@ '../include/effects', '../include/images', '../include/lazy', + '../include/pathops', '../include/pipe', '../include/utils', '../include/utils/mac', @@ -82,6 +83,7 @@ '../src/utils/SkParseColor.cpp', '../src/utils/SkParsePath.cpp', '../src/utils/SkPictureUtils.cpp', + '../src/utils/SkPathUtils.cpp', '../src/utils/SkProxyCanvas.cpp', '../src/utils/SkSHA1.cpp', '../src/utils/SkSHA1.h', -- cgit v1.2.3 From 0a7dcabccbbc0aca085eafb3789350388b422c02 Mon Sep 17 00:00:00 2001 From: "reed@google.com" Date: Tue, 2 Jul 2013 13:56:39 +0000 Subject: add charsToGlyphs to SkTypeface Will disable new unittest until all backends are implemented. On Mac, new API is 4x faster than old paint one, so next CL I will reimplement the paint calls in terms of the new typeface call. R=eae@chromium.org Review URL: https://codereview.chromium.org/18083023 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@9860 2bbb7eff-a529-9590-31e7-b0007b416f81 --- bench.gypi | 1 + 1 file changed, 1 insertion(+) diff --git a/bench.gypi b/bench.gypi index 7c5e1a3..37e6552 100644 --- a/bench.gypi +++ b/bench.gypi @@ -17,6 +17,7 @@ '../bench/ChecksumBench.cpp', '../bench/ChartBench.cpp', '../bench/ChromeBench.cpp', + '../bench/CmapBench.cpp', '../bench/ColorFilterBench.cpp', '../bench/DashBench.cpp', '../bench/DecodeBench.cpp', -- cgit v1.2.3 From c3128d524c209a9f86a7cfc098e0adb7074c640e Mon Sep 17 00:00:00 2001 From: "edisonn@google.com" Date: Tue, 2 Jul 2013 22:42:53 +0000 Subject: isolate podofo to prepare for native parser, autogenerate PDF API during build Review URL: https://codereview.chromium.org/18042005 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@9879 2bbb7eff-a529-9590-31e7-b0007b416f81 --- pdfviewer.gyp | 50 +++++++++++++++++++++++++++++++++++++++++++------- 1 file changed, 43 insertions(+), 7 deletions(-) diff --git a/pdfviewer.gyp b/pdfviewer.gyp index 3f78a48..55e6b1b 100644 --- a/pdfviewer.gyp +++ b/pdfviewer.gyp @@ -23,8 +23,45 @@ '../experimental/PdfViewer/SkPdfFont.cpp', '../experimental/PdfViewer/SkPdfParser.cpp', '../experimental/PdfViewer/SkPdfUtils.cpp', - '../experimental/PdfViewer/pdfparser/podofo/autogen/SkPdfPodofoMapper_autogen.cpp', + #'../experimental/PdfViewer/SkPdfNYI.cpp', + #podofo + '../experimental/PdfViewer/pdfparser/podofo/SkPdfPodofoTokenizer.cpp', + '../experimental/PdfViewer/pdfparser/podofo/SkPodofoParsedPDF.cpp', + '../experimental/PdfViewer/pdfparser/podofo/SkPodofoUtils.cpp', + '../experimental/PdfViewer/pdfparser/podofo/autogen/SkPdfMapper_autogen.cpp', '../experimental/PdfViewer/pdfparser/podofo/autogen/SkPdfHeaders_autogen.cpp', + #native TODO + + # libraries.cc is generated by the js2c action below. + #'<(INTERMEDIATE_DIR)/libraries.cc', + ], + 'actions': [ + { + 'action_name': 'spec2def', + 'inputs': [ + '../experimental/PdfViewer/spec2def.py', + '../experimental/PdfViewer/PdfReference-okular-1.txt', + ], + 'outputs': [ + '../experimental/PdfViewer/autogen/pdfspec_autogen.py', + ], + 'action': ['python', '../experimental/PdfViewer/spec2def.py', '../experimental/PdfViewer/PdfReference-okular-1.txt', '../experimental/PdfViewer/autogen/pdfspec_autogen.py'], + }, + { + 'action_name': 'generate_code', + 'inputs': [ + '../experimental/PdfViewer/generate_code.py', + '../experimental/PdfViewer/autogen/pdfspec_autogen.py', + ], + 'outputs': [ + '../experimental/PdfViewer/pdfparser/autogen/SkPdfEnums_autogen.h', + '../experimental/PdfViewer/pdfparser/podofo/autogen/SkPdfMapper_autogen.cpp', + '../experimental/PdfViewer/pdfparser/podofo/autogen/SkPdfHeaders_autogen.cpp', + # TODO(edisonn): ok, there are many more files here, which we should list but since + # any change in the above should trigger a change here, we should be fine normally + ], + 'action': ['python', '../experimental/PdfViewer/generate_code.py', '../experimental/PdfViewer/pdfparser/'], + }, ], 'include_dirs': [ '../third_party/externals/podofo/src/base', @@ -33,10 +70,9 @@ '../tools', '../experimental/PdfViewer', '../experimental/PdfViewer/pdfparser', + '../experimental/PdfViewer/pdfparser/autogen', '../experimental/PdfViewer/pdfparser/podofo', '../experimental/PdfViewer/pdfparser/podofo/autogen', - #'../experimental/PdfViewer/pdfparser/native', - #'../experimental/PdfViewer/pdfparser/native/autogen', ], 'dependencies': [ 'core.gyp:core', @@ -66,12 +102,12 @@ '../experimental/PdfViewer/pdf_viewer_main.cpp', ], 'include_dirs': [ - '../third_party/externals/podofo/src/base', - '../third_party/externals/podofo/src', - '../third_party/externals/podofo', '../tools', '../experimental/PdfViewer', - '../experimental/PdfViewer/autogen', + '../experimental/PdfViewer/pdfparser', + '../experimental/PdfViewer/pdfparser/autogen', + '../experimental/PdfViewer/pdfparser/podofo', + '../experimental/PdfViewer/pdfparser/podofo/autogen', ], 'dependencies': [ 'core.gyp:core', -- cgit v1.2.3 From a02e78095e35b5c25141ee11ad610ecd3f5a9bf4 Mon Sep 17 00:00:00 2001 From: "borenet@google.com" Date: Wed, 3 Jul 2013 15:55:05 +0000 Subject: Enable ASAN build Requires Clang 3.1 or higher to be installed. R=epoger@google.com Review URL: https://codereview.chromium.org/18205007 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@9891 2bbb7eff-a529-9590-31e7-b0007b416f81 --- common_conditions.gypi | 9 +++++++++ common_variables.gypi | 1 + 2 files changed, 10 insertions(+) diff --git a/common_conditions.gypi b/common_conditions.gypi index 4aa503d..6fabfdc 100644 --- a/common_conditions.gypi +++ b/common_conditions.gypi @@ -210,6 +210,15 @@ }], ], }], + [ 'skia_asan_build', { + 'cflags': [ + '-fsanitize=address', + '-fno-omit-frame-pointer', + ], + 'ldflags': [ + '-fsanitize=address', + ], + }], ], }, ], diff --git a/common_variables.gypi b/common_variables.gypi index 3a42fdc..67049e3 100644 --- a/common_variables.gypi +++ b/common_variables.gypi @@ -142,6 +142,7 @@ 'skia_static_initializers%': '<(skia_static_initializers)', 'ios_sdk_version%': '6.0', 'skia_win_debuggers_path%': '<(skia_win_debuggers_path)', + 'skia_asan_build%': 0, # These are referenced by our .gypi files that list files (e.g. core.gypi) # -- cgit v1.2.3 From cd04dd52bfbd262f7578f6b2d0f72d961486020d Mon Sep 17 00:00:00 2001 From: "robertphillips@google.com" Date: Tue, 9 Jul 2013 15:03:59 +0000 Subject: GM (and fix) for drawArc capping issue https://codereview.chromium.org/18271003/ git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@9928 2bbb7eff-a529-9590-31e7-b0007b416f81 --- gmslides.gypi | 1 + 1 file changed, 1 insertion(+) diff --git a/gmslides.gypi b/gmslides.gypi index 69516c0..66f869f 100644 --- a/gmslides.gypi +++ b/gmslides.gypi @@ -4,6 +4,7 @@ '../gm/aaclip.cpp', '../gm/aarectmodes.cpp', '../gm/alphagradients.cpp', + '../gm/arcofzorro.cpp', '../gm/arithmode.cpp', '../gm/bicubicfilter.cpp', '../gm/bigmatrix.cpp', -- cgit v1.2.3 From 1c10e475f4e43bbfacb72861290074bb7e46a5c3 Mon Sep 17 00:00:00 2001 From: "humper@google.com" Date: Tue, 9 Jul 2013 17:48:15 +0000 Subject: More general image filter interface; tested implementation of standalone image scaler (not yet plumbed). High quality downsampler. Fast SSE resampler. BUG= R=reed@google.com Review URL: https://codereview.chromium.org/17381008 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@9936 2bbb7eff-a529-9590-31e7-b0007b416f81 --- bench.gypi | 1 - core.gypi | 3 ++- gmslides.gypi | 1 + opts.gyp | 4 ++++ 4 files changed, 7 insertions(+), 2 deletions(-) diff --git a/bench.gypi b/bench.gypi index 37e6552..956fec9 100644 --- a/bench.gypi +++ b/bench.gypi @@ -5,7 +5,6 @@ '../bench/benchmain.cpp', '../bench/SkBenchmark.h', '../bench/SkBenchmark.cpp', - '../bench/AAClipBench.cpp', '../bench/BicubicBench.cpp', '../bench/BitmapBench.cpp', diff --git a/core.gypi b/core.gypi index 2703231..e87c0f4 100644 --- a/core.gypi +++ b/core.gypi @@ -21,13 +21,14 @@ '<(skia_src_path)/core/SkBBoxHierarchyRecord.cpp', '<(skia_src_path)/core/SkBBoxHierarchyRecord.h', '<(skia_src_path)/core/SkBitmap.cpp', + '<(skia_src_path)/core/SkBitmapFilter.h', + '<(skia_src_path)/core/SkBitmapFilter.cpp', '<(skia_src_path)/core/SkBitmapHeap.cpp', '<(skia_src_path)/core/SkBitmapHeap.h', '<(skia_src_path)/core/SkBitmapProcShader.cpp', '<(skia_src_path)/core/SkBitmapProcShader.h', '<(skia_src_path)/core/SkBitmapProcState.cpp', '<(skia_src_path)/core/SkBitmapProcState.h', - '<(skia_src_path)/core/SkBitmapProcBicubic.cpp', '<(skia_src_path)/core/SkBitmapProcState_matrix.h', '<(skia_src_path)/core/SkBitmapProcState_matrixProcs.cpp', '<(skia_src_path)/core/SkBitmapProcState_sample.h', diff --git a/gmslides.gypi b/gmslides.gypi index 66f869f..0b640a2 100644 --- a/gmslides.gypi +++ b/gmslides.gypi @@ -89,6 +89,7 @@ '../gm/rrects.cpp', '../gm/roundrects.cpp', '../gm/samplerstress.cpp', + # '../gm/scalebitmap.cpp', '../gm/shaderbounds.cpp', '../gm/selftest.cpp', '../gm/shadertext.cpp', diff --git a/opts.gyp b/opts.gyp index 2c87b81..bcc85a9 100644 --- a/opts.gyp +++ b/opts.gyp @@ -43,9 +43,13 @@ ], }], ], + 'include_dirs': [ + '../include/utils', + ], 'sources': [ '../src/opts/opts_check_SSE2.cpp', '../src/opts/SkBitmapProcState_opts_SSE2.cpp', + '../src/opts/SkBitmapFilter_opts_SSE2.cpp', '../src/opts/SkBlitRow_opts_SSE2.cpp', '../src/opts/SkBlitRect_opts_SSE2.cpp', '../src/opts/SkUtils_opts_SSE2.cpp', -- cgit v1.2.3 From ae1221683364d05faf8c3c15137dada6ea8926c7 Mon Sep 17 00:00:00 2001 From: "humper@google.com" Date: Tue, 9 Jul 2013 18:02:06 +0000 Subject: Revert "More general image filter interface; tested implementation of standalone" This reverts commit 4df3e8b079e019af5f60c13e7e6ec6589663962a. git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@9937 2bbb7eff-a529-9590-31e7-b0007b416f81 --- bench.gypi | 1 + core.gypi | 3 +-- gmslides.gypi | 1 - opts.gyp | 4 ---- 4 files changed, 2 insertions(+), 7 deletions(-) diff --git a/bench.gypi b/bench.gypi index 956fec9..37e6552 100644 --- a/bench.gypi +++ b/bench.gypi @@ -5,6 +5,7 @@ '../bench/benchmain.cpp', '../bench/SkBenchmark.h', '../bench/SkBenchmark.cpp', + '../bench/AAClipBench.cpp', '../bench/BicubicBench.cpp', '../bench/BitmapBench.cpp', diff --git a/core.gypi b/core.gypi index e87c0f4..2703231 100644 --- a/core.gypi +++ b/core.gypi @@ -21,14 +21,13 @@ '<(skia_src_path)/core/SkBBoxHierarchyRecord.cpp', '<(skia_src_path)/core/SkBBoxHierarchyRecord.h', '<(skia_src_path)/core/SkBitmap.cpp', - '<(skia_src_path)/core/SkBitmapFilter.h', - '<(skia_src_path)/core/SkBitmapFilter.cpp', '<(skia_src_path)/core/SkBitmapHeap.cpp', '<(skia_src_path)/core/SkBitmapHeap.h', '<(skia_src_path)/core/SkBitmapProcShader.cpp', '<(skia_src_path)/core/SkBitmapProcShader.h', '<(skia_src_path)/core/SkBitmapProcState.cpp', '<(skia_src_path)/core/SkBitmapProcState.h', + '<(skia_src_path)/core/SkBitmapProcBicubic.cpp', '<(skia_src_path)/core/SkBitmapProcState_matrix.h', '<(skia_src_path)/core/SkBitmapProcState_matrixProcs.cpp', '<(skia_src_path)/core/SkBitmapProcState_sample.h', diff --git a/gmslides.gypi b/gmslides.gypi index 0b640a2..66f869f 100644 --- a/gmslides.gypi +++ b/gmslides.gypi @@ -89,7 +89,6 @@ '../gm/rrects.cpp', '../gm/roundrects.cpp', '../gm/samplerstress.cpp', - # '../gm/scalebitmap.cpp', '../gm/shaderbounds.cpp', '../gm/selftest.cpp', '../gm/shadertext.cpp', diff --git a/opts.gyp b/opts.gyp index bcc85a9..2c87b81 100644 --- a/opts.gyp +++ b/opts.gyp @@ -43,13 +43,9 @@ ], }], ], - 'include_dirs': [ - '../include/utils', - ], 'sources': [ '../src/opts/opts_check_SSE2.cpp', '../src/opts/SkBitmapProcState_opts_SSE2.cpp', - '../src/opts/SkBitmapFilter_opts_SSE2.cpp', '../src/opts/SkBlitRow_opts_SSE2.cpp', '../src/opts/SkBlitRect_opts_SSE2.cpp', '../src/opts/SkUtils_opts_SSE2.cpp', -- cgit v1.2.3 From 409562b57d9b0bb2ff2228f1f164b90668d76f71 Mon Sep 17 00:00:00 2001 From: "commit-bot@chromium.org" Date: Tue, 9 Jul 2013 19:43:29 +0000 Subject: Added GM and Bench Added GM's and Bench Added GM file nate_gradients.cpp BUG= R=reed@google.com, bsalomon@google.com Author: dierk@google.com Review URL: https://chromiumcodereview.appspot.com/18259012 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@9938 2bbb7eff-a529-9590-31e7-b0007b416f81 --- gmslides.gypi | 1 + 1 file changed, 1 insertion(+) diff --git a/gmslides.gypi b/gmslides.gypi index 66f869f..480279a 100644 --- a/gmslides.gypi +++ b/gmslides.gypi @@ -50,6 +50,7 @@ '../gm/getpostextpath.cpp', '../gm/giantbitmap.cpp', '../gm/gradients.cpp', + '../gm/gradientDirtyLaundry.cpp', '../gm/gradient_matrix.cpp', '../gm/gradtext.cpp', '../gm/hairlines.cpp', -- cgit v1.2.3 From fa1ea893b48e8cbefda6c7da1faaf1acf9944458 Mon Sep 17 00:00:00 2001 From: "humper@google.com" Date: Tue, 9 Jul 2013 21:37:14 +0000 Subject: New bitmap filter checkin; this time with less build breakage BUG= Review URL: https://codereview.chromium.org/18942002 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@9944 2bbb7eff-a529-9590-31e7-b0007b416f81 --- bench.gypi | 1 - core.gypi | 3 ++- gmslides.gypi | 1 + opts.gyp | 4 ++++ 4 files changed, 7 insertions(+), 2 deletions(-) diff --git a/bench.gypi b/bench.gypi index 37e6552..956fec9 100644 --- a/bench.gypi +++ b/bench.gypi @@ -5,7 +5,6 @@ '../bench/benchmain.cpp', '../bench/SkBenchmark.h', '../bench/SkBenchmark.cpp', - '../bench/AAClipBench.cpp', '../bench/BicubicBench.cpp', '../bench/BitmapBench.cpp', diff --git a/core.gypi b/core.gypi index 2703231..e87c0f4 100644 --- a/core.gypi +++ b/core.gypi @@ -21,13 +21,14 @@ '<(skia_src_path)/core/SkBBoxHierarchyRecord.cpp', '<(skia_src_path)/core/SkBBoxHierarchyRecord.h', '<(skia_src_path)/core/SkBitmap.cpp', + '<(skia_src_path)/core/SkBitmapFilter.h', + '<(skia_src_path)/core/SkBitmapFilter.cpp', '<(skia_src_path)/core/SkBitmapHeap.cpp', '<(skia_src_path)/core/SkBitmapHeap.h', '<(skia_src_path)/core/SkBitmapProcShader.cpp', '<(skia_src_path)/core/SkBitmapProcShader.h', '<(skia_src_path)/core/SkBitmapProcState.cpp', '<(skia_src_path)/core/SkBitmapProcState.h', - '<(skia_src_path)/core/SkBitmapProcBicubic.cpp', '<(skia_src_path)/core/SkBitmapProcState_matrix.h', '<(skia_src_path)/core/SkBitmapProcState_matrixProcs.cpp', '<(skia_src_path)/core/SkBitmapProcState_sample.h', diff --git a/gmslides.gypi b/gmslides.gypi index 480279a..35d326e 100644 --- a/gmslides.gypi +++ b/gmslides.gypi @@ -90,6 +90,7 @@ '../gm/rrects.cpp', '../gm/roundrects.cpp', '../gm/samplerstress.cpp', + # '../gm/scalebitmap.cpp', '../gm/shaderbounds.cpp', '../gm/selftest.cpp', '../gm/shadertext.cpp', diff --git a/opts.gyp b/opts.gyp index 2c87b81..bcc85a9 100644 --- a/opts.gyp +++ b/opts.gyp @@ -43,9 +43,13 @@ ], }], ], + 'include_dirs': [ + '../include/utils', + ], 'sources': [ '../src/opts/opts_check_SSE2.cpp', '../src/opts/SkBitmapProcState_opts_SSE2.cpp', + '../src/opts/SkBitmapFilter_opts_SSE2.cpp', '../src/opts/SkBlitRow_opts_SSE2.cpp', '../src/opts/SkBlitRect_opts_SSE2.cpp', '../src/opts/SkUtils_opts_SSE2.cpp', -- cgit v1.2.3 From 9fd813656a8b19565254f63fbc47728906b2337d Mon Sep 17 00:00:00 2001 From: "edisonn@google.com" Date: Wed, 10 Jul 2013 17:09:50 +0000 Subject: Native PDF parser implementation - don't try it on pdfs that are not generated by skia, Crome Print Preview or Chrome Save As Pdf - it will crash as mising xref, pdfs with updates, and other features are not supported yer. Review URL: https://codereview.chromium.org/18323019 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@9962 2bbb7eff-a529-9590-31e7-b0007b416f81 --- pdfviewer.gyp | 34 +++++++++++----------------------- 1 file changed, 11 insertions(+), 23 deletions(-) diff --git a/pdfviewer.gyp b/pdfviewer.gyp index 55e6b1b..95e0421 100644 --- a/pdfviewer.gyp +++ b/pdfviewer.gyp @@ -24,16 +24,11 @@ '../experimental/PdfViewer/SkPdfParser.cpp', '../experimental/PdfViewer/SkPdfUtils.cpp', #'../experimental/PdfViewer/SkPdfNYI.cpp', - #podofo - '../experimental/PdfViewer/pdfparser/podofo/SkPdfPodofoTokenizer.cpp', - '../experimental/PdfViewer/pdfparser/podofo/SkPodofoParsedPDF.cpp', - '../experimental/PdfViewer/pdfparser/podofo/SkPodofoUtils.cpp', - '../experimental/PdfViewer/pdfparser/podofo/autogen/SkPdfMapper_autogen.cpp', - '../experimental/PdfViewer/pdfparser/podofo/autogen/SkPdfHeaders_autogen.cpp', - #native TODO - - # libraries.cc is generated by the js2c action below. - #'<(INTERMEDIATE_DIR)/libraries.cc', + '../experimental/PdfViewer/pdfparser/native/SkPdfObject.cpp', + '../experimental/PdfViewer/pdfparser/native/SkPdfNativeTokenizer.cpp', + '../experimental/PdfViewer/pdfparser/native/SkNativeParsedPDF.cpp', + '../experimental/PdfViewer/pdfparser/native/autogen/SkPdfMapper_autogen.cpp', + '../experimental/PdfViewer/pdfparser/native/autogen/SkPdfHeaders_autogen.cpp', ], 'actions': [ { @@ -55,8 +50,8 @@ ], 'outputs': [ '../experimental/PdfViewer/pdfparser/autogen/SkPdfEnums_autogen.h', - '../experimental/PdfViewer/pdfparser/podofo/autogen/SkPdfMapper_autogen.cpp', - '../experimental/PdfViewer/pdfparser/podofo/autogen/SkPdfHeaders_autogen.cpp', + '../experimental/PdfViewer/pdfparser/native/autogen/SkPdfMapper_autogen.cpp', + '../experimental/PdfViewer/pdfparser/native/autogen/SkPdfHeaders_autogen.cpp', # TODO(edisonn): ok, there are many more files here, which we should list but since # any change in the above should trigger a change here, we should be fine normally ], @@ -64,15 +59,12 @@ }, ], 'include_dirs': [ - '../third_party/externals/podofo/src/base', - '../third_party/externals/podofo/src', - '../third_party/externals/podofo', '../tools', '../experimental/PdfViewer', '../experimental/PdfViewer/pdfparser', '../experimental/PdfViewer/pdfparser/autogen', - '../experimental/PdfViewer/pdfparser/podofo', - '../experimental/PdfViewer/pdfparser/podofo/autogen', + '../experimental/PdfViewer/pdfparser/native', + '../experimental/PdfViewer/pdfparser/native/autogen', ], 'dependencies': [ 'core.gyp:core', @@ -81,15 +73,11 @@ 'pdf.gyp:pdf', 'ports.gyp:ports', 'tools.gyp:picture_utils', - '../third_party/externals/podofo/podofo.gyp:podofo', ], 'link_settings': { 'libraries': [ ], }, - 'defines': [ - 'BUILDING_PODOFO', - ], }, { 'target_name': 'pdfviewer', @@ -106,8 +94,8 @@ '../experimental/PdfViewer', '../experimental/PdfViewer/pdfparser', '../experimental/PdfViewer/pdfparser/autogen', - '../experimental/PdfViewer/pdfparser/podofo', - '../experimental/PdfViewer/pdfparser/podofo/autogen', + '../experimental/PdfViewer/pdfparser/native', + '../experimental/PdfViewer/pdfparser/native/autogen', ], 'dependencies': [ 'core.gyp:core', -- cgit v1.2.3 From fdeccc4d5e5c95833f130697af3900aa8f9b174c Mon Sep 17 00:00:00 2001 From: "edisonn@google.com" Date: Wed, 10 Jul 2013 17:44:55 +0000 Subject: pdf viewer: fix a few warnings, and enable warning as errors Review URL: https://codereview.chromium.org/18293012 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@9966 2bbb7eff-a529-9590-31e7-b0007b416f81 --- pdfviewer.gyp | 3 --- 1 file changed, 3 deletions(-) diff --git a/pdfviewer.gyp b/pdfviewer.gyp index 95e0421..4093d97 100644 --- a/pdfviewer.gyp +++ b/pdfviewer.gyp @@ -4,9 +4,6 @@ # ./gyp_skia pdfviewer.gyp && make pdfviewer # { - 'variables': { - 'skia_warnings_as_errors': 0, - }, 'includes': [ 'apptype_console.gypi', ], -- cgit v1.2.3 From 0dc1ad131d545ba566283b2ddeb1be19af21f81a Mon Sep 17 00:00:00 2001 From: "edisonn@google.com" Date: Wed, 10 Jul 2013 22:33:10 +0000 Subject: pdf viewer: refactor, add -w parameter to pdfviewer, add -n to remove extenassion page when there is a single page (so skdiff can be run easily) and fix a bug (SkPdfobject should not reset on destruct) Review URL: https://codereview.chromium.org/18435007 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@9983 2bbb7eff-a529-9590-31e7-b0007b416f81 --- pdfviewer.gyp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pdfviewer.gyp b/pdfviewer.gyp index 4093d97..7fa11dc 100644 --- a/pdfviewer.gyp +++ b/pdfviewer.gyp @@ -18,7 +18,7 @@ 'sources': [ '../experimental/PdfViewer/SkPdfBasics.cpp', '../experimental/PdfViewer/SkPdfFont.cpp', - '../experimental/PdfViewer/SkPdfParser.cpp', + '../experimental/PdfViewer/SkPdfRenderer.cpp', '../experimental/PdfViewer/SkPdfUtils.cpp', #'../experimental/PdfViewer/SkPdfNYI.cpp', '../experimental/PdfViewer/pdfparser/native/SkPdfObject.cpp', -- cgit v1.2.3 From fda5586f1b9410366ab385bbff47b27e95e8c8d7 Mon Sep 17 00:00:00 2001 From: "edisonn@google.com" Date: Thu, 11 Jul 2013 12:27:21 +0000 Subject: pdfviewer: measure mem usage, command line flags library. Review URL: https://codereview.chromium.org/18562010 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@9996 2bbb7eff-a529-9590-31e7-b0007b416f81 --- pdfviewer.gyp | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/pdfviewer.gyp b/pdfviewer.gyp index 7fa11dc..0161a1e 100644 --- a/pdfviewer.gyp +++ b/pdfviewer.gyp @@ -56,7 +56,6 @@ }, ], 'include_dirs': [ - '../tools', '../experimental/PdfViewer', '../experimental/PdfViewer/pdfparser', '../experimental/PdfViewer/pdfparser/autogen', @@ -65,16 +64,9 @@ ], 'dependencies': [ 'core.gyp:core', - 'effects.gyp:effects', 'images.gyp:images', - 'pdf.gyp:pdf', - 'ports.gyp:ports', - 'tools.gyp:picture_utils', + 'zlib.gyp:zlib', ], - 'link_settings': { - 'libraries': [ - ], - }, }, { 'target_name': 'pdfviewer', @@ -87,7 +79,6 @@ '../experimental/PdfViewer/pdf_viewer_main.cpp', ], 'include_dirs': [ - '../tools', '../experimental/PdfViewer', '../experimental/PdfViewer/pdfparser', '../experimental/PdfViewer/pdfparser/autogen', @@ -96,8 +87,9 @@ ], 'dependencies': [ 'core.gyp:core', - 'images.gyp:images', + 'flags.gyp:flags', 'libpdfviewer', + 'tools.gyp:picture_utils', ], }, ], -- cgit v1.2.3 From 10a632fad269276387d3b7412181e0e04c2f9e8e Mon Sep 17 00:00:00 2001 From: "commit-bot@chromium.org" Date: Thu, 11 Jul 2013 12:48:14 +0000 Subject: ARM Skia NEON patches - 10 - ARM build ARM-Build: make Linux arm/NEON builds possible This factorizes the definitions common to Linux & assimilated and Android. It also enables to do native builds on Linux for ARM processors. BUG= R=djsollen@google.com, borenet@google.com Author: kevin.petit.arm@gmail.com Review URL: https://chromiumcodereview.appspot.com/18243007 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@9997 2bbb7eff-a529-9590-31e7-b0007b416f81 --- common_conditions.gypi | 105 ++++++++++++++++++++++++++----------------------- 1 file changed, 55 insertions(+), 50 deletions(-) diff --git a/common_conditions.gypi b/common_conditions.gypi index 6fabfdc..fe54bf3 100644 --- a/common_conditions.gypi +++ b/common_conditions.gypi @@ -17,6 +17,7 @@ ], }, ], + [ 'skia_os == "win"', { 'defines': [ @@ -126,6 +127,56 @@ }, ], + # The following section is common to linux + derivatives and android + [ 'skia_os in ["linux", "freebsd", "openbsd", "solaris", "nacl", "chromeos", "android"]', + { + 'conditions': [ + [ 'skia_warnings_as_errors', { + 'cflags': [ + '-Werror', + ], + }], + [ 'skia_arch_type == "arm" and arm_thumb == 1', { + 'cflags': [ + '-mthumb', + ], + }], + [ 'skia_arch_type == "arm" and armv7 == 1', { + 'variables': { + 'arm_neon_optional%': 0, + }, + 'defines': [ + '__ARM_ARCH__=7', + ], + 'cflags': [ + '-march=armv7-a', + '-mfloat-abi=softfp', + ], + 'conditions': [ + [ 'arm_neon == 1', { + 'defines': [ + '__ARM_HAVE_NEON', + ], + 'cflags': [ + '-mfpu=neon', + ], + 'ldflags': [ + '-march=armv7-a', + '-Wl,--fix-cortex-a8', + ], + }], + [ 'arm_neon_optional == 1', { + 'defines': [ + '__ARM_HAVE_OPTIONAL_NEON_SUPPORT', + ], + }], + ], + }], + ], + }, + ], + + [ 'skia_os in ["linux", "freebsd", "openbsd", "solaris", "nacl", "chromeos"]', { 'defines': [ @@ -163,11 +214,6 @@ 'SKIA_IMPLEMENTATION=1', ], }], - [ 'skia_warnings_as_errors', { - 'cflags': [ - '-Werror', - ], - }], [ 'skia_os == "nacl"', { 'defines': [ 'SK_BUILD_FOR_NACL', @@ -192,7 +238,7 @@ ], }, { 'conditions': [ - [ 'skia_arch_width == 64', { + [ 'skia_arch_width == 64 and skia_arch_type == "x86"', { 'cflags': [ '-m64', ], @@ -200,7 +246,7 @@ '-m64', ], }], - [ 'skia_arch_width == 32', { + [ 'skia_arch_width == 32 and skia_arch_type == "x86"', { 'cflags': [ '-m32', ], @@ -374,14 +420,6 @@ '-fno-rtti', ], 'conditions': [ - [ 'skia_warnings_as_errors', { - 'cflags': [ - '-Werror', - ], - }], - [ 'skia_profile_enabled == 1', { - 'cflags': ['-g', '-fno-omit-frame-pointer', '-marm', '-mapcs'], - }], [ 'skia_shared_lib', { 'cflags': [ '-fPIC', @@ -393,42 +431,9 @@ 'SKIA_IMPLEMENTATION=1', ], }], - [ 'skia_arch_type == "arm" and arm_thumb == 1', { - 'cflags': [ - '-mthumb', - ], + [ 'skia_profile_enabled == 1', { + 'cflags': ['-g', '-fno-omit-frame-pointer', '-marm', '-mapcs'], }], - [ 'skia_arch_type == "arm" and armv7 == 1', { - 'variables': { - 'arm_neon_optional%': 0, - }, - 'defines': [ - '__ARM_ARCH__=7', - ], - 'cflags': [ - '-march=armv7-a', - '-mfloat-abi=softfp', - ], - 'conditions': [ - [ 'arm_neon == 1', { - 'defines': [ - '__ARM_HAVE_NEON', - ], - 'cflags': [ - '-mfpu=neon', - ], - 'ldflags': [ - '-march=armv7-a', - '-Wl,--fix-cortex-a8', - ], - }], - [ 'arm_neon_optional == 1', { - 'defines': [ - '__ARM_HAVE_OPTIONAL_NEON_SUPPORT', - ], - }], - ], - }], ], }, ], -- cgit v1.2.3 From 321ce5dee4dad5b0ba08aec78079953720271ff1 Mon Sep 17 00:00:00 2001 From: "edisonn@google.com" Date: Thu, 11 Jul 2013 14:28:04 +0000 Subject: Add an option to have a PdfViewer in SampleApp. Add a parameter --pdfDir to pass the dir with pdfs. Add flag --sort to sort samples acording to title, so foo.skp follows foo.pdf and we can quickly compare diffs. The option needs to be enabled manually by developer to be compiled locally, since the pdf viewer is work in progress. R=reed@google.com Review URL: https://codereview.chromium.org/17904006 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@10004 2bbb7eff-a529-9590-31e7-b0007b416f81 --- SampleApp.gyp | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/SampleApp.gyp b/SampleApp.gyp index fcf8016..2574fc8 100644 --- a/SampleApp.gyp +++ b/SampleApp.gyp @@ -1,4 +1,8 @@ { + 'variables': { + #manaully set sample_pdf_file_viewer to 1 to have the PdfViewer in SampleApp + 'sample_pdf_file_viewer%': 0, + }, 'targets': [ { 'target_name': 'SampleApp', @@ -152,7 +156,21 @@ 'views_animated.gyp:views_animated', 'lua.gyp:lua', ], - 'conditions' : [ + 'conditions' : [ + [ 'sample_pdf_file_viewer == 1', { + 'defines': [ + 'SAMPLE_PDF_FILE_VIEWER', + ], + 'dependencies': [ + 'pdfviewer.gyp:libpdfviewer', + ], + 'include_dirs' : [ + '../experimental/PdfViewer/pdfparser/podofo', + ], + 'sources': [ + '../samplecode/SamplePdfFileViewer.cpp', + ] + }], [ 'skia_os in ["linux", "freebsd", "openbsd", "solaris", "chromeos"]', { 'sources!': [ '../samplecode/SampleDecode.cpp', -- cgit v1.2.3 From 7a150db5157e4c43eb9ab8483698e01415f5ad07 Mon Sep 17 00:00:00 2001 From: "edisonn@google.com" Date: Thu, 11 Jul 2013 14:45:20 +0000 Subject: (unreviewed) sample app: fix break in pdf viewer (podofo was replaced by native parser) Review URL: https://codereview.chromium.org/18507004 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@10007 2bbb7eff-a529-9590-31e7-b0007b416f81 --- SampleApp.gyp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SampleApp.gyp b/SampleApp.gyp index 2574fc8..b30fca7 100644 --- a/SampleApp.gyp +++ b/SampleApp.gyp @@ -165,7 +165,7 @@ 'pdfviewer.gyp:libpdfviewer', ], 'include_dirs' : [ - '../experimental/PdfViewer/pdfparser/podofo', + '../experimental/PdfViewer/', ], 'sources': [ '../samplecode/SamplePdfFileViewer.cpp', -- cgit v1.2.3 From cd2d014b924d4c32199e2a06aa84d941a8cd2109 Mon Sep 17 00:00:00 2001 From: "borenet@google.com" Date: Thu, 11 Jul 2013 18:46:30 +0000 Subject: Disable soft floating point on ChromeOS Should fix the Daisy build. R=djsollen@google.com Review URL: https://codereview.chromium.org/18812006 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@10020 2bbb7eff-a529-9590-31e7-b0007b416f81 --- common_conditions.gypi | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/common_conditions.gypi b/common_conditions.gypi index fe54bf3..2faf67d 100644 --- a/common_conditions.gypi +++ b/common_conditions.gypi @@ -150,7 +150,6 @@ ], 'cflags': [ '-march=armv7-a', - '-mfloat-abi=softfp', ], 'conditions': [ [ 'arm_neon == 1', { @@ -170,6 +169,11 @@ '__ARM_HAVE_OPTIONAL_NEON_SUPPORT', ], }], + [ 'skia_os != "chromeos"', { + 'cflags': [ + '-mfloat-abi=softfp', + ], + }], ], }], ], -- cgit v1.2.3 From 47c883c3fc4e77729c8eda574f89dd6532e01d86 Mon Sep 17 00:00:00 2001 From: "humper@google.com" Date: Thu, 11 Jul 2013 20:28:30 +0000 Subject: reenable the scale benchmark, and only bench actual canvas draw commands instead of direct invocations of the (now private) bitmap scale method BUG= R=reed@google.com Review URL: https://codereview.chromium.org/18941009 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@10027 2bbb7eff-a529-9590-31e7-b0007b416f81 --- bench.gypi | 1 + 1 file changed, 1 insertion(+) diff --git a/bench.gypi b/bench.gypi index 956fec9..dbfb12a 100644 --- a/bench.gypi +++ b/bench.gypi @@ -9,6 +9,7 @@ '../bench/BicubicBench.cpp', '../bench/BitmapBench.cpp', '../bench/BitmapRectBench.cpp', + '../bench/BitmapScaleBench.cpp', '../bench/BlendBench.cpp', '../bench/BlurBench.cpp', '../bench/BlurImageFilterBench.cpp', -- cgit v1.2.3 From 4b0487491e65c03546e852689173a4072bb84a00 Mon Sep 17 00:00:00 2001 From: "skia.committer@gmail.com" Date: Fri, 12 Jul 2013 07:01:14 +0000 Subject: Sanitizing source files in Housekeeper-Nightly git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@10033 2bbb7eff-a529-9590-31e7-b0007b416f81 --- SampleApp.gyp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SampleApp.gyp b/SampleApp.gyp index b30fca7..6473ea4 100644 --- a/SampleApp.gyp +++ b/SampleApp.gyp @@ -170,7 +170,7 @@ 'sources': [ '../samplecode/SamplePdfFileViewer.cpp', ] - }], + }], [ 'skia_os in ["linux", "freebsd", "openbsd", "solaris", "chromeos"]', { 'sources!': [ '../samplecode/SampleDecode.cpp', -- cgit v1.2.3 From c746d793792dccd579305223c1a32201fa922d88 Mon Sep 17 00:00:00 2001 From: "bungeman@google.com" Date: Fri, 12 Jul 2013 18:22:49 +0000 Subject: R=mtklein@google.com Review URL: https://codereview.chromium.org/18503009 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@10050 2bbb7eff-a529-9590-31e7-b0007b416f81 --- tests.gyp | 1 + utils.gyp | 2 ++ 2 files changed, 3 insertions(+) diff --git a/tests.gyp b/tests.gyp index bcc61b5..c6dd1c6 100644 --- a/tests.gyp +++ b/tests.gyp @@ -51,6 +51,7 @@ '../tests/EmptyPathTest.cpp', '../tests/ErrorTest.cpp', '../tests/FillPathTest.cpp', + '../tests/FitsInTest.cpp', '../tests/FlatDataTest.cpp', '../tests/FlateTest.cpp', '../tests/FontHostStreamTest.cpp', diff --git a/utils.gyp b/utils.gyp index 07f8921..2ec5374 100644 --- a/utils.gyp +++ b/utils.gyp @@ -96,6 +96,8 @@ '../src/utils/SkThreadUtils_pthread_other.cpp', '../src/utils/SkThreadUtils_win.cpp', '../src/utils/SkThreadUtils_win.h', + '../src/utils/SkTFitsIn.h', + '../src/utils/SkTLogic.h', '../src/utils/SkUnitMappers.cpp', #mac -- cgit v1.2.3 From fb95d90bf7a119efabaa32db85ac7b6b81503796 Mon Sep 17 00:00:00 2001 From: "humper@google.com" Date: Fri, 12 Jul 2013 21:14:33 +0000 Subject: Working plumb of image scaling: 1) always generate mipmaps if we detect that we are downsampling. 2) pre-scale the image if we detect that we are upsampling (currently valid for scale+translate only) 3) A few miscellaneous bug fixes related to image scaling. Still need SSE/Neon versions of these image scalers. BUG= R=bsalomon@google.com, robertphillips@google.com Review URL: https://codereview.chromium.org/18978014 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@10056 2bbb7eff-a529-9590-31e7-b0007b416f81 --- gmslides.gypi | 1 + 1 file changed, 1 insertion(+) diff --git a/gmslides.gypi b/gmslides.gypi index 35d326e..9d33549 100644 --- a/gmslides.gypi +++ b/gmslides.gypi @@ -35,6 +35,7 @@ '../gm/deviceproperties.cpp', '../gm/distantclip.cpp', '../gm/displacement.cpp', + '../gm/downsamplebitmap.cpp', '../gm/drawbitmaprect.cpp', '../gm/drawlooper.cpp', '../gm/extractbitmap.cpp', -- cgit v1.2.3 From b34a21c92ccbc7a24b459a1a0d7ea5cde4cc1bda Mon Sep 17 00:00:00 2001 From: "robertphillips@google.com" Date: Sat, 13 Jul 2013 15:37:25 +0000 Subject: Reverted 10056-10059 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@10060 2bbb7eff-a529-9590-31e7-b0007b416f81 --- gmslides.gypi | 1 - 1 file changed, 1 deletion(-) diff --git a/gmslides.gypi b/gmslides.gypi index 9d33549..35d326e 100644 --- a/gmslides.gypi +++ b/gmslides.gypi @@ -35,7 +35,6 @@ '../gm/deviceproperties.cpp', '../gm/distantclip.cpp', '../gm/displacement.cpp', - '../gm/downsamplebitmap.cpp', '../gm/drawbitmaprect.cpp', '../gm/drawlooper.cpp', '../gm/extractbitmap.cpp', -- cgit v1.2.3 From a0633a85144e90b6c566eea1018202caa03f8b4f Mon Sep 17 00:00:00 2001 From: "commit-bot@chromium.org" Date: Sat, 13 Jul 2013 17:24:24 +0000 Subject: Make GrPaint have a variable sized array of color and coverage stages rather than a fixed size. R=robertphillips@google.com, jvanverth@google.com Author: bsalomon@google.com Review URL: https://chromiumcodereview.appspot.com/18686007 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@10062 2bbb7eff-a529-9590-31e7-b0007b416f81 --- gpu.gypi | 1 + 1 file changed, 1 insertion(+) diff --git a/gpu.gypi b/gpu.gypi index 2191ff2..fff7922 100644 --- a/gpu.gypi +++ b/gpu.gypi @@ -84,6 +84,7 @@ '<(skia_src_path)/gpu/GrMemoryPool.cpp', '<(skia_src_path)/gpu/GrMemoryPool.h', '<(skia_src_path)/gpu/GrOvalRenderer.cpp', + '<(skia_src_path)/gpu/GrPaint.cpp', '<(skia_src_path)/gpu/GrPath.cpp', '<(skia_src_path)/gpu/GrPath.h', '<(skia_src_path)/gpu/GrPathRendererChain.cpp', -- cgit v1.2.3 From ad7a341f7b112bbaf02c05f60a3d6fee3d3209cf Mon Sep 17 00:00:00 2001 From: "humper@google.com" Date: Sun, 14 Jul 2013 01:44:59 +0000 Subject: fix trivial matrix computation Revert "Reverted 10056-10059" This reverts commit bab4ebcaa7270c3b866a8e10917c39b055ebd51a. Fix broken GM test, reintroduce image scaling. BUG= Review URL: https://codereview.chromium.org/18721006 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@10066 2bbb7eff-a529-9590-31e7-b0007b416f81 --- gmslides.gypi | 1 + 1 file changed, 1 insertion(+) diff --git a/gmslides.gypi b/gmslides.gypi index 35d326e..9d33549 100644 --- a/gmslides.gypi +++ b/gmslides.gypi @@ -35,6 +35,7 @@ '../gm/deviceproperties.cpp', '../gm/distantclip.cpp', '../gm/displacement.cpp', + '../gm/downsamplebitmap.cpp', '../gm/drawbitmaprect.cpp', '../gm/drawlooper.cpp', '../gm/extractbitmap.cpp', -- cgit v1.2.3 From 85f2c7e67c88797c1096407dc984baf1d79bed5b Mon Sep 17 00:00:00 2001 From: "robertphillips@google.com" Date: Mon, 15 Jul 2013 15:06:54 +0000 Subject: Move gaussianBlur functionality to src\effects https://codereview.chromium.org/18771004/ git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@10080 2bbb7eff-a529-9590-31e7-b0007b416f81 --- effects.gypi | 2 ++ 1 file changed, 2 insertions(+) diff --git a/effects.gypi b/effects.gypi index 36638eb..cdc2c0d 100644 --- a/effects.gypi +++ b/effects.gypi @@ -31,6 +31,8 @@ '<(skia_src_path)/effects/SkEmbossMask.h', '<(skia_src_path)/effects/SkEmbossMask_Table.h', '<(skia_src_path)/effects/SkEmbossMaskFilter.cpp', + '<(skia_src_path)/effects/SkGpuBlurUtils.h', + '<(skia_src_path)/effects/SkGpuBlurUtils.cpp', '<(skia_src_path)/effects/SkKernel33MaskFilter.cpp', '<(skia_src_path)/effects/SkLayerDrawLooper.cpp', '<(skia_src_path)/effects/SkLayerRasterizer.cpp', -- cgit v1.2.3 From 43786367fc866446f221a44108029a22843730c2 Mon Sep 17 00:00:00 2001 From: "tfarina@chromium.org" Date: Tue, 16 Jul 2013 13:05:27 +0000 Subject: Move implementation of SkFilterShader into its source file. Since SkFilterShader has its own header file, makes more sense to have a separate source file to implement it rather than placing it in a "random" SkColorFilter.cpp file. R=robertphillips@google.com Review URL: https://codereview.chromium.org/19305004 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@10101 2bbb7eff-a529-9590-31e7-b0007b416f81 --- core.gypi | 1 + 1 file changed, 1 insertion(+) diff --git a/core.gypi b/core.gypi index e87c0f4..deb2c50 100644 --- a/core.gypi +++ b/core.gypi @@ -80,6 +80,7 @@ '<(skia_src_path)/core/SkFP.h', '<(skia_src_path)/core/SkFilterProc.cpp', '<(skia_src_path)/core/SkFilterProc.h', + '<(skia_src_path)/core/SkFilterShader.cpp', '<(skia_src_path)/core/SkFlattenable.cpp', '<(skia_src_path)/core/SkFlattenableBuffers.cpp', '<(skia_src_path)/core/SkFloat.cpp', -- cgit v1.2.3 From 3581b0965cb47d0c077b805047b49b811d10cd43 Mon Sep 17 00:00:00 2001 From: "bungeman@google.com" Date: Tue, 16 Jul 2013 14:59:24 +0000 Subject: Split TLS implementation into its own translation unit. SkTLS has it's own header separate from SkThread, and having SkThread own the platform implementation of SkTLS is problematic with Chromium. The simplest way to clean this up is to put the implementation in its own set of files, where it is also more easily found. R=robertphillips@google.com Review URL: https://codereview.chromium.org/19240007 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@10105 2bbb7eff-a529-9590-31e7-b0007b416f81 --- ports.gyp | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/ports.gyp b/ports.gyp index 526e920..2641bc9 100644 --- a/ports.gyp +++ b/ports.gyp @@ -27,15 +27,19 @@ '../src/ports/SkFontHost_win.cpp', '../src/ports/SkFontHost_win_dw.cpp', '../src/ports/SkGlobalInitialization_default.cpp', - '../src/ports/SkPurgeableMemoryBlock_none.cpp', - '../src/ports/SkThread_win.cpp', - '../src/ports/SkMemory_malloc.cpp', '../src/ports/SkOSFile_posix.cpp', '../src/ports/SkOSFile_stdio.cpp', '../src/ports/SkOSFile_win.cpp', + '../src/ports/SkPurgeableMemoryBlock_none.cpp', + #'../src/ports/SkThread_none.cpp', + '../src/ports/SkThread_pthread.cpp', + '../src/ports/SkThread_win.cpp', '../src/ports/SkTime_Unix.cpp', '../src/ports/SkTime_win.cpp', + #'../src/ports/SkTLS_none.cpp', + '../src/ports/SkTLS_pthread.cpp', + '../src/ports/SkTLS_win.cpp', '../src/ports/SkXMLParser_empty.cpp', ], 'conditions': [ @@ -58,7 +62,6 @@ '../src/ports/SkFontHost_FreeType_common.cpp', '../src/ports/SkFontHost_fontconfig.cpp', '../src/ports/SkFontConfigInterface_direct.cpp', - '../src/ports/SkThread_pthread.cpp', ], }], [ 'skia_os == "nacl"', { @@ -79,7 +82,6 @@ '../src/ports/SkFontHost_FreeType.cpp', '../src/ports/SkFontHost_FreeType_common.cpp', '../src/ports/SkFontHost_linux.cpp', - '../src/ports/SkThread_pthread.cpp', ], 'sources!': [ '../src/ports/SkDebug_stdio.cpp', @@ -99,7 +101,6 @@ # '../src/ports/SkFontHost_FreeType.cpp', # '../src/ports/SkFontHost_FreeType_common.cpp', '../src/ports/SkPurgeableMemoryBlock_mac.cpp', - '../src/ports/SkThread_pthread.cpp', '../src/utils/mac/SkStream_mac.cpp', ], 'sources!': [ @@ -115,7 +116,6 @@ 'sources': [ '../src/ports/SkFontHost_mac.cpp', '../src/ports/SkPurgeableMemoryBlock_mac.cpp', - '../src/ports/SkThread_pthread.cpp', '../src/utils/mac/SkStream_mac.cpp', ], 'sources!': [ @@ -141,8 +141,10 @@ ], 'sources!': [ # these are used everywhere but windows '../src/ports/SkDebug_stdio.cpp', - '../src/ports/SkTime_Unix.cpp', '../src/ports/SkOSFile_posix.cpp', + '../src/ports/SkThread_pthread.cpp', + '../src/ports/SkTime_Unix.cpp', + '../src/ports/SkTLS_pthread.cpp', ], }, { # else !win 'sources!': [ @@ -152,6 +154,7 @@ '../src/ports/SkOSFile_win.cpp', '../src/ports/SkThread_win.cpp', '../src/ports/SkTime_win.cpp', + '../src/ports/SkTLS_win.cpp', ], }], [ 'skia_os == "android"', { -- cgit v1.2.3 From 7911a92fa96a311bc5e7bf4c706a5371fbd8dafb Mon Sep 17 00:00:00 2001 From: "commit-bot@chromium.org" Date: Tue, 16 Jul 2013 18:21:46 +0000 Subject: Add the lazy decoder from PictureFlags to SkImageDecoder R=caryclark@google.com, scroggo@google.com Author: sglez@google.com Review URL: https://chromiumcodereview.appspot.com/19109002 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@10111 2bbb7eff-a529-9590-31e7-b0007b416f81 --- tools.gyp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tools.gyp b/tools.gyp index de1d8e9..5d7c92e 100644 --- a/tools.gyp +++ b/tools.gyp @@ -188,6 +188,7 @@ 'target_name': 'picture_renderer', 'type': 'static_library', 'sources': [ + '../tools/LazyDecodeBitmap.cpp', '../tools/PictureRenderer.h', '../tools/PictureRenderer.cpp', '../tools/PictureRenderingFlags.h', @@ -295,6 +296,7 @@ 'dependencies': [ 'skia_lib.gyp:skia_lib', 'tools.gyp:picture_renderer', + 'flags.gyp:flags', ], }, { -- cgit v1.2.3 From 7a2412de01e0661cb09ad6e5c09af504969cf76d Mon Sep 17 00:00:00 2001 From: "zachr@google.com" Date: Wed, 17 Jul 2013 19:29:19 +0000 Subject: make OpenCL optional for skpdiff - add CPU based different pixels metric R=djsollen@google.com Review URL: https://codereview.chromium.org/19374006 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@10127 2bbb7eff-a529-9590-31e7-b0007b416f81 --- common_conditions.gypi | 12 +++++++++++- common_variables.gypi | 2 ++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/common_conditions.gypi b/common_conditions.gypi index 2faf67d..a39756b 100644 --- a/common_conditions.gypi +++ b/common_conditions.gypi @@ -17,7 +17,17 @@ ], }, ], - + [ 'skia_opencl == 1', + { + 'defines': [ + 'SK_SUPPORT_OPENCL=1', + ], + }, { + 'defines': [ + 'SK_SUPPORT_OPENCL=0', + ], + }, + ], [ 'skia_os == "win"', { 'defines': [ diff --git a/common_variables.gypi b/common_variables.gypi index 67049e3..d7d41f2 100644 --- a/common_variables.gypi +++ b/common_variables.gypi @@ -91,6 +91,7 @@ 'skia_profile_enabled%': 0, 'skia_win_debuggers_path%': '', 'skia_shared_lib%': 0, + 'skia_opencl%': 0, # These variables determine the default optimization level for different # compilers. @@ -139,6 +140,7 @@ 'skia_osx_sdkroot%': '<(skia_osx_sdkroot)', 'skia_profile_enabled%': '<(skia_profile_enabled)', 'skia_shared_lib%': '<(skia_shared_lib)', + 'skia_opencl%': '<(skia_opencl)', 'skia_static_initializers%': '<(skia_static_initializers)', 'ios_sdk_version%': '6.0', 'skia_win_debuggers_path%': '<(skia_win_debuggers_path)', -- cgit v1.2.3 From 63947ddc2ad38c080ef6559e36074eb208bb404e Mon Sep 17 00:00:00 2001 From: "egdaniel@google.com" Date: Wed, 17 Jul 2013 19:30:41 +0000 Subject: Add bench for hairline paths. R=bsalomon@google.com Review URL: https://codereview.chromium.org/19238003 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@10128 2bbb7eff-a529-9590-31e7-b0007b416f81 --- bench.gypi | 1 + 1 file changed, 1 insertion(+) diff --git a/bench.gypi b/bench.gypi index dbfb12a..4d9dcbe 100644 --- a/bench.gypi +++ b/bench.gypi @@ -31,6 +31,7 @@ '../bench/GrMemoryPoolBench.cpp', '../bench/ImageDecodeBench.cpp', '../bench/InterpBench.cpp', + '../bench/HairlinePathBench.cpp', '../bench/LineBench.cpp', '../bench/LightingBench.cpp', '../bench/MagnifierBench.cpp', -- cgit v1.2.3 From cffde48ad4ce59eaba92c40da9993c48fa8a7d55 Mon Sep 17 00:00:00 2001 From: "reed@google.com" Date: Thu, 18 Jul 2013 19:53:31 +0000 Subject: pull mipmap class into its own (private) header BUG= R=scroggo@google.com Review URL: https://codereview.chromium.org/19462007 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@10161 2bbb7eff-a529-9590-31e7-b0007b416f81 --- core.gypi | 1 + tests.gyp | 1 + 2 files changed, 2 insertions(+) diff --git a/core.gypi b/core.gypi index deb2c50..bf5e245 100644 --- a/core.gypi +++ b/core.gypi @@ -107,6 +107,7 @@ '<(skia_src_path)/core/SkMath.cpp', '<(skia_src_path)/core/SkMatrix.cpp', '<(skia_src_path)/core/SkMetaData.cpp', + '<(skia_src_path)/core/SkMipMap.cpp', '<(skia_src_path)/core/SkOrderedReadBuffer.cpp', '<(skia_src_path)/core/SkOrderedWriteBuffer.cpp', '<(skia_src_path)/core/SkPackBits.cpp', diff --git a/tests.gyp b/tests.gyp index c6dd1c6..e93a12f 100644 --- a/tests.gyp +++ b/tests.gyp @@ -77,6 +77,7 @@ '../tests/Matrix44Test.cpp', '../tests/MemsetTest.cpp', '../tests/MetaDataTest.cpp', + '../tests/MipMapTest.cpp', '../tests/OSPathTest.cpp', '../tests/PackBitsTest.cpp', '../tests/PaintTest.cpp', -- cgit v1.2.3 From b69af2a669404b188a9ba2b34a765f7e4134c78b Mon Sep 17 00:00:00 2001 From: "commit-bot@chromium.org" Date: Fri, 19 Jul 2013 00:32:39 +0000 Subject: Measurement tool for Bounding-Box-Hierarchies. BUG= R=caryclark@google.com, reed@google.com Author: sglez@google.com Review URL: https://chromiumcodereview.appspot.com/16948011 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@10173 2bbb7eff-a529-9590-31e7-b0007b416f81 --- tools.gyp | 24 +++++++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) diff --git a/tools.gyp b/tools.gyp index 5d7c92e..4cbdf4b 100644 --- a/tools.gyp +++ b/tools.gyp @@ -15,7 +15,7 @@ 'dependencies': [ 'bench_pictures', 'filter', - 'lua_pictures', + 'bbh_shootout', 'lua_app', 'pinspect', 'render_pdfs', @@ -299,6 +299,28 @@ 'flags.gyp:flags', ], }, + { + 'target_name': 'bbh_shootout', + 'type': 'executable', + 'include_dirs': [ + '../bench', + '../tools/' + ], + 'sources': [ + '../tools/bbh_shootout.cpp', + + # Bench code: + '../bench/TimerData.h', + '../bench/TimerData.cpp', + ], + 'dependencies': [ + 'skia_lib.gyp:skia_lib', + 'bench.gyp:bench_timer', + 'tools.gyp:picture_utils', + 'tools.gyp:picture_renderer', + 'flags.gyp:flags', + ], + }, { 'target_name': 'filter', 'type': 'executable', -- cgit v1.2.3 From e0388bc862d8054864fc8c28d12ff1a4ebb13399 Mon Sep 17 00:00:00 2001 From: "robertphillips@google.com" Date: Fri, 19 Jul 2013 00:50:48 +0000 Subject: Reverting r10173 due to compile problems git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@10174 2bbb7eff-a529-9590-31e7-b0007b416f81 --- tools.gyp | 24 +----------------------- 1 file changed, 1 insertion(+), 23 deletions(-) diff --git a/tools.gyp b/tools.gyp index 4cbdf4b..5d7c92e 100644 --- a/tools.gyp +++ b/tools.gyp @@ -15,7 +15,7 @@ 'dependencies': [ 'bench_pictures', 'filter', - 'bbh_shootout', + 'lua_pictures', 'lua_app', 'pinspect', 'render_pdfs', @@ -299,28 +299,6 @@ 'flags.gyp:flags', ], }, - { - 'target_name': 'bbh_shootout', - 'type': 'executable', - 'include_dirs': [ - '../bench', - '../tools/' - ], - 'sources': [ - '../tools/bbh_shootout.cpp', - - # Bench code: - '../bench/TimerData.h', - '../bench/TimerData.cpp', - ], - 'dependencies': [ - 'skia_lib.gyp:skia_lib', - 'bench.gyp:bench_timer', - 'tools.gyp:picture_utils', - 'tools.gyp:picture_renderer', - 'flags.gyp:flags', - ], - }, { 'target_name': 'filter', 'type': 'executable', -- cgit v1.2.3 From 19f14f9fe04e3b5c986755d59fa2b07fdc8f2ded Mon Sep 17 00:00:00 2001 From: "bungeman@google.com" Date: Fri, 19 Jul 2013 18:51:10 +0000 Subject: Remove unneeded mention of SkThread_pthread.cpp in ports.gyp. This was overlooked in r10105. git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@10200 2bbb7eff-a529-9590-31e7-b0007b416f81 --- ports.gyp | 1 - 1 file changed, 1 deletion(-) diff --git a/ports.gyp b/ports.gyp index 2641bc9..0e57985 100644 --- a/ports.gyp +++ b/ports.gyp @@ -170,7 +170,6 @@ ], 'sources': [ '../src/ports/SkDebug_android.cpp', - '../src/ports/SkThread_pthread.cpp', '../src/ports/SkFontConfigInterface_android.cpp', '../src/ports/SkFontConfigParser_android.cpp', '../src/ports/SkFontHost_FreeType.cpp', -- cgit v1.2.3 From 43bcfe443ec8d6c3a5985892d84140155e4895bc Mon Sep 17 00:00:00 2001 From: "commit-bot@chromium.org" Date: Fri, 19 Jul 2013 18:54:04 +0000 Subject: Fix build problem with reverted issue 16948011 BUG= R=caryclark@google.com Author: sglez@google.com Review URL: https://chromiumcodereview.appspot.com/19541009 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@10201 2bbb7eff-a529-9590-31e7-b0007b416f81 --- tools.gyp | 24 +++++++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) diff --git a/tools.gyp b/tools.gyp index 5d7c92e..4cbdf4b 100644 --- a/tools.gyp +++ b/tools.gyp @@ -15,7 +15,7 @@ 'dependencies': [ 'bench_pictures', 'filter', - 'lua_pictures', + 'bbh_shootout', 'lua_app', 'pinspect', 'render_pdfs', @@ -299,6 +299,28 @@ 'flags.gyp:flags', ], }, + { + 'target_name': 'bbh_shootout', + 'type': 'executable', + 'include_dirs': [ + '../bench', + '../tools/' + ], + 'sources': [ + '../tools/bbh_shootout.cpp', + + # Bench code: + '../bench/TimerData.h', + '../bench/TimerData.cpp', + ], + 'dependencies': [ + 'skia_lib.gyp:skia_lib', + 'bench.gyp:bench_timer', + 'tools.gyp:picture_utils', + 'tools.gyp:picture_renderer', + 'flags.gyp:flags', + ], + }, { 'target_name': 'filter', 'type': 'executable', -- cgit v1.2.3 From 73e0485f273ebc2a9374ce55c71a888c1c955cff Mon Sep 17 00:00:00 2001 From: "commit-bot@chromium.org" Date: Fri, 19 Jul 2013 18:58:34 +0000 Subject: Adds SkPDFResourceDict class to manage resource dicts. Refactors existing code to use this class. BUG= R=vandebo@chromium.org, edisonn@google.com Author: richardlin@chromium.org Review URL: https://chromiumcodereview.appspot.com/18977002 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@10202 2bbb7eff-a529-9590-31e7-b0007b416f81 --- pdf.gyp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pdf.gyp b/pdf.gyp index f89df93..1c0567e 100644 --- a/pdf.gyp +++ b/pdf.gyp @@ -38,6 +38,8 @@ '../src/pdf/SkPDFImageStream.h', '../src/pdf/SkPDFPage.cpp', '../src/pdf/SkPDFPage.h', + '../src/pdf/SkPDFResourceDict.cpp', + '../src/pdf/SkPDFResourceDict.h', '../src/pdf/SkPDFShader.cpp', '../src/pdf/SkPDFShader.h', '../src/pdf/SkPDFStream.cpp', -- cgit v1.2.3 From 35aa7b92e2e49924da63ede21b0aebbd954a1afe Mon Sep 17 00:00:00 2001 From: "vandebo@chromium.org" Date: Fri, 19 Jul 2013 20:13:44 +0000 Subject: Revert "Adds SkPDFResourceDict class to manage resource dicts. Refactors existing code to use this class." This reverts commit r10202 Review URL: https://codereview.chromium.org/19790007 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@10205 2bbb7eff-a529-9590-31e7-b0007b416f81 --- pdf.gyp | 2 -- 1 file changed, 2 deletions(-) diff --git a/pdf.gyp b/pdf.gyp index 1c0567e..f89df93 100644 --- a/pdf.gyp +++ b/pdf.gyp @@ -38,8 +38,6 @@ '../src/pdf/SkPDFImageStream.h', '../src/pdf/SkPDFPage.cpp', '../src/pdf/SkPDFPage.h', - '../src/pdf/SkPDFResourceDict.cpp', - '../src/pdf/SkPDFResourceDict.h', '../src/pdf/SkPDFShader.cpp', '../src/pdf/SkPDFShader.h', '../src/pdf/SkPDFStream.cpp', -- cgit v1.2.3 From 93c215edb7679d50a7cfc6527d03a3b85a0b97dc Mon Sep 17 00:00:00 2001 From: "humper@google.com" Date: Fri, 19 Jul 2013 20:20:04 +0000 Subject: The image resampling code has been transplanted from Chrome; it's incredibly fast. We've tested this CL plumbed into Chrome and done benchmarking with excellent results. This CL can land independent of any Chrome changes; it's completely internal to skia. BUG= R=reed@google.com Review URL: https://codereview.chromium.org/19335002 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@10206 2bbb7eff-a529-9590-31e7-b0007b416f81 --- core.gypi | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/core.gypi b/core.gypi index bf5e245..eac96f6 100644 --- a/core.gypi +++ b/core.gypi @@ -32,6 +32,8 @@ '<(skia_src_path)/core/SkBitmapProcState_matrix.h', '<(skia_src_path)/core/SkBitmapProcState_matrixProcs.cpp', '<(skia_src_path)/core/SkBitmapProcState_sample.h', + '<(skia_src_path)/core/SkBitmapScaler.h', + '<(skia_src_path)/core/SkBitmapScaler.cpp', '<(skia_src_path)/core/SkBitmapShader16BilerpTemplate.h', '<(skia_src_path)/core/SkBitmapShaderTemplate.h', '<(skia_src_path)/core/SkBitmap_scroll.cpp', @@ -56,6 +58,8 @@ '<(skia_src_path)/core/SkComposeShader.cpp', '<(skia_src_path)/core/SkConfig8888.cpp', '<(skia_src_path)/core/SkConfig8888.h', + '<(skia_src_path)/core/SkConvolver.cpp', + '<(skia_src_path)/core/SkConvolver.h', '<(skia_src_path)/core/SkCordic.cpp', '<(skia_src_path)/core/SkCordic.h', '<(skia_src_path)/core/SkCoreBlitters.h', -- cgit v1.2.3 From 01164f5ea8ea97997e52a89561e72f69391e7acb Mon Sep 17 00:00:00 2001 From: "humper@google.com" Date: Fri, 19 Jul 2013 21:12:08 +0000 Subject: use SK_ScalarPI, and fix ARM build git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@10212 2bbb7eff-a529-9590-31e7-b0007b416f81 --- opts.gyp | 1 + 1 file changed, 1 insertion(+) diff --git a/opts.gyp b/opts.gyp index bcc85a9..c15cfb6 100644 --- a/opts.gyp +++ b/opts.gyp @@ -96,6 +96,7 @@ [ '(skia_arch_type == "arm" and armv7 == 0) or (skia_os == "ios")', { 'sources': [ '../src/opts/SkBitmapProcState_opts_none.cpp', + '../src/opts/SkBitmapFilter_opts_none.cpp', '../src/opts/SkBlitRow_opts_none.cpp', '../src/opts/SkUtils_opts_none.cpp', ], -- cgit v1.2.3 From adca8b6c9401c630b67eca168d1cfd691c70ca6b Mon Sep 17 00:00:00 2001 From: "humper@google.com" Date: Fri, 19 Jul 2013 21:26:15 +0000 Subject: bad line in gyp fie snuck into last commit, continuing the ARM breakage git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@10214 2bbb7eff-a529-9590-31e7-b0007b416f81 --- opts.gyp | 1 - 1 file changed, 1 deletion(-) diff --git a/opts.gyp b/opts.gyp index c15cfb6..bcc85a9 100644 --- a/opts.gyp +++ b/opts.gyp @@ -96,7 +96,6 @@ [ '(skia_arch_type == "arm" and armv7 == 0) or (skia_os == "ios")', { 'sources': [ '../src/opts/SkBitmapProcState_opts_none.cpp', - '../src/opts/SkBitmapFilter_opts_none.cpp', '../src/opts/SkBlitRow_opts_none.cpp', '../src/opts/SkUtils_opts_none.cpp', ], -- cgit v1.2.3 From ac4a505c1c894cf8d1ab7ebc4c9684a7e13bac99 Mon Sep 17 00:00:00 2001 From: "bungeman@google.com" Date: Fri, 19 Jul 2013 22:31:23 +0000 Subject: Update obvious deps. This is a step toward targets declaring their deps in a sane fashion. This change resolves cycles by forcing core to the root, then opts, ports, and utils depending on core, then everything else. We will need some other change to resolve the fact that core, opts, ports, and utils depend on each other and other targets which depend on them. Outside of these targets, things look ok. R=djsollen@google.com Review URL: https://codereview.chromium.org/19823003 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@10217 2bbb7eff-a529-9590-31e7-b0007b416f81 --- animator.gyp | 16 ++++++++-------- effects.gyp | 9 +++++---- gpu.gyp | 13 ++++++------- images.gyp | 3 +-- opts.gyp | 15 +++++++++------ pdf.gyp | 3 --- ports.gyp | 5 +++-- sfnt.gyp | 5 +++-- svg.gyp | 9 +++++---- utils.gyp | 5 +++-- views.gyp | 18 ++++++++---------- views_animated.gyp | 19 ++++++++++--------- xml.gyp | 7 ++++--- zlib.gyp | 5 ++--- 14 files changed, 67 insertions(+), 65 deletions(-) diff --git a/animator.gyp b/animator.gyp index a462ca4..609d52e 100644 --- a/animator.gyp +++ b/animator.gyp @@ -9,16 +9,16 @@ 'product_name': 'skia_animator', 'type': 'static_library', 'standalone_static_library': 1, + 'dependencies': [ + 'core.gyp:*', + 'effects.gyp:*', + 'images.gyp:*', + 'utils.gyp:*', + 'views.gyp:*', + 'xml.gyp:*', + ], 'include_dirs': [ '../include/animator', - '../include/config', - '../include/core', - '../include/effects', - '../include/images', - '../include/lazy', - '../include/utils', - '../include/views', - '../include/xml', '../src/utils', ], 'sources': [ diff --git a/effects.gyp b/effects.gyp index d69c820..d0b8b4d 100644 --- a/effects.gyp +++ b/effects.gyp @@ -6,15 +6,16 @@ 'product_name': 'skia_effects', 'type': 'static_library', 'standalone_static_library': 1, + 'dependencies': [ + 'core.gyp:*', + 'images.gyp:*', + 'utils.gyp:*', + ], 'includes': [ 'effects.gypi', ], 'include_dirs': [ - '../include/config', - '../include/core', '../include/effects', - '../include/lazy', - '../include/utils', '../src/core', ], 'direct_dependent_settings': { diff --git a/gpu.gyp b/gpu.gyp index de0babd..df82cda 100644 --- a/gpu.gyp +++ b/gpu.gyp @@ -121,20 +121,19 @@ 'product_name': 'skia_skgpu', 'type': 'static_library', 'standalone_static_library': 1, + 'dependencies': [ + 'angle.gyp:*', + 'core.gyp:*', + 'utils.gyp:*', + ], 'includes': [ 'gpu.gypi', ], 'include_dirs': [ - '../include/config', - '../include/core', - '../include/utils', - '../src/core', '../include/gpu', + '../src/core', '../src/gpu', ], - 'dependencies': [ - 'angle.gyp:*', - ], 'export_dependent_settings': [ 'angle.gyp:*', ], diff --git a/images.gyp b/images.gyp index b2b404f..76df7d1 100644 --- a/images.gyp +++ b/images.gyp @@ -7,6 +7,7 @@ 'type': 'static_library', 'standalone_static_library': 1, 'dependencies': [ + 'core.gyp:*', 'libjpeg.gyp:*', 'libwebp.gyp:libwebp', 'utils.gyp:utils', @@ -15,8 +16,6 @@ 'libjpeg.gyp:*', ], 'include_dirs': [ - '../include/config', - '../include/core', '../include/images', '../include/lazy', # for access to SkErrorInternals.h diff --git a/opts.gyp b/opts.gyp index bcc85a9..8aa5e0f 100644 --- a/opts.gyp +++ b/opts.gyp @@ -23,9 +23,10 @@ 'product_name': 'skia_opts', 'type': 'static_library', 'standalone_static_library': 1, + 'dependencies': [ + 'core.gyp:*', + ], 'include_dirs': [ - '../include/config', - '../include/core', '../src/core', '../src/opts', ], @@ -111,9 +112,10 @@ 'product_name': 'skia_opts_ssse3', 'type': 'static_library', 'standalone_static_library': 1, + 'dependencies': [ + 'core.gyp:*', + ], 'include_dirs': [ - '../include/config', - '../include/core', '../src/core', ], 'conditions': [ @@ -146,9 +148,10 @@ 'product_name': 'skia_opts_neon', 'type': 'static_library', 'standalone_static_library': 1, + 'dependencies': [ + 'core.gyp:*', + ], 'include_dirs': [ - '../include/config', - '../include/core', '../src/core', '../src/opts', ], diff --git a/pdf.gyp b/pdf.gyp index f89df93..1efb984 100644 --- a/pdf.gyp +++ b/pdf.gyp @@ -10,9 +10,6 @@ 'zlib.gyp:zlib', ], 'include_dirs': [ - '../include/config', - '../include/core', - '../include/images', '../include/pdf', '../src/core', # needed to get SkGlyphCache.h and SkTextFormatParams.h '../src/utils', # needed to get SkBitSet.h diff --git a/ports.gyp b/ports.gyp index 0e57985..1c7c33e 100644 --- a/ports.gyp +++ b/ports.gyp @@ -6,9 +6,10 @@ 'product_name': 'skia_ports', 'type': 'static_library', 'standalone_static_library': 1, + 'dependencies': [ + 'core.gyp:*', + ], 'include_dirs': [ - '../include/config', - '../include/core', '../include/effects', '../include/images', '../include/ports', diff --git a/sfnt.gyp b/sfnt.gyp index cc21b22..88ab94f 100644 --- a/sfnt.gyp +++ b/sfnt.gyp @@ -5,9 +5,10 @@ 'product_name': 'skia_sfnt', 'type': 'static_library', 'standalone_static_library': 1, + 'dependencies': [ + 'core.gyp:*', + ], 'include_dirs': [ - '../include/config', - '../include/core', '../src/sfnt', ], 'sources': [ diff --git a/svg.gyp b/svg.gyp index 3952fd7..c161ef5 100644 --- a/svg.gyp +++ b/svg.gyp @@ -5,11 +5,12 @@ 'product_name': 'skia_svg', 'type': 'static_library', 'standalone_static_library': 1, + 'dependencies': [ + 'core.gyp:*', + 'utils.gyp:*', + 'xml.gyp:*', + ], 'include_dirs': [ - '../include/config', - '../include/core', - '../include/xml', - '../include/utils', '../include/svg', ], 'sources': [ diff --git a/utils.gyp b/utils.gyp index 2ec5374..68bf6b6 100644 --- a/utils.gyp +++ b/utils.gyp @@ -6,9 +6,10 @@ 'product_name': 'skia_utils', 'type': 'static_library', 'standalone_static_library': 1, + 'dependencies': [ + 'core.gyp:*', + ], 'include_dirs': [ - '../include/config', - '../include/core', '../include/effects', '../include/images', '../include/lazy', diff --git a/views.gyp b/views.gyp index 182bb34..2957fed 100644 --- a/views.gyp +++ b/views.gyp @@ -11,19 +11,17 @@ 'product_name': 'skia_views', 'type': 'static_library', 'standalone_static_library': 1, + 'dependencies': [ + 'angle.gyp:*', + 'core.gyp:*', + 'effects.gyp:*', + 'images.gyp:*', + 'utils.gyp:*', + 'xml.gyp:*', + ], 'include_dirs': [ - '../include/config', - '../include/core', - '../include/effects', - '../include/images', - '../include/lazy', - '../include/utils', '../include/views', '../include/views/unix', - '../include/xml', - ], - 'dependencies': [ - 'angle.gyp:*', ], 'sources': [ '../include/views/SkApplication.h', diff --git a/views_animated.gyp b/views_animated.gyp index 29e981d..29488b7 100644 --- a/views_animated.gyp +++ b/views_animated.gyp @@ -5,18 +5,19 @@ { 'target_name': 'views_animated', 'type': 'static_library', + 'dependencies': [ + 'angle.gyp:*', + 'animator.gyp:*', + 'core.gyp:*', + 'effects.gyp:*', + 'images.gyp:*', + 'utils.gyp:*', + 'views.gyp:*', + 'xml.gyp:*', + ], 'include_dirs': [ - '../include/animator', - '../include/config', - '../include/core', - '../include/effects', - '../include/images', - '../include/lazy', - '../include/utils', - '../include/views', '../include/views/animated', '../include/views/unix', - '../include/xml', ], 'sources': [ '../include/views/animated/SkBorderView.h', diff --git a/xml.gyp b/xml.gyp index 2c4e06f..e75dd4c 100644 --- a/xml.gyp +++ b/xml.gyp @@ -5,11 +5,12 @@ 'product_name': 'skia_xml', 'type': 'static_library', 'standalone_static_library': 1, + 'dependencies': [ + 'core.gyp:*', + 'utils.gyp:*', + ], 'include_dirs': [ - '../include/config', - '../include/core', '../include/xml', - '../include/utils', ], 'sources': [ '../include/xml/SkBML_WXMLParser.h', diff --git a/zlib.gyp b/zlib.gyp index fcd0ac3..1423c04 100644 --- a/zlib.gyp +++ b/zlib.gyp @@ -3,9 +3,8 @@ { 'target_name': 'zlib', 'type': 'static_library', - 'include_dirs': [ - '../include/config', - '../include/core', + 'dependencies': [ + 'core.gyp:*', ], 'sources': [ '../include/core/SkFlate.h', -- cgit v1.2.3 From fbe1fa38de28ee92c802539cb9a379ccc51d47fa Mon Sep 17 00:00:00 2001 From: "bungeman@google.com" Date: Fri, 19 Jul 2013 23:10:37 +0000 Subject: Lie about views_animated dependencies until Android situation is resolved. git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@10220 2bbb7eff-a529-9590-31e7-b0007b416f81 --- views_animated.gyp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/views_animated.gyp b/views_animated.gyp index 29488b7..b0b0233 100644 --- a/views_animated.gyp +++ b/views_animated.gyp @@ -7,7 +7,7 @@ 'type': 'static_library', 'dependencies': [ 'angle.gyp:*', - 'animator.gyp:*', + #'animator.gyp:*', #commented out until Android is fixed 'core.gyp:*', 'effects.gyp:*', 'images.gyp:*', @@ -16,6 +16,8 @@ 'xml.gyp:*', ], 'include_dirs': [ + '../include/animator', + '../include/views/animated', '../include/views/unix', ], -- cgit v1.2.3 From 9674f66f05775341676849a08310478da276ed05 Mon Sep 17 00:00:00 2001 From: "bungeman@google.com" Date: Sat, 20 Jul 2013 00:24:35 +0000 Subject: Revert deps changes in r10220 and r10217. Need to avoid linking in .a things which are already provided by .so things. git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@10222 2bbb7eff-a529-9590-31e7-b0007b416f81 --- animator.gyp | 16 ++++++++-------- effects.gyp | 9 ++++----- gpu.gyp | 13 +++++++------ images.gyp | 3 ++- opts.gyp | 15 ++++++--------- pdf.gyp | 3 +++ ports.gyp | 5 ++--- sfnt.gyp | 5 ++--- svg.gyp | 9 ++++----- utils.gyp | 5 ++--- views.gyp | 18 ++++++++++-------- views_animated.gyp | 19 ++++++++----------- xml.gyp | 7 +++---- zlib.gyp | 5 +++-- 14 files changed, 64 insertions(+), 68 deletions(-) diff --git a/animator.gyp b/animator.gyp index 609d52e..a462ca4 100644 --- a/animator.gyp +++ b/animator.gyp @@ -9,16 +9,16 @@ 'product_name': 'skia_animator', 'type': 'static_library', 'standalone_static_library': 1, - 'dependencies': [ - 'core.gyp:*', - 'effects.gyp:*', - 'images.gyp:*', - 'utils.gyp:*', - 'views.gyp:*', - 'xml.gyp:*', - ], 'include_dirs': [ '../include/animator', + '../include/config', + '../include/core', + '../include/effects', + '../include/images', + '../include/lazy', + '../include/utils', + '../include/views', + '../include/xml', '../src/utils', ], 'sources': [ diff --git a/effects.gyp b/effects.gyp index d0b8b4d..d69c820 100644 --- a/effects.gyp +++ b/effects.gyp @@ -6,16 +6,15 @@ 'product_name': 'skia_effects', 'type': 'static_library', 'standalone_static_library': 1, - 'dependencies': [ - 'core.gyp:*', - 'images.gyp:*', - 'utils.gyp:*', - ], 'includes': [ 'effects.gypi', ], 'include_dirs': [ + '../include/config', + '../include/core', '../include/effects', + '../include/lazy', + '../include/utils', '../src/core', ], 'direct_dependent_settings': { diff --git a/gpu.gyp b/gpu.gyp index df82cda..de0babd 100644 --- a/gpu.gyp +++ b/gpu.gyp @@ -121,19 +121,20 @@ 'product_name': 'skia_skgpu', 'type': 'static_library', 'standalone_static_library': 1, - 'dependencies': [ - 'angle.gyp:*', - 'core.gyp:*', - 'utils.gyp:*', - ], 'includes': [ 'gpu.gypi', ], 'include_dirs': [ - '../include/gpu', + '../include/config', + '../include/core', + '../include/utils', '../src/core', + '../include/gpu', '../src/gpu', ], + 'dependencies': [ + 'angle.gyp:*', + ], 'export_dependent_settings': [ 'angle.gyp:*', ], diff --git a/images.gyp b/images.gyp index 76df7d1..b2b404f 100644 --- a/images.gyp +++ b/images.gyp @@ -7,7 +7,6 @@ 'type': 'static_library', 'standalone_static_library': 1, 'dependencies': [ - 'core.gyp:*', 'libjpeg.gyp:*', 'libwebp.gyp:libwebp', 'utils.gyp:utils', @@ -16,6 +15,8 @@ 'libjpeg.gyp:*', ], 'include_dirs': [ + '../include/config', + '../include/core', '../include/images', '../include/lazy', # for access to SkErrorInternals.h diff --git a/opts.gyp b/opts.gyp index 8aa5e0f..bcc85a9 100644 --- a/opts.gyp +++ b/opts.gyp @@ -23,10 +23,9 @@ 'product_name': 'skia_opts', 'type': 'static_library', 'standalone_static_library': 1, - 'dependencies': [ - 'core.gyp:*', - ], 'include_dirs': [ + '../include/config', + '../include/core', '../src/core', '../src/opts', ], @@ -112,10 +111,9 @@ 'product_name': 'skia_opts_ssse3', 'type': 'static_library', 'standalone_static_library': 1, - 'dependencies': [ - 'core.gyp:*', - ], 'include_dirs': [ + '../include/config', + '../include/core', '../src/core', ], 'conditions': [ @@ -148,10 +146,9 @@ 'product_name': 'skia_opts_neon', 'type': 'static_library', 'standalone_static_library': 1, - 'dependencies': [ - 'core.gyp:*', - ], 'include_dirs': [ + '../include/config', + '../include/core', '../src/core', '../src/opts', ], diff --git a/pdf.gyp b/pdf.gyp index 1efb984..f89df93 100644 --- a/pdf.gyp +++ b/pdf.gyp @@ -10,6 +10,9 @@ 'zlib.gyp:zlib', ], 'include_dirs': [ + '../include/config', + '../include/core', + '../include/images', '../include/pdf', '../src/core', # needed to get SkGlyphCache.h and SkTextFormatParams.h '../src/utils', # needed to get SkBitSet.h diff --git a/ports.gyp b/ports.gyp index 1c7c33e..0e57985 100644 --- a/ports.gyp +++ b/ports.gyp @@ -6,10 +6,9 @@ 'product_name': 'skia_ports', 'type': 'static_library', 'standalone_static_library': 1, - 'dependencies': [ - 'core.gyp:*', - ], 'include_dirs': [ + '../include/config', + '../include/core', '../include/effects', '../include/images', '../include/ports', diff --git a/sfnt.gyp b/sfnt.gyp index 88ab94f..cc21b22 100644 --- a/sfnt.gyp +++ b/sfnt.gyp @@ -5,10 +5,9 @@ 'product_name': 'skia_sfnt', 'type': 'static_library', 'standalone_static_library': 1, - 'dependencies': [ - 'core.gyp:*', - ], 'include_dirs': [ + '../include/config', + '../include/core', '../src/sfnt', ], 'sources': [ diff --git a/svg.gyp b/svg.gyp index c161ef5..3952fd7 100644 --- a/svg.gyp +++ b/svg.gyp @@ -5,12 +5,11 @@ 'product_name': 'skia_svg', 'type': 'static_library', 'standalone_static_library': 1, - 'dependencies': [ - 'core.gyp:*', - 'utils.gyp:*', - 'xml.gyp:*', - ], 'include_dirs': [ + '../include/config', + '../include/core', + '../include/xml', + '../include/utils', '../include/svg', ], 'sources': [ diff --git a/utils.gyp b/utils.gyp index 68bf6b6..2ec5374 100644 --- a/utils.gyp +++ b/utils.gyp @@ -6,10 +6,9 @@ 'product_name': 'skia_utils', 'type': 'static_library', 'standalone_static_library': 1, - 'dependencies': [ - 'core.gyp:*', - ], 'include_dirs': [ + '../include/config', + '../include/core', '../include/effects', '../include/images', '../include/lazy', diff --git a/views.gyp b/views.gyp index 2957fed..182bb34 100644 --- a/views.gyp +++ b/views.gyp @@ -11,17 +11,19 @@ 'product_name': 'skia_views', 'type': 'static_library', 'standalone_static_library': 1, - 'dependencies': [ - 'angle.gyp:*', - 'core.gyp:*', - 'effects.gyp:*', - 'images.gyp:*', - 'utils.gyp:*', - 'xml.gyp:*', - ], 'include_dirs': [ + '../include/config', + '../include/core', + '../include/effects', + '../include/images', + '../include/lazy', + '../include/utils', '../include/views', '../include/views/unix', + '../include/xml', + ], + 'dependencies': [ + 'angle.gyp:*', ], 'sources': [ '../include/views/SkApplication.h', diff --git a/views_animated.gyp b/views_animated.gyp index b0b0233..29e981d 100644 --- a/views_animated.gyp +++ b/views_animated.gyp @@ -5,21 +5,18 @@ { 'target_name': 'views_animated', 'type': 'static_library', - 'dependencies': [ - 'angle.gyp:*', - #'animator.gyp:*', #commented out until Android is fixed - 'core.gyp:*', - 'effects.gyp:*', - 'images.gyp:*', - 'utils.gyp:*', - 'views.gyp:*', - 'xml.gyp:*', - ], 'include_dirs': [ '../include/animator', - + '../include/config', + '../include/core', + '../include/effects', + '../include/images', + '../include/lazy', + '../include/utils', + '../include/views', '../include/views/animated', '../include/views/unix', + '../include/xml', ], 'sources': [ '../include/views/animated/SkBorderView.h', diff --git a/xml.gyp b/xml.gyp index e75dd4c..2c4e06f 100644 --- a/xml.gyp +++ b/xml.gyp @@ -5,12 +5,11 @@ 'product_name': 'skia_xml', 'type': 'static_library', 'standalone_static_library': 1, - 'dependencies': [ - 'core.gyp:*', - 'utils.gyp:*', - ], 'include_dirs': [ + '../include/config', + '../include/core', '../include/xml', + '../include/utils', ], 'sources': [ '../include/xml/SkBML_WXMLParser.h', diff --git a/zlib.gyp b/zlib.gyp index 1423c04..fcd0ac3 100644 --- a/zlib.gyp +++ b/zlib.gyp @@ -3,8 +3,9 @@ { 'target_name': 'zlib', 'type': 'static_library', - 'dependencies': [ - 'core.gyp:*', + 'include_dirs': [ + '../include/config', + '../include/core', ], 'sources': [ '../include/core/SkFlate.h', -- cgit v1.2.3 From 3ae1b13a97037e96b936c18edea38f57087ebfd6 Mon Sep 17 00:00:00 2001 From: "skia.committer@gmail.com" Date: Sat, 20 Jul 2013 07:00:58 +0000 Subject: Sanitizing source files in Housekeeper-Nightly git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@10223 2bbb7eff-a529-9590-31e7-b0007b416f81 --- core.gypi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core.gypi b/core.gypi index eac96f6..51cf640 100644 --- a/core.gypi +++ b/core.gypi @@ -33,7 +33,7 @@ '<(skia_src_path)/core/SkBitmapProcState_matrixProcs.cpp', '<(skia_src_path)/core/SkBitmapProcState_sample.h', '<(skia_src_path)/core/SkBitmapScaler.h', - '<(skia_src_path)/core/SkBitmapScaler.cpp', + '<(skia_src_path)/core/SkBitmapScaler.cpp', '<(skia_src_path)/core/SkBitmapShader16BilerpTemplate.h', '<(skia_src_path)/core/SkBitmapShaderTemplate.h', '<(skia_src_path)/core/SkBitmap_scroll.cpp', -- cgit v1.2.3 From 63bdcb69d110039a66918fb052014cd14bb34287 Mon Sep 17 00:00:00 2001 From: "zachr@google.com" Date: Mon, 22 Jul 2013 13:14:04 +0000 Subject: migrate skpdiff to tools R=djsollen@google.com Review URL: https://codereview.chromium.org/19671002 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@10225 2bbb7eff-a529-9590-31e7-b0007b416f81 --- tools.gyp | 49 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 49 insertions(+) diff --git a/tools.gyp b/tools.gyp index 4cbdf4b..6387fc0 100644 --- a/tools.gyp +++ b/tools.gyp @@ -21,6 +21,7 @@ 'render_pdfs', 'render_pictures', 'skdiff', + 'skpdiff', 'skhello', 'skimage', ], @@ -50,6 +51,54 @@ 'skia_lib.gyp:skia_lib', ], }, + { + 'target_name': 'skpdiff', + 'type': 'executable', + 'sources': [ + '../tools/skpdiff/skpdiff_main.cpp', + '../tools/skpdiff/SkDiffContext.cpp', + '../tools/skpdiff/SkImageDiffer.cpp', + '../tools/skpdiff/SkPMetric.cpp', + '../tools/skpdiff/skpdiff_util.cpp', + '../tools/flags/SkCommandLineFlags.cpp', + ], + 'include_dirs': [ + '../tools/flags' + ], + 'dependencies': [ + 'skia_lib.gyp:skia_lib', + ], + 'cflags': [ + '-O3', + ], + 'conditions': [ + ['skia_opencl', { + 'sources': [ + '../tools/skpdiff/SkCLImageDiffer.cpp', + '../tools/skpdiff/SkDifferentPixelsMetric_opencl.cpp', + ], + 'conditions': [ + [ 'skia_os == "mac"', { + 'link_settings': { + 'libraries': [ + '$(SDKROOT)/System/Library/Frameworks/OpenCL.framework', + ] + } + }, { + 'link_settings': { + 'libraries': [ + '-lOpenCL', + ], + }, + }], + ], + }, { # !skia_opencl + 'sources': [ + '../tools/skpdiff/SkDifferentPixelsMetric_cpu.cpp', + ], + }], + ], + }, { 'target_name': 'skimagediff', 'type': 'executable', -- cgit v1.2.3 From be169d477dda29d2b51e6cbf01eb6275a8c3750c Mon Sep 17 00:00:00 2001 From: "zachr@google.com" Date: Mon, 22 Jul 2013 13:29:20 +0000 Subject: Revert "migrate skpdiff to tools" This reverts commit 58a7ec70ce6b4548793a2ddc37c63d3d44edbc36. git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@10226 2bbb7eff-a529-9590-31e7-b0007b416f81 --- tools.gyp | 49 ------------------------------------------------- 1 file changed, 49 deletions(-) diff --git a/tools.gyp b/tools.gyp index 6387fc0..4cbdf4b 100644 --- a/tools.gyp +++ b/tools.gyp @@ -21,7 +21,6 @@ 'render_pdfs', 'render_pictures', 'skdiff', - 'skpdiff', 'skhello', 'skimage', ], @@ -51,54 +50,6 @@ 'skia_lib.gyp:skia_lib', ], }, - { - 'target_name': 'skpdiff', - 'type': 'executable', - 'sources': [ - '../tools/skpdiff/skpdiff_main.cpp', - '../tools/skpdiff/SkDiffContext.cpp', - '../tools/skpdiff/SkImageDiffer.cpp', - '../tools/skpdiff/SkPMetric.cpp', - '../tools/skpdiff/skpdiff_util.cpp', - '../tools/flags/SkCommandLineFlags.cpp', - ], - 'include_dirs': [ - '../tools/flags' - ], - 'dependencies': [ - 'skia_lib.gyp:skia_lib', - ], - 'cflags': [ - '-O3', - ], - 'conditions': [ - ['skia_opencl', { - 'sources': [ - '../tools/skpdiff/SkCLImageDiffer.cpp', - '../tools/skpdiff/SkDifferentPixelsMetric_opencl.cpp', - ], - 'conditions': [ - [ 'skia_os == "mac"', { - 'link_settings': { - 'libraries': [ - '$(SDKROOT)/System/Library/Frameworks/OpenCL.framework', - ] - } - }, { - 'link_settings': { - 'libraries': [ - '-lOpenCL', - ], - }, - }], - ], - }, { # !skia_opencl - 'sources': [ - '../tools/skpdiff/SkDifferentPixelsMetric_cpu.cpp', - ], - }], - ], - }, { 'target_name': 'skimagediff', 'type': 'executable', -- cgit v1.2.3 From 20afdb109ce35173e6fa97349448fc1133ffdbfc Mon Sep 17 00:00:00 2001 From: "djsollen@google.com" Date: Mon, 22 Jul 2013 14:12:56 +0000 Subject: refactor gyp to isolate freetype usage R=bungeman@google.com Review URL: https://codereview.chromium.org/19835002 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@10229 2bbb7eff-a529-9590-31e7-b0007b416f81 --- common_conditions.gypi | 4 ---- core.gyp | 2 -- freetype.gyp | 38 ++++++++++++++++++++++++++++++++++++++ ports.gyp | 44 +++++++++----------------------------------- skia_lib.gyp | 5 ----- 5 files changed, 47 insertions(+), 46 deletions(-) diff --git a/common_conditions.gypi b/common_conditions.gypi index a39756b..1ff70f5 100644 --- a/common_conditions.gypi +++ b/common_conditions.gypi @@ -240,10 +240,6 @@ '-pthread', ], }, - }, { # skia_os != "nacl" - 'include_dirs' : [ - '/usr/include/freetype2', - ], }], [ 'skia_os == "chromeos"', { 'ldflags': [ diff --git a/core.gyp b/core.gyp index bebcad6..28f5111 100644 --- a/core.gyp +++ b/core.gyp @@ -39,7 +39,6 @@ [ 'skia_os == "mac"', { 'include_dirs': [ '../include/utils/mac', - '../third_party/freetype/include/**', ], 'sources': [ '../include/utils/mac/SkCGUtils.h', @@ -110,7 +109,6 @@ [ 'skia_os == "mac"', { 'include_dirs': [ '../include/utils/mac', - '../third_party/freetype/include/**', ], }], [ 'skia_os == "ios"', { diff --git a/freetype.gyp b/freetype.gyp index f72c29c..91fc0b3 100644 --- a/freetype.gyp +++ b/freetype.gyp @@ -2,6 +2,44 @@ 'targets': [ { 'target_name': 'freetype', + 'type': 'none', + 'conditions': [ + [ 'skia_os in ["linux", "freebsd", "openbsd", "solaris", "chromeos"]', { + 'direct_dependent_settings': { + 'include_dirs' : [ + '/usr/include/freetype2', + ], + 'link_settings': { + 'libraries': [ + '-lfreetype', + ], + 'defines': [ + #The font host requires at least FreeType 2.3.0 at runtime. + 'SK_FONTHOST_FREETYPE_RUNTIME_VERSION=0x020300',\ + 'SK_CAN_USE_DLOPEN=1', + ], + } + }, + }], + [ 'skia_os in ["android", "nacl"]', { + 'dependencies': [ + 'freetype_static' + ], + 'export_dependent_settings': [ + 'freetype_static' + ], + 'direct_dependent_settings': { + 'defines': [ + # Both Android and NaCl provide at least FreeType 2.4.0 + 'SK_FONTHOST_FREETYPE_RUNTIME_VERSION=0x020400', + 'SK_CAN_USE_DLOPEN=0', + ], + }, + }], + ], + }, + { + 'target_name': 'freetype_static', 'type': 'static_library', 'standalone_static_library': 1, 'sources': [ diff --git a/ports.gyp b/ports.gyp index 0e57985..3fe8331 100644 --- a/ports.gyp +++ b/ports.gyp @@ -43,44 +43,30 @@ '../src/ports/SkXMLParser_empty.cpp', ], 'conditions': [ - [ 'skia_os in ["linux", "freebsd", "openbsd", "solaris", "chromeos"]', { - 'defines': [ - #The font host requires at least FreeType 2.3.0 at runtime. - 'SK_FONTHOST_FREETYPE_RUNTIME_VERSION=0x020300',\ - 'SK_CAN_USE_DLOPEN=1', + [ 'skia_os in ["linux", "freebsd", "openbsd", "solaris", "chromeos", "nacl", "android"]', { + 'sources': [ + '../src/ports/SkFontHost_FreeType.cpp', + '../src/ports/SkFontHost_FreeType_common.cpp', ], + 'dependencies': [ + 'freetype.gyp:freetype', + ], + }], + [ 'skia_os in ["linux", "freebsd", "openbsd", "solaris", "chromeos"]', { 'link_settings': { 'libraries': [ - '-lfreetype', '-lfontconfig', '-ldl', ], }, 'sources': [ '../src/fonts/SkFontMgr_fontconfig.cpp', - '../src/ports/SkFontHost_FreeType.cpp', - '../src/ports/SkFontHost_FreeType_common.cpp', '../src/ports/SkFontHost_fontconfig.cpp', '../src/ports/SkFontConfigInterface_direct.cpp', ], }], [ 'skia_os == "nacl"', { - 'dependencies': [ - # On other OS, we can dynamically link against freetype. For nacl, - # we have to include our own version since the naclports version is - # too old (<0x020300) to provide the functionality we need. - 'freetype.gyp:freetype', - ], - 'export_dependent_settings': [ - 'freetype.gyp:freetype', - ], - 'defines': [ - # We use Android's repo, which provides at least FreeType 2.4.0 - 'SK_FONTHOST_FREETYPE_RUNTIME_VERSION=0x020400',\ - ], 'sources': [ - '../src/ports/SkFontHost_FreeType.cpp', - '../src/ports/SkFontHost_FreeType_common.cpp', '../src/ports/SkFontHost_linux.cpp', ], 'sources!': [ @@ -94,12 +80,9 @@ [ 'skia_os == "mac"', { 'include_dirs': [ '../include/utils/mac', - '../third_party/freetype/include/**', ], 'sources': [ '../src/ports/SkFontHost_mac.cpp', -# '../src/ports/SkFontHost_FreeType.cpp', -# '../src/ports/SkFontHost_FreeType_common.cpp', '../src/ports/SkPurgeableMemoryBlock_mac.cpp', '../src/utils/mac/SkStream_mac.cpp', ], @@ -158,12 +141,6 @@ ], }], [ 'skia_os == "android"', { - 'defines': [ - #Android provides at least FreeType 2.4.0 at runtime. - 'SK_FONTHOST_FREETYPE_RUNTIME_VERSION=0x020400', - #Skia should not use dlopen on Android. - 'SK_CAN_USE_DLOPEN=0', - ], 'sources!': [ '../src/ports/SkDebug_stdio.cpp', '../src/ports/SkPurgeableMemoryBlock_none.cpp', @@ -172,13 +149,10 @@ '../src/ports/SkDebug_android.cpp', '../src/ports/SkFontConfigInterface_android.cpp', '../src/ports/SkFontConfigParser_android.cpp', - '../src/ports/SkFontHost_FreeType.cpp', - '../src/ports/SkFontHost_FreeType_common.cpp', '../src/ports/SkFontHost_fontconfig.cpp', '../src/ports/SkPurgeableMemoryBlock_android.cpp', ], 'dependencies': [ - 'freetype.gyp:freetype', 'android_deps.gyp:expat', ], }], diff --git a/skia_lib.gyp b/skia_lib.gyp index d4cd00e..6f8e9cf 100644 --- a/skia_lib.gyp +++ b/skia_lib.gyp @@ -27,11 +27,6 @@ 'gpu.gyp:skgpu', ], }], - [ 'skia_os == "nacl"', { - 'component_libs': [ - 'freetype.gyp:freetype', - ], - }], ], }, 'targets': [ -- cgit v1.2.3 From fe0c902e6a44be33c6c9ba18917f86767be01467 Mon Sep 17 00:00:00 2001 From: "bungeman@google.com" Date: Mon, 22 Jul 2013 14:39:45 +0000 Subject: Update obvious deps. This is a step toward targets declaring their deps in a sane fashion. This change resolves cycles by forcing core to the root, then everything in skia_lib pointing toward core as best possible, then everything outside skia_lib depending on skia_lib for things in skia_lib. This prevents double definitions where a symbol is provided by both the skia_lib shared object and and a statically linked component of skia_lib. R=djsollen@google.com Review URL: https://codereview.chromium.org/19823003 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@10231 2bbb7eff-a529-9590-31e7-b0007b416f81 --- animator.gyp | 13 +++++-------- effects.gyp | 9 +++++---- gm.gyp | 1 - gpu.gyp | 13 ++++++------- images.gyp | 3 +-- opts.gyp | 15 +++++++++------ pdf.gyp | 3 --- ports.gyp | 5 +++-- sfnt.gyp | 5 +++-- svg.gyp | 8 ++++---- utils.gyp | 5 +++-- views.gyp | 15 +++++---------- views_animated.gyp | 16 +++++++--------- xml.gyp | 6 +++--- zlib.gyp | 5 ++--- 15 files changed, 56 insertions(+), 66 deletions(-) diff --git a/animator.gyp b/animator.gyp index a462ca4..f6d875c 100644 --- a/animator.gyp +++ b/animator.gyp @@ -9,16 +9,13 @@ 'product_name': 'skia_animator', 'type': 'static_library', 'standalone_static_library': 1, + 'dependencies': [ + 'skia_lib.gyp:skia_lib', + 'views.gyp:*', + 'xml.gyp:*', + ], 'include_dirs': [ '../include/animator', - '../include/config', - '../include/core', - '../include/effects', - '../include/images', - '../include/lazy', - '../include/utils', - '../include/views', - '../include/xml', '../src/utils', ], 'sources': [ diff --git a/effects.gyp b/effects.gyp index d69c820..d0b8b4d 100644 --- a/effects.gyp +++ b/effects.gyp @@ -6,15 +6,16 @@ 'product_name': 'skia_effects', 'type': 'static_library', 'standalone_static_library': 1, + 'dependencies': [ + 'core.gyp:*', + 'images.gyp:*', + 'utils.gyp:*', + ], 'includes': [ 'effects.gypi', ], 'include_dirs': [ - '../include/config', - '../include/core', '../include/effects', - '../include/lazy', - '../include/utils', '../src/core', ], 'direct_dependent_settings': { diff --git a/gm.gyp b/gm.gyp index 3fdfb8e..6608aba 100644 --- a/gm.gyp +++ b/gm.gyp @@ -8,7 +8,6 @@ 'target_name': 'gm_expectations', 'type': 'static_library', 'include_dirs' : [ - '../include/core/', '../src/utils/', ], 'sources': [ diff --git a/gpu.gyp b/gpu.gyp index de0babd..df82cda 100644 --- a/gpu.gyp +++ b/gpu.gyp @@ -121,20 +121,19 @@ 'product_name': 'skia_skgpu', 'type': 'static_library', 'standalone_static_library': 1, + 'dependencies': [ + 'angle.gyp:*', + 'core.gyp:*', + 'utils.gyp:*', + ], 'includes': [ 'gpu.gypi', ], 'include_dirs': [ - '../include/config', - '../include/core', - '../include/utils', - '../src/core', '../include/gpu', + '../src/core', '../src/gpu', ], - 'dependencies': [ - 'angle.gyp:*', - ], 'export_dependent_settings': [ 'angle.gyp:*', ], diff --git a/images.gyp b/images.gyp index b2b404f..76df7d1 100644 --- a/images.gyp +++ b/images.gyp @@ -7,6 +7,7 @@ 'type': 'static_library', 'standalone_static_library': 1, 'dependencies': [ + 'core.gyp:*', 'libjpeg.gyp:*', 'libwebp.gyp:libwebp', 'utils.gyp:utils', @@ -15,8 +16,6 @@ 'libjpeg.gyp:*', ], 'include_dirs': [ - '../include/config', - '../include/core', '../include/images', '../include/lazy', # for access to SkErrorInternals.h diff --git a/opts.gyp b/opts.gyp index bcc85a9..8aa5e0f 100644 --- a/opts.gyp +++ b/opts.gyp @@ -23,9 +23,10 @@ 'product_name': 'skia_opts', 'type': 'static_library', 'standalone_static_library': 1, + 'dependencies': [ + 'core.gyp:*', + ], 'include_dirs': [ - '../include/config', - '../include/core', '../src/core', '../src/opts', ], @@ -111,9 +112,10 @@ 'product_name': 'skia_opts_ssse3', 'type': 'static_library', 'standalone_static_library': 1, + 'dependencies': [ + 'core.gyp:*', + ], 'include_dirs': [ - '../include/config', - '../include/core', '../src/core', ], 'conditions': [ @@ -146,9 +148,10 @@ 'product_name': 'skia_opts_neon', 'type': 'static_library', 'standalone_static_library': 1, + 'dependencies': [ + 'core.gyp:*', + ], 'include_dirs': [ - '../include/config', - '../include/core', '../src/core', '../src/opts', ], diff --git a/pdf.gyp b/pdf.gyp index f89df93..1efb984 100644 --- a/pdf.gyp +++ b/pdf.gyp @@ -10,9 +10,6 @@ 'zlib.gyp:zlib', ], 'include_dirs': [ - '../include/config', - '../include/core', - '../include/images', '../include/pdf', '../src/core', # needed to get SkGlyphCache.h and SkTextFormatParams.h '../src/utils', # needed to get SkBitSet.h diff --git a/ports.gyp b/ports.gyp index 3fe8331..fa717e1 100644 --- a/ports.gyp +++ b/ports.gyp @@ -6,9 +6,10 @@ 'product_name': 'skia_ports', 'type': 'static_library', 'standalone_static_library': 1, + 'dependencies': [ + 'core.gyp:*', + ], 'include_dirs': [ - '../include/config', - '../include/core', '../include/effects', '../include/images', '../include/ports', diff --git a/sfnt.gyp b/sfnt.gyp index cc21b22..88ab94f 100644 --- a/sfnt.gyp +++ b/sfnt.gyp @@ -5,9 +5,10 @@ 'product_name': 'skia_sfnt', 'type': 'static_library', 'standalone_static_library': 1, + 'dependencies': [ + 'core.gyp:*', + ], 'include_dirs': [ - '../include/config', - '../include/core', '../src/sfnt', ], 'sources': [ diff --git a/svg.gyp b/svg.gyp index 3952fd7..aed26a6 100644 --- a/svg.gyp +++ b/svg.gyp @@ -5,11 +5,11 @@ 'product_name': 'skia_svg', 'type': 'static_library', 'standalone_static_library': 1, + 'dependencies': [ + 'skia_lib.gyp:skia_lib', + 'xml.gyp:*', + ], 'include_dirs': [ - '../include/config', - '../include/core', - '../include/xml', - '../include/utils', '../include/svg', ], 'sources': [ diff --git a/utils.gyp b/utils.gyp index 2ec5374..68bf6b6 100644 --- a/utils.gyp +++ b/utils.gyp @@ -6,9 +6,10 @@ 'product_name': 'skia_utils', 'type': 'static_library', 'standalone_static_library': 1, + 'dependencies': [ + 'core.gyp:*', + ], 'include_dirs': [ - '../include/config', - '../include/core', '../include/effects', '../include/images', '../include/lazy', diff --git a/views.gyp b/views.gyp index 182bb34..51ce0f0 100644 --- a/views.gyp +++ b/views.gyp @@ -11,19 +11,14 @@ 'product_name': 'skia_views', 'type': 'static_library', 'standalone_static_library': 1, + 'dependencies': [ + 'skia_lib.gyp:skia_lib', + 'angle.gyp:*', + 'xml.gyp:*', + ], 'include_dirs': [ - '../include/config', - '../include/core', - '../include/effects', - '../include/images', - '../include/lazy', - '../include/utils', '../include/views', '../include/views/unix', - '../include/xml', - ], - 'dependencies': [ - 'angle.gyp:*', ], 'sources': [ '../include/views/SkApplication.h', diff --git a/views_animated.gyp b/views_animated.gyp index 29e981d..4bfcb28 100644 --- a/views_animated.gyp +++ b/views_animated.gyp @@ -5,18 +5,16 @@ { 'target_name': 'views_animated', 'type': 'static_library', + 'dependencies': [ + 'skia_lib.gyp:skia_lib', + 'angle.gyp:*', + 'animator.gyp:*', + 'views.gyp:*', + 'xml.gyp:*', + ], 'include_dirs': [ - '../include/animator', - '../include/config', - '../include/core', - '../include/effects', - '../include/images', - '../include/lazy', - '../include/utils', - '../include/views', '../include/views/animated', '../include/views/unix', - '../include/xml', ], 'sources': [ '../include/views/animated/SkBorderView.h', diff --git a/xml.gyp b/xml.gyp index 2c4e06f..7c06b44 100644 --- a/xml.gyp +++ b/xml.gyp @@ -5,11 +5,11 @@ 'product_name': 'skia_xml', 'type': 'static_library', 'standalone_static_library': 1, + 'dependencies': [ + 'skia_lib.gyp:skia_lib', + ], 'include_dirs': [ - '../include/config', - '../include/core', '../include/xml', - '../include/utils', ], 'sources': [ '../include/xml/SkBML_WXMLParser.h', diff --git a/zlib.gyp b/zlib.gyp index fcd0ac3..89d4470 100644 --- a/zlib.gyp +++ b/zlib.gyp @@ -3,9 +3,8 @@ { 'target_name': 'zlib', 'type': 'static_library', - 'include_dirs': [ - '../include/config', - '../include/core', + 'dependencies': [ + 'skia_lib.gyp:skia_lib', ], 'sources': [ '../include/core/SkFlate.h', -- cgit v1.2.3 From 6488041938586522ce313bc5000a2a4516e45052 Mon Sep 17 00:00:00 2001 From: "edisonn@google.com" Date: Mon, 22 Jul 2013 15:36:39 +0000 Subject: pdfviewer: All NulCanvas (does not draw operations), TrackDevice (trackes what pixels have been changed) Review URL: https://codereview.chromium.org/19793006 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@10236 2bbb7eff-a529-9590-31e7-b0007b416f81 --- pdfviewer.gyp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pdfviewer.gyp b/pdfviewer.gyp index 0161a1e..ae746fd 100644 --- a/pdfviewer.gyp +++ b/pdfviewer.gyp @@ -21,6 +21,8 @@ '../experimental/PdfViewer/SkPdfRenderer.cpp', '../experimental/PdfViewer/SkPdfUtils.cpp', #'../experimental/PdfViewer/SkPdfNYI.cpp', + '../experimental/PdfViewer/SkTrackDevice.cpp', + '../experimental/PdfViewer/SkTracker.cpp', '../experimental/PdfViewer/pdfparser/native/SkPdfObject.cpp', '../experimental/PdfViewer/pdfparser/native/SkPdfNativeTokenizer.cpp', '../experimental/PdfViewer/pdfparser/native/SkNativeParsedPDF.cpp', -- cgit v1.2.3 From 111c18628a309890e64bfd5138e85ca0d5620d4f Mon Sep 17 00:00:00 2001 From: "commit-bot@chromium.org" Date: Mon, 22 Jul 2013 18:20:52 +0000 Subject: Adds SkPDFResourceDict class, refactor existing code to use it. Committed: http://code.google.com/p/skia/source/detail?r=10202 R=vandebo@chromium.org, edisonn@google.com Author: richardlin@chromium.org Review URL: https://chromiumcodereview.appspot.com/18977002 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@10245 2bbb7eff-a529-9590-31e7-b0007b416f81 --- pdf.gyp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pdf.gyp b/pdf.gyp index 1efb984..afababe 100644 --- a/pdf.gyp +++ b/pdf.gyp @@ -35,6 +35,8 @@ '../src/pdf/SkPDFImageStream.h', '../src/pdf/SkPDFPage.cpp', '../src/pdf/SkPDFPage.h', + '../src/pdf/SkPDFResourceDict.cpp', + '../src/pdf/SkPDFResourceDict.h', '../src/pdf/SkPDFShader.cpp', '../src/pdf/SkPDFShader.h', '../src/pdf/SkPDFStream.cpp', -- cgit v1.2.3 From f56a8593349d546250a4796a591ebf147d8ce383 Mon Sep 17 00:00:00 2001 From: "vandebo@chromium.org" Date: Mon, 22 Jul 2013 18:31:24 +0000 Subject: Revert "Adds SkPDFResourceDict class, refactor existing code to use it." This reverts commit r10245 Review URL: https://codereview.chromium.org/19523007 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@10247 2bbb7eff-a529-9590-31e7-b0007b416f81 --- pdf.gyp | 2 -- 1 file changed, 2 deletions(-) diff --git a/pdf.gyp b/pdf.gyp index afababe..1efb984 100644 --- a/pdf.gyp +++ b/pdf.gyp @@ -35,8 +35,6 @@ '../src/pdf/SkPDFImageStream.h', '../src/pdf/SkPDFPage.cpp', '../src/pdf/SkPDFPage.h', - '../src/pdf/SkPDFResourceDict.cpp', - '../src/pdf/SkPDFResourceDict.h', '../src/pdf/SkPDFShader.cpp', '../src/pdf/SkPDFShader.h', '../src/pdf/SkPDFStream.cpp', -- cgit v1.2.3 From 2ac4f77f8d13429e79b4efa1999558845c89eda1 Mon Sep 17 00:00:00 2001 From: "zachr@google.com" Date: Mon, 22 Jul 2013 18:46:45 +0000 Subject: move skpdiff into tools R=djsollen@google.com Review URL: https://codereview.chromium.org/19608005 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@10249 2bbb7eff-a529-9590-31e7-b0007b416f81 --- tools.gyp | 56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 56 insertions(+) diff --git a/tools.gyp b/tools.gyp index 4cbdf4b..f460ee3 100644 --- a/tools.gyp +++ b/tools.gyp @@ -21,6 +21,7 @@ 'render_pdfs', 'render_pictures', 'skdiff', + 'skpdiff', 'skhello', 'skimage', ], @@ -50,6 +51,61 @@ 'skia_lib.gyp:skia_lib', ], }, + { + 'target_name': 'skpdiff', + 'type': 'executable', + 'sources': [ + '../tools/skpdiff/skpdiff_main.cpp', + '../tools/skpdiff/SkDiffContext.cpp', + '../tools/skpdiff/SkImageDiffer.cpp', + '../tools/skpdiff/SkPMetric.cpp', + '../tools/skpdiff/skpdiff_util.cpp', + '../tools/flags/SkCommandLineFlags.cpp', + ], + 'include_dirs': [ + '../tools/flags' + ], + 'dependencies': [ + 'skia_lib.gyp:skia_lib', + ], + 'cflags': [ + '-O3', + ], + 'conditions': [ + [ 'skia_os in ["linux", "freebsd", "openbsd", "solaris", "chromeos"]', { + 'link_settings': { + 'libraries': [ + '-lrt', + ], + }, + }], + ['skia_opencl', { + 'sources': [ + '../tools/skpdiff/SkCLImageDiffer.cpp', + '../tools/skpdiff/SkDifferentPixelsMetric_opencl.cpp', + ], + 'conditions': [ + [ 'skia_os == "mac"', { + 'link_settings': { + 'libraries': [ + '$(SDKROOT)/System/Library/Frameworks/OpenCL.framework', + ] + } + }, { + 'link_settings': { + 'libraries': [ + '-lOpenCL', + ], + }, + }], + ], + }, { # !skia_opencl + 'sources': [ + '../tools/skpdiff/SkDifferentPixelsMetric_cpu.cpp', + ], + }], + ], + }, { 'target_name': 'skimagediff', 'type': 'executable', -- cgit v1.2.3 From fa089adef6e3b1e5b04866b20d8bc75c79aca72d Mon Sep 17 00:00:00 2001 From: "senorblanco@chromium.org" Date: Mon, 22 Jul 2013 20:03:22 +0000 Subject: This patch implements a crop rect for SkImageFilter. It has been implemented for SkColorFilterImageFilter and SkBlurImageFilter as examples. In order to preserve the immutability of SkImageFilters, the crop rect is passed as a constructor parameter. If NULL (the default), the bounds of the input image are used, as before. This also tightens up the boundary handling for SkImageBlurFilter on the GPU backend. Where we were previously using clamping semantics, we now respect decal semantics (so we don't oversaturate the edges). This brings the GPU and raster backends into closer alignment, but will require some new baselines for the GPU tests. At a minimum, the following tests will need new baselines: imageblur, imagefiltersbase, imagefilterscropped, spritebitmap. R=reed@google.com Review URL: https://codereview.chromium.org/19775006 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@10251 2bbb7eff-a529-9590-31e7-b0007b416f81 --- gmslides.gypi | 1 + 1 file changed, 1 insertion(+) diff --git a/gmslides.gypi b/gmslides.gypi index 9d33549..46b1bd5 100644 --- a/gmslides.gypi +++ b/gmslides.gypi @@ -63,6 +63,7 @@ '../gm/lighting.cpp', '../gm/image.cpp', '../gm/imagefiltersbase.cpp', + '../gm/imagefilterscropped.cpp', '../gm/imagefiltersgraph.cpp', '../gm/internal_links.cpp', '../gm/lcdtext.cpp', -- cgit v1.2.3 From aeab405b75c28df7a40f57e654eb340b1a7b1eef Mon Sep 17 00:00:00 2001 From: "commit-bot@chromium.org" Date: Tue, 23 Jul 2013 11:13:56 +0000 Subject: Turn on -Wall -Wextra on Mac, and fix all the warnings that crop up for /usr/bin/g++ and Clang 3.3. BUG= R=bungeman@google.com Author: mtklein@google.com Review URL: https://chromiumcodereview.appspot.com/19569012 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@10255 2bbb7eff-a529-9590-31e7-b0007b416f81 --- common_conditions.gypi | 3 +++ 1 file changed, 3 insertions(+) diff --git a/common_conditions.gypi b/common_conditions.gypi index 1ff70f5..2dcd36c 100644 --- a/common_conditions.gypi +++ b/common_conditions.gypi @@ -302,6 +302,9 @@ 'xcode_settings': { 'OTHER_CPLUSPLUSFLAGS': [ '-Werror', + '-Wall', + '-Wextra', + '-Wno-unused-parameter', ], }, }], -- cgit v1.2.3 From 6d902cbf7f7d6d4db3ffa0f68974d8ddf55ad5eb Mon Sep 17 00:00:00 2001 From: "djsollen@google.com" Date: Tue, 23 Jul 2013 12:22:11 +0000 Subject: Update freetype DEPS to version 2.5 with PNG encoded color bitmap glyphs R=bungeman@google.com Review URL: https://codereview.chromium.org/19931003 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@10259 2bbb7eff-a529-9590-31e7-b0007b416f81 --- freetype.gyp | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/freetype.gyp b/freetype.gyp index 91fc0b3..8800674 100644 --- a/freetype.gyp +++ b/freetype.gyp @@ -42,6 +42,10 @@ 'target_name': 'freetype_static', 'type': 'static_library', 'standalone_static_library': 1, + 'dependencies': [ + # we are dependent upon PNG for color emoji glyphs + 'images.gyp:images' + ], 'sources': [ # base components (required) '../third_party/externals/freetype/src/base/ftsystem.c', @@ -80,6 +84,7 @@ '../third_party/externals/freetype/src/psnames/psnames.c', # PostScript glyph names support ], 'include_dirs': [ + '../third_party/freetype', '../third_party/externals/freetype/internal', '../third_party/externals/freetype/builds', '../third_party/externals/freetype/include', @@ -94,6 +99,11 @@ ], }, 'conditions': [ + [ 'skia_warnings_as_errors', { + 'cflags!': [ + '-Werror', + ], + }], [ 'skia_os == "mac"', { 'sources': [ '../third_party/externals/freetype/src/base/ftmac.c', # only on the Macintosh -- cgit v1.2.3 From d5471806d820f1e2d840e21a960af7e5c9290b23 Mon Sep 17 00:00:00 2001 From: "djsollen@google.com" Date: Tue, 23 Jul 2013 15:51:12 +0000 Subject: Update freetype to version 2.5.0.1 when building it from source. R=bungeman@google.com Review URL: https://codereview.chromium.org/19625006 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@10273 2bbb7eff-a529-9590-31e7-b0007b416f81 --- freetype.gyp | 4 ++-- images.gyp | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/freetype.gyp b/freetype.gyp index 8800674..91c92b7 100644 --- a/freetype.gyp +++ b/freetype.gyp @@ -79,12 +79,11 @@ # auxiliary modules (optional) '../third_party/externals/freetype/src/autofit/autofit.c', # auto hinting module - '../third_party/externals/freetype/src/psaux/psaux.c', # PostScript Type 1 parsing '../third_party/externals/freetype/src/pshinter/pshinter.c', # PS hinting module '../third_party/externals/freetype/src/psnames/psnames.c', # PostScript glyph names support ], 'include_dirs': [ - '../third_party/freetype', + '../third_party/freetype/include_overrides', '../third_party/externals/freetype/internal', '../third_party/externals/freetype/builds', '../third_party/externals/freetype/include', @@ -95,6 +94,7 @@ ], 'direct_dependent_settings': { 'include_dirs': [ + '../third_party/freetype/include_overrides', '../third_party/externals/freetype/include', ], }, diff --git a/images.gyp b/images.gyp index 76df7d1..6d3b009 100644 --- a/images.gyp +++ b/images.gyp @@ -136,6 +136,9 @@ 'android_deps.gyp:gif', 'android_deps.gyp:png', ], + 'export_dependent_settings': [ + 'android_deps.gyp:png' + ], },{ #else if skia_os != android 'sources!': [ '../src/images/SkImageRef_ashmem.h', -- cgit v1.2.3 From 728cc3b351ae78901f11615f6d8b61736271a8ed Mon Sep 17 00:00:00 2001 From: "reed@google.com" Date: Tue, 23 Jul 2013 16:20:28 +0000 Subject: remove dead SampleDecode.cpp git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@10275 2bbb7eff-a529-9590-31e7-b0007b416f81 --- SampleApp.gyp | 9 --------- 1 file changed, 9 deletions(-) diff --git a/SampleApp.gyp b/SampleApp.gyp index 6473ea4..4fb8a84 100644 --- a/SampleApp.gyp +++ b/SampleApp.gyp @@ -57,7 +57,6 @@ '../samplecode/SampleComplexClip.cpp', '../samplecode/SampleConcavePaths.cpp', '../samplecode/SampleCull.cpp', - '../samplecode/SampleDecode.cpp', '../samplecode/SampleDegenerateTwoPtRadials.cpp', '../samplecode/SampleDither.cpp', '../samplecode/SampleDitherBitmap.cpp', @@ -171,11 +170,6 @@ '../samplecode/SamplePdfFileViewer.cpp', ] }], - [ 'skia_os in ["linux", "freebsd", "openbsd", "solaris", "chromeos"]', { - 'sources!': [ - '../samplecode/SampleDecode.cpp', - ], - }], [ 'skia_os == "win"', { 'sources!': [ # require UNIX functions @@ -183,9 +177,6 @@ ], }], [ 'skia_os == "mac"', { - 'sources!': [ - '../samplecode/SampleDecode.cpp', - ], 'sources': [ # Sample App specific files '../src/views/mac/SampleApp-Info.plist', -- cgit v1.2.3 From d6b3b4f66b669bdd62a169da7f01d2c5373961e5 Mon Sep 17 00:00:00 2001 From: "sglez@google.com" Date: Tue, 23 Jul 2013 17:26:34 +0000 Subject: refactor duplication (shouldSkip and skip_name) into a utility function R=caryclark@google.com, reed@google.com Review URL: https://codereview.chromium.org/19807005 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@10280 2bbb7eff-a529-9590-31e7-b0007b416f81 --- bench.gyp | 1 + 1 file changed, 1 insertion(+) diff --git a/bench.gyp b/bench.gyp index 27f80ce..040f7a4 100644 --- a/bench.gyp +++ b/bench.gyp @@ -19,6 +19,7 @@ 'dependencies': [ 'skia_lib.gyp:skia_lib', 'bench_timer', + 'flags.gyp:flags', ], 'conditions': [ ['skia_gpu == 1', -- cgit v1.2.3 From 1c8cb1dba961393f3f66fce76df719561e993e79 Mon Sep 17 00:00:00 2001 From: "epoger@google.com" Date: Tue, 23 Jul 2013 17:56:20 +0000 Subject: Revert r10280, which caused https://code.google.com/p/skia/issues/detail?id=1441 Review URL: https://codereview.chromium.org/19537005 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@10284 2bbb7eff-a529-9590-31e7-b0007b416f81 --- bench.gyp | 1 - 1 file changed, 1 deletion(-) diff --git a/bench.gyp b/bench.gyp index 040f7a4..27f80ce 100644 --- a/bench.gyp +++ b/bench.gyp @@ -19,7 +19,6 @@ 'dependencies': [ 'skia_lib.gyp:skia_lib', 'bench_timer', - 'flags.gyp:flags', ], 'conditions': [ ['skia_gpu == 1', -- cgit v1.2.3 From dac670026f7417a9dcfc9800dcd3f0645e46f501 Mon Sep 17 00:00:00 2001 From: "reed@google.com" Date: Tue, 23 Jul 2013 19:13:54 +0000 Subject: add scaledimagecache BUG= Review URL: https://codereview.chromium.org/20005003 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@10286 2bbb7eff-a529-9590-31e7-b0007b416f81 --- bench.gypi | 1 + core.gypi | 1 + tests.gyp | 1 + 3 files changed, 3 insertions(+) diff --git a/bench.gypi b/bench.gypi index 4d9dcbe..a2d5369 100644 --- a/bench.gypi +++ b/bench.gypi @@ -29,6 +29,7 @@ '../bench/GameBench.cpp', '../bench/GradientBench.cpp', '../bench/GrMemoryPoolBench.cpp', + '../bench/ImageCacheBench.cpp', '../bench/ImageDecodeBench.cpp', '../bench/InterpBench.cpp', '../bench/HairlinePathBench.cpp', diff --git a/core.gypi b/core.gypi index 51cf640..5c3fdf5 100644 --- a/core.gypi +++ b/core.gypi @@ -150,6 +150,7 @@ '<(skia_src_path)/core/SkRRect.cpp', '<(skia_src_path)/core/SkRTree.h', '<(skia_src_path)/core/SkRTree.cpp', + '<(skia_src_path)/core/SkScaledImageCache.cpp', '<(skia_src_path)/core/SkScalar.cpp', '<(skia_src_path)/core/SkScalerContext.cpp', '<(skia_src_path)/core/SkScalerContext.h', diff --git a/tests.gyp b/tests.gyp index e93a12f..3f4cbe7 100644 --- a/tests.gyp +++ b/tests.gyp @@ -67,6 +67,7 @@ '../tests/GrMemoryPoolTest.cpp', '../tests/GrSurfaceTest.cpp', '../tests/HashCacheTest.cpp', + '../tests/ImageCacheTest.cpp', '../tests/ImageDecodingTest.cpp', '../tests/InfRectTest.cpp', '../tests/LListTest.cpp', -- cgit v1.2.3 From 2fc7f026409be77bc0397199da496f3b2cf7fd4e Mon Sep 17 00:00:00 2001 From: "commit-bot@chromium.org" Date: Tue, 23 Jul 2013 21:49:29 +0000 Subject: Fix Clang build on SkPDFResourceDict (CL 18977002) R=edisonn@google.com, vandebo@chromium.org Author: richardlin@chromium.org Review URL: https://chromiumcodereview.appspot.com/19954011 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@10295 2bbb7eff-a529-9590-31e7-b0007b416f81 --- pdf.gyp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pdf.gyp b/pdf.gyp index 1efb984..afababe 100644 --- a/pdf.gyp +++ b/pdf.gyp @@ -35,6 +35,8 @@ '../src/pdf/SkPDFImageStream.h', '../src/pdf/SkPDFPage.cpp', '../src/pdf/SkPDFPage.h', + '../src/pdf/SkPDFResourceDict.cpp', + '../src/pdf/SkPDFResourceDict.h', '../src/pdf/SkPDFShader.cpp', '../src/pdf/SkPDFShader.h', '../src/pdf/SkPDFStream.cpp', -- cgit v1.2.3 From f52cb2de30a9008d67ac3456e1cf9136fe661b76 Mon Sep 17 00:00:00 2001 From: "robertphillips@google.com" Date: Wed, 24 Jul 2013 13:18:06 +0000 Subject: Reverting r10251 (Implement crop rect for SkImageFilter) due to Chromium-side unit test failures git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@10304 2bbb7eff-a529-9590-31e7-b0007b416f81 --- gmslides.gypi | 1 - 1 file changed, 1 deletion(-) diff --git a/gmslides.gypi b/gmslides.gypi index 46b1bd5..9d33549 100644 --- a/gmslides.gypi +++ b/gmslides.gypi @@ -63,7 +63,6 @@ '../gm/lighting.cpp', '../gm/image.cpp', '../gm/imagefiltersbase.cpp', - '../gm/imagefilterscropped.cpp', '../gm/imagefiltersgraph.cpp', '../gm/internal_links.cpp', '../gm/lcdtext.cpp', -- cgit v1.2.3 From 04184ce83d5bf8ea5043e5ee67eef0834d3c49dd Mon Sep 17 00:00:00 2001 From: "edisonn@google.com" Date: Wed, 24 Jul 2013 15:56:19 +0000 Subject: pdfviewer: remove dependency on picture_utils. add utility function to render SkStream into bitmap. Review URL: https://codereview.chromium.org/20087003 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@10314 2bbb7eff-a529-9590-31e7-b0007b416f81 --- pdfviewer.gyp | 5 ----- 1 file changed, 5 deletions(-) diff --git a/pdfviewer.gyp b/pdfviewer.gyp index ae746fd..c138d9f 100644 --- a/pdfviewer.gyp +++ b/pdfviewer.gyp @@ -11,10 +11,6 @@ { 'target_name': 'libpdfviewer', 'type': 'static_library', - 'cflags': ['-fexceptions'], - 'cflags_cc': ['-fexceptions'], - 'cflags!': [ '-fno-exceptions' ], - 'cflags_cc!': [ '-fno-exceptions' ], 'sources': [ '../experimental/PdfViewer/SkPdfBasics.cpp', '../experimental/PdfViewer/SkPdfFont.cpp', @@ -91,7 +87,6 @@ 'core.gyp:core', 'flags.gyp:flags', 'libpdfviewer', - 'tools.gyp:picture_utils', ], }, ], -- cgit v1.2.3 From 6c5572922c21d807a5577ec94a4fc4448ca357ae Mon Sep 17 00:00:00 2001 From: "mtklein@google.com" Date: Wed, 24 Jul 2013 16:20:05 +0000 Subject: all in the gyp BUG= R=caryclark@google.com Review URL: https://codereview.chromium.org/19726012 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@10315 2bbb7eff-a529-9590-31e7-b0007b416f81 --- common_conditions.gypi | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/common_conditions.gypi b/common_conditions.gypi index 2dcd36c..6828660 100644 --- a/common_conditions.gypi +++ b/common_conditions.gypi @@ -308,6 +308,14 @@ ], }, }], +# This old compiler is really bad at figuring out when things are uninitialized, so ignore it. + [ '<(mac_sdk)==10.6', { + 'xcode_settings': { + 'OTHER_CPLUSPLUSFLAGS': [ + '-Wno-uninitialized', + ], + }, + }], ], 'configurations': { 'Debug': { -- cgit v1.2.3 From e881d36015d575ea48fd1cda7569825f9a56c04e Mon Sep 17 00:00:00 2001 From: "sglez@google.com" Date: Wed, 24 Jul 2013 17:24:23 +0000 Subject: refactor duplication (shouldSkip and skip_name) into a utility function R=caryclark@google.com, reed@google.com Committed: https://code.google.com/p/skia/source/detail?r=10280 Review URL: https://codereview.chromium.org/19807005 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@10317 2bbb7eff-a529-9590-31e7-b0007b416f81 --- bench.gyp | 1 + 1 file changed, 1 insertion(+) diff --git a/bench.gyp b/bench.gyp index 27f80ce..040f7a4 100644 --- a/bench.gyp +++ b/bench.gyp @@ -19,6 +19,7 @@ 'dependencies': [ 'skia_lib.gyp:skia_lib', 'bench_timer', + 'flags.gyp:flags', ], 'conditions': [ ['skia_gpu == 1', -- cgit v1.2.3 From 1f1e4fd7b688aa5a63d7444cb74e2cbccefe6c66 Mon Sep 17 00:00:00 2001 From: "edisonn@google.com" Date: Wed, 24 Jul 2013 17:32:30 +0000 Subject: pdfviewer: path for outputs are relative to some other folder, make them absolute. Review URL: https://codereview.chromium.org/19808012 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@10318 2bbb7eff-a529-9590-31e7-b0007b416f81 --- pdfviewer.gyp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pdfviewer.gyp b/pdfviewer.gyp index c138d9f..f2e8cb7 100644 --- a/pdfviewer.gyp +++ b/pdfviewer.gyp @@ -33,9 +33,9 @@ '../experimental/PdfViewer/PdfReference-okular-1.txt', ], 'outputs': [ - '../experimental/PdfViewer/autogen/pdfspec_autogen.py', + '<(skia_src_path)/../experimental/PdfViewer/autogen/pdfspec_autogen.py', ], - 'action': ['python', '../experimental/PdfViewer/spec2def.py', '../experimental/PdfViewer/PdfReference-okular-1.txt', '../experimental/PdfViewer/autogen/pdfspec_autogen.py'], + 'action': ['python', '<(skia_src_path)/../experimental/PdfViewer/spec2def.py', '<(skia_src_path)/../experimental/PdfViewer/PdfReference-okular-1.txt', '<(skia_src_path)/../experimental/PdfViewer/autogen/pdfspec_autogen.py'], }, { 'action_name': 'generate_code', @@ -44,13 +44,13 @@ '../experimental/PdfViewer/autogen/pdfspec_autogen.py', ], 'outputs': [ - '../experimental/PdfViewer/pdfparser/autogen/SkPdfEnums_autogen.h', - '../experimental/PdfViewer/pdfparser/native/autogen/SkPdfMapper_autogen.cpp', - '../experimental/PdfViewer/pdfparser/native/autogen/SkPdfHeaders_autogen.cpp', + '<(skia_src_path)/../experimental/PdfViewer/pdfparser/autogen/SkPdfEnums_autogen.h', + '<(skia_src_path)/../experimental/PdfViewer/pdfparser/native/autogen/SkPdfMapper_autogen.cpp', + '<(skia_src_path)/../experimental/PdfViewer/pdfparser/native/autogen/SkPdfHeaders_autogen.cpp', # TODO(edisonn): ok, there are many more files here, which we should list but since # any change in the above should trigger a change here, we should be fine normally ], - 'action': ['python', '../experimental/PdfViewer/generate_code.py', '../experimental/PdfViewer/pdfparser/'], + 'action': ['python', '<(skia_src_path)/../experimental/PdfViewer/generate_code.py', '<(skia_src_path)/../experimental/PdfViewer/pdfparser/'], }, ], 'include_dirs': [ -- cgit v1.2.3 From 463558a519673337b3b5464f632e3f69183ad406 Mon Sep 17 00:00:00 2001 From: "sglez@google.com" Date: Wed, 24 Jul 2013 17:48:03 +0000 Subject: SkiaExamples improvements. Make it possible for a client to write a Hello World in less than 50 lines. R=caryclark@google.com Review URL: https://codereview.chromium.org/18574002 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@10319 2bbb7eff-a529-9590-31e7-b0007b416f81 --- SkiaExamples.gyp | 76 -------------------------------------------------------- experimental.gyp | 69 ++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 69 insertions(+), 76 deletions(-) delete mode 100644 SkiaExamples.gyp diff --git a/SkiaExamples.gyp b/SkiaExamples.gyp deleted file mode 100644 index 8f26a8a..0000000 --- a/SkiaExamples.gyp +++ /dev/null @@ -1,76 +0,0 @@ -{ - 'targets' : [ - { - 'target_name': 'SkiaExamples', - 'type': 'executable', - 'mac_bundle' : 1, - 'include_dirs' : [], - 'includes': [], - 'sources': [ - '../experimental/SkiaExamples/HelloSkiaExample.cpp', - '../experimental/SkiaExamples/BaseExample.h', - '../experimental/SkiaExamples/BaseExample.cpp', - ], - 'dependencies': [ - 'skia_lib.gyp:skia_lib', - 'views.gyp:views', - 'xml.gyp:xml', - ], - 'conditions' : [ - [ 'skia_gpu == 1', { - 'include_dirs' : [ - '../src/gpu', #gl/GrGLUtil.h - ] - }], - [ 'skia_os == "win"', { - 'sources' : [ - '../src/views/win/SkOSWindow_Win.cpp', - '../src/views/win/skia_win.cpp', - ], - }, - ], - - [ 'skia_os == "mac"', { - 'sources': [ - -# SkiaExamples specific files - '../experimental/SkiaExamples/SkiaExamples-Info.plist', - '../experimental/SkiaExamples/SkExampleNSView.h', - '../experimental/SkiaExamples/SkExampleNSView.mm', - -# Mac files - '../src/views/mac/SampleAppDelegate.h', - '../src/views/mac/SampleAppDelegate.mm', - '../src/views/mac/SkEventNotifier.mm', - '../src/views/mac/skia_mac.mm', - '../src/views/mac/SkNSView.h', - '../src/views/mac/SkNSView.mm', - '../src/views/mac/SkOptionsTableView.h', - '../src/views/mac/SkOptionsTableView.mm', - '../src/views/mac/SkOSWindow_Mac.mm', - '../src/views/mac/SkTextFieldCell.h', - '../src/views/mac/SkTextFieldCell.m', - ], - 'include_dirs' : [ - '../src/views/mac/' - ], - 'link_settings': { - }, - 'xcode_settings' : { - 'INFOPLIST_FILE' : '../experimental/SkiaExamples/SkiaExamples-Info.plist', - }, - 'mac_bundle_resources' : [ - '../experimental/SkiaExamples/SkiaExamples.xib' - ], - } - ], - ], - } - ], -} - -# Local Variables: -# tab-width:2 -# indent-tabs-mode:nil -# End: -# vim: set expandtab tabstop=2 shiftwidth=2: diff --git a/experimental.gyp b/experimental.gyp index 09711ac..5552b4c 100644 --- a/experimental.gyp +++ b/experimental.gyp @@ -18,6 +18,75 @@ ], }, }, + { + 'target_name': 'SkiaExamples', + 'type': 'executable', + 'mac_bundle' : 1, + 'include_dirs' : [ + '../tools/flags', + ], + 'includes': [], + 'sources': [ + '../experimental/SkiaExamples/SkExample.h', + '../experimental/SkiaExamples/SkExample.cpp', + '../experimental/SkiaExamples/HelloSkiaExample.cpp', + ], + 'dependencies': [ + 'skia_lib.gyp:skia_lib', + 'views.gyp:views', + 'xml.gyp:xml', + 'flags.gyp:flags' + ], + 'conditions' : [ + [ 'skia_gpu == 1', { + 'include_dirs' : [ + '../src/gpu', #gl/GrGLUtil.h + ] + }], + [ 'skia_os == "win"', { + 'sources' : [ + '../src/views/win/SkOSWindow_Win.cpp', + '../src/views/win/skia_win.cpp', + ], + }, + ], + + [ 'skia_os == "mac"', { + 'sources': [ + +# SkiaExamples specific files + '../experimental/SkiaExamples/SkiaExamples-Info.plist', + '../experimental/SkiaExamples/SkExampleNSView.h', + '../experimental/SkiaExamples/SkExampleNSView.mm', + +# Mac files + '../src/views/mac/SampleAppDelegate.h', + '../src/views/mac/SampleAppDelegate.mm', + '../src/views/mac/SkEventNotifier.mm', + '../src/views/mac/skia_mac.mm', + '../src/views/mac/SkNSView.h', + '../src/views/mac/SkNSView.mm', + '../src/views/mac/SkOptionsTableView.h', + '../src/views/mac/SkOptionsTableView.mm', + '../src/views/mac/SkOSWindow_Mac.mm', + '../src/views/mac/SkTextFieldCell.h', + '../src/views/mac/SkTextFieldCell.m', + ], + 'include_dirs' : [ + '../src/views/mac/' + ], + 'link_settings': { + }, + 'xcode_settings' : { + 'INFOPLIST_FILE' : '../experimental/SkiaExamples/SkiaExamples-Info.plist', + }, + 'mac_bundle_resources' : [ + '../experimental/SkiaExamples/SkiaExamples.xib' + ], + } + ], + ], + } ], } -- cgit v1.2.3 From ba077b2bba425e3c6127a748f7708cee16add283 Mon Sep 17 00:00:00 2001 From: "senorblanco@chromium.org" Date: Wed, 24 Jul 2013 22:19:24 +0000 Subject: This patch implements a crop rect for SkImageFilter. It has been implemented for SkColorFilterImageFilter and SkBlurImageFilter as examples. In order to preserve the immutability of SkImageFilters, the crop rect is passed as a constructor parameter. If NULL (the default), the bounds of the input image are used, as before. This also tightens up the boundary handling for SkImageBlurFilter on the GPU backend. Where we were previously using clamping semantics, we now respect decal semantics (so we don't oversaturate the edges). This brings the GPU and raster backends into closer alignment, but will require some new baselines for the GPU tests. At a minimum, the following tests will need new baselines: imageblur, imagefiltersbase, imagefilterscropped, spritebitmap. R=reed@google.com Committed: https://code.google.com/p/skia/source/detail?r=10251 Review URL: https://codereview.chromium.org/19775006 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@10338 2bbb7eff-a529-9590-31e7-b0007b416f81 --- gmslides.gypi | 1 + tests.gyp | 1 + 2 files changed, 2 insertions(+) diff --git a/gmslides.gypi b/gmslides.gypi index 9d33549..46b1bd5 100644 --- a/gmslides.gypi +++ b/gmslides.gypi @@ -63,6 +63,7 @@ '../gm/lighting.cpp', '../gm/image.cpp', '../gm/imagefiltersbase.cpp', + '../gm/imagefilterscropped.cpp', '../gm/imagefiltersgraph.cpp', '../gm/internal_links.cpp', '../gm/lcdtext.cpp', diff --git a/tests.gyp b/tests.gyp index 3f4cbe7..a4ea32d 100644 --- a/tests.gyp +++ b/tests.gyp @@ -69,6 +69,7 @@ '../tests/HashCacheTest.cpp', '../tests/ImageCacheTest.cpp', '../tests/ImageDecodingTest.cpp', + '../tests/ImageFilterTest.cpp', '../tests/InfRectTest.cpp', '../tests/LListTest.cpp', '../tests/LayerDrawLooperTest.cpp', -- cgit v1.2.3 From cf49b0820d41e9b00589381c74fad10e522def4b Mon Sep 17 00:00:00 2001 From: "sglez@google.com" Date: Thu, 25 Jul 2013 14:55:18 +0000 Subject: Add lua_pictures target to tools.gyp BUG= R=rmistry@google.com Review URL: https://codereview.chromium.org/20321002 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@10355 2bbb7eff-a529-9590-31e7-b0007b416f81 --- tools.gyp | 1 + 1 file changed, 1 insertion(+) diff --git a/tools.gyp b/tools.gyp index f460ee3..3eae3cc 100644 --- a/tools.gyp +++ b/tools.gyp @@ -15,6 +15,7 @@ 'dependencies': [ 'bench_pictures', 'filter', + 'lua_pictures', 'bbh_shootout', 'lua_app', 'pinspect', -- cgit v1.2.3 From 2ac9ea467776d4afd16e1073631d0901022cdf68 Mon Sep 17 00:00:00 2001 From: "edisonn@google.com" Date: Thu, 25 Jul 2013 15:33:13 +0000 Subject: pdfviewer: update drawBitmap, and fic a gyp issue: gyp does not run in a consistent way on various palt forms, and it generates some files in ../../../foo instead of ../foo - Solution: use the (inconvenient) Shared intermediary directory that should work on all platforms. Review URL: https://codereview.chromium.org/20328002 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@10359 2bbb7eff-a529-9590-31e7-b0007b416f81 --- pdfviewer.gyp | 33 +++++++++++++++++++++------------ 1 file changed, 21 insertions(+), 12 deletions(-) diff --git a/pdfviewer.gyp b/pdfviewer.gyp index f2e8cb7..7e862b8 100644 --- a/pdfviewer.gyp +++ b/pdfviewer.gyp @@ -22,9 +22,18 @@ '../experimental/PdfViewer/pdfparser/native/SkPdfObject.cpp', '../experimental/PdfViewer/pdfparser/native/SkPdfNativeTokenizer.cpp', '../experimental/PdfViewer/pdfparser/native/SkNativeParsedPDF.cpp', - '../experimental/PdfViewer/pdfparser/native/autogen/SkPdfMapper_autogen.cpp', - '../experimental/PdfViewer/pdfparser/native/autogen/SkPdfHeaders_autogen.cpp', + '<(SHARED_INTERMEDIATE_DIR)/native/autogen/SkPdfMapper_autogen.cpp', + '<(SHARED_INTERMEDIATE_DIR)/native/autogen/SkPdfHeaders_autogen.cpp', ], + 'copies': [ + { + 'files': [ + '../experimental/PdfViewer/datatypes.py', + '../experimental/PdfViewer/generate_code.py', + ], + 'destination': '<(SHARED_INTERMEDIATE_DIR)', + }, + ], 'actions': [ { 'action_name': 'spec2def', @@ -33,32 +42,32 @@ '../experimental/PdfViewer/PdfReference-okular-1.txt', ], 'outputs': [ - '<(skia_src_path)/../experimental/PdfViewer/autogen/pdfspec_autogen.py', + '<(SHARED_INTERMEDIATE_DIR)/pdfspec_autogen.py', ], - 'action': ['python', '<(skia_src_path)/../experimental/PdfViewer/spec2def.py', '<(skia_src_path)/../experimental/PdfViewer/PdfReference-okular-1.txt', '<(skia_src_path)/../experimental/PdfViewer/autogen/pdfspec_autogen.py'], + 'action': ['python', '../experimental/PdfViewer/spec2def.py', '../experimental/PdfViewer/PdfReference-okular-1.txt', '<(SHARED_INTERMEDIATE_DIR)/pdfspec_autogen.py'], }, { 'action_name': 'generate_code', 'inputs': [ - '../experimental/PdfViewer/generate_code.py', - '../experimental/PdfViewer/autogen/pdfspec_autogen.py', + '<(SHARED_INTERMEDIATE_DIR)/datatypes.py', + '<(SHARED_INTERMEDIATE_DIR)/generate_code.py', + '<(SHARED_INTERMEDIATE_DIR)/pdfspec_autogen.py', ], 'outputs': [ - '<(skia_src_path)/../experimental/PdfViewer/pdfparser/autogen/SkPdfEnums_autogen.h', - '<(skia_src_path)/../experimental/PdfViewer/pdfparser/native/autogen/SkPdfMapper_autogen.cpp', - '<(skia_src_path)/../experimental/PdfViewer/pdfparser/native/autogen/SkPdfHeaders_autogen.cpp', + '<(SHARED_INTERMEDIATE_DIR)/native/autogen/SkPdfEnums_autogen.h', + '<(SHARED_INTERMEDIATE_DIR)/native/autogen/SkPdfMapper_autogen.cpp', + '<(SHARED_INTERMEDIATE_DIR)/native/autogen/SkPdfHeaders_autogen.cpp', # TODO(edisonn): ok, there are many more files here, which we should list but since # any change in the above should trigger a change here, we should be fine normally ], - 'action': ['python', '<(skia_src_path)/../experimental/PdfViewer/generate_code.py', '<(skia_src_path)/../experimental/PdfViewer/pdfparser/'], + 'action': ['python', '<(SHARED_INTERMEDIATE_DIR)/generate_code.py', '<(SHARED_INTERMEDIATE_DIR)'], }, ], 'include_dirs': [ '../experimental/PdfViewer', '../experimental/PdfViewer/pdfparser', - '../experimental/PdfViewer/pdfparser/autogen', '../experimental/PdfViewer/pdfparser/native', - '../experimental/PdfViewer/pdfparser/native/autogen', + '<(SHARED_INTERMEDIATE_DIR)/native/autogen', ], 'dependencies': [ 'core.gyp:core', -- cgit v1.2.3 From 1e56936646faaff04fa840ac74bd86c98aed0857 Mon Sep 17 00:00:00 2001 From: "robertphillips@google.com" Date: Thu, 25 Jul 2013 21:34:00 +0000 Subject: Added GM to test forthcoming bleed flag https://codereview.chromium.org/20101004/ git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@10375 2bbb7eff-a529-9590-31e7-b0007b416f81 --- gmslides.gypi | 1 + 1 file changed, 1 insertion(+) diff --git a/gmslides.gypi b/gmslides.gypi index 46b1bd5..275568a 100644 --- a/gmslides.gypi +++ b/gmslides.gypi @@ -15,6 +15,7 @@ '../gm/bitmaprect.cpp', '../gm/bitmaprecttest.cpp', '../gm/bitmapscroll.cpp', + '../gm/bleed.cpp', '../gm/blend.cpp', '../gm/blurs.cpp', '../gm/blurrect.cpp', -- cgit v1.2.3 From 9a27ec21207b4c7570f868ca5076a82498a5388a Mon Sep 17 00:00:00 2001 From: "skia.committer@gmail.com" Date: Fri, 26 Jul 2013 07:00:58 +0000 Subject: Sanitizing source files in Housekeeper-Nightly git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@10385 2bbb7eff-a529-9590-31e7-b0007b416f81 --- pdfviewer.gyp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pdfviewer.gyp b/pdfviewer.gyp index 7e862b8..914b8c8 100644 --- a/pdfviewer.gyp +++ b/pdfviewer.gyp @@ -33,7 +33,7 @@ ], 'destination': '<(SHARED_INTERMEDIATE_DIR)', }, - ], + ], 'actions': [ { 'action_name': 'spec2def', -- cgit v1.2.3 From b276b49ae76439fa9e69b4c5f8c088b9e4183c3e Mon Sep 17 00:00:00 2001 From: "edisonn@google.com" Date: Sun, 28 Jul 2013 18:34:14 +0000 Subject: pdfviewer: gs operator implementation: dashing and font Review URL: https://codereview.chromium.org/20810002 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@10403 2bbb7eff-a529-9590-31e7-b0007b416f81 --- pdfviewer.gyp | 1 + 1 file changed, 1 insertion(+) diff --git a/pdfviewer.gyp b/pdfviewer.gyp index 914b8c8..ad6f92f 100644 --- a/pdfviewer.gyp +++ b/pdfviewer.gyp @@ -71,6 +71,7 @@ ], 'dependencies': [ 'core.gyp:core', + 'effects.gyp:effects', 'images.gyp:images', 'zlib.gyp:zlib', ], -- cgit v1.2.3 From a8c98be5561e8842eea6b98a615a093110b968bd Mon Sep 17 00:00:00 2001 From: "edisonn@google.com" Date: Mon, 29 Jul 2013 19:10:58 +0000 Subject: pdfviewer: more plumming for soft masks, blend modes and transparency groups Review URL: https://codereview.chromium.org/21125002 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@10419 2bbb7eff-a529-9590-31e7-b0007b416f81 --- pdfviewer.gyp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pdfviewer.gyp b/pdfviewer.gyp index ad6f92f..8552f3b 100644 --- a/pdfviewer.gyp +++ b/pdfviewer.gyp @@ -55,6 +55,8 @@ ], 'outputs': [ '<(SHARED_INTERMEDIATE_DIR)/native/autogen/SkPdfEnums_autogen.h', + '<(SHARED_INTERMEDIATE_DIR)/native/autogen/SkPdfMapper_autogen.h', + '<(SHARED_INTERMEDIATE_DIR)/native/autogen/SkPdfHeaders_autogen.h', '<(SHARED_INTERMEDIATE_DIR)/native/autogen/SkPdfMapper_autogen.cpp', '<(SHARED_INTERMEDIATE_DIR)/native/autogen/SkPdfHeaders_autogen.cpp', # TODO(edisonn): ok, there are many more files here, which we should list but since -- cgit v1.2.3 From 33c037633157c5caff10b1ee75e925d6089943ac Mon Sep 17 00:00:00 2001 From: "robertphillips@google.com" Date: Tue, 30 Jul 2013 12:15:19 +0000 Subject: Fix quickReject computation for blurs https://codereview.chromium.org/17035007/ git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@10428 2bbb7eff-a529-9590-31e7-b0007b416f81 --- gmslides.gypi | 1 + 1 file changed, 1 insertion(+) diff --git a/gmslides.gypi b/gmslides.gypi index 275568a..3af7d73 100644 --- a/gmslides.gypi +++ b/gmslides.gypi @@ -18,6 +18,7 @@ '../gm/bleed.cpp', '../gm/blend.cpp', '../gm/blurs.cpp', + '../gm/blurquickreject.cpp', '../gm/blurrect.cpp', '../gm/circles.cpp', '../gm/colorfilterimagefilter.cpp', -- cgit v1.2.3 From 37dbc50a11396248f63eb777b1e70e885482f988 Mon Sep 17 00:00:00 2001 From: "djsollen@google.com" Date: Wed, 31 Jul 2013 12:57:27 +0000 Subject: update gyp for ARM builds to be more well defined. R=mtklein@google.com Review URL: https://codereview.chromium.org/21096005 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@10454 2bbb7eff-a529-9590-31e7-b0007b416f81 --- common_conditions.gypi | 29 ++++++++++++++++++----------- common_variables.gypi | 7 ++++--- core.gyp | 2 +- libwebp.gyp | 4 ++-- opts.gyp | 4 ++-- 5 files changed, 27 insertions(+), 19 deletions(-) diff --git a/common_conditions.gypi b/common_conditions.gypi index 6828660..c9d24ae 100644 --- a/common_conditions.gypi +++ b/common_conditions.gypi @@ -150,17 +150,28 @@ 'cflags': [ '-mthumb', ], - }], - [ 'skia_arch_type == "arm" and armv7 == 1', { - 'variables': { - 'arm_neon_optional%': 0, - }, - 'defines': [ - '__ARM_ARCH__=7', + # The --fix-cortex-a8 switch enables a link-time workaround for + # an erratum in certain Cortex-A8 processors. The workaround is + # enabled by default if you target the ARM v7-A arch profile. + # It can be enabled otherwise by specifying --fix-cortex-a8, or + # disabled unconditionally by specifying --no-fix-cortex-a8. + # + # The erratum only affects Thumb-2 code. + 'conditions': [ + [ 'arm_version < 7', { + 'ldflags': [ + '-Wl,--fix-cortex-a8', + ], + }], ], + }], + [ 'skia_arch_type == "arm" and arm_version >= 7', { 'cflags': [ '-march=armv7-a', ], + 'ldflags': [ + '-march=armv7-a', + ], 'conditions': [ [ 'arm_neon == 1', { 'defines': [ @@ -169,10 +180,6 @@ 'cflags': [ '-mfpu=neon', ], - 'ldflags': [ - '-march=armv7-a', - '-Wl,--fix-cortex-a8', - ], }], [ 'arm_neon_optional == 1', { 'defines': [ diff --git a/common_variables.gypi b/common_variables.gypi index d7d41f2..8965c82 100644 --- a/common_variables.gypi +++ b/common_variables.gypi @@ -69,11 +69,11 @@ }], [ 'skia_os == "ios"', { 'skia_arch_type%': 'arm', - 'armv7%': 1, + 'arm_version%': 7, 'arm_neon%': 0, # neon asm files known not to work with the ios build },{ # skia_os is not ios 'skia_arch_type%': 'x86', - 'armv7%': 0, + 'arm_version%': 0, 'arm_neon%': 0, }], ], @@ -121,8 +121,9 @@ # Re-define all variables defined within the level-2 'variables' dict, # so that siblings of the level-1 'variables' dict can see them. - 'armv7%': '<(armv7)', + 'arm_version%': '<(arm_version)', 'arm_neon%': '<(arm_neon)', + 'arm_neon_optional%': 0, 'skia_os%': '<(skia_os)', 'os_posix%': '<(os_posix)', 'skia_scalar%': '<(skia_scalar)', diff --git a/core.gyp b/core.gyp index 28f5111..14eda4b 100644 --- a/core.gyp +++ b/core.gyp @@ -80,7 +80,7 @@ '../src/core/SkPaintOptionsAndroid.cpp', ], }], - [ 'skia_os == "android" and skia_arch_type == "arm" and armv7 == 1', { + [ 'skia_os == "android" and skia_arch_type == "arm"', { # The code in SkUtilsArm.cpp can be used on an ARM-based Linux system, not only Android. 'sources': [ '../src/core/SkPaintOptionsAndroid.cpp', diff --git a/libwebp.gyp b/libwebp.gyp index 4b36fbb..17e0026 100644 --- a/libwebp.gyp +++ b/libwebp.gyp @@ -67,7 +67,7 @@ { 'target_name': 'libwebp_dsp_neon', 'conditions': [ - ['armv7 == 1', { + ['arm_version >= 7', { 'type': 'static_library', 'include_dirs': [ '../third_party/externals/libwebp', @@ -82,7 +82,7 @@ '-mfpu=vfpv3-d16', ], 'cflags': [ '-mfpu=neon' ], - },{ # "armv7 != 1" + },{ # !(arm_version >= 7) 'type': 'none', }], ], diff --git a/opts.gyp b/opts.gyp index 8aa5e0f..010ddfb 100644 --- a/opts.gyp +++ b/opts.gyp @@ -56,7 +56,7 @@ '../src/opts/SkUtils_opts_SSE2.cpp', ], }], - [ 'skia_arch_type == "arm" and armv7 == 1', { + [ 'skia_arch_type == "arm" and arm_version >= 7', { # The assembly uses the frame pointer register (r7 in Thumb/r11 in # ARM), the compiler doesn't like that. 'cflags!': [ @@ -94,7 +94,7 @@ }], ], }], - [ '(skia_arch_type == "arm" and armv7 == 0) or (skia_os == "ios")', { + [ '(skia_arch_type == "arm" and arm_version < 7) or (skia_os == "ios")', { 'sources': [ '../src/opts/SkBitmapProcState_opts_none.cpp', '../src/opts/SkBlitRow_opts_none.cpp', -- cgit v1.2.3 From 16b1acd21de835cec24d66ef1b63370c0b4cec4c Mon Sep 17 00:00:00 2001 From: "reed@google.com" Date: Wed, 31 Jul 2013 17:37:31 +0000 Subject: adapt FontConfig to use SK_FONTHOST_USES_FONTMGR BUG= Review URL: https://codereview.chromium.org/21331003 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@10463 2bbb7eff-a529-9590-31e7-b0007b416f81 --- ports.gyp | 1 + 1 file changed, 1 insertion(+) diff --git a/ports.gyp b/ports.gyp index fa717e1..fff368d 100644 --- a/ports.gyp +++ b/ports.gyp @@ -18,6 +18,7 @@ '../include/xml', '../src/core', '../src/lazy', + '../src/ports', '../src/sfnt', '../src/utils', ], -- cgit v1.2.3 From 5f1dd37aad2652c27f6734175ff0c2870c9226eb Mon Sep 17 00:00:00 2001 From: "mtklein@google.com" Date: Wed, 31 Jul 2013 20:09:25 +0000 Subject: Enable runtime checks for SSSE3 on x86 on Android. $ compare-android.sh bench --match bitmap_ --repeat 30 master -> ssse3 N=30 p=0.001000 (corrected to 0.000033) sig? speedup bench n -1.16% bitmap_scale_filter_256_64 y -0.72% bitmap_8888_A_scale_bicubic y -0.21% bitmap_index8_A n -0.00% bitmap_565 n -0.00% bitmap_scale_filter_90_80 n 0.03% bitmap_8888_A_source_transparent y 0.06% bitmap_index8 y 0.30% bitmap_8888_A_source_stripes_two n 0.34% bitmap_scale_filter_80_90 y 0.42% bitmap_8888_A y 0.44% bitmap_8888_A_source_opaque n 0.53% bitmap_scale_filter_90_10 y 0.71% bitmap_8888_A_source_stripes_three y 0.91% bitmap_8888_A_scale_rotate_bicubic y 1.04% bitmap_8888_update n 1.19% bitmap_scale_filter_10_90 n 1.39% bitmap_scale_filter_90_90 y 1.77% bitmap_8888_update_volatile y 1.89% bitmap_8888 y 2.37% bitmap_scale_filter_30_90 y 9.57% bitmap_scale_filter_64_256 n 17.86% bitmap_scale_filter_90_30 y 25.40% bitmap_8888_A_scale_rotate_bilerp y 27.19% bitmap_8888_scale_rotate_bilerp y 27.23% bitmap_8888_update_scale_rotate_bilerp y 27.29% bitmap_8888_update_volatile_scale_rotate_bilerp y 55.08% bitmap_8888_A_scale_bilerp y 58.75% bitmap_8888_update_volatile_scale_bilerp y 58.90% bitmap_8888_scale_bilerp y 58.92% bitmap_8888_update_scale_bilerp Overall speedup: 10.52% BUG=skia:1111 R=djsollen@google.com Review URL: https://codereview.chromium.org/21203005 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@10474 2bbb7eff-a529-9590-31e7-b0007b416f81 --- opts.gyp | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/opts.gyp b/opts.gyp index 010ddfb..12c4dc5 100644 --- a/opts.gyp +++ b/opts.gyp @@ -33,20 +33,18 @@ 'conditions': [ [ 'skia_arch_type == "x86" and skia_os != "ios"', { 'conditions': [ - [ 'skia_os in ["linux", "freebsd", "openbsd", "solaris", "nacl", "chromeos"]', { + [ 'skia_os in ["linux", "freebsd", "openbsd", "solaris", "nacl", "chromeos", "android"]', { 'cflags': [ '-msse2', ], }], - [ 'skia_os != "android"', { - 'dependencies': [ - 'opts_ssse3', - ], - }], ], 'include_dirs': [ '../include/utils', ], + 'dependencies': [ + 'opts_ssse3', + ], 'sources': [ '../src/opts/opts_check_SSE2.cpp', '../src/opts/SkBitmapProcState_opts_SSE2.cpp', @@ -119,7 +117,7 @@ '../src/core', ], 'conditions': [ - [ 'skia_os in ["linux", "freebsd", "openbsd", "solaris", "nacl", "chromeos"]', { + [ 'skia_os in ["linux", "freebsd", "openbsd", "solaris", "nacl", "chromeos", "android"]', { 'cflags': [ '-mssse3', ], -- cgit v1.2.3 From 204c488d9d51464790627f41d71573b0e945fcba Mon Sep 17 00:00:00 2001 From: "commit-bot@chromium.org" Date: Wed, 31 Jul 2013 22:54:31 +0000 Subject: Inverse fill support in PDF BUG= https://code.google.com/p/skia/issues/detail?id=241 (partial fix) R=edisonn@google.com, vandebo@chromium.org, reed@google.com Author: richardlin@chromium.org Review URL: https://chromiumcodereview.appspot.com/19519017 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@10476 2bbb7eff-a529-9590-31e7-b0007b416f81 --- gmslides.gypi | 1 + 1 file changed, 1 insertion(+) diff --git a/gmslides.gypi b/gmslides.gypi index 3af7d73..cb88389 100644 --- a/gmslides.gypi +++ b/gmslides.gypi @@ -61,6 +61,7 @@ '../gm/hittestpath.cpp', '../gm/imageblur.cpp', '../gm/imagemagnifier.cpp', + '../gm/inversepaths.cpp', '../gm/lerpmode.cpp', '../gm/lighting.cpp', '../gm/image.cpp', -- cgit v1.2.3 From c5414abd7802e03f574f7a2580c25382beb2a262 Mon Sep 17 00:00:00 2001 From: "senorblanco@chromium.org" Date: Thu, 1 Aug 2013 14:59:05 +0000 Subject: Remove SkBlendImageFilter, and all tests. Its functionality has been subsumed by SkXfermodeImageFilter. R=robertphillips@google.com Review URL: https://codereview.chromium.org/21404002 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@10482 2bbb7eff-a529-9590-31e7-b0007b416f81 --- bench.gypi | 1 - effects.gypi | 2 -- gmslides.gypi | 1 - 3 files changed, 4 deletions(-) diff --git a/bench.gypi b/bench.gypi index a2d5369..2be1afa 100644 --- a/bench.gypi +++ b/bench.gypi @@ -10,7 +10,6 @@ '../bench/BitmapBench.cpp', '../bench/BitmapRectBench.cpp', '../bench/BitmapScaleBench.cpp', - '../bench/BlendBench.cpp', '../bench/BlurBench.cpp', '../bench/BlurImageFilterBench.cpp', '../bench/BlurRectBench.cpp', diff --git a/effects.gypi b/effects.gypi index cdc2c0d..63857c9 100644 --- a/effects.gypi +++ b/effects.gypi @@ -13,7 +13,6 @@ '<(skia_src_path)/effects/SkAvoidXfermode.cpp', '<(skia_src_path)/effects/SkBicubicImageFilter.cpp', '<(skia_src_path)/effects/SkBitmapSource.cpp', - '<(skia_src_path)/effects/SkBlendImageFilter.cpp', '<(skia_src_path)/effects/SkBlurDrawLooper.cpp', '<(skia_src_path)/effects/SkBlurMask.cpp', '<(skia_src_path)/effects/SkBlurMask.h', @@ -79,7 +78,6 @@ '<(skia_include_path)/effects/SkArithmeticMode.h', '<(skia_include_path)/effects/SkAvoidXfermode.h', '<(skia_include_path)/effects/SkBitmapSource.h', - '<(skia_include_path)/effects/SkBlendImageFilter.h', '<(skia_include_path)/effects/SkBlurDrawLooper.h', '<(skia_include_path)/effects/SkBlurImageFilter.h', '<(skia_include_path)/effects/SkBlurMaskFilter.h', diff --git a/gmslides.gypi b/gmslides.gypi index cb88389..6729835 100644 --- a/gmslides.gypi +++ b/gmslides.gypi @@ -16,7 +16,6 @@ '../gm/bitmaprecttest.cpp', '../gm/bitmapscroll.cpp', '../gm/bleed.cpp', - '../gm/blend.cpp', '../gm/blurs.cpp', '../gm/blurquickreject.cpp', '../gm/blurrect.cpp', -- cgit v1.2.3 From d845c1411dfceccc82a7f39ddd6637c8d68db878 Mon Sep 17 00:00:00 2001 From: "scroggo@google.com" Date: Thu, 1 Aug 2013 15:03:42 +0000 Subject: Fixes for JPEG subset decoding. Ensure that the stream passed to JPEG for subset decoding is neither deleted before it is no longer needed nor deleted an extra time. src/images/SkJpegUtility.h: src/images/SkJpegUtility.cpp: Always ref and unref the stream provided to skjpeg_source_mgr. Add some comments explaining how skjpeg_source_mgr's members handle ownership. Fix a warning comparing signed and unsigned numbers, converting to size_t which is more appropriate for measuring bytes. Remove dead code referring to fMemoryBase and fMemoryBaseSize, which are never used. src/images/SkImageDecoder_libjpeg.cpp: Call the new constructor for skjpeg_source_mgr, which no longer takes a boolean to determine ownership. include/images/SkBitmapRegionDecoder.h src/images/SkBitmapRegionDecoder.cpp: This small shim has been removed, since it is not needed to use Skia's image decoders. Its functionality will be folded into Android. Required for the merge to Android. R=djsollen@google.com Review URL: https://codereview.chromium.org/21561002 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@10483 2bbb7eff-a529-9590-31e7-b0007b416f81 --- images.gyp | 2 -- 1 file changed, 2 deletions(-) diff --git a/images.gyp b/images.gyp index 6d3b009..0bc8a76 100644 --- a/images.gyp +++ b/images.gyp @@ -34,8 +34,6 @@ '../src/images/bmpdecoderhelper.cpp', '../src/images/bmpdecoderhelper.h', - '../src/images/SkBitmapRegionDecoder.cpp', - '../src/images/SkForceLinking.cpp', '../src/images/SkImageDecoder.cpp', '../src/images/SkImageDecoder_FactoryDefault.cpp', -- cgit v1.2.3 From d95165ef4512bb4d6218095cb46c4f03d77f41be Mon Sep 17 00:00:00 2001 From: "bsalomon@google.com" Date: Fri, 2 Aug 2013 14:39:25 +0000 Subject: Add fullscreen rect bench R=robertphillips@google.com Review URL: https://codereview.chromium.org/21592002 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@10510 2bbb7eff-a529-9590-31e7-b0007b416f81 --- bench.gypi | 1 + 1 file changed, 1 insertion(+) diff --git a/bench.gypi b/bench.gypi index 2be1afa..77ba56c 100644 --- a/bench.gypi +++ b/bench.gypi @@ -25,6 +25,7 @@ '../bench/DisplacementBench.cpp', '../bench/FontCacheBench.cpp', '../bench/FontScalerBench.cpp', + '../bench/FSRectBench.cpp', '../bench/GameBench.cpp', '../bench/GradientBench.cpp', '../bench/GrMemoryPoolBench.cpp', -- cgit v1.2.3 From cf8b1865537bbb50587e60f6a6174bc1e04f1ad9 Mon Sep 17 00:00:00 2001 From: "commit-bot@chromium.org" Date: Sun, 4 Aug 2013 15:09:23 +0000 Subject: In preparation for make Chromium's skia.gyp use pdf.gypi. R=edisonn@google.com, djsollen@google.com Author: robertphillips@google.com Review URL: https://chromiumcodereview.appspot.com/21952002 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@10526 2bbb7eff-a529-9590-31e7-b0007b416f81 --- pdf.gyp | 37 ++++--------------------------------- pdf.gypi | 50 ++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 54 insertions(+), 33 deletions(-) create mode 100644 pdf.gypi diff --git a/pdf.gyp b/pdf.gyp index afababe..ce4c59f 100644 --- a/pdf.gyp +++ b/pdf.gyp @@ -9,45 +9,16 @@ 'skia_lib.gyp:skia_lib', 'zlib.gyp:zlib', ], + 'includes': [ + 'pdf.gypi', + ], 'include_dirs': [ '../include/pdf', '../src/core', # needed to get SkGlyphCache.h and SkTextFormatParams.h '../src/utils', # needed to get SkBitSet.h ], 'sources': [ - '../include/pdf/SkPDFDevice.h', - '../include/pdf/SkPDFDocument.h', - - '../src/pdf/SkPDFCatalog.cpp', - '../src/pdf/SkPDFCatalog.h', - '../src/pdf/SkPDFDevice.cpp', - '../src/pdf/SkPDFDocument.cpp', - '../src/pdf/SkPDFFont.cpp', - '../src/pdf/SkPDFFont.h', - '../src/pdf/SkPDFFontImpl.h', - '../src/pdf/SkPDFFormXObject.cpp', - '../src/pdf/SkPDFFormXObject.h', - '../src/pdf/SkPDFGraphicState.cpp', - '../src/pdf/SkPDFGraphicState.h', - '../src/pdf/SkPDFImage.cpp', - '../src/pdf/SkPDFImage.h', - '../src/pdf/SkPDFImageStream.cpp', - '../src/pdf/SkPDFImageStream.h', - '../src/pdf/SkPDFPage.cpp', - '../src/pdf/SkPDFPage.h', - '../src/pdf/SkPDFResourceDict.cpp', - '../src/pdf/SkPDFResourceDict.h', - '../src/pdf/SkPDFShader.cpp', - '../src/pdf/SkPDFShader.h', - '../src/pdf/SkPDFStream.cpp', - '../src/pdf/SkPDFStream.h', - '../src/pdf/SkPDFTypes.cpp', - '../src/pdf/SkPDFTypes.h', - '../src/pdf/SkPDFUtils.cpp', - '../src/pdf/SkPDFUtils.h', - '../src/pdf/SkTSet.h', - - '../src/doc/SkDocument_PDF.cpp', + 'pdf.gypi', # Makes the gypi appear in IDEs (but does not modify the build). ], # This section makes all targets that depend on this target # #define SK_SUPPORT_PDF and have access to the pdf header files. diff --git a/pdf.gypi b/pdf.gypi new file mode 100644 index 0000000..ae4a032 --- /dev/null +++ b/pdf.gypi @@ -0,0 +1,50 @@ +# Include this gypi to include all 'pdf' files +# The parent gyp/gypi file must define +# 'skia_src_path' e.g. skia/trunk/src +# 'skia_include_path' e.g. skia/trunk/include +# +# The skia build defines these in common_variables.gypi +# +{ + 'sources': [ + '<(skia_include_path)/pdf/SkPDFDevice.h', + '<(skia_include_path)/pdf/SkPDFDocument.h', + + '<(skia_src_path)/pdf/SkPDFCatalog.cpp', + '<(skia_src_path)/pdf/SkPDFCatalog.h', + '<(skia_src_path)/pdf/SkPDFDevice.cpp', + '<(skia_src_path)/pdf/SkPDFDocument.cpp', + '<(skia_src_path)/pdf/SkPDFFont.cpp', + '<(skia_src_path)/pdf/SkPDFFont.h', + '<(skia_src_path)/pdf/SkPDFFontImpl.h', + '<(skia_src_path)/pdf/SkPDFFormXObject.cpp', + '<(skia_src_path)/pdf/SkPDFFormXObject.h', + '<(skia_src_path)/pdf/SkPDFGraphicState.cpp', + '<(skia_src_path)/pdf/SkPDFGraphicState.h', + '<(skia_src_path)/pdf/SkPDFImage.cpp', + '<(skia_src_path)/pdf/SkPDFImage.h', + '<(skia_src_path)/pdf/SkPDFImageStream.cpp', + '<(skia_src_path)/pdf/SkPDFImageStream.h', + '<(skia_src_path)/pdf/SkPDFPage.cpp', + '<(skia_src_path)/pdf/SkPDFPage.h', + '<(skia_src_path)/pdf/SkPDFResourceDict.cpp', + '<(skia_src_path)/pdf/SkPDFResourceDict.h', + '<(skia_src_path)/pdf/SkPDFShader.cpp', + '<(skia_src_path)/pdf/SkPDFShader.h', + '<(skia_src_path)/pdf/SkPDFStream.cpp', + '<(skia_src_path)/pdf/SkPDFStream.h', + '<(skia_src_path)/pdf/SkPDFTypes.cpp', + '<(skia_src_path)/pdf/SkPDFTypes.h', + '<(skia_src_path)/pdf/SkPDFUtils.cpp', + '<(skia_src_path)/pdf/SkPDFUtils.h', + '<(skia_src_path)/pdf/SkTSet.h', + + '<(skia_src_path)/doc/SkDocument_PDF.cpp', + ], +} + +# Local Variables: +# tab-width:2 +# indent-tabs-mode:nil +# End: +# vim: set expandtab tabstop=2 shiftwidth=2: -- cgit v1.2.3 From c342d360d4cd8c97cf51ff3248d12fa80895908f Mon Sep 17 00:00:00 2001 From: "commit-bot@chromium.org" Date: Mon, 5 Aug 2013 13:28:55 +0000 Subject: Fix a crash on stroking empty paths with nv_path_rendering enabled Fix the crash by defining that GrPathRenderer::drawPath and GrPathRenderer::stencilPath are called only with non-empty paths. Adds a new test "GpuDrawPath" and tests the condition. BUG=1477 R=bsalomon@google.com Author: kkinnunen@nvidia.com Review URL: https://chromiumcodereview.appspot.com/22173002 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@10528 2bbb7eff-a529-9590-31e7-b0007b416f81 --- tests.gyp | 1 + 1 file changed, 1 insertion(+) diff --git a/tests.gyp b/tests.gyp index a4ea32d..b151031 100644 --- a/tests.gyp +++ b/tests.gyp @@ -62,6 +62,7 @@ '../tests/GLInterfaceValidation.cpp', '../tests/GLProgramsTest.cpp', '../tests/GpuBitmapCopyTest.cpp', + '../tests/GpuDrawPathTest.cpp', '../tests/GrContextFactoryTest.cpp', '../tests/GradientTest.cpp', '../tests/GrMemoryPoolTest.cpp', -- cgit v1.2.3 From a22c9a6350f0838abf49a2796b9b6ee98027cfb5 Mon Sep 17 00:00:00 2001 From: "djsollen@google.com" Date: Mon, 5 Aug 2013 13:38:28 +0000 Subject: Enable SkUtilsArm on all ARM platforms and always use NDK compliant NEON detection on Android. R=scroggo@google.com Review URL: https://codereview.chromium.org/22193002 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@10530 2bbb7eff-a529-9590-31e7-b0007b416f81 --- core.gyp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/core.gyp b/core.gyp index 14eda4b..7d322a6 100644 --- a/core.gyp +++ b/core.gyp @@ -79,11 +79,13 @@ 'sources': [ '../src/core/SkPaintOptionsAndroid.cpp', ], + 'dependencies': [ + 'android_deps.gyp:cpu_features', + ], }], - [ 'skia_os == "android" and skia_arch_type == "arm"', { + [ 'skia_arch_type == "arm"', { # The code in SkUtilsArm.cpp can be used on an ARM-based Linux system, not only Android. 'sources': [ - '../src/core/SkPaintOptionsAndroid.cpp', '../src/core/SkUtilsArm.cpp', '../src/core/SkUtilsArm.h', ], -- cgit v1.2.3 From 766d9be7fd584b3416f8b811828c1752265bb324 Mon Sep 17 00:00:00 2001 From: "commit-bot@chromium.org" Date: Mon, 5 Aug 2013 16:55:55 +0000 Subject: Add blend optimization helpers and use to convert rect draws to clears. R=robertphillips@google.com, jvanverth@google.com, reed@google.com Author: bsalomon@google.com Review URL: https://chromiumcodereview.appspot.com/21877006 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@10537 2bbb7eff-a529-9590-31e7-b0007b416f81 --- gpu.gypi | 2 ++ 1 file changed, 2 insertions(+) diff --git a/gpu.gypi b/gpu.gypi index fff7922..c71abbf 100644 --- a/gpu.gypi +++ b/gpu.gypi @@ -55,6 +55,8 @@ '<(skia_src_path)/gpu/GrAtlas.cpp', '<(skia_src_path)/gpu/GrAtlas.h', '<(skia_src_path)/gpu/GrBinHashKey.h', + '<(skia_src_path)/gpu/GrBlend.cpp', + '<(skia_src_path)/gpu/GrBlend.h', '<(skia_src_path)/gpu/GrBufferAllocPool.cpp', '<(skia_src_path)/gpu/GrBufferAllocPool.h', '<(skia_src_path)/gpu/GrCacheID.cpp', -- cgit v1.2.3 From 3880cb1d5ba20eb2e8207051c17b4c9dfd2b20bf Mon Sep 17 00:00:00 2001 From: "edisonn@google.com" Date: Mon, 5 Aug 2013 17:26:11 +0000 Subject: pdfviewer: set backdround to transparent, and add an app to chop transparent content in png files. Review URL: https://codereview.chromium.org/21981008 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@10538 2bbb7eff-a529-9590-31e7-b0007b416f81 --- pdfviewer.gyp | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/pdfviewer.gyp b/pdfviewer.gyp index 8552f3b..063c294 100644 --- a/pdfviewer.gyp +++ b/pdfviewer.gyp @@ -99,6 +99,22 @@ 'core.gyp:core', 'flags.gyp:flags', 'libpdfviewer', + 'chop_transparency', + ], + }, + { + 'target_name': 'chop_transparency', + 'type': 'executable', + 'sources': [ + '../experimental/PdfViewer/chop_transparency_main.cpp', + ], + 'include_dirs': [ + # For SkBitmapHasher.h + '../src/utils/', + ], + 'dependencies': [ + 'skia_lib.gyp:skia_lib', + 'flags.gyp:flags', ], }, ], -- cgit v1.2.3 From 168862df2eae1ab2d1c30be2cf6a7719371c6fc4 Mon Sep 17 00:00:00 2001 From: "bsalomon@google.com" Date: Mon, 5 Aug 2013 18:27:23 +0000 Subject: Revert "Add blend optimization helpers and use to convert rect draws to clears." This reverts commit r10537. git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@10542 2bbb7eff-a529-9590-31e7-b0007b416f81 --- gpu.gypi | 2 -- 1 file changed, 2 deletions(-) diff --git a/gpu.gypi b/gpu.gypi index c71abbf..fff7922 100644 --- a/gpu.gypi +++ b/gpu.gypi @@ -55,8 +55,6 @@ '<(skia_src_path)/gpu/GrAtlas.cpp', '<(skia_src_path)/gpu/GrAtlas.h', '<(skia_src_path)/gpu/GrBinHashKey.h', - '<(skia_src_path)/gpu/GrBlend.cpp', - '<(skia_src_path)/gpu/GrBlend.h', '<(skia_src_path)/gpu/GrBufferAllocPool.cpp', '<(skia_src_path)/gpu/GrBufferAllocPool.h', '<(skia_src_path)/gpu/GrCacheID.cpp', -- cgit v1.2.3 From 67b4c8c19afc9520f1d3a3decd4f012c50c32d0f Mon Sep 17 00:00:00 2001 From: "commit-bot@chromium.org" Date: Mon, 5 Aug 2013 22:31:20 +0000 Subject: revise SkTDynamicHash and add unit tests BUG= R=reed@google.com Author: mtklein@google.com Review URL: https://chromiumcodereview.appspot.com/22292004 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@10552 2bbb7eff-a529-9590-31e7-b0007b416f81 --- tests.gyp | 1 + 1 file changed, 1 insertion(+) diff --git a/tests.gyp b/tests.gyp index b151031..0bb3550 100644 --- a/tests.gyp +++ b/tests.gyp @@ -48,6 +48,7 @@ '../tests/DrawBitmapRectTest.cpp', '../tests/DrawPathTest.cpp', '../tests/DrawTextTest.cpp', + '../tests/DynamicHashTest.cpp', '../tests/EmptyPathTest.cpp', '../tests/ErrorTest.cpp', '../tests/FillPathTest.cpp', -- cgit v1.2.3 From 9c49aad831d7a7f6feb167f37aeadaf94d09d43d Mon Sep 17 00:00:00 2001 From: "commit-bot@chromium.org" Date: Tue, 6 Aug 2013 15:07:23 +0000 Subject: Add blend optimization helpers and use to convert rect draws to clears. Committed: http://code.google.com/p/skia/source/detail?r=10537 R=robertphillips@google.com, jvanverth@google.com, reed@google.com Author: bsalomon@google.com Review URL: https://chromiumcodereview.appspot.com/21877006 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@10562 2bbb7eff-a529-9590-31e7-b0007b416f81 --- gpu.gypi | 2 ++ 1 file changed, 2 insertions(+) diff --git a/gpu.gypi b/gpu.gypi index fff7922..c71abbf 100644 --- a/gpu.gypi +++ b/gpu.gypi @@ -55,6 +55,8 @@ '<(skia_src_path)/gpu/GrAtlas.cpp', '<(skia_src_path)/gpu/GrAtlas.h', '<(skia_src_path)/gpu/GrBinHashKey.h', + '<(skia_src_path)/gpu/GrBlend.cpp', + '<(skia_src_path)/gpu/GrBlend.h', '<(skia_src_path)/gpu/GrBufferAllocPool.cpp', '<(skia_src_path)/gpu/GrBufferAllocPool.h', '<(skia_src_path)/gpu/GrCacheID.cpp', -- cgit v1.2.3 From b2c923704aadb8cbcc5b6349fe81ec9559972152 Mon Sep 17 00:00:00 2001 From: "commit-bot@chromium.org" Date: Tue, 6 Aug 2013 18:13:01 +0000 Subject: Tweak -mssse3 on Mac a little. Using OTHER_CPLUSPLUSFLAGS instead of OTHER_CFLAGS will append -mssse3 into the argument list instead of overwriting as the old note warns about. (So it's actually there twice now for the files in opts_ssse3, and we can still build if we remove -mssse3 from common_conditions.gypi.) We could also just delete this clause entirely given that common_conditions.gypi sets it anyway. Which do you think is best? This code won't compile unless _someone_ has set -mssse3. Seems to me the redundancy helps communicate that and protect against changes in common_conditions.gypi. BUG= R=epoger@google.com, bungeman@google.com Author: mtklein@google.com Review URL: https://chromiumcodereview.appspot.com/21279005 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@10573 2bbb7eff-a529-9590-31e7-b0007b416f81 --- opts.gyp | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/opts.gyp b/opts.gyp index 12c4dc5..8a48b9a 100644 --- a/opts.gyp +++ b/opts.gyp @@ -122,14 +122,7 @@ '-mssse3', ], }], - # TODO(epoger): the following will enable SSSE3 on Macs, but it will - # break once we set OTHER_CFLAGS anywhere else (the first setting will - # be replaced, not added to) - [ 'skia_os in ["mac"]', { - 'xcode_settings': { - 'OTHER_CFLAGS': ['-mssse3',], - }, - }], + # (Mac has -mssse3 globally.) [ 'skia_arch_type == "x86"', { 'sources': [ '../src/opts/SkBitmapProcState_opts_SSSE3.cpp', -- cgit v1.2.3 From 4124217bb9faf929ac7b8b67e868773ef6e2a27c Mon Sep 17 00:00:00 2001 From: "junov@chromium.org" Date: Tue, 6 Aug 2013 20:01:40 +0000 Subject: Upstreaming DropShadowImageFilter into skia, from Blink GM imagefiltersbase will need rebaselining after this change R=senorblanco@chromium.org Review URL: https://codereview.chromium.org/22258005 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@10583 2bbb7eff-a529-9590-31e7-b0007b416f81 --- effects.gypi | 2 ++ 1 file changed, 2 insertions(+) diff --git a/effects.gypi b/effects.gypi index 63857c9..e55cbc7 100644 --- a/effects.gypi +++ b/effects.gypi @@ -26,6 +26,7 @@ '<(skia_src_path)/effects/SkDashPathEffect.cpp', '<(skia_src_path)/effects/SkDiscretePathEffect.cpp', '<(skia_src_path)/effects/SkDisplacementMapEffect.cpp', + '<(skia_src_path)/effects/SkDropShadowImageFilter.cpp', '<(skia_src_path)/effects/SkEmbossMask.cpp', '<(skia_src_path)/effects/SkEmbossMask.h', '<(skia_src_path)/effects/SkEmbossMask_Table.h', @@ -89,6 +90,7 @@ '<(skia_include_path)/effects/SkDiscretePathEffect.h', '<(skia_include_path)/effects/SkDisplacementMapEffect.h', '<(skia_include_path)/effects/SkDrawExtraPathEffect.h', + '<(skia_include_path)/effects/SkDropShadowImageFilter.h', '<(skia_include_path)/effects/SkEmbossMaskFilter.h', '<(skia_include_path)/effects/SkGradientShader.h', '<(skia_include_path)/effects/SkKernel33MaskFilter.h', -- cgit v1.2.3 From fb31ae3fae6d3cf3791a914ebde5d9c5e3c2a189 Mon Sep 17 00:00:00 2001 From: "jvanverth@google.com" Date: Tue, 6 Aug 2013 21:12:59 +0000 Subject: Reverting r10583: Upstreaming DropShadowImageFilter into skia, from Blink git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@10587 2bbb7eff-a529-9590-31e7-b0007b416f81 --- effects.gypi | 2 -- 1 file changed, 2 deletions(-) diff --git a/effects.gypi b/effects.gypi index e55cbc7..63857c9 100644 --- a/effects.gypi +++ b/effects.gypi @@ -26,7 +26,6 @@ '<(skia_src_path)/effects/SkDashPathEffect.cpp', '<(skia_src_path)/effects/SkDiscretePathEffect.cpp', '<(skia_src_path)/effects/SkDisplacementMapEffect.cpp', - '<(skia_src_path)/effects/SkDropShadowImageFilter.cpp', '<(skia_src_path)/effects/SkEmbossMask.cpp', '<(skia_src_path)/effects/SkEmbossMask.h', '<(skia_src_path)/effects/SkEmbossMask_Table.h', @@ -90,7 +89,6 @@ '<(skia_include_path)/effects/SkDiscretePathEffect.h', '<(skia_include_path)/effects/SkDisplacementMapEffect.h', '<(skia_include_path)/effects/SkDrawExtraPathEffect.h', - '<(skia_include_path)/effects/SkDropShadowImageFilter.h', '<(skia_include_path)/effects/SkEmbossMaskFilter.h', '<(skia_include_path)/effects/SkGradientShader.h', '<(skia_include_path)/effects/SkKernel33MaskFilter.h', -- cgit v1.2.3 From 3569ec84b1582ca88ebf8dce0c8aac608b1fc5c7 Mon Sep 17 00:00:00 2001 From: "commit-bot@chromium.org" Date: Wed, 7 Aug 2013 00:07:51 +0000 Subject: Move SkComposeImageFilter into its own {.h, .cpp} files In http://crrev.com/21154002, SkComposeImageFilter will be used outside of tests. Consequently, this moves SkComposeImageFilter from SkTestImageFilters.{h, cpp} into its own {.h, .cpp} files. BUG=181613 R=senorblanco@chromium.org Author: ajuma@chromium.org Review URL: https://chromiumcodereview.appspot.com/22438003 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@10591 2bbb7eff-a529-9590-31e7-b0007b416f81 --- effects.gypi | 1 + 1 file changed, 1 insertion(+) diff --git a/effects.gypi b/effects.gypi index 63857c9..05ce569 100644 --- a/effects.gypi +++ b/effects.gypi @@ -22,6 +22,7 @@ '<(skia_src_path)/effects/SkColorFilterImageFilter.cpp', '<(skia_src_path)/effects/SkColorMatrix.cpp', '<(skia_src_path)/effects/SkColorMatrixFilter.cpp', + '<(skia_src_path)/effects/SkComposeImageFilter.cpp', '<(skia_src_path)/effects/SkCornerPathEffect.cpp', '<(skia_src_path)/effects/SkDashPathEffect.cpp', '<(skia_src_path)/effects/SkDiscretePathEffect.cpp', -- cgit v1.2.3 From dccf47acbdb65e21ed989fa3f45e638caffa6ce6 Mon Sep 17 00:00:00 2001 From: "bsalomon@google.com" Date: Wed, 7 Aug 2013 13:34:14 +0000 Subject: Revert "Add blend optimization helpers and use to convert rect draws to clears." This reverts commit r10537. git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@10601 2bbb7eff-a529-9590-31e7-b0007b416f81 --- gpu.gypi | 2 -- 1 file changed, 2 deletions(-) diff --git a/gpu.gypi b/gpu.gypi index c71abbf..fff7922 100644 --- a/gpu.gypi +++ b/gpu.gypi @@ -55,8 +55,6 @@ '<(skia_src_path)/gpu/GrAtlas.cpp', '<(skia_src_path)/gpu/GrAtlas.h', '<(skia_src_path)/gpu/GrBinHashKey.h', - '<(skia_src_path)/gpu/GrBlend.cpp', - '<(skia_src_path)/gpu/GrBlend.h', '<(skia_src_path)/gpu/GrBufferAllocPool.cpp', '<(skia_src_path)/gpu/GrBufferAllocPool.h', '<(skia_src_path)/gpu/GrCacheID.cpp', -- cgit v1.2.3 From 37e93761eca3fa497d8cd4201c649938f23682be Mon Sep 17 00:00:00 2001 From: "reed@google.com" Date: Wed, 7 Aug 2013 15:30:09 +0000 Subject: enable SK_FONTHOST_USES_FONTMGR for mac and win. linux fontmgr not ready BUG= Review URL: https://codereview.chromium.org/22406004 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@10605 2bbb7eff-a529-9590-31e7-b0007b416f81 --- common_conditions.gypi | 2 ++ 1 file changed, 2 insertions(+) diff --git a/common_conditions.gypi b/common_conditions.gypi index c9d24ae..e046b13 100644 --- a/common_conditions.gypi +++ b/common_conditions.gypi @@ -32,6 +32,7 @@ { 'defines': [ 'SK_BUILD_FOR_WIN32', + 'SK_FONTHOST_USES_FONTMGR', 'SK_IGNORE_STDINT_DOT_H', '_CRT_SECURE_NO_WARNINGS', 'GR_GL_FUNCTION_TYPE=__stdcall', @@ -293,6 +294,7 @@ }, 'defines': [ 'SK_BUILD_FOR_MAC', + 'SK_FONTHOST_USES_FONTMGR', ], 'conditions' : [ [ 'skia_arch_width == 64', { -- cgit v1.2.3 From e8bb5e1feef393ec60315e2ce2189b1d926017c1 Mon Sep 17 00:00:00 2001 From: "scroggo@google.com" Date: Wed, 7 Aug 2013 19:16:05 +0000 Subject: Add downsample from 8888 to 4444. Extend SkBitmap::copyTo to copy from a source with SkARGB_8888_Config to a destination bitmap with SkARGB_4444_Config. BUG=http://code.google.com/p/chromium/issues/detail?id=245774 R=reed@google.com Review URL: https://codereview.chromium.org/22350003 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@10621 2bbb7eff-a529-9590-31e7-b0007b416f81 --- gmslides.gypi | 1 + 1 file changed, 1 insertion(+) diff --git a/gmslides.gypi b/gmslides.gypi index 6729835..8d0b2e9 100644 --- a/gmslides.gypi +++ b/gmslides.gypi @@ -28,6 +28,7 @@ '../gm/composeshader.cpp', #'../gm/conicpaths.cpp', '../gm/convexpaths.cpp', + '../gm/copyTo4444.cpp', '../gm/cubicpaths.cpp', '../gm/cmykjpeg.cpp', '../gm/degeneratesegments.cpp', -- cgit v1.2.3 From 3366cfd554f29ba78df0de1c8f742f6d544d33fd Mon Sep 17 00:00:00 2001 From: "junov@chromium.org" Date: Wed, 7 Aug 2013 20:00:55 +0000 Subject: Upstreaming DropShadowImageFilter into skia, from Blink GM imagefiltersbase will need rebaselining after this change R=senorblanco@chromium.org Committed: https://code.google.com/p/skia/source/detail?r=10583 Review URL: https://codereview.chromium.org/22258005 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@10626 2bbb7eff-a529-9590-31e7-b0007b416f81 --- effects.gypi | 2 ++ 1 file changed, 2 insertions(+) diff --git a/effects.gypi b/effects.gypi index 05ce569..84d38ac 100644 --- a/effects.gypi +++ b/effects.gypi @@ -27,6 +27,7 @@ '<(skia_src_path)/effects/SkDashPathEffect.cpp', '<(skia_src_path)/effects/SkDiscretePathEffect.cpp', '<(skia_src_path)/effects/SkDisplacementMapEffect.cpp', + '<(skia_src_path)/effects/SkDropShadowImageFilter.cpp', '<(skia_src_path)/effects/SkEmbossMask.cpp', '<(skia_src_path)/effects/SkEmbossMask.h', '<(skia_src_path)/effects/SkEmbossMask_Table.h', @@ -90,6 +91,7 @@ '<(skia_include_path)/effects/SkDiscretePathEffect.h', '<(skia_include_path)/effects/SkDisplacementMapEffect.h', '<(skia_include_path)/effects/SkDrawExtraPathEffect.h', + '<(skia_include_path)/effects/SkDropShadowImageFilter.h', '<(skia_include_path)/effects/SkEmbossMaskFilter.h', '<(skia_include_path)/effects/SkGradientShader.h', '<(skia_include_path)/effects/SkKernel33MaskFilter.h', -- cgit v1.2.3 From 185f408a49280605c52e7eeb4e8d21d91a53669c Mon Sep 17 00:00:00 2001 From: "commit-bot@chromium.org" Date: Thu, 8 Aug 2013 02:52:05 +0000 Subject: Use Path Ops to generate PDF clips R=vandebo@chromium.org, edisonn@google.com, caryclark@google.com Author: richardlin@chromium.org Review URL: https://chromiumcodereview.appspot.com/21161003 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@10633 2bbb7eff-a529-9590-31e7-b0007b416f81 --- gmslides.gypi | 1 + 1 file changed, 1 insertion(+) diff --git a/gmslides.gypi b/gmslides.gypi index 8d0b2e9..71eb4d2 100644 --- a/gmslides.gypi +++ b/gmslides.gypi @@ -20,6 +20,7 @@ '../gm/blurquickreject.cpp', '../gm/blurrect.cpp', '../gm/circles.cpp', + '../gm/circularclips.cpp', '../gm/colorfilterimagefilter.cpp', '../gm/colormatrix.cpp', '../gm/colortype.cpp', -- cgit v1.2.3 From 1499cbff362a9a8c9ade40893de0e73c473e6a78 Mon Sep 17 00:00:00 2001 From: "djsollen@google.com" Date: Thu, 8 Aug 2013 12:31:05 +0000 Subject: Create a gypi that contains all the SK_API header files for use by clients (i.e. chromium). R=robertphillips@google.com, torne@chromium.org Review URL: https://codereview.chromium.org/22474010 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@10637 2bbb7eff-a529-9590-31e7-b0007b416f81 --- exported_api_headers.gypi | 133 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 133 insertions(+) create mode 100644 exported_api_headers.gypi diff --git a/exported_api_headers.gypi b/exported_api_headers.gypi new file mode 100644 index 0000000..a105a8a --- /dev/null +++ b/exported_api_headers.gypi @@ -0,0 +1,133 @@ +# Include this gypi to include all public header files that use +# the SK_API defines. +# +# The list is computed by running 'egrep -lr "SK_API" include' in the root dir +# of the project. +# +{ + 'variables': { + 'header_filenames': [ + 'pdf/SkPDFDevice.h', + 'pdf/SkPDFDocument.h', + 'gpu/SkGpuDevice.h', + 'gpu/SkGrPixelRef.h', + 'effects/SkMorphologyImageFilter.h', + 'effects/Sk2DPathEffect.h', + 'effects/SkXfermodeImageFilter.h', + 'effects/SkArithmeticMode.h', + 'effects/SkMergeImageFilter.h', + 'effects/SkPerlinNoiseShader.h', + 'effects/SkLerpXfermode.h', + 'effects/SkRectShaderImageFilter.h', + 'effects/SkMagnifierImageFilter.h', + 'effects/SkBicubicImageFilter.h', + 'effects/SkPorterDuff.h', + 'effects/SkBlurImageFilter.h', + 'effects/SkKernel33MaskFilter.h', + 'effects/SkTableMaskFilter.h', + 'effects/SkAvoidXfermode.h', + 'effects/SkBitmapSource.h', + 'effects/SkCornerPathEffect.h', + 'effects/SkTransparentShader.h', + 'effects/SkStippleMaskFilter.h', + 'effects/SkPaintFlagsDrawFilter.h', + 'effects/SkOffsetImageFilter.h', + 'effects/SkDiscretePathEffect.h', + 'effects/SkTableColorFilter.h', + 'effects/SkGradientShader.h', + 'effects/SkEmbossMaskFilter.h', + 'effects/SkComposeImageFilter.h', + 'effects/SkTestImageFilters.h', + 'effects/SkLayerRasterizer.h', + 'effects/SkDashPathEffect.h', + 'effects/Sk1DPathEffect.h', + 'effects/SkBlurMaskFilter.h', + 'effects/SkDisplacementMapEffect.h', + 'effects/SkPixelXorXfermode.h', + 'effects/SkColorMatrixFilter.h', + 'effects/SkColorMatrix.h', + 'effects/SkBlurDrawLooper.h', + 'effects/SkColorFilterImageFilter.h', + 'effects/SkLayerDrawLooper.h', + 'effects/SkLightingImageFilter.h', + 'effects/SkDropShadowImageFilter.h', + 'effects/SkMatrixConvolutionImageFilter.h', + 'utils/SkPictureUtils.h', + 'utils/SkMatrix44.h', + 'utils/SkProxyCanvas.h', + 'utils/SkNWayCanvas.h', + 'utils/SkPathUtils.h', + 'utils/SkDeferredCanvas.h', + 'utils/SkNullCanvas.h', + 'utils/mac/SkCGUtils.h', + 'device/xps/SkXPSDevice.h', + 'ports/SkTypeface_win.h', + 'ports/SkFontConfigInterface.h', + 'ports/SkTypeface_mac.h', + 'ports/SkTypeface_android.h', + 'ports/SkFontStyle.h', + 'ports/SkFontMgr.h', + 'core/SkColor.h', + 'core/SkFontHost.h', + 'core/SkMetaData.h', + 'core/SkRRect.h', + 'core/SkMatrix.h', + 'core/SkDataTable.h', + 'core/SkTypeface.h', + 'core/SkDrawFilter.h', + 'core/SkRasterizer.h', + 'core/SkColorPriv.h', + 'core/SkPaint.h', + 'core/SkBitmap.h', + 'core/SkFloatBits.h', + 'core/SkDeque.h', + 'core/Sk64.h', + 'core/SkComposeShader.h', + 'core/SkImage.h', + 'core/SkTileGridPicture.h', + 'core/SkGraphics.h', + 'core/SkCanvas.h', + 'core/SkPicture.h', + 'core/SkClipStack.h', + 'core/SkXfermode.h', + 'core/SkColorFilter.h', + 'core/SkRegion.h', + 'core/SkRefCnt.h', + 'core/SkStream.h', + 'core/SkGeometry.h', + 'core/SkPathMeasure.h', + 'core/SkMaskFilter.h', + 'core/SkTDArray.h', + 'core/SkAnnotation.h', + 'core/SkDrawLooper.h', + 'core/SkThread_platform.h', + 'core/SkTemplates.h', + 'core/SkWeakRefCnt.h', + 'core/SkTypes.h', + 'core/SkData.h', + 'core/SkPoint.h', + 'core/SkColorShader.h', + 'core/SkUnPreMultiply.h', + 'core/SkDevice.h', + 'core/SkImageFilter.h', + 'core/SkPreConfig.h', + 'core/SkImageFilterUtils.h', + 'core/SkPathEffect.h', + 'core/SkString.h', + 'core/SkPixelRef.h', + 'core/SkEmptyShader.h', + 'core/SkSurface.h', + 'core/SkShader.h', + 'core/SkPath.h', + 'core/SkFlattenable.h', + 'core/SkRect.h', + 'pathops/SkPathOps.h', + ], + }, +} + +# Local Variables: +# tab-width:2 +# indent-tabs-mode:nil +# End: +# vim: set expandtab tabstop=2 shiftwidth=2: -- cgit v1.2.3 From 0b0bd0019408a8d469e2f262e7edde460cba1a78 Mon Sep 17 00:00:00 2001 From: "edisonn@google.com" Date: Thu, 8 Aug 2013 12:42:13 +0000 Subject: pdfviewer: add ability to run on gpu Review URL: https://codereview.chromium.org/22684002 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@10638 2bbb7eff-a529-9590-31e7-b0007b416f81 --- pdfviewer.gyp | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/pdfviewer.gyp b/pdfviewer.gyp index 063c294..4f6e8ab 100644 --- a/pdfviewer.gyp +++ b/pdfviewer.gyp @@ -72,9 +72,7 @@ '<(SHARED_INTERMEDIATE_DIR)/native/autogen', ], 'dependencies': [ - 'core.gyp:core', - 'effects.gyp:effects', - 'images.gyp:images', + 'skia_lib.gyp:skia_lib', 'zlib.gyp:zlib', ], }, @@ -96,7 +94,7 @@ '../experimental/PdfViewer/pdfparser/native/autogen', ], 'dependencies': [ - 'core.gyp:core', + 'skia_lib.gyp:skia_lib', 'flags.gyp:flags', 'libpdfviewer', 'chop_transparency', -- cgit v1.2.3 From 6dffe7593b28dc9820d1ed4b88b845f115743c0d Mon Sep 17 00:00:00 2001 From: "commit-bot@chromium.org" Date: Thu, 8 Aug 2013 19:20:05 +0000 Subject: Adding 2 functions to the Skia API I need wrappers for both SkOrderedReadBuffer and SkOrderedWriteBuffer inside Chromium in order to do the IPC serialization of Skia SkImageFilter objects. See https://codereview.chromium.org/21271002/ BUG= R=djsollen@google.com, scroggo@google.com, reed@google.com Author: sugoi@chromium.org Review URL: https://chromiumcodereview.appspot.com/22591002 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@10642 2bbb7eff-a529-9590-31e7-b0007b416f81 --- core.gypi | 2 ++ 1 file changed, 2 insertions(+) diff --git a/core.gypi b/core.gypi index 5c3fdf5..d3d998e 100644 --- a/core.gypi +++ b/core.gypi @@ -87,6 +87,7 @@ '<(skia_src_path)/core/SkFilterShader.cpp', '<(skia_src_path)/core/SkFlattenable.cpp', '<(skia_src_path)/core/SkFlattenableBuffers.cpp', + '<(skia_src_path)/core/SkFlattenableSerialization.cpp', '<(skia_src_path)/core/SkFloat.cpp', '<(skia_src_path)/core/SkFloat.h', '<(skia_src_path)/core/SkFloatBits.cpp', @@ -235,6 +236,7 @@ '<(skia_include_path)/core/SkError.h', '<(skia_include_path)/core/SkFixed.h', '<(skia_include_path)/core/SkFlattenable.h', + '<(skia_include_path)/core/SkFlattenableSerialization.h', '<(skia_include_path)/core/SkFloatBits.h', '<(skia_include_path)/core/SkFloatingPoint.h', '<(skia_include_path)/core/SkFontHost.h', -- cgit v1.2.3 From 5afe400f473c747e2e5acb50b249fad1b8f2b0fc Mon Sep 17 00:00:00 2001 From: "commit-bot@chromium.org" Date: Thu, 8 Aug 2013 21:13:38 +0000 Subject: Add new GM to targeted at rect->clear optimization with different xfermodes. R=robertphillips@google.com Author: bsalomon@google.com Review URL: https://chromiumcodereview.appspot.com/22264010 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@10645 2bbb7eff-a529-9590-31e7-b0007b416f81 --- gmslides.gypi | 1 + 1 file changed, 1 insertion(+) diff --git a/gmslides.gypi b/gmslides.gypi index 71eb4d2..87c46e7 100644 --- a/gmslides.gypi +++ b/gmslides.gypi @@ -127,6 +127,7 @@ '../gm/xfermodeimagefilter.cpp', '../gm/xfermodes.cpp', '../gm/xfermodes2.cpp', + '../gm/xfermodes3.cpp', ], } -- cgit v1.2.3 From 97962c4c5062a613afff7729f0a0db8939b4e76d Mon Sep 17 00:00:00 2001 From: "commit-bot@chromium.org" Date: Thu, 8 Aug 2013 22:55:21 +0000 Subject: This attempts to replicate some bad cache behavior Mozilla reported. R=bsalomon@google.com Author: robertphillips@google.com Review URL: https://chromiumcodereview.appspot.com/22411005 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@10649 2bbb7eff-a529-9590-31e7-b0007b416f81 --- tests.gyp | 1 + 1 file changed, 1 insertion(+) diff --git a/tests.gyp b/tests.gyp index 0bb3550..f58b0ab 100644 --- a/tests.gyp +++ b/tests.gyp @@ -104,6 +104,7 @@ '../tests/RefCntTest.cpp', '../tests/RefDictTest.cpp', '../tests/RegionTest.cpp', + '../tests/ResourceCacheTest.cpp', '../tests/RoundRectTest.cpp', '../tests/RTreeTest.cpp', '../tests/SHA1Test.cpp', -- cgit v1.2.3 From 99d5ecc89be4d33274a65c02aa1463e80ae1fe6c Mon Sep 17 00:00:00 2001 From: "skia.committer@gmail.com" Date: Fri, 9 Aug 2013 07:01:22 +0000 Subject: Sanitizing source files in Housekeeper-Nightly git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@10650 2bbb7eff-a529-9590-31e7-b0007b416f81 --- exported_api_headers.gypi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/exported_api_headers.gypi b/exported_api_headers.gypi index a105a8a..83a16a1 100644 --- a/exported_api_headers.gypi +++ b/exported_api_headers.gypi @@ -1,7 +1,7 @@ # Include this gypi to include all public header files that use # the SK_API defines. # -# The list is computed by running 'egrep -lr "SK_API" include' in the root dir +# The list is computed by running 'egrep -lr "SK_API" include' in the root dir # of the project. # { -- cgit v1.2.3 From 841ff599ff79daa0a978405a7d263994c9081ca6 Mon Sep 17 00:00:00 2001 From: "commit-bot@chromium.org" Date: Fri, 9 Aug 2013 13:23:56 +0000 Subject: Fix crash when querying a runtime config that is defined in environment Fix crash when querying a runtime config in case when there's no skia.conf file and the config variable is still defined in the environment. Runs the added SkRTConf::UnitTest test as part of new "UnitTest" test. BUG=skia:1494 R=bsalomon@google.com, humper@google.com Author: kkinnunen@nvidia.com Review URL: https://chromiumcodereview.appspot.com/22650007 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@10654 2bbb7eff-a529-9590-31e7-b0007b416f81 --- tests.gyp | 1 + 1 file changed, 1 insertion(+) diff --git a/tests.gyp b/tests.gyp index f58b0ab..9062446 100644 --- a/tests.gyp +++ b/tests.gyp @@ -127,6 +127,7 @@ '../tests/TSetTest.cpp', '../tests/ToUnicode.cpp', '../tests/UnicodeTest.cpp', + '../tests/UnitTestTest.cpp', '../tests/UtilsTest.cpp', '../tests/WArrayTest.cpp', '../tests/WritePixelsTest.cpp', -- cgit v1.2.3 From 0fd38be37f82a955b4f3ed3ebcebc3113d0eaaad Mon Sep 17 00:00:00 2001 From: "djsollen@google.com" Date: Fri, 9 Aug 2013 15:45:35 +0000 Subject: Remove exported headers and add all public headers into dictionary for reference by clients. R=robertphillips@google.com Review URL: https://codereview.chromium.org/22613003 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@10661 2bbb7eff-a529-9590-31e7-b0007b416f81 --- exported_api_headers.gypi | 133 ------------------- public_headers.gypi | 316 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 316 insertions(+), 133 deletions(-) delete mode 100644 exported_api_headers.gypi create mode 100644 public_headers.gypi diff --git a/exported_api_headers.gypi b/exported_api_headers.gypi deleted file mode 100644 index 83a16a1..0000000 --- a/exported_api_headers.gypi +++ /dev/null @@ -1,133 +0,0 @@ -# Include this gypi to include all public header files that use -# the SK_API defines. -# -# The list is computed by running 'egrep -lr "SK_API" include' in the root dir -# of the project. -# -{ - 'variables': { - 'header_filenames': [ - 'pdf/SkPDFDevice.h', - 'pdf/SkPDFDocument.h', - 'gpu/SkGpuDevice.h', - 'gpu/SkGrPixelRef.h', - 'effects/SkMorphologyImageFilter.h', - 'effects/Sk2DPathEffect.h', - 'effects/SkXfermodeImageFilter.h', - 'effects/SkArithmeticMode.h', - 'effects/SkMergeImageFilter.h', - 'effects/SkPerlinNoiseShader.h', - 'effects/SkLerpXfermode.h', - 'effects/SkRectShaderImageFilter.h', - 'effects/SkMagnifierImageFilter.h', - 'effects/SkBicubicImageFilter.h', - 'effects/SkPorterDuff.h', - 'effects/SkBlurImageFilter.h', - 'effects/SkKernel33MaskFilter.h', - 'effects/SkTableMaskFilter.h', - 'effects/SkAvoidXfermode.h', - 'effects/SkBitmapSource.h', - 'effects/SkCornerPathEffect.h', - 'effects/SkTransparentShader.h', - 'effects/SkStippleMaskFilter.h', - 'effects/SkPaintFlagsDrawFilter.h', - 'effects/SkOffsetImageFilter.h', - 'effects/SkDiscretePathEffect.h', - 'effects/SkTableColorFilter.h', - 'effects/SkGradientShader.h', - 'effects/SkEmbossMaskFilter.h', - 'effects/SkComposeImageFilter.h', - 'effects/SkTestImageFilters.h', - 'effects/SkLayerRasterizer.h', - 'effects/SkDashPathEffect.h', - 'effects/Sk1DPathEffect.h', - 'effects/SkBlurMaskFilter.h', - 'effects/SkDisplacementMapEffect.h', - 'effects/SkPixelXorXfermode.h', - 'effects/SkColorMatrixFilter.h', - 'effects/SkColorMatrix.h', - 'effects/SkBlurDrawLooper.h', - 'effects/SkColorFilterImageFilter.h', - 'effects/SkLayerDrawLooper.h', - 'effects/SkLightingImageFilter.h', - 'effects/SkDropShadowImageFilter.h', - 'effects/SkMatrixConvolutionImageFilter.h', - 'utils/SkPictureUtils.h', - 'utils/SkMatrix44.h', - 'utils/SkProxyCanvas.h', - 'utils/SkNWayCanvas.h', - 'utils/SkPathUtils.h', - 'utils/SkDeferredCanvas.h', - 'utils/SkNullCanvas.h', - 'utils/mac/SkCGUtils.h', - 'device/xps/SkXPSDevice.h', - 'ports/SkTypeface_win.h', - 'ports/SkFontConfigInterface.h', - 'ports/SkTypeface_mac.h', - 'ports/SkTypeface_android.h', - 'ports/SkFontStyle.h', - 'ports/SkFontMgr.h', - 'core/SkColor.h', - 'core/SkFontHost.h', - 'core/SkMetaData.h', - 'core/SkRRect.h', - 'core/SkMatrix.h', - 'core/SkDataTable.h', - 'core/SkTypeface.h', - 'core/SkDrawFilter.h', - 'core/SkRasterizer.h', - 'core/SkColorPriv.h', - 'core/SkPaint.h', - 'core/SkBitmap.h', - 'core/SkFloatBits.h', - 'core/SkDeque.h', - 'core/Sk64.h', - 'core/SkComposeShader.h', - 'core/SkImage.h', - 'core/SkTileGridPicture.h', - 'core/SkGraphics.h', - 'core/SkCanvas.h', - 'core/SkPicture.h', - 'core/SkClipStack.h', - 'core/SkXfermode.h', - 'core/SkColorFilter.h', - 'core/SkRegion.h', - 'core/SkRefCnt.h', - 'core/SkStream.h', - 'core/SkGeometry.h', - 'core/SkPathMeasure.h', - 'core/SkMaskFilter.h', - 'core/SkTDArray.h', - 'core/SkAnnotation.h', - 'core/SkDrawLooper.h', - 'core/SkThread_platform.h', - 'core/SkTemplates.h', - 'core/SkWeakRefCnt.h', - 'core/SkTypes.h', - 'core/SkData.h', - 'core/SkPoint.h', - 'core/SkColorShader.h', - 'core/SkUnPreMultiply.h', - 'core/SkDevice.h', - 'core/SkImageFilter.h', - 'core/SkPreConfig.h', - 'core/SkImageFilterUtils.h', - 'core/SkPathEffect.h', - 'core/SkString.h', - 'core/SkPixelRef.h', - 'core/SkEmptyShader.h', - 'core/SkSurface.h', - 'core/SkShader.h', - 'core/SkPath.h', - 'core/SkFlattenable.h', - 'core/SkRect.h', - 'pathops/SkPathOps.h', - ], - }, -} - -# Local Variables: -# tab-width:2 -# indent-tabs-mode:nil -# End: -# vim: set expandtab tabstop=2 shiftwidth=2: diff --git a/public_headers.gypi b/public_headers.gypi new file mode 100644 index 0000000..7bf3547 --- /dev/null +++ b/public_headers.gypi @@ -0,0 +1,316 @@ +# Include this gypi to include all public header files that exist in the +# include directory. +# +# The list is computed by running 'find include -name *.h'' in the root dir of +# the project. +# +{ + 'variables': { + 'header_filenames': [ + 'include/pdf/SkPDFDevice.h' + 'include/pdf/SkPDFDocument.h' + 'include/svg/SkSVGTypes.h' + 'include/svg/SkSVGBase.h' + 'include/svg/SkSVGAttribute.h' + 'include/svg/SkSVGParser.h' + 'include/svg/SkSVGPaintState.h' + 'include/animator/SkAnimator.h' + 'include/animator/SkAnimatorView.h' + 'include/gpu/GrTexture.h' + 'include/gpu/SkGr.h' + 'include/gpu/GrContext.h' + 'include/gpu/gl/GrGLConfig_chrome.h' + 'include/gpu/gl/SkNativeGLContext.h' + 'include/gpu/gl/SkMesaGLContext.h' + 'include/gpu/gl/SkDebugGLContext.h' + 'include/gpu/gl/SkANGLEGLContext.h' + 'include/gpu/gl/GrGLConfig.h' + 'include/gpu/gl/GrGLInterface.h' + 'include/gpu/gl/SkNullGLContext.h' + 'include/gpu/gl/GrGLFunctions.h' + 'include/gpu/gl/SkGLContextHelper.h' + 'include/gpu/gl/GrGLExtensions.h' + 'include/gpu/SkGpuDevice.h' + 'include/gpu/GrTypes.h' + 'include/gpu/GrFontScaler.h' + 'include/gpu/GrResource.h' + 'include/gpu/GrRefCnt.h' + 'include/gpu/GrKey.h' + 'include/gpu/GrOvalRenderer.h' + 'include/gpu/GrEffectUnitTest.h' + 'include/gpu/GrConfig.h' + 'include/gpu/GrPaint.h' + 'include/gpu/GrPathRendererChain.h' + 'include/gpu/GrTBackendEffectFactory.h' + 'include/gpu/GrDrawEffect.h' + 'include/gpu/GrTextContext.h' + 'include/gpu/GrEffect.h' + 'include/gpu/GrNoncopyable.h' + 'include/gpu/SkGrTexturePixelRef.h' + 'include/gpu/GrTextureAccess.h' + 'include/gpu/GrRect.h' + 'include/gpu/GrEffectStage.h' + 'include/gpu/GrClipData.h' + 'include/gpu/GrUserConfig.h' + 'include/gpu/SkGrPixelRef.h' + 'include/gpu/GrAARectRenderer.h' + 'include/gpu/GrColor.h' + 'include/gpu/GrGlyph.h' + 'include/gpu/GrBackendEffectFactory.h' + 'include/gpu/GrContextFactory.h' + 'include/gpu/GrRenderTarget.h' + 'include/gpu/GrSurface.h' + 'include/gpu/GrTypesPriv.h' + 'include/gpu/GrPoint.h' + 'include/config/sk_stdint.h' + 'include/config/SkUserConfig.h' + 'include/pipe/SkGPipe.h' + 'include/images/SkImageRef.h' + 'include/images/SkMovie.h' + 'include/images/SkPageFlipper.h' + 'include/images/SkForceLinking.h' + 'include/images/SkImageRef_GlobalPool.h' + 'include/images/SkImages.h' + 'include/effects/SkMorphologyImageFilter.h' + 'include/effects/Sk2DPathEffect.h' + 'include/effects/SkXfermodeImageFilter.h' + 'include/effects/SkArithmeticMode.h' + 'include/effects/SkMergeImageFilter.h' + 'include/effects/SkPerlinNoiseShader.h' + 'include/effects/SkLerpXfermode.h' + 'include/effects/SkRectShaderImageFilter.h' + 'include/effects/SkMagnifierImageFilter.h' + 'include/effects/SkBicubicImageFilter.h' + 'include/effects/SkPorterDuff.h' + 'include/effects/SkBlurImageFilter.h' + 'include/effects/SkKernel33MaskFilter.h' + 'include/effects/SkTableMaskFilter.h' + 'include/effects/SkAvoidXfermode.h' + 'include/effects/SkBitmapSource.h' + 'include/effects/SkCornerPathEffect.h' + 'include/effects/SkTransparentShader.h' + 'include/effects/SkStippleMaskFilter.h' + 'include/effects/SkPaintFlagsDrawFilter.h' + 'include/effects/SkOffsetImageFilter.h' + 'include/effects/SkDiscretePathEffect.h' + 'include/effects/SkTableColorFilter.h' + 'include/effects/SkGradientShader.h' + 'include/effects/SkEmbossMaskFilter.h' + 'include/effects/SkComposeImageFilter.h' + 'include/effects/SkTestImageFilters.h' + 'include/effects/SkLayerRasterizer.h' + 'include/effects/SkDashPathEffect.h' + 'include/effects/Sk1DPathEffect.h' + 'include/effects/SkBlurMaskFilter.h' + 'include/effects/SkDrawExtraPathEffect.h' + 'include/effects/SkDisplacementMapEffect.h' + 'include/effects/SkPixelXorXfermode.h' + 'include/effects/SkColorMatrixFilter.h' + 'include/effects/SkColorMatrix.h' + 'include/effects/SkBlurDrawLooper.h' + 'include/effects/SkColorFilterImageFilter.h' + 'include/effects/SkLayerDrawLooper.h' + 'include/effects/SkLightingImageFilter.h' + 'include/effects/SkDropShadowImageFilter.h' + 'include/effects/SkMatrixConvolutionImageFilter.h' + 'include/utils/win/SkAutoCoInitialize.h' + 'include/utils/win/SkHRESULT.h' + 'include/utils/win/SkIStream.h' + 'include/utils/win/SkTScopedComPtr.h' + 'include/utils/SkBoundaryPatch.h' + 'include/utils/SkUnitMappers.h' + 'include/utils/SkPictureUtils.h' + 'include/utils/SkRandom.h' + 'include/utils/SkMeshUtils.h' + 'include/utils/SkCullPoints.h' + 'include/utils/SkCamera.h' + 'include/utils/SkLua.h' + 'include/utils/SkParsePaint.h' + 'include/utils/SkCountdown.h' + 'include/utils/SkRunnable.h' + 'include/utils/SkParse.h' + 'include/utils/SkThreadPool.h' + 'include/utils/SkMatrix44.h' + 'include/utils/SkInterpolator.h' + 'include/utils/SkWGL.h' + 'include/utils/SkDumpCanvas.h' + 'include/utils/SkRTConf.h' + 'include/utils/SkCubicInterval.h' + 'include/utils/SkLuaCanvas.h' + 'include/utils/SkDebugUtils.h' + 'include/utils/SkLayer.h' + 'include/utils/SkProxyCanvas.h' + 'include/utils/SkNWayCanvas.h' + 'include/utils/SkPathUtils.h' + 'include/utils/SkDeferredCanvas.h' + 'include/utils/ios/SkStream_NSData.h' + 'include/utils/SkNullCanvas.h' + 'include/utils/SkParsePath.h' + 'include/utils/SkJSON.h' + 'include/utils/SkCondVar.h' + 'include/utils/SkNinePatch.h' + 'include/utils/mac/SkCGUtils.h' + 'include/xml/SkDOM.h' + 'include/xml/SkJS.h' + 'include/xml/SkXMLParser.h' + 'include/xml/SkBML_XMLParser.h' + 'include/xml/SkBML_WXMLParser.h' + 'include/xml/SkXMLWriter.h' + 'include/device/xps/SkXPSDevice.h' + 'include/device/xps/SkConstexprMath.h' + 'include/ports/SkTypeface_win.h' + 'include/ports/SkHarfBuzzFont.h' + 'include/ports/SkFontConfigInterface.h' + 'include/ports/SkTypeface_mac.h' + 'include/ports/SkTypeface_android.h' + 'include/ports/SkFontStyle.h' + 'include/ports/SkFontMgr.h' + 'include/text/SkTextLayout.h' + 'include/core/SkColor.h' + 'include/core/SkFontHost.h' + 'include/core/SkMetaData.h' + 'include/core/SkRRect.h' + 'include/core/SkMatrix.h' + 'include/core/SkDataTable.h' + 'include/core/SkScalar.h' + 'include/core/SkFlattenableSerialization.h' + 'include/core/SkTypeface.h' + 'include/core/SkImageEncoder.h' + 'include/core/SkDrawFilter.h' + 'include/core/SkTDict.h' + 'include/core/SkRasterizer.h' + 'include/core/SkColorPriv.h' + 'include/core/SkFloatingPoint.h' + 'include/core/SkOSFile.h' + 'include/core/SkPaint.h' + 'include/core/SkTDStack.h' + 'include/core/SkDither.h' + 'include/core/SkFixed.h' + 'include/core/SkDocument.h' + 'include/core/SkInstCnt.h' + 'include/core/SkEndian.h' + 'include/core/SkColorTable.h' + 'include/core/SkBitmap.h' + 'include/core/SkDraw.h' + 'include/core/SkPackBits.h' + 'include/core/SkFloatBits.h' + 'include/core/SkDeque.h' + 'include/core/SkTRegistry.h' + 'include/core/Sk64.h' + 'include/core/SkTLazy.h' + 'include/core/SkComposeShader.h' + 'include/core/SkUtils.h' + 'include/core/SkImage.h' + 'include/core/SkTileGridPicture.h' + 'include/core/SkPaintOptionsAndroid.h' + 'include/core/SkDeviceProperties.h' + 'include/core/SkGraphics.h' + 'include/core/SkCanvas.h' + 'include/core/SkPicture.h' + 'include/core/SkClipStack.h' + 'include/core/SkTScopedPtr.h' + 'include/core/SkXfermode.h' + 'include/core/SkColorFilter.h' + 'include/core/SkRegion.h' + 'include/core/SkRefCnt.h' + 'include/core/SkStream.h' + 'include/core/SkFontLCDConfig.h' + 'include/core/SkBlitRow.h' + 'include/core/SkGeometry.h' + 'include/core/SkStrokeRec.h' + 'include/core/SkImageDecoder.h' + 'include/core/SkTime.h' + 'include/core/SkImageTypes.h' + 'include/core/SkScalarCompare.h' + 'include/core/SkPathMeasure.h' + 'include/core/SkMaskFilter.h' + 'include/core/SkBounder.h' + 'include/core/SkFlate.h' + 'include/core/SkTDArray.h' + 'include/core/SkAnnotation.h' + 'include/core/SkChecksum.h' + 'include/core/SkMath.h' + 'include/core/SkDrawLooper.h' + 'include/core/SkThread_platform.h' + 'include/core/SkFlattenableBuffers.h' + 'include/core/SkTemplates.h' + 'include/core/SkMask.h' + 'include/core/SkMallocPixelRef.h' + 'include/core/SkWeakRefCnt.h' + 'include/core/SkTypes.h' + 'include/core/SkThread.h' + 'include/core/SkData.h' + 'include/core/SkPoint.h' + 'include/core/SkColorShader.h' + 'include/core/SkChunkAlloc.h' + 'include/core/SkUnPreMultiply.h' + 'include/core/SkReader32.h' + 'include/core/SkDevice.h' + 'include/core/SkImageFilter.h' + 'include/core/SkAdvancedTypefaceMetrics.h' + 'include/core/SkTInternalLList.h' + 'include/core/SkTArray.h' + 'include/core/SkStringUtils.h' + 'include/core/SkPreConfig.h' + 'include/core/SkImageFilterUtils.h' + 'include/core/SkLineClipper.h' + 'include/core/SkDataSet.h' + 'include/core/SkPathEffect.h' + 'include/core/SkString.h' + 'include/core/SkPixelRef.h' + 'include/core/SkSize.h' + 'include/core/SkEmptyShader.h' + 'include/core/SkSurface.h' + 'include/core/SkPostConfig.h' + 'include/core/SkShader.h' + 'include/core/SkWriter32.h' + 'include/core/SkError.h' + 'include/core/SkPath.h' + 'include/core/SkTrace.h' + 'include/core/SkUnitMapper.h' + 'include/core/SkFlattenable.h' + 'include/core/SkTSearch.h' + 'include/core/SkRect.h' + 'include/pathops/SkPathOps.h' + 'include/views/SkTouchGesture.h' + 'include/views/SkEvent.h' + 'include/views/SkOSWindow_NaCl.h' + 'include/views/SkTextBox.h' + 'include/views/SkViewInflate.h' + 'include/views/SkOSWindow_iOS.h' + 'include/views/SkBGViewArtist.h' + 'include/views/SkOSWindow_SDL.h' + 'include/views/SkWindow.h' + 'include/views/SkSystemEventTypes.h' + 'include/views/SkOSWindow_Android.h' + 'include/views/SkOSWindow_Mac.h' + 'include/views/android/AndroidKeyToSkKey.h' + 'include/views/SkEventSink.h' + 'include/views/animated/SkImageView.h' + 'include/views/animated/SkWidgetViews.h' + 'include/views/animated/SkProgressBarView.h' + 'include/views/animated/SkBorderView.h' + 'include/views/animated/SkScrollBarView.h' + 'include/views/SkStackViewLayout.h' + 'include/views/SkApplication.h' + 'include/views/unix/keysym2ucs.h' + 'include/views/unix/XkeysToSkKeys.h' + 'include/views/SkKey.h' + 'include/views/SkView.h' + 'include/views/SkOSMenu.h' + 'include/views/SkOSWindow_Unix.h' + 'include/views/SkWidget.h' + 'include/views/SkOSWindow_Win.h' + 'include/lazy/SkBitmapFactory.h' + 'include/lazy/SkImageCache.h' + 'include/lazy/SkPurgeableImageCache.h' + 'include/lazy/SkLruImageCache.h' + ], + }, +} + +# Local Variables: +# tab-width:2 +# indent-tabs-mode:nil +# End: +# vim: set expandtab tabstop=2 shiftwidth=2: -- cgit v1.2.3 From bb85d11583e224a807e5947bdfe89b8c3ad57e0e Mon Sep 17 00:00:00 2001 From: "djsollen@google.com" Date: Fri, 9 Aug 2013 16:11:36 +0000 Subject: remove include from the header paths R=robertphillips@google.com, torne@chromium.org Review URL: https://codereview.chromium.org/22450005 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@10664 2bbb7eff-a529-9590-31e7-b0007b416f81 --- public_headers.gypi | 596 ++++++++++++++++++++++++++-------------------------- 1 file changed, 298 insertions(+), 298 deletions(-) diff --git a/public_headers.gypi b/public_headers.gypi index 7bf3547..d9c85cd 100644 --- a/public_headers.gypi +++ b/public_headers.gypi @@ -7,304 +7,304 @@ { 'variables': { 'header_filenames': [ - 'include/pdf/SkPDFDevice.h' - 'include/pdf/SkPDFDocument.h' - 'include/svg/SkSVGTypes.h' - 'include/svg/SkSVGBase.h' - 'include/svg/SkSVGAttribute.h' - 'include/svg/SkSVGParser.h' - 'include/svg/SkSVGPaintState.h' - 'include/animator/SkAnimator.h' - 'include/animator/SkAnimatorView.h' - 'include/gpu/GrTexture.h' - 'include/gpu/SkGr.h' - 'include/gpu/GrContext.h' - 'include/gpu/gl/GrGLConfig_chrome.h' - 'include/gpu/gl/SkNativeGLContext.h' - 'include/gpu/gl/SkMesaGLContext.h' - 'include/gpu/gl/SkDebugGLContext.h' - 'include/gpu/gl/SkANGLEGLContext.h' - 'include/gpu/gl/GrGLConfig.h' - 'include/gpu/gl/GrGLInterface.h' - 'include/gpu/gl/SkNullGLContext.h' - 'include/gpu/gl/GrGLFunctions.h' - 'include/gpu/gl/SkGLContextHelper.h' - 'include/gpu/gl/GrGLExtensions.h' - 'include/gpu/SkGpuDevice.h' - 'include/gpu/GrTypes.h' - 'include/gpu/GrFontScaler.h' - 'include/gpu/GrResource.h' - 'include/gpu/GrRefCnt.h' - 'include/gpu/GrKey.h' - 'include/gpu/GrOvalRenderer.h' - 'include/gpu/GrEffectUnitTest.h' - 'include/gpu/GrConfig.h' - 'include/gpu/GrPaint.h' - 'include/gpu/GrPathRendererChain.h' - 'include/gpu/GrTBackendEffectFactory.h' - 'include/gpu/GrDrawEffect.h' - 'include/gpu/GrTextContext.h' - 'include/gpu/GrEffect.h' - 'include/gpu/GrNoncopyable.h' - 'include/gpu/SkGrTexturePixelRef.h' - 'include/gpu/GrTextureAccess.h' - 'include/gpu/GrRect.h' - 'include/gpu/GrEffectStage.h' - 'include/gpu/GrClipData.h' - 'include/gpu/GrUserConfig.h' - 'include/gpu/SkGrPixelRef.h' - 'include/gpu/GrAARectRenderer.h' - 'include/gpu/GrColor.h' - 'include/gpu/GrGlyph.h' - 'include/gpu/GrBackendEffectFactory.h' - 'include/gpu/GrContextFactory.h' - 'include/gpu/GrRenderTarget.h' - 'include/gpu/GrSurface.h' - 'include/gpu/GrTypesPriv.h' - 'include/gpu/GrPoint.h' - 'include/config/sk_stdint.h' - 'include/config/SkUserConfig.h' - 'include/pipe/SkGPipe.h' - 'include/images/SkImageRef.h' - 'include/images/SkMovie.h' - 'include/images/SkPageFlipper.h' - 'include/images/SkForceLinking.h' - 'include/images/SkImageRef_GlobalPool.h' - 'include/images/SkImages.h' - 'include/effects/SkMorphologyImageFilter.h' - 'include/effects/Sk2DPathEffect.h' - 'include/effects/SkXfermodeImageFilter.h' - 'include/effects/SkArithmeticMode.h' - 'include/effects/SkMergeImageFilter.h' - 'include/effects/SkPerlinNoiseShader.h' - 'include/effects/SkLerpXfermode.h' - 'include/effects/SkRectShaderImageFilter.h' - 'include/effects/SkMagnifierImageFilter.h' - 'include/effects/SkBicubicImageFilter.h' - 'include/effects/SkPorterDuff.h' - 'include/effects/SkBlurImageFilter.h' - 'include/effects/SkKernel33MaskFilter.h' - 'include/effects/SkTableMaskFilter.h' - 'include/effects/SkAvoidXfermode.h' - 'include/effects/SkBitmapSource.h' - 'include/effects/SkCornerPathEffect.h' - 'include/effects/SkTransparentShader.h' - 'include/effects/SkStippleMaskFilter.h' - 'include/effects/SkPaintFlagsDrawFilter.h' - 'include/effects/SkOffsetImageFilter.h' - 'include/effects/SkDiscretePathEffect.h' - 'include/effects/SkTableColorFilter.h' - 'include/effects/SkGradientShader.h' - 'include/effects/SkEmbossMaskFilter.h' - 'include/effects/SkComposeImageFilter.h' - 'include/effects/SkTestImageFilters.h' - 'include/effects/SkLayerRasterizer.h' - 'include/effects/SkDashPathEffect.h' - 'include/effects/Sk1DPathEffect.h' - 'include/effects/SkBlurMaskFilter.h' - 'include/effects/SkDrawExtraPathEffect.h' - 'include/effects/SkDisplacementMapEffect.h' - 'include/effects/SkPixelXorXfermode.h' - 'include/effects/SkColorMatrixFilter.h' - 'include/effects/SkColorMatrix.h' - 'include/effects/SkBlurDrawLooper.h' - 'include/effects/SkColorFilterImageFilter.h' - 'include/effects/SkLayerDrawLooper.h' - 'include/effects/SkLightingImageFilter.h' - 'include/effects/SkDropShadowImageFilter.h' - 'include/effects/SkMatrixConvolutionImageFilter.h' - 'include/utils/win/SkAutoCoInitialize.h' - 'include/utils/win/SkHRESULT.h' - 'include/utils/win/SkIStream.h' - 'include/utils/win/SkTScopedComPtr.h' - 'include/utils/SkBoundaryPatch.h' - 'include/utils/SkUnitMappers.h' - 'include/utils/SkPictureUtils.h' - 'include/utils/SkRandom.h' - 'include/utils/SkMeshUtils.h' - 'include/utils/SkCullPoints.h' - 'include/utils/SkCamera.h' - 'include/utils/SkLua.h' - 'include/utils/SkParsePaint.h' - 'include/utils/SkCountdown.h' - 'include/utils/SkRunnable.h' - 'include/utils/SkParse.h' - 'include/utils/SkThreadPool.h' - 'include/utils/SkMatrix44.h' - 'include/utils/SkInterpolator.h' - 'include/utils/SkWGL.h' - 'include/utils/SkDumpCanvas.h' - 'include/utils/SkRTConf.h' - 'include/utils/SkCubicInterval.h' - 'include/utils/SkLuaCanvas.h' - 'include/utils/SkDebugUtils.h' - 'include/utils/SkLayer.h' - 'include/utils/SkProxyCanvas.h' - 'include/utils/SkNWayCanvas.h' - 'include/utils/SkPathUtils.h' - 'include/utils/SkDeferredCanvas.h' - 'include/utils/ios/SkStream_NSData.h' - 'include/utils/SkNullCanvas.h' - 'include/utils/SkParsePath.h' - 'include/utils/SkJSON.h' - 'include/utils/SkCondVar.h' - 'include/utils/SkNinePatch.h' - 'include/utils/mac/SkCGUtils.h' - 'include/xml/SkDOM.h' - 'include/xml/SkJS.h' - 'include/xml/SkXMLParser.h' - 'include/xml/SkBML_XMLParser.h' - 'include/xml/SkBML_WXMLParser.h' - 'include/xml/SkXMLWriter.h' - 'include/device/xps/SkXPSDevice.h' - 'include/device/xps/SkConstexprMath.h' - 'include/ports/SkTypeface_win.h' - 'include/ports/SkHarfBuzzFont.h' - 'include/ports/SkFontConfigInterface.h' - 'include/ports/SkTypeface_mac.h' - 'include/ports/SkTypeface_android.h' - 'include/ports/SkFontStyle.h' - 'include/ports/SkFontMgr.h' - 'include/text/SkTextLayout.h' - 'include/core/SkColor.h' - 'include/core/SkFontHost.h' - 'include/core/SkMetaData.h' - 'include/core/SkRRect.h' - 'include/core/SkMatrix.h' - 'include/core/SkDataTable.h' - 'include/core/SkScalar.h' - 'include/core/SkFlattenableSerialization.h' - 'include/core/SkTypeface.h' - 'include/core/SkImageEncoder.h' - 'include/core/SkDrawFilter.h' - 'include/core/SkTDict.h' - 'include/core/SkRasterizer.h' - 'include/core/SkColorPriv.h' - 'include/core/SkFloatingPoint.h' - 'include/core/SkOSFile.h' - 'include/core/SkPaint.h' - 'include/core/SkTDStack.h' - 'include/core/SkDither.h' - 'include/core/SkFixed.h' - 'include/core/SkDocument.h' - 'include/core/SkInstCnt.h' - 'include/core/SkEndian.h' - 'include/core/SkColorTable.h' - 'include/core/SkBitmap.h' - 'include/core/SkDraw.h' - 'include/core/SkPackBits.h' - 'include/core/SkFloatBits.h' - 'include/core/SkDeque.h' - 'include/core/SkTRegistry.h' - 'include/core/Sk64.h' - 'include/core/SkTLazy.h' - 'include/core/SkComposeShader.h' - 'include/core/SkUtils.h' - 'include/core/SkImage.h' - 'include/core/SkTileGridPicture.h' - 'include/core/SkPaintOptionsAndroid.h' - 'include/core/SkDeviceProperties.h' - 'include/core/SkGraphics.h' - 'include/core/SkCanvas.h' - 'include/core/SkPicture.h' - 'include/core/SkClipStack.h' - 'include/core/SkTScopedPtr.h' - 'include/core/SkXfermode.h' - 'include/core/SkColorFilter.h' - 'include/core/SkRegion.h' - 'include/core/SkRefCnt.h' - 'include/core/SkStream.h' - 'include/core/SkFontLCDConfig.h' - 'include/core/SkBlitRow.h' - 'include/core/SkGeometry.h' - 'include/core/SkStrokeRec.h' - 'include/core/SkImageDecoder.h' - 'include/core/SkTime.h' - 'include/core/SkImageTypes.h' - 'include/core/SkScalarCompare.h' - 'include/core/SkPathMeasure.h' - 'include/core/SkMaskFilter.h' - 'include/core/SkBounder.h' - 'include/core/SkFlate.h' - 'include/core/SkTDArray.h' - 'include/core/SkAnnotation.h' - 'include/core/SkChecksum.h' - 'include/core/SkMath.h' - 'include/core/SkDrawLooper.h' - 'include/core/SkThread_platform.h' - 'include/core/SkFlattenableBuffers.h' - 'include/core/SkTemplates.h' - 'include/core/SkMask.h' - 'include/core/SkMallocPixelRef.h' - 'include/core/SkWeakRefCnt.h' - 'include/core/SkTypes.h' - 'include/core/SkThread.h' - 'include/core/SkData.h' - 'include/core/SkPoint.h' - 'include/core/SkColorShader.h' - 'include/core/SkChunkAlloc.h' - 'include/core/SkUnPreMultiply.h' - 'include/core/SkReader32.h' - 'include/core/SkDevice.h' - 'include/core/SkImageFilter.h' - 'include/core/SkAdvancedTypefaceMetrics.h' - 'include/core/SkTInternalLList.h' - 'include/core/SkTArray.h' - 'include/core/SkStringUtils.h' - 'include/core/SkPreConfig.h' - 'include/core/SkImageFilterUtils.h' - 'include/core/SkLineClipper.h' - 'include/core/SkDataSet.h' - 'include/core/SkPathEffect.h' - 'include/core/SkString.h' - 'include/core/SkPixelRef.h' - 'include/core/SkSize.h' - 'include/core/SkEmptyShader.h' - 'include/core/SkSurface.h' - 'include/core/SkPostConfig.h' - 'include/core/SkShader.h' - 'include/core/SkWriter32.h' - 'include/core/SkError.h' - 'include/core/SkPath.h' - 'include/core/SkTrace.h' - 'include/core/SkUnitMapper.h' - 'include/core/SkFlattenable.h' - 'include/core/SkTSearch.h' - 'include/core/SkRect.h' - 'include/pathops/SkPathOps.h' - 'include/views/SkTouchGesture.h' - 'include/views/SkEvent.h' - 'include/views/SkOSWindow_NaCl.h' - 'include/views/SkTextBox.h' - 'include/views/SkViewInflate.h' - 'include/views/SkOSWindow_iOS.h' - 'include/views/SkBGViewArtist.h' - 'include/views/SkOSWindow_SDL.h' - 'include/views/SkWindow.h' - 'include/views/SkSystemEventTypes.h' - 'include/views/SkOSWindow_Android.h' - 'include/views/SkOSWindow_Mac.h' - 'include/views/android/AndroidKeyToSkKey.h' - 'include/views/SkEventSink.h' - 'include/views/animated/SkImageView.h' - 'include/views/animated/SkWidgetViews.h' - 'include/views/animated/SkProgressBarView.h' - 'include/views/animated/SkBorderView.h' - 'include/views/animated/SkScrollBarView.h' - 'include/views/SkStackViewLayout.h' - 'include/views/SkApplication.h' - 'include/views/unix/keysym2ucs.h' - 'include/views/unix/XkeysToSkKeys.h' - 'include/views/SkKey.h' - 'include/views/SkView.h' - 'include/views/SkOSMenu.h' - 'include/views/SkOSWindow_Unix.h' - 'include/views/SkWidget.h' - 'include/views/SkOSWindow_Win.h' - 'include/lazy/SkBitmapFactory.h' - 'include/lazy/SkImageCache.h' - 'include/lazy/SkPurgeableImageCache.h' - 'include/lazy/SkLruImageCache.h' + 'pdf/SkPDFDevice.h' + 'pdf/SkPDFDocument.h' + 'svg/SkSVGTypes.h' + 'svg/SkSVGBase.h' + 'svg/SkSVGAttribute.h' + 'svg/SkSVGParser.h' + 'svg/SkSVGPaintState.h' + 'animator/SkAnimator.h' + 'animator/SkAnimatorView.h' + 'gpu/GrTexture.h' + 'gpu/SkGr.h' + 'gpu/GrContext.h' + 'gpu/gl/GrGLConfig_chrome.h' + 'gpu/gl/SkNativeGLContext.h' + 'gpu/gl/SkMesaGLContext.h' + 'gpu/gl/SkDebugGLContext.h' + 'gpu/gl/SkANGLEGLContext.h' + 'gpu/gl/GrGLConfig.h' + 'gpu/gl/GrGLInterface.h' + 'gpu/gl/SkNullGLContext.h' + 'gpu/gl/GrGLFunctions.h' + 'gpu/gl/SkGLContextHelper.h' + 'gpu/gl/GrGLExtensions.h' + 'gpu/SkGpuDevice.h' + 'gpu/GrTypes.h' + 'gpu/GrFontScaler.h' + 'gpu/GrResource.h' + 'gpu/GrRefCnt.h' + 'gpu/GrKey.h' + 'gpu/GrOvalRenderer.h' + 'gpu/GrEffectUnitTest.h' + 'gpu/GrConfig.h' + 'gpu/GrPaint.h' + 'gpu/GrPathRendererChain.h' + 'gpu/GrTBackendEffectFactory.h' + 'gpu/GrDrawEffect.h' + 'gpu/GrTextContext.h' + 'gpu/GrEffect.h' + 'gpu/GrNoncopyable.h' + 'gpu/SkGrTexturePixelRef.h' + 'gpu/GrTextureAccess.h' + 'gpu/GrRect.h' + 'gpu/GrEffectStage.h' + 'gpu/GrClipData.h' + 'gpu/GrUserConfig.h' + 'gpu/SkGrPixelRef.h' + 'gpu/GrAARectRenderer.h' + 'gpu/GrColor.h' + 'gpu/GrGlyph.h' + 'gpu/GrBackendEffectFactory.h' + 'gpu/GrContextFactory.h' + 'gpu/GrRenderTarget.h' + 'gpu/GrSurface.h' + 'gpu/GrTypesPriv.h' + 'gpu/GrPoint.h' + 'config/sk_stdint.h' + 'config/SkUserConfig.h' + 'pipe/SkGPipe.h' + 'images/SkImageRef.h' + 'images/SkMovie.h' + 'images/SkPageFlipper.h' + 'images/SkForceLinking.h' + 'images/SkImageRef_GlobalPool.h' + 'images/SkImages.h' + 'effects/SkMorphologyImageFilter.h' + 'effects/Sk2DPathEffect.h' + 'effects/SkXfermodeImageFilter.h' + 'effects/SkArithmeticMode.h' + 'effects/SkMergeImageFilter.h' + 'effects/SkPerlinNoiseShader.h' + 'effects/SkLerpXfermode.h' + 'effects/SkRectShaderImageFilter.h' + 'effects/SkMagnifierImageFilter.h' + 'effects/SkBicubicImageFilter.h' + 'effects/SkPorterDuff.h' + 'effects/SkBlurImageFilter.h' + 'effects/SkKernel33MaskFilter.h' + 'effects/SkTableMaskFilter.h' + 'effects/SkAvoidXfermode.h' + 'effects/SkBitmapSource.h' + 'effects/SkCornerPathEffect.h' + 'effects/SkTransparentShader.h' + 'effects/SkStippleMaskFilter.h' + 'effects/SkPaintFlagsDrawFilter.h' + 'effects/SkOffsetImageFilter.h' + 'effects/SkDiscretePathEffect.h' + 'effects/SkTableColorFilter.h' + 'effects/SkGradientShader.h' + 'effects/SkEmbossMaskFilter.h' + 'effects/SkComposeImageFilter.h' + 'effects/SkTestImageFilters.h' + 'effects/SkLayerRasterizer.h' + 'effects/SkDashPathEffect.h' + 'effects/Sk1DPathEffect.h' + 'effects/SkBlurMaskFilter.h' + 'effects/SkDrawExtraPathEffect.h' + 'effects/SkDisplacementMapEffect.h' + 'effects/SkPixelXorXfermode.h' + 'effects/SkColorMatrixFilter.h' + 'effects/SkColorMatrix.h' + 'effects/SkBlurDrawLooper.h' + 'effects/SkColorFilterImageFilter.h' + 'effects/SkLayerDrawLooper.h' + 'effects/SkLightingImageFilter.h' + 'effects/SkDropShadowImageFilter.h' + 'effects/SkMatrixConvolutionImageFilter.h' + 'utils/win/SkAutoCoInitialize.h' + 'utils/win/SkHRESULT.h' + 'utils/win/SkIStream.h' + 'utils/win/SkTScopedComPtr.h' + 'utils/SkBoundaryPatch.h' + 'utils/SkUnitMappers.h' + 'utils/SkPictureUtils.h' + 'utils/SkRandom.h' + 'utils/SkMeshUtils.h' + 'utils/SkCullPoints.h' + 'utils/SkCamera.h' + 'utils/SkLua.h' + 'utils/SkParsePaint.h' + 'utils/SkCountdown.h' + 'utils/SkRunnable.h' + 'utils/SkParse.h' + 'utils/SkThreadPool.h' + 'utils/SkMatrix44.h' + 'utils/SkInterpolator.h' + 'utils/SkWGL.h' + 'utils/SkDumpCanvas.h' + 'utils/SkRTConf.h' + 'utils/SkCubicInterval.h' + 'utils/SkLuaCanvas.h' + 'utils/SkDebugUtils.h' + 'utils/SkLayer.h' + 'utils/SkProxyCanvas.h' + 'utils/SkNWayCanvas.h' + 'utils/SkPathUtils.h' + 'utils/SkDeferredCanvas.h' + 'utils/ios/SkStream_NSData.h' + 'utils/SkNullCanvas.h' + 'utils/SkParsePath.h' + 'utils/SkJSON.h' + 'utils/SkCondVar.h' + 'utils/SkNinePatch.h' + 'utils/mac/SkCGUtils.h' + 'xml/SkDOM.h' + 'xml/SkJS.h' + 'xml/SkXMLParser.h' + 'xml/SkBML_XMLParser.h' + 'xml/SkBML_WXMLParser.h' + 'xml/SkXMLWriter.h' + 'device/xps/SkXPSDevice.h' + 'device/xps/SkConstexprMath.h' + 'ports/SkTypeface_win.h' + 'ports/SkHarfBuzzFont.h' + 'ports/SkFontConfigInterface.h' + 'ports/SkTypeface_mac.h' + 'ports/SkTypeface_android.h' + 'ports/SkFontStyle.h' + 'ports/SkFontMgr.h' + 'text/SkTextLayout.h' + 'core/SkColor.h' + 'core/SkFontHost.h' + 'core/SkMetaData.h' + 'core/SkRRect.h' + 'core/SkMatrix.h' + 'core/SkDataTable.h' + 'core/SkScalar.h' + 'core/SkFlattenableSerialization.h' + 'core/SkTypeface.h' + 'core/SkImageEncoder.h' + 'core/SkDrawFilter.h' + 'core/SkTDict.h' + 'core/SkRasterizer.h' + 'core/SkColorPriv.h' + 'core/SkFloatingPoint.h' + 'core/SkOSFile.h' + 'core/SkPaint.h' + 'core/SkTDStack.h' + 'core/SkDither.h' + 'core/SkFixed.h' + 'core/SkDocument.h' + 'core/SkInstCnt.h' + 'core/SkEndian.h' + 'core/SkColorTable.h' + 'core/SkBitmap.h' + 'core/SkDraw.h' + 'core/SkPackBits.h' + 'core/SkFloatBits.h' + 'core/SkDeque.h' + 'core/SkTRegistry.h' + 'core/Sk64.h' + 'core/SkTLazy.h' + 'core/SkComposeShader.h' + 'core/SkUtils.h' + 'core/SkImage.h' + 'core/SkTileGridPicture.h' + 'core/SkPaintOptionsAndroid.h' + 'core/SkDeviceProperties.h' + 'core/SkGraphics.h' + 'core/SkCanvas.h' + 'core/SkPicture.h' + 'core/SkClipStack.h' + 'core/SkTScopedPtr.h' + 'core/SkXfermode.h' + 'core/SkColorFilter.h' + 'core/SkRegion.h' + 'core/SkRefCnt.h' + 'core/SkStream.h' + 'core/SkFontLCDConfig.h' + 'core/SkBlitRow.h' + 'core/SkGeometry.h' + 'core/SkStrokeRec.h' + 'core/SkImageDecoder.h' + 'core/SkTime.h' + 'core/SkImageTypes.h' + 'core/SkScalarCompare.h' + 'core/SkPathMeasure.h' + 'core/SkMaskFilter.h' + 'core/SkBounder.h' + 'core/SkFlate.h' + 'core/SkTDArray.h' + 'core/SkAnnotation.h' + 'core/SkChecksum.h' + 'core/SkMath.h' + 'core/SkDrawLooper.h' + 'core/SkThread_platform.h' + 'core/SkFlattenableBuffers.h' + 'core/SkTemplates.h' + 'core/SkMask.h' + 'core/SkMallocPixelRef.h' + 'core/SkWeakRefCnt.h' + 'core/SkTypes.h' + 'core/SkThread.h' + 'core/SkData.h' + 'core/SkPoint.h' + 'core/SkColorShader.h' + 'core/SkChunkAlloc.h' + 'core/SkUnPreMultiply.h' + 'core/SkReader32.h' + 'core/SkDevice.h' + 'core/SkImageFilter.h' + 'core/SkAdvancedTypefaceMetrics.h' + 'core/SkTInternalLList.h' + 'core/SkTArray.h' + 'core/SkStringUtils.h' + 'core/SkPreConfig.h' + 'core/SkImageFilterUtils.h' + 'core/SkLineClipper.h' + 'core/SkDataSet.h' + 'core/SkPathEffect.h' + 'core/SkString.h' + 'core/SkPixelRef.h' + 'core/SkSize.h' + 'core/SkEmptyShader.h' + 'core/SkSurface.h' + 'core/SkPostConfig.h' + 'core/SkShader.h' + 'core/SkWriter32.h' + 'core/SkError.h' + 'core/SkPath.h' + 'core/SkTrace.h' + 'core/SkUnitMapper.h' + 'core/SkFlattenable.h' + 'core/SkTSearch.h' + 'core/SkRect.h' + 'pathops/SkPathOps.h' + 'views/SkTouchGesture.h' + 'views/SkEvent.h' + 'views/SkOSWindow_NaCl.h' + 'views/SkTextBox.h' + 'views/SkViewInflate.h' + 'views/SkOSWindow_iOS.h' + 'views/SkBGViewArtist.h' + 'views/SkOSWindow_SDL.h' + 'views/SkWindow.h' + 'views/SkSystemEventTypes.h' + 'views/SkOSWindow_Android.h' + 'views/SkOSWindow_Mac.h' + 'views/android/AndroidKeyToSkKey.h' + 'views/SkEventSink.h' + 'views/animated/SkImageView.h' + 'views/animated/SkWidgetViews.h' + 'views/animated/SkProgressBarView.h' + 'views/animated/SkBorderView.h' + 'views/animated/SkScrollBarView.h' + 'views/SkStackViewLayout.h' + 'views/SkApplication.h' + 'views/unix/keysym2ucs.h' + 'views/unix/XkeysToSkKeys.h' + 'views/SkKey.h' + 'views/SkView.h' + 'views/SkOSMenu.h' + 'views/SkOSWindow_Unix.h' + 'views/SkWidget.h' + 'views/SkOSWindow_Win.h' + 'lazy/SkBitmapFactory.h' + 'lazy/SkImageCache.h' + 'lazy/SkPurgeableImageCache.h' + 'lazy/SkLruImageCache.h' ], }, } -- cgit v1.2.3 -- cgit v1.2.3 From f3ccf597b84a756e9dddb2a0f51e7a5e0e1f0d7e Mon Sep 17 00:00:00 2001 From: "robertphillips@google.com" Date: Sun, 11 Aug 2013 13:20:18 +0000 Subject: Reverted r10654 (Fix crash when querying a runtime config that is defined in environment) due to compilation failure on Chromium win_layout bot git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@10669 2bbb7eff-a529-9590-31e7-b0007b416f81 --- tests.gyp | 1 - 1 file changed, 1 deletion(-) diff --git a/tests.gyp b/tests.gyp index 9062446..f58b0ab 100644 --- a/tests.gyp +++ b/tests.gyp @@ -127,7 +127,6 @@ '../tests/TSetTest.cpp', '../tests/ToUnicode.cpp', '../tests/UnicodeTest.cpp', - '../tests/UnitTestTest.cpp', '../tests/UtilsTest.cpp', '../tests/WArrayTest.cpp', '../tests/WritePixelsTest.cpp', -- cgit v1.2.3 From 19638031648f55de30cb73d56a9a2020a60f7587 Mon Sep 17 00:00:00 2001 From: "reed@google.com" Date: Wed, 7 Aug 2013 15:30:09 +0000 Subject: enable SK_FONTHOST_USES_FONTMGR for mac and win. linux fontmgr not ready BUG= Review URL: https://codereview.chromium.org/22406004 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@10605 2bbb7eff-a529-9590-31e7-b0007b416f81 --- common_conditions.gypi | 2 ++ 1 file changed, 2 insertions(+) diff --git a/common_conditions.gypi b/common_conditions.gypi index c9d24ae..e046b13 100644 --- a/common_conditions.gypi +++ b/common_conditions.gypi @@ -32,6 +32,7 @@ { 'defines': [ 'SK_BUILD_FOR_WIN32', + 'SK_FONTHOST_USES_FONTMGR', 'SK_IGNORE_STDINT_DOT_H', '_CRT_SECURE_NO_WARNINGS', 'GR_GL_FUNCTION_TYPE=__stdcall', @@ -293,6 +294,7 @@ }, 'defines': [ 'SK_BUILD_FOR_MAC', + 'SK_FONTHOST_USES_FONTMGR', ], 'conditions' : [ [ 'skia_arch_width == 64', { -- cgit v1.2.3 From aa1d940aa67339aaabaee9128cd425181cfa6b66 Mon Sep 17 00:00:00 2001 From: "scroggo@google.com" Date: Wed, 7 Aug 2013 19:16:05 +0000 Subject: Add downsample from 8888 to 4444. Extend SkBitmap::copyTo to copy from a source with SkARGB_8888_Config to a destination bitmap with SkARGB_4444_Config. BUG=http://code.google.com/p/chromium/issues/detail?id=245774 R=reed@google.com Review URL: https://codereview.chromium.org/22350003 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@10621 2bbb7eff-a529-9590-31e7-b0007b416f81 --- gmslides.gypi | 1 + 1 file changed, 1 insertion(+) diff --git a/gmslides.gypi b/gmslides.gypi index 6729835..8d0b2e9 100644 --- a/gmslides.gypi +++ b/gmslides.gypi @@ -28,6 +28,7 @@ '../gm/composeshader.cpp', #'../gm/conicpaths.cpp', '../gm/convexpaths.cpp', + '../gm/copyTo4444.cpp', '../gm/cubicpaths.cpp', '../gm/cmykjpeg.cpp', '../gm/degeneratesegments.cpp', -- cgit v1.2.3 From a981291c64263fccd2a0de89e30a75c8126f3440 Mon Sep 17 00:00:00 2001 From: "junov@chromium.org" Date: Wed, 7 Aug 2013 20:00:55 +0000 Subject: Upstreaming DropShadowImageFilter into skia, from Blink GM imagefiltersbase will need rebaselining after this change R=senorblanco@chromium.org Committed: https://code.google.com/p/skia/source/detail?r=10583 Review URL: https://codereview.chromium.org/22258005 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@10626 2bbb7eff-a529-9590-31e7-b0007b416f81 --- effects.gypi | 2 ++ 1 file changed, 2 insertions(+) diff --git a/effects.gypi b/effects.gypi index 05ce569..84d38ac 100644 --- a/effects.gypi +++ b/effects.gypi @@ -27,6 +27,7 @@ '<(skia_src_path)/effects/SkDashPathEffect.cpp', '<(skia_src_path)/effects/SkDiscretePathEffect.cpp', '<(skia_src_path)/effects/SkDisplacementMapEffect.cpp', + '<(skia_src_path)/effects/SkDropShadowImageFilter.cpp', '<(skia_src_path)/effects/SkEmbossMask.cpp', '<(skia_src_path)/effects/SkEmbossMask.h', '<(skia_src_path)/effects/SkEmbossMask_Table.h', @@ -90,6 +91,7 @@ '<(skia_include_path)/effects/SkDiscretePathEffect.h', '<(skia_include_path)/effects/SkDisplacementMapEffect.h', '<(skia_include_path)/effects/SkDrawExtraPathEffect.h', + '<(skia_include_path)/effects/SkDropShadowImageFilter.h', '<(skia_include_path)/effects/SkEmbossMaskFilter.h', '<(skia_include_path)/effects/SkGradientShader.h', '<(skia_include_path)/effects/SkKernel33MaskFilter.h', -- cgit v1.2.3 From fcaa7d454c7330fcfd19b100af9540670acb30c8 Mon Sep 17 00:00:00 2001 From: "commit-bot@chromium.org" Date: Thu, 8 Aug 2013 02:52:05 +0000 Subject: Use Path Ops to generate PDF clips R=vandebo@chromium.org, edisonn@google.com, caryclark@google.com Author: richardlin@chromium.org Review URL: https://chromiumcodereview.appspot.com/21161003 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@10633 2bbb7eff-a529-9590-31e7-b0007b416f81 --- gmslides.gypi | 1 + 1 file changed, 1 insertion(+) diff --git a/gmslides.gypi b/gmslides.gypi index 8d0b2e9..71eb4d2 100644 --- a/gmslides.gypi +++ b/gmslides.gypi @@ -20,6 +20,7 @@ '../gm/blurquickreject.cpp', '../gm/blurrect.cpp', '../gm/circles.cpp', + '../gm/circularclips.cpp', '../gm/colorfilterimagefilter.cpp', '../gm/colormatrix.cpp', '../gm/colortype.cpp', -- cgit v1.2.3 From 8fed265d16c03b370f4b12fd5f8a0947ddbbce32 Mon Sep 17 00:00:00 2001 From: "djsollen@google.com" Date: Thu, 8 Aug 2013 12:31:05 +0000 Subject: Create a gypi that contains all the SK_API header files for use by clients (i.e. chromium). R=robertphillips@google.com, torne@chromium.org Review URL: https://codereview.chromium.org/22474010 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@10637 2bbb7eff-a529-9590-31e7-b0007b416f81 --- exported_api_headers.gypi | 133 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 133 insertions(+) create mode 100644 exported_api_headers.gypi diff --git a/exported_api_headers.gypi b/exported_api_headers.gypi new file mode 100644 index 0000000..a105a8a --- /dev/null +++ b/exported_api_headers.gypi @@ -0,0 +1,133 @@ +# Include this gypi to include all public header files that use +# the SK_API defines. +# +# The list is computed by running 'egrep -lr "SK_API" include' in the root dir +# of the project. +# +{ + 'variables': { + 'header_filenames': [ + 'pdf/SkPDFDevice.h', + 'pdf/SkPDFDocument.h', + 'gpu/SkGpuDevice.h', + 'gpu/SkGrPixelRef.h', + 'effects/SkMorphologyImageFilter.h', + 'effects/Sk2DPathEffect.h', + 'effects/SkXfermodeImageFilter.h', + 'effects/SkArithmeticMode.h', + 'effects/SkMergeImageFilter.h', + 'effects/SkPerlinNoiseShader.h', + 'effects/SkLerpXfermode.h', + 'effects/SkRectShaderImageFilter.h', + 'effects/SkMagnifierImageFilter.h', + 'effects/SkBicubicImageFilter.h', + 'effects/SkPorterDuff.h', + 'effects/SkBlurImageFilter.h', + 'effects/SkKernel33MaskFilter.h', + 'effects/SkTableMaskFilter.h', + 'effects/SkAvoidXfermode.h', + 'effects/SkBitmapSource.h', + 'effects/SkCornerPathEffect.h', + 'effects/SkTransparentShader.h', + 'effects/SkStippleMaskFilter.h', + 'effects/SkPaintFlagsDrawFilter.h', + 'effects/SkOffsetImageFilter.h', + 'effects/SkDiscretePathEffect.h', + 'effects/SkTableColorFilter.h', + 'effects/SkGradientShader.h', + 'effects/SkEmbossMaskFilter.h', + 'effects/SkComposeImageFilter.h', + 'effects/SkTestImageFilters.h', + 'effects/SkLayerRasterizer.h', + 'effects/SkDashPathEffect.h', + 'effects/Sk1DPathEffect.h', + 'effects/SkBlurMaskFilter.h', + 'effects/SkDisplacementMapEffect.h', + 'effects/SkPixelXorXfermode.h', + 'effects/SkColorMatrixFilter.h', + 'effects/SkColorMatrix.h', + 'effects/SkBlurDrawLooper.h', + 'effects/SkColorFilterImageFilter.h', + 'effects/SkLayerDrawLooper.h', + 'effects/SkLightingImageFilter.h', + 'effects/SkDropShadowImageFilter.h', + 'effects/SkMatrixConvolutionImageFilter.h', + 'utils/SkPictureUtils.h', + 'utils/SkMatrix44.h', + 'utils/SkProxyCanvas.h', + 'utils/SkNWayCanvas.h', + 'utils/SkPathUtils.h', + 'utils/SkDeferredCanvas.h', + 'utils/SkNullCanvas.h', + 'utils/mac/SkCGUtils.h', + 'device/xps/SkXPSDevice.h', + 'ports/SkTypeface_win.h', + 'ports/SkFontConfigInterface.h', + 'ports/SkTypeface_mac.h', + 'ports/SkTypeface_android.h', + 'ports/SkFontStyle.h', + 'ports/SkFontMgr.h', + 'core/SkColor.h', + 'core/SkFontHost.h', + 'core/SkMetaData.h', + 'core/SkRRect.h', + 'core/SkMatrix.h', + 'core/SkDataTable.h', + 'core/SkTypeface.h', + 'core/SkDrawFilter.h', + 'core/SkRasterizer.h', + 'core/SkColorPriv.h', + 'core/SkPaint.h', + 'core/SkBitmap.h', + 'core/SkFloatBits.h', + 'core/SkDeque.h', + 'core/Sk64.h', + 'core/SkComposeShader.h', + 'core/SkImage.h', + 'core/SkTileGridPicture.h', + 'core/SkGraphics.h', + 'core/SkCanvas.h', + 'core/SkPicture.h', + 'core/SkClipStack.h', + 'core/SkXfermode.h', + 'core/SkColorFilter.h', + 'core/SkRegion.h', + 'core/SkRefCnt.h', + 'core/SkStream.h', + 'core/SkGeometry.h', + 'core/SkPathMeasure.h', + 'core/SkMaskFilter.h', + 'core/SkTDArray.h', + 'core/SkAnnotation.h', + 'core/SkDrawLooper.h', + 'core/SkThread_platform.h', + 'core/SkTemplates.h', + 'core/SkWeakRefCnt.h', + 'core/SkTypes.h', + 'core/SkData.h', + 'core/SkPoint.h', + 'core/SkColorShader.h', + 'core/SkUnPreMultiply.h', + 'core/SkDevice.h', + 'core/SkImageFilter.h', + 'core/SkPreConfig.h', + 'core/SkImageFilterUtils.h', + 'core/SkPathEffect.h', + 'core/SkString.h', + 'core/SkPixelRef.h', + 'core/SkEmptyShader.h', + 'core/SkSurface.h', + 'core/SkShader.h', + 'core/SkPath.h', + 'core/SkFlattenable.h', + 'core/SkRect.h', + 'pathops/SkPathOps.h', + ], + }, +} + +# Local Variables: +# tab-width:2 +# indent-tabs-mode:nil +# End: +# vim: set expandtab tabstop=2 shiftwidth=2: -- cgit v1.2.3 From d863dd707c8b1dab6ae155121ccdd4382279fda3 Mon Sep 17 00:00:00 2001 From: "edisonn@google.com" Date: Thu, 8 Aug 2013 12:42:13 +0000 Subject: pdfviewer: add ability to run on gpu Review URL: https://codereview.chromium.org/22684002 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@10638 2bbb7eff-a529-9590-31e7-b0007b416f81 --- pdfviewer.gyp | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/pdfviewer.gyp b/pdfviewer.gyp index 063c294..4f6e8ab 100644 --- a/pdfviewer.gyp +++ b/pdfviewer.gyp @@ -72,9 +72,7 @@ '<(SHARED_INTERMEDIATE_DIR)/native/autogen', ], 'dependencies': [ - 'core.gyp:core', - 'effects.gyp:effects', - 'images.gyp:images', + 'skia_lib.gyp:skia_lib', 'zlib.gyp:zlib', ], }, @@ -96,7 +94,7 @@ '../experimental/PdfViewer/pdfparser/native/autogen', ], 'dependencies': [ - 'core.gyp:core', + 'skia_lib.gyp:skia_lib', 'flags.gyp:flags', 'libpdfviewer', 'chop_transparency', -- cgit v1.2.3 From c8cdcb410e6396ec82000b4813815e8020d1308b Mon Sep 17 00:00:00 2001 From: "commit-bot@chromium.org" Date: Thu, 8 Aug 2013 19:20:05 +0000 Subject: Adding 2 functions to the Skia API I need wrappers for both SkOrderedReadBuffer and SkOrderedWriteBuffer inside Chromium in order to do the IPC serialization of Skia SkImageFilter objects. See https://codereview.chromium.org/21271002/ BUG= R=djsollen@google.com, scroggo@google.com, reed@google.com Author: sugoi@chromium.org Review URL: https://chromiumcodereview.appspot.com/22591002 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@10642 2bbb7eff-a529-9590-31e7-b0007b416f81 --- core.gypi | 2 ++ 1 file changed, 2 insertions(+) diff --git a/core.gypi b/core.gypi index 5c3fdf5..d3d998e 100644 --- a/core.gypi +++ b/core.gypi @@ -87,6 +87,7 @@ '<(skia_src_path)/core/SkFilterShader.cpp', '<(skia_src_path)/core/SkFlattenable.cpp', '<(skia_src_path)/core/SkFlattenableBuffers.cpp', + '<(skia_src_path)/core/SkFlattenableSerialization.cpp', '<(skia_src_path)/core/SkFloat.cpp', '<(skia_src_path)/core/SkFloat.h', '<(skia_src_path)/core/SkFloatBits.cpp', @@ -235,6 +236,7 @@ '<(skia_include_path)/core/SkError.h', '<(skia_include_path)/core/SkFixed.h', '<(skia_include_path)/core/SkFlattenable.h', + '<(skia_include_path)/core/SkFlattenableSerialization.h', '<(skia_include_path)/core/SkFloatBits.h', '<(skia_include_path)/core/SkFloatingPoint.h', '<(skia_include_path)/core/SkFontHost.h', -- cgit v1.2.3 From 9b7ecfb0a6e6cf5ef2ab56da8f2dc6b30a796f7b Mon Sep 17 00:00:00 2001 From: "commit-bot@chromium.org" Date: Thu, 8 Aug 2013 21:13:38 +0000 Subject: Add new GM to targeted at rect->clear optimization with different xfermodes. R=robertphillips@google.com Author: bsalomon@google.com Review URL: https://chromiumcodereview.appspot.com/22264010 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@10645 2bbb7eff-a529-9590-31e7-b0007b416f81 --- gmslides.gypi | 1 + 1 file changed, 1 insertion(+) diff --git a/gmslides.gypi b/gmslides.gypi index 71eb4d2..87c46e7 100644 --- a/gmslides.gypi +++ b/gmslides.gypi @@ -127,6 +127,7 @@ '../gm/xfermodeimagefilter.cpp', '../gm/xfermodes.cpp', '../gm/xfermodes2.cpp', + '../gm/xfermodes3.cpp', ], } -- cgit v1.2.3 From d898c5459b9117de55f1d48783b26c96367209dc Mon Sep 17 00:00:00 2001 From: "djsollen@google.com" Date: Mon, 12 Aug 2013 12:30:04 +0000 Subject: Update Skia Android tools. This CL moves the skia_launcher out of the system/bin and into /data/local/tmp; removes the need to package our shared libs in an apk; and updates all the scripts to work in the new environment. R=mtklein@google.com, scroggo@google.com Review URL: https://codereview.chromium.org/22617002 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@10673 2bbb7eff-a529-9590-31e7-b0007b416f81 --- apptype_console.gypi | 1 + most.gyp | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/apptype_console.gypi b/apptype_console.gypi index a306193..9a5e8a7 100644 --- a/apptype_console.gypi +++ b/apptype_console.gypi @@ -15,6 +15,7 @@ [ 'skia_os == "android"', { 'dependencies': [ 'android_deps.gyp:Android_EntryPoint', + 'android_system.gyp:skia_launcher', ], }], [ 'skia_os == "nacl"', { diff --git a/most.gyp b/most.gyp index bc6810a..cfe528e 100644 --- a/most.gyp +++ b/most.gyp @@ -22,7 +22,7 @@ ], 'conditions': [ ['skia_os == "android"', { - 'dependencies': [ 'android_system.gyp:SkiaAndroidApp' ], + 'dependencies': [ 'android_system.gyp:SampleApp_APK' ], }], ], }, -- cgit v1.2.3 From d147bb92759ec927a4cc53ab5817439991378fad Mon Sep 17 00:00:00 2001 From: "djsollen@google.com" Date: Mon, 12 Aug 2013 14:57:54 +0000 Subject: fix malformed gypi file that was missing commas R=torne@chromium.org Review URL: https://codereview.chromium.org/22841003 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@10678 2bbb7eff-a529-9590-31e7-b0007b416f81 --- public_headers.gypi | 598 ++++++++++++++++++++++++++-------------------------- 1 file changed, 299 insertions(+), 299 deletions(-) diff --git a/public_headers.gypi b/public_headers.gypi index d9c85cd..10f30e5 100644 --- a/public_headers.gypi +++ b/public_headers.gypi @@ -1,310 +1,310 @@ # Include this gypi to include all public header files that exist in the # include directory. # -# The list is computed by running 'find include -name *.h'' in the root dir of +# The list is computed by running 'find include -name *.h' in the root dir of # the project. # { 'variables': { 'header_filenames': [ - 'pdf/SkPDFDevice.h' - 'pdf/SkPDFDocument.h' - 'svg/SkSVGTypes.h' - 'svg/SkSVGBase.h' - 'svg/SkSVGAttribute.h' - 'svg/SkSVGParser.h' - 'svg/SkSVGPaintState.h' - 'animator/SkAnimator.h' - 'animator/SkAnimatorView.h' - 'gpu/GrTexture.h' - 'gpu/SkGr.h' - 'gpu/GrContext.h' - 'gpu/gl/GrGLConfig_chrome.h' - 'gpu/gl/SkNativeGLContext.h' - 'gpu/gl/SkMesaGLContext.h' - 'gpu/gl/SkDebugGLContext.h' - 'gpu/gl/SkANGLEGLContext.h' - 'gpu/gl/GrGLConfig.h' - 'gpu/gl/GrGLInterface.h' - 'gpu/gl/SkNullGLContext.h' - 'gpu/gl/GrGLFunctions.h' - 'gpu/gl/SkGLContextHelper.h' - 'gpu/gl/GrGLExtensions.h' - 'gpu/SkGpuDevice.h' - 'gpu/GrTypes.h' - 'gpu/GrFontScaler.h' - 'gpu/GrResource.h' - 'gpu/GrRefCnt.h' - 'gpu/GrKey.h' - 'gpu/GrOvalRenderer.h' - 'gpu/GrEffectUnitTest.h' - 'gpu/GrConfig.h' - 'gpu/GrPaint.h' - 'gpu/GrPathRendererChain.h' - 'gpu/GrTBackendEffectFactory.h' - 'gpu/GrDrawEffect.h' - 'gpu/GrTextContext.h' - 'gpu/GrEffect.h' - 'gpu/GrNoncopyable.h' - 'gpu/SkGrTexturePixelRef.h' - 'gpu/GrTextureAccess.h' - 'gpu/GrRect.h' - 'gpu/GrEffectStage.h' - 'gpu/GrClipData.h' - 'gpu/GrUserConfig.h' - 'gpu/SkGrPixelRef.h' - 'gpu/GrAARectRenderer.h' - 'gpu/GrColor.h' - 'gpu/GrGlyph.h' - 'gpu/GrBackendEffectFactory.h' - 'gpu/GrContextFactory.h' - 'gpu/GrRenderTarget.h' - 'gpu/GrSurface.h' - 'gpu/GrTypesPriv.h' - 'gpu/GrPoint.h' - 'config/sk_stdint.h' - 'config/SkUserConfig.h' - 'pipe/SkGPipe.h' - 'images/SkImageRef.h' - 'images/SkMovie.h' - 'images/SkPageFlipper.h' - 'images/SkForceLinking.h' - 'images/SkImageRef_GlobalPool.h' - 'images/SkImages.h' - 'effects/SkMorphologyImageFilter.h' - 'effects/Sk2DPathEffect.h' - 'effects/SkXfermodeImageFilter.h' - 'effects/SkArithmeticMode.h' - 'effects/SkMergeImageFilter.h' - 'effects/SkPerlinNoiseShader.h' - 'effects/SkLerpXfermode.h' - 'effects/SkRectShaderImageFilter.h' - 'effects/SkMagnifierImageFilter.h' - 'effects/SkBicubicImageFilter.h' - 'effects/SkPorterDuff.h' - 'effects/SkBlurImageFilter.h' - 'effects/SkKernel33MaskFilter.h' - 'effects/SkTableMaskFilter.h' - 'effects/SkAvoidXfermode.h' - 'effects/SkBitmapSource.h' - 'effects/SkCornerPathEffect.h' - 'effects/SkTransparentShader.h' - 'effects/SkStippleMaskFilter.h' - 'effects/SkPaintFlagsDrawFilter.h' - 'effects/SkOffsetImageFilter.h' - 'effects/SkDiscretePathEffect.h' - 'effects/SkTableColorFilter.h' - 'effects/SkGradientShader.h' - 'effects/SkEmbossMaskFilter.h' - 'effects/SkComposeImageFilter.h' - 'effects/SkTestImageFilters.h' - 'effects/SkLayerRasterizer.h' - 'effects/SkDashPathEffect.h' - 'effects/Sk1DPathEffect.h' - 'effects/SkBlurMaskFilter.h' - 'effects/SkDrawExtraPathEffect.h' - 'effects/SkDisplacementMapEffect.h' - 'effects/SkPixelXorXfermode.h' - 'effects/SkColorMatrixFilter.h' - 'effects/SkColorMatrix.h' - 'effects/SkBlurDrawLooper.h' - 'effects/SkColorFilterImageFilter.h' - 'effects/SkLayerDrawLooper.h' - 'effects/SkLightingImageFilter.h' - 'effects/SkDropShadowImageFilter.h' - 'effects/SkMatrixConvolutionImageFilter.h' - 'utils/win/SkAutoCoInitialize.h' - 'utils/win/SkHRESULT.h' - 'utils/win/SkIStream.h' - 'utils/win/SkTScopedComPtr.h' - 'utils/SkBoundaryPatch.h' - 'utils/SkUnitMappers.h' - 'utils/SkPictureUtils.h' - 'utils/SkRandom.h' - 'utils/SkMeshUtils.h' - 'utils/SkCullPoints.h' - 'utils/SkCamera.h' - 'utils/SkLua.h' - 'utils/SkParsePaint.h' - 'utils/SkCountdown.h' - 'utils/SkRunnable.h' - 'utils/SkParse.h' - 'utils/SkThreadPool.h' - 'utils/SkMatrix44.h' - 'utils/SkInterpolator.h' - 'utils/SkWGL.h' - 'utils/SkDumpCanvas.h' - 'utils/SkRTConf.h' - 'utils/SkCubicInterval.h' - 'utils/SkLuaCanvas.h' - 'utils/SkDebugUtils.h' - 'utils/SkLayer.h' - 'utils/SkProxyCanvas.h' - 'utils/SkNWayCanvas.h' - 'utils/SkPathUtils.h' - 'utils/SkDeferredCanvas.h' - 'utils/ios/SkStream_NSData.h' - 'utils/SkNullCanvas.h' - 'utils/SkParsePath.h' - 'utils/SkJSON.h' - 'utils/SkCondVar.h' - 'utils/SkNinePatch.h' - 'utils/mac/SkCGUtils.h' - 'xml/SkDOM.h' - 'xml/SkJS.h' - 'xml/SkXMLParser.h' - 'xml/SkBML_XMLParser.h' - 'xml/SkBML_WXMLParser.h' - 'xml/SkXMLWriter.h' - 'device/xps/SkXPSDevice.h' - 'device/xps/SkConstexprMath.h' - 'ports/SkTypeface_win.h' - 'ports/SkHarfBuzzFont.h' - 'ports/SkFontConfigInterface.h' - 'ports/SkTypeface_mac.h' - 'ports/SkTypeface_android.h' - 'ports/SkFontStyle.h' - 'ports/SkFontMgr.h' - 'text/SkTextLayout.h' - 'core/SkColor.h' - 'core/SkFontHost.h' - 'core/SkMetaData.h' - 'core/SkRRect.h' - 'core/SkMatrix.h' - 'core/SkDataTable.h' - 'core/SkScalar.h' - 'core/SkFlattenableSerialization.h' - 'core/SkTypeface.h' - 'core/SkImageEncoder.h' - 'core/SkDrawFilter.h' - 'core/SkTDict.h' - 'core/SkRasterizer.h' - 'core/SkColorPriv.h' - 'core/SkFloatingPoint.h' - 'core/SkOSFile.h' - 'core/SkPaint.h' - 'core/SkTDStack.h' - 'core/SkDither.h' - 'core/SkFixed.h' - 'core/SkDocument.h' - 'core/SkInstCnt.h' - 'core/SkEndian.h' - 'core/SkColorTable.h' - 'core/SkBitmap.h' - 'core/SkDraw.h' - 'core/SkPackBits.h' - 'core/SkFloatBits.h' - 'core/SkDeque.h' - 'core/SkTRegistry.h' - 'core/Sk64.h' - 'core/SkTLazy.h' - 'core/SkComposeShader.h' - 'core/SkUtils.h' - 'core/SkImage.h' - 'core/SkTileGridPicture.h' - 'core/SkPaintOptionsAndroid.h' - 'core/SkDeviceProperties.h' - 'core/SkGraphics.h' - 'core/SkCanvas.h' - 'core/SkPicture.h' - 'core/SkClipStack.h' - 'core/SkTScopedPtr.h' - 'core/SkXfermode.h' - 'core/SkColorFilter.h' - 'core/SkRegion.h' - 'core/SkRefCnt.h' - 'core/SkStream.h' - 'core/SkFontLCDConfig.h' - 'core/SkBlitRow.h' - 'core/SkGeometry.h' - 'core/SkStrokeRec.h' - 'core/SkImageDecoder.h' - 'core/SkTime.h' - 'core/SkImageTypes.h' - 'core/SkScalarCompare.h' - 'core/SkPathMeasure.h' - 'core/SkMaskFilter.h' - 'core/SkBounder.h' - 'core/SkFlate.h' - 'core/SkTDArray.h' - 'core/SkAnnotation.h' - 'core/SkChecksum.h' - 'core/SkMath.h' - 'core/SkDrawLooper.h' - 'core/SkThread_platform.h' - 'core/SkFlattenableBuffers.h' - 'core/SkTemplates.h' - 'core/SkMask.h' - 'core/SkMallocPixelRef.h' - 'core/SkWeakRefCnt.h' - 'core/SkTypes.h' - 'core/SkThread.h' - 'core/SkData.h' - 'core/SkPoint.h' - 'core/SkColorShader.h' - 'core/SkChunkAlloc.h' - 'core/SkUnPreMultiply.h' - 'core/SkReader32.h' - 'core/SkDevice.h' - 'core/SkImageFilter.h' - 'core/SkAdvancedTypefaceMetrics.h' - 'core/SkTInternalLList.h' - 'core/SkTArray.h' - 'core/SkStringUtils.h' - 'core/SkPreConfig.h' - 'core/SkImageFilterUtils.h' - 'core/SkLineClipper.h' - 'core/SkDataSet.h' - 'core/SkPathEffect.h' - 'core/SkString.h' - 'core/SkPixelRef.h' - 'core/SkSize.h' - 'core/SkEmptyShader.h' - 'core/SkSurface.h' - 'core/SkPostConfig.h' - 'core/SkShader.h' - 'core/SkWriter32.h' - 'core/SkError.h' - 'core/SkPath.h' - 'core/SkTrace.h' - 'core/SkUnitMapper.h' - 'core/SkFlattenable.h' - 'core/SkTSearch.h' - 'core/SkRect.h' - 'pathops/SkPathOps.h' - 'views/SkTouchGesture.h' - 'views/SkEvent.h' - 'views/SkOSWindow_NaCl.h' - 'views/SkTextBox.h' - 'views/SkViewInflate.h' - 'views/SkOSWindow_iOS.h' - 'views/SkBGViewArtist.h' - 'views/SkOSWindow_SDL.h' - 'views/SkWindow.h' - 'views/SkSystemEventTypes.h' - 'views/SkOSWindow_Android.h' - 'views/SkOSWindow_Mac.h' - 'views/android/AndroidKeyToSkKey.h' - 'views/SkEventSink.h' - 'views/animated/SkImageView.h' - 'views/animated/SkWidgetViews.h' - 'views/animated/SkProgressBarView.h' - 'views/animated/SkBorderView.h' - 'views/animated/SkScrollBarView.h' - 'views/SkStackViewLayout.h' - 'views/SkApplication.h' - 'views/unix/keysym2ucs.h' - 'views/unix/XkeysToSkKeys.h' - 'views/SkKey.h' - 'views/SkView.h' - 'views/SkOSMenu.h' - 'views/SkOSWindow_Unix.h' - 'views/SkWidget.h' - 'views/SkOSWindow_Win.h' - 'lazy/SkBitmapFactory.h' - 'lazy/SkImageCache.h' - 'lazy/SkPurgeableImageCache.h' - 'lazy/SkLruImageCache.h' + 'pdf/SkPDFDevice.h', + 'pdf/SkPDFDocument.h', + 'svg/SkSVGTypes.h', + 'svg/SkSVGBase.h', + 'svg/SkSVGAttribute.h', + 'svg/SkSVGParser.h', + 'svg/SkSVGPaintState.h', + 'animator/SkAnimator.h', + 'animator/SkAnimatorView.h', + 'gpu/GrTexture.h', + 'gpu/SkGr.h', + 'gpu/GrContext.h', + 'gpu/gl/GrGLConfig_chrome.h', + 'gpu/gl/SkNativeGLContext.h', + 'gpu/gl/SkMesaGLContext.h', + 'gpu/gl/SkDebugGLContext.h', + 'gpu/gl/SkANGLEGLContext.h', + 'gpu/gl/GrGLConfig.h', + 'gpu/gl/GrGLInterface.h', + 'gpu/gl/SkNullGLContext.h', + 'gpu/gl/GrGLFunctions.h', + 'gpu/gl/SkGLContextHelper.h', + 'gpu/gl/GrGLExtensions.h', + 'gpu/SkGpuDevice.h', + 'gpu/GrTypes.h', + 'gpu/GrFontScaler.h', + 'gpu/GrResource.h', + 'gpu/GrRefCnt.h', + 'gpu/GrKey.h', + 'gpu/GrOvalRenderer.h', + 'gpu/GrEffectUnitTest.h', + 'gpu/GrConfig.h', + 'gpu/GrPaint.h', + 'gpu/GrPathRendererChain.h', + 'gpu/GrTBackendEffectFactory.h', + 'gpu/GrDrawEffect.h', + 'gpu/GrTextContext.h', + 'gpu/GrEffect.h', + 'gpu/GrNoncopyable.h', + 'gpu/SkGrTexturePixelRef.h', + 'gpu/GrTextureAccess.h', + 'gpu/GrRect.h', + 'gpu/GrEffectStage.h', + 'gpu/GrClipData.h', + 'gpu/GrUserConfig.h', + 'gpu/SkGrPixelRef.h', + 'gpu/GrAARectRenderer.h', + 'gpu/GrColor.h', + 'gpu/GrGlyph.h', + 'gpu/GrBackendEffectFactory.h', + 'gpu/GrContextFactory.h', + 'gpu/GrRenderTarget.h', + 'gpu/GrSurface.h', + 'gpu/GrTypesPriv.h', + 'gpu/GrPoint.h', + 'config/sk_stdint.h', + 'config/SkUserConfig.h', + 'pipe/SkGPipe.h', + 'images/SkImageRef.h', + 'images/SkMovie.h', + 'images/SkPageFlipper.h', + 'images/SkForceLinking.h', + 'images/SkImageRef_GlobalPool.h', + 'images/SkImages.h', + 'effects/SkMorphologyImageFilter.h', + 'effects/Sk2DPathEffect.h', + 'effects/SkXfermodeImageFilter.h', + 'effects/SkArithmeticMode.h', + 'effects/SkMergeImageFilter.h', + 'effects/SkPerlinNoiseShader.h', + 'effects/SkLerpXfermode.h', + 'effects/SkRectShaderImageFilter.h', + 'effects/SkMagnifierImageFilter.h', + 'effects/SkBicubicImageFilter.h', + 'effects/SkPorterDuff.h', + 'effects/SkBlurImageFilter.h', + 'effects/SkKernel33MaskFilter.h', + 'effects/SkTableMaskFilter.h', + 'effects/SkAvoidXfermode.h', + 'effects/SkBitmapSource.h', + 'effects/SkCornerPathEffect.h', + 'effects/SkTransparentShader.h', + 'effects/SkStippleMaskFilter.h', + 'effects/SkPaintFlagsDrawFilter.h', + 'effects/SkOffsetImageFilter.h', + 'effects/SkDiscretePathEffect.h', + 'effects/SkTableColorFilter.h', + 'effects/SkGradientShader.h', + 'effects/SkEmbossMaskFilter.h', + 'effects/SkComposeImageFilter.h', + 'effects/SkTestImageFilters.h', + 'effects/SkLayerRasterizer.h', + 'effects/SkDashPathEffect.h', + 'effects/Sk1DPathEffect.h', + 'effects/SkBlurMaskFilter.h', + 'effects/SkDrawExtraPathEffect.h', + 'effects/SkDisplacementMapEffect.h', + 'effects/SkPixelXorXfermode.h', + 'effects/SkColorMatrixFilter.h', + 'effects/SkColorMatrix.h', + 'effects/SkBlurDrawLooper.h', + 'effects/SkColorFilterImageFilter.h', + 'effects/SkLayerDrawLooper.h', + 'effects/SkLightingImageFilter.h', + 'effects/SkDropShadowImageFilter.h', + 'effects/SkMatrixConvolutionImageFilter.h', + 'utils/win/SkAutoCoInitialize.h', + 'utils/win/SkHRESULT.h', + 'utils/win/SkIStream.h', + 'utils/win/SkTScopedComPtr.h', + 'utils/SkBoundaryPatch.h', + 'utils/SkUnitMappers.h', + 'utils/SkPictureUtils.h', + 'utils/SkRandom.h', + 'utils/SkMeshUtils.h', + 'utils/SkCullPoints.h', + 'utils/SkCamera.h', + 'utils/SkLua.h', + 'utils/SkParsePaint.h', + 'utils/SkCountdown.h', + 'utils/SkRunnable.h', + 'utils/SkParse.h', + 'utils/SkThreadPool.h', + 'utils/SkMatrix44.h', + 'utils/SkInterpolator.h', + 'utils/SkWGL.h', + 'utils/SkDumpCanvas.h', + 'utils/SkRTConf.h', + 'utils/SkCubicInterval.h', + 'utils/SkLuaCanvas.h', + 'utils/SkDebugUtils.h', + 'utils/SkLayer.h', + 'utils/SkProxyCanvas.h', + 'utils/SkNWayCanvas.h', + 'utils/SkPathUtils.h', + 'utils/SkDeferredCanvas.h', + 'utils/ios/SkStream_NSData.h', + 'utils/SkNullCanvas.h', + 'utils/SkParsePath.h', + 'utils/SkJSON.h', + 'utils/SkCondVar.h', + 'utils/SkNinePatch.h', + 'utils/mac/SkCGUtils.h', + 'xml/SkDOM.h', + 'xml/SkJS.h', + 'xml/SkXMLParser.h', + 'xml/SkBML_XMLParser.h', + 'xml/SkBML_WXMLParser.h', + 'xml/SkXMLWriter.h', + 'device/xps/SkXPSDevice.h', + 'device/xps/SkConstexprMath.h', + 'ports/SkTypeface_win.h', + 'ports/SkHarfBuzzFont.h', + 'ports/SkFontConfigInterface.h', + 'ports/SkTypeface_mac.h', + 'ports/SkTypeface_android.h', + 'ports/SkFontStyle.h', + 'ports/SkFontMgr.h', + 'text/SkTextLayout.h', + 'core/SkColor.h', + 'core/SkFontHost.h', + 'core/SkMetaData.h', + 'core/SkRRect.h', + 'core/SkMatrix.h', + 'core/SkDataTable.h', + 'core/SkScalar.h', + 'core/SkFlattenableSerialization.h', + 'core/SkTypeface.h', + 'core/SkImageEncoder.h', + 'core/SkDrawFilter.h', + 'core/SkTDict.h', + 'core/SkRasterizer.h', + 'core/SkColorPriv.h', + 'core/SkFloatingPoint.h', + 'core/SkOSFile.h', + 'core/SkPaint.h', + 'core/SkTDStack.h', + 'core/SkDither.h', + 'core/SkFixed.h', + 'core/SkDocument.h', + 'core/SkInstCnt.h', + 'core/SkEndian.h', + 'core/SkColorTable.h', + 'core/SkBitmap.h', + 'core/SkDraw.h', + 'core/SkPackBits.h', + 'core/SkFloatBits.h', + 'core/SkDeque.h', + 'core/SkTRegistry.h', + 'core/Sk64.h', + 'core/SkTLazy.h', + 'core/SkComposeShader.h', + 'core/SkUtils.h', + 'core/SkImage.h', + 'core/SkTileGridPicture.h', + 'core/SkPaintOptionsAndroid.h', + 'core/SkDeviceProperties.h', + 'core/SkGraphics.h', + 'core/SkCanvas.h', + 'core/SkPicture.h', + 'core/SkClipStack.h', + 'core/SkTScopedPtr.h', + 'core/SkXfermode.h', + 'core/SkColorFilter.h', + 'core/SkRegion.h', + 'core/SkRefCnt.h', + 'core/SkStream.h', + 'core/SkFontLCDConfig.h', + 'core/SkBlitRow.h', + 'core/SkGeometry.h', + 'core/SkStrokeRec.h', + 'core/SkImageDecoder.h', + 'core/SkTime.h', + 'core/SkImageTypes.h', + 'core/SkScalarCompare.h', + 'core/SkPathMeasure.h', + 'core/SkMaskFilter.h', + 'core/SkBounder.h', + 'core/SkFlate.h', + 'core/SkTDArray.h', + 'core/SkAnnotation.h', + 'core/SkChecksum.h', + 'core/SkMath.h', + 'core/SkDrawLooper.h', + 'core/SkThread_platform.h', + 'core/SkFlattenableBuffers.h', + 'core/SkTemplates.h', + 'core/SkMask.h', + 'core/SkMallocPixelRef.h', + 'core/SkWeakRefCnt.h', + 'core/SkTypes.h', + 'core/SkThread.h', + 'core/SkData.h', + 'core/SkPoint.h', + 'core/SkColorShader.h', + 'core/SkChunkAlloc.h', + 'core/SkUnPreMultiply.h', + 'core/SkReader32.h', + 'core/SkDevice.h', + 'core/SkImageFilter.h', + 'core/SkAdvancedTypefaceMetrics.h', + 'core/SkTInternalLList.h', + 'core/SkTArray.h', + 'core/SkStringUtils.h', + 'core/SkPreConfig.h', + 'core/SkImageFilterUtils.h', + 'core/SkLineClipper.h', + 'core/SkDataSet.h', + 'core/SkPathEffect.h', + 'core/SkString.h', + 'core/SkPixelRef.h', + 'core/SkSize.h', + 'core/SkEmptyShader.h', + 'core/SkSurface.h', + 'core/SkPostConfig.h', + 'core/SkShader.h', + 'core/SkWriter32.h', + 'core/SkError.h', + 'core/SkPath.h', + 'core/SkTrace.h', + 'core/SkUnitMapper.h', + 'core/SkFlattenable.h', + 'core/SkTSearch.h', + 'core/SkRect.h', + 'pathops/SkPathOps.h', + 'views/SkTouchGesture.h', + 'views/SkEvent.h', + 'views/SkOSWindow_NaCl.h', + 'views/SkTextBox.h', + 'views/SkViewInflate.h', + 'views/SkOSWindow_iOS.h', + 'views/SkBGViewArtist.h', + 'views/SkOSWindow_SDL.h', + 'views/SkWindow.h', + 'views/SkSystemEventTypes.h', + 'views/SkOSWindow_Android.h', + 'views/SkOSWindow_Mac.h', + 'views/android/AndroidKeyToSkKey.h', + 'views/SkEventSink.h', + 'views/animated/SkImageView.h', + 'views/animated/SkWidgetViews.h', + 'views/animated/SkProgressBarView.h', + 'views/animated/SkBorderView.h', + 'views/animated/SkScrollBarView.h', + 'views/SkStackViewLayout.h', + 'views/SkApplication.h', + 'views/unix/keysym2ucs.h', + 'views/unix/XkeysToSkKeys.h', + 'views/SkKey.h', + 'views/SkView.h', + 'views/SkOSMenu.h', + 'views/SkOSWindow_Unix.h', + 'views/SkWidget.h', + 'views/SkOSWindow_Win.h', + 'lazy/SkBitmapFactory.h', + 'lazy/SkImageCache.h', + 'lazy/SkPurgeableImageCache.h', + 'lazy/SkLruImageCache.h', ], }, } -- cgit v1.2.3 -- cgit v1.2.3 From ffdb65f5c5352876c0e6d384b0bc70f6dea18078 Mon Sep 17 00:00:00 2001 From: "bsalomon@google.com" Date: Tue, 27 Aug 2013 21:45:39 +0000 Subject: Merge r10804 from trunk to branches/chrome/m30_1599 git-svn-id: http://skia.googlecode.com/svn/branches/chrome/m30_1599/gyp@10962 2bbb7eff-a529-9590-31e7-b0007b416f81 --- gmslides.gypi | 1 + 1 file changed, 1 insertion(+) diff --git a/gmslides.gypi b/gmslides.gypi index 87c46e7..db0e286 100644 --- a/gmslides.gypi +++ b/gmslides.gypi @@ -77,6 +77,7 @@ '../gm/mixedxfermodes.cpp', '../gm/modecolorfilters.cpp', '../gm/morphology.cpp', + '../gm/nested.cpp', '../gm/ninepatchstretch.cpp', '../gm/nocolorbleed.cpp', '../gm/optimizations.cpp', -- cgit v1.2.3 From f241a2a431570ba2dde614ae696a9ce441cce60f Mon Sep 17 00:00:00 2001 From: "djsollen@google.com" Date: Wed, 4 Sep 2013 15:51:35 +0000 Subject: cherrypick rev 10981 into branch m30_1599 to fix http://crbug.com/278141 git-svn-id: http://skia.googlecode.com/svn/branches/chrome/m30_1599/gyp@11077 2bbb7eff-a529-9590-31e7-b0007b416f81 --- core.gypi | 1 + 1 file changed, 1 insertion(+) diff --git a/core.gypi b/core.gypi index d3d998e..1d11f17 100644 --- a/core.gypi +++ b/core.gypi @@ -70,6 +70,7 @@ '<(skia_src_path)/core/SkDebug.cpp', '<(skia_src_path)/core/SkDeque.cpp', '<(skia_src_path)/core/SkDevice.cpp', + '<(skia_src_path)/core/SkDeviceLooper.cpp', '<(skia_src_path)/core/SkDeviceProfile.cpp', '<(skia_src_path)/core/SkDither.cpp', '<(skia_src_path)/core/SkDraw.cpp', -- cgit v1.2.3 From af440b3593bb378469f0de7c8ae650e94e0588e6 Mon Sep 17 00:00:00 2001 From: "djsollen@google.com" Date: Wed, 11 Sep 2013 13:45:33 +0000 Subject: cherrypick rev 11013 into branch m30_1599 to fix http://crbug.com/286073 git-svn-id: http://skia.googlecode.com/svn/branches/chrome/m30_1599/gyp@11195 2bbb7eff-a529-9590-31e7-b0007b416f81 --- tests.gyp | 1 + utils.gyp | 2 ++ 2 files changed, 3 insertions(+) diff --git a/tests.gyp b/tests.gyp index f58b0ab..916f3e2 100644 --- a/tests.gyp +++ b/tests.gyp @@ -34,6 +34,7 @@ '../tests/BlitRowTest.cpp', '../tests/BlurTest.cpp', '../tests/CanvasTest.cpp', + '../tests/CanvasStateTest.cpp', '../tests/ChecksumTest.cpp', '../tests/ClampRangeTest.cpp', '../tests/ClipCacheTest.cpp', diff --git a/utils.gyp b/utils.gyp index 68bf6b6..df12b79 100644 --- a/utils.gyp +++ b/utils.gyp @@ -35,6 +35,7 @@ '../include/utils/SkBoundaryPatch.h', '../include/utils/SkCamera.h', + '../include/utils/SkCanvasStateUtils.h', '../include/utils/SkCubicInterval.h', '../include/utils/SkCullPoints.h', '../include/utils/SkDebugUtils.h', @@ -65,6 +66,7 @@ '../src/utils/SkBitSet.h', '../src/utils/SkBoundaryPatch.cpp', '../src/utils/SkCamera.cpp', + '../src/utils/SkCanvasStateUtils.cpp', '../src/utils/SkCubicInterval.cpp', '../src/utils/SkCullPoints.cpp', '../src/utils/SkDeferredCanvas.cpp', -- cgit v1.2.3 From 21e2d90077b889f17dd1ca74b3cb6f76aa8b1a87 Mon Sep 17 00:00:00 2001 From: "djsollen@google.com" Date: Wed, 11 Sep 2013 13:50:53 +0000 Subject: cherrypick rev 11081 into branch m30_1599 to fix http://crbug.com/286073 git-svn-id: http://skia.googlecode.com/svn/branches/chrome/m30_1599/gyp@11196 2bbb7eff-a529-9590-31e7-b0007b416f81 --- utils.gyp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/utils.gyp b/utils.gyp index df12b79..d3bac16 100644 --- a/utils.gyp +++ b/utils.gyp @@ -66,6 +66,8 @@ '../src/utils/SkBitSet.h', '../src/utils/SkBoundaryPatch.cpp', '../src/utils/SkCamera.cpp', + '../src/utils/SkCanvasStack.h', + '../src/utils/SkCanvasStack.cpp', '../src/utils/SkCanvasStateUtils.cpp', '../src/utils/SkCubicInterval.cpp', '../src/utils/SkCullPoints.cpp', -- cgit v1.2.3 From 4558d6c52772c6ef6638a45a6bd9fb852a01148b Mon Sep 17 00:00:00 2001 From: "reed@google.com" Date: Fri, 27 Sep 2013 16:19:58 +0000 Subject: Hack to make it compile, given that we're missing SkBitmapDevice.h R=djsollen@google.com Review URL: https://codereview.chromium.org/25037005 git-svn-id: http://skia.googlecode.com/svn/branches/chrome/m30_1599/gyp@11503 2bbb7eff-a529-9590-31e7-b0007b416f81 --- tests.gyp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests.gyp b/tests.gyp index 916f3e2..0a53617 100644 --- a/tests.gyp +++ b/tests.gyp @@ -34,7 +34,7 @@ '../tests/BlitRowTest.cpp', '../tests/BlurTest.cpp', '../tests/CanvasTest.cpp', - '../tests/CanvasStateTest.cpp', +# '../tests/CanvasStateTest.cpp', '../tests/ChecksumTest.cpp', '../tests/ClampRangeTest.cpp', '../tests/ClipCacheTest.cpp', -- cgit v1.2.3