Commit Graph

316 Commits

Author SHA1 Message Date
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