Commit Graph

104 Commits

Author SHA1 Message Date
djsollen@google.com
ab5e91184b Update gyp to allow alternative out directories
If the enviroment variable SKIA_OUT is set the output of both
gyp and make will be redirected to that directory.

Review URL: https://codereview.appspot.com/6782095

git-svn-id: http://skia.googlecode.com/svn/trunk@6578 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-11-28 14:11:41 +00:00
epoger@google.com
6714ea4e4d 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@6116 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-10-25 16:32:07 +00:00
epoger@google.com
9c875d34ff 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@5999 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-10-18 16:10:56 +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
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
686989b242 Fix build by reverting make all to not include the debugger
git-svn-id: http://skia.googlecode.com/svn/trunk@4412 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-06-29 18:51:29 +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
borenet@google.com
dd3d08ea8e 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@4368 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-06-27 19:04:39 +00:00
borenet@google.com
b52cf3dd95 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@4168 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-06-05 17:57:48 +00:00
epoger@google.com
ab9b658a2a 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@2113 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-08-15 19:22:39 +00:00
epoger@google.com
08c315d268 re-enable "core" build target lost in r1968
git-svn-id: http://skia.googlecode.com/svn/trunk@1970 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-07-27 14:17:35 +00:00
epoger@google.com
c9493a4a68 Properly handle parallel make ("make -j"), and only rerun gyp if necessary.
This should completely resolve http://code.google.com/p/skia/issues/detail?id=330 ('building multiple targets in parallel fails on Linux')

This should resolve http://code.google.com/p/skia/issues/detail?id=313 ('toplevel makefile always reruns gyp_skia') for Linux, but not Mac.  (See details in comments within the file)
Review URL: http://codereview.appspot.com/4827043

git-svn-id: http://skia.googlecode.com/svn/trunk@1968 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-07-27 14:06:25 +00:00
epoger@google.com
2d75cc0c16 make gyp_skia runnable from any directory
http://codereview.appspot.com/4720042



git-svn-id: http://skia.googlecode.com/svn/trunk@1863 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-07-14 17:31:33 +00:00
epoger@google.com
eaacf47005 make toplevel Makefile pass MAKEFLAGS to out/Makefile
http://codereview.appspot.com/4661052



git-svn-id: http://skia.googlecode.com/svn/trunk@1739 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-06-28 16:48:56 +00:00
epoger@google.com
02362945f7 Add "tools" to "make all"
git-svn-id: http://skia.googlecode.com/svn/trunk@1688 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-06-23 19:24:28 +00:00
epoger@google.com
5d2e4cc165 add toplevel Makefile that works for Mac and Unix
http://codereview.appspot.com/4633063



git-svn-id: http://skia.googlecode.com/svn/trunk@1675 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-06-22 19:17:28 +00:00
epoger@google.com
baa677b248 delete all old (non-Gyp) buildfiles
git-svn-id: http://skia.googlecode.com/svn/trunk@1583 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-06-14 18:35:08 +00:00
epoger@google.com
b7fd3ee27e Temporarily fall back to the old makefile; the new one was killing buildbot.
git-svn-id: http://skia.googlecode.com/svn/trunk@1527 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-06-07 15:46:40 +00:00
epoger@google.com
1e8e056afc 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@1526 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-06-07 14:48:41 +00:00
reed@google.com
e1fee49d03 remove legacy LCDTEXT define
git-svn-id: http://skia.googlecode.com/svn/trunk@1514 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-06-06 17:15:46 +00:00
tomhudson@google.com
f910b36e45 New scalar benchmark suite, comparing SkScalarAs2sCompliment vs native float operations
http://http://codereview.appspot.com/4532116/



git-svn-id: http://skia.googlecode.com/svn/trunk@1511 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-06-06 15:16:31 +00:00
reed@google.com
416d303709 add MatrixBench.cpp
git-svn-id: http://skia.googlecode.com/svn/trunk@1463 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-06-01 15:11:42 +00:00
bungeman@google.com
0e45441994 Add Mesa as a GL backend.
http://codereview.appspot.com/4545055/


git-svn-id: http://skia.googlecode.com/svn/trunk@1382 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-05-19 17:47:02 +00:00
bungeman@google.com
16bab87a78 Add GL context creation for X so that gm can run GPU on Linux.
http://codereview.appspot.com/4548047/


git-svn-id: http://skia.googlecode.com/svn/trunk@1343 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-05-17 14:24:46 +00:00
reed@google.com
07f3ee10d3 use SkPath for GrPath, removing GrPathIter entirely
http://codereview.appspot.com/4515071/



git-svn-id: http://skia.googlecode.com/svn/trunk@1335 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-05-16 17:21:57 +00:00
reed@google.com
2f3dc9dc4c add typefacecache
speedup lcd blits
clean up some samples



git-svn-id: http://skia.googlecode.com/svn/trunk@1220 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-05-02 17:33:45 +00:00
reed@google.com
95bae399cc move SkOSFile.cpp into utils_files.mk, since it is needed for skdiff on all
platforms



git-svn-id: http://skia.googlecode.com/svn/trunk@1207 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-04-28 14:07:43 +00:00
tomhudson@google.com
4b33d28eb3 New 'skdiff' tool to compare two directories full of files, write diff images
into a third directory, and create a summary web page with metrics for easy
inspection of the results.



git-svn-id: http://skia.googlecode.com/svn/trunk@1200 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-04-27 15:39:30 +00:00
reed@google.com
2adc557b0f http://codereview.appspot.com/4431067/
Add a SKIA_SHARED flag to the Makefile to build skia as a shared object.

