Commit Graph

359 Commits

Author SHA1 Message Date
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
epoger@google.com
6fc7cc23a9 Fix Windows build breakage in http://code.google.com/p/skia/source/detail?r=2925
TBR=reed
Review URL: http://codereview.appspot.com/5500087

git-svn-id: http://skia.googlecode.com/svn/trunk@2927 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-12-28 15:13:41 +00:00
mike@reedtribe.org
6f6e8c39a7 RETURN key now records default slide for startup
git-svn-id: http://skia.googlecode.com/svn/trunk@2925 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-12-27 22:33:50 +00:00
bsalomon@google.com
4d4f281b28 Fix int->float conversion warning in VS2010
git-svn-id: http://skia.googlecode.com/svn/trunk@2853 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-12-12 18:34:01 +00:00
bsalomon@google.com
e9f091d7cd Use : as separator between "GM" and slide name in SampleApp. This makes it easier to jump to a GM slide using command line args on windows.
git-svn-id: http://skia.googlecode.com/svn/trunk@2846 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-12-09 19:50:48 +00:00
reed@google.com
e23f194bf9 install drawfilter for the picture playback as well
git-svn-id: http://skia.googlecode.com/svn/trunk@2839 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-12-08 19:36:00 +00:00
bsalomon@google.com
6f3795105b Make all pixel ops go thru ctx so we can correctly flush. Unify two texture upload code paths.
Review URL: http://codereview.appspot.com/5373108/



git-svn-id: http://skia.googlecode.com/svn/trunk@2701 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-11-16 20:36:03 +00:00
reed@google.com
f03bb566e2 land http://codereview.appspot.com/5244058/ - add matrix to SkView
git-svn-id: http://skia.googlecode.com/svn/trunk@2670 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-11-11 21:42:12 +00:00
tomhudson@google.com
f74ad8c91a Removes warnings generated by gcc and clang.
git-svn-id: http://skia.googlecode.com/svn/trunk@2651 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-11-09 22:15:08 +00:00
reed@google.com
073c90769e use new PurgeFontCache() api
git-svn-id: http://skia.googlecode.com/svn/trunk@2633 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-11-08 20:03:48 +00:00
djsollen@google.com
56c69773ae Update files to use SK_BUILD_FOR_ANDROID.
This CL also removes any unecessary references to
the ANDROID definition.
Review URL: http://codereview.appspot.com/5354049

git-svn-id: http://skia.googlecode.com/svn/trunk@2629 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-11-08 19:00:26 +00:00
reed@google.com
2072db8901 post event to ourself to update the title after our constructor
(so we can see the title of the first slide)



git-svn-id: http://skia.googlecode.com/svn/trunk@2625 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-11-08 15:18:10 +00:00
reed@google.com
ac7aa1bc3f prefix GM names with "GM " so I know that's what they are.
git-svn-id: http://skia.googlecode.com/svn/trunk@2624 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-11-08 15:06:34 +00:00
bsalomon@google.com
c436499622 [GPU] Add explicit byte order and PM vs. UPM 8888 configs
Review URL: http://codereview.appspot.com/5347042/



git-svn-id: http://skia.googlecode.com/svn/trunk@2618 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-11-07 15:54:49 +00:00
djsollen@google.com
6ff82553df Add support for building Android SampleApp.
Review URL: http://codereview.appspot.com/5342051

git-svn-id: http://skia.googlecode.com/svn/trunk@2617 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-11-07 15:43:57 +00:00
bsalomon@google.com
e269f210bd Recommit r2611 with fix for gm
git-svn-id: http://skia.googlecode.com/svn/trunk@2614 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-11-07 13:29:52 +00:00
bsalomon@google.com
b87d2b5c2a Revert r2611 until windows gm can be debugged
git-svn-id: http://skia.googlecode.com/svn/trunk@2612 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-11-07 01:58:39 +00:00
bsalomon@google.com
6d9adaec78 Add replacement APIs for createPlatformSurface: createPlatformTexture and createPlatformRenderTarget
git-svn-id: http://skia.googlecode.com/svn/trunk@2611 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-11-07 01:37:22 +00:00
djsollen@google.com
fad4510d43 Move the Android sample app into the android repo.
Review URL: http://codereview.appspot.com/5332054

git-svn-id: http://skia.googlecode.com/svn/trunk@2602 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-11-04 13:00:18 +00:00
djsollen@google.com
58629291bc Adding support to trunk for building Skia using the Android NDK.
This CL depends on a subsequent CL to add the appropriate NDK
toolchain and system sources to the skia repo.

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

git-svn-id: http://skia.googlecode.com/svn/trunk@2592 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-11-03 13:08:29 +00:00