Commit Graph

6438 Commits

Author SHA1 Message Date
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
caryclark@google.com
4aaaaeace7 shape ops work in progress
git-svn-id: http://skia.googlecode.com/svn/trunk@7898 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-02-28 16:12:39 +00:00
scroggo@google.com
826b41525b Only print error message in debug mode.
Currently, PictureTest runs a test of recording a bad bitmap to a
picture and then replaying the picture. We assert at the record
step in debug mode, so the test only runs in release, to ensure that
we can still play back a picture, even if it has a bad bitmap. Silence
the error message in release, so our test doesn't appear to error
(since it is actually working as desired).

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

git-svn-id: http://skia.googlecode.com/svn/trunk@7897 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-02-28 15:50:13 +00:00
edisonn@google.com
5bd26d32ab revert r7892
git-svn-id: http://skia.googlecode.com/svn/trunk@7896 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-02-28 14:01:44 +00:00
borenet@google.com
27552cc3c6 Whitespace change: Reset skia-autogen
git-svn-id: http://skia.googlecode.com/svn/trunk@7895 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-02-28 12:33:47 +00:00
robertphillips@google.com
b83a193338 Reverting r7882 (Replace A8 with RGBA8 when renderable A8 isn't supported) due Android rendering issues
git-svn-id: http://skia.googlecode.com/svn/trunk@7893 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-02-27 20:27:44 +00:00
edisonn@google.com
194b7cdb50 resubmit after fixing assert issue: https://codereview.appspot.com/6744050
git-svn-id: http://skia.googlecode.com/svn/trunk@7892 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-02-27 19:45:11 +00:00
sugoi@google.com
54f0d1b711 Tests : Unused parameters cleanup
I removed unused parameters in the tests wherever it was trivial to do so. I'm trying to get the easy ones out of the way before we get into more involved discussions around this.
Review URL: https://codereview.appspot.com/7394055

git-svn-id: http://skia.googlecode.com/svn/trunk@7891 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-02-27 19:17:41 +00:00
reed@google.com
4e0d96b655 revert fontconfig gyp change for now (need to install it on housekeeper and chromeos bots)
git-svn-id: http://skia.googlecode.com/svn/trunk@7890 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-02-27 19:17:07 +00:00
bsalomon@google.com
ff436617d8 Sort GL extension strings and search to find.
Review URL: https://codereview.chromium.org/12316141

git-svn-id: http://skia.googlecode.com/svn/trunk@7889 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-02-27 19:07:32 +00:00
reed@google.com
f0e92f3814 enable fontconfig by default in ports.gyp
git-svn-id: http://skia.googlecode.com/svn/trunk@7888 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-02-27 19:06:52 +00:00
reed@google.com
f71a2335f9 use fontconfig fonthost for skia (in prep for using in chrome)
Review URL: https://codereview.chromium.org/12319150

git-svn-id: http://skia.googlecode.com/svn/trunk@7887 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-02-27 19:06:30 +00:00
bsalomon@google.com
89e6f5bacf Assign color=0 in GrDrawState.cpp to stop tools from raising false alarms about uninit reads.
We were assigning color to oldColor but it in turn would never be read because the valid flags
would be cleared.

R=jvanverth@google.com
Review URL: https://codereview.chromium.org/12313150

git-svn-id: http://skia.googlecode.com/svn/trunk@7886 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-02-27 18:43:47 +00:00
junov@chromium.org
29b19e53cf Change SkTileGride geometry calculations to match the Chromium compositor.
This patch changes the semantics of tileWidth/Height to include the border region, and
uses an offset to take into account the fact that there is no outer border for outer
tiles. This patch also fixes a previous bug where the right column and bottom row were
considered to be included in bounds that are expressed as an SkIRect.

Companion Chromium CL required for roll: https://codereview.chromium.org/12221077/

TEST=TileGrid unit test
Review URL: https://codereview.appspot.com/7350050

git-svn-id: http://skia.googlecode.com/svn/trunk@7885 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-02-27 18:35:16 +00:00
edisonn@google.com
d1c53aae59 Revert r7883
git-svn-id: http://skia.googlecode.com/svn/trunk@7884 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-02-27 17:46:09 +00:00
edisonn@google.com
676aef05ab Use SkSet to fix issue when pdf generates an exp number of resources.
The problem fixed - http://code.google.com/p/skia/issues/detail?id=940 - is that getResources will recursively obtain all child resource recursively without checking for duplicates.

If we have lots of duplicates, then we try to build a very large vector (exponential with the number of nodes usually) and sooner or later we end up using too much memory and crash.

A possible solution could have been to make sure resources do not have duplicates, but that requirement is impractical, and it this leaves the solution fragile, if there is any issue in the tree,  we crash.

When we emit the pdf, the large number of duplicates is not an issue, because SkPDFCatalog::addObject will deal with duplicates.

I have run the gm with --config pdf, and the images are 100% same bits, while the pdfs have the same size but some very small changes, the order of some objects.
Review URL: https://codereview.appspot.com/6744050

git-svn-id: http://skia.googlecode.com/svn/trunk@7883 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-02-27 16:54:44 +00:00
robertphillips@google.com
94ba6c62c7 Replace A8 with RGBA8 when renderable A8 isn't supported
https://codereview.appspot.com/7372053/



git-svn-id: http://skia.googlecode.com/svn/trunk@7882 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-02-27 16:43:49 +00:00
sugoi@google.com
0f0d9b720e GM : Unused parameters cleanup
I removed unused parameters in the gms wherever it was trivial to do so. I'm
trying to get the easy ones out of the way before we get into more involved
discussions around this.
Review URL: https://codereview.appspot.com/7398056

git-svn-id: http://skia.googlecode.com/svn/trunk@7881 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-02-27 15:41:12 +00:00
borenet@google.com
5661c5ba0d Build freetype as a standalone_static_library
Needed by external applications which don't use our libraries in-place.
Review URL: https://codereview.chromium.org/12328138

git-svn-id: http://skia.googlecode.com/svn/trunk@7879 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-02-27 14:12:55 +00:00
rmistry@google.com
221179d176 Whitespace change (SkipBuildbotRuns)
git-svn-id: http://skia.googlecode.com/svn/trunk@7878 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-02-27 13:24:35 +00:00
rmistry@google.com
485dcdf58a Whitespace change (SkipBuildbotRuns)
git-svn-id: http://skia.googlecode.com/svn/trunk@7877 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-02-27 13:24:22 +00:00
rmistry@google.com
f9680ed787 Whitespace change (SkipBuildbotRuns)
git-svn-id: http://skia.googlecode.com/svn/trunk@7876 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-02-27 13:24:12 +00:00
skia.committer@gmail.com
12eea2b10d Sanitizing source files in Skia_Periodic_House_Keeping
git-svn-id: http://skia.googlecode.com/svn/trunk@7875 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-02-27 07:10:10 +00:00
reed@google.com
ee619a059a fix getFamilyName by calling FcFreeTypeQuery
git-svn-id: http://skia.googlecode.com/svn/trunk@7874 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-02-26 22:58:09 +00:00
sugoi@google.com
8d38d516c0 Fixed sk_getMetrics_utf32_xy function
The unused parameters x and y here seems to be a mistake.
Review URL: https://codereview.appspot.com/7386055

git-svn-id: http://skia.googlecode.com/svn/trunk@7873 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-02-26 21:56:19 +00:00
bsalomon@google.com
1744f97ea7 Use glGetStringi to get extensions when available.
Review URL: https://codereview.chromium.org/12328111

git-svn-id: http://skia.googlecode.com/svn/trunk@7872 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-02-26 21:46:32 +00:00
reed@google.com
8d33a24cfe implement CreateTypefaceFromFile
git-svn-id: http://skia.googlecode.com/svn/trunk@7869 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-02-26 17:11:07 +00:00
reed@google.com
098b7ff264 git-svn-id: http://skia.googlecode.com/svn/trunk@7868 2bbb7eff-a529-9590-31e7-b0007b416f81 2013-02-26 17:01:26 +00:00
reed@google.com
92abe48f24 move SampleTypeface into gm/typefacestyles
git-svn-id: http://skia.googlecode.com/svn/trunk@7867 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-02-26 16:57:16 +00:00
commit-bot@chromium.org
03ba084373 Whitespace change to test commit-queue
(SkipBuildbotRuns)

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

git-svn-id: http://skia.googlecode.com/svn/trunk@7866 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-02-26 16:25:04 +00:00
rmistry@google.com
9868e7cfd0 Removing blank lines from codereview.settings.
depot_tools/checkout.py does not like blank lines:
https://github.com/beurdouche/tools/blob/master/depot_tools/checkout.py#L38
Due to blank lines in our codereview.settings it was not returning the correct VIEW_VC and due to this the 'Commited' line was not showing up in changes submitted by the commit-queue.

(SkipBuildbotRuns)
Review URL: https://codereview.appspot.com/7388061

git-svn-id: http://skia.googlecode.com/svn/trunk@7865 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-02-26 16:01:21 +00:00
caryclark@google.com
7ff5c841bf shape ops work in progress
git-svn-id: http://skia.googlecode.com/svn/trunk@7864 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-02-26 15:56:05 +00:00
reed@google.com
b1c65b62bf git-svn-id: http://skia.googlecode.com/svn/trunk@7863 2bbb7eff-a529-9590-31e7-b0007b416f81 2013-02-26 15:50:51 +00:00
bsalomon@google.com
f47dd74da3 Rename template param to SkSTArray to be consistent with its base class, SkTArray.
R=jvanverth@google.com
Review URL: https://codereview.appspot.com/7372050

git-svn-id: http://skia.googlecode.com/svn/trunk@7862 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-02-26 15:40:01 +00:00
bsalomon@google.com
9c58f46c42 Add files omitted from gcl change in r7860.
git-svn-id: http://skia.googlecode.com/svn/trunk@7861 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-02-26 14:45:41 +00:00
bsalomon@google.com
8f9436161a Consolidate functions common the the null and debug GL interfaces.
R=robertphillips@google.com
Review URL: https://codereview.appspot.com/7400053

git-svn-id: http://skia.googlecode.com/svn/trunk@7860 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-02-26 14:34:43 +00:00
commit-bot@chromium.org
52a3d810d6 Whitespace change to test commit queue
(SkipBuildbotRuns)

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

git-svn-id: http://skia.googlecode.com/svn/trunk@7859 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-02-26 13:13:44 +00:00
rmistry@google.com
2876a59078 Pointing CODE_REVIEW_SERVER to Chromium Rietveld.
(SkipBuildbotRuns)
Review URL: https://codereview.appspot.com/7382058

git-svn-id: http://skia.googlecode.com/svn/trunk@7858 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-02-26 12:01:28 +00:00
skia.committer@gmail.com
5ca3bd0cbb Sanitizing source files in Skia_Periodic_House_Keeping
git-svn-id: http://skia.googlecode.com/svn/trunk@7857 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-02-26 07:01:22 +00:00
reed@google.com
80f5465083 git-svn-id: http://skia.googlecode.com/svn/trunk@7856 2bbb7eff-a529-9590-31e7-b0007b416f81 2013-02-25 22:19:20 +00:00
scroggo@google.com
e5f48243bd Fix a bunch of warnings, mainly around rowBytes.
My recent change changed the way SkBitmap::fRowBytes is stored,
and parameter/return values referring to rowBytes were changed
to type size_t. Change the storage back, and eliminate warnings
resulting from returning a size_t.

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

git-svn-id: http://skia.googlecode.com/svn/trunk@7855 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-02-25 21:47:41 +00:00
reed@google.com
10863051df remove duplicate impl for getFileName() on SkFDStream
git-svn-id: http://skia.googlecode.com/svn/trunk@7854 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-02-25 21:02:21 +00:00