platform/upstream/libSkiaSharp.git
12 years agoNeed to apply matrix to advance in generateAdvance (as we already were in generateMet...
reed@google.com [Wed, 18 Jul 2012 13:45:58 +0000 (13:45 +0000)]
Need to apply matrix to advance in generateAdvance (as we already were in generateMetrics)
Fixes b/6833339
Expand existing unittest to detect this (we needed to set both scale and skew on the paint)

git-svn-id: http://skia.googlecode.com/svn/trunk@4647 2bbb7eff-a529-9590-31e7-b0007b416f81

12 years agoFactory method for creating GrGLProgram
bsalomon@google.com [Wed, 18 Jul 2012 13:20:29 +0000 (13:20 +0000)]
Factory method for creating GrGLProgram

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

git-svn-id: http://skia.googlecode.com/svn/trunk@4646 2bbb7eff-a529-9590-31e7-b0007b416f81

12 years agoAdd skipToLast method to SkClipStack
robertphillips@google.com [Wed, 18 Jul 2012 12:06:15 +0000 (12:06 +0000)]
Add skipToLast method to SkClipStack

http://codereview.appspot.com/6411043/

git-svn-id: http://skia.googlecode.com/svn/trunk@4644 2bbb7eff-a529-9590-31e7-b0007b416f81

12 years agoExported SkFILEWStream class so that it can be used in Chrome.
alokp@chromium.org [Tue, 17 Jul 2012 19:10:36 +0000 (19:10 +0000)]
Exported SkFILEWStream class so that it can be used in Chrome.
Review URL: https://codereview.appspot.com/6409052

git-svn-id: http://skia.googlecode.com/svn/trunk@4643 2bbb7eff-a529-9590-31e7-b0007b416f81

12 years agoFix build breakage in r4641.
tomhudson@google.com [Tue, 17 Jul 2012 19:07:35 +0000 (19:07 +0000)]
Fix build breakage in r4641.
Unreviewed.

git-svn-id: http://skia.googlecode.com/svn/trunk@4642 2bbb7eff-a529-9590-31e7-b0007b416f81

12 years agoMove texture domains onto a GrCustomStage, off of GrSamplerState.
tomhudson@google.com [Tue, 17 Jul 2012 18:43:21 +0000 (18:43 +0000)]
Move texture domains onto a GrCustomStage, off of GrSamplerState.

This will require gyp changes to roll into Chrome.

http://codereview.appspot.com/6405050/

git-svn-id: http://skia.googlecode.com/svn/trunk@4641 2bbb7eff-a529-9590-31e7-b0007b416f81

12 years agoUpdate docs and trunk dirs if they exist overriding any local merge conflicts.
rmistry@google.com [Tue, 17 Jul 2012 18:27:03 +0000 (18:27 +0000)]
Update docs and trunk dirs if they exist overriding any local merge conflicts.

Created to fix bug http://code.google.com/p/skia/issues/detail?id=710 :
housekeeping buildbot: conflict in UpdateDoxygen step.

git-svn-id: http://skia.googlecode.com/svn/trunk@4640 2bbb7eff-a529-9590-31e7-b0007b416f81

12 years agoUse SkFlatDictionary in SkGPipe to take advantage of its new features.
scroggo@google.com [Tue, 17 Jul 2012 16:49:40 +0000 (16:49 +0000)]
Use SkFlatDictionary in SkGPipe to take advantage of its new features.

Add a controller class to perform the allocation/unallocation for the dictionary and to provide an entry to be replaced, if replacements are allowed.

TODO:
Use LRU caching in my custom controller so replacements will be done less often.
More refactoring on SkFlatDictionary so picture recording's use of the dictionary does not require going through the path to replace.

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

git-svn-id: http://skia.googlecode.com/svn/trunk@4639 2bbb7eff-a529-9590-31e7-b0007b416f81

12 years agoPurge bitmaps from SkGPipe's shared heap.
scroggo@google.com [Tue, 17 Jul 2012 16:10:34 +0000 (16:10 +0000)]
Purge bitmaps from SkGPipe's shared heap.

BitmapInfo:
Now in SkGPipePriv so it can be accessed by SkGPipeRead.

Add the ability to essentially ref count BitmapInfos so that they can
be purged to make room in the shared heap for a new one.

SkGPipeWrite:
Purge the least recently used bitmap if it has already been drawn by
all readers.

SkGPipeRead:
Read the BitmapInfo (instead of the SkBitmap) and decrement its count
after drawing.

SkGPipeController:
Added a method to tell how many readers will be used, so that when
purging bitmaps each reader can be accounted for.

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

git-svn-id: http://skia.googlecode.com/svn/trunk@4638 2bbb7eff-a529-9590-31e7-b0007b416f81

12 years agoAdded more features to deletes and breakpoints
chudy@google.com [Tue, 17 Jul 2012 15:40:51 +0000 (15:40 +0000)]
Added more features to deletes and breakpoints

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

git-svn-id: http://skia.googlecode.com/svn/trunk@4637 2bbb7eff-a529-9590-31e7-b0007b416f81

12 years agoFixed simpleaaclip gm - it wasn't showing xor case
robertphillips@google.com [Tue, 17 Jul 2012 15:37:15 +0000 (15:37 +0000)]
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

12 years agoremove Symbian (not needed) flag, and assume all CPUs *except* thumb have fast
reed@google.com [Tue, 17 Jul 2012 12:13:56 +0000 (12:13 +0000)]
remove Symbian (not needed) flag, and assume all CPUs *except* thumb have fast
conditional instructions.

git-svn-id: http://skia.googlecode.com/svn/trunk@4635 2bbb7eff-a529-9590-31e7-b0007b416f81

12 years agoFixed two sub-optimal iterator uses
robertphillips@google.com [Mon, 16 Jul 2012 21:20:03 +0000 (21:20 +0000)]
Fixed two sub-optimal iterator uses

http://codereview.appspot.com/6409048/

git-svn-id: http://skia.googlecode.com/svn/trunk@4633 2bbb7eff-a529-9590-31e7-b0007b416f81

12 years agobench_pictures now has an option for benchmarking record time.
keyar@chromium.org [Mon, 16 Jul 2012 19:20:14 +0000 (19:20 +0000)]
bench_pictures now has an option for benchmarking record time.

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

git-svn-id: http://skia.googlecode.com/svn/trunk@4632 2bbb7eff-a529-9590-31e7-b0007b416f81

12 years agoExtended SkDeque's reverse iteration capability to SkClipStack
robertphillips@google.com [Mon, 16 Jul 2012 18:52:29 +0000 (18:52 +0000)]
Extended SkDeque's reverse iteration capability to SkClipStack

http://codereview.appspot.com/6409046/

git-svn-id: http://skia.googlecode.com/svn/trunk@4631 2bbb7eff-a529-9590-31e7-b0007b416f81

12 years agoCleaned up icons, added keyboard shortcuts to everything
chudy@google.com [Mon, 16 Jul 2012 18:35:23 +0000 (18:35 +0000)]
Cleaned up icons, added keyboard shortcuts to everything

Keyboard Shortcuts and Menu reordering

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

git-svn-id: http://skia.googlecode.com/svn/trunk@4630 2bbb7eff-a529-9590-31e7-b0007b416f81

12 years agoskdiff: cap return value at 255 to avoid automatic 'wrapping' (%256) of return value
epoger@google.com [Mon, 16 Jul 2012 18:01:06 +0000 (18:01 +0000)]
skdiff: cap return value at 255 to avoid automatic 'wrapping' (%256) of return value
Review URL: https://codereview.appspot.com/6409045

git-svn-id: http://skia.googlecode.com/svn/trunk@4629 2bbb7eff-a529-9590-31e7-b0007b416f81

12 years agoFix test break in r4627.
bsalomon@google.com [Mon, 16 Jul 2012 17:54:26 +0000 (17:54 +0000)]
Fix test break in r4627.

git-svn-id: http://skia.googlecode.com/svn/trunk@4628 2bbb7eff-a529-9590-31e7-b0007b416f81

12 years agoRemove GrGLProgram::CachedData, make GrGLProgram represent the program
bsalomon@google.com [Mon, 16 Jul 2012 17:36:28 +0000 (17:36 +0000)]
Remove GrGLProgram::CachedData, make GrGLProgram represent the program

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

git-svn-id: http://skia.googlecode.com/svn/trunk@4627 2bbb7eff-a529-9590-31e7-b0007b416f81

12 years agoAdded pipe as a rendering option for render_pictures.
keyar@chromium.org [Mon, 16 Jul 2012 17:29:16 +0000 (17:29 +0000)]
Added pipe as a rendering option for render_pictures.

I will add tiling as a rendering option and then figure out a way to not have the code duplicated between render_pictures and bench_pictures.

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

git-svn-id: http://skia.googlecode.com/svn/trunk@4626 2bbb7eff-a529-9590-31e7-b0007b416f81

12 years agofix for non-Windows-specific compiler error in r4624
robertphillips@google.com [Mon, 16 Jul 2012 17:19:21 +0000 (17:19 +0000)]
fix for non-Windows-specific compiler error in r4624

git-svn-id: http://skia.googlecode.com/svn/trunk@4625 2bbb7eff-a529-9590-31e7-b0007b416f81

12 years agoRefactor SkDeque's iterator and allocation method
robertphillips@google.com [Mon, 16 Jul 2012 16:58:49 +0000 (16:58 +0000)]
Refactor SkDeque's iterator and allocation method

http://codereview.appspot.com/6353098/

git-svn-id: http://skia.googlecode.com/svn/trunk@4624 2bbb7eff-a529-9590-31e7-b0007b416f81

12 years agoAdd a skia method to perform an atomic add.
scroggo@google.com [Mon, 16 Jul 2012 16:51:28 +0000 (16:51 +0000)]
Add a skia method to perform an atomic add.

Complements sk_atomic_inc for when you want to increase by more than one.

This time, use the correct atomic add function on Windows.

Reviewed at https://codereview.appspot.com/6399050/

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

git-svn-id: http://skia.googlecode.com/svn/trunk@4623 2bbb7eff-a529-9590-31e7-b0007b416f81

12 years agoland http://codereview.appspot.com/6325044/ by Lei
reed@google.com [Mon, 16 Jul 2012 16:07:42 +0000 (16:07 +0000)]
land http://codereview.appspot.com/6325044/ by Lei

git-svn-id: http://skia.googlecode.com/svn/trunk@4622 2bbb7eff-a529-9590-31e7-b0007b416f81

12 years agoDelete 5 stale gm expected images
epoger@google.com [Mon, 16 Jul 2012 14:56:37 +0000 (14:56 +0000)]
Delete 5 stale gm expected images
- complexclip_gpu.png is no longer being generated
- aaclip_pdf.pdf and clamped_gradients_pdf.pdf have not been exercised and need rebaselining
Review URL: https://codereview.appspot.com/6405048

git-svn-id: http://skia.googlecode.com/svn/trunk@4620 2bbb7eff-a529-9590-31e7-b0007b416f81

12 years agoFix bad allocator access in r4616
bsalomon@google.com [Mon, 16 Jul 2012 14:16:22 +0000 (14:16 +0000)]
Fix bad allocator access in r4616

git-svn-id: http://skia.googlecode.com/svn/trunk@4619 2bbb7eff-a529-9590-31e7-b0007b416f81

12 years agoAdding bracketing save/restore calls to SkPicture at record time and
junov@chromium.org [Mon, 16 Jul 2012 14:04:59 +0000 (14:04 +0000)]
Adding bracketing save/restore calls to SkPicture at record time and
preparing tests for enforcing save/restore balancing constraints on SkPicture

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

git-svn-id: http://skia.googlecode.com/svn/trunk@4618 2bbb7eff-a529-9590-31e7-b0007b416f81

12 years agoFix fs param name in conical gradient due to r4616.
bsalomon@google.com [Mon, 16 Jul 2012 13:46:39 +0000 (13:46 +0000)]
Fix fs param name in conical gradient due to r4616.

git-svn-id: http://skia.googlecode.com/svn/trunk@4617 2bbb7eff-a529-9590-31e7-b0007b416f81

12 years agoRemove uniform var pointers from custom effects
bsalomon@google.com [Mon, 16 Jul 2012 13:36:18 +0000 (13:36 +0000)]
Remove uniform var pointers from custom effects

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

git-svn-id: http://skia.googlecode.com/svn/trunk@4616 2bbb7eff-a529-9590-31e7-b0007b416f81

12 years agoRevert "Add a method to atomic add."
scroggo@google.com [Mon, 16 Jul 2012 13:22:56 +0000 (13:22 +0000)]
Revert "Add a method to atomic add."

This reverts commit eb539cf92f487daf9567ffbbba6b6653406d43ae.

BUG=
TEST=

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

git-svn-id: http://skia.googlecode.com/svn/trunk@4615 2bbb7eff-a529-9590-31e7-b0007b416f81

12 years agoAdd a skia method to perform an atomic add.
scroggo@google.com [Mon, 16 Jul 2012 13:13:29 +0000 (13:13 +0000)]
Add a skia method to perform an atomic add.

Complements sk_atomic_inc for when you want to increase by more than one.

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

git-svn-id: http://skia.googlecode.com/svn/trunk@4614 2bbb7eff-a529-9590-31e7-b0007b416f81

12 years agoHaving updated the documentation of GrCustomStage to argue that all custom stages...
tomhudson@google.com [Mon, 16 Jul 2012 12:23:32 +0000 (12:23 +0000)]
Having updated the documentation of GrCustomStage to argue that all custom stages must be
immutable, this CL makes that true for ConvolutionEffect.

http://codereview.appspot.com/6398043/

git-svn-id: http://skia.googlecode.com/svn/trunk@4613 2bbb7eff-a529-9590-31e7-b0007b416f81

12 years agoskdiff: replace --failonmismatches with repeatable --failonresult option
epoger@google.com [Fri, 13 Jul 2012 21:22:02 +0000 (21:22 +0000)]
skdiff: replace --failonmismatches with repeatable --failonresult option
Review URL: https://codereview.appspot.com/6392064

git-svn-id: http://skia.googlecode.com/svn/trunk@4611 2bbb7eff-a529-9590-31e7-b0007b416f81

12 years agoshape ops work in progress
caryclark@google.com [Fri, 13 Jul 2012 21:07:52 +0000 (21:07 +0000)]
shape ops work in progress

git-svn-id: http://skia.googlecode.com/svn/trunk@4610 2bbb7eff-a529-9590-31e7-b0007b416f81

12 years ago[PDF] Add link annotations.
vandebo@chromium.org [Fri, 13 Jul 2012 20:06:02 +0000 (20:06 +0000)]
[PDF] Add link annotations.

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

git-svn-id: http://skia.googlecode.com/svn/trunk@4609 2bbb7eff-a529-9590-31e7-b0007b416f81

12 years agoStart removing calls to GrDrawState::setTexture() (and GrPaint::setTexture()?) when...
tomhudson@google.com [Fri, 13 Jul 2012 19:54:19 +0000 (19:54 +0000)]
Start removing calls to GrDrawState::setTexture() (and GrPaint::setTexture()?) when there's
a GrSingleTextureEffect involved holding the texture.

http://codereview.appspot.com/6353094/

git-svn-id: http://skia.googlecode.com/svn/trunk@4608 2bbb7eff-a529-9590-31e7-b0007b416f81

12 years agoMac build fix for Keyar. Unreviewed.
senorblanco@chromium.org [Fri, 13 Jul 2012 18:55:53 +0000 (18:55 +0000)]
Mac build fix for Keyar.  Unreviewed.

git-svn-id: http://skia.googlecode.com/svn/trunk@4607 2bbb7eff-a529-9590-31e7-b0007b416f81

12 years agoUpdated make_filepath test to reflect changes in picture_utils. TBR
keyar@chromium.org [Fri, 13 Jul 2012 18:43:39 +0000 (18:43 +0000)]
Updated make_filepath test to reflect changes in picture_utils. TBR

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

git-svn-id: http://skia.googlecode.com/svn/trunk@4606 2bbb7eff-a529-9590-31e7-b0007b416f81

12 years agoThere were three different problems with lighting filters:
senorblanco@chromium.org [Fri, 13 Jul 2012 18:25:06 +0000 (18:25 +0000)]
There were three different problems with lighting filters:

1)  Texture offsets (fImageIncrement) have to be signed depending on
whether the texture is "right way up" (texture upload) or "upside down"
(render target), so the surface normals were coming out upside down.
2)  Light normals have to y-negated on upload
These two bugs were cancelling each other out in SampleApp, (where we
were testing w/textures) but not in Chrome (where we were testing
w/render targets).
3)  The extract-the-height-from-the-view-matrix hack I was using to
compare light positions vs. gl_FragCoord doesn't work in Chrome where we
compile with GR_STATIC_RECT_VB, and the view matrix contains more than
the viewport transform (to accomodate the canonical vertex buffer).
Fixed by passing the destination render target to
GrGLProgramStage::setData(), so it can flip the light positions in Y on
the CPU.

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

