Commit Graph

2536 Commits

Author SHA1 Message Date
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
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
bsalomon@google.com
f3ccda7d4f 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
2012-07-11 14:56:33 +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
bsalomon@google.com
3a52d68b40 Revert SkNO_RETURN_HINT fix in favor of a simpler fix
git-svn-id: http://skia.googlecode.com/svn/trunk@4529 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-07-11 13:30:08 +00:00
bsalomon@google.com
22f0761d78 Fix SkNO_RETURN_HINT warnings on mac/clang
Review URL: http://codereview.appspot.com/6392048/



git-svn-id: http://skia.googlecode.com/svn/trunk@4528 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-07-11 12:52:04 +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
bungeman@google.com
37946b5b2e Move animated view headers to correct directory.
git-svn-id: http://skia.googlecode.com/svn/trunk@4524 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-07-10 21:54:31 +00:00
rileya@google.com
ab2fe82840 Replace all instances of 'clear' with 'pop's in conical gradient pdf impl, looks like the pdf spec doesn't support Postscript's 'clear' stack operator. Should fix some warnings on mac buildbots.
git-svn-id: http://skia.googlecode.com/svn/trunk@4521 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-07-10 20:41:38 +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
reed@google.com
e2589aeebf Change SkFlatData to have a sentinel value, allowing the Compare function to
not need a loop-end-test.
Review URL: https://codereview.appspot.com/6355086

git-svn-id: http://skia.googlecode.com/svn/trunk@4517 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-07-10 19:38:01 +00:00
bsalomon@google.com
4eefe6132c Handle convex paths with degeneracies in cheap direction computation
Review URL: http://codereview.appspot.com/6349085/



git-svn-id: http://skia.googlecode.com/svn/trunk@4515 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-07-10 18:28:12 +00:00
bsalomon@google.com
f0a104e6f1 Remove GrStringBuilder
Review URL: http://codereview.appspot.com/6343093/



git-svn-id: http://skia.googlecode.com/svn/trunk@4514 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-07-10 17:51:07 +00:00
robertphillips@google.com
41f9e6e45d Fix to get r4511 compiling in Debug
git-svn-id: http://skia.googlecode.com/svn/trunk@4512 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-07-10 17:41:27 +00:00
robertphillips@google.com
59f46b81f8 Fixed Windows compiler complaints
http://codereview.appspot.com/6392044



git-svn-id: http://skia.googlecode.com/svn/trunk@4511 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-07-10 17:30:58 +00:00
tomhudson@google.com
676e66096c More carefully disable stages in Ganesh to avoid textures or effects
leaking between draw calls.

http://codereview.appspot.com/6353083/



git-svn-id: http://skia.googlecode.com/svn/trunk@4510 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-07-10 17:21:48 +00:00
bsalomon@google.com
313f019287 Don't call glTexSubImage2D w/ indexed texture format on desktop GL
Review URL: http://codereview.appspot.com/6374048/



git-svn-id: http://skia.googlecode.com/svn/trunk@4509 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-07-10 17:21:02 +00:00
bsalomon@google.com
52544c7cb6 Remove redundant vlayout masks and wasted vlayout bits
Review URL: http://codereview.appspot.com/6345080/


git-svn-id: http://skia.googlecode.com/svn/trunk@4506 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-07-10 15:06:59 +00:00
reed@google.com
b4ed0178d0 bug fix: take the fAllocSize into account when we perform the compare, otherwise
we can read past the end of one of the flatdatas if we're unlucky.



git-svn-id: http://skia.googlecode.com/svn/trunk@4503 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-07-10 13:29:52 +00:00
junov@chromium.org
9fa4d0cca9 Adding sanity checks on restore offsets in SkPicturePlayback::draw
Review URL: http://codereview.appspot.com/6382044/
BUG=http://code.google.com/p/chromium/issues/detail?id=133432



git-svn-id: http://skia.googlecode.com/svn/trunk@4496 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-07-09 20:53:37 +00:00
tomhudson@google.com
c377baf406 Add placement new macros to SkPostConfig, call SkNEW* from Ganesh.
TODO: unify with the placement new implementation in SkTemplatesPriv.h,
once various issues there are overcome. reed@ should be taking the lead
there.

http://codereview.appspot.com/6384043/



git-svn-id: http://skia.googlecode.com/svn/trunk@4492 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-07-09 20:17:56 +00:00
senorblanco@chromium.org
3a67a668db Add an SK_PRINTF_LIKE macro, which declares a function to have printf-like
semantics, allowing gcc and clang to check the format string against the
arguments.  Enable its use on SkString (printf, appendf, and prependf).  Also
define an SK_SIZE_T_SPECIFIER macro so there's a cross-platform way of
printing a size_t.

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



git-svn-id: http://skia.googlecode.com/svn/trunk@4485 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-07-09 18:22:08 +00:00
tomhudson@google.com
1dcfa1fcbd Fix definition of isEqual() for two gradient effect custom stages.
Expand comments defining isEqual() to better distinguish equality from
equivalence, which is more significant in Ganesh shader cache management.

http://codereview.appspot.com/6379043/



git-svn-id: http://skia.googlecode.com/svn/trunk@4484 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-07-09 18:21:28 +00:00
bungeman@google.com
8cd5ae79c6 Fix SkBlendLCD16_SSE2 for non ARGB platforms.
http://codereview.appspot.com/6356062/


git-svn-id: http://skia.googlecode.com/svn/trunk@4481 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-07-09 17:44:57 +00:00
reed@google.com
142e1fe7cf restore 4478 w/ fixed assert (no long need 8-byte alignment)
git-svn-id: http://skia.googlecode.com/svn/trunk@4480 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-07-09 17:44:44 +00:00
reed@google.com
fc8581b2d8 revert 4478
git-svn-id: http://skia.googlecode.com/svn/trunk@4479 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-07-09 17:40:48 +00:00
reed@google.com
f8affe5adf switch callers to SkChecksum::Compute (no 32/64 preference)
Review URL: https://codereview.appspot.com/6377043

git-svn-id: http://skia.googlecode.com/svn/trunk@4478 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-07-09 17:05:51 +00:00
robertphillips@google.com
5dfb67219a Left over cleanup from r4416 (fix for lingering AA clip mask bug)
http://codereview.appspot.com/6356058/



git-svn-id: http://skia.googlecode.com/svn/trunk@4474 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-07-09 16:32:28 +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
junov@chromium.org
e3dbedb44c Refactoring code in SkPictureRecord that touches fRestoreOffsetStack
Review URL: http://codereview.appspot.com/6350059/
BUG=http://code.google.com/p/chromium/issues/detail?id=133432



