Commit Graph

6479 Commits

Author SHA1 Message Date
scroggo@google.com
161e1ba4c0 Created my own flag parser, based off of gflags.
Share common code between bench_ and render_ to set up the PictureRenderer.
Fix an include error in SkPictureRenderer.h.
Simplified parameter passing in render_pictures_main.
Switch to using an SkAutoTUnref for the PictureRenderer.
I also changed the input format somewhat, so the buildbots need to be updated as well: https://codereview.appspot.com/7441044/
Fixed a bug in PictureBenchmark where calling setTimeIndividualTiles(false) sets the member variable to true.
Removed setDeviceType from PictureBenchmark, since only the PictureRenderer needs to know which device type to use.

Some changes to the input format:
'--logPerIter' no longer takes a 1 or 0. Instead, '--logPerIter'
turns it on and '--nologPerIter' turns it off (with off as the
default). (Note that this is for bench_pictures; bench still uses the old format)

Change '--device' to '--config' and 'bitmap' to '8888' to be
the same as gm.

Requires '--r' before inputs (to match gm), though there can be multiple inputs following it.

Changed --enable-deferred-image-decoding (which no one uses but me yet anyway) to --deferImageDecoding, since the former is incompatible with the flag parser.

Changes to behavior:
Show a short error message on failure (rather than the explanation of all
flags).

BUG=https://code.google.com/p/skia/issues/detail?id=1094

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

git-svn-id: http://skia.googlecode.com/svn/trunk@7961 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-03-04 16:41:06 +00:00
reed@google.com
822bde74b9 implement fonthost table methods directly in fontconfig backend, _tables now relegated to
android and windows...
Review URL: https://codereview.chromium.org/12395015

git-svn-id: http://skia.googlecode.com/svn/trunk@7959 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-03-04 16:28:33 +00:00
reed@google.com
6ec97b6e4b refactor fonthost_tables into wrapper (fonthost) and impl (fontstream)
git-svn-id: http://skia.googlecode.com/svn/trunk@7958 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-03-04 15:16:06 +00:00
robertphillips@google.com
b755a2ace7 Fix Mac 10.8 64-bit Release ClipCacheTest issue
unreviewed



git-svn-id: http://skia.googlecode.com/svn/trunk@7957 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-03-04 14:59:55 +00:00
humper@google.com
0cb80e1190 fix mac build
BUG=

Review URL: https://codereview.chromium.org/12387084

git-svn-id: http://skia.googlecode.com/svn/trunk@7956 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-03-04 14:52:02 +00:00
reed@google.com
8333d2adf9 enable fontconfig backend for fonthost on linux
git-svn-id: http://skia.googlecode.com/svn/trunk@7955 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-03-04 14:45:29 +00:00
reed@google.com
4969044d0b short-circuit if the requested typeface matches what we've been given.
git-svn-id: http://skia.googlecode.com/svn/trunk@7954 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-03-04 14:39:47 +00:00
bsalomon@google.com
b12dc38964 Add commented out code to create a core profile on windows.
Review URL: https://codereview.chromium.org/12393044

git-svn-id: http://skia.googlecode.com/svn/trunk@7953 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-03-04 14:29:01 +00:00
jvanverth@google.com
c490f801b0 Change random number generator for 'tests' to SkMWCRandom. Also removes some
unused headers and fixes a couple of bugs exposed by changing the random 
number generator:

First, the function SkMatrix::getMaxStretch() had an error where it was testing
the square of a number against near-zero. This led to it occasionally taking a
cheaper but imprecise path for computing the eigenvalues of the matrix. It's 
been replaced with a check against the square of SK_ScalarNearlyZero. 

The second case was a failure in ClipStackTest, where it hit the rare case of 
a practically empty clip stack (it has a single Union) and we set a tight 
bounds. The bounds rect doesn't get set by GrReducedClip::ReduceClipStack() in 
this case, so when it clips the reduced stack it's clipping against garbage, 
and the resulting regions don't match. The solution is to initialize the 
tightBounds rect.


git-svn-id: http://skia.googlecode.com/svn/trunk@7952 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-03-04 13:56:38 +00:00
mike@reedtribe.org
bb963e2585 remove obsolete mac-font-cruft
git-svn-id: http://skia.googlecode.com/svn/trunk@7949 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-03-03 13:55:40 +00:00
skia.committer@gmail.com
0c23faf222 Sanitizing source files in Skia_Periodic_House_Keeping
git-svn-id: http://skia.googlecode.com/svn/trunk@7948 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-03-03 07:16:29 +00:00
mike@reedtribe.org
b103ed4e39 eliminate atsuii/coretext distinction, and rename to just _mac
git-svn-id: http://skia.googlecode.com/svn/trunk@7947 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-03-03 03:50:09 +00:00
mike@reedtribe.org
fd21c6b29f try ~0U instead of ~0 to fix signed warning passing to size_t
git-svn-id: http://skia.googlecode.com/svn/trunk@7946 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-03-03 03:22:43 +00:00
mike@reedtribe.org
b753ef2ca9 pass ~0 for length when we want to know the length of a table (with dst==null)
git-svn-id: http://skia.googlecode.com/svn/trunk@7945 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-03-03 01:57:21 +00:00
mike@reedtribe.org
dc09f07671 move some of the impl in fonthost into typeface virtuals
git-svn-id: http://skia.googlecode.com/svn/trunk@7944 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-03-03 01:15:48 +00:00
epoger@google.com
b9ba1eadc8 gm self-test: make all test cases exercise transparency
BUG=https://code.google.com/p/skia/issues/detail?id=1142
Review URL: https://codereview.chromium.org/12379047