git-svn-id: http://skia.googlecode.com/svn/trunk@4605 2bbb7eff-a529-9590-31e7-b0007b416f81

12 years agoadd baselines for new gm
reed@google.com [Fri, 13 Jul 2012 18:24:16 +0000 (18:24 +0000)]
add baselines for new gm

git-svn-id: http://skia.googlecode.com/svn/trunk@4604 2bbb7eff-a529-9590-31e7-b0007b416f81

12 years agoPreparations for adding options and different render types to render_pictures.
keyar@chromium.org [Fri, 13 Jul 2012 18:22:59 +0000 (18:22 +0000)]
Preparations for adding options and different render types to render_pictures.

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

git-svn-id: http://skia.googlecode.com/svn/trunk@4603 2bbb7eff-a529-9590-31e7-b0007b416f81

12 years agoBenchmark tiling now better reflects how it is done in Chrome.
keyar@chromium.org [Fri, 13 Jul 2012 18:15:04 +0000 (18:15 +0000)]
Benchmark tiling now better reflects how it is done in Chrome.

Namely, the tile backing stores are all the same size.

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

git-svn-id: http://skia.googlecode.com/svn/trunk@4602 2bbb7eff-a529-9590-31e7-b0007b416f81

12 years agoFixed over-length lines in GrGLCreateDebugInterface.cpp
robertphillips@google.com [Fri, 13 Jul 2012 17:45:17 +0000 (17:45 +0000)]
Fixed over-length lines in GrGLCreateDebugInterface.cpp