git-svn-id: http://skia.googlecode.com/svn/trunk@4472 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-07-09 16:03:55 +00:00
bsalomon@google.com
21320a17aa Fix bug in calling NV DeletePaths
Review URL: http://codereview.appspot.com/6345078/



git-svn-id: http://skia.googlecode.com/svn/trunk@4467 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-07-09 14:30:26 +00:00
senorblanco@chromium.org
bdb1ec453a Minor cleanup in lighting image filters: Made the light color a member of the
light, rather than the filter, so computation is localized.  Changed a couple
of non-const refs in the image filter creation API const refs.  Changed "const
SkColor&" to "SkColor", since it's just a uint32_t anyway.

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


git-svn-id: http://skia.googlecode.com/svn/trunk@4466 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-07-09 14:29:51 +00:00
mike@reedtribe.org
9ef23a3e05 HitTest: 10% speedup by adding quick-reject/accept using X bounds
git-svn-id: http://skia.googlecode.com/svn/trunk@4461 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-07-07 00:28:17 +00:00
mike@reedtribe.org
a920a35c0f add support for cubics to SkHitTestPathEx
git-svn-id: http://skia.googlecode.com/svn/trunk@4460 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-07-07 00:12:12 +00:00
robertphillips@google.com
54823c227d Rolling back r4034 (Proposed plumbing to propagate save & restore)
http://codereview.appspot.com/6346066/



git-svn-id: http://skia.googlecode.com/svn/trunk@4456 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-07-03 19:12:29 +00:00
rileya@google.com
e38160c38c Reworked gradient shader to no longer explicitly set gl_FragColor or return prematurely.
This should fix failing linux buildbot, and should play nicer with programs that don't use the gl_FragColor global, or that have multiple stages.
Also disabled debug printing from revision 4445.
Review URL: https://codereview.appspot.com/6345063

git-svn-id: http://skia.googlecode.com/svn/trunk@4454 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-07-03 18:03:04 +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
bsalomon@google.com
44f7c4a6f8 Make SkTSearch variants with compare func as template param
Review URL: https://codereview.appspot.com/6345060/



git-svn-id: http://skia.googlecode.com/svn/trunk@4449 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-07-03 15:03:10 +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
rileya@google.com
11b2d8b8d2 Temporary checkin to debug Linux bot issue.
git-svn-id: http://skia.googlecode.com/svn/trunk@4445 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-07-03 14:22:11 +00:00
rileya@google.com
baaaeebf17 Changed '0.5f' to '0.5' in conical gradient shader to fix problem with shader compile on Mac.
git-svn-id: http://skia.googlecode.com/svn/trunk@4444 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-07-03 14:11:05 +00:00
rileya@google.com
3e33258cd1 Added GPU implementation of 2-point conical gradient.
Review URL: https://codereview.appspot.com/6354062

git-svn-id: http://skia.googlecode.com/svn/trunk@4442 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-07-03 13:43:35 +00:00
mike@reedtribe.org
a2a95f9def experimental hittest for paths (incomplete)
git-svn-id: http://skia.googlecode.com/svn/trunk@4437 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-07-03 02:35:36 +00:00
reed@google.com
fd59d12000 change NewWithCString to allocate room for the terminating NULL, so the data
can be treated as a cstring (duh).



git-svn-id: http://skia.googlecode.com/svn/trunk@4430 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-07-02 20:28:31 +00:00
reed@google.com
0985c558fc fix type
git-svn-id: http://skia.googlecode.com/svn/trunk@4428 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-07-02 19:36:47 +00:00
reed@google.com
2e07942f42 add read/write SkData methods
git-svn-id: http://skia.googlecode.com/svn/trunk@4427 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-07-02 19:35:13 +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
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
robertphillips@google.com
366f1c6a09 Fixed lingering gpu-path AA clip mask generation bug
http://codereview.appspot.com/6351055/



git-svn-id: http://skia.googlecode.com/svn/trunk@4416 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-06-29 21:38:47 +00:00
robertphillips@google.com
41efe04af9 Partially rolled forward the SkGrPixelRef changes
http://codereview.appspot.com/6354060/



git-svn-id: http://skia.googlecode.com/svn/trunk@4415 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-06-29 20:55:14 +00:00
scroggo@google.com
d33819aeb6 Fix a warning on linux when compiling SkGPipeWrite.cpp
Review URL: https://codereview.appspot.com/6349057

git-svn-id: http://skia.googlecode.com/svn/trunk@4413 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-06-29 19:24:25 +00:00
tomhudson@google.com
375ff85e96 Un-trifurcate GrTextContext: get rid of Default and Batched subclasses,
folding their functionality back into the base class.

Requires gyp changes.

http://codereview.appspot.com/6357048/



git-svn-id: http://skia.googlecode.com/svn/trunk@4411 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-06-29 18:37:57 +00:00
bsalomon@google.com
05a718c9d2 Fix some NV path rendering issues with perspective and inverse paths
Review URL: http://codereview.appspot.com/6347050/



git-svn-id: http://skia.googlecode.com/svn/trunk@4403 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-06-29 14:01:53 +00:00
robertphillips@google.com
e9c0469a49 Pseudo-reverted r4396 (SkGrPixelRef files are still in source pool but are unused)
git-svn-id: http://skia.googlecode.com/svn/trunk@4402 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-06-29 00:30:13 +00:00
robertphillips@google.com
ecf1f3299a Temporarily readding SkGrTexturePixelRef.h/.cpp until WebKit is transitioned to SkGrPixelRef
git-svn-id: http://skia.googlecode.com/svn/trunk@4401 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-06-28 21:59:38 +00:00
vandebo@chromium.org
da6c569334 [PDF] Fix PDF code to not crash on SkComposeShader.
Review URL: https://codereview.appspot.com/6354053

git-svn-id: http://skia.googlecode.com/svn/trunk@4400 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-06-28 21:37:20 +00:00
robertphillips@google.com
5088eb49fe Moved SkGrTexturePixelRef to SkGrPixelRef
http://codereview.appspot.com/6344054/



git-svn-id: http://skia.googlecode.com/svn/trunk@4397 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-06-28 20:59:13 +00:00
robertphillips@google.com
d881bc194d Collapsed SkGrTexturePixelRef and SkGrRenderTargetPixelRef into SkGrPixelRef using new GrSurface class
http://codereview.appspot.com/6359045/



