Commit Graph

119 Commits

Author SHA1 Message Date
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
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
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
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
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
bsalomon@google.com
8301de132e Remove SK_OVERRIDE from func defn
git-svn-id: http://skia.googlecode.com/svn/trunk@2570 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-10-31 16:47:13 +00:00
bsalomon@google.com
48dd1a26ec Import all GMs as Samples.
Review URL: http://codereview.appspot.com/5332043/



git-svn-id: http://skia.googlecode.com/svn/trunk@2564 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-10-31 14:18:20 +00:00
bsalomon@google.com
74913722bf Add NULL GL context implementation. Use in bench (-nullgl) and SampleApp (backspace key)
Review URL: http://codereview.appspot.com/5303080/


git-svn-id: http://skia.googlecode.com/svn/trunk@2545 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-10-27 20:44:19 +00:00
bsalomon@google.com
820e80ad63 Fix some warnings on VS2010
Review URL: http://codereview.appspot.com/5312051/



git-svn-id: http://skia.googlecode.com/svn/trunk@2520 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-10-24 21:09:40 +00:00
reed@google.com
045e62d715 enable soft clipping (yikes)
git-svn-id: http://skia.googlecode.com/svn/trunk@2515 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-10-24 12:19:46 +00:00
bsalomon@google.com
6fb736fc2e Simplify specification of default interface
Review URL: http://codereview.appspot.com/5036045/



git-svn-id: http://skia.googlecode.com/svn/trunk@2276 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-09-16 18:51:57 +00:00
bsalomon@google.com
e8f0910935 Add 'K' to SampleApp to trigger animated perspective rendering
Review URL: http://codereview.appspot.com/4967061/



git-svn-id: http://skia.googlecode.com/svn/trunk@2244 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-09-08 18:48:12 +00:00
bsalomon@google.com
0b77d6892b Make GrGLInterface a per-GrContext refcounted object rather than a global
Review URL: http://codereview.appspot.com/4901046/



git-svn-id: http://skia.googlecode.com/svn/trunk@2140 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-08-19 13:28:54 +00:00
bsalomon@google.com
583a1e3850 Fixed r2125. Identical change but also moves GrTesselatedPathRenderer.h to src dir.
Verbal SGTM from Tom who reviewed the original version at: http://codereview.appspot.com/4894050/



git-svn-id: http://skia.googlecode.com/svn/trunk@2129 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-08-17 13:42:46 +00:00
vandebo@chromium.org
b4f4c02eff Revert "Make GrDrawTarget.h and GrPathRenderer.h be private headers"
This reverts commit r2125

Looks like GrPathRenderer.h is used from gpu/include/GrTesselatedPathRenderer.h

There also seems to be a dependency tracking problem, because r2125 didn't go red, but the next revision did.

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

git-svn-id: http://skia.googlecode.com/svn/trunk@2127 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-08-16 23:20:31 +00:00
bsalomon@google.com
8b4a64d318 Make GrDrawTarget.h and GrPathRenderer.h be private headers
Review URL: http://codereview.appspot.com/4894050/



git-svn-id: http://skia.googlecode.com/svn/trunk@2125 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-08-16 20:38:11 +00:00
yangsu@google.com
ef7bdfac61 Added Debugger to Sample App, off by default
Removed CocoaDebugger from experimental
Slight changes to SkOSMenu
Bug fixes for NetPipeReader and DrawingBoard


git-svn-id: http://skia.googlecode.com/svn/trunk@2102 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-08-12 14:27:47 +00:00
yangsu@google.com
f121b05254 Removed networking dependencies from SampleApp, Pipe now off by default
git-svn-id: http://skia.googlecode.com/svn/trunk@2060 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-08-08 16:02:51 +00:00
yangsu@google.com
db03eaa371 Added transitions and net pipe to SampleApp, updated gyp files
http://codereview.appspot.com/4839047/
http://codereview.appspot.com/4801080/


git-svn-id: http://skia.googlecode.com/svn/trunk@2059 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-08-08 15:37:23 +00:00
reed@google.com
87fac4abd7 retool SkEvent to own its target ID or target proc
git-svn-id: http://skia.googlecode.com/svn/trunk@2041 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-08-04 13:50:17 +00:00
yangsu@google.com
921091f29e Set up global options for SampleApp and now allows SampleApp to request menu items from the slides
http://codereview.appspot.com/4807056/


git-svn-id: http://skia.googlecode.com/svn/trunk@2024 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-08-02 13:39:12 +00:00
bsalomon@google.com
5bfc21761e cleanup GrGLTexture / GrGLRenderTarget cons. Make GrRenderTarget aware of its msaa sample count.
Review URL: http://codereview.appspot.com/4833045/



git-svn-id: http://skia.googlecode.com/svn/trunk@1996 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-07-29 20:29:05 +00:00
epoger@google.com
ec3ed6a5eb Automatic update of all copyright notices to reflect new license terms.
I have manually examined all of these diffs and restored a few files that
seem to require manual adjustment.

