epoger@google.com
af07d065d1
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
2012-07-13 14:53:18 +00:00
bsalomon@google.com
fd4c00eb36
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
2012-07-13 14:39:51 +00:00
bsalomon@google.com
19263b1e67
Fix SkMatrix line endings (LF)
...
git-svn-id: http://skia.googlecode.com/svn/trunk@4592 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-07-13 13:36:38 +00:00
caryclark@google.com
5c286d3286
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
2012-07-13 11:57:28 +00:00
epoger@google.com
c665832fbf
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
2012-07-12 23:35:28 +00:00
chudy@google.com
9ca9bfe9f6
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
2012-07-12 21:58:14 +00:00
keyar@chromium.org
b5e30abbeb
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
2012-07-12 21:16:49 +00:00
caryclark@google.com
210acafc52
shape ops work in progress
...
git-svn-id: http://skia.googlecode.com/svn/trunk@4586 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-07-12 21:05:13 +00:00
vandebo@chromium.org
30580f6949
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
2012-07-12 20:22:04 +00:00
borenet@google.com
0cb1e2bcae
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
2012-07-12 19:48:42 +00:00
caryclark@google.com
9764cc6c10
shape ops work in progress
...
git-svn-id: http://skia.googlecode.com/svn/trunk@4583 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-07-12 19:29:45 +00:00
keyar@chromium.org
4916971526
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
2012-07-12 19:19:55 +00:00
epoger@google.com
70044cc496
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
2012-07-12 18:37:55 +00:00
epoger@google.com
46a45963fa
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
2012-07-12 18:16:02 +00:00
junov@chromium.org
a6c9e0e02b
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
2012-07-12 17:47:34 +00:00
tomhudson@google.com
d0c1a06cb9
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
2012-07-12 17:23:52 +00:00
bsalomon@google.com
d7727ceb82
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
2012-07-12 16:40:03 +00:00
reed@google.com
ba68cdb415
rebaseline macpro for convexpaths (test was changed)
...
git-svn-id: http://skia.googlecode.com/svn/trunk@4574 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-07-12 15:59:09 +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
reed@google.com
83ca337348
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
2012-07-12 15:27:54 +00:00
junov@chromium.org
02662b7feb
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
2012-07-12 14:44:52 +00:00
senorblanco@chromium.org
c76230868d
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
2012-07-12 14:39:07 +00:00
chudy@google.com
233e4b80e0
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
2012-07-12 14:38:49 +00:00
chudy@google.com
e606d6e210
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
2012-07-12 14:31:25 +00:00
chudy@google.com
e565de4fad
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
2012-07-12 14:15:54 +00:00
junov@chromium.org
6fc5699e77
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
2012-07-12 14:01:32 +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
caryclark@google.com
027de226c1
shape ops work in progress
...
M Intersection/Simplify.cpp
git-svn-id: http://skia.googlecode.com/svn/trunk@4560 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-07-12 12:52:50 +00:00
senorblanco@chromium.org
5f47a39916
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
2012-07-12 00:34:39 +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
senorblanco@chromium.org
eb311845c1
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
2012-07-11 20:49:26 +00:00
reed@google.com
b0a34d80c5
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
2012-07-11 19:57:55 +00:00
bsalomon@google.com
548a433ec3
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
2012-07-11 19:45:22 +00:00
bsalomon@google.com
641ca9c808
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
2012-07-11 19:35:52 +00:00
reed@google.com
e9bb623e4d
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
2012-07-11 18:56:10 +00:00
reed@google.com
79382af267
remove debugging printfs
...
git-svn-id: http://skia.googlecode.com/svn/trunk@4551 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-07-11 18:55:23 +00:00
robertphillips@google.com
fea85ac3e3
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
2012-07-11 18:53:23 +00:00
reed@google.com
19393dff0c
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
2012-07-11 18:48:37 +00:00
senorblanco@chromium.org
a2fdb338c7
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
2012-07-11 18:47:11 +00:00
robertphillips@google.com
bca1c5de48
Fixed merge error in r4545
...
git-svn-id: http://skia.googlecode.com/svn/trunk@4546 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-07-11 18:25:24 +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
bsalomon@google.com
ad5e937c11
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
2012-07-11 18:11:27 +00:00
caryclark@google.com
fa4a6e9646
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
2012-07-11 17:52:32 +00:00
reed@google.com
91bd45967c
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
2012-07-11 17:24:49 +00:00
senorblanco@chromium.org
22b13f3628
Disable lighting filter unit test temporarily; unreviewed.
...
git-svn-id: http://skia.googlecode.com/svn/trunk@4541 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-07-11 17:10:26 +00:00
senorblanco@chromium.org
0ec1eab877
Mac GLSL fixes; unreviewed.
...
git-svn-id: http://skia.googlecode.com/svn/trunk@4539 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-07-11 16:44:49 +00:00
senorblanco@chromium.org
6730cbb80a
More build fixes; unreviewed.
...
git-svn-id: http://skia.googlecode.com/svn/trunk@4537 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-07-11 16:35:00 +00:00
senorblanco@chromium.org
bd9fad67b8
Mac build fix; unreviewed.
...
git-svn-id: http://skia.googlecode.com/svn/trunk@4536 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-07-11 16:25:37 +00:00
senorblanco@chromium.org
894790d77c
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
2012-07-11 16:01:22 +00:00
bsalomon@google.com
eb715c8d5c
VariableVisibility -> ShaderType
...
Review URL: http://codereview.appspot.com/6344103/
git-svn-id: http://skia.googlecode.com/svn/trunk@4534 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-07-11 15:03:31 +00:00