git-svn-id: http://skia.googlecode.com/svn/trunk@4396 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-06-28 20:02:39 +00:00
bsalomon@google.com
d1e533f09f Change CT assert to RT assert
git-svn-id: http://skia.googlecode.com/svn/trunk@4391 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-06-28 18:56:22 +00:00
bsalomon@google.com
ded4f4b163 Initial support for GL_NV_path_renering. Experimental, there are still some issues to resolve, set gyp variable skia_nv_path_rendering=1 or build flag GR_GL_USE_NV_PATH_RENDERING to enable.
http://codereview.appspot.com/6349049/



git-svn-id: http://skia.googlecode.com/svn/trunk@4390 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-06-28 18:48:06 +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
reed@google.com
dbc936dff3 add SkData::NewFromCString()
git-svn-id: http://skia.googlecode.com/svn/trunk@4383 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-06-28 15:40:09 +00:00
robertphillips@google.com
fe65943d30 fixed another clang++ compiler error
git-svn-id: http://skia.googlecode.com/svn/trunk@4382 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-06-28 01:01:53 +00:00
robertphillips@google.com
58b20215f6 Split GrSWMaskHelper into its own files
http://codereview.appspot.com/6350046/



git-svn-id: http://skia.googlecode.com/svn/trunk@4380 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-06-27 20:44:52 +00:00
robertphillips@google.com
eca2dfb002 fixed missing "return" error
git-svn-id: http://skia.googlecode.com/svn/trunk@4379 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-06-27 20:13:49 +00:00
junov@chromium.org
ef76060cbf Adding checksum to SkFlatData to accelerate SkPicture recording.
The checksum triggers an early exit in the mem compare use to search for duplicate flattened objects. Also, call to memcmp was replaced with 64-bit at a time comparison loop.

Review URL: http://codereview.appspot.com/6339046/
BUG=http://code.google.com/p/chromium/issues/detail?id=54079
TEST=Checksum and PictureRecord tests in bench.exe



git-svn-id: http://skia.googlecode.com/svn/trunk@4378 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-06-27 20:03:16 +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
robertphillips@google.com
1d89c93b2a Added ReadPixels format-supported check to GL Caps
http://codereview.appspot.com/6336055/



git-svn-id: http://skia.googlecode.com/svn/trunk@4374 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-06-27 19:31:41 +00:00
reed@google.com
26344cfaff add explicit purgeAll() so we don't get foiled by the min cache-limit
call unref instead of delete on the GrFontScaler
Review URL: https://codereview.appspot.com/6353045

git-svn-id: http://skia.googlecode.com/svn/trunk@4366 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-06-27 18:23:01 +00:00
robertphillips@google.com
c0c1daa7f6 Enable Scratch texture detach in SW path renderer's onDrawPath (again)
http://codereview.appspot.com/6331057/



git-svn-id: http://skia.googlecode.com/svn/trunk@4365 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-06-27 18:02:57 +00:00
bungeman@google.com
488379e5ac Bump max flattenable from 64 to 1024.
Ran into limit on Mac.


git-svn-id: http://skia.googlecode.com/svn/trunk@4364 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-06-27 15:57:34 +00:00
reed@google.com
e4e75dca21 remove duplicate definition of SkAlign8()
git-svn-id: http://skia.googlecode.com/svn/trunk@4363 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-06-27 15:41:54 +00:00
robertphillips@google.com
386319eebb Fixed Resource counting bug in AutoScratchTexture detach mechanism
http://codereview.appspot.com/6356043/



git-svn-id: http://skia.googlecode.com/svn/trunk@4361 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-06-27 14:59:18 +00:00
reed@google.com
51f3866995 fix leak of Light object (in this private instance, the caller is transferring
ownership of the object, so the receive does not need to call ref).
Review URL: https://codereview.appspot.com/6348045

git-svn-id: http://skia.googlecode.com/svn/trunk@4360 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-06-27 14:24:29 +00:00
robertphillips@google.com
0456e0b7b8 Added Inst counting to SkFlattenable-derived classes
http://codereview.appspot.com/6355043/



git-svn-id: http://skia.googlecode.com/svn/trunk@4359 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-06-27 14:03:26 +00:00
bsalomon@google.com
a4f6b10818 Make GrInOrderDrawBuffer playback command driven
Review URL: http://codereview.appspot.com/6341052/




git-svn-id: http://skia.googlecode.com/svn/trunk@4356 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-06-26 21:04:22 +00:00
robertphillips@google.com
69ffcf0d34 Fixed alignment issue in Linux build
git-svn-id: http://skia.googlecode.com/svn/trunk@4355 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-06-26 21:01:05 +00:00
robertphillips@google.com
409566a17d Removed cached copy of the GrDebugGLInterface
http://codereview.appspot.com/6329068/



git-svn-id: http://skia.googlecode.com/svn/trunk@4354 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-06-26 20:19:41 +00:00
reed@google.com
fa35e3ddcc plumb SkInstCnt to all subclasses of GrRefCnt
git-svn-id: http://skia.googlecode.com/svn/trunk@4353 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-06-26 20:16:17 +00:00
reed@google.com
a23d048209 remove SkInstCnt tracking of SkViewRegistry
git-svn-id: http://skia.googlecode.com/svn/trunk@4352 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-06-26 20:15:42 +00:00
reed@google.com
79655480e7 remove bogus SkViewFactory reference
git-svn-id: http://skia.googlecode.com/svn/trunk@4350 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-06-26 19:48:09 +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
tomhudson@google.com
1909e15a6d In GrBatchedTextContext, use GrSafeSetNull(), for more safeness!
http://codereview.appspot.com/6326058/



git-svn-id: http://skia.googlecode.com/svn/trunk@4345 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-06-26 17:57:03 +00:00
reed@google.com
fcb57b5570 more SkInstCnt plumbing
git-svn-id: http://skia.googlecode.com/svn/trunk@4344 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-06-26 17:55:30 +00:00
reed@google.com
82ce2b8afb add more SkInstCnt plumbing
git-svn-id: http://skia.googlecode.com/svn/trunk@4343 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-06-26 17:43:26 +00:00
reed@google.com
3b42998466 stick SkInstCnt in more classes, to help track down leaks
git-svn-id: http://skia.googlecode.com/svn/trunk@4341 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-06-26 15:30:08 +00:00
djsollen@google.com
0833777df1 Cleanup flattening code to properly serialize lighting image filters.
Review URL: https://codereview.appspot.com/6333070