The following files still need to be modified manually, in a separate CL:

android_sample/SampleApp/AndroidManifest.xml
android_sample/SampleApp/res/layout/layout.xml
android_sample/SampleApp/res/menu/sample.xml
android_sample/SampleApp/res/values/strings.xml
android_sample/SampleApp/src/com/skia/sampleapp/SampleApp.java
android_sample/SampleApp/src/com/skia/sampleapp/SampleView.java
experimental/CiCarbonSampleMain.c
experimental/CocoaDebugger/main.m
experimental/FileReaderApp/main.m
experimental/SimpleCocoaApp/main.m
experimental/iOSSampleApp/Shared/SkAlertPrompt.h
experimental/iOSSampleApp/Shared/SkAlertPrompt.m
experimental/iOSSampleApp/SkiOSSampleApp-Base.xcconfig
experimental/iOSSampleApp/SkiOSSampleApp-Debug.xcconfig
experimental/iOSSampleApp/SkiOSSampleApp-Release.xcconfig
gpu/src/android/GrGLDefaultInterface_android.cpp
gyp/common.gypi
gyp_skia
include/ports/SkHarfBuzzFont.h
include/views/SkOSWindow_wxwidgets.h
make.bat
make.py
src/opts/memset.arm.S
src/opts/memset16_neon.S
src/opts/memset32_neon.S
src/opts/opts_check_arm.cpp
src/ports/SkDebug_brew.cpp
src/ports/SkMemory_brew.cpp
src/ports/SkOSFile_brew.cpp
src/ports/SkXMLParser_empty.cpp
src/utils/ios/SkImageDecoder_iOS.mm
src/utils/ios/SkOSFile_iOS.mm
src/utils/ios/SkStream_NSData.mm
tests/FillPathTest.cpp
Review URL: http://codereview.appspot.com/4816058

git-svn-id: http://skia.googlecode.com/svn/trunk@1982 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-07-28 14:26:00 +00:00
bsalomon@google.com
84223118f7 Remove some cruft from SampleApp.cpp
Review URL: http://codereview.appspot.com/4724042



git-svn-id: http://skia.googlecode.com/svn/trunk@1858 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-07-14 14:45:44 +00:00
bsalomon@google.com
098e96df6a Add DeviceManager to SampleWindow
Review URL: http://codereview.appspot.com/4715045/


git-svn-id: http://skia.googlecode.com/svn/trunk@1857 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-07-14 14:30:46 +00:00
mike@reedtribe.org
6757a1a2bb Be sure to call context->flush() before we swapbuffers, otherwise we might miss
some deferred drawing calls (esp. text). SkGpuCanvas was doing this for us, so
now we have to do it explicitly.



git-svn-id: http://skia.googlecode.com/svn/trunk@1813 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-07-07 01:10:34 +00:00
bsalomon@google.com
840e9f3776 make sure size change posts at sample app startup.
git-svn-id: http://skia.googlecode.com/svn/trunk@1811 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-07-06 21:59:09 +00:00
reed@google.com
a03c97943b fix typo:
this-make3DReady()

should be

this->make3DReady()



git-svn-id: http://skia.googlecode.com/svn/trunk@1803 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-07-06 18:01:20 +00:00
reed@google.com
29038ed2ab always use grcontext to get the bits to the screen
git-svn-id: http://skia.googlecode.com/svn/trunk@1802 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-07-06 17:56:47 +00:00
reed@google.com
57c8d833cd revert prev hack around make3DReady
git-svn-id: http://skia.googlecode.com/svn/trunk@1799 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-07-06 15:27:03 +00:00
reed@google.com
c157531aa2 force grcontext to be created at startup
git-svn-id: http://skia.googlecode.com/svn/trunk@1798 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-07-06 15:11:07 +00:00
reed@google.com
3cec4d71e6 check-point for testing drawBitmap [raster,gpu] -> [raster,gpu]
git-svn-id: http://skia.googlecode.com/svn/trunk@1796 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-07-06 13:59:47 +00:00
senorblanco@chromium.org
78b8253c0a Parse SampleApp command line for a test name. If an argument is passed to
SampleApp on the command line, interpret it as a test name.  If it's a valid
test, open that test at startup.

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



git-svn-id: http://skia.googlecode.com/svn/trunk@1742 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-06-28 19:44:03 +00:00
yangsu@google.com
ae8a2e5cba Modified the iOS pdf data code to use steam.copytoData()
git-svn-id: http://skia.googlecode.com/svn/trunk@1721 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-06-24 21:09:39 +00:00
reed@google.com
8a85d0c493 replace detach/getStream apis on dynamicwstream with SkData
http://codereview.appspot.com/4657046/



git-svn-id: http://skia.googlecode.com/svn/trunk@1714 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-06-24 19:12:12 +00:00