http://codereview.appspot.com/6346104/

git-svn-id: http://skia.googlecode.com/svn/trunk@4601 2bbb7eff-a529-9590-31e7-b0007b416f81

12 years agodon't add circles on chopped cubics
reed@google.com [Fri, 13 Jul 2012 15:55:15 +0000 (15:55 +0000)]
don't add circles on chopped cubics

git-svn-id: http://skia.googlecode.com/svn/trunk@4600 2bbb7eff-a529-9590-31e7-b0007b416f81

12 years agorebaseline after gpu change
reed@google.com [Fri, 13 Jul 2012 15:52:14 +0000 (15:52 +0000)]
rebaseline after gpu change

git-svn-id: http://skia.googlecode.com/svn/trunk@4599 2bbb7eff-a529-9590-31e7-b0007b416f81

12 years agoAdded SkDevice onAttachToCanvas & onDetachFromCanvas methods
robertphillips@google.com [Fri, 13 Jul 2012 15:36:15 +0000 (15:36 +0000)]
Added SkDevice onAttachToCanvas & onDetachFromCanvas methods

http://codereview.appspot.com/6348100/

git-svn-id: http://skia.googlecode.com/svn/trunk@4598 2bbb7eff-a529-9590-31e7-b0007b416f81

12 years agoFixed calling SkIntToScalar on a float error
robertphillips@google.com [Fri, 13 Jul 2012 15:17:53 +0000 (15:17 +0000)]
Fixed calling SkIntToScalar on a float error