git-svn-id: http://skia.googlecode.com/svn/trunk@4340 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-06-26 14:33:13 +00:00
robertphillips@google.com
009f62919f Reverting r4324
git-svn-id: http://skia.googlecode.com/svn/trunk@4338 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-06-26 12:56:54 +00:00
scroggo@google.com
6eb0d62cc3 Register some flattenable factories.
Now, SkComposeShaders, SkDiscreteMapper, SkCosineMapper,
Line2DPathEffect, and SkTransparentShader can be flattened
and unflattened. This makes more of our samples work when
using a pipe.

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

git-svn-id: http://skia.googlecode.com/svn/trunk@4334 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-06-25 20:32:12 +00:00
tomhudson@google.com
09662068c3 Disable assert blocking DEPS roll. This is a sanity-checking assert not
necessary to correct operation (yet). Will pursue a fix & reenable.

http://codereview.appspot.com/6330056/



git-svn-id: http://skia.googlecode.com/svn/trunk@4332 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-06-25 20:18:47 +00:00
reed@google.com
e56513d2a9 if bounds don't intersect in DIFF mode, just return src (don't return empty)
Review URL: https://codereview.appspot.com/6337052

git-svn-id: http://skia.googlecode.com/svn/trunk@4331 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-06-25 20:06:33 +00:00
bsalomon@google.com
1015e03467 Fix crash when buidling with no deferred drawing in grcontext
git-svn-id: http://skia.googlecode.com/svn/trunk@4329 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-06-25 18:41:04 +00:00
bsalomon@google.com
70fc152576 Fix the stencil rules to perfom an rdiff with an inverse path
Review URL: http://codereview.appspot.com/6336056/


git-svn-id: http://skia.googlecode.com/svn/trunk@4328 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-06-25 18:03:46 +00:00
bsalomon@google.com
ce7357df6a Add header needed to use the SWAP_PER_DRAW debug facility on windows.
git-svn-id: http://skia.googlecode.com/svn/trunk@4327 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-06-25 17:49:25 +00:00
tomhudson@google.com
f13f588046 Add GrPaint::*StageEnabled() and GrDrawState::stageEnabled() functions.
These wrap the question of "is this stage of the shader enabled?" so that
we can change the semantics - previously iff there was a texture, now
if there is a texture OR a GrCustomStage, soon (post-cl 6306097) iff there
is a GrCustomStage, which at that point will hold whatever texture is
necessary.

http://codereview.appspot.com/6306104/



git-svn-id: http://skia.googlecode.com/svn/trunk@4325 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-06-25 17:27:28 +00:00
robertphillips@google.com
f41f4d2257 Enable Scratch texture detach in SW path renderer's onDrawPath (take 2)
http://codereview.appspot.com/6331057/



git-svn-id: http://skia.googlecode.com/svn/trunk@4324 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-06-25 17:26:29 +00:00
djsollen@google.com
edae1416ba Fix metrics test to no longer include the cpp.
The inclusion of the cpp caused linker errors when building skia
components as shared libaries for inclusion in an Android app.
Review URL: https://codereview.appspot.com/6338063

git-svn-id: http://skia.googlecode.com/svn/trunk@4323 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-06-25 17:01:46 +00:00
tomhudson@google.com
b213ed8b76 Simplify vertex layout bitfields by making Position-as-texcoords the
default.

http://codereview.appspot.com/6337050/



git-svn-id: http://skia.googlecode.com/svn/trunk@4321 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-06-25 15:22:12 +00:00
robertphillips@google.com
1807d0d0de Reverting r4319
git-svn-id: http://skia.googlecode.com/svn/trunk@4320 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-06-25 15:17:32 +00:00
robertphillips@google.com
042cb4769f Enable Scratch texture detach in SW path renderer's onDrawPath
http://codereview.appspot.com/6331057/



git-svn-id: http://skia.googlecode.com/svn/trunk@4319 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-06-25 14:37:11 +00:00
reed@google.com
34342f6f51 export flags on the state of the world when a picture was serialized.
e.g. don't read/write functionptrs in that case (sizeof may be different for one)
Review URL: https://codereview.appspot.com/6331050

git-svn-id: http://skia.googlecode.com/svn/trunk@4318 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-06-25 14:36:28 +00:00
bungeman@google.com
ec95a4ae45 Remove multi-byte character constants.
http://codereview.appspot.com/6305117/


git-svn-id: http://skia.googlecode.com/svn/trunk@4317 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-06-25 14:26:48 +00:00
djsollen@google.com
5df2a99861 [android] Add an API to load customized font config for testing.
When running WebKit layout tests, we need to load some fonts from Linux to
match baselines of chromium linux. However, font config file is
hard-coded in Skia now. This change add an API to customize font config
in skia.

https://codereview.appspot.com/6296067/

git-svn-id: http://skia.googlecode.com/svn/trunk@4316 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-06-25 13:58:22 +00:00
tomhudson@google.com
3eee8fbe0f Fix misplaced return in GrDrawState::stageDisabled().
Original patch by guanqun.lu@gmail.com

http://codereview.appspot.com/6338058/



git-svn-id: http://skia.googlecode.com/svn/trunk@4315 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-06-25 12:30:34 +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
tomhudson@google.com
7d6afdd795 Extend texture release on GrDrawState to also handle custom stages.
Add asserts to GrContext::setPaint() to make sure we're keeping things
cleaned up.
Remove double-call of setPaint() during text context initialization.

http://codereview.appspot.com/6324046/



git-svn-id: http://skia.googlecode.com/svn/trunk@4313 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-06-22 20:10:50 +00:00
bsalomon@google.com
1b1e201ea3 Revert #if 0ed out code accidentally committed as part of r4299.
git-svn-id: http://skia.googlecode.com/svn/trunk@4309 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-06-22 18:18:08 +00:00
reed@google.com
6756209ee0 Expand header in serialized pictures
Make chunk/tag reading allow for optional and (somewhat) out-of-order chunks.
Return empty picture instead of throwing on error
Review URL: https://codereview.appspot.com/6329049

git-svn-id: http://skia.googlecode.com/svn/trunk@4308 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-06-22 15:38:39 +00:00
bsalomon@google.com
07fc0d178e Revert r4287. Large numbers of textures created by random gradients can cause poor driver performance (at least on Mac)
BUG=670



git-svn-id: http://skia.googlecode.com/svn/trunk@4306 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-06-22 15:15:59 +00:00
junov@chromium.org
89e615d260 Removing redundant calls to GEN_ID_INC_EVAL in SkPaint.cpp
Review URL: http://codereview.appspot.com/6302099/



