Commit Graph

129 Commits

Author SHA1 Message Date
commit-bot@chromium.org
93f5e51621 Small fixes for auto generating Android.mk
Turn off -Wno-c++11-extensions for Android. The Android framework does
not support this flag. Using it gives a bunch of warnings when building,
so remove it.

Remove skia_chrome_utils from framework. They are experimental and not
used by Android.

BUG=skia:1975
R=djsollen@google.com, robertphillips@google.com

Author: scroggo@google.com

Review URL: https://codereview.chromium.org/164793002

git-svn-id: http://skia.googlecode.com/svn/trunk@13475 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-02-17 15:22:26 +00:00
commit-bot@chromium.org
35d4872f9a Gyp flag to disable inlining.
To turn off all inlining, rebuild after running the command

$ GYP_DEFINES=skia_disable_inlining=1 ./gyp_skia

Provides an initial value in one GM to avoid an uninitialized variable warning.

BUG=skia:2126
R=scroggo@google.com, mtklein@google.com, tomhudson@google.com

Author: tomhudson@chromium.org

Review URL: https://codereview.chromium.org/163363004

git-svn-id: http://skia.googlecode.com/svn/trunk@13437 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-02-13 18:36:36 +00:00
scroggo@google.com
d4adfa37fb Reland "Gyp file changes for the android framework."
Relands https://codereview.chromium.org/153093003/, which was reverted
with https://skia.googlesource.com/skia.git/+/eb6295044b97db05ec40625dcebc2459b2a38a98

This reverts commit 6b32be1402eb6c549d5ba1db71860e24f9de2991.

BUG=skia:1975
R=djsollen@google.com

Review URL: https://codereview.chromium.org/154053002

git-svn-id: http://skia.googlecode.com/svn/trunk@13321 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-02-05 16:35:12 +00:00
scroggo@google.com
eb6295044b Gyp file changes for the android framework.
Split off from https://codereview.chromium.org/140503007/.