- Add a libskia.so target that uses gcc -shared rather than ar to link.
- Adjust binaries so they use whichever skia library we've configured.



git-svn-id: http://skia.googlecode.com/svn/trunk@1194 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-04-26 20:14:24 +00:00
reed@google.com
02b17f79cb add gradient bench
use -O3 in release builds



git-svn-id: http://skia.googlecode.com/svn/trunk@1138 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-04-15 15:47:35 +00:00
reed@google.com
d34658a5f1 add benchmark for path filling
git-svn-id: http://skia.googlecode.com/svn/trunk@1097 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-04-11 13:12:51 +00:00
bsalomon@google.com
f987d1b234 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@1045 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-04-04 17:13:52 +00:00
vandebo@chromium.org
4b83c63573 Move where compression enable/disable is done to make recompilation faster.
Review URL: http://codereview.appspot.com/4354043

git-svn-id: http://skia.googlecode.com/svn/trunk@1035 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-04-01 18:33:22 +00:00
reed@google.com
df49991eb3 add SkCreateTypefaceFromCTFont() to create a typeface directly from a CTFontRef
Compute the actual style from the returned CTFontRef, rather than assuming the
request will always be met.



git-svn-id: http://skia.googlecode.com/svn/trunk@979 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-03-22 14:07:59 +00:00
bsalomon@google.com
918261018f 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@970 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-03-21 19:51:57 +00:00
reed@google.com
e6507632c1 change -lpng12 to -lpng
The distinction doesn't seem necessary, and newer installs are getting 1.4 or later of libpng



git-svn-id: http://skia.googlecode.com/svn/trunk@969 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-03-21 17:45:15 +00:00
scroggo
b66365f5dd Updates to the unix sample app.
Rather than placing pixels, use XPutImage to place the bitmap on screen.

Modify the color arrangements for 8888 when building the sample app, so
they agree with X.

Add a title to simple sample.

Include SkTouchGesture.



git-svn-id: http://skia.googlecode.com/svn/trunk@963 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-03-18 21:43:03 +00:00
vandebo@chromium.org
5b073680ec Enable compiling the PDF backend by default in the makefile.
Use SKIA_PDF_SUPPORT=false to disable the PDF backend.

Review URL: http://codereview.appspot.com/4267046

git-svn-id: http://skia.googlecode.com/svn/trunk@906 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-03-08 18:33:31 +00:00
vandebo@chromium.org
da912d61ed [PDF] Add support for Shaders.
- Shaders, or as they are referred to in PDF, patterns, are drawn in the coordinate system of the initial page, so when we canonicalize them, we have to consider the current transform and where they are constructed.

- Image shaders are tiled by default, this makes repeat and mirror modes easy, but means we have to draw a pattern as large as the current clip to support clamp mode.

- Gradient shaders are implemented with type 4 functions, which are basically small snippets of post script code.  I've tried to make the code generation modular and heavily commented to make it easy to understand or expand.

Review URL: http://codereview.appspot.com/4239061

git-svn-id: http://skia.googlecode.com/svn/trunk@905 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-03-08 18:31:02 +00:00
reed@google.com
c921843d85 fixes for some warnings:
- #if of something that was not defined
- explicit constructor call for baseclass in copy-constructor of subclass

http://code.google.com/p/skia/issues/detail?id=112



git-svn-id: http://skia.googlecode.com/svn/trunk@727 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-01-25 19:05:12 +00:00
reed@google.com
21b0a2b4fe enable sse2 source in makefile
git-svn-id: http://skia.googlecode.com/svn/trunk@698 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-01-17 18:41:23 +00:00
reed@google.com
6bc2f5db71 add SSE2 opt files to xcode
git-svn-id: http://skia.googlecode.com/svn/trunk@697 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-01-17 18:37:43 +00:00
reed@google.com
272e7545a3 use -O2 for release, -g for debug (so we can get symbols for gdb)
git-svn-id: http://skia.googlecode.com/svn/trunk@681 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-01-10 14:54:30 +00:00
reed@google.com
1fcd51e6b2 add template macro to "safely" perform casts w/o breaking strict-aliasing
fix aliasing warnings



git-svn-id: http://skia.googlecode.com/svn/trunk@674 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-01-05 15:50:27 +00:00
reed@android.com
38669c12c5 add colorspace option to SkBitmap -> CGImageRef utility (patch from nico)
git-svn-id: http://skia.googlecode.com/svn/trunk@666 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-01-03 13:48:50 +00:00
reed@google.com
37df17d164 fix build for linux
partial impl for GPU on linux (need getProcAddress and SkEGLContext)



git-svn-id: http://skia.googlecode.com/svn/trunk@661 2bbb7eff-a529-9590-31e7-b0007b416f81
2010-12-23 20:20:51 +00:00
reed@google.com
7876114a79 require lpng12 for gm tool (since Mac encoder tweaks the results for colorspace "correction")
update baselines using png



git-svn-id: http://skia.googlecode.com/svn/trunk@657 2bbb7eff-a529-9590-31e7-b0007b416f81
2010-12-23 16:34:58 +00:00
reed@google.com
eeeb5a05b9 silence some of our startup spew
tie skia and gr's debug symbols together in the Makefile



git-svn-id: http://skia.googlecode.com/svn/trunk@654 2bbb7eff-a529-9590-31e7-b0007b416f81
2010-12-23 15:12:59 +00:00