Commit Graph

83 Commits

Author SHA1 Message Date
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
yangsu@google.com
501775e5ac Added helper methods for changing samples, getting sample titles, and extracting pdf Data
http://codereview.appspot.com/4626073/


git-svn-id: http://skia.googlecode.com/svn/trunk@1704 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-06-24 16:04:50 +00:00
Scroggo
d3aed39ab1 Unify handleTouch and handleClick in SampleApp.
Allow each sample to handle clicks in Android SampleApp.

Remove SampleWindow::handleTouch.

Allow an SkWindow to have multiple clicks.

Add an owner pointer to SkView::Click.

Reviewed at http://codereview.appspot.com/4643052/


git-svn-id: http://skia.googlecode.com/svn/trunk@1673 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-06-22 13:26:56 +00:00
Scroggo
62b65b0913 SampleApp fixes.
On Android, delete gWindow before calling application_term, avoiding a crash
each time the app closes.  Also make sure the screen is redrawn when resuming.

On Linux, delete gWindow to avoid memory leak.

In general, allow moving from sample 0 to the last sample.

Reviewed at http://codereview.appspot.com/4639060


git-svn-id: http://skia.googlecode.com/svn/trunk@1661 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-06-21 16:01:26 +00:00
Scroggo
8ac0d542b0 Add a way to save to PDF in SampleApp on Android and elsewhere.
In Android, add the PDF file to downloads, so it can be opened.

Reviewed at http://codereview.appspot.com/4638052/


git-svn-id: http://skia.googlecode.com/svn/trunk@1659 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-06-21 14:44:57 +00:00
Scroggo
b4490c7435 Minor fixes for SampleApp.
- Add a comment for invalidating in onSizeChange.
- Call base constructor for SkOSWindow_Unix.
- Call onSizeChange in SampleWindow constructor so fZoomCenter gets set.


git-svn-id: http://skia.googlecode.com/svn/trunk@1627 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-06-17 13:53:05 +00:00
Scroggo
a54e2f61f8 Use SkTouchGesture to handle pinch events in Android SampleApp.
http://codereview.appspot.com/4631043/


git-svn-id: http://skia.googlecode.com/svn/trunk@1624 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-06-17 12:46:17 +00:00
reed@google.com
af951c9bc4 make SkDevice constructors explicit between offscreen and on/direct
http://codereview.appspot.com/4632044/



git-svn-id: http://skia.googlecode.com/svn/trunk@1620 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-06-16 19:10:39 +00:00
Scroggo
3e7ff9f31d Better fix for changing the viewport in sample app.
Create a platform description and base the size on the SkWindow
in order to create a RenderTarget, which results in changing the
viewport.  This allows us to use only GR calls.

In the Android sample app, fix the problem where nothing is drawn
in the first frame, and default to drawing in GL.

Reviewed at http://codereview.appspot.com/4642043/


git-svn-id: http://skia.googlecode.com/svn/trunk@1615 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-06-16 15:31:26 +00:00
Scroggo
716a0387ca Fix the mac build of the SampleApp.
My call to glViewport breaks the mac build, but benefits the Android
and linux builds.  Fix the mac build until I come up with a better
solution.

Reviewed at http://codereview.appspot.com/4628042/


git-svn-id: http://skia.googlecode.com/svn/trunk@1612 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-06-16 14:00:15 +00:00
Scroggo
2c8208f3a4 Improvements to the SampleApp (primarily Android).
Reviewed at http://codereview.appspot.com/4587042/

Android
- Added buttons for interaction without a keyboard.
- Added the ability to zoom in to a specific point (roughly).
- Added event handling (for showing a slideshow, for example).
- Allow changing screen orientation
- Updated README file, explaining how to build

Multiplatform changes
- Added SampleApp header file
- Remove FPS when turning off measure FPS mode


git-svn-id: http://skia.googlecode.com/svn/trunk@1596 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-06-15 16:49:08 +00:00
djsollen@google.com
e32b5837c3 Updates to the Android SampleApp
http://codereview.appspot.com/4602049/


git-svn-id: http://skia.googlecode.com/svn/trunk@1567 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-06-13 16:58:40 +00:00
Scroggo
aed68d999b Make linux sample app work on my laptop. Reviewed at http://codereview.appspot.com/4568050/
git-svn-id: http://skia.googlecode.com/svn/trunk@1539 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-06-08 14:26:00 +00:00
yangsu@google.com
1f3942110a Added code to enable the pipe module to record to a file
http://codereview.appspot.com/4564052/


