Commit Graph

378 Commits

Author SHA1 Message Date
caryclark@google.com
02939ce4bd fix warnings on Mac in ssamplecode
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/6301044

git-svn-id: http://skia.googlecode.com/svn/trunk@4183 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-06-06 12:09:51 +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
reed@google.com
1830c7aa3c --pictureDir foo will load serialized pictures <>.skp from the foo directory
git-svn-id: http://skia.googlecode.com/svn/trunk@4132 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-06-04 12:05:43 +00:00
reed@google.com
fd4be26c42 Change patheffect to take a (new) StrokeRec object, which encapsulates the fill
or stroke parameters for a path.

Today, the patheffect only sees if the caller was going to stroke or fill, and
if stroke, it just sees the width. With this change, the effect can see all of the
related parameters (e.g. cap/join/miter). No other change is intended at this
time.

After this change, I hope to use this additional data to allow SkDashPathEffect
to, at times, apply the stroke as part of its effect, which may be much more
efficient than first dashing, and then reading that and stroking it.

Most of these files changed just because of the new parameter to filterPath. The
key changes are in SkPathEffect.[h,cpp], SkPaint.cpp and SkScalerContext.cpp
Review URL: https://codereview.appspot.com/6250051

git-svn-id: http://skia.googlecode.com/svn/trunk@4048 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-05-25 01:04:12 +00:00
reed@google.com
d3521f1a8d revert 4046 -- GM:pathfill failed on one bot, maybe uninitialized memory somewhere?
git-svn-id: http://skia.googlecode.com/svn/trunk@4047 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-05-24 20:32:22 +00:00
reed@google.com
9797272edf Change patheffect to take a (new) StrokeRec object, which encapsulates the fill
or stroke parameters for a path.

Today, the patheffect only sees if the caller was going to stroke or fill, and if
stroke, it just sees the width. With this change, the effect can see all of the
related parameters (e.g. cap/join/miter). No other change is intended at this
time.

After this change, I hope to use this additional data to allow SkDashPathEffect
to, at times, apply the stroke as part of its effect, which may be much more
efficient than first dashing, and then reading that and stroking it.

Most of these files changed just because of the new parameter to filterPath. The
key changes are in SkPathEffect.[h,cpp], SkPaint.cpp and SkScalerContext.cpp
Review URL: https://codereview.appspot.com/6249050

git-svn-id: http://skia.googlecode.com/svn/trunk@4046 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-05-24 20:13:57 +00:00
robertphillips@google.com
67febd9506 Converted AAClips SampleApp slide to GM:simpleaaclip
http://codereview.appspot.com/6220043/



git-svn-id: http://skia.googlecode.com/svn/trunk@4025 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-05-22 12:14:50 +00:00
tomhudson@google.com
ffe39bd3b6 Fix type errors and a few warnings for Visual Studio 2010 64-bit build.
We're still far from 64b statically safe, mostly around SkReader32.h
and the address-alignment code in GrTypes.h.
Original code provided by jianliang79.

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



git-svn-id: http://skia.googlecode.com/svn/trunk@3994 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-05-17 15:38:00 +00:00
robertphillips@google.com
2470b25ac8 Updated AAClips Sample slide and complexclip2 GM to exercise AA clipping
http://codereview.appspot.com/6212047/

will require image rebaselining



git-svn-id: http://skia.googlecode.com/svn/trunk@3943 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-05-15 17:03:16 +00:00
robertphillips@google.com
706f6212c6 Fixes for Windows Release compiler complaints (overflow in const arith)
http://codereview.appspot.com/6210056/



git-svn-id: http://skia.googlecode.com/svn/trunk@3926 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-05-14 17:51:23 +00:00
robertphillips@google.com
4debcac8c3 Debug Windows compiler complaint fixes
http://codereview.appspot.com/6208055/



git-svn-id: http://skia.googlecode.com/svn/trunk@3924 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-05-14 16:33:36 +00:00
reed@google.com
963a8fa542 remove (unused) reference to SkStrokePathEffect
git-svn-id: http://skia.googlecode.com/svn/trunk@3891 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-05-10 13:04:59 +00:00
robertphillips@google.com
c6ce750c73 Fixed some fixed point build Windows compiler complaints
http://codereview.appspot.com/6197063/



git-svn-id: http://skia.googlecode.com/svn/trunk@3867 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-05-08 13:15:37 +00:00
bsalomon@google.com
9c1f1ac5d3 Move function decls and macros out of public headers that are meant for internal use.
git-svn-id: http://skia.googlecode.com/svn/trunk@3849 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-05-07 17:09:37 +00:00
robertphillips@google.com
7265e72555 Added "--list" command line option to SampleApp
http://codereview.appspot.com/6161043/

committed on behalf of Guanqun



