Commit Graph

3817 Commits

Author SHA1 Message Date
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
reed@google.com
b83f7978d7 temporary avoid zero-divide (to avoid assert in fixedpoint build)
git-svn-id: http://skia.googlecode.com/svn/trunk@4166 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-06-05 17:39:22 +00:00
reed@google.com
070a8002b4 temporary:
- suppress PDF for twopointradial GM until we fix its assert/failure (vandebo)
- detect divide-by-zero and abort for now (reed)



git-svn-id: http://skia.googlecode.com/svn/trunk@4165 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-06-05 17:15:30 +00:00
robertphillips@google.com
25c199343d Reverting r4162
git-svn-id: http://skia.googlecode.com/svn/trunk@4164 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-06-05 16:24:32 +00:00
reed@google.com
4384fabab4 add gm (no images yet) for two-point-radial gradients
git-svn-id: http://skia.googlecode.com/svn/trunk@4163 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-06-05 16:14:23 +00:00
robertphillips@google.com
3227ab5f64 Added instance counting system for SkRefCnt-derived objects
http://codereview.appspot.com/6242070/



git-svn-id: http://skia.googlecode.com/svn/trunk@4162 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-06-05 15:40:54 +00:00
bsalomon@google.com
492093951a Move stuff from protected to private in GrGpuGL
Review URL: http://codereview.appspot.com/6295044/



git-svn-id: http://skia.googlecode.com/svn/trunk@4161 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-06-05 15:13:46 +00:00
scroggo@google.com
691703cdd4 Fix an issue where Pipe did not draw correctly
on all platforms.

Since parameters can be evaluated in any order,
we can't call buffer.read() inline for multiple
parameters. The fix is to read the stream (in
the correct order) before we call the function.
Review URL: https://codereview.appspot.com/6277046

git-svn-id: http://skia.googlecode.com/svn/trunk@4160 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-06-05 14:58:40 +00:00
robertphillips@google.com
088719ecdc Added missing #include in SkGlobalInitialization_default.cpp for Android build
git-svn-id: http://skia.googlecode.com/svn/trunk@4156 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-06-05 13:22:14 +00:00
robertphillips@google.com
0090ec7cb0 Fix for compiler error in r4154
git-svn-id: http://skia.googlecode.com/svn/trunk@4155 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-06-05 13:12:53 +00:00
robertphillips@google.com
941ee9303b Fixed flattening of SkStippleMaskFilter
http://codereview.appspot.com/6279052/



git-svn-id: http://skia.googlecode.com/svn/trunk@4154 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-06-05 12:55:05 +00:00
bsalomon@google.com
8fc5e47a2d Mac mini lion rebaselines from r4152
git-svn-id: http://skia.googlecode.com/svn/trunk@4153 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-06-05 12:50:41 +00:00
bsalomon@google.com
9793fa0a3d Rebaseline GPU gradient GMs due to r4151.
git-svn-id: http://skia.googlecode.com/svn/trunk@4152 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-06-04 21:44:25 +00:00
bsalomon@google.com
3a5dab4e5e Always filter gradient textures
[GMs could possibly need rebaselining]


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



git-svn-id: http://skia.googlecode.com/svn/trunk@4151 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-06-04 20:21:28 +00:00
bsalomon@google.com
e287c1b49d Remove cached texture width/height that was used by 4x4 filter
Review URL: http://codereview.appspot.com/6286048



git-svn-id: http://skia.googlecode.com/svn/trunk@4150 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-06-04 20:18:54 +00:00
bsalomon@google.com
d2ae1fad78 remove 4x4 downsample filter mode
Review URL: http://codereview.appspot.com/6267046/



git-svn-id: http://skia.googlecode.com/svn/trunk@4149 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-06-04 20:06:02 +00:00
robertphillips@google.com
a1e5795279 GrTexture can now create its own cache key
http://codereview.appspot.com/6269047/



git-svn-id: http://skia.googlecode.com/svn/trunk@4148 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-06-04 20:05:28 +00:00
reed@google.com
778e163503 change gm to use concat instead of setMatrix, so we don't trash the caller if
it was recorded into a picture.



