skia.committer@gmail.com
3458716b52
Sanitizing source files in Skia_Periodic_House_Keeping
...
git-svn-id: http://skia.googlecode.com/svn/trunk@6500 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-11-20 02:01:23 +00:00
reed@google.com
808b70f869
modify gm to have a non-uniform donut for testing
...
git-svn-id: http://skia.googlecode.com/svn/trunk@6477 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-11-19 16:14:02 +00:00
reed@google.com
aef73617d1
flag the GM if we're in deferred-canvas mode, to work-around bug trying to
...
get the context from its device.
git-svn-id: http://skia.googlecode.com/svn/trunk@6452 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-11-16 13:41:45 +00:00
mike@reedtribe.org
1588974aff
use #if SK_SUPPORT_GPU to guard references to gpudevice
...
git-svn-id: http://skia.googlecode.com/svn/trunk@6449 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-11-16 02:31:03 +00:00
mike@reedtribe.org
92aa756c86
use gpu surface to match canvas
...
change gm to reset shader when we start antialiasing
git-svn-id: http://skia.googlecode.com/svn/trunk@6448 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-11-16 02:23:10 +00:00
skia.committer@gmail.com
884e60be30
Sanitizing source files in Skia_Periodic_House_Keeping
...
git-svn-id: http://skia.googlecode.com/svn/trunk@6447 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-11-16 02:01:17 +00:00
reed@google.com
86eca4774b
draw offscreen so we can see the alpha-channel we are writing
...
todo: know when to use a gpu-surface
git-svn-id: http://skia.googlecode.com/svn/trunk@6436 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-11-15 17:24:23 +00:00
reed@google.com
a4f8137e67
update srcmode GM to include aa/bw and gradients
...
add 'G' key to sampleapp, to toggle showing the GM's bounds as an overlay
git-svn-id: http://skia.googlecode.com/svn/trunk@6431 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-11-15 15:56:38 +00:00
reed@google.com
5dd85a45bc
add gm for srcmode (and clearmode) in prep for optimization work
...
git-svn-id: http://skia.googlecode.com/svn/trunk@6429 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-11-15 13:46:47 +00:00
mike@reedtribe.org
b947625800
remove unused (and undefined) SkColorSpace parameter.
...
git-svn-id: http://skia.googlecode.com/svn/trunk@6427 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-11-15 02:37:45 +00:00
epoger@google.com
454008ae29
comment-only change to gm/tests/run.sh
...
git-svn-id: http://skia.googlecode.com/svn/trunk@6407 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-11-13 20:46:50 +00:00
epoger@google.com
57f7abc865
Maintain failedTests list within GMMain object
...
Review URL: https://codereview.appspot.com/6819121
git-svn-id: http://skia.googlecode.com/svn/trunk@6390 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-11-13 03:41:55 +00:00
epoger@google.com
a413a53cb2
Add a self-test for gm, similar to our self-test for skdiff.
...
Review URL: https://codereview.appspot.com/6827068
git-svn-id: http://skia.googlecode.com/svn/trunk@6380 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-11-12 18:04:51 +00:00
skia.committer@gmail.com
453995e01d
Sanitizing source files in Skia_Periodic_House_Keeping
...
git-svn-id: http://skia.googlecode.com/svn/trunk@6376 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-11-10 02:01:26 +00:00
reed@google.com
ce7ffaccc4
report max pixel error on failure, rather than the hex of the first mismatched pixel
...
Review URL: https://codereview.appspot.com/6826080
git-svn-id: http://skia.googlecode.com/svn/trunk@6365 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-11-09 14:51:18 +00:00
senorblanco@chromium.org
9daf96afb3
Break out SkOffsetImageFilter into its own file, and derive it from
...
SkSingleInputImageFilter, to make it DAG-friendly.
Review URL: https://codereview.appspot.com/6822086
git-svn-id: http://skia.googlecode.com/svn/trunk@6315 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-11-06 20:29:39 +00:00
skia.committer@gmail.com
1aa90cf11e
Sanitizing source files in Skia_Periodic_House_Keeping
...
git-svn-id: http://skia.googlecode.com/svn/trunk@6306 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-11-06 13:18:25 +00:00
reed@google.com
db87c96085
add blurrect gm
...
git-svn-id: http://skia.googlecode.com/svn/trunk@6284 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-11-02 21:11:12 +00:00
robertphillips@google.com
ea5d8af9fb
Fix for 2 parallel gpu rendering issues (bigbitmaprect & image-surface)
...
https://codereview.appspot.com/6816079/
git-svn-id: http://skia.googlecode.com/svn/trunk@6266 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-11-02 17:38:28 +00:00
bsalomon@google.com
c7a24d23f7
Check modulo values passed to GM.
...
R=reed@google.com
Review URL: https://codereview.appspot.com/6820073
git-svn-id: http://skia.googlecode.com/svn/trunk@6248 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-11-01 18:03:48 +00:00
bsalomon@google.com
b9086a0268
Replace GrMatrix with SkMatrix.
...
Review URL: https://codereview.appspot.com/6814067
git-svn-id: http://skia.googlecode.com/svn/trunk@6247 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-11-01 18:02:54 +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
bsalomon@google.com
d8b5faca04
Reland r6233 with fix.
...
git-svn-id: http://skia.googlecode.com/svn/trunk@6241 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-11-01 17:02:46 +00:00
bsalomon@google.com
115b06f3d5
Re-revert r6233.
...
git-svn-id: http://skia.googlecode.com/svn/trunk@6239 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-11-01 15:47:55 +00:00
bsalomon@google.com
c3a58f345d
Reland r6233 with fix for config conversion texture matrices.
...
git-svn-id: http://skia.googlecode.com/svn/trunk@6238 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-11-01 15:40:47 +00:00
bsalomon@google.com
66e534da8e
Revert r6233 while investigating bot failures.
...
git-svn-id: http://skia.googlecode.com/svn/trunk@6235 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-11-01 14:02:43 +00:00
bsalomon@google.com
ce49e16d3b
Checkpoint in moving texture matrices out of GrGLProgram and into GrGLEffect.
...
Review URL: https://codereview.appspot.com/6818064
git-svn-id: http://skia.googlecode.com/svn/trunk@6233 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-11-01 13:50:50 +00:00
robertphillips@google.com
97b6b0730d
Fleshed out GPU portion of image/surface feature
...
https://codereview.appspot.com/6813055/
git-svn-id: http://skia.googlecode.com/svn/trunk@6214 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-10-31 14:48:39 +00:00
skia.committer@gmail.com
e862d16162
Sanitizing source files in Skia_Periodic_House_Keeping
...
git-svn-id: http://skia.googlecode.com/svn/trunk@6210 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-10-31 02:01:18 +00:00
reed@google.com
4117a24de4
add test for bug in line drawing. fix is pending a way to handle all of the
...
rebaselines...
git-svn-id: http://skia.googlecode.com/svn/trunk@6208 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-10-30 20:26:58 +00:00
senorblanco@chromium.org
7b734e0843
Fix alpha computation for specular lighting filter (GPU path).
...
Change lighting GM background to show blending.
NOTE: This will require new results for the lighting GM.
Review URL: https://codereview.appspot.com/6812050
git-svn-id: http://skia.googlecode.com/svn/trunk@6181 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-10-29 19:47:06 +00:00
epoger@google.com
82cb65ba18
Alphabetize gm options (in usage message and option parser).
...
Also add long-form option names for all options.
Review URL: https://codereview.appspot.com/6817050
git-svn-id: http://skia.googlecode.com/svn/trunk@6173 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-10-29 18:59:17 +00:00
epoger@google.com
e8ebeb1f8f
Add option to gm: write out images into a hierarchy, rather than a flat set of files
...
BUG=https://code.google.com/p/skia/issues/detail?id=743
Review URL: https://codereview.appspot.com/6810047
git-svn-id: http://skia.googlecode.com/svn/trunk@6167 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-10-29 16:42:11 +00:00
senorblanco@chromium.org
cd9f55989e
Add a factory Create function for SkColorFilterImageFilter, and move the matrix optimization there. This will allow the Chrome compositor to extract the optimized matrix, and potentially apply the color matrix itself, saving a buffer allocation & draw.
...
Review URL: https://codereview.appspot.com/6739057
git-svn-id: http://skia.googlecode.com/svn/trunk@6152 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-10-26 19:37:00 +00:00
epoger@google.com
de96163a80
object-ify gmmain.cpp (no functional change) to ease planned changes later
...
Review URL: https://codereview.appspot.com/6801043
git-svn-id: http://skia.googlecode.com/svn/trunk@6147 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-10-26 18:56:36 +00:00
djsollen@google.com
ebce16d21b
Refactor gm to minimize wasted passes through picture and pipe code paths.
...
Testing this CL shows around a 40% time reduction when running gm on a mac debug build.
Review URL: https://codereview.appspot.com/6791043
git-svn-id: http://skia.googlecode.com/svn/trunk@6140 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-10-26 14:07:13 +00:00
bsalomon@google.com
08283afc26
Rename GrSamplerState to GrEffectStage.
...
R=robertphillips@google.com
Review URL: https://codereview.appspot.com/6777053
git-svn-id: http://skia.googlecode.com/svn/trunk@6135 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-10-26 13:01:20 +00:00
reed@google.com
b5a5a9dc75
don't send % by itself to printf
...
git-svn-id: http://skia.googlecode.com/svn/trunk@6120 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-10-25 17:58:23 +00:00
epoger@google.com
f28dd8ab10
clarify code/comments in gmmain.cpp (no functional change)
...
Review URL: https://codereview.appspot.com/6749067
git-svn-id: http://skia.googlecode.com/svn/trunk@6115 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-10-25 16:27:34 +00:00
bsalomon@google.com
6f261bed02
GrCustomStage Renaming Part 2
...
GrSamplerState member rename
GrCustomStageUnitTest rename
some comment updates
Review URL: https://codereview.appspot.com/6771043
git-svn-id: http://skia.googlecode.com/svn/trunk@6078 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-10-24 19:07:10 +00:00
senorblanco@chromium.org
985fa79141
Protect filter_texture() against render target change.
...
Fix blend filters when input textures are "sloppy" (approx scratch texture match)
Add a new test case to gm/imagefiltersgraph, and reduce its size.
NOTE: this will require new baselines for the imagefiltersgraph GM.
BUG=950
Review URL: https://codereview.appspot.com/6769043
git-svn-id: http://skia.googlecode.com/svn/trunk@6073 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-10-24 15:14:26 +00:00
skia.committer@gmail.com
24c29d91ca
Sanitizing source files in Skia_Periodic_House_Keeping
...
git-svn-id: http://skia.googlecode.com/svn/trunk@6023 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-10-20 02:01:23 +00:00
bsalomon@google.com
c6126c1828
Add a GM that tests xfermode-based color filters.
...
Review URL: https://codereview.appspot.com/6736052
git-svn-id: http://skia.googlecode.com/svn/trunk@6022 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-10-19 19:26:05 +00:00
edisonn@google.com
9cb9c2057c
Enable gm/aarectmodes with pdf config. Does not crash in mac (nor windows) according to comment. I am working to improve pdf, first step to have all gms export to pdf.
...
Review URL: https://codereview.appspot.com/6713055
git-svn-id: http://skia.googlecode.com/svn/trunk@6016 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-10-19 14:17:22 +00:00
skia.committer@gmail.com
6a748ad8d8
Sanitizing source files in Skia_Periodic_House_Keeping
...
git-svn-id: http://skia.googlecode.com/svn/trunk@6013 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-10-19 02:01:19 +00:00
reed@google.com
ae7b8f3e7b
add --modulo A B option to gm, so we can only execute 1/B of the tests in a
...
given instance.
Review URL: https://codereview.appspot.com/6739044
git-svn-id: http://skia.googlecode.com/svn/trunk@6007 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-10-18 21:30:57 +00:00
mike@reedtribe.org
a0591698fd
add two more tilemode gms, in advance of experimenting w/ decal
...
git-svn-id: http://skia.googlecode.com/svn/trunk@5990 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-10-18 02:01:59 +00:00
bsalomon@google.com
1282009256
Add transparent source bitmap to colormatrix GM.
...
R=robertphillips@google.com
Review URL: https://codereview.appspot.com/6727043
git-svn-id: http://skia.googlecode.com/svn/trunk@5969 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-10-16 17:50:48 +00:00
bsalomon@google.com
dfdb7e5240
Reland r5963 with two fixes:
...
Missing ref in GrSweepGradient::TestCreate.
Must reset() the sampler in setup_drawstate_aaclip() to avoid hitting a (dubious) assert.
git-svn-id: http://skia.googlecode.com/svn/trunk@5964 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-10-16 15:19:45 +00:00
bsalomon@google.com
f6eac8af58
Revert r5962 because of failures.
...
git-svn-id: http://skia.googlecode.com/svn/trunk@5963 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-10-16 14:31:26 +00:00
bsalomon@google.com
b022177777
Require matrix for custom stage to be set when custom stage is installed.
...
Review URL: https://codereview.appspot.com/6696044
git-svn-id: http://skia.googlecode.com/svn/trunk@5962 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-10-16 14:16:11 +00:00
skia.committer@gmail.com
f57c01bdcf
Sanitizing source files in Skia_Periodic_House_Keeping
...
git-svn-id: http://skia.googlecode.com/svn/trunk@5943 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-10-13 02:01:56 +00:00
bsalomon@google.com
42316095ec
Add new GM, shadertext3. It would have revealed a bug in the GPU draw-large-text-as-path code path that was recently fixed.
...
R=reed@google.com
Review URL: https://codereview.appspot.com/6638057
git-svn-id: http://skia.googlecode.com/svn/trunk@5932 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-10-12 19:26:15 +00:00
senorblanco@chromium.org
8d21f6c7a9
When two or more color matrix image filters are connected together, and the non-leaf matrices do not require clamping, we can concatenate their matrices and apply them together.
...
Review URL: https://codereview.appspot.com/6489054
git-svn-id: http://skia.googlecode.com/svn/trunk@5931 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-10-12 19:14:06 +00:00
skia.committer@gmail.com
fc84359aa9
Sanitizing source files in Skia_Periodic_House_Keeping
...
git-svn-id: http://skia.googlecode.com/svn/trunk@5892 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-10-11 02:01:14 +00:00
senorblanco@chromium.org
9f25de7900
This patch implements generalized DAG connectivity for SkImageFilter. SkImageFilter maintains a list of inputs, which can be constructed either from a SkImageFilter** or zero or more SkImageFilter* arguments (varargs).
...
Existing filters which maintained their own filter connectivity were refactored to use the new constructors and flattening/unflattening code. Modifying the remaining filters which are not yet DAG-friendly is left for future work; they are considered to have zero inputs for now.
Review URL: https://codereview.appspot.com/6443119
git-svn-id: http://skia.googlecode.com/svn/trunk@5891 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-10-10 20:36:13 +00:00
reed@google.com
1b6c73d67a
add ability to skip 565 test in gm (until I can fix an assert in debug build)
...
git-svn-id: http://skia.googlecode.com/svn/trunk@5879 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-10-10 15:17:24 +00:00
bsalomon@google.com
41fe45b955
Add a new GM: shadertext2.
...
It tests a bitmap shader with various combinations of matrices and shader matrices. The text is drawn filled and stroked.
Review URL: https://codereview.appspot.com/6639052
git-svn-id: http://skia.googlecode.com/svn/trunk@5877 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-10-10 13:35:23 +00:00
bsalomon@google.com
c7448cef09
GrPaint encapsulation.
...
R=robertphillips@google.com
Review URL: https://codereview.appspot.com/6624052
git-svn-id: http://skia.googlecode.com/svn/trunk@5838 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-10-05 19:04:13 +00:00
bsalomon@google.com
88becf450f
Rename GrPaint fields/enums/members texture->color mask->coverage.
...
R=robertphillips@google.com
Review URL: https://codereview.appspot.com/6615046
git-svn-id: http://skia.googlecode.com/svn/trunk@5827 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-10-05 14:54:42 +00:00
scroggo@google.com
30efb8a94f
Do not do PNG encoding/decoding when testing picture serialization.
...
Fixes the build.
Review URL: https://codereview.appspot.com/6624046
git-svn-id: http://skia.googlecode.com/svn/trunk@5819 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-10-04 22:02:46 +00:00
scroggo@google.com
5a7c6be72b
Add the ability to provide function pointers to SkPicture serialization
...
and deserialization for encoding and decoding bitmaps.
Remove kForceFlattenBitmapPixels_Flag, which is no longer used.
When an SkOrderedReadBuffer needs to read a bitmap, if it does not
have an image decoder, use a dummy bitmap.
In GM, add a tolerance option for color differences, used when
testing picture serialization, so it can assume two images are the
same even though PNG encoding/decoding may have resulted in small
differences.
Create dummy implementations for SkImageDecoder and SkImageEncoder
functions in SkImageDecoder_empty so that a project that does not
want to include the images project it can still build.
Allow ports to build without images project.
In Mac's image encoder, copy 4444 to 8888 before encoding.
Add SkWriter32::reservePad, to provide a pointer to write non 4 byte
aligned data, padded with zeroes.
In bench_ and render_ pictures, pass decode function to SkPicture
creation from a stream.
BUG=https://code.google.com/p/skia/issues/detail?id=842
Review URL: https://codereview.appspot.com/6551071
git-svn-id: http://skia.googlecode.com/svn/trunk@5818 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-10-04 21:46:08 +00:00
senorblanco@chromium.org
3bc16c8bc1
Implement GPU path for matrix convolution. Note that when not convolving alpha,
...
the premultiplying is done less efficiently than in the raster path: it's
done on each texture access, rather than as a pre-processing pass. This was
so I could do the filter as a single custom stage; will try the optimization
separately.
This implementation gives a ~30X speedup on the GPU results for the
matrixconvolution bench (~10X due to the GPU, and ~3X due to texture
uploads/readback removal).
Note: this changes the matrixconvolution for the software path as well, so
it will likely break the bots until that test is rebaselined.
Review URL: https://codereview.appspot.com/6585069/
git-svn-id: http://skia.googlecode.com/svn/trunk@5809 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-10-04 17:18:20 +00:00
reed@google.com
1ba274d9f3
revert 5794
...
git-svn-id: http://skia.googlecode.com/svn/trunk@5795 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-10-03 20:40:38 +00:00
reed@google.com
4837724a7e
add test for rotated saveLayer, to see that we clip against the specified bounds
...
(hint: we don't at the moment)
git-svn-id: http://skia.googlecode.com/svn/trunk@5794 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-10-03 20:17:22 +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
robertphillips@google.com
8fdb4c16a1
Fixed memory leak in bitmaprect GM
...
https://codereview.appspot.com/6593058/
git-svn-id: http://skia.googlecode.com/svn/trunk@5763 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-10-02 11:47:16 +00:00
reed@google.com
7ec0015ec3
delete obsolete/unused SkGpuCanvas
...
git-svn-id: http://skia.googlecode.com/svn/trunk@5752 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-10-01 18:06:05 +00:00
reed@google.com
44a42ea8b2
1. remove references to (deprecated) SkGpuCanvas
...
2. remove references to setDevice (soon to be deprecated)
Review URL: https://codereview.appspot.com/6597055
git-svn-id: http://skia.googlecode.com/svn/trunk@5751 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-10-01 17:54:05 +00:00
robertphillips@google.com
ffad46b264
Fixed bug in drawing of large bitmaps
...
https://codereview.appspot.com/6595047/
git-svn-id: http://skia.googlecode.com/svn/trunk@5745 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-10-01 14:32:51 +00:00
robertphillips@google.com
67d91be9bb
Added additional case to GM:drawbitmapmatrix
...
https://codereview.appspot.com/6573067/
This require re-baselining of all drawbitmapmatrix images!
git-svn-id: http://skia.googlecode.com/svn/trunk@5723 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-09-28 17:24:44 +00:00
skia.committer@gmail.com
44d498812a
Sanitizing source files in Skia_Periodic_House_Keeping
...
git-svn-id: http://skia.googlecode.com/svn/trunk@5705 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-09-27 02:01:04 +00:00
tfarina@chromium.org
7b3b26e56c
gm: Include system_preferences.h in mac file.
...
This fixes the FIXME in there.
R=epoger@google.com
Review URL: https://codereview.appspot.com/6576049
git-svn-id: http://skia.googlecode.com/svn/trunk@5692 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-09-26 15:41:42 +00:00
robertphillips@google.com
653b0d678e
Disable memory intensive drawBitmapRectToRect tests on Android
...
http://codereview.appspot.com/6567052/
git-svn-id: http://skia.googlecode.com/svn/trunk@5691 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-09-26 15:28:04 +00:00
robertphillips@google.com
21a95f16c9
Added more drawBitmapRectToRect tests
...
http://codereview.appspot.com/6564053/
git-svn-id: http://skia.googlecode.com/svn/trunk@5688 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-09-26 13:10:19 +00:00
mike@reedtribe.org
3bd2173663
SkCanvas::setDevice() must die, and so we begin by removing our own
...
references to setBitmapDevice() (gotta walk before we can run)
git-svn-id: http://skia.googlecode.com/svn/trunk@5680 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-09-26 02:45:10 +00:00
bungeman@google.com
8ff8a1959f
Vertical metrics for FreeType.
...
https://codereview.appspot.com/6554064/
git-svn-id: http://skia.googlecode.com/svn/trunk@5677 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-09-25 20:38:28 +00:00
senorblanco@chromium.org
8640d5024d
This patch adds support for optional processing of the alpha channel in
...
the matrix convolution filter. Test cases are added to the GM and the
bench.
NOTE: This will require rebaselining the matrixconvolution GM, so it will
likely turn the bots red until that is done.
https://codereview.appspot.com/6547049/
git-svn-id: http://skia.googlecode.com/svn/trunk@5661 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-09-25 14:32:42 +00:00
scroggo@google.com
977e6626af
When recording a GM to a picture, pass the GM's size to beginRecording.
...
Review URL: https://codereview.appspot.com/6552047
git-svn-id: http://skia.googlecode.com/svn/trunk@5644 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-09-21 19:12:32 +00:00
senorblanco@chromium.org
5faa2dc266
Implements a matrix convolution filter (raster path only). The filtering loop
...
is templated on the tiling mode for speed: interior pixels are unconditionally
fetched; border pixels apply the appropriate tiling mode before fetching. It
handles target, bias, divisor (as gain), and edge modes (named to be more
skia-like). It does not handle the "preserveAlpha" semantics of
feConvolveMatrix, nor "kernelUnitLength".
git-svn-id: http://skia.googlecode.com/svn/trunk@5592 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-09-18 20:32:34 +00:00
reed@google.com
7112173c3c
re-re-land 5578
...
will follow w/ new .skp files to keep the waterfall green (I hope)
git-svn-id: http://skia.googlecode.com/svn/trunk@5584 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-09-18 15:14:33 +00:00
reed@google.com
10f9f4a844
revert 5580
...
git-svn-id: http://skia.googlecode.com/svn/trunk@5581 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-09-18 14:04:54 +00:00
reed@google.com
eab16dea1c
re-land 5578 w/ pipe fix
...
git-svn-id: http://skia.googlecode.com/svn/trunk@5580 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-09-18 13:47:20 +00:00
reed@google.com
c75c36a14b
revert 5578 -- broke pipe
...
git-svn-id: http://skia.googlecode.com/svn/trunk@5579 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-09-18 13:20:52 +00:00
reed@google.com
f1ab723033
Change drawBitmapRect to take a float-src-rect instead of integer-src-rect. This
...
allows the client more control over the scaling. Because of virtual overrides
and wanting to keep the old call-sites up and running, this CL renames the
virtual entry-point to drawBitmapRectToRect, and downgrades drawBitmapRect to
a non-virtual helper function.
The implementation is to use the float-rect for computing the matrix, but still
cons-up an integer rect for the purposes of subsetting the original bitmap. We
do this by calling float_src->roundOut(&int_src) so that we include all
(partially) covered src pixels.
No change needed on SkDevice, since that signature is explicitly passed the
computed matrix.
Review URL: https://codereview.appspot.com/6501140
git-svn-id: http://skia.googlecode.com/svn/trunk@5578 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-09-18 12:59:44 +00:00
skia.committer@gmail.com
54339a826e
Sanitizing source files in Skia_Periodic_House_Keeping
...
git-svn-id: http://skia.googlecode.com/svn/trunk@5577 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-09-18 02:01:09 +00:00
robertphillips@google.com
968c17ddda
fixed compiler complaints
...
http://codereview.appspot.com/6499124/
git-svn-id: http://skia.googlecode.com/svn/trunk@5565 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-09-17 12:05:40 +00:00
scroggo@google.com
39362527e9
Turn serialization back on in GM.
...
With https://codereview.appspot.com/6503106/ it is now safe to do
serialization by default.
Review URL: https://codereview.appspot.com/6498121
git-svn-id: http://skia.googlecode.com/svn/trunk@5551 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-09-14 17:37:46 +00:00
rileya@google.com
71e21ba2af
Fix picture refcnt bug in distantclip gm. Unreviewed.
...
git-svn-id: http://skia.googlecode.com/svn/trunk@5542 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-09-14 14:24:14 +00:00
rileya@google.com
ffadfb5d43
Add gm to test SkRegion/clipPath bug.
...
Review URL: https://codereview.appspot.com/6501131
git-svn-id: http://skia.googlecode.com/svn/trunk@5540 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-09-14 13:53:36 +00:00
scroggo@google.com
d8a6cc814f
Make texteffects gm work through serialization and pipe.
...
Move Line2DPathEffect (now Sk_) into a separate header file so it can
be shared and initialized.
Switch to the shared version in SampleAll and SampleSlides.
Remove the skip pipe flag from texteffects, since it can now be serialized.
I have a separate change to turn serialization on by default at https://codereview.appspot.com/6498121/
Review URL: https://codereview.appspot.com/6503106
git-svn-id: http://skia.googlecode.com/svn/trunk@5512 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-09-12 18:53:49 +00:00
reed@google.com
ef752fe38b
disable replay for now
...
git-svn-id: http://skia.googlecode.com/svn/trunk@5463 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-09-10 16:06:18 +00:00
reed@google.com
4bbec456d9
cache decoded bitmap in global for now
...
git-svn-id: http://skia.googlecode.com/svn/trunk@5457 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-09-10 11:50:26 +00:00
mike@reedtribe.org
ad6aa5cc60
enable lcdtext
...
git-svn-id: http://skia.googlecode.com/svn/trunk@5455 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-09-10 01:43:42 +00:00
mike@reedtribe.org
396948bf4a
update
...
git-svn-id: http://skia.googlecode.com/svn/trunk@5454 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-09-10 01:01:51 +00:00
skia.committer@gmail.com
3590a248bb
Sanitizing source files in Skia_Periodic_House_Keeping
...
git-svn-id: http://skia.googlecode.com/svn/trunk@5452 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-09-09 02:01:52 +00:00
reed@google.com
b567178eaf
update
...
git-svn-id: http://skia.googlecode.com/svn/trunk@5449 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-09-08 20:00:36 +00:00
reed@google.com
9f72d5481e
experimental
...
git-svn-id: http://skia.googlecode.com/svn/trunk@5448 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-09-08 16:52:23 +00:00
skia.committer@gmail.com
04ba448579
Sanitizing source files in Skia_Periodic_House_Keeping
...
git-svn-id: http://skia.googlecode.com/svn/trunk@5425 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-09-07 02:01:30 +00:00
robertphillips@google.com
94acc70312
Fixed Windows compiler complaints (esp. in debugger)
...
https://codereview.appspot.com/6497090/
git-svn-id: http://skia.googlecode.com/svn/trunk@5419 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-09-06 18:43:21 +00:00
bsalomon@google.com
100abf49e1
Shut up some Mac (xcode 3) warnings
...
Review URL: http://codereview.appspot.com/6503053/
git-svn-id: http://skia.googlecode.com/svn/trunk@5402 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-09-05 17:40:04 +00:00
robertphillips@google.com
5955202c80
Allow cache tracking to be enabled in release
...
https://codereview.appspot.com/6500057/
git-svn-id: http://skia.googlecode.com/svn/trunk@5365 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-08-31 13:07:37 +00:00
scroggo@google.com
3961aac79e
Reenable pipe for imagefiltersgraph GM on Android.
...
This test was fixed with r5269.
Review URL: https://codereview.appspot.com/6490045
git-svn-id: http://skia.googlecode.com/svn/trunk@5324 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-08-28 19:34:44 +00:00
reed@google.com
9c72827f90
disable pipe for now
...
git-svn-id: http://skia.googlecode.com/svn/trunk@5317 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-08-28 15:54:54 +00:00
reed@google.com
97af1a64ae
Add caching of the snapshot image form a surface
...
Notify the surface when the canvas draws into it, so it can invalidate the
cached image, and (if needed) perform a copy-on-write on the surface if it
was being shared with the image.
Review URL: https://codereview.appspot.com/6441115
git-svn-id: http://skia.googlecode.com/svn/trunk@5306 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-08-28 12:19:02 +00:00
rmistry@google.com
ae933ce0ea
Result of running tools/sanitize_source_files.py (which was added in https://codereview.appspot.com/6465078/ )
...
This CL is part III of IV (I broke down the 1280 files into 4 CLs).
Review URL: https://codereview.appspot.com/6475053
git-svn-id: http://skia.googlecode.com/svn/trunk@5264 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-08-23 18:19:56 +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
senorblanco@chromium.org
b2ee33c535
Implements the non-Porter-Duff compositing modes required for SVG's feBlend
...
element. This filter has two inputs, since normal blending can't be used. The
GPU side uses two filter stages to accomplish this: one to sample the
background, and one to sample the foreground and blend it.
Review URL: https://codereview.appspot.com/6463081/
git-svn-id: http://skia.googlecode.com/svn/trunk@5231 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-08-22 16:24:44 +00:00
robertphillips@google.com
5f9f2f574f
Added resource cache debug output to help track changes
...
http://codereview.appspot.com/6463079/
git-svn-id: http://skia.googlecode.com/svn/trunk@5220 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-08-22 10:57:05 +00:00
senorblanco@chromium.org
44888c66d4
Move SkColorFilterImageFilter into its own file.
...
Review URL: https://codereview.appspot.com/6463072/
git-svn-id: http://skia.googlecode.com/svn/trunk@5197 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-08-20 19:23:24 +00:00
borenet@google.com
b7961193a3
Enable 64-bit builds on Windows
...
Encountered compile errors passing 64-bit size_t to
SkIntToScalar and needed to make adjustments to
gm/gradients.cpp and bench/PicturePlaybackBench.cpp.
Verified on my local Linux, Mac, and Windows machines.
As of this change, the skia_arch_width gyp define
actually forces a 32/64-bit build on Linux, Mac, and
Windows.
Review URL: https://codereview.appspot.com/6460112
git-svn-id: http://skia.googlecode.com/svn/trunk@5195 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-08-20 18:58:26 +00:00
scroggo
facc95a87b
Disable imagefiltersgraph from running through pipe on android
...
While we figure out what the problem is.
Review URL: https://codereview.appspot.com/6441164
git-svn-id: http://skia.googlecode.com/svn/trunk@5193 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-08-20 17:55:10 +00:00
senorblanco@chromium.org
f1369ce607
Implements a new class, SkSingleInputImageFilter, to handle DAG connectivity
...
for filters with a single image input. This provides functionality to store,
flatten and unflatten a single SkImageFilter input, as well as to recursively
evaluate it on the CPU or GPU. The following classes were re-parented to
implement DAG connectivity: SkBlurImageFilter, SkDilateImageFilter,
SkErodeImageFilter, SkColorFilterImageFilter. The constructors for each
have been appended with a new parameter, representing the input filter
(default NULL).
This change also implements an arbitrary SkBitmap input source for filtering,
SkBitmapSource.
NOTE: This CL will require gyp file changes when rolling past this revision.
Review URL: https://codereview.appspot.com/6462071/
git-svn-id: http://skia.googlecode.com/svn/trunk@5170 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-08-20 14:53:21 +00:00
scroggo@google.com
837d31a0c9
Use SkCanvas::concat instead of SkCanvas::setMatrix so this GM can be tiled.
...
Review URL: https://codereview.appspot.com/6460091
git-svn-id: http://skia.googlecode.com/svn/trunk@5116 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-08-15 18:42:45 +00:00
scroggo@google.com
63258865c4
Skip tiled drawing in GM for magnifier image filter.
...
Merely skips the test until we get a real fix for the problem.
BUG=https://code.google.com/p/skia/issues/detail?id=781
Review URL: https://codereview.appspot.com/6459094
git-svn-id: http://skia.googlecode.com/svn/trunk@5111 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-08-15 16:32:19 +00:00
robertphillips@google.com
5d8d18651a
Addressed Windows compiler complaints
...
http://codereview.appspot.com/6462062/
This CL will require re-baselining of the imagemagnifier GM
git-svn-id: http://skia.googlecode.com/svn/trunk@5108 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-08-15 14:36:41 +00:00
bsalomon@google.com
82aa7482cb
Add a zoom filter to Skia. This will be used on ChromeOS to implement the screen magnifier.
...
Committed on behalf of zork@chromium.org
Review URL: http://codereview.appspot.com/6354065/
git-svn-id: http://skia.googlecode.com/svn/trunk@5056 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-08-13 14:22:17 +00:00
mike@reedtribe.org
d6c38137e2
suppress pip for now, since we use locally-defined effects
...
git-svn-id: http://skia.googlecode.com/svn/trunk@5053 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-08-13 01:57:05 +00:00
mike@reedtribe.org
3e044403e1
adjust size to match the content
...
git-svn-id: http://skia.googlecode.com/svn/trunk@5052 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-08-13 01:13:38 +00:00
mike@reedtribe.org
3d1cb97240
move texteffects from Sample to gm
...
git-svn-id: http://skia.googlecode.com/svn/trunk@5051 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-08-13 00:52:07 +00:00
reed@google.com
d74e710c00
remove SkShape (unused)
...
Review URL: https://codereview.appspot.com/6461069
git-svn-id: http://skia.googlecode.com/svn/trunk@5033 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-08-09 18:05:33 +00:00
reed@google.com
7b4531f64c
change SkTextToPathIter to allow continuation even when there is no path for
...
the current glyph. Fixes bug in getTextPath() if there are spaces in the text.
Update gm to add space-characters, so images will have to be rebaselined.
git-svn-id: http://skia.googlecode.com/svn/trunk@4979 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-08-07 15:53:00 +00:00
borenet@google.com
24e8999b4b
Remove verylargebitmap gm on Android
...
We can't allocate that much memory on Android
Review URL: https://codereview.appspot.com/6460054
git-svn-id: http://skia.googlecode.com/svn/trunk@4973 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-08-07 14:46:05 +00:00
reed@google.com
7eb3a2653b
add gm for very large bitmaps (>32K >64K)
...
raster expected to fail when scaling >64K (for now)
git-svn-id: http://skia.googlecode.com/svn/trunk@4967 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-08-07 14:05:14 +00:00
bsalomon@google.com
a68937c950
Move SK_SUPPORT_GPU checks below first #includes in case the macro is defined in SkUserConfig.h rather than by the build system.
...
git-svn-id: http://skia.googlecode.com/svn/trunk@4948 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-08-03 15:00:52 +00:00
bsalomon@google.com
2a48c3adb7
Fix includes files missing in release builds from GrCustomStageUnitTest.h.
...
Also fix SK_SUPPORT_GPU=0 build breaks in gmmain.cpp and GLProgramsTest.cpp
git-svn-id: http://skia.googlecode.com/svn/trunk@4947 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-08-03 14:54:45 +00:00
robertphillips@google.com
a73e860923
Skipping MSAA GMs on Android
...
http://codereview.appspot.com/6453079/
git-svn-id: http://skia.googlecode.com/svn/trunk@4926 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-08-02 17:56:02 +00:00
robertphillips@google.com
a2f8008fd7
Added output of failed GMs to assist tracking errors on Android
...
http://codereview.appspot.com/6452084/
git-svn-id: http://skia.googlecode.com/svn/trunk@4923 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-08-02 16:22:47 +00:00
bsalomon@google.com
54ad851361
Fix infinite recursion in cubic->quad conversion, also attempt to detect nearly flat cubics early.
...
Review URL: http://codereview.appspot.com/6448100/
THIS WILL REQUIRE REBASELINING OF CONVEXPATHS GM.
git-svn-id: http://skia.googlecode.com/svn/trunk@4917 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-08-02 14:55:45 +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
robertphillips@google.com
ab5ec7e3a5
Translated clip GMs to increase stability
...
http://codereview.appspot.com/6458064/
This will require rebaselining of complexclip2* & simplaaaclip*
git-svn-id: http://skia.googlecode.com/svn/trunk@4905 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-08-02 12:37:01 +00:00
scroggo@google.com
19c2894bc7
Fix memory leak in gammatext GM.
...
Review URL: https://codereview.appspot.com/6458055
git-svn-id: http://skia.googlecode.com/svn/trunk@4902 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-08-01 20:53:33 +00:00
scroggo@google.com
9f7520898e
Fix a memory leak in cmykjpeg GM.
...
Review URL: https://codereview.appspot.com/6448089
git-svn-id: http://skia.googlecode.com/svn/trunk@4861 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-07-31 16:37:11 +00:00
reed@google.com
076f4c9791
fix LayerDrawLooper to record its fFlagsMask
...
convert SampleDrawLooper to a GM
git-svn-id: http://skia.googlecode.com/svn/trunk@4854 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-07-31 14:32:38 +00:00
mike@reedtribe.org
d829b5cbff
add SkImage from encoded data
...
git-svn-id: http://skia.googlecode.com/svn/trunk@4845 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-07-31 03:57:11 +00:00
mike@reedtribe.org
d2782edf07
update to surface.getCanvas()
...
git-svn-id: http://skia.googlecode.com/svn/trunk@4844 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-07-31 02:45:15 +00:00
reed@google.com
58b21ec7f0
expand internal subclasses into separate files
...
git-svn-id: http://skia.googlecode.com/svn/trunk@4836 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-07-30 18:20:12 +00:00
scroggo@google.com
58be682c77
Share code in various SkGPipeCanvas::drawBitmap_ calls.
...
Also implement SkGPipeCanvas::drawBitmapMatrix, and
create a GM to make sure it works properly.
Use a flag instead of writing a bool for determining whether
drawBitmap_ has a paint and whether drawBitmapRect has a source
rectangle.
BUG=
TEST=drawbitmapmatrix GM
Review URL: https://codereview.appspot.com/6450053
git-svn-id: http://skia.googlecode.com/svn/trunk@4828 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-07-30 14:40:01 +00:00
mike@reedtribe.org
70e3590552
check-point for image/surface work
...
git-svn-id: http://skia.googlecode.com/svn/trunk@4823 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-07-29 20:38:16 +00:00
scroggo@google.com
3cb969f27d
In SkGPipe, only serialize SkTypefaces in cross process mode.
...
Also make SkGPipeController ref the recording canvas to ensure that
objects used by SkGPipeCanvas (e.g. SharedHeap and fTypefaceSet, which
hold references to objects to which pointers are written to the stream)
survive to be played back even if SkGPipeWriter.endRecording() is called.
BUG=
TEST=TypefaceGM
Review URL: https://codereview.appspot.com/6447055
git-svn-id: http://skia.googlecode.com/svn/trunk@4817 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-07-27 20:39:19 +00:00
scroggo@google.com
15011ee5e4
Make SkDeferredCanvas query SkGPipeWriter for space allocated for bitmaps.
...
SkGPipe now has a method to report how much memory is used for its shared heap.
BUG=http://code.google.com/p/skia/issues/detail?id=738
TEST=DeferredCanvasTest
Review URL: https://codereview.appspot.com/6445046
git-svn-id: http://skia.googlecode.com/svn/trunk@4791 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-07-26 20:03:32 +00:00
bsalomon@google.com
1c31f63323
Remove texture/mask setters on GrPaint
...
Review URL: http://codereview.appspot.com/6446052/
git-svn-id: http://skia.googlecode.com/svn/trunk@4790 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-07-26 19:39:06 +00:00
borenet@google.com
b4e704306a
Add flag to skip pipe on select GMs
...
Confirmed with scroggo@ that these should not be run
with pipe.
Review URL: https://codereview.appspot.com/6405068
git-svn-id: http://skia.googlecode.com/svn/trunk@4698 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-07-20 18:45:10 +00:00
borenet@google.com
03fc17cbf8
Disable bitmapcopy gm on Android
...
This has been failing on Nexus S. Disable so that we
don't miss further regressions.
Bug @ http://code.google.com/p/skia/issues/detail?id=705
Review URL: https://codereview.appspot.com/6427053
git-svn-id: http://skia.googlecode.com/svn/trunk@4696 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-07-20 18:19:06 +00:00
reed@google.com
005832439e
#include "SkTemplates.h"
...
git-svn-id: http://skia.googlecode.com/svn/trunk@4685 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-07-20 11:34:36 +00:00
reed@google.com
ca0062ee5e
add SkPaint::getPosTextPath(), with gm to test it
...
Review URL: https://codereview.appspot.com/6427055
git-svn-id: http://skia.googlecode.com/svn/trunk@4684 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-07-20 11:20:32 +00:00
senorblanco@chromium.org
1e95d715d0
Clean up the use of AutoScratchTexture in the gaussian blur and morphology
...
filters. Instead of passing in AutoScratchTextures for temporaries, we allocate
them inside the function and detach() after rendering. Since the functions now
return a ref()'ed texture, we no longer ref() the result in filter_texture().
Also, the imageblur gm was passing a paint with an image filter both to
saveLayer()/restore(), and to every text draw call. Back when only restore()
was applying filters, this was fine, but since we're now applying filters on all
draw calls, this means we're double-blurring in this GM.
I've reverted the Mac baselines for the imageblur GM to their previous versions;
hopefully this will be correct.
git-svn-id: http://skia.googlecode.com/svn/trunk@4659 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-07-18 19:52:53 +00:00
robertphillips@google.com
2a021292f5
Fixed simpleaaclip gm - it wasn't showing xor case
...
http://codereview.appspot.com/6402055/
This CL will require image rebaselining
git-svn-id: http://skia.googlecode.com/svn/trunk@4636 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-07-17 15:37:15 +00:00
reed@google.com
8d850be3aa
don't add circles on chopped cubics
...
git-svn-id: http://skia.googlecode.com/svn/trunk@4600 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-07-13 15:55:15 +00:00
robertphillips@google.com
7fb2601e7a
Fixed calling SkIntToScalar on a float error
...
git-svn-id: http://skia.googlecode.com/svn/trunk@4597 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-07-13 15:17:53 +00:00
robertphillips@google.com
54bb7abc09
Improved clarity of complexclip GM
...
http://codereview.appspot.com/6344108/
git-svn-id: http://skia.googlecode.com/svn/trunk@4596 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-07-13 14:55:25 +00:00
chudy@google.com
f32f6e8323
Added annotation for gm's -wp flag
...
Review URL: https://codereview.appspot.com/6345098
git-svn-id: http://skia.googlecode.com/svn/trunk@4573 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-07-12 15:42:37 +00:00
robertphillips@google.com
50a69a0727
Altered complexclip GM to test out saveLayer w/ a bound and clipping
...
http://codereview.appspot.com/6344108/
git-svn-id: http://skia.googlecode.com/svn/trunk@4561 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-07-12 13:48:46 +00:00
robertphillips@google.com
56c79b1037
Added GrContext::AutoClipStack to encapsulate setting\resetting of clip stack
...
http://codereview.appspot.com/6343097/
git-svn-id: http://skia.googlecode.com/svn/trunk@4558 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-07-11 20:57:46 +00:00
robertphillips@google.com
3e11c0bd92
Forced GrClip to always have conservative bounds
...
http://codereview.appspot.com/6353089/
git-svn-id: http://skia.googlecode.com/svn/trunk@4545 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-07-11 18:20:35 +00:00
tomhudson@google.com
cb325ceda1
Change TextContext handling of stages and draw targets; this allows us to
...
assert in GrContext::setPaint() that all stages are disabled every time
the paint is set.
Watch for possible performance implications.
http://codereview.appspot.com/6347043/
git-svn-id: http://skia.googlecode.com/svn/trunk@4531 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-07-11 14:41:19 +00:00
mike@reedtribe.org
bad1b2ff1d
add SkPath::contains(x, y)
...
git-svn-id: http://skia.googlecode.com/svn/trunk@4526 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-07-11 01:51:33 +00:00
rileya@google.com
6219728eec
Added pdf implementation of conical gradient.
...
Also fixed an erroneous comment in the gpu implementation.
Review URL: https://codereview.appspot.com/6351076
git-svn-id: http://skia.googlecode.com/svn/trunk@4520 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-07-10 20:05:23 +00:00
bsalomon@google.com
a51ab8416d
Preserve convex control point polygon in cubic->quadratic approximation
...
GM test modified, will require rebaselining.
Review URL: http://codereview.appspot.com/6355088/
git-svn-id: http://skia.googlecode.com/svn/trunk@4518 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-07-10 19:53:34 +00:00
robertphillips@google.com
5c0b3134ab
r4511 with handling for the Mac-specific CAN_IMAGE_PDF path
...
git-svn-id: http://skia.googlecode.com/svn/trunk@4513 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-07-10 17:50:00 +00:00
scroggo@google.com
d3ba5cc85e
In SkGPipe, set a limit on the amount of flattenables cached.
...
Also fix a type in gmmain.
Review URL: https://codereview.appspot.com/6351061
git-svn-id: http://skia.googlecode.com/svn/trunk@4473 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-07-09 16:05:53 +00:00
rileya@google.com
5cf2c28427
Added conical gradient to gm gradients test, and added two variants of that test, one with perspective applied to the local matrices of the gradients and the other with perspective applied to the overall view matrix.
...
Will require GM rebaselining.
Review URL: https://codereview.appspot.com/6344091
git-svn-id: http://skia.googlecode.com/svn/trunk@4468 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-07-09 14:42:16 +00:00
scroggo@google.com
d7dbd423f2
Ensure that SkDeferredCanvas::onCreateCompatibleDevice unrefs its temp device.
...
Also update my GM to use createCompatibleDevice.
Review URL: https://codereview.appspot.com/6357061
git-svn-id: http://skia.googlecode.com/svn/trunk@4450 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-07-03 15:16:30 +00:00
scroggo@google.com
6ea165dd8f
Another fix for drawing bitmaps through an SkGPipe that share pixelrefs.
...
In addition to checking the offset, also check to ensure that the width
and height match, so that a subset which includes the upper left corner
will be handled properly as well.
Review URL: https://codereview.appspot.com/6352066
git-svn-id: http://skia.googlecode.com/svn/trunk@4448 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-07-03 14:52:08 +00:00
reed@google.com
dbc5d28979
fix SkFixed build
...
git-svn-id: http://skia.googlecode.com/svn/trunk@4441 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-07-03 12:23:22 +00:00
mike@reedtribe.org
43c62b11ec
add gm for hittesting paths
...
git-svn-id: http://skia.googlecode.com/svn/trunk@4438 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-07-03 02:44:02 +00:00
scroggo
b3c0f4886e
Provide static global initializers for SkColorTable and SkComposeShader.
...
This makes some GMs which were broken on Android work. Reenable them on
Android.
Also fix a typo in gmmain.
Review URL: https://codereview.appspot.com/6344069
git-svn-id: http://skia.googlecode.com/svn/trunk@4426 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-07-02 19:07:57 +00:00
scroggo@google.com
aae9e27fcc
Fix buildbot.
...
GM is currently broken due to my new test. Disable the portion that
causes a crash.
Review URL: https://codereview.appspot.com/6344067
git-svn-id: http://skia.googlecode.com/svn/trunk@4418 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-07-02 14:36:33 +00:00
scroggo@google.com
4f1f6bf050
Properly handle extracted bitmaps in cross process/shared addr space SkGPipe.
...
Use the pixel ref which we have already copied and the appropriate pixel ref
offset.
Turn SampleDrawBitmap into a GM to test this functionality.
Review URL: https://codereview.appspot.com/6348059
git-svn-id: http://skia.googlecode.com/svn/trunk@4417 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-07-02 13:35:09 +00:00
scroggo@google.com
b340cf7e3d
Only skip pipe playback for blurs GM in FIXED mode.
...
Only skip it when it would actually fail. Also add a comment
describing why it fails:
// SkCanvas::drawCircle, used by this test, performs a quick reject.
// The large size given to the device used by SkGPipeCanvas means that
// the device clip will not be set properly and circles will be
// rejected when in FIXED.
Review URL: https://codereview.appspot.com/6354058
git-svn-id: http://skia.googlecode.com/svn/trunk@4414 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-06-29 19:25:21 +00:00
scroggo@google.com
d5429282d1
Disable pipe playback on android for composeshader GM.
...
Review URL: https://codereview.appspot.com/6349058
git-svn-id: http://skia.googlecode.com/svn/trunk@4409 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-06-29 18:11:31 +00:00
scroggo@google.com
99853c743d
Allow composeshader GM to run PDF.
...
Review URL: https://codereview.appspot.com/6373043
git-svn-id: http://skia.googlecode.com/svn/trunk@4408 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-06-29 17:45:49 +00:00
scroggo@google.com
32f20eb02c
Create a new GM to exercise ComposeShader.
...
Code borrowed from samplecode/SampleShaders.cpp
Review URL: https://codereview.appspot.com/6371043
git-svn-id: http://skia.googlecode.com/svn/trunk@4407 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-06-29 17:28:50 +00:00
scroggo@google.com
fc937347bf
Disable pipe for bitmapfilters gm on Android.
...
Until I can investigate why the test is broken.
Review URL: https://codereview.appspot.com/6357045
git-svn-id: http://skia.googlecode.com/svn/trunk@4395 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-06-28 19:55:06 +00:00
scroggo@google.com
3ab3175030
Turn off the blurs GM for Pipe playback.
...
It was failing on FIXED. Turn it off while we fix the real problem.
Review URL: https://codereview.appspot.com/6349051
git-svn-id: http://skia.googlecode.com/svn/trunk@4386 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-06-28 16:09:39 +00:00
scroggo@google.com
565254bc93
Fix SkGPipe drawing, and turn it on by default.
...
A recent change broke SkGPipe. Fix it, and turn on pipe drawing
in GM by default so we will catch these in the future.
We already had a bug where SkGPipeWriter had to use its Cross Process
flag to work, so for a quick fix, force the reader to use the Cross
Process flag as well. The bug to allow both cross and non cross process
is http://code.google.com/p/skia/issues/detail?id=663
Review URL: https://codereview.appspot.com/6333071
git-svn-id: http://skia.googlecode.com/svn/trunk@4384 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-06-28 15:41:32 +00:00
robertphillips@google.com
97fafe1b5e
Altered SkInstCnt to print out atexit
...
http://codereview.appspot.com/6348043/
git-svn-id: http://skia.googlecode.com/svn/trunk@4377 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-06-27 19:52:20 +00:00
robertphillips@google.com
b74af872cc
Separated Inst counting from the SK_DEBUG #define (now SK_ENABLE_INST_COUNT)
...
http://codereview.appspot.com/6353047/
git-svn-id: http://skia.googlecode.com/svn/trunk@4376 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-06-27 19:41:42 +00:00
reed@google.com
4bca84d3cf
don't leak filters
...
git-svn-id: http://skia.googlecode.com/svn/trunk@4358 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-06-27 14:00:06 +00:00
reed@google.com
31f5ccd188
add dump for SkWStream inst-leaks
...
git-svn-id: http://skia.googlecode.com/svn/trunk@4349 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-06-26 19:25:18 +00:00
reed@google.com
563a3b4102
more SkInstCnt plumbing
...
fix some typeface leaks
git-svn-id: http://skia.googlecode.com/svn/trunk@4348 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-06-26 19:24:50 +00:00
borenet@google.com
0682ca6971
Re-enable gm fontscaler for Android
...
This was fixed in 4.1, and we're upgrading the bots since no non-beta client
uses 4.0.
Review URL: https://codereview.appspot.com/6334058
git-svn-id: http://skia.googlecode.com/svn/trunk@4342 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-06-26 17:23:52 +00:00
borenet@google.com
ceb2a0311f
Temporarily disable failing GM tests on Android
...
- fontscaler - this test fails due to a GL driver bug fixed in Jelly Bean
- drawbitmaprect - suspect this is also a driver bug
- shadertext - causes the device to reboot
Review URL: https://codereview.appspot.com/6330057
git-svn-id: http://skia.googlecode.com/svn/trunk@4336 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-06-25 21:03:04 +00:00
senorblanco@chromium.org
f49b429cef
Raster implementation of diffuse and specular lighting filters. Externally,
...
the caller instantiates a light (distant, point or spot), and an
SkDiffuseLightingFilter or SkSpecularLightingImageFilter with that light. A
Sobel edge detection filter is applied to the alpha of the incoming bitmap, and
the result is used as a height map for lighting calculations.
Review URL: http://codereview.appspot.com/6302101/
git-svn-id: http://skia.googlecode.com/svn/trunk@4314 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-06-22 21:01:23 +00:00
reed@google.com
e5f48b92b3
change gm option from -config to --config, to match the double-dash convention of
...
all of its other options.
Review URL: https://codereview.appspot.com/6337044
git-svn-id: http://skia.googlecode.com/svn/trunk@4307 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-06-22 15:27:39 +00:00
borenet@google.com
14ca1d33bc
Revert r4259
...
git-svn-id: http://skia.googlecode.com/svn/trunk@4260 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-06-15 13:46:44 +00:00
borenet@google.com
78fc39021e
Serialize by Default
...
- doSerialize is true by default
- "--serialize" flag replaced by "--noserialize"
Review URL: https://codereview.appspot.com/6274045
git-svn-id: http://skia.googlecode.com/svn/trunk@4259 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-06-15 12:53:04 +00:00
robertphillips@google.com
4d73ac22a1
Version 2 of the Instance Counting system. This one simplifies the print out of information.
...
http://codereview.appspot.com/6296069/
git-svn-id: http://skia.googlecode.com/svn/trunk@4255 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-06-13 18:54:08 +00:00
robertphillips@google.com
4bdfb8c9d6
Compiler complaints + some minor cleanup
...
http://codereview.appspot.com/6295070/
git-svn-id: http://skia.googlecode.com/svn/trunk@4238 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-06-12 21:23:49 +00:00
robertphillips@google.com
f6747b0b90
Split GrContext's AA Rect drawing methods into helper class
...
http://codereview.appspot.com/6300070/
git-svn-id: http://skia.googlecode.com/svn/trunk@4233 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-06-12 00:32:28 +00:00
reed@google.com
5ee6491b7a
Better fix for rev. 4214 (inverse-fill and clipping). This fix avoids changing
...
the actual clipping bounds, which caused tiny differences in the scan converter.
Also adding a gm (which I should have the first time.)
Review URL: https://codereview.appspot.com/6297073
git-svn-id: http://skia.googlecode.com/svn/trunk@4227 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-06-11 17:30:33 +00:00
scroggo@google.com
5867c0f032
Add the ability to specify config to GM.
...
Code adapted from bench.
To specify a config, add -config <configName1>|<configName2> etc
to the command line.
To find the valid names (which can depend on flags passed in), use
-h or --help.
Review URL: https://codereview.appspot.com/6297053
git-svn-id: http://skia.googlecode.com/svn/trunk@4205 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-06-07 17:39:48 +00:00
robertphillips@google.com
75b3c9633c
Move clientID into texture desc
...
http://codereview.appspot.com/6305044/
git-svn-id: http://skia.googlecode.com/svn/trunk@4201 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-06-07 12:08:45 +00:00
scroggo@google.com
72c9672ce2
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@4199 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-06-06 21:07:10 +00:00
bsalomon@google.com
47059542e7
Search and replace change. Some Gr enum value names didn't have a "Gr" in their suffix.
...
Verbal LGTM from TomH
git-svn-id: http://skia.googlecode.com/svn/trunk@4198 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-06-06 20:51:20 +00:00
reed@google.com
cb7be694c3
Add new gradient to support HTML Canvas2D two-point-radial-gradient. Ours is
...
called (for now at least) TwoPointConical, to distinguish it from the
existing one (TwoPointRadial), and to reflect its odd behavior where it draws
transparent outside the boundary of the "cone" between the two circles.
This impl is unsupported by GPU and Printing at the moment, and Chrome does not
yet invoke it.
Review URL: https://codereview.appspot.com/6299051
git-svn-id: http://skia.googlecode.com/svn/trunk@4197 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-06-06 20:31:56 +00:00
scroggo@google.com
d895b055a0
Reenable running samplerstress GM in pipe mode.
...
It was disabled because samplerstress did was not
registered for flattening. Now that it is, do not
skip it when running GM in pipe mode.
Review URL: https://codereview.appspot.com/6305057
git-svn-id: http://skia.googlecode.com/svn/trunk@4196 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-06-06 19:13:46 +00:00
caryclark@google.com
1313086ef4
fix warnings on Mac in gm
...
Fix these class of warnings:
- unused functions
- unused locals
- sign mismatch
- missing function prototypes
- missing newline at end of file
- 64 to 32 bit truncation
The changes prefer to link in dead code in the debug build
with 'if (false)' than to comment it out, but trivial cases
are commented out or sometimes deleted if it appears to be
a copy/paste error.
Review URL: https://codereview.appspot.com/6305046
git-svn-id: http://skia.googlecode.com/svn/trunk@4185 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-06-06 12:10:45 +00:00
robertphillips@google.com
977b9c8af3
Instance counting for SkRefCnt-derived objects (w/ CanvasTest fix)
...
http://codereview.appspot.com/6242070/
git-svn-id: http://skia.googlecode.com/svn/trunk@4170 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-06-05 19:35:09 +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
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
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
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
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
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
robertphillips@google.com
67febd9506
Converted AAClips SampleApp slide to GM:simpleaaclip
...
http://codereview.appspot.com/6220043/
git-svn-id: http://skia.googlecode.com/svn/trunk@4025 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-05-22 12:14:50 +00:00
reed@google.com
de1837bb96
remove bogus nearlyzero checks
...
Review URL: https://codereview.appspot.com/6213060
git-svn-id: http://skia.googlecode.com/svn/trunk@4014 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-05-21 16:47:43 +00:00
reed@google.com
21384df037
add dashing2 gm to exercise dashing on curves and polygons
...
git-svn-id: http://skia.googlecode.com/svn/trunk@3997 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-05-18 17:59:08 +00:00
tomhudson@google.com
ffe39bd3b6
Fix type errors and a few warnings for Visual Studio 2010 64-bit build.
...
We're still far from 64b statically safe, mostly around SkReader32.h
and the address-alignment code in GrTypes.h.
Original code provided by jianliang79.
http://code.google.com/p/skia/issues/detail?id=601
git-svn-id: http://skia.googlecode.com/svn/trunk@3994 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-05-17 15:38:00 +00:00
reed@google.com
e8fcb5017c
add options to enable/disable "FAILED to read ..." message
...
--disable-missing-warning
--enable-missing-warning
default is still enabled
git-svn-id: http://skia.googlecode.com/svn/trunk@3992 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-05-17 15:28:20 +00:00
robertphillips@google.com
2470b25ac8
Updated AAClips Sample slide and complexclip2 GM to exercise AA clipping
...
http://codereview.appspot.com/6212047/
will require image rebaselining
git-svn-id: http://skia.googlecode.com/svn/trunk@3943 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-05-15 17:03:16 +00:00
vandebo@chromium.org
683001ce0d
[PDF] Ensure that filling single line paths (with no area) does not draw anything.
...
Add a test to a gm to confirm the new behavior.
Fixes http://crbug.com/123072
Review URL: https://codereview.appspot.com/6137060
git-svn-id: http://skia.googlecode.com/svn/trunk@3884 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-05-09 17:17:51 +00:00
reed@google.com
5aff0ef9d7
commented-out test for exact aa coverage
...
git-svn-id: http://skia.googlecode.com/svn/trunk@3878 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-05-09 15:04:11 +00:00
reed@google.com
35a81dfdb2
add gm for dashing variations
...
git-svn-id: http://skia.googlecode.com/svn/trunk@3842 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-05-04 21:49:27 +00:00
robertphillips@google.com
a93f9c3893
converted "unsigned int" to "size_t" to address compiler failure
...
git-svn-id: http://skia.googlecode.com/svn/trunk@3815 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-05-02 14:05:47 +00:00
robertphillips@google.com
d9d5385791
Added GM test to stress test the texture unit/sampler allocation
...
http://codereview.appspot.com/6134058/
git-svn-id: http://skia.googlecode.com/svn/trunk@3814 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-05-02 13:55:06 +00:00
bsalomon@google.com
7d30a21315
Fixes matrix inconsistency in GPU draws with filters. Also adds a GM test.
...
May make GM go red on bots, will rebaseline.
Committed on behalf of Guanqun.Lu@gmail.com
Review URL: http://codereview.appspot.com/6049046/
git-svn-id: http://skia.googlecode.com/svn/trunk@3764 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-04-25 15:52:27 +00:00
bsalomon@google.com
daf12bb01a
Fix early termination of GM when 16x msaa rt can't be created.
...
git-svn-id: http://skia.googlecode.com/svn/trunk@3744 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-04-20 19:08:44 +00:00
reed@google.com
57b1935dbc
silence warning
...
git-svn-id: http://skia.googlecode.com/svn/trunk@3735 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-04-19 19:25:49 +00:00
bsalomon@google.com
7361f54294
Make GM able to run MSAA modes and multiple GPU configs in a single run.
...
Review URL: http://codereview.appspot.com/6061051/
git-svn-id: http://skia.googlecode.com/svn/trunk@3734 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-04-19 19:15:35 +00:00
vandebo@chromium.org
95ead84e0f
Fix some float/scalar/int confusion.
...
Review URL: https://codereview.appspot.com/6064043
git-svn-id: http://skia.googlecode.com/svn/trunk@3725 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-04-18 17:11:19 +00:00
epoger@google.com
9284ccd8bc
Make gm tool able to read and write image files in the same run
...
BUG=http://code.google.com/p/skia/issues/detail?id=571
Review URL: https://codereview.appspot.com/6052050
git-svn-id: http://skia.googlecode.com/svn/trunk@3717 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-04-18 13:36:54 +00:00
vandebo@chromium.org
c39c8674c9
Fix some fixed-point bugs.
...
Review URL: https://codereview.appspot.com/6047046
git-svn-id: http://skia.googlecode.com/svn/trunk@3714 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-04-17 21:46:18 +00:00
robertphillips@google.com
6853e808a4
Addressed more Windows compiler complaint issues
...
http://codereview.appspot.com/6007056/
git-svn-id: http://skia.googlecode.com/svn/trunk@3689 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-04-16 15:50:18 +00:00
bsalomon@google.com
0b26c15876
Add file missing from r3682 checkin
...
git-svn-id: http://skia.googlecode.com/svn/trunk@3683 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-04-16 14:19:32 +00:00
tomhudson@google.com
75589257c6
Fix miscellaneous compiler warnings from Visual Studio 2010.
...
Changes serialization path for MorphologyImageFilter, handling of Windows
HRESULTS; otherwise just tweaks tests.
git-svn-id: http://skia.googlecode.com/svn/trunk@3642 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-04-10 17:42:21 +00:00
senorblanco@chromium.org
56dd630c41
Clamp dilate and erode radius to image width and height.
...
NOTE: This will require new baselines for the morphology GM.
git-svn-id: http://skia.googlecode.com/svn/trunk@3641 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-04-10 17:25:44 +00:00
reed@google.com
8e529b7947
change -d option to write out complete images (that differed from the baseline)
...
git-svn-id: http://skia.googlecode.com/svn/trunk@3632 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-04-09 20:20:10 +00:00
robertphillips@google.com
09042b80d2
Fixing Windows compiler complaints
...
http://codereview.appspot.com/5991056/
git-svn-id: http://skia.googlecode.com/svn/trunk@3626 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-04-06 20:01:46 +00:00
junov@chromium.org
7c545bddf8
Augment gm shadows test to cover hairline paths
...
Note: this patch will cause gm/shadows to fail on all platforms until the test is re baselined.
REVIEW=http://codereview.appspot.com/5972065/
git-svn-id: http://skia.googlecode.com/svn/trunk@3612 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-04-05 13:20:59 +00:00
reed@google.com
d42e3f60cd
defer drawing/work until first draw, to make debugging easier and speedup
...
instantiating the obj just to get its name.
git-svn-id: http://skia.googlecode.com/svn/trunk@3568 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-03-30 20:04:21 +00:00
robertphillips@google.com
d3b9fbbc48
Code changes for ANGLE GL interface. .gyp file changes will be delivered later.
...
http://codereview.appspot.com/5940046/
git-svn-id: http://skia.googlecode.com/svn/trunk@3519 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-03-28 16:19:11 +00:00
djsollen@google.com
ba28d03e94
Create macro for registering classes for deserialization
...
Review URL: https://codereview.appspot.com/5909063
git-svn-id: http://skia.googlecode.com/svn/trunk@3494 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-03-26 17:57:35 +00:00
bsalomon@google.com
22f42b71fc
[GPU] when paint has patheffect, it should fallback to path render
...
Comitted on behalf of Guanqun.Lu@gmail.com
THIS MAY CAUSE GM TO GO RED, WILL REBASELINE.
Review URL: http://codereview.appspot.com/5885057/
git-svn-id: http://skia.googlecode.com/svn/trunk@3487 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-03-26 14:36:55 +00:00
djsollen@google.com
a2ca41e3af
Cleanup Macros arround static initializers for SkFlattenable.
...
This CL also removes an unused debugging function from the class
Review URL: https://codereview.appspot.com/5890043
git-svn-id: http://skia.googlecode.com/svn/trunk@3483 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-03-23 19:00:34 +00:00
robertphillips@google.com
ec51cb8634
Improved codec link-forcing system by adding Encoder/Decoder creation entry points
...
http://codereview.appspot.com/5881055/
git-svn-id: http://skia.googlecode.com/svn/trunk@3481 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-03-23 18:13:47 +00:00
reed@google.com
8926b169f6
apply imagefilter to all draw calls
...
Review URL: https://codereview.appspot.com/5856048
git-svn-id: http://skia.googlecode.com/svn/trunk@3476 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-03-23 15:36:36 +00:00
reed@google.com
9afc656df6
delay any drawing until first call to onDraw (eases debugging)
...
git-svn-id: http://skia.googlecode.com/svn/trunk@3461 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-03-22 14:09:28 +00:00
robertphillips@google.com
f6f123d236
Added tracking of frame buffer objects to debug GL interface
...
http://codereview.appspot.com/5866043/
git-svn-id: http://skia.googlecode.com/svn/trunk@3455 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-03-21 17:57:55 +00:00
vandebo@chromium.org
79d3cb4ba7
[PDF] Add GM and infrastructure to test drawing shaders with an initial transform.
...
Previous review at https://codereview.appspot.com/5867047/ and https://codereview.appspot.com/5849045/
TBR=reed@google.com
Review URL: https://codereview.appspot.com/5860044
git-svn-id: http://skia.googlecode.com/svn/trunk@3452 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-03-21 17:34:30 +00:00
vandebo@chromium.org
a43a532e94
Revert "[PDF] Add GM and infrastructure to test drawing shaders with an initial transform."
...
This reverts r3450
TBR=reed@google.com
Review URL: https://codereview.appspot.com/5864050
git-svn-id: http://skia.googlecode.com/svn/trunk@3451 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-03-21 17:11:27 +00:00
vandebo@chromium.org
b0ccdec166
[PDF] Add GM and infrastructure to test drawing shaders with an initial transform.
...
Review URL: https://codereview.appspot.com/5867047
git-svn-id: http://skia.googlecode.com/svn/trunk@3450 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-03-21 16:45:47 +00:00
robertphillips@google.com
8570b5c869
Adding CMYK jpeg changes w/o .gyp alterations
...
http://codereview.appspot.com/5785054/
git-svn-id: http://skia.googlecode.com/svn/trunk@3442 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-03-20 17:40:58 +00:00
robertphillips@google.com
0a89c90d18
reverting to 3437
...
git-svn-id: http://skia.googlecode.com/svn/trunk@3439 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-03-20 15:13:04 +00:00
robertphillips@google.com
d5c9e996df
Fix for CMYK jpeg decoding issue (69 - unable to read some jpeg files on android)
...
http://codereview.appspot.com/5785054/
git-svn-id: http://skia.googlecode.com/svn/trunk@3438 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-03-20 14:51:47 +00:00
bungeman@google.com
f8aa18c08d
Compile with c++0x.
...
http://codereview.appspot.com/5841074/
git-svn-id: http://skia.googlecode.com/svn/trunk@3434 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-03-19 21:04:52 +00:00
bsalomon@google.com
1a38d5508f
Perform degenerate check in device coords in convex path renderer
...
Review URL: http://codereview.appspot.com/5821053/
git-svn-id: http://skia.googlecode.com/svn/trunk@3401 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-03-15 14:40:46 +00:00
tomhudson@google.com
7816a4e840
Close an (incidental) memory leak in gmmain.
...
Create a suppressions file for gm so that valgrind doesn't warn about
dubious actions the driver takes. There *may* be one of those that we
could do something about...
http://codereview.appspot.com/5820056/
git-svn-id: http://skia.googlecode.com/svn/trunk@3396 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-03-15 13:39:51 +00:00
reed@google.com
6005aeb3aa
update test
...
git-svn-id: http://skia.googlecode.com/svn/trunk@3393 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-03-14 20:15:47 +00:00
reed@google.com
6b2f7ea7f4
tweak gm bounds to better fit the content
...
remove assert that is too strict if the src is the dst of a prev draw
(where alpha might be 0xFE, even if it *should* be 0xFF)
git-svn-id: http://skia.googlecode.com/svn/trunk@3388 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-03-14 20:00:42 +00:00
vandebo@chromium.org
54ff85c79d
[PDF] Fix some fixed/float-point mismatches for image shaders.
...
BUG=520
Review URL: https://codereview.appspot.com/5787061
git-svn-id: http://skia.googlecode.com/svn/trunk@3356 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-03-09 17:18:50 +00:00
reed@google.com
b0b462b93b
add more modes/flags to giantbitmap test
...
git-svn-id: http://skia.googlecode.com/svn/trunk@3353 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-03-08 22:13:39 +00:00
reed@google.com
26b73d3128
defer any drawing until our first time, so we don't do it in our
...
constructor (which may get called multiple times)
git-svn-id: http://skia.googlecode.com/svn/trunk@3352 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-03-08 22:13:04 +00:00
reed@google.com
ce151d0eba
return false if the typeface cannot be found
...
from https://codereview.appspot.com/5756059/
git-svn-id: http://skia.googlecode.com/svn/trunk@3340 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-03-08 16:10:57 +00:00
reed@google.com
584493e653
disable PDF for now, until http://code.google.com/p/skia/issues/detail?id=520
...
is fixed
git-svn-id: http://skia.googlecode.com/svn/trunk@3338 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-03-08 14:40:07 +00:00
reed@google.com
4bc0a9db18
use higher precision (64bit) fixed-point for matrix proc
...
Review URL: https://codereview.appspot.com/5772044
git-svn-id: http://skia.googlecode.com/svn/trunk@3336 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-03-07 21:47:41 +00:00
senorblanco@chromium.org
05054f1a78
Erode and dilate image filter effects, CPU and GPU implementations.
...
Review URL: http://codereview.appspot.com/5656067/
git-svn-id: http://skia.googlecode.com/svn/trunk@3310 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-03-02 21:05:45 +00:00
bsalomon@google.com
5b56d9e43f
In convex path renderer, translate polygon to origin for fanPt computation
...
Review URL: http://codereview.appspot.com/5698051/
git-svn-id: http://skia.googlecode.com/svn/trunk@3241 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-02-23 19:18:37 +00:00
bsalomon@google.com
278dc6929b
Use cheapComputeDirection to determine normal facing in GrAAConvexPathRenderer
...
Review URL: http://codereview.appspot.com/5649083/
git-svn-id: http://skia.googlecode.com/svn/trunk@3198 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-02-15 16:52:51 +00:00
reed@google.com
ed3ee6418a
add test for colored text drawing (hopefully gamma corrected)
...
git-svn-id: http://skia.googlecode.com/svn/trunk@3190 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-02-14 16:12:49 +00:00
tomhudson@google.com
6bf38b59c9
Move GL-specific include files to their own subdirectory, to better
...
coexist alongside D3D backend.
Requires gyp change.
http://codereview.appspot.com/5665045/
git-svn-id: http://skia.googlecode.com/svn/trunk@3185 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-02-14 15:11:59 +00:00
epoger@google.com
7bc13a6260
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@3184 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-02-14 14:53:59 +00:00
bsalomon@google.com
632151bc91
Add path effect GM
...
Review URL: http://codereview.appspot.com/5649069/
git-svn-id: http://skia.googlecode.com/svn/trunk@3172 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-02-13 15:18:34 +00:00
bsalomon@google.com
dc3c78076e
[GPU]: Handle degenerate quads when computing UV matrix from control points
...
Review URL: http://codereview.appspot.com/5602045/
git-svn-id: http://skia.googlecode.com/svn/trunk@3125 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-01-31 20:46:32 +00:00
twiz@google.com
e24a07980e
Expose '--notexturecache' command line argument to gm.
...
Pass '--notexturecache' to gm to resize the Ganesh texture cache to 0. This stresses Ganesh's behaviour after a cache purge operation.
Review URL: https://codereview.appspot.com/5569079
git-svn-id: http://skia.googlecode.com/svn/trunk@3123 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-01-31 18:35:30 +00:00
bsalomon@google.com
9732f62eae
Fix degenerate test in convex path renderer
...
Review URL: http://codereview.appspot.com/5581058/
git-svn-id: http://skia.googlecode.com/svn/trunk@3118 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-01-31 15:19:21 +00:00
reed@google.com
bb0948fce2
increase height to include entire circle for large radial
...
git-svn-id: http://skia.googlecode.com/svn/trunk@3114 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-01-31 14:44:13 +00:00
tomhudson@google.com
39c2515816
Add missing SkFloatToScalar() calls to fix the build.
...
git-svn-id: http://skia.googlecode.com/svn/trunk@3108 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-01-30 20:12:10 +00:00
tomhudson@google.com
b18e58c065
New radial gradient GM to observe banding and dithering effects.
...
Gray transparent disk in the center, shading to black transparent at edges.
git-svn-id: http://skia.googlecode.com/svn/trunk@3107 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-01-30 20:00:13 +00:00
bsalomon@google.com
78d6cf9f43
Remove GrAALevel enum, use explicit sample count
...
Review URL: http://codereview.appspot.com/5600045/
git-svn-id: http://skia.googlecode.com/svn/trunk@3106 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-01-30 18:09:31 +00:00
junov@chromium.org
bf6c1e4aff
Adding a flush method to SkCanvas
...
BUG=http://code.google.com/p/skia/issues/detail?id=467
REVIEW=http://codereview.appspot.com/5600044/
TEST=gm uses the new code path on all its test cases
git-svn-id: http://skia.googlecode.com/svn/trunk@3102 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-01-30 14:53:22 +00:00
bsalomon@google.com
72b55be3f3
Change background color and add paths to convexpaths gm
...
git-svn-id: http://skia.googlecode.com/svn/trunk@3090 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-01-26 20:33:19 +00:00
bsalomon@google.com
0680961481
revert 3078
...
git-svn-id: http://skia.googlecode.com/svn/trunk@3079 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-01-21 15:03:39 +00:00
bsalomon@google.com
495e210eb1
fix interior issues in convex path renderer
...
git-svn-id: http://skia.googlecode.com/svn/trunk@3078 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-01-21 14:48:36 +00:00
epoger@google.com
e3cc2eb88f
Stop writing out XPS baselines until we resolve skia issue 455
...
BUG=455
TBR=bungeman
Review URL: https://codereview.appspot.com/5554052
git-svn-id: http://skia.googlecode.com/svn/trunk@3068 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-01-18 20:11:13 +00:00
junov@google.com
77e498e6ba
Updating gm's usage message
...
git-svn-id: http://skia.googlecode.com/svn/trunk@3065 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-01-18 18:56:34 +00:00
junov@google.com
4370aedf7f
Adding class SkDeferredCanvas for deferred rendering.
...
TEST=added a new pass to gm, so all gm tests are run through SkDeferredCanvas
REVIEW=http://codereview.appspot.com/5430058/
git-svn-id: http://skia.googlecode.com/svn/trunk@3059 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-01-18 16:21:08 +00:00
reed@google.com
188bfcf766
if the y-max has neighbors (prev and next) with the same Y values, then the
...
cross will be 0, but we can still know the direction by looking at the change
in X
Fixes the hypen in #7 of this bug http://code.google.com/p/chromium/issues/detail?id=109370
git-svn-id: http://skia.googlecode.com/svn/trunk@3049 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-01-17 18:26:38 +00:00
bsalomon@google.com
5cc90d1322
Incorporate changes related to Tom's post-hoc comments on the convex path renderer.
...
git-svn-id: http://skia.googlecode.com/svn/trunk@3045 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-01-17 16:28:34 +00:00
bsalomon@google.com
69cc6ad20e
Add convex path renderer (disabled)
...
Review URL: http://codereview.appspot.com/5533061/
git-svn-id: http://skia.googlecode.com/svn/trunk@3040 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-01-17 14:25:10 +00:00
reed@google.com
3d19c385e7
fix cheapComputeDirection() in the non-convex case to pivot on the y-max point
...
rather than pivoting on the next. Also remove the loop, as it is just logically
wrong to think we can use this trick only a non-extrema pt.
git-svn-id: http://skia.googlecode.com/svn/trunk@3014 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-01-11 18:16:39 +00:00
reed@google.com
b435bd7d49
use SkIntToScalar
...
git-svn-id: http://skia.googlecode.com/svn/trunk@3003 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-01-10 19:28:01 +00:00
reed@google.com
3e71a88762
add gm for reverseAddPath
...
git-svn-id: http://skia.googlecode.com/svn/trunk@3001 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-01-10 18:44:37 +00:00
reed@google.com
d1ab9320b0
restore (debugged) cheapComputeDirection
...
git-svn-id: http://skia.googlecode.com/svn/trunk@3000 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-01-10 18:40:03 +00:00
reed@google.com
df6bcb1412
disable for now
...
git-svn-id: http://skia.googlecode.com/svn/trunk@2999 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-01-10 18:13:23 +00:00
reed@google.com
69a9943b67
add SkPath::cheapComputeDirection() plus unittests
...
git-svn-id: http://skia.googlecode.com/svn/trunk@2996 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-01-10 18:00:10 +00:00
reed@google.com
63d73749fb
add SkPath::reverseAddPath()
...
git-svn-id: http://skia.googlecode.com/svn/trunk@2995 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-01-10 15:33:12 +00:00
bsalomon@google.com
cadbcb8e53
Towards enabling -Werror in skia on Linux
...
Review URL: http://codereview.appspot.com/5516044/
git-svn-id: http://skia.googlecode.com/svn/trunk@2983 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-01-06 19:22:11 +00:00
reed@google.com
76dd277b1f
add filterImage() entry-point to SkDevice, to allow it to specialize on subclasses
...
of SkImageFilter. If that returns false, then the filter itself is invoked.
git-svn-id: http://skia.googlecode.com/svn/trunk@2977 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-01-05 21:15:07 +00:00
vandebo@chromium.org
663515bc59
[PDF] Fix some scalar/int assumptions.
...
Review URL: http://codereview.appspot.com/5516043
git-svn-id: http://skia.googlecode.com/svn/trunk@2975 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-01-05 18:45:27 +00:00
senorblanco@chromium.org
b3a39b5b01
When applying a color matrix, unpremultiply the source, and premultiply the
...
result. If the input color is missing, set to all-zeros or all-ones as
appropriate. Add an alpha test case to the colormatrix GM.
Review URL: http://codereview.appspot.com/5520046/
git-svn-id: http://skia.googlecode.com/svn/trunk@2974 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-01-05 18:28:56 +00:00
bungeman@google.com
a682b93736
Make font scaler gm work correctly in fixed point.
...
http://codereview.appspot.com/5509049/
git-svn-id: http://skia.googlecode.com/svn/trunk@2973 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-01-05 18:10:48 +00:00
senorblanco@chromium.org
8ff9c74892
Reverting r2969, since it broke the GLPrograms RunTests step.
...
Unreviewed; build fix.
git-svn-id: http://skia.googlecode.com/svn/trunk@2972 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-01-05 17:34:38 +00:00
senorblanco@chromium.org
c3e159a325
When applying a color matrix, unpremultiply the source, and premultiply
...
the result.
Review URL: http://codereview.appspot.com/5520046/
git-svn-id: http://skia.googlecode.com/svn/trunk@2969 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-01-05 16:59:27 +00:00
bungeman@google.com
dc9a695a62
The units used to setup XPS should be SkScalars.
...
http://codereview.appspot.com/5509050/
git-svn-id: http://skia.googlecode.com/svn/trunk@2968 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-01-05 16:56:29 +00:00
schenney@chromium.org
6630d8d8ea
Add the ability to iterate through a path without modification. This change is
...
required by WebKit SVG in order to correctly draw markers and endcaps.
BUG=415
TEST=TestPath in the unit tests
Review URL: http://codereview.appspot.com/5505097
git-svn-id: http://skia.googlecode.com/svn/trunk@2962 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-01-04 21:05:51 +00:00
schenney@chromium.org
0b71f6cedd
Removing path drawing gm tests that produce either an entirely
...
filled or entirely empty clip area. Requested but not reviewed by
reed@google.com .
TEST=Covered now by unit testing.
git-svn-id: http://skia.googlecode.com/svn/trunk@2956 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-01-04 00:18:53 +00:00
schenney@chromium.org
68f11dee77
Removing unnecessary gm tests. Unreviewed but approved by reed@google.com.
...
TEST=Test coverage now in unit tests.
git-svn-id: http://skia.googlecode.com/svn/trunk@2951 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-01-03 21:37:19 +00:00
senorblanco@chromium.org
50bdad85db
Implement the color matrix filter in Ganesh. Also, fix and enable the color
...
matrix test slide. This was basically implemented in the same places where
the blending-based color filter was being done. The shader simply does a mat4
matrix multiply and a vec4 add.
Review URL: http://codereview.appspot.com/5489107/
git-svn-id: http://skia.googlecode.com/svn/trunk@2948 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-01-03 20:51:57 +00:00
reed@google.com
2d6ef528e5
add helper drawSizeBounds to show the GM's size
...
git-svn-id: http://skia.googlecode.com/svn/trunk@2943 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-01-03 17:20:38 +00:00
mike@reedtribe.org
10afbefa5b
add optional --forceBWtext to gm, forcing all text to BW to ease
...
comparisons between platform variations (e.g. mac 10.5,6,7)
probably only make sense in conjunction with some flag on GM allowing
the slide to opt in-or-out, so we only hack text labels, and not GMs
that are explicitly trying to test text rendering.
git-svn-id: http://skia.googlecode.com/svn/trunk@2938 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-12-30 16:02:53 +00:00
mike@reedtribe.org
a69b48c29d
Add SkTableColorFilter, as a foundation for several SVG filters
...
git-svn-id: http://skia.googlecode.com/svn/trunk@2933 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-12-28 20:31:00 +00:00
tomhudson@google.com
abfa8d137b
Fix fixed-point antialiased clipping GM; upload baselines.
...
http://codereview.appspot.com/5503077/
git-svn-id: http://skia.googlecode.com/svn/trunk@2930 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-12-28 19:40:48 +00:00
epoger@google.com
c7cf2b351f
Add number-of-missing-baseline-images report to gm
...
Review URL: http://codereview.appspot.com/5489123
git-svn-id: http://skia.googlecode.com/svn/trunk@2929 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-12-28 19:31:01 +00:00
caryclark@google.com
5fbb4dc0a5
support vertical text and typeface-by-name on Leopard
...
M src/ports/SkFontHost_mac_coretext.cpp
M gyp/gmslides.gypi
A gm/verttext2.cpp
git-svn-id: http://skia.googlecode.com/svn/trunk@2920 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-12-21 20:06:30 +00:00
tomhudson@google.com
ef279d36ca
New gm to test anti-aliased clipping.
...
git-svn-id: http://skia.googlecode.com/svn/trunk@2914 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-12-21 14:27:14 +00:00
schenney@chromium.org
45cbfdd535
Unreviewed changes to the gm tests for paths. Each test is broken into four
...
smaller images to avoid problems with XPS on Windows hanging on large images.
git-svn-id: http://skia.googlecode.com/svn/trunk@2911 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-12-20 21:48:14 +00:00
senorblanco@chromium.org
e5ff3cefe0
Implement SkColorFilter::asColorMatrix() virtual, and override in
...
SkColorMatrixFilter. Implement missing SkColorMatrixFilter::setMatrix() and
setArray() functions (were in .h, just not implemented). Add a gm for color
matrix filters.
Review URL: http://codereview.appspot.com/5500044/
git-svn-id: http://skia.googlecode.com/svn/trunk@2909 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-12-20 20:58:18 +00:00
reed@google.com
32d25b6f5f
initial impl of SkImageFilters : virtual signature will change!
...
Do not invest too much in other subclasses until this API solidifies.
git-svn-id: http://skia.googlecode.com/svn/trunk@2903 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-12-20 16:19:00 +00:00
schenney@chromium.org
4da06ab335
Modifying SkPath to store all verbs provided by the user, and to give
...
correct results for all stroke and fill modes even on the various types
of degenerate paths.
The goals of this patch include:
1. Have Skia store all of the verbs implied by path construction methods, even
if those define degenerate paths. The SVG implementation in WebKit, which is
backed by Skia, needs to know about all elements of the path, even degenerate
ones, for the correct drawing of markers and line caps. For example, in SVG you
should be able to draw a scatter plot by specifying a marker for vertices and
then giving a sequence of moveTo commands. Skia will not store the moveTos,
requiring a different storage mechanism.
2. Assuming 1, maintain the current Skia behavior. That is, make Skia robust to
degenerate paths.
3. Fix an existing bug in Skia where a degenerate moveTo-lineTo pair spits out
warnings from rasterization and produces incorrect results in inverse-fill
renderings.
4. Adds extensive testing for degenerate paths and path rendering in general.
To meet these goals, the patch I am proposing will result in minor additional
storage for degenerate paths (a few bytes per degenerate path, only if the user
defines such paths). There is also some additional overhead in the iteration
code, with the path now cleaned to remove degenerate segments as part of the
iteration process. I suspect this will also fix issues with computing normal
vectors to degenerate segments. Benchmarking suggests that this change may
result in slightly (< 1%) slower path drawing due to the checks for
degeneracy. This overhead could be removed (in fact, a significant speedup
could occur) if the results of iterating to clean up the path were cached.
This would cost memory, of course, and quite a bit of it.
BUG=398
TEST=tests/PathTest.cpp
gm/cubicpaths.cpp
gm/degeneratesegments.cpp
gm/movepaths.cpp
gm/linepaths.cpp
gm/quadpaths.cpp
Review URL: http://codereview.appspot.com/5482051
git-svn-id: http://skia.googlecode.com/svn/trunk@2901 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-12-20 15:14:18 +00:00
reed@google.com
263cb3a79c
can't pass const to setPixels :(
...
git-svn-id: http://skia.googlecode.com/svn/trunk@2900 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-12-20 14:35:32 +00:00
reed@google.com
5213c04216
defer creating offscreen until our first draw (so our constructor runs fast)
...
git-svn-id: http://skia.googlecode.com/svn/trunk@2898 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-12-20 13:41:09 +00:00
reed@google.com
eb85630fd6
fix positioning for scalar=fixed, still need to fix actual mode
...
git-svn-id: http://skia.googlecode.com/svn/trunk@2862 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-12-12 22:15:18 +00:00
reed@google.com
eb0fa29fc4
try to make it draw correctly in fixed point
...
git-svn-id: http://skia.googlecode.com/svn/trunk@2860 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-12-12 22:01:06 +00:00
bsalomon@google.com
aa814fe4a1
Access sampler matrices directly, cleanup GrSamplerState::reset()s
...
Review URL: http://codereview.appspot.com/5488048/
git-svn-id: http://skia.googlecode.com/svn/trunk@2854 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-12-12 18:45:07 +00:00
mike@reedtribe.org
e51755fc64
add first cut at arithmetic mode
...
git-svn-id: http://skia.googlecode.com/svn/trunk@2849 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-12-10 19:36:56 +00:00
reed@google.com
a8f60f2502
change to complexclip_bw and complexclip_aa, adding more combinations as well
...
git-svn-id: http://skia.googlecode.com/svn/trunk@2833 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-12-08 16:18:29 +00:00
reed@google.com
b4b49ccc41
add getBGColor() getter
...
git-svn-id: http://skia.googlecode.com/svn/trunk@2809 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-12-06 16:15:42 +00:00
bsalomon@google.com
39ee0ffa72
Prep #1 for making GrDrawState a class
...
Review URL: http://codereview.appspot.com/5437138/
git-svn-id: http://skia.googlecode.com/svn/trunk@2808 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-12-06 15:32:52 +00:00
bsalomon@google.com
5bc34f04fe
Remove fConfig/fFormat union in GrTextureDesc
...
Review URL: http://codereview.appspot.com/5448116/
git-svn-id: http://skia.googlecode.com/svn/trunk@2806 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-12-06 14:46:34 +00:00
senorblanco@chromium.org
ef843cdcd1
When a bitmap is texture-backed, change SkBitmap::copyTo() to do a deep
...
copy of the texels in VRAM rather than a readback and re-upload. This
gives a 3-10X speedup on recursive canvas-to-canvas draws.
N.B.: This introduces a new GM test, which will need new baselines.
git-svn-id: http://skia.googlecode.com/svn/trunk@2790 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-12-02 19:11:17 +00:00
bsalomon@google.com
29d3501e3b
Fix issue where bumping the max gm width/height affects gpu images
...
Review URL: http://codereview.appspot.com/5440065/
git-svn-id: http://skia.googlecode.com/svn/trunk@2766 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-11-30 16:57:21 +00:00
reed@google.com
2f6c957afd
update verttext to remove leading space from image name
...
add mac-desktop baseline images
git-svn-id: http://skia.googlecode.com/svn/trunk@2763 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-11-30 14:58:16 +00:00
reed@google.com
fb82300d1b
enable shadermask optimization all the time
...
update gm for shadermask
fix bugs in lcd_blend math
git-svn-id: http://skia.googlecode.com/svn/trunk@2761 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-11-30 14:29:55 +00:00
bsalomon@google.com
fb30951cd9
[GPU] tile when large bitmap pased drawBitmap and only a small fraction is used
...
Review URL: http://codereview.appspot.com/5450048/
git-svn-id: http://skia.googlecode.com/svn/trunk@2760 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-11-30 14:13:48 +00:00
reed@google.com
e805535b19
add test for shader text w/ and w/o lcd (and w/ and w/o opaque)
...
git-svn-id: http://skia.googlecode.com/svn/trunk@2753 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-11-28 16:31:28 +00:00
bsalomon@google.com
31648eb1cf
Fix warnings
...
Review URL: http://codereview.appspot.com/5433054/
git-svn-id: http://skia.googlecode.com/svn/trunk@2741 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-11-23 15:01:08 +00:00
bsalomon@google.com
6f3795105b
Make all pixel ops go thru ctx so we can correctly flush. Unify two texture upload code paths.
...
Review URL: http://codereview.appspot.com/5373108/
git-svn-id: http://skia.googlecode.com/svn/trunk@2701 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-11-16 20:36:03 +00:00
senorblanco@chromium.org
54e01b2ab9
This change makes SkImageFilter and SkBlurImageFilter flattenable/unflattenable.
...
The imageblur test also needed to stop calling getDeviceSize(), since it was
returning 99999x99999 for the SkPicture case.
git-svn-id: http://skia.googlecode.com/svn/trunk@2699 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-11-16 18:20:47 +00:00
reed@google.com
761661580e
add test for bad scanconversion (disabled)
...
git-svn-id: http://skia.googlecode.com/svn/trunk@2673 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-11-14 13:14:58 +00:00
reed@google.com
14debba629
add test gm for vertical text
...
git-svn-id: http://skia.googlecode.com/svn/trunk@2661 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-11-10 20:06:01 +00:00
senorblanco@chromium.org
60014ca387
Implement Gaussian blurs for images. The caller creates an an
...
SkBlurImageFilter, sets it on an SkPaint, passes that paint to saveLayer(),
draws the primitives which are to be blurred, then calls restore(), which
applies the blur. The blurs have separate sizes in the horizontal and vertical
direction. This feature is GPU-only for now.
NB: Due to the clipping change, there are slight pixel differences on the
blurs_gpu and shadows_gpu tests, so those will require rebaselining on all
platforms, as will some of the WebKit layout tests (TBD).
Review URL: http://codereview.appspot.com/5322068/
git-svn-id: http://skia.googlecode.com/svn/trunk@2643 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-11-09 16:05:58 +00:00
reed@google.com
8923c6cfd5
suppress font-purge messages
...
git-svn-id: http://skia.googlecode.com/svn/trunk@2623 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-11-08 14:59:38 +00:00
bungeman@google.com
24babf45b1
Add font scaler gm.
...
http://codereview.appspot.com/5337044/
git-svn-id: http://skia.googlecode.com/svn/trunk@2619 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-11-07 16:33:40 +00:00
bsalomon@google.com
c436499622
[GPU] Add explicit byte order and PM vs. UPM 8888 configs
...
Review URL: http://codereview.appspot.com/5347042/
git-svn-id: http://skia.googlecode.com/svn/trunk@2618 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-11-07 15:54:49 +00:00
bsalomon@google.com
e269f210bd
Recommit r2611 with fix for gm
...
git-svn-id: http://skia.googlecode.com/svn/trunk@2614 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-11-07 13:29:52 +00:00
bsalomon@google.com
b87d2b5c2a
Revert r2611 until windows gm can be debugged
...
git-svn-id: http://skia.googlecode.com/svn/trunk@2612 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-11-07 01:58:39 +00:00
bsalomon@google.com
6d9adaec78
Add replacement APIs for createPlatformSurface: createPlatformTexture and createPlatformRenderTarget
...
git-svn-id: http://skia.googlecode.com/svn/trunk@2611 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-11-07 01:37:22 +00:00
bungeman@google.com
0f0c2888e0
Add font scaler gm.
...
http://codereview.appspot.com/5337044/
git-svn-id: http://skia.googlecode.com/svn/trunk@2603 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-11-04 15:47:41 +00:00
bsalomon@google.com
c69809745e
Recommit r2584 with gpu pass of the new ReadPixels test disabled in fixed pt (gpu code doesn't work in general in fixed pt).
...
git-svn-id: http://skia.googlecode.com/svn/trunk@2586 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-11-02 19:57:21 +00:00
bsalomon@google.com
ace7bd5623
Revert r2584 (new test fails in fixed pt builds)
...
git-svn-id: http://skia.googlecode.com/svn/trunk@2585 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-11-02 19:39:51 +00:00
bsalomon@google.com
1a8ddf0a35
Changes the SkCanvas::readPixels API. Allows caller to read into prealloced bitmap pixels. Changes how clipping to device bounds is handled.
...
Review URL: http://codereview.appspot.com/5307077/
git-svn-id: http://skia.googlecode.com/svn/trunk@2584 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-11-02 19:34:16 +00:00
reed@google.com
b2a5162f1d
all for multiple --match foo args, which will be logically OR'd together
...
git-svn-id: http://skia.googlecode.com/svn/trunk@2567 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-10-31 16:30:04 +00:00
bsalomon@google.com
48dd1a26ec
Import all GMs as Samples.
...
Review URL: http://codereview.appspot.com/5332043/
git-svn-id: http://skia.googlecode.com/svn/trunk@2564 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-10-31 14:18:20 +00:00
bsalomon@google.com
72e49b8982
warning fixes
...
Review URL http://codereview.appspot.com/5328050/
git-svn-id: http://skia.googlecode.com/svn/trunk@2548 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-10-27 21:47:03 +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