Commit Graph

4151 Commits

Author SHA1 Message Date
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
schenney@chromium.org
fedd09ba7e Really fix the build.
git-svn-id: http://skia.googlecode.com/svn/trunk@4253 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-06-13 18:29:20 +00:00
djsollen@google.com
b2c16472f6 Add BSON implementation to third_party
Review URL: https://codereview.appspot.com/6267044

git-svn-id: http://skia.googlecode.com/svn/trunk@4252 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-06-13 18:22:09 +00:00
djsollen@google.com
aba0e3b6bc Add JSON dependency to build.
This dependency is a mirror of the one that Chrome
uses to import jsoncpp.
Review URL: https://codereview.appspot.com/6269043

git-svn-id: http://skia.googlecode.com/svn/trunk@4251 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-06-13 18:21:47 +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
aaf1688959 Speculative build fix. Tests do not fail locally.
git-svn-id: http://skia.googlecode.com/svn/trunk@4248 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-06-13 17:41:00 +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
bsalomon@google.com
f22f77faeb NV PR spec update to function param, use GrGL typedefs rather than fundamental types
Review URL: http://codereview.appspot.com/6307077/



git-svn-id: http://skia.googlecode.com/svn/trunk@4245 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-06-13 14:16:03 +00:00
reed@google.com
9a323c98f6 faster SkScalarIsFinite()
git-svn-id: http://skia.googlecode.com/svn/trunk@4244 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-06-13 13:03:08 +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
reed@google.com
357818cb76 fix bogus assert
git-svn-id: http://skia.googlecode.com/svn/trunk@4242 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-06-13 12:30:35 +00:00
robertphillips@google.com
bb0b67f659 Reverting r4239 & r4240
git-svn-id: http://skia.googlecode.com/svn/trunk@4241 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-06-12 21:58:09 +00:00
reed@google.com
d70f7307a4 pass -fArray[i] instead of fArray[i], to skip a compiler optimization where it
thought it could tread the memory as if it pointed to an int instead of a float.



git-svn-id: http://skia.googlecode.com/svn/trunk@4240 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-06-12 21:40:13 +00:00
reed@google.com
df9d6f1768 add bench for SkScalarIsFinite
git-svn-id: http://skia.googlecode.com/svn/trunk@4239 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-06-12 21:29:43 +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
reed@google.com
51c62a6cfa add readPtr and writePtr to SkReader32 and SkWriter32
add template helper SkSWriter32, which allocates initial storage buffer
Review URL: https://codereview.appspot.com/6299075

git-svn-id: http://skia.googlecode.com/svn/trunk@4237 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-06-12 20:47:53 +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
777442d52e Adding the render_pictures test tool
Submitted on behalf of keyar@chromium.org

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



git-svn-id: http://skia.googlecode.com/svn/trunk@4235 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-06-12 14:56:36 +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
tomhudson@google.com
a0116d541d Disable morphology benchmarks on fixed point builds.
http://codereview.appspot.com/6300082/



git-svn-id: http://skia.googlecode.com/svn/trunk@4231 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-06-11 20:48:18 +00:00
tomhudson@google.com
f2e91a3907 Dilate & Erode benchmarks. Unlike the blur benchmarks (which test
Convolution), they show no improvement from unrolling the GLSL loops
in src/gpu/effects/GrMorphologyEffect.cpp

http://codereview.appspot.com/6299067/



git-svn-id: http://skia.googlecode.com/svn/trunk@4230 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-06-11 19:22:01 +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
300a4426b2 new baselines for new test (pathinvfill). PDF and GPU fail, so no baselines for them
git-svn-id: http://skia.googlecode.com/svn/trunk@4228 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-06-11 17:41:14 +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
4151341273 Add SK_API to null canvas create method
git-svn-id: http://skia.googlecode.com/svn/trunk@4221 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-06-11 15:41:25 +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
caryclark@google.com
88f7d0cb09 shape ops work in progress
git-svn-id: http://skia.googlecode.com/svn/trunk@4208 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-06-07 21:09:20 +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