git-svn-id: http://skia.googlecode.com/svn/trunk@4305 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-06-22 14:37:21 +00:00
robertphillips@google.com
a0a66c1183 Fix clipping of ovals on top & right
http://codereview.appspot.com/6294091/



git-svn-id: http://skia.googlecode.com/svn/trunk@4303 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-06-22 13:14:29 +00:00
reed@google.com
ed38495c7c add PictInfo chunk to serialized pictures
Review URL: https://codereview.appspot.com/6325048

git-svn-id: http://skia.googlecode.com/svn/trunk@4302 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-06-22 13:12:17 +00:00
robertphillips@google.com
15c0fea699 AutoScratchTexture can now release its texture and it will return to the texture cache when freed
http://codereview.appspot.com/6262043/



git-svn-id: http://skia.googlecode.com/svn/trunk@4301 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-06-22 12:41:43 +00:00
bsalomon@google.com
5e24129831 Move GrTemplates.h to src
Review URL: http://codereview.appspot.com/6333053/


git-svn-id: http://skia.googlecode.com/svn/trunk@4300 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-06-22 12:34:22 +00:00
bsalomon@google.com
9e553c6e7c Minor GrStencilSettings cleanup
Review URL: http://codereview.appspot.com/6329044/



git-svn-id: http://skia.googlecode.com/svn/trunk@4299 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-06-22 12:23:29 +00:00
robertphillips@google.com
9ec075366e Altered GrDrawState to always ref texture and render target
http://codereview.appspot.com/6251049/



git-svn-id: http://skia.googlecode.com/svn/trunk@4298 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-06-22 12:01:30 +00:00
robertphillips@google.com
7d501ab502 Add GrSurface parent class above GrTexture & GrRenderTarget
http://codereview.appspot.com/6297092/



git-svn-id: http://skia.googlecode.com/svn/trunk@4292 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-06-21 21:09:06 +00:00
robertphillips@google.com
15e9d3e66e Expanded distribution of instance counting
http://codereview.appspot.com/6300114/



git-svn-id: http://skia.googlecode.com/svn/trunk@4291 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-06-21 20:25:03 +00:00
robertphillips@google.com
c82a8b7aa4 Fixed two bugs in SW-only clip mask generation
http://codereview.appspot.com/6306086/



git-svn-id: http://skia.googlecode.com/svn/trunk@4290 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-06-21 20:15:48 +00:00
bsalomon@google.com
7aa876bfbf Record pixel ref's gen ID in picture
Review URL: http://codereview.appspot.com/6325046/



git-svn-id: http://skia.googlecode.com/svn/trunk@4289 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-06-21 20:13:04 +00:00
bsalomon@google.com
a320194e42 Make GrClipMaskManager configure the stencil and scissor on GrGpu
Review URL: http://codereview.appspot.com/6308096/



git-svn-id: http://skia.googlecode.com/svn/trunk@4288 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-06-21 19:58:20 +00:00
bsalomon@google.com
8f7e1dac5c Remove count budget from resource cache
Review URL: http://codereview.appspot.com/6312052/



git-svn-id: http://skia.googlecode.com/svn/trunk@4287 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-06-21 19:48:32 +00:00
reed@google.com
a4c6e4d6d3 landing mirror of https://codereview.appspot.com/6304098/
by kondapallykalyan

fixing  compiler warnings in SkAAClip



git-svn-id: http://skia.googlecode.com/svn/trunk@4283 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-06-20 14:29:50 +00:00
bsalomon@google.com
4da34e36cb Add GrMemoryPool as a helper to override operators new/delete
Review URL: http://codereview.appspot.com/6306090/



git-svn-id: http://skia.googlecode.com/svn/trunk@4282 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-06-19 15:40:27 +00:00
tomhudson@google.com
50e4ce0552 Fix memory leaks.
http://codereview.appspot.com/6301098/



git-svn-id: http://skia.googlecode.com/svn/trunk@4281 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-06-19 15:27:50 +00:00
reed@google.com
2999f789c7 landing http://codereview.appspot.com/6306095/ by guanqun
fix the following warning for SkColorTable

../src/core/SkColorTable.cpp: In copy constructor
‘SkColorTable::SkColorTable(const SkColorTable&)’:
../src/core/SkColorTable.cpp:30:1: warning: base class ‘class SkFlattenable’
should be explicitly initialized in the copy constructor [-Wextra]



git-svn-id: http://skia.googlecode.com/svn/trunk@4280 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-06-19 15:27:46 +00:00
bsalomon@google.com
276c1fabc2 fix incorrect GPU rendering for path inverse fill when path is outside the clip
Committed on behalf of Guanqun.Lu@gmail.com

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



git-svn-id: http://skia.googlecode.com/svn/trunk@4279 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-06-19 13:22:45 +00:00
bsalomon@google.com
75356a713f Fixed compile warning in SkOSWindow_unix.cpp
Committed on behalf of kondapallykalyan@gmail.com

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



git-svn-id: http://skia.googlecode.com/svn/trunk@4278 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-06-19 13:08:59 +00:00
reed@google.com
81275391b1 add MS UI GOTHIC to list of bad fonts.
specify per-rect-edge outset for bad fonts

http://code.google.com/p/chromium/issues/detail?id=121586



git-svn-id: http://skia.googlecode.com/svn/trunk@4275 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-06-18 14:08:56 +00:00
bsalomon@google.com
c8f7f47afa Store clip mask location in GrClipMaskManager as a enum rather than two bools
Review URL: http://codereview.appspot.com/6306092/



git-svn-id: http://skia.googlecode.com/svn/trunk@4274 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-06-18 13:44:51 +00:00
bsalomon@google.com
b702c0fcc0 GPU would ignore the path effect when its stroke is zero, fix it
Committed on behalf of Guanqun.Lu@gmail.com

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




git-svn-id: http://skia.googlecode.com/svn/trunk@4273 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-06-18 12:52:56 +00:00
bsalomon@google.com
e76b7ccb86 fix gl error of 'invalid enum' from GL_COLOR_TABLE
Committed on behalf of Guanqun.Lu@gmail.com

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



git-svn-id: http://skia.googlecode.com/svn/trunk@4272 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-06-18 12:47:06 +00:00
bsalomon@google.com
845eafddb0 show meaningful GL error strings during debugging
Committed on behalf of Guanqun.Lu@gmail.com

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



git-svn-id: http://skia.googlecode.com/svn/trunk@4271 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-06-18 12:27:29 +00:00
bsalomon@google.com
fc0d23a6ba Avoid un-necessary re-calculations of width in for loop of emitFS function
Committed on behalf of kondapallykalyan@gmail.com

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