git-svn-id: http://skia.googlecode.com/svn/trunk@7943 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-03-02 19:56:18 +00:00
robertphillips@google.com
7ae918eec7 Move initialization to PictureRenderer ctor
https://codereview.appspot.com/7435052/



git-svn-id: http://skia.googlecode.com/svn/trunk@7942 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-03-02 17:45:27 +00:00
robertphillips@google.com
13f181f28f Relanding 7914
git-svn-id: http://skia.googlecode.com/svn/trunk@7940 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-03-02 12:02:08 +00:00
skia.committer@gmail.com
f140f18878 Sanitizing source files in Skia_Periodic_House_Keeping
git-svn-id: http://skia.googlecode.com/svn/trunk@7939 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-03-02 07:01:56 +00:00
robertphillips@google.com
2c00ba3d72 Revert 7932
git-svn-id: http://skia.googlecode.com/svn/trunk@7938 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-03-01 21:34:26 +00:00
jvanverth@google.com
3b0d631cdf Remove constructors from GrVertexAttrib.
It fits our style better to use initializer lists, so the constructors have 
been removed and replaced with said lists.

Review URL: https://codereview.chromium.org/12379052


git-svn-id: http://skia.googlecode.com/svn/trunk@7936 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-03-01 20:30:01 +00:00
borenet@google.com
cef21e415b Add freetype to skia_base_libs when building for NaCl
External users need access to libfreetype.a when they use skia_base_libs.
Review URL: https://codereview.chromium.org/12383022

git-svn-id: http://skia.googlecode.com/svn/trunk@7934 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-03-01 20:28:57 +00:00
robertphillips@google.com
f9ce42302b Initialize grid info in TiledPictureRenderer::init
https://codereview.appspot.com/7444053/



git-svn-id: http://skia.googlecode.com/svn/trunk@7932 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-03-01 20:15:18 +00:00
robertphillips@google.com
e37ad358b7 Reland r7918 & r7916
git-svn-id: http://skia.googlecode.com/svn/trunk@7931 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-03-01 19:44:30 +00:00
jvanverth@google.com
9b98c1b7d0 Make global static variable kVertexAttribs in GrAARectRenderer local to functions.
Chrome was choking on this static variable because it's global and initialized
using a constructor. Moved it inside the two functions that use it, so it's no
longer global.

In addition, made the constructors for GrVertexAttrib inline so hopefully they
will be optimized away.


git-svn-id: http://skia.googlecode.com/svn/trunk@7930 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-03-01 18:54:50 +00:00
jvanverth@google.com
9b855c7c95 Resubmit r7899 and r7901.
git-svn-id: http://skia.googlecode.com/svn/trunk@7929 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-03-01 18:21:22 +00:00
bsalomon@google.com
df8114d846 Fix mesa issues.
R=robertphillips@google.com
Review URL: https://codereview.chromium.org/12389055

git-svn-id: http://skia.googlecode.com/svn/trunk@7928 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-03-01 18:10:41 +00:00
epoger@google.com
c5d71e2a97 gm self-test: disable spuriously-failing aaclip tests
Review URL: https://codereview.chromium.org/12377049

git-svn-id: http://skia.googlecode.com/svn/trunk@7927 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-03-01 16:46:49 +00:00
epoger@google.com
44a18d5819 gm self-test: fix results that break housekeeping bot
Review URL: https://codereview.chromium.org/12393011

git-svn-id: http://skia.googlecode.com/svn/trunk@7926 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-03-01 16:18:06 +00:00
robertphillips@google.com
cf5951036e Revert r7918 & r7916 due to Linux rendering issues
git-svn-id: http://skia.googlecode.com/svn/trunk@7925 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-03-01 15:43:41 +00:00
bsalomon@google.com
ecd84842b3 Add support to GrGLInterface for vertex array objects
Committed: https://code.google.com/p/skia/source/detail?r=7919
Review URL: https://codereview.chromium.org/12379025

git-svn-id: http://skia.googlecode.com/svn/trunk@7924 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-03-01 15:36:02 +00:00
bsalomon@google.com
b82c3993c2 Revert 7919 and 7920 (committed wrong version of r7919.)
git-svn-id: http://skia.googlecode.com/svn/trunk@7923 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-03-01 15:32:49 +00:00
commit-bot@chromium.org
c61c3c3101 gm self-test: use a pathologically simple test case instead of dashing2
BUG=https://code.google.com/p/skia/issues/detail?id=677