git-svn-id: http://skia.googlecode.com/svn/trunk@4597 2bbb7eff-a529-9590-31e7-b0007b416f81

12 years agoImproved clarity of complexclip GM
robertphillips@google.com [Fri, 13 Jul 2012 14:55:25 +0000 (14:55 +0000)]
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

12 years agoAdd SkTDArray.contains(), which is just a wrapper around find()
epoger@google.com [Fri, 13 Jul 2012 14:53:18 +0000 (14:53 +0000)]
Add SkTDArray.contains(), which is just a wrapper around find()
Review URL: https://codereview.appspot.com/6349103

git-svn-id: http://skia.googlecode.com/svn/trunk@4595 2bbb7eff-a529-9590-31e7-b0007b416f81

12 years agoFix SkMatrix.h line endings (LF) [change 4592 fixed the cpp]
bsalomon@google.com [Fri, 13 Jul 2012 14:39:51 +0000 (14:39 +0000)]
Fix SkMatrix.h line endings (LF) [change 4592 fixed the cpp]

git-svn-id: http://skia.googlecode.com/svn/trunk@4594 2bbb7eff-a529-9590-31e7-b0007b416f81

12 years agoFix SkMatrix line endings (LF)
bsalomon@google.com [Fri, 13 Jul 2012 13:36:38 +0000 (13:36 +0000)]
Fix SkMatrix line endings (LF)