git-svn-id: http://skia.googlecode.com/svn/trunk@4270 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-06-15 21:50:15 +00:00
bsalomon@google.com
13b85aab6e Give GrClipMaskManager a GrGpu*
Review URL: http://codereview.appspot.com/6301090/



git-svn-id: http://skia.googlecode.com/svn/trunk@4269 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-06-15 21:09:40 +00:00
bsalomon@google.com
0f1c10b3fd Remove unused function left in GrGLProgram.cpp
git-svn-id: http://skia.googlecode.com/svn/trunk@4268 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-06-15 20:36:33 +00:00
bsalomon@google.com
945bbe1456 Suppress annoying printf in GM when MSAA is not supported.
git-svn-id: http://skia.googlecode.com/svn/trunk@4265 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-06-15 14:30:34 +00:00
reed@google.com
5a121add5e add more font names to our extra-bottom-space hack
http://code.google.com/p/chromium/issues/detail?id=130842

Change cached names to be UTF8 encoded, since we now have some non-ascii names



git-svn-id: http://skia.googlecode.com/svn/trunk@4264 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-06-15 14:27:15 +00:00
bsalomon@google.com
c345c4279b Add strings to debug/null interfaces glGetString
Review URL: http://codereview.appspot.com/6294062/



git-svn-id: http://skia.googlecode.com/svn/trunk@4263 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-06-15 14:16:00 +00:00
bsalomon@google.com
c0af317331 TLS GrContext count
Review URL: http://codereview.appspot.com/6298077/


git-svn-id: http://skia.googlecode.com/svn/trunk@4262 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-06-15 14:10:09 +00:00
robertphillips@google.com
f69a11b5c5 Use GrAARectRenderer in GPU AA clip mask generation
http://codereview.appspot.com/6300097/



git-svn-id: http://skia.googlecode.com/svn/trunk@4261 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-06-15 13:58:07 +00:00
reed@google.com
b8a5c618d2 http://codereview.appspot.com/6307089
Detect bad font, and adjust glyph heights to avoid clipping



git-svn-id: http://skia.googlecode.com/svn/trunk@4257 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-06-13 20:01:44 +00:00
reed@google.com
4d0078aa51 Fix calling (and checking) the decal_ functions when the input is SkFractionalInt.
The bug was to cast to SkFixed from SkFractionalInt, when what we needed to do
was shift the fractional guy down to fixed.

This bug was only caught on an android device w/o neon, since other configs have
assembly for their matrixproc that didn't have this bug.
Review URL: https://codereview.appspot.com/6303074

