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 --- gm.gyp | 52 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 52 insertions(+) create mode 100644 gm.gyp (limited to 'gm.gyp') 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: -- 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(+) (limited to 'gm.gyp') 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 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 +------- 1 file changed, 1 insertion(+), 7 deletions(-) (limited to 'gm.gyp') 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', ], }, -- 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(+) (limited to 'gm.gyp') 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 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 --- gm.gyp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gm.gyp') 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': [ { -- 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(+) (limited to 'gm.gyp') 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(+) (limited to 'gm.gyp') 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 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(+) (limited to 'gm.gyp') 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 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 --- gm.gyp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'gm.gyp') 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 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(+) (limited to 'gm.gyp') 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(+) (limited to 'gm.gyp') 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 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 --- gm.gyp | 1 + 1 file changed, 1 insertion(+) (limited to 'gm.gyp') 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 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 --- gm.gyp | 1 + 1 file changed, 1 insertion(+) (limited to 'gm.gyp') 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 + 1 file changed, 1 insertion(+) (limited to 'gm.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', ], }, ], -- 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(-) (limited to 'gm.gyp') 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 --- gm.gyp | 1 + 1 file changed, 1 insertion(+) (limited to 'gm.gyp') 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 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 --- gm.gyp | 30 ++++-------------------------- 1 file changed, 4 insertions(+), 26 deletions(-) (limited to 'gm.gyp') 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', -- 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 --- gm.gyp | 1 + 1 file changed, 1 insertion(+) (limited to 'gm.gyp') 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', ], -- 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(-) (limited to 'gm.gyp') 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 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 --- gm.gyp | 1 - 1 file changed, 1 deletion(-) (limited to 'gm.gyp') 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': [ { -- 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 --- gm.gyp | 3 +++ 1 file changed, 3 insertions(+) (limited to 'gm.gyp') 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', ], -- 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 --- gm.gyp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gm.gyp') 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 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(+) (limited to 'gm.gyp') 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(+) (limited to 'gm.gyp') 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 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(+) (limited to 'gm.gyp') 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 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 --- gm.gyp | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) (limited to 'gm.gyp') 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', + ], + }], + ], }, ], } -- 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 --- gm.gyp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gm.gyp') 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"', { -- 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 --- gm.gyp | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) (limited to 'gm.gyp') 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', - ], }], ], }, -- 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(+) (limited to 'gm.gyp') 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(-) (limited to 'gm.gyp') 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 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 +++ 1 file changed, 3 insertions(+) (limited to 'gm.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"', { -- 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 --- gm.gyp | 1 + 1 file changed, 1 insertion(+) (limited to 'gm.gyp') 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 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 --- gm.gyp | 1 + 1 file changed, 1 insertion(+) (limited to 'gm.gyp') 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', -- 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 --- gm.gyp | 1 - 1 file changed, 1 deletion(-) (limited to 'gm.gyp') 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', -- 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 --- gm.gyp | 1 + 1 file changed, 1 insertion(+) (limited to 'gm.gyp') 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', -- 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 --- gm.gyp | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'gm.gyp') 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', ], -- 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 --- gm.gyp | 9 --------- 1 file changed, 9 deletions(-) (limited to 'gm.gyp') 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', ], -- 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 --- gm.gyp | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'gm.gyp') 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', ], -- 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(+) (limited to 'gm.gyp') 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 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 +++++++++++++++++++++++++- 1 file changed, 25 insertions(+), 1 deletion(-) (limited to 'gm.gyp') 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', -- 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 --- gm.gyp | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'gm.gyp') diff --git a/gm.gyp b/gm.gyp index fa413c3..a8b1533 100644 --- a/gm.gyp +++ b/gm.gyp @@ -16,7 +16,7 @@ '../gm/gm_expectations.cpp', ], 'dependencies': [ - 'skia_base_libs.gyp:skia_base_libs', + 'skia_lib.gyp:skia_lib', 'core.gyp:core', 'images.gyp:images', 'jsoncpp.gyp:jsoncpp', @@ -57,14 +57,11 @@ '../src/pipe/utils/SamplePipeControllers.cpp', ], 'dependencies': [ - 'skia_base_libs.gyp:skia_base_libs', - 'effects.gyp:effects', + 'skia_lib.gyp:skia_lib', 'flags.gyp:flags', 'gm.gyp:gm_expectations', - 'images.gyp:images', 'jsoncpp.gyp:jsoncpp', 'pdf.gyp:pdf', - 'utils.gyp:utils', ], 'conditions': [ ['skia_os == "mac"', { -- cgit v1.2.3 From d07b4b787bb4cf3bd3c8ffe0caeceb755a6feb71 Mon Sep 17 00:00:00 2001 From: "djsollen@google.com" 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 --- gm.gyp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'gm.gyp') diff --git a/gm.gyp b/gm.gyp index a8b1533..fa413c3 100644 --- a/gm.gyp +++ b/gm.gyp @@ -16,7 +16,7 @@ '../gm/gm_expectations.cpp', ], 'dependencies': [ - 'skia_lib.gyp:skia_lib', + 'skia_base_libs.gyp:skia_base_libs', 'core.gyp:core', 'images.gyp:images', 'jsoncpp.gyp:jsoncpp', @@ -57,11 +57,14 @@ '../src/pipe/utils/SamplePipeControllers.cpp', ], 'dependencies': [ - 'skia_lib.gyp:skia_lib', + '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', + 'utils.gyp:utils', ], 'conditions': [ ['skia_os == "mac"', { -- 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 --- gm.gyp | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'gm.gyp') diff --git a/gm.gyp b/gm.gyp index fa413c3..a8b1533 100644 --- a/gm.gyp +++ b/gm.gyp @@ -16,7 +16,7 @@ '../gm/gm_expectations.cpp', ], 'dependencies': [ - 'skia_base_libs.gyp:skia_base_libs', + 'skia_lib.gyp:skia_lib', 'core.gyp:core', 'images.gyp:images', 'jsoncpp.gyp:jsoncpp', @@ -57,14 +57,11 @@ '../src/pipe/utils/SamplePipeControllers.cpp', ], 'dependencies': [ - 'skia_base_libs.gyp:skia_base_libs', - 'effects.gyp:effects', + 'skia_lib.gyp:skia_lib', 'flags.gyp:flags', 'gm.gyp:gm_expectations', - 'images.gyp:images', 'jsoncpp.gyp:jsoncpp', 'pdf.gyp:pdf', - 'utils.gyp:utils', ], 'conditions': [ ['skia_os == "mac"', { -- 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(-) (limited to 'gm.gyp') 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 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 --- gm.gyp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'gm.gyp') 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', -- 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 --- gm.gyp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gm.gyp') 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', -- 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 --- gm.gyp | 1 - 1 file changed, 1 deletion(-) (limited to 'gm.gyp') 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': [ -- cgit v1.2.3