git-svn-id: http://skia.googlecode.com/svn/trunk@1469 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-06-01 18:03:34 +00:00
reed@google.com
81e3d7f794 update to SampleView
git-svn-id: http://skia.googlecode.com/svn/trunk@1460 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-06-01 12:42:36 +00:00
Scroggo
bbb203c075 Remove unnecessary call to unlock.
git-svn-id: http://skia.googlecode.com/svn/trunk@1451 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-05-31 17:04:56 +00:00
Scroggo
3272ba8abc Show fatbits mode in openGL. http://codereview.appspot.com/4515141/
git-svn-id: http://skia.googlecode.com/svn/trunk@1426 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-05-25 20:50:42 +00:00
reed@google.com
dde0956375 add cross-process option to gpipe
add unittests for reader32 and writer32



git-svn-id: http://skia.googlecode.com/svn/trunk@1397 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-05-23 12:21:05 +00:00
reed@google.com
bad8c87812 show consistent timings between debug and release
git-svn-id: http://skia.googlecode.com/svn/trunk@1370 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-05-18 20:10:31 +00:00
reed@google.com
b36334d46a lockPixels before looking at them in Zoomer
git-svn-id: http://skia.googlecode.com/svn/trunk@1363 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-05-18 15:07:20 +00:00
reed@google.com
09e3baaaf5 add 'h' to tri-toggle font hinting
git-svn-id: http://skia.googlecode.com/svn/trunk@1360 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-05-18 12:04:31 +00:00
reed@google.com
66f22fd07a fix uninitialized var
git-svn-id: http://skia.googlecode.com/svn/trunk@1345 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-05-17 15:33:45 +00:00
reed@google.com
176753aa6d add 'n' to tri-toggle bitmap-filter (LERP) on/off/neutral
git-svn-id: http://skia.googlecode.com/svn/trunk@1344 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-05-17 15:32:04 +00:00
reed@google.com
a6ff4dc22d add 'p' to toggle on/off testing the pipe
git-svn-id: http://skia.googlecode.com/svn/trunk@1317 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-05-12 22:08:24 +00:00
reed@google.com
0faac1e857 remove some dead code in pipes
inherit from SampleView for more samples
add L key to toggle using SkGPipe



git-svn-id: http://skia.googlecode.com/svn/trunk@1296 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-05-11 05:58:58 +00:00
reed@google.com
4aebe4fb10 disable experimental TEST_GPIPE
git-svn-id: http://skia.googlecode.com/svn/trunk@1253 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-05-05 14:07:35 +00:00
reed@google.com
961ddb04a0 update to SampleView
git-svn-id: http://skia.googlecode.com/svn/trunk@1252 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-05-05 14:03:48 +00:00
reed@google.com
64e3eb24e5 update pipe test
git-svn-id: http://skia.googlecode.com/svn/trunk@1238 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-05-04 14:32:04 +00:00
bsalomon@google.com
05ef510389 Remove GrContext.h dependence on GrGpu.h
Review URL:  http://codereview.appspot.com/4433096/



git-svn-id: http://skia.googlecode.com/svn/trunk@1227 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-05-02 21:14:59 +00:00
reed@google.com
68f456d568 fix compile
git-svn-id: http://skia.googlecode.com/svn/trunk@1222 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-05-02 18:55:39 +00:00
reed@google.com
2f3dc9dc4c add typefacecache
speedup lcd blits
clean up some samples



git-svn-id: http://skia.googlecode.com/svn/trunk@1220 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-05-02 17:33:45 +00:00
reed@google.com
17d7aec896 move end-timer for FPS to afterChildren, so we will have flushed opengl
git-svn-id: http://skia.googlecode.com/svn/trunk@1170 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-04-25 14:31:44 +00:00
reed@google.com
f21833999d migrate some samples over to SampleView, for FPS measurements
git-svn-id: http://skia.googlecode.com/svn/trunk@1166 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-04-22 14:10:48 +00:00
mike@reedtribe.org
2eb595292b add 'f' toggle to trigger timer for sample. Must subclass SampleView instead
of SkView to opt-in. Then override onDrawContent() and optionally onDrawBackground.



git-svn-id: http://skia.googlecode.com/svn/trunk@1165 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-04-22 01:59:09 +00:00
reed@google.com
261b8e2ca1 fix warnings
git-svn-id: http://skia.googlecode.com/svn/trunk@1129 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-04-14 17:53:24 +00:00
mike@reedtribe.org
3ce59dc499 fix drawfilter to match new api
enlarge default 'z' fatbits view



git-svn-id: http://skia.googlecode.com/svn/trunk@1080 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-04-08 00:38:05 +00:00
bsalomon@google.com
6dcf499d35 Fix dangling ptr when GrRenderTarget outlives its GrTexture representation
Move management of fRenderTarget ptr from GL texture class to base class

Minor:
Remove redundant GrContext-per-frame debug code in SampleApp.cpp
Add GrTexture.cpp to legacy VS2010 vcxproj

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



git-svn-id: http://skia.googlecode.com/svn/trunk@1061 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-04-05 21:16:14 +00:00