git-svn-id: http://skia.googlecode.com/svn/trunk@4147 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-06-04 20:00:01 +00:00
tomhudson@google.com
83e5eb8d02 Clean up likely reference leak in Ganesh custom stages.
http://codereview.appspot.com/6286047/



git-svn-id: http://skia.googlecode.com/svn/trunk@4146 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-06-04 19:58:30 +00:00
reed@google.com
150fee575b rebaselined w/ new (high-fidelity-asColorMatrix) colormatrix impl from 4143
git-svn-id: http://skia.googlecode.com/svn/trunk@4145 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-06-04 19:37:36 +00:00
bsalomon@google.com
c96cb3a929 Break up GrGpuGL::flushGLCommonState
Review URL: http://codereview.appspot.com/6270049/



git-svn-id: http://skia.googlecode.com/svn/trunk@4144 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-06-04 19:31:00 +00:00
reed@google.com
7b6c19392c remove mutable apis on SkColorMatrixFilter, must use constructor.
fix flattening to not write function-ptrs (no go for serialization), so we
store the raw float values now.

Slight change to GM/DRT images for GPU possible. Just rebaseline.
Review URL: https://codereview.appspot.com/6273052

git-svn-id: http://skia.googlecode.com/svn/trunk@4143 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-06-04 19:07:41 +00:00
bsalomon@google.com
4c8837867a move texture flush and param update to separate function
Review URL: http://codereview.appspot.com/6266044/



git-svn-id: http://skia.googlecode.com/svn/trunk@4142 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-06-04 19:05:11 +00:00
reed@google.com
8b0d0f6a9c remove public function-ptr based colorfilter
Review URL: https://codereview.appspot.com/6286046

git-svn-id: http://skia.googlecode.com/svn/trunk@4141 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-06-04 18:10:33 +00:00
scroggo@google.com
d13bdfb70f Turn off pipe playback in GM by default.
Works for me, but not on all platforms.
Review URL: https://codereview.appspot.com/6293043

git-svn-id: http://skia.googlecode.com/svn/trunk@4140 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-06-04 17:45:54 +00:00
scroggo@google.com
5af9b2032b 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@4139 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-06-04 17:17:36 +00:00
djsollen@google.com
da30999f2b change static variable to #define
git-svn-id: http://skia.googlecode.com/svn/trunk@4138 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-06-04 14:13:06 +00:00
djsollen@google.com
c6ff3e7a49 Add legacy script to enable skia roll into chromium.
Review URL: https://codereview.appspot.com/6277045

git-svn-id: http://skia.googlecode.com/svn/trunk@4137 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-06-04 13:39:47 +00:00
bsalomon@google.com
0ae2ca2830 Revert r4134 due to bot failures
git-svn-id: http://skia.googlecode.com/svn/trunk@4136 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-06-04 13:31:48 +00:00
robertphillips@google.com
07ef911f18 Fixed Linux compiler complaints
http://codereview.appspot.com/6269045/



git-svn-id: http://skia.googlecode.com/svn/trunk@4135 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-06-04 13:22:14 +00:00
bsalomon@google.com
009103d330 Move GrGpuGL::programUnitTest into its own file
Review URL: http://codereview.appspot.com/6272043/




git-svn-id: http://skia.googlecode.com/svn/trunk@4134 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-06-04 13:03:25 +00:00
robertphillips@google.com
3271628342 Move texture descriptor into GrTexture
http://codereview.appspot.com/6258068/



git-svn-id: http://skia.googlecode.com/svn/trunk@4133 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-06-04 12:48:45 +00:00
reed@google.com
1830c7aa3c --pictureDir foo will load serialized pictures <>.skp from the foo directory
git-svn-id: http://skia.googlecode.com/svn/trunk@4132 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-06-04 12:05:43 +00:00
mike@reedtribe.org
5d0c62f0f6 add -wp option to write serialized pictures to the specified directory
git-svn-id: http://skia.googlecode.com/svn/trunk@4131 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-06-02 14:50:13 +00:00
junov@chromium.org
4866cc0afb Adding option to serialize mutable bitmaps in SkPicture
BUG=http://code.google.com/p/chromium/issues/detail?id=115654
REVIEW=http://codereview.appspot.com/6221066/