git-svn-id: http://skia.googlecode.com/svn/trunk@3835 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-05-03 18:22:28 +00:00
robertphillips@google.com
67a6db3611 Made "Clip" sample use AA clipping
http://codereview.appspot.com/6176046/



git-svn-id: http://skia.googlecode.com/svn/trunk@3834 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-05-03 18:05:18 +00:00
reed@google.com
4b5894c82d show contains and intersects predicates in sample
git-svn-id: http://skia.googlecode.com/svn/trunk@3824 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-05-02 18:03:32 +00:00
robertphillips@google.com
47ab504d49 Fixed usage info for SampleApp's msaa flag
http://codereview.appspot.com/6159043/

committed on behalf of Guanqun Lu



git-svn-id: http://skia.googlecode.com/svn/trunk@3817 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-05-02 14:18:20 +00:00
robertphillips@google.com
7460b378d6 Fixed minor Release & fixed point compiler warnings on Linux
http://codereview.appspot.com/6118050/



git-svn-id: http://skia.googlecode.com/svn/trunk@3766 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-04-25 16:54:51 +00:00
scroggo@google.com
7dadc748d9 In SampleWindow, pass ownership of menus to SkWindow, so it can safely
delete them in its destructor.

BUG=557
TEST=Run SampleApp on linux. Then press escape.
Review URL: https://codereview.appspot.com/6050047

git-svn-id: http://skia.googlecode.com/svn/trunk@3719 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-04-18 14:07:57 +00:00
robertphillips@google.com
6853e808a4 Addressed more Windows compiler complaint issues
http://codereview.appspot.com/6007056/



git-svn-id: http://skia.googlecode.com/svn/trunk@3689 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-04-16 15:50:18 +00:00
bsalomon@google.com
ddd40e5e96 Tear down Gr stuff before GL context in SampleApp
Review URL: http://codereview.appspot.com/6000043/



git-svn-id: http://skia.googlecode.com/svn/trunk@3639 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-04-10 15:56:29 +00:00
robertphillips@google.com
4750fa55f2 Minor bug fix in SampleApp
http://codereview.appspot.com/5992081/



git-svn-id: http://skia.googlecode.com/svn/trunk@3638 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-04-10 13:34:11 +00:00
reed@google.com
59ed2c22c0 safely handle null blur filter
git-svn-id: http://skia.googlecode.com/svn/trunk@3629 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-04-09 17:12:30 +00:00
bsalomon@google.com
1195925b05 Add MSAA option to SampleApp
Review URL: http://codereview.appspot.com/5969049


git-svn-id: http://skia.googlecode.com/svn/trunk@3627 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-04-06 20:13:38 +00:00
robertphillips@google.com
09042b80d2 Fixing Windows compiler complaints
http://codereview.appspot.com/5991056/



git-svn-id: http://skia.googlecode.com/svn/trunk@3626 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-04-06 20:01:46 +00:00
bsalomon@google.com
3c4d032aeb Revert 3857 (which was committed from wrong tree)
git-svn-id: http://skia.googlecode.com/svn/trunk@3588 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-04-03 18:04:51 +00:00
bsalomon@google.com
5f017a4ab0 Fix GL attach/detach in Mac SampleApp
Review URL: http://codereview.appspot.com/5984043/


git-svn-id: http://skia.googlecode.com/svn/trunk@3587 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-04-03 18:03:03 +00:00
robertphillips@google.com
b442a6d572 Redelivering r3555 to re-add run-time switching between ANGLE and native opengl
http://codereview.appspot.com/5969044/



git-svn-id: http://skia.googlecode.com/svn/trunk@3578 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-04-02 19:24:21 +00:00
robertphillips@google.com
bd8d7adb0a Reverting r3555
git-svn-id: http://skia.googlecode.com/svn/trunk@3556 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-03-30 15:18:14 +00:00
robertphillips@google.com
53e96a14ca Added run-time switching between OpenGL & ANGLE in SampleApp
http://codereview.appspot.com/5969044/



git-svn-id: http://skia.googlecode.com/svn/trunk@3555 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-03-30 14:47:53 +00:00
djsollen@google.com
257fc5bd13 Remove unused static functions from SampleApp and effects
Review URL: https://codereview.appspot.com/5956050

git-svn-id: http://skia.googlecode.com/svn/trunk@3543 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-03-29 17:54:05 +00:00
djsollen@google.com
54924243c1 Cleanup code related to SkFlattenable::flatten()
The following changes were made by this CL:

1. Make flatten() a protected method as callers should use
   SkFlattenableWriteBuffer to flatten an object
2. Make flatten a const method (including subclasses)
3. Mark subclass implementation of flatten with SK_OVERRIDE
4. Ensure overridden flatten impls call their parent
5. Remove no-op implementations of flatten from subclasses

Additionally, if necessary the unflattening constructor was
also moved to the protected section of the subclasses
header if it was not already there.