git-svn-id: http://skia.googlecode.com/svn/trunk@4256 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-06-13 19:39:03 +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
972265db21 releaseTextures portion of GrDrawState Ref textures CL (http://codereview.appspot.com/6251049/)
http://codereview.appspot.com/6299081/



git-svn-id: http://skia.googlecode.com/svn/trunk@4254 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-06-13 18:49:30 +00:00
tomhudson@google.com
db3a1541f0 Remove local variable from GrConvolutionEffect GLSL code; reported to give marginal speedup
on some Intel architectures. Original patch from kondapallykalyan@.

http://codereview.appspot.com/6302070/



git-svn-id: http://skia.googlecode.com/svn/trunk@4250 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-06-13 18:12:57 +00:00
scroggo@google.com
8ae3c7f67e For SkGPipe, store bitmaps in a common location.
Also make a change to SkBitmap::copyTo() so that we do not
crash.
Review URL: https://codereview.appspot.com/6296066

git-svn-id: http://skia.googlecode.com/svn/trunk@4249 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-06-13 17:47:52 +00:00
schenney@chromium.org
7e963605d5 Fix the problem of rendering closePath not properly after a moveTo call in
canvas 2D interface. If there is a polyline, followed by a moveTo and a
closePath, both the moveTo and the closePath should be ignored for the purposes
of drawing, and the polyline should not be closed (unless force closed is true
(for filling, for instance).

Tested for path with both valid and degenerate content, when asked to
consume degenerates and not, force closed and not.

This patch also includes a uni test refactoring to reduce the amount of code
to test path iteration and zero length paths.

BUG=6297049

TEST=tests/PathTest.cpp, testIter method.
Review URL: https://codereview.appspot.com/6300086

git-svn-id: http://skia.googlecode.com/svn/trunk@4247 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-06-13 17:05:43 +00:00
tomhudson@google.com
761b37c0eb Split two-point radial gradient parameters into two arrays of uniforms,
to avoid sharing arrays between fragment & vertex shaders. Appears to
work around driver bug on Xoom.

http://codereview.appspot.com/6304070/



git-svn-id: http://skia.googlecode.com/svn/trunk@4246 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-06-13 15:22:18 +00:00
robertphillips@google.com
e98ade4fde Added Texture desc to render target
http://codereview.appspot.com/6302068/



git-svn-id: http://skia.googlecode.com/svn/trunk@4243 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-06-13 12:53:07 +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
djsollen@google.com
64a0ec3655 Move SkColorTable into its own header and reduce includes in SkFlattenable.h
Review URL: https://codereview.appspot.com/6299072

git-svn-id: http://skia.googlecode.com/svn/trunk@4236 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-06-12 15:17:27 +00:00
junov@chromium.org
957ebddce1 Adding API to GrTexture to reset cached texture parameter values
REVIEW=http://codereview.appspot.com/6305084/
BUG=http://code.google.com/p/chromium/issues/detail?id=130925



git-svn-id: http://skia.googlecode.com/svn/trunk@4234 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-06-12 13:58:36 +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
7886ad3de1 remove SK_CAN_USE_FLOAT (deprecated)
git-svn-id: http://skia.googlecode.com/svn/trunk@4232 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-06-11 21:21:26 +00:00
reed@google.com
4908533aef fix missing switch-statement handler (for conical gradient)
git-svn-id: http://skia.googlecode.com/svn/trunk@4229 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-06-11 18:54:07 +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
db15a420c3 Register Two_Point_Conical_Gradient for flattening.
Without being registered, the twopointconical GM fails
when using --pipe or --serialize, since this gradient
will not be flattened/unflattened.
Review URL: https://codereview.appspot.com/6294060

git-svn-id: http://skia.googlecode.com/svn/trunk@4226 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-06-11 16:51:45 +00:00
bsalomon@google.com
7f7dd73bbd fix include name (masked by case insensitiviy on windows)
git-svn-id: http://skia.googlecode.com/svn/trunk@4225 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-06-11 15:55:58 +00:00
bsalomon@google.com
f6a78c97f9 fix SkNWayCanvas cons call again.
git-svn-id: http://skia.googlecode.com/svn/trunk@4224 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-06-11 15:52:55 +00:00
bsalomon@google.com
651132a845 Fix SkNWayCanvas cons call when creating null canvas.
git-svn-id: http://skia.googlecode.com/svn/trunk@4223 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-06-11 15:47:23 +00:00
bsalomon@google.com
b51c633c4f Fix Fixed-Point build by changing static_assert around scalar=float to a runtime crash.
git-svn-id: http://skia.googlecode.com/svn/trunk@4222 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-06-11 15:46:05 +00:00
bsalomon@google.com
19bbd3d02e Null canvas
Review URL: http://codereview.appspot.com/6117051/



git-svn-id: http://skia.googlecode.com/svn/trunk@4220 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-06-11 15:39:15 +00:00
bsalomon@google.com
64aef2bacd Towards NV path rendering
Review URL: http://codereview.appspot.com/6302049/



git-svn-id: http://skia.googlecode.com/svn/trunk@4219 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-06-11 15:36:13 +00:00
tomhudson@google.com
f8a2289667 Manually unroll loop in convolution (blur) - most GL drivers do, but some
don't, and this leads to 20-30% benchmark speedup.

http://codereview.appspot.com/6308057/



git-svn-id: http://skia.googlecode.com/svn/trunk@4218 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-06-11 12:42:24 +00:00
mike@reedtribe.org
23113dd420 fix typo: fA is dx^2 + dx^2 - dr^2, not dx^2 - dy^2 - dr^2
git-svn-id: http://skia.googlecode.com/svn/trunk@4217 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-06-09 02:03:40 +00:00
bsalomon@google.com
0efcc37952 Remove glBlendEquation and glColorPointer
Review URL: http://codereview.appspot.com/6300075/



git-svn-id: http://skia.googlecode.com/svn/trunk@4216 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-06-08 20:36:22 +00:00
djsollen@google.com
94e75ee46a Rename the existing flatten(void*) methods.
This change avoids naminc confusion with the SkFlattenable flatten methods and
also changes SkPath to use the void* model instead of taking a SkReader32.
Review URL: https://codereview.appspot.com/6299062

git-svn-id: http://skia.googlecode.com/svn/trunk@4215 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-06-08 18:30:46 +00:00
reed@google.com
97caebc746 Detect inverse-fill, and treat its bounds as huge (all of integer space) for the
purposes of comparing w/ the clip-bounds, otherwise we can reject the draw if
the bounds of the path are outside the bounds of the clip.
Review URL: https://codereview.appspot.com/6302058

git-svn-id: http://skia.googlecode.com/svn/trunk@4214 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-06-08 16:30:12 +00:00
scroggo@google.com
b073d920c9 Add a tiled pipe mode to SampleApp.
Using the "Pipe" checkbox in SamleApp, you can now
toggle amongst three states: no pipe, a normal pipe
(or others depending on #defines), and a tiled pipe.
You can also use shift + p to toggle.
Review URL: https://codereview.appspot.com/6303055

git-svn-id: http://skia.googlecode.com/svn/trunk@4213 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-06-08 15:35:03 +00:00
robertphillips@google.com
56f2244dca Fix for r4201 performance regression (http://code.google.com/p/skia/issues/detail?id=640)
http://codereview.appspot.com/6299060/



git-svn-id: http://skia.googlecode.com/svn/trunk@4212 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-06-08 14:21:26 +00:00
bsalomon@google.com
5a94efcc3e Call flushMiscFixedFunctionState (D'oh!)
Review URL: http://codereview.appspot.com/6302057/



git-svn-id: http://skia.googlecode.com/svn/trunk@4211 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-06-08 14:13:02 +00:00
bsalomon@google.com
df9d656c35 Add SkPath::getVerbs/countVerbs
Review URL: http://codereview.appspot.com/6306053/


git-svn-id: http://skia.googlecode.com/svn/trunk@4209 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-06-07 21:43:15 +00:00
reed@google.com
83226976b5 extend asAGradient for Conical type (to be implemented by PDF and XPS)
Review URL: https://codereview.appspot.com/6308051

git-svn-id: http://skia.googlecode.com/svn/trunk@4207 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-06-07 20:26:47 +00:00
bsalomon@google.com
f6d3c5aa5f Make SkPath::RawIter require a non-NULL pts pointer.
Review URL: http://codereview.appspot.com/6301060/



git-svn-id: http://skia.googlecode.com/svn/trunk@4206 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-06-07 17:47:33 +00:00
reed@google.com
aca29ae8cd optimize quad-root for conical gradients
Review URL: https://codereview.appspot.com/6307052

git-svn-id: http://skia.googlecode.com/svn/trunk@4204 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-06-07 14:20:52 +00:00
bsalomon@google.com
fcdb083420 Fix dumb bug in checking gl interface validation against binding from gl version string
git-svn-id: http://skia.googlecode.com/svn/trunk@4202 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-06-07 13:03:03 +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
bsalomon@google.com
9923c2b29a Remove gpu stats tracking
Review URL: http://codereview.appspot.com/6300052/



git-svn-id: http://skia.googlecode.com/svn/trunk@4194 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-06-06 18:21:18 +00:00
bsalomon@google.com
d4340e2b35 fix bug in GrGLInterface validation added in r4192
git-svn-id: http://skia.googlecode.com/svn/trunk@4193 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-06-06 15:38:52 +00:00
bsalomon@google.com
fe11cb6486 Add GL function pointers for GL_NV_path_rendering
Review URL: http://codereview.appspot.com/6296046/



git-svn-id: http://skia.googlecode.com/svn/trunk@4192 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-06-06 15:17:54 +00:00
caryclark@google.com
16230cbaca fix warnings on Mac in src/animator
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/6306044

git-svn-id: http://skia.googlecode.com/svn/trunk@4189 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-06-06 12:11:55 +00:00
caryclark@google.com
3dd459151f fix warnings on Mac in miscellaneous files
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/6305047

git-svn-id: http://skia.googlecode.com/svn/trunk@4186 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-06-06 12:11:10 +00:00
caryclark@google.com
83ecdc3ac6 fix warnings on Mac in src/opts
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/6303045

git-svn-id: http://skia.googlecode.com/svn/trunk@4184 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-06-06 12:10:26 +00:00
caryclark@google.com
803eceb6af fix warnings on Mac in src/core
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/6301046

git-svn-id: http://skia.googlecode.com/svn/trunk@4182 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-06-06 12:09:34 +00:00
caryclark@google.com
383d5d4949 fix warnings on Mac in src/effects
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/6299049

git-svn-id: http://skia.googlecode.com/svn/trunk@4181 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-06-06 12:09:18 +00:00
caryclark@google.com
cf6285b89b fix warnings on Mac in src/gpu and include/gpu
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/6296044

git-svn-id: http://skia.googlecode.com/svn/trunk@4180 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-06-06 12:09:01 +00:00
caryclark@google.com
2a2cc20573 fix warnings on Mac in src/images
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/6299048

git-svn-id: http://skia.googlecode.com/svn/trunk@4179 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-06-06 12:04:36 +00:00
caryclark@google.com
1445a0d53b fix warnings on Mac in src/pdf
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/6299047

git-svn-id: http://skia.googlecode.com/svn/trunk@4178 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-06-06 12:04:24 +00:00
caryclark@google.com
920901da53 fix warnings on Mac in src/pipe
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/6302045

git-svn-id: http://skia.googlecode.com/svn/trunk@4177 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-06-06 12:04:11 +00:00
caryclark@google.com
679ab317cd fix warnings on Mac in src/views
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/6300045

git-svn-id: http://skia.googlecode.com/svn/trunk@4176 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-06-06 12:04:00 +00:00
bsalomon@google.com
411dad0630 Move stencil param adjustment to GrClipMaskManager, attempt to make GrGpuGL::flushStencil readable
Review URL: http://codereview.appspot.com/6295046/



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



git-svn-id: http://skia.googlecode.com/svn/trunk@4165 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-06-05 17:15:30 +00:00
robertphillips@google.com
25c199343d Reverting r4162
git-svn-id: http://skia.googlecode.com/svn/trunk@4164 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-06-05 16:24:32 +00:00
robertphillips@google.com
3227ab5f64 Added instance counting system for SkRefCnt-derived objects
http://codereview.appspot.com/6242070/



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



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

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

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



git-svn-id: http://skia.googlecode.com/svn/trunk@4154 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-06-05 12:55:05 +00:00
bsalomon@google.com
3a5dab4e5e Always filter gradient textures
[GMs could possibly need rebaselining]


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



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



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



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



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



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



git-svn-id: http://skia.googlecode.com/svn/trunk@4146 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-06-04 19:58:30 +00:00
bsalomon@google.com
c96cb3a929 Break up GrGpuGL::flushGLCommonState
Review URL: http://codereview.appspot.com/6270049/



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

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

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



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

git-svn-id: http://skia.googlecode.com/svn/trunk@4141 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-06-04 18:10:33 +00:00
scroggo@google.com
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
bsalomon@google.com
0ae2ca2830 Revert r4134 due to bot failures
git-svn-id: http://skia.googlecode.com/svn/trunk@4136 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-06-04 13:31:48 +00:00
robertphillips@google.com
07ef911f18 Fixed Linux compiler complaints
http://codereview.appspot.com/6269045/



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




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



git-svn-id: http://skia.googlecode.com/svn/trunk@4133 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-06-04 12:48:45 +00:00
junov@chromium.org
4866cc0afb Adding option to serialize mutable bitmaps in SkPicture
BUG=http://code.google.com/p/chromium/issues/detail?id=115654
REVIEW=http://codereview.appspot.com/6221066/



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

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



git-svn-id: http://skia.googlecode.com/svn/trunk@4129 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-06-01 20:42:15 +00:00
bungeman@google.com
e70f798ebc Serialize support for GDI.
http://codereview.appspot.com/6263046/



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

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



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




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



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



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

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



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


git-svn-id: http://skia.googlecode.com/svn/trunk@4115 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-06-01 15:53:06 +00:00
djsollen@google.com
b0d416c280 Store font family when serializing android fonts.
Review URL: https://codereview.appspot.com/6259063

git-svn-id: http://skia.googlecode.com/svn/trunk@4114 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-06-01 15:36:39 +00:00
bsalomon@google.com
c1d2a58ec8 Move GrGpuGL::ProgramCache declaration to header
Review URL: http://codereview.appspot.com/6245083/



git-svn-id: http://skia.googlecode.com/svn/trunk@4113 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-06-01 15:08:19 +00:00
tomhudson@google.com
1f90287df3 Punctuation cleanup to satisfy idiosyncracies of OpenBSD gcc 4.2.1.
Original patch by landry.breuil.

http://code.google.com/p/skia/issues/detail?id=626



git-svn-id: http://skia.googlecode.com/svn/trunk@4112 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-06-01 13:15:47 +00:00
djsollen@google.com
15eeca0068 Update the implementation of SkTypeface_android.h functions.
This CL removes the hardcoded mappings of FallbackScripts to
a particular font file and replaces it with a dynamic mechanism
that takes a style and representative character code for a given
FallbackScript class and returns the most appropriate SkTypeface
that contains that character code.
Review URL: https://codereview.appspot.com/6197074

git-svn-id: http://skia.googlecode.com/svn/trunk@4111 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-06-01 12:52:26 +00:00
reed@google.com
3b700f6929 add more names to fontdescriptor
Review URL: https://codereview.appspot.com/6249074

git-svn-id: http://skia.googlecode.com/svn/trunk@4110 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-05-31 21:16:48 +00:00
bsalomon@google.com
14882947f3 Stop using deprecated functions in Mac GrGLInterface setup
git-svn-id: http://skia.googlecode.com/svn/trunk@4109 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-05-31 20:39:48 +00:00
djsollen@google.com
9714516a0d Add SkFontDescriptor for serializing fonts.
Review URL: https://codereview.appspot.com/6250080

git-svn-id: http://skia.googlecode.com/svn/trunk@4106 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-05-31 19:55:08 +00:00
tomhudson@google.com
dcdc1fccc5 Fix SK_OVERRIDE error caught by Clang in r4105; wrong params for setData().
git-svn-id: http://skia.googlecode.com/svn/trunk@4105 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-05-31 19:53:37 +00:00
tomhudson@google.com
7fab52d4c7 Add GrGradientEffects files. These implementations will be invoked from
GrGLPrograms in a further change, replacing the current CoordMapping
enums.

http://codereview.appspot.com/6250081/



git-svn-id: http://skia.googlecode.com/svn/trunk@4104 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-05-31 19:40:13 +00:00
bsalomon@google.com
b505a128ef Implement morphology as a custom effect
Review URL: http://codereview.appspot.com/6250073/



git-svn-id: http://skia.googlecode.com/svn/trunk@4102 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-05-31 18:40:36 +00:00