git-svn-id: http://skia.googlecode.com/svn/trunk@4592 2bbb7eff-a529-9590-31e7-b0007b416f81

12 years agoshape ops work in progress
caryclark@google.com [Fri, 13 Jul 2012 11:57:28 +0000 (11:57 +0000)]
shape ops work in progress
Review URL: https://codereview.appspot.com/6392058

git-svn-id: http://skia.googlecode.com/svn/trunk@4591 2bbb7eff-a529-9590-31e7-b0007b416f81

12 years agoupdate-doxygen.sh: update local copy of workspace rather than checking it out fresh...
epoger@google.com [Thu, 12 Jul 2012 23:35:28 +0000 (23:35 +0000)]
update-doxygen.sh: update local copy of workspace rather than checking it out fresh every time
Review URL: https://codereview.appspot.com/6346099

git-svn-id: http://skia.googlecode.com/svn/trunk@4590 2bbb7eff-a529-9590-31e7-b0007b416f81

12 years agoFeature, HitBox selects current command
chudy@google.com [Thu, 12 Jul 2012 21:58:14 +0000 (21:58 +0000)]
Feature, HitBox selects current command

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

git-svn-id: http://skia.googlecode.com/svn/trunk@4588 2bbb7eff-a529-9590-31e7-b0007b416f81

12 years agoChanged cmsecs to msecs to be consistent with bench.
keyar@chromium.org [Thu, 12 Jul 2012 21:16:49 +0000 (21:16 +0000)]
Changed cmsecs to msecs to be consistent with bench.

We are using wall time and not cpu time and so the proper name for this
should probably be outputted.

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

git-svn-id: http://skia.googlecode.com/svn/trunk@4587 2bbb7eff-a529-9590-31e7-b0007b416f81

12 years agoshape ops work in progress
caryclark@google.com [Thu, 12 Jul 2012 21:05:13 +0000 (21:05 +0000)]
shape ops work in progress

git-svn-id: http://skia.googlecode.com/svn/trunk@4586 2bbb7eff-a529-9590-31e7-b0007b416f81

12 years agoFix setFileOffset type to remove warnings.
vandebo@chromium.org [Thu, 12 Jul 2012 20:22:04 +0000 (20:22 +0000)]
Fix setFileOffset type to remove warnings.

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

git-svn-id: http://skia.googlecode.com/svn/trunk@4585 2bbb7eff-a529-9590-31e7-b0007b416f81

12 years agoDisable WritePixelsTest on Android
borenet@google.com [Thu, 12 Jul 2012 19:48:42 +0000 (19:48 +0000)]
Disable WritePixelsTest on Android

This fails on Xoom.  Re-enable when #634 is fixed.
Review URL: https://codereview.appspot.com/6354099

git-svn-id: http://skia.googlecode.com/svn/trunk@4584 2bbb7eff-a529-9590-31e7-b0007b416f81

12 years agoshape ops work in progress
caryclark@google.com [Thu, 12 Jul 2012 19:29:45 +0000 (19:29 +0000)]
shape ops work in progress

git-svn-id: http://skia.googlecode.com/svn/trunk@4583 2bbb7eff-a529-9590-31e7-b0007b416f81

12 years agoAdded a benchmark for measuring picture unflattening time.
keyar@chromium.org [Thu, 12 Jul 2012 19:19:55 +0000 (19:19 +0000)]
Added a benchmark for measuring picture unflattening time.

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

git-svn-id: http://skia.googlecode.com/svn/trunk@4582 2bbb7eff-a529-9590-31e7-b0007b416f81

12 years agorename NO_ERROR to kNoError, because Windows defines a NO_ERROR macro elsewhere
epoger@google.com [Thu, 12 Jul 2012 18:37:55 +0000 (18:37 +0000)]
rename NO_ERROR to kNoError, because Windows defines a NO_ERROR macro elsewhere

TBR=rmistry
Review URL: https://codereview.appspot.com/6355100

git-svn-id: http://skia.googlecode.com/svn/trunk@4581 2bbb7eff-a529-9590-31e7-b0007b416f81

12 years agoskdiff: add --failonmismatches and --listfilename options, plus cleanup
epoger@google.com [Thu, 12 Jul 2012 18:16:02 +0000 (18:16 +0000)]
skdiff: add --failonmismatches and --listfilename options, plus cleanup