Review URL: https://chromiumcodereview.appspot.com/12381038

git-svn-id: http://skia.googlecode.com/svn/trunk@7922 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-03-01 15:32:34 +00:00
robertphillips@google.com
1fc506adc5 Revert r7914 due to Linux rendering issues
git-svn-id: http://skia.googlecode.com/svn/trunk@7921 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-03-01 15:18:41 +00:00
bsalomon@google.com
a9621742bb Fix mesa build error from r7519.
git-svn-id: http://skia.googlecode.com/svn/trunk@7920 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-03-01 14:56:40 +00:00
bsalomon@google.com
87c6d7a99e Add support to GrGLInterface for vertex array objects
Review URL: https://codereview.chromium.org/12379025

git-svn-id: http://skia.googlecode.com/svn/trunk@7919 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-03-01 14:37:18 +00:00
robertphillips@google.com
6dd683a435 Fix for Mac compiler problem in 7916
unreviewed



git-svn-id: http://skia.googlecode.com/svn/trunk@7918 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-03-01 14:24:33 +00:00
robertphillips@google.com
4310c66ed4 Fix for skp chunk sizes when clips are used outside of any save
https://codereview.appspot.com/7342047/



git-svn-id: http://skia.googlecode.com/svn/trunk@7917 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-03-01 14:17:58 +00:00
robertphillips@google.com
43c0ac9ca8 Collapse saveLayer/drawBitmapRect/restore trios to drawBitmapRect when possible
https://codereview.appspot.com/7387045/



git-svn-id: http://skia.googlecode.com/svn/trunk@7916 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-03-01 14:12:59 +00:00
robertphillips@google.com
348e35eff9 Replace A8 with RGBA8 when renderable A8 isn't supported
https://codereview.appspot.com/7372053/



git-svn-id: http://skia.googlecode.com/svn/trunk@7914 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-03-01 14:10:57 +00:00
skia.committer@gmail.com
631cdcb4a6 Sanitizing source files in Skia_Periodic_House_Keeping
git-svn-id: http://skia.googlecode.com/svn/trunk@7910 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-03-01 12:12:55 +00:00
robertphillips@google.com
af3a3b9fb1 Revert r7901 & r7899 to allow DEPS roll
git-svn-id: http://skia.googlecode.com/svn/trunk@7909 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-02-28 23:08:28 +00:00
bsalomon@google.com
2b1b8c083b Checkpoint towards core profile support.
1) Stop calling glDisable for removed state

2) Use new GLSL names for texture sampling functions.
Review URL: https://codereview.chromium.org/12330181

git-svn-id: http://skia.googlecode.com/svn/trunk@7908 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-02-28 22:06:02 +00:00
robertphillips@google.com
6177e6999d Split GrGLContextInfo into GrGLContext & GrGLContextInfo
https://codereview.appspot.com/7436045/



git-svn-id: http://skia.googlecode.com/svn/trunk@7905 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-02-28 20:16:25 +00:00
bsalomon@google.com
26fb61ae46 Move the default definition of GR_USE_NEW_SHADER_SOURCE_SIGNATURE to GrGLConfig.
R=senorblanco@google.com
Review URL: https://codereview.chromium.org/12390021

git-svn-id: http://skia.googlecode.com/svn/trunk@7904 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-02-28 19:26:04 +00:00
jvanverth@google.com
c7565d177f Adding missing const for r7902
git-svn-id: http://skia.googlecode.com/svn/trunk@7903 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-02-28 19:18:07 +00:00
commit-bot@chromium.org
aa537d4bdb Make SkTDArray accessors const-friendly.
This change creates const and non-const versions of SkTDArray::begin(), end(), operator[]() and getAt(). This will keep us from inadvertently changing a const SkTDArray, which the previous signatures allowed.

Review URL: https://chromiumcodereview.appspot.com/12315131

git-svn-id: http://skia.googlecode.com/svn/trunk@7902 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-02-28 19:03:13 +00:00
jvanverth@google.com
00b1c3ad30 Fix assert in bench due to r7899. Unreviewed.
git-svn-id: http://skia.googlecode.com/svn/trunk@7901 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-02-28 17:15:03 +00:00
commit-bot@chromium.org
e452a0ab43 Use updated Khronos signature for glShaderSource
(const char* const instead of char**).

This is needed for new Khronos headers.

BUG=178589

Review URL: https://chromiumcodereview.appspot.com/12310156

git-svn-id: http://skia.googlecode.com/svn/trunk@7900 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-02-28 17:11:11 +00:00
jvanverth@google.com
b8b705b1b9 Add new vertex attribute array specification.
This changes the old method of setting vertex layout to a new one where we
specify vertex attribute data separately from attribute bindings (i.e. program
functionality). Attribute data is now set up via an array of generic attribute
types and offsets, and this is mapped to the old program functionality by
setting specific attribute indices. This allows us to create more general 
inputs to shaders.


git-svn-id: http://skia.googlecode.com/svn/trunk@7899 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-02-28 16:28:34 +00:00