git-svn-id: http://skia.googlecode.com/svn/trunk@3540 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-03-29 15:18:04 +00:00
robertphillips@google.com
d3b9fbbc48 Code changes for ANGLE GL interface. .gyp file changes will be delivered later.
http://codereview.appspot.com/5940046/



git-svn-id: http://skia.googlecode.com/svn/trunk@3519 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-03-28 16:19:11 +00:00
bsalomon@google.com
8500322537 disable GPU blur on small paths
Change originally by Guanqun.Lu@gmail.com with minor edits and sample added by me

COULD POSSIBLY CHANGE GPU RESULTS OF GM SLIDES WITH BLUR, WILL REBASILINE IF SO.

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



git-svn-id: http://skia.googlecode.com/svn/trunk@3514 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-03-28 14:44:37 +00:00
djsollen@google.com
ba28d03e94 Create macro for registering classes for deserialization
Review URL: https://codereview.appspot.com/5909063

git-svn-id: http://skia.googlecode.com/svn/trunk@3494 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-03-26 17:57:35 +00:00
robertphillips@google.com
76d4021ee1 Fix for SampleApp command line parsing issue.
http://codereview.appspot.com/5785054/



git-svn-id: http://skia.googlecode.com/svn/trunk@3462 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-03-22 14:12:15 +00:00
robertphillips@google.com
8570b5c869 Adding CMYK jpeg changes w/o .gyp alterations
http://codereview.appspot.com/5785054/



git-svn-id: http://skia.googlecode.com/svn/trunk@3442 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-03-20 17:40:58 +00:00
robertphillips@google.com
0a89c90d18 reverting to 3437
git-svn-id: http://skia.googlecode.com/svn/trunk@3439 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-03-20 15:13:04 +00:00
robertphillips@google.com
d5c9e996df Fix for CMYK jpeg decoding issue (69 - unable to read some jpeg files on android)
http://codereview.appspot.com/5785054/



git-svn-id: http://skia.googlecode.com/svn/trunk@3438 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-03-20 14:51:47 +00:00
djsollen@google.com
166e653f67 Fix scaling issue when drawing text on a path.
If the paint is stroked and the font size is small
we were incorrectly rendering the sample text.
Review URL: https://codereview.appspot.com/5844060

git-svn-id: http://skia.googlecode.com/svn/trunk@3437 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-03-20 14:24:38 +00:00
djsollen@google.com
ae8ae3d1a2 Cleanup sample slide for drawTextOnPath
Review URL: https://codereview.appspot.com/5834048

git-svn-id: http://skia.googlecode.com/svn/trunk@3402 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-03-15 15:01:34 +00:00
reed@google.com
c9fa63c869 don't draw in constructor (makes debugging harder)
git-svn-id: http://skia.googlecode.com/svn/trunk@3369 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-03-12 21:14:09 +00:00
reed@google.com
7b1859034f add init() method, so we don't draw in our constructor (makes debugging harder)
git-svn-id: http://skia.googlecode.com/svn/trunk@3368 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-03-12 21:13:48 +00:00
bsalomon@google.com
ab9e2c6fc8 Annotate overridden functions with SK_OVERRIDE in OverView class.
R=bsalomon@google.com

Signed-off-by: Thiago Farina <tfarina@chromium.org>


Committed on behalf of tfarina@chromium.org
Review URL: https://codereview.appspot.com/5752057/



git-svn-id: http://skia.googlecode.com/svn/trunk@3341 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-03-08 16:20:16 +00:00
reed@google.com
84ef10f8f9 cast to double
http://codereview.appspot.com/5645064/



git-svn-id: http://skia.googlecode.com/svn/trunk@3206 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-02-16 13:18:48 +00:00
tomhudson@google.com
6bf38b59c9 Move GL-specific include files to their own subdirectory, to better
coexist alongside D3D backend.
Requires gyp change.

http://codereview.appspot.com/5665045/



git-svn-id: http://skia.googlecode.com/svn/trunk@3185 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-02-14 15:11:59 +00:00
twiz@google.com
05e70247c3 Expose functionality to purge the GPU texture cache while running SampleApp.
Press 'p' to purge the cache.  A summary of the number of bytes of video memory
released is output to the command prompt.
Review URL: https://codereview.appspot.com/5587045

git-svn-id: http://skia.googlecode.com/svn/trunk@3097 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-01-27 19:12:00 +00:00
epoger@google.com
2c1eb6f08d Landing change from http://codereview.appspot.com/5540063/
git-svn-id: http://skia.googlecode.com/svn/trunk@3060 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-01-18 17:02:15 +00:00
mike@reedtribe.org
dd52caaa09 return -1 if we failed to find by title
git-svn-id: http://skia.googlecode.com/svn/trunk@2931 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-12-28 20:02:10 +00:00