These changes are needed in order to switch the buildbots from using "gm -r" to "skdiff" to compare gm results, and should be generally good for humans too.
Review URL: https://codereview.appspot.com/6392054

git-svn-id: http://skia.googlecode.com/svn/trunk@4579 2bbb7eff-a529-9590-31e7-b0007b416f81

12 years agoCleanup restore offsets at end of SkPicture recording
junov@chromium.org [Thu, 12 Jul 2012 17:47:34 +0000 (17:47 +0000)]
Cleanup restore offsets at end of SkPicture recording

Review URL: http://codereview.appspot.com/6355099/
TEST=skia unit test CanvasTest, test step TwoClipOps
BUG=https://code.google.com/p/chromium/issues/detail?id=133432

git-svn-id: http://skia.googlecode.com/svn/trunk@4577 2bbb7eff-a529-9590-31e7-b0007b416f81

12 years agoIntroduces new SingleTextureEffect base class for GrCustomStage objects.
tomhudson@google.com [Thu, 12 Jul 2012 17:23:52 +0000 (17:23 +0000)]
Introduces new SingleTextureEffect base class for GrCustomStage objects.
This class tracks the texture that the object uses. A future commit will get rid of the
GrTexture pointer currenty stored in the GrDrawState, allowing us to have CustomStages
*without* textures.

Requires gyp change on next roll.

http://codereview.appspot.com/6306097/

git-svn-id: http://skia.googlecode.com/svn/trunk@4576 2bbb7eff-a529-9590-31e7-b0007b416f81

12 years agoRefactor how precision is handled with GrGLShaderVar
bsalomon@google.com [Thu, 12 Jul 2012 16:40:03 +0000 (16:40 +0000)]
Refactor how precision is handled with GrGLShaderVar

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

git-svn-id: http://skia.googlecode.com/svn/trunk@4575 2bbb7eff-a529-9590-31e7-b0007b416f81

12 years agorebaseline macpro for convexpaths (test was changed)
reed@google.com [Thu, 12 Jul 2012 15:59:09 +0000 (15:59 +0000)]
rebaseline macpro for convexpaths (test was changed)

git-svn-id: http://skia.googlecode.com/svn/trunk@4574 2bbb7eff-a529-9590-31e7-b0007b416f81

12 years agoAdded annotation for gm's -wp flag
chudy@google.com [Thu, 12 Jul 2012 15:42:37 +0000 (15:42 +0000)]
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

12 years agocheck a hashtable before using a bsearch
reed@google.com [Thu, 12 Jul 2012 15:27:54 +0000 (15:27 +0000)]
check a hashtable before using a bsearch
Review URL: https://codereview.appspot.com/6345097

git-svn-id: http://skia.googlecode.com/svn/trunk@4572 2bbb7eff-a529-9590-31e7-b0007b416f81

12 years agoFixing bad assertion test that was trippin-up debug buildbots
junov@chromium.org [Thu, 12 Jul 2012 14:44:52 +0000 (14:44 +0000)]
Fixing bad assertion test that was trippin-up debug buildbots

TBR=http://codereview.appspot.com/6344109

git-svn-id: http://skia.googlecode.com/svn/trunk@4569 2bbb7eff-a529-9590-31e7-b0007b416f81

12 years agoFix the lighting filters unit test and re-enable it.
senorblanco@chromium.org [Thu, 12 Jul 2012 14:39:07 +0000 (14:39 +0000)]
Fix the lighting filters unit test and re-enable it.

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

git-svn-id: http://skia.googlecode.com/svn/trunk@4568 2bbb7eff-a529-9590-31e7-b0007b416f81

12 years agoBug Fix: Delete redraws correctly when redraw command execution is paused
chudy@google.com [Thu, 12 Jul 2012 14:38:49 +0000 (14:38 +0000)]
Bug Fix: Delete redraws correctly when redraw command execution is paused

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

git-svn-id: http://skia.googlecode.com/svn/trunk@4567 2bbb7eff-a529-9590-31e7-b0007b416f81

12 years agoSkHitBox added.
chudy@google.com [Thu, 12 Jul 2012 14:31:25 +0000 (14:31 +0000)]
SkHitBox added.

SkHitBox is a class that determines which draw command is associated with the pixel located at x,y. By calculating a single point instead of the entire bitmap at once there is no visible performance slowdown.

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

git-svn-id: http://skia.googlecode.com/svn/trunk@4565 2bbb7eff-a529-9590-31e7-b0007b416f81

12 years agoSeperated Space for displaying breakpoint and deletion icons
chudy@google.com [Thu, 12 Jul 2012 14:15:54 +0000 (14:15 +0000)]
Seperated Space for displaying breakpoint and deletion icons

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

git-svn-id: http://skia.googlecode.com/svn/trunk@4563 2bbb7eff-a529-9590-31e7-b0007b416f81

12 years agoFixing type mask computation in SkMatrix to make it faster and make it so that matric...
junov@chromium.org [Thu, 12 Jul 2012 14:01:32 +0000 (14:01 +0000)]
Fixing type mask computation in SkMatrix to make it faster and make it so that matrices have the same type masks as their inverses.
This patch also add bench tests that call invert() followed by mapRect() on various types of matrices.  Performance of these tests was greatly affected by typemask computation

Review URL: http://codereview.appspot.com/6380043/
BUG=https://code.google.com/p/chromium/issues/detail?id=135259

git-svn-id: http://skia.googlecode.com/svn/trunk@4562 2bbb7eff-a529-9590-31e7-b0007b416f81

12 years agoAltered complexclip GM to test out saveLayer w/ a bound and clipping
robertphillips@google.com [Thu, 12 Jul 2012 13:48:46 +0000 (13:48 +0000)]
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

12 years agoshape ops work in progress
caryclark@google.com [Thu, 12 Jul 2012 12:52:50 +0000 (12:52 +0000)]
shape ops work in progress

M    Intersection/Simplify.cpp

git-svn-id: http://skia.googlecode.com/svn/trunk@4560 2bbb7eff-a529-9590-31e7-b0007b416f81

12 years agoThe correct fix for the lighting filters on Windows: set the GL calling
senorblanco@chromium.org [Thu, 12 Jul 2012 00:34:39 +0000 (00:34 +0000)]
The correct fix for the lighting filters on Windows:  set the GL calling
convention for all targets, not just gpu, since effects now makes GL calls too.

Build fix; unreviewed.

git-svn-id: http://skia.googlecode.com/svn/trunk@4559 2bbb7eff-a529-9590-31e7-b0007b416f81

12 years agoAdded GrContext::AutoClipStack to encapsulate setting\resetting of clip stack
robertphillips@google.com [Wed, 11 Jul 2012 20:57:46 +0000 (20:57 +0000)]
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

12 years agoFix lighting filters on Windows, and re-enable the GPU path.
senorblanco@chromium.org [Wed, 11 Jul 2012 20:49:26 +0000 (20:49 +0000)]
Fix lighting filters on Windows, and re-enable the GPU path.

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

git-svn-id: http://skia.googlecode.com/svn/trunk@4557 2bbb7eff-a529-9590-31e7-b0007b416f81

12 years agoidea: add annotation to SkPaint
reed@google.com [Wed, 11 Jul 2012 19:57:55 +0000 (19:57 +0000)]
idea: add annotation to SkPaint
Review URL: https://codereview.appspot.com/6355050

git-svn-id: http://skia.googlecode.com/svn/trunk@4555 2bbb7eff-a529-9590-31e7-b0007b416f81

12 years agoFix linux warnings
bsalomon@google.com [Wed, 11 Jul 2012 19:45:22 +0000 (19:45 +0000)]
Fix linux warnings
Review URL: http://codereview.appspot.com/6354093/

git-svn-id: http://skia.googlecode.com/svn/trunk@4554 2bbb7eff-a529-9590-31e7-b0007b416f81

12 years agoFix dumb copy/paste bug that breaks GLProgramTest on debug builds with GS support.
bsalomon@google.com [Wed, 11 Jul 2012 19:35:52 +0000 (19:35 +0000)]
Fix dumb copy/paste bug that breaks GLProgramTest on debug builds with GS support.

git-svn-id: http://skia.googlecode.com/svn/trunk@4553 2bbb7eff-a529-9590-31e7-b0007b416f81

12 years agoadd default: to switch statement, to avoid warning/error for unhandled cases.
reed@google.com [Wed, 11 Jul 2012 18:56:10 +0000 (18:56 +0000)]
add default: to switch statement, to avoid warning/error for unhandled cases.

git-svn-id: http://skia.googlecode.com/svn/trunk@4552 2bbb7eff-a529-9590-31e7-b0007b416f81

12 years agoremove debugging printfs
reed@google.com [Wed, 11 Jul 2012 18:55:23 +0000 (18:55 +0000)]
remove debugging printfs

git-svn-id: http://skia.googlecode.com/svn/trunk@4551 2bbb7eff-a529-9590-31e7-b0007b416f81

12 years agoMinor refactoring to make GrAutoMatrix a nested sub-class of GrContext
robertphillips@google.com [Wed, 11 Jul 2012 18:53:23 +0000 (18:53 +0000)]
Minor refactoring to make GrAutoMatrix a nested sub-class of GrContext

http://codereview.appspot.com/6356092/

git-svn-id: http://skia.googlecode.com/svn/trunk@4549 2bbb7eff-a529-9590-31e7-b0007b416f81

12 years agoadd flatten/unflatten to SkDataSet
reed@google.com [Wed, 11 Jul 2012 18:48:37 +0000 (18:48 +0000)]
add flatten/unflatten to SkDataSet
Review URL: https://codereview.appspot.com/6374057

git-svn-id: http://skia.googlecode.com/svn/trunk@4548 2bbb7eff-a529-9590-31e7-b0007b416f81

12 years agoDisable GPU path for lighting filters, due to Windows weirdness. Unreviewed.
senorblanco@chromium.org [Wed, 11 Jul 2012 18:47:11 +0000 (18:47 +0000)]
Disable GPU path for lighting filters, due to Windows weirdness.  Unreviewed.

git-svn-id: http://skia.googlecode.com/svn/trunk@4547 2bbb7eff-a529-9590-31e7-b0007b416f81

12 years agoFixed merge error in r4545
robertphillips@google.com [Wed, 11 Jul 2012 18:25:24 +0000 (18:25 +0000)]
Fixed merge error in r4545

git-svn-id: http://skia.googlecode.com/svn/trunk@4546 2bbb7eff-a529-9590-31e7-b0007b416f81

12 years agoForced GrClip to always have conservative bounds
robertphillips@google.com [Wed, 11 Jul 2012 18:20:35 +0000 (18:20 +0000)]
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

12 years agoMake GrGLShaderBuilder produce the shader strings
bsalomon@google.com [Wed, 11 Jul 2012 18:11:27 +0000 (18:11 +0000)]
Make GrGLShaderBuilder produce the shader strings

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

git-svn-id: http://skia.googlecode.com/svn/trunk@4544 2bbb7eff-a529-9590-31e7-b0007b416f81

12 years agoshape ops work in progress
caryclark@google.com [Wed, 11 Jul 2012 17:52:32 +0000 (17:52 +0000)]
shape ops work in progress

M    Intersection/SimplifyRect4x4_Test.cpp
M    Intersection/Simplify.cpp
M    Intersection/SimplifyFindNext_Test.cpp
M    Intersection/SimplifyNew_Test.cpp
M    Intersection/op.htm

git-svn-id: http://skia.googlecode.com/svn/trunk@4543 2bbb7eff-a529-9590-31e7-b0007b416f81

12 years agoadd SkDataSet class, so SkAnnotation can be more immutable-like
reed@google.com [Wed, 11 Jul 2012 17:24:49 +0000 (17:24 +0000)]
add SkDataSet class, so SkAnnotation can be more immutable-like
Review URL: https://codereview.appspot.com/6354091

git-svn-id: http://skia.googlecode.com/svn/trunk@4542 2bbb7eff-a529-9590-31e7-b0007b416f81

12 years agoDisable lighting filter unit test temporarily; unreviewed.
senorblanco@chromium.org [Wed, 11 Jul 2012 17:10:26 +0000 (17:10 +0000)]
Disable lighting filter unit test temporarily; unreviewed.

git-svn-id: http://skia.googlecode.com/svn/trunk@4541 2bbb7eff-a529-9590-31e7-b0007b416f81

12 years agoMac GLSL fixes; unreviewed.
senorblanco@chromium.org [Wed, 11 Jul 2012 16:44:49 +0000 (16:44 +0000)]
Mac GLSL fixes; unreviewed.

git-svn-id: http://skia.googlecode.com/svn/trunk@4539 2bbb7eff-a529-9590-31e7-b0007b416f81

12 years agoMore build fixes; unreviewed.
senorblanco@chromium.org [Wed, 11 Jul 2012 16:35:00 +0000 (16:35 +0000)]
More build fixes; unreviewed.

git-svn-id: http://skia.googlecode.com/svn/trunk@4537 2bbb7eff-a529-9590-31e7-b0007b416f81

12 years agoMac build fix; unreviewed.
senorblanco@chromium.org [Wed, 11 Jul 2012 16:25:37 +0000 (16:25 +0000)]
Mac build fix; unreviewed.

git-svn-id: http://skia.googlecode.com/svn/trunk@4536 2bbb7eff-a529-9590-31e7-b0007b416f81

12 years agoThis patch implements the diffuse and specular lighting filters in Ganesh.
senorblanco@chromium.org [Wed, 11 Jul 2012 16:01:22 +0000 (16:01 +0000)]
This patch implements the diffuse and specular lighting filters in Ganesh.
There are three light types for each:  distant, point and spot, whose code
generation lives in a GrGLLight class hierarchy.  This similar to the CPU
implementation, where each light type provides a function to compute the vector
from the surface plane to the light (surfaceToLight) and to compute the light
colour (emitLightColour).  Instead of templated member functions, as in the CPU
implementation, these are virtual functions to emit the light-specific GLSL
code.

All of the code for the GPU path lives in the same file as that for the CPU
path, SkLightingImageFilter.cpp.  In order to provide Ganesh a hook to access
it, SkImageFilter now has a asNewCustomStage() virtual, which allows an image
filter to return a GrCustomStage representing that filter.

Note that this patch does not handle the border conditions correctly (the
[top|bottom][Left|Right]Normal() functions in the CPU implementation).  That
will come in a future patch.

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

git-svn-id: http://skia.googlecode.com/svn/trunk@4535 2bbb7eff-a529-9590-31e7-b0007b416f81

12 years agoVariableVisibility -> ShaderType
bsalomon@google.com [Wed, 11 Jul 2012 15:03:31 +0000 (15:03 +0000)]
VariableVisibility -> ShaderType

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

git-svn-id: http://skia.googlecode.com/svn/trunk@4534 2bbb7eff-a529-9590-31e7-b0007b416f81

12 years agoFix assumption that enabled stage implies texture is present
bsalomon@google.com [Wed, 11 Jul 2012 14:56:33 +0000 (14:56 +0000)]
Fix assumption that enabled stage implies texture is present
Review URL: http://codereview.appspot.com/6353087/

git-svn-id: http://skia.googlecode.com/svn/trunk@4532 2bbb7eff-a529-9590-31e7-b0007b416f81

12 years agoChange TextContext handling of stages and draw targets; this allows us to
tomhudson@google.com [Wed, 11 Jul 2012 14:41:19 +0000 (14:41 +0000)]
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