The eventual goal is to create our Android.mk from gyp. This patch
adds an option for skia_android_framework with the right settings.
The follow-up (https://codereview.chromium.org/140503007/) will
use scripts to create the final makefile.

gyp/android_deps.gyp:
Use different dependencies for the framework than for building Skia
normally.

gyp/android_framework_lib.gyp:
Like skia_lib, specifies the minimum needed for building Skia, in this
case for the framework.

gyp/common_conditions.gypi:
Add settings specific to skia_android_framework. In some cases this
means turning off flags and defines.

gyp/common.gypi
Turn off SK_DEBUG and SK_DEVELOPER when building for the framework.
This allows the framework to create a single makefile which can be
modified to add SK_DEBUG and SK_DEVELOPER as desired.

gyp/common_variables.gypi:
Add skia_android_framework.

gyp/core.gyp:
Don't depend on cpufeatures, and add the cutils library for
skia_android_framework.

gyp/freetype.gyp:
skia_android_framework-specific options:
Don't include freetype_static as a dependency.
Include the proper folders.
Include the android library.

gyp/images.gyp:
Don't export libjpeg as a dependency for targets that include images
for the framework.
Also reorder image decoders to match the Android order, leaving our
most commonly used ones last (and therefore first in the chain for
trying them).

gyp/libwebp.gyp:
Use the system webp when building for the Android framework. Specify
the correct settings for the framework.

gyp/opts.gyp:
Specify a default set of files to compile when there are no possible
optimizations.

gyp/pdf.gyp:
Add dependencies for Android framework.

gyp/zlib.gyp:
Include the zlib folder, and undefine SK_ZLIB_INCLUDE.

BUG=skia:1975
R=djsollen@google.com

Committed: https://code.google.com/p/skia/source/detail?r=13298

Review URL: https://codereview.chromium.org/153093003

git-svn-id: http://skia.googlecode.com/svn/trunk@13304 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-02-04 16:08:48 +00:00
scroggo@google.com
1c9bd55ea3 Gyp file changes for the android framework.
Split off from https://codereview.chromium.org/140503007/.

The eventual goal is to create our Android.mk from gyp. This patch
adds an option for skia_android_framework with the right settings.
The follow-up (https://codereview.chromium.org/140503007/) will
use scripts to create the final makefile.

gyp/android_deps.gyp:
Use different dependencies for the framework than for building Skia
normally.

gyp/android_framework_lib.gyp:
Like skia_lib, specifies the minimum needed for building Skia, in this
case for the framework.

gyp/common_conditions.gypi:
Add settings specific to skia_android_framework. In some cases this
means turning off flags and defines.

gyp/common.gypi
Turn off SK_DEBUG and SK_DEVELOPER when building for the framework.
This allows the framework to create a single makefile which can be
modified to add SK_DEBUG and SK_DEVELOPER as desired.

gyp/common_variables.gypi:
Add skia_android_framework.

gyp/core.gyp:
Don't depend on cpufeatures, and add the cutils library for
skia_android_framework.

gyp/freetype.gyp:
skia_android_framework-specific options:
Don't include freetype_static as a dependency.
Include the proper folders.
Include the android library.

gyp/images.gyp:
Don't export libjpeg as a dependency for targets that include images
for the framework.
Also reorder image decoders to match the Android order, leaving our
most commonly used ones last (and therefore first in the chain for
trying them).

gyp/libwebp.gyp:
Use the system webp when building for the Android framework. Specify
the correct settings for the framework.

gyp/opts.gyp:
Specify a default set of files to compile when there are no possible
optimizations.

gyp/pdf.gyp:
Add dependencies for Android framework.

gyp/zlib.gyp:
Include the zlib folder, and undefine SK_ZLIB_INCLUDE.

BUG=skia:1975
R=djsollen@google.com

Review URL: https://codereview.chromium.org/153093003

git-svn-id: http://skia.googlecode.com/svn/trunk@13298 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-02-04 14:50:20 +00:00
commit-bot@chromium.org
d8ed85101e Turn NVPR on by default (but off in tools).
BUG=skia:2042

Committed: http://code.google.com/p/skia/source/detail?r=13164

R=robertphillips@google.com

Author: bsalomon@google.com

Review URL: https://codereview.chromium.org/144003006

git-svn-id: http://skia.googlecode.com/svn/trunk@13176 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-01-24 20:49:44 +00:00
halcanary@google.com
68c74884d0 Revert "Turn NVPR on by default (but off in tools)."
This reverts commit 83d81c96de.

Broke Windows build.  Autorevert didn't work.

TBR=bsalomon@google.com,robertphillips@google.com
NOTREECHECKS=true
NOTRY=true
NOPRESUBMIT=true
BUG=skia:2042

Review URL: https://codereview.chromium.org/146863003

git-svn-id: http://skia.googlecode.com/svn/trunk@13169 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-01-24 16:04:09 +00:00
commit-bot@chromium.org
83d81c96de Turn NVPR on by default (but off in tools).
BUG=skia:2042
R=robertphillips@google.com

Author: bsalomon@google.com

Review URL: https://codereview.chromium.org/144003006

git-svn-id: http://skia.googlecode.com/svn/trunk@13164 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-01-24 14:38:13 +00:00
senorblanco@chromium.org
29f351a867 Allow an override of MACOSX_DEPLOYMENT_TARGET, so the user can build against a different SDK if desired.
R=mtklein@google.com, bungeman, mtklein

Review URL: https://codereview.chromium.org/138033018

git-svn-id: http://skia.googlecode.com/svn/trunk@13126 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-01-20 16:14:02 +00:00
commit-bot@chromium.org
424fce31c1 disable poplar/fontconfig by default on mac
BUG=skia:2045
NOTRY=true
R=vandebo@chromium.org, mtklein@google.com

Author: reed@google.com

Review URL: https://codereview.chromium.org/139863002

git-svn-id: http://skia.googlecode.com/svn/trunk@13095 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-01-15 19:28:27 +00:00
commit-bot@chromium.org
fa190be48a Roll fontconfig to 2.11.0 and reenable poppler on mac
R=mtklein@google.com, epoger@google.com

Author: vandebo@chromium.org

Review URL: https://codereview.chromium.org/138843002

git-svn-id: http://skia.googlecode.com/svn/trunk@13091 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-01-15 17:24:22 +00:00
commit-bot@chromium.org
b638a3a941 Default Mac to 64-bit.
DM keeps exhausting 4G address space when it's really rolling.

BUG=
R=reed@google.com, borenet@google.com

Author: mtklein@google.com

Review URL: https://codereview.chromium.org/135733004

git-svn-id: http://skia.googlecode.com/svn/trunk@13072 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-01-14 20:49:26 +00:00
commit-bot@chromium.org
4a8e17d52d remove poplar building from mac, until it is fixed
BUG=skia:2008
R=mtklein@google.com, vandebo@chromium.org

Author: reed@google.com

Review URL: https://codereview.chromium.org/134243002

git-svn-id: http://skia.googlecode.com/svn/trunk@13020 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-01-10 17:21:00 +00:00
commit-bot@chromium.org
83f56922e2 Fix Mac fontconfig build (try 2)
The Mac fontconfig just #defines the cache directory, which works fine if fontconfig never has to look up any fonts (the case until now). If it has to actually find fonts from the disk, the cache directory and config directory need to be properly defined as well as running fc-cache to populate the cache directory.

Populating the cache directory can take some time, but should only happen on a clean build. To remove this extra time, we have to not build poppler on Mac, which can now be accomplished with GYP_DEFINES="skia_mac_poppler=0"

R=epoger@google.com

Author: vandebo@chromium.org

Review URL: https://codereview.chromium.org/132333002

git-svn-id: http://skia.googlecode.com/svn/trunk@13007 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-01-09 22:54:26 +00:00
commit-bot@chromium.org
32eea431de Revert of https://codereview.chromium.org/113203003/
Reason for revert: Broken under XCode.

R=bungeman@google.com, epoger@google.com
TBR=bungeman@google.com, epoger@google.com
NOTREECHECKS=true
NOTRY=true

Author: vandebo@chromium.org

Review URL: https://codereview.chromium.org/132093003

git-svn-id: http://skia.googlecode.com/svn/trunk@12997 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-01-09 17:52:54 +00:00
commit-bot@chromium.org
9a907fa0d3 Fix Mac fontconfig build
The Mac fontconfig just #defines the cache directory, which works fine if fontconfig never has to look up any fonts (the case until now).  If it has to actually find fonts from the disk, the cache directory and config directory need to be properly defined as well as running fc-cache to populate the cache directory.

Populating the cache directory can take some time, but should only happen on a clean build.  To remove this extra time, we have to not build poppler on Mac, which can now be accomplished with GYP_DEFINES="skia_mac_poppler=0"

R=bungeman@google.com, epoger@google.com

Author: vandebo@chromium.org

Review URL: https://codereview.chromium.org/113203003

git-svn-id: http://skia.googlecode.com/svn/trunk@12994 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-01-09 17:37:38 +00:00
robertphillips@google.com
42cc237caf New Composite CSS border object
https://codereview.chromium.org/86263003/



git-svn-id: http://skia.googlecode.com/svn/trunk@12597 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-12-10 15:19:32 +00:00
commit-bot@chromium.org
611fde182a Remove the comments settings for vim tab width and expansion variables.
These add unnecessary bloat for everyone to carry around, so we just
remove them now.

The same change was made in chromium by Tony in
http://codereview.chromium.org/7310019 - crrev.com/92046

BUG=None
TEST=./gyp_skia
R=mtklein@google.com

Author: tfarina@chromium.org

Review URL: https://codereview.chromium.org/92673003

git-svn-id: http://skia.googlecode.com/svn/trunk@12443 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-12-02 22:23:03 +00:00
jvanverth@google.com
d830d13c27 Hook in rough distance field support for fonts
R=bsalomon@google.com

Review URL: https://codereview.chromium.org/41213003

git-svn-id: http://skia.googlecode.com/svn/trunk@12229 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-11-11 20:54:09 +00:00
commit-bot@chromium.org
ffd178c84d Initial draft code to run pdfviewer withg gms
draft cl to run pdfviewer with gms 	modified:   gm/gmmain.cpp 	modified:   gyp/gm.gyp 	modified:   src/utils/SkPDFRasterizer.cpp 	modified:   src/utils/SkPDFRasterizer.h

R=scroggo@google.com, borenet@google.com

Author: edisonn@google.com

Review URL: https://codereview.chromium.org/26269002

git-svn-id: http://skia.googlecode.com/svn/trunk@12214 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-11-11 15:10:47 +00:00
robertphillips@google.com
4e5559af89 Allow specifying the max texture count on the bots
https://codereview.chromium.org/50413011/



git-svn-id: http://skia.googlecode.com/svn/trunk@12020 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-10-30 17:04:16 +00:00
commit-bot@chromium.org
5003bde3f8 Factor out skia_keep_frame_pointer. Handy with perf to get call stacks.
Today it's set when we're running a sanitizer, but it's more generally useful.  perf record -g (--call-graph) only works for me if we don't omit the frame pointer.

BUG=
R=bungeman@google.com

Author: mtklein@google.com

Review URL: https://codereview.chromium.org/41923004

git-svn-id: http://skia.googlecode.com/svn/trunk@11966 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-10-25 18:14:54 +00:00
mtklein@google.com
9f3b0e462e skia/trunk changes for generic sanitizer gyp flag.
BUG=
R=borenet@google.com

Review URL: https://codereview.chromium.org/25564003

git-svn-id: http://skia.googlecode.com/svn/trunk@11648 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-10-08 15:16:36 +00:00
bungeman@google.com
1435f9f29a Add skia_tsan_build to match skia_asan_build and fix one example race.
R=mtklein@google.com

Review URL: https://codereview.chromium.org/24644003

git-svn-id: http://skia.googlecode.com/svn/trunk@11464 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-09-25 22:39:22 +00:00
borenet@google.com
47ae4b0d54 Add skia_clang_build gyp define, add -Wstring-conversion flag
If you want the warning, you have to specify skia_clang_build=1

R=djsollen@google.com

Review URL: https://codereview.chromium.org/23038014

git-svn-id: http://skia.googlecode.com/svn/trunk@10861 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-08-21 18:02:50 +00:00
djsollen@google.com
f7542ba18e 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@10454 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-07-31 12:57:27 +00:00
zachr@google.com
d658568a82 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@10127 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-07-17 19:29:19 +00:00
borenet@google.com
0d19309080 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@9891 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-07-03 15:55:05 +00:00
commit-bot@chromium.org
06b3864ce8 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@9710 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-06-20 20:28:54 +00:00
commit-bot@chromium.org
5a6c2d8208 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@9615 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-06-14 17:10:09 +00:00
borenet@google.com
05d550ed36 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@9505 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-06-11 15:52:19 +00:00
djsollen@google.com
52f0297aaf 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@9395 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-06-03 12:10:19 +00:00
djsollen@google.com
a96627fd24 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@9379 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-05-31 20:09:47 +00:00
djsollen@google.com
cf5348f5aa 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@9378 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-05-31 20:02:56 +00:00
borenet@google.com
a72aef8a21 Refactor skia_warnings_as_errors
Review URL: https://codereview.chromium.org/12963002

git-svn-id: http://skia.googlecode.com/svn/trunk@8330 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-03-22 13:16:06 +00:00
borenet@google.com
663a979129 Fix build
Disable r8044 differently.
Unreviewed

git-svn-id: http://skia.googlecode.com/svn/trunk@8057 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-03-08 22:22:44 +00:00
borenet@google.com
f8905e4d44 Fix Windows build
Temporarily disable skia_win_debuggers_path gyp variable.
Unreviewed.

git-svn-id: http://skia.googlecode.com/svn/trunk@8056 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-03-08 22:14:32 +00:00
edisonn@google.com
184487c808 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@8044 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-03-08 18:00:16 +00:00
humper@google.com
522dbd2e62 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@7684 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-02-08 21:45:33 +00:00
jvanverth@google.com
74dda9018e 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@7110 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-01-09 21:04:52 +00:00
sugoi@google.com
e3453cbd20 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@7047 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-01-07 14:26:40 +00:00
rmistry@google.com
7cdea64233 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@6674 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-12-05 14:56:08 +00:00
djsollen@google.com
5afbbc47df 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@6598 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-11-29 15:09:58 +00:00
borenet@google.com
7158e6acca 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@6245 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-11-01 17:43:44 +00:00
djsollen@google.com
42041e6de8 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@6177 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-10-29 19:24:45 +00:00
djsollen@google.com
2d6535a91d 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@5936 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-10-12 19:44:35 +00:00
borenet@google.com
efb1d77ad2 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@5889 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-10-10 19:45:51 +00:00
epoger@google.com
3fc070cfce 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@5806 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-10-04 14:50:18 +00:00
bsalomon@google.com
4663822bc9 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@5802 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-10-04 12:52:03 +00:00
bsalomon@google.com
c6445a17ab 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@5796 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-10-03 20:58:26 +00:00
caryclark@google.com
5987f58036 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@5776 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-10-02 18:33:14 +00:00
mike@reedtribe.org
9a520eb745 revert 5681
git-svn-id: http://skia.googlecode.com/svn/trunk@5682 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-09-26 03:08:16 +00:00
mike@reedtribe.org
4269631bdf remove SampleXfermodes.cpp (obsolete, as we have it as a GM)
git-svn-id: http://skia.googlecode.com/svn/trunk@5681 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-09-26 03:06:55 +00:00
senorblanco@chromium.org
b8d212fe95 Build fix. Unreviewed.
git-svn-id: http://skia.googlecode.com/svn/trunk@5653 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-09-24 21:27:14 +00:00
caryclark@google.com
976298edd7 unbreak the build
move define of skia_arch_type to front

git-svn-id: http://skia.googlecode.com/svn/trunk@5650 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-09-24 19:41:43 +00:00
caryclark@google.com
594dd3cd78 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@5649 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-09-24 19:33:57 +00:00
senorblanco@chromium.org
bc5cbfe4ed 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@5607 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-09-20 16:10:02 +00:00
borenet@google.com
c2dd3d4109 Fix noisy Android build
Review URL: https://codereview.appspot.com/6488107

git-svn-id: http://skia.googlecode.com/svn/trunk@5503 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-09-11 21:37:28 +00:00
borenet@google.com
a98eb919a2 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@5398 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-09-04 21:09:40 +00:00
borenet@google.com
623ff0a5f7 Add ANGLE to DEPS, integrate build
Review URL: https://codereview.appspot.com/6494052

git-svn-id: http://skia.googlecode.com/svn/trunk@5387 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-09-04 16:45:05 +00:00
rmistry@google.com
d6176b0dca 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@5263 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-08-23 18:14:13 +00:00
bungeman@google.com
e8f0592ae8 DirectWrite font host for skia.
https://codereview.appspot.com/5417063/


git-svn-id: http://skia.googlecode.com/svn/trunk@5128 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-08-16 16:13:40 +00:00
chudy@google.com
bbad34de3b 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@5057 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-08-13 14:26:36 +00:00
borenet@google.com
a37a517b54 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@5041 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-08-09 20:44:32 +00:00
reed@google.com
baa5d94ee3 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@5007 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-08-08 20:39:17 +00:00
bsalomon@google.com
cf8fb1f6f0 Create GPU-less build of Skia.
git-svn-id: http://skia.googlecode.com/svn/trunk@4912 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-08-02 14:03:32 +00:00
borenet@google.com
7ef392940d 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@4653 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-07-18 14:59:54 +00:00
djsollen@google.com
e7290ef304 Update the makefile and gyp for the debugger.
Review URL: https://codereview.appspot.com/6355052

git-svn-id: http://skia.googlecode.com/svn/trunk@4410 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-06-29 18:26:27 +00:00
chudy@google.com
b6789115b7 Add missing gyp dependencies for debugger
git-svn-id: http://skia.googlecode.com/svn/trunk@4405 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-06-29 14:34:58 +00:00
bsalomon@google.com
ded4f4b163 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@4390 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-06-28 18:48:06 +00:00
djsollen@google.com
7f562ad0ad fix the build
git-svn-id: http://skia.googlecode.com/svn/trunk@4387 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-06-28 16:19:03 +00:00
djsollen@google.com
e341cb37e6 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@4385 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-06-28 16:08:05 +00:00
robertphillips@google.com
021bce94a3 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@3580 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-04-02 20:42:26 +00:00
epoger@google.com
573e8ba41c 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@3418 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-03-16 18:28:24 +00:00
epoger@google.com
aa3b6a965e 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@3411 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-03-16 13:52:49 +00:00
bsalomon@google.com
20c0a18e05 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@3332 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-03-06 20:43:53 +00:00
djsollen@google.com
51c2fa7bb1 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@2593 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-11-03 13:13:27 +00:00
bsalomon@google.com
373a6635b7 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@2499 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-10-19 20:43:20 +00:00
seanpaul@google.com
1134f98165 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@2270 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-09-15 14:24:33 +00:00