git-svn-id: http://skia.googlecode.com/svn/trunk@4130 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-06-01 21:23:07 +00:00
tomhudson@google.com
898e7b568f Flip the switch to turn on GrCustomStage implementation of gradients;
remove old implementation, including enums & state on various structs.

http://codereview.appspot.com/6245078/



git-svn-id: http://skia.googlecode.com/svn/trunk@4129 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-06-01 20:42:15 +00:00
tomhudson@google.com
0bdbed3802 Fix GrSamplerState::operator=() to take a reference rather than a copy.
Visual review by bsalomon@.



git-svn-id: http://skia.googlecode.com/svn/trunk@4128 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-06-01 19:50:02 +00:00
bungeman@google.com
04640299dc VC++ allows template parameter shadowing.
git-svn-id: http://skia.googlecode.com/svn/trunk@4127 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-06-01 19:47:51 +00:00
bungeman@google.com
e70f798ebc Serialize support for GDI.
http://codereview.appspot.com/6263046/



git-svn-id: http://skia.googlecode.com/svn/trunk@4126 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-06-01 19:38:19 +00:00
reed@google.com
c3b80ba50a read/write sfnt-data length, to match convetion of other fonthosts.
TODO: move that "convention" into shared code (SkTypeface.cpp or SkFontHost.cpp)
and just require each port to support:

1. typeface <--> descriptor
2. typeface_raw_data <--> stream (possibly with algo-style flags)



git-svn-id: http://skia.googlecode.com/svn/trunk@4125 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-06-01 19:36:05 +00:00
bsalomon@google.com
7e5c6249f1 Move GrGpuGL::programUnitTest into its own file
Review URL: http://codereview.appspot.com/6272043/




git-svn-id: http://skia.googlecode.com/svn/trunk@4124 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-06-01 19:28:26 +00:00
bsalomon@google.com
60da417642 Move max vertex attributes value to GL Caps
Review URL: http://codereview.appspot.com/6271043/



git-svn-id: http://skia.googlecode.com/svn/trunk@4123 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-06-01 19:25:00 +00:00
bsalomon@google.com
890e3b58e7 Remove dirty flags from GrGpuGL state flush
Review URL: http://codereview.appspot.com/6255073/



git-svn-id: http://skia.googlecode.com/svn/trunk@4122 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-06-01 19:01:37 +00:00
bsalomon@google.com
0b323316ed SkBool8 -> bool to suppress warning (verbal LGTM from TomH)
git-svn-id: http://skia.googlecode.com/svn/trunk@4121 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-06-01 18:50:01 +00:00
bsalomon@google.com
0e9144828c Suppress dumb warning.
git-svn-id: http://skia.googlecode.com/svn/trunk@4120 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-06-01 18:29:37 +00:00
caryclark@google.com
f25edfeac7 shape ops work in progress
git-svn-id: http://skia.googlecode.com/svn/trunk@4119 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-06-01 18:20:10 +00:00
caryclark@google.com
a3f05facab shape ops work in progress
git-svn-id: http://skia.googlecode.com/svn/trunk@4118 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-06-01 17:44:28 +00:00
reed@google.com
99840553cd use SkFontDescriptor on mac
Review URL: https://codereview.appspot.com/6247064

git-svn-id: http://skia.googlecode.com/svn/trunk@4117 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-06-01 16:19:32 +00:00
tomhudson@google.com
5440f06331 Clean up duplicate code in Ganesh, moving more function onto GrGLShaderBuilder.
http://codereview.appspot.com/6245082/



git-svn-id: http://skia.googlecode.com/svn/trunk@4116 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-06-01 15:55:50 +00:00
bungeman@google.com
b6896e72c7 Remove 'legacy' font descriptor methods.
http://codereview.appspot.com/6261059/


git-svn-id: http://skia.googlecode.com/svn/trunk@4115 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-06-01 15:53:06 +00:00