bsalomon@google.com [Mon, 5 Nov 2012 19:28:12 +0000 (19:28 +0000)]
Fix dumb mistake of passing the same matrix to both matrix params of GrGLMatrixEffect::GenKey in texture domain effect.
Review: Over-the-shoulder review from robertphillips@google.com
git-svn-id: http://skia.googlecode.com/svn/trunk@6298
2bbb7eff-a529-9590-31e7-
b0007b416f81
bsalomon@google.com [Mon, 5 Nov 2012 16:36:02 +0000 (16:36 +0000)]
Remove default texture coords / texture matrix
Review URL: https://codereview.appspot.com/6775100
git-svn-id: http://skia.googlecode.com/svn/trunk@6293
2bbb7eff-a529-9590-31e7-
b0007b416f81
robertphillips@google.com [Mon, 5 Nov 2012 01:31:44 +0000 (01:31 +0000)]
Attempt to patch Chrome compiler failures
git-svn-id: http://skia.googlecode.com/svn/trunk@6289
2bbb7eff-a529-9590-31e7-
b0007b416f81
scroggo@google.com [Fri, 2 Nov 2012 22:01:26 +0000 (22:01 +0000)]
Make bench_pictures output a meaningful config name.
Review URL: https://codereview.appspot.com/6813074
git-svn-id: http://skia.googlecode.com/svn/trunk@6288
2bbb7eff-a529-9590-31e7-
b0007b416f81
bsalomon@google.com [Fri, 2 Nov 2012 21:45:01 +0000 (21:45 +0000)]
Make all remaining effects use GrGLEffectMatrix
R=robertphillips@google.com
Review URL: https://codereview.appspot.com/6817079
git-svn-id: http://skia.googlecode.com/svn/trunk@6286
2bbb7eff-a529-9590-31e7-
b0007b416f81
scroggo@google.com [Fri, 2 Nov 2012 21:28:12 +0000 (21:28 +0000)]
In bench_pictures --multi, maintain thread local caches.
Builds on https://codereview.appspot.com/6718046/ by mtklein.
Previously, each iteration of drawing a picture started new threads to draw the picture. Since each thread is using thread local storage for the font cache, this means that each iteration had to start with an empty font cache.
The newly added MultiCorePictureRenderer, separated from TiledPictureRenderer, now starts the drawing threads at the beginning of the test using an SkThreadPool, and keeps them alive through all iterations, so the font cache can be reused.
For now, I have removed the pipe version of the threaded renderer.
Updated bench_pictures_main and render_pictures_main to use the new
renderer, and to unref a renderer before early exit.
Review URL: https://codereview.appspot.com/6777063
git-svn-id: http://skia.googlecode.com/svn/trunk@6285
2bbb7eff-a529-9590-31e7-
b0007b416f81
reed@google.com [Fri, 2 Nov 2012 21:11:12 +0000 (21:11 +0000)]
add blurrect gm
git-svn-id: http://skia.googlecode.com/svn/trunk@6284
2bbb7eff-a529-9590-31e7-
b0007b416f81
scroggo@google.com [Fri, 2 Nov 2012 20:51:19 +0000 (20:51 +0000)]
When cloning into an SkPicture, clear its data.
Prevents a memory leak if the caller clones into an SkPicture
that already has a playback or record.
Review URL: https://codereview.appspot.com/6813081
git-svn-id: http://skia.googlecode.com/svn/trunk@6282
2bbb7eff-a529-9590-31e7-
b0007b416f81
bsalomon@google.com [Fri, 2 Nov 2012 20:45:37 +0000 (20:45 +0000)]
Make morphology, convolution, and table color filter opt out of default texture matrices.
Review URL: https://codereview.appspot.com/6817077
git-svn-id: http://skia.googlecode.com/svn/trunk@6280
2bbb7eff-a529-9590-31e7-
b0007b416f81
reed@google.com [Fri, 2 Nov 2012 19:59:18 +0000 (19:59 +0000)]
add 'c' toggle to test clipping
git-svn-id: http://skia.googlecode.com/svn/trunk@6278
2bbb7eff-a529-9590-31e7-
b0007b416f81
bsalomon@google.com [Fri, 2 Nov 2012 19:50:26 +0000 (19:50 +0000)]
Make GrGLTextureDomainEffect use GrGLEffectMatrix.
Also, don't send redundant domain.
Review URL: https://codereview.appspot.com/6820082
git-svn-id: http://skia.googlecode.com/svn/trunk@6276
2bbb7eff-a529-9590-31e7-
b0007b416f81
junov@chromium.org [Fri, 2 Nov 2012 19:16:22 +0000 (19:16 +0000)]
Fixing crash in render_pictures. Uninitialized member in PictureRenderer
TBR=scroggo
git-svn-id: http://skia.googlecode.com/svn/trunk@6272
2bbb7eff-a529-9590-31e7-
b0007b416f81
epoger@google.com [Fri, 2 Nov 2012 18:35:04 +0000 (18:35 +0000)]
Split off SkConsistentChecksum from SkChecksum
as part of https://goto.google.com/ImprovingTheSkiaRebaseliningProcess
Review URL: https://codereview.appspot.com/6820074
git-svn-id: http://skia.googlecode.com/svn/trunk@6270
2bbb7eff-a529-9590-31e7-
b0007b416f81
bsalomon@google.com [Fri, 2 Nov 2012 18:23:45 +0000 (18:23 +0000)]
Make GrGLConfigConversionEffect use GrGLEffectMatrix
Review URL: https://codereview.appspot.com/6815074
git-svn-id: http://skia.googlecode.com/svn/trunk@6268
2bbb7eff-a529-9590-31e7-
b0007b416f81
junov@chromium.org [Fri, 2 Nov 2012 18:11:49 +0000 (18:11 +0000)]
Adding rtree support to the bench_pictures utility
Review URL: https://codereview.appspot.com/6775080
git-svn-id: http://skia.googlecode.com/svn/trunk@6267
2bbb7eff-a529-9590-31e7-
b0007b416f81
robertphillips@google.com [Fri, 2 Nov 2012 17:38:28 +0000 (17:38 +0000)]
Fix for 2 parallel gpu rendering issues (bigbitmaprect & image-surface)
https://codereview.appspot.com/6816079/
git-svn-id: http://skia.googlecode.com/svn/trunk@6266
2bbb7eff-a529-9590-31e7-
b0007b416f81
borenet@google.com [Fri, 2 Nov 2012 12:46:23 +0000 (12:46 +0000)]
Another whitespace change to trigger bots
git-svn-id: http://skia.googlecode.com/svn/trunk@6263
2bbb7eff-a529-9590-31e7-
b0007b416f81
borenet@google.com [Fri, 2 Nov 2012 12:23:00 +0000 (12:23 +0000)]
Whitespace change to trigger bots
Fixed chicken-and-egg problem where the update_scripts step couldn't run
because the script hadn't been downloaded yet.
git-svn-id: http://skia.googlecode.com/svn/trunk@6261
2bbb7eff-a529-9590-31e7-
b0007b416f81
borenet@google.com [Fri, 2 Nov 2012 11:37:26 +0000 (11:37 +0000)]
Whitespace change to trigger rebuild after r6259
git-svn-id: http://skia.googlecode.com/svn/trunk@6260
2bbb7eff-a529-9590-31e7-
b0007b416f81
skia.committer@gmail.com [Fri, 2 Nov 2012 02:01:24 +0000 (02:01 +0000)]
Sanitizing source files in Skia_Periodic_House_Keeping
git-svn-id: http://skia.googlecode.com/svn/trunk@6258
2bbb7eff-a529-9590-31e7-
b0007b416f81
robertphillips@google.com [Thu, 1 Nov 2012 22:18:10 +0000 (22:18 +0000)]
Disable static asserts to get Chrome compiling
git-svn-id: http://skia.googlecode.com/svn/trunk@6257
2bbb7eff-a529-9590-31e7-
b0007b416f81
edisonn@google.com [Thu, 1 Nov 2012 20:07:33 +0000 (20:07 +0000)]
Support render_pdfs in iOS too (add tool_main()).
git-svn-id: http://skia.googlecode.com/svn/trunk@6254
2bbb7eff-a529-9590-31e7-
b0007b416f81
edisonn@google.com [Thu, 1 Nov 2012 19:52:38 +0000 (19:52 +0000)]
Add utility to convert skp files to pdf files. Code compatible with render_pictures_main.cpp. I could have refactored the code to avoid code duplication, but it does not seem right, and it will overcomplicate the code.
Review URL: https://codereview.appspot.com/6615073
git-svn-id: http://skia.googlecode.com/svn/trunk@6253
2bbb7eff-a529-9590-31e7-
b0007b416f81
bsalomon@google.com [Thu, 1 Nov 2012 18:03:48 +0000 (18:03 +0000)]
Check modulo values passed to GM.
R=reed@google.com
Review URL: https://codereview.appspot.com/6820073
git-svn-id: http://skia.googlecode.com/svn/trunk@6248
2bbb7eff-a529-9590-31e7-
b0007b416f81
bsalomon@google.com [Thu, 1 Nov 2012 18:02:54 +0000 (18:02 +0000)]
Replace GrMatrix with SkMatrix.
Review URL: https://codereview.appspot.com/6814067
git-svn-id: http://skia.googlecode.com/svn/trunk@6247
2bbb7eff-a529-9590-31e7-
b0007b416f81
borenet@google.com [Thu, 1 Nov 2012 18:01:08 +0000 (18:01 +0000)]
Fix NoGPU build
Some link settings were set in the wrong targets
git-svn-id: http://skia.googlecode.com/svn/trunk@6246
2bbb7eff-a529-9590-31e7-
b0007b416f81
borenet@google.com [Thu, 1 Nov 2012 17:43:44 +0000 (17:43 +0000)]
Improve NaCl support
- Add nacl_make script to build Skia targets for NaCl using gyp
- Add nacl_interface for command-line apps
- Add nacl_sample as front-end for SampleApp
- Add freetype to DEPS
- Various gyp tweaks for NaCl
TODO:
- Implement GL interface
- Implement font host
- Fix plumbing so that SampleApp works properly
Review URL: https://codereview.appspot.com/6671044
git-svn-id: http://skia.googlecode.com/svn/trunk@6245
2bbb7eff-a529-9590-31e7-
b0007b416f81
robertphillips@google.com [Thu, 1 Nov 2012 17:31:02 +0000 (17:31 +0000)]
Fix leaks in SkSurface_Gpu.cpp
https://codereview.appspot.com/6826046/
git-svn-id: http://skia.googlecode.com/svn/trunk@6244
2bbb7eff-a529-9590-31e7-
b0007b416f81
bsalomon@google.com [Thu, 1 Nov 2012 17:12:34 +0000 (17:12 +0000)]
Remove GrScalar, replace with SkScalar.
Review URL: https://codereview.appspot.com/6812064
git-svn-id: http://skia.googlecode.com/svn/trunk@6243
2bbb7eff-a529-9590-31e7-
b0007b416f81
junov@chromium.org [Thu, 1 Nov 2012 17:10:32 +0000 (17:10 +0000)]
Refactoring RTree integration to support SkBBoxHierarchy polymorphism in SkPicture.
This moves the rtree creation into a virtual method.
Review URL: https://codereview.appspot.com/6811057
git-svn-id: http://skia.googlecode.com/svn/trunk@6242
2bbb7eff-a529-9590-31e7-
b0007b416f81
bsalomon@google.com [Thu, 1 Nov 2012 17:02:46 +0000 (17:02 +0000)]
Reland r6233 with fix.
git-svn-id: http://skia.googlecode.com/svn/trunk@6241
2bbb7eff-a529-9590-31e7-
b0007b416f81
scroggo@google.com [Thu, 1 Nov 2012 16:28:23 +0000 (16:28 +0000)]
Use SkToBool to fix a warning.
Review URL: https://codereview.appspot.com/6818069
git-svn-id: http://skia.googlecode.com/svn/trunk@6240
2bbb7eff-a529-9590-31e7-
b0007b416f81
bsalomon@google.com [Thu, 1 Nov 2012 15:47:55 +0000 (15:47 +0000)]
Re-revert r6233.
git-svn-id: http://skia.googlecode.com/svn/trunk@6239
2bbb7eff-a529-9590-31e7-
b0007b416f81
bsalomon@google.com [Thu, 1 Nov 2012 15:40:47 +0000 (15:40 +0000)]
Reland r6233 with fix for config conversion texture matrices.
git-svn-id: http://skia.googlecode.com/svn/trunk@6238
2bbb7eff-a529-9590-31e7-
b0007b416f81
bsalomon@google.com [Thu, 1 Nov 2012 14:02:43 +0000 (14:02 +0000)]
Revert r6233 while investigating bot failures.
git-svn-id: http://skia.googlecode.com/svn/trunk@6235
2bbb7eff-a529-9590-31e7-
b0007b416f81
bsalomon@google.com [Thu, 1 Nov 2012 13:50:50 +0000 (13:50 +0000)]
Checkpoint in moving texture matrices out of GrGLProgram and into GrGLEffect.
Review URL: https://codereview.appspot.com/6818064
git-svn-id: http://skia.googlecode.com/svn/trunk@6233
2bbb7eff-a529-9590-31e7-
b0007b416f81
djsollen@google.com [Thu, 1 Nov 2012 12:15:12 +0000 (12:15 +0000)]
Fix asserts in SkPathMeasure to honor documented API
Review URL: https://codereview.appspot.com/6822061
git-svn-id: http://skia.googlecode.com/svn/trunk@6232
2bbb7eff-a529-9590-31e7-
b0007b416f81
skia.committer@gmail.com [Thu, 1 Nov 2012 02:01:27 +0000 (02:01 +0000)]
Sanitizing source files in Skia_Periodic_House_Keeping
git-svn-id: http://skia.googlecode.com/svn/trunk@6228
2bbb7eff-a529-9590-31e7-
b0007b416f81
bungeman@google.com [Wed, 31 Oct 2012 20:53:49 +0000 (20:53 +0000)]
GDI fonthost to serialize using correct font name.
https://codereview.appspot.com/6822060/
git-svn-id: http://skia.googlecode.com/svn/trunk@6227
2bbb7eff-a529-9590-31e7-
b0007b416f81
reed@google.com [Wed, 31 Oct 2012 19:59:23 +0000 (19:59 +0000)]
add SkScalarsEqual() so we don't have to use memcmp for arrays of floats.
git-svn-id: http://skia.googlecode.com/svn/trunk@6226
2bbb7eff-a529-9590-31e7-
b0007b416f81
scroggo@google.com [Wed, 31 Oct 2012 19:29:13 +0000 (19:29 +0000)]
Implement SkCondVar for windows.
Only works on Vista or later, since it uses condition variables.
Review URL: https://codereview.appspot.com/6812062
git-svn-id: http://skia.googlecode.com/svn/trunk@6225
2bbb7eff-a529-9590-31e7-
b0007b416f81
caryclark@google.com [Wed, 31 Oct 2012 19:00:20 +0000 (19:00 +0000)]
shape ops work in progress
git-svn-id: http://skia.googlecode.com/svn/trunk@6223
2bbb7eff-a529-9590-31e7-
b0007b416f81
bsalomon@google.com [Wed, 31 Oct 2012 18:09:01 +0000 (18:09 +0000)]
Make SkShader store localM directly rather than as a separate alloc.
May cause very slight GM changes in gpu two pt radial/conical radients.
Review URL: https://codereview.appspot.com/6821056
git-svn-id: http://skia.googlecode.com/svn/trunk@6221
2bbb7eff-a529-9590-31e7-
b0007b416f81
reed@google.com [Wed, 31 Oct 2012 17:57:01 +0000 (17:57 +0000)]
catch case where clipping shortened the line down to a single pixel, but our
state variables made us draw twice... with different fractional positions (yikes).
Inspired by http://code.google.com/p/chromium/issues/detail?id=148638
tho not necessarily a fix for that issue (can't repro the issue yet).
git-svn-id: http://skia.googlecode.com/svn/trunk@6220
2bbb7eff-a529-9590-31e7-
b0007b416f81
bsalomon@google.com [Wed, 31 Oct 2012 16:50:38 +0000 (16:50 +0000)]
Shortcut inverting the identity matrix.
Review URL: https://codereview.appspot.com/6775087/
git-svn-id: http://skia.googlecode.com/svn/trunk@6218
2bbb7eff-a529-9590-31e7-
b0007b416f81
scroggo@google.com [Wed, 31 Oct 2012 15:52:16 +0000 (15:52 +0000)]
Add SkThreadPool for managing threads.
Skia-ized from https://codereview.appspot.com/6755043/
TODO: Use SkThread and platform independent features.
Review URL: https://codereview.appspot.com/6777064
git-svn-id: http://skia.googlecode.com/svn/trunk@6217
2bbb7eff-a529-9590-31e7-
b0007b416f81
robertphillips@google.com [Wed, 31 Oct 2012 14:58:16 +0000 (14:58 +0000)]
Fix for error in r6214 (missing pre-declaration)
Unreviewed
git-svn-id: http://skia.googlecode.com/svn/trunk@6215
2bbb7eff-a529-9590-31e7-
b0007b416f81
robertphillips@google.com [Wed, 31 Oct 2012 14:48:39 +0000 (14:48 +0000)]
Fleshed out GPU portion of image/surface feature
https://codereview.appspot.com/6813055/
git-svn-id: http://skia.googlecode.com/svn/trunk@6214
2bbb7eff-a529-9590-31e7-
b0007b416f81
robertphillips@google.com [Wed, 31 Oct 2012 13:56:35 +0000 (13:56 +0000)]
Add validation check to GrGpu::createTexture & minor SkGpuDevice cleanup
https://codereview.appspot.com/6821055/
git-svn-id: http://skia.googlecode.com/svn/trunk@6213
2bbb7eff-a529-9590-31e7-
b0007b416f81
robertphillips@google.com [Wed, 31 Oct 2012 12:25:21 +0000 (12:25 +0000)]
Ganesh resource cache changes
https://codereview.appspot.com/6784051/
git-svn-id: http://skia.googlecode.com/svn/trunk@6211
2bbb7eff-a529-9590-31e7-
b0007b416f81
skia.committer@gmail.com [Wed, 31 Oct 2012 02:01:18 +0000 (02:01 +0000)]
Sanitizing source files in Skia_Periodic_House_Keeping
git-svn-id: http://skia.googlecode.com/svn/trunk@6210
2bbb7eff-a529-9590-31e7-
b0007b416f81
borenet@google.com [Tue, 30 Oct 2012 21:12:16 +0000 (21:12 +0000)]
Whitespace change to trigger bots
git-svn-id: http://skia.googlecode.com/svn/trunk@6209
2bbb7eff-a529-9590-31e7-
b0007b416f81
reed@google.com [Tue, 30 Oct 2012 20:26:58 +0000 (20:26 +0000)]
add test for bug in line drawing. fix is pending a way to handle all of the
rebaselines...
git-svn-id: http://skia.googlecode.com/svn/trunk@6208
2bbb7eff-a529-9590-31e7-
b0007b416f81
bsalomon@google.com [Tue, 30 Oct 2012 20:17:54 +0000 (20:17 +0000)]
Upstreaming changes from gpu_dev to trunk.
git-svn-id: http://skia.googlecode.com/svn/trunk@6207
2bbb7eff-a529-9590-31e7-
b0007b416f81
junov@chromium.org [Tue, 30 Oct 2012 19:05:17 +0000 (19:05 +0000)]
Eliminating implicit conversion from enum to bool. Fixes compiler warning
Review URL: https://codereview.appspot.com/6819053
git-svn-id: http://skia.googlecode.com/svn/trunk@6206
2bbb7eff-a529-9590-31e7-
b0007b416f81
epoger@google.com [Tue, 30 Oct 2012 17:33:09 +0000 (17:33 +0000)]
comment-only: add "this may change" warning to SkChecksum.h
Review URL: https://codereview.appspot.com/6810054
git-svn-id: http://skia.googlecode.com/svn/trunk@6205
2bbb7eff-a529-9590-31e7-
b0007b416f81
epoger@google.com [Tue, 30 Oct 2012 16:25:17 +0000 (16:25 +0000)]
Revert r6051, re-adding json to DEPS file
Review URL: https://codereview.appspot.com/6816059
git-svn-id: http://skia.googlecode.com/svn/trunk@6202
2bbb7eff-a529-9590-31e7-
b0007b416f81
bsalomon@google.com [Tue, 30 Oct 2012 15:50:22 +0000 (15:50 +0000)]
Remove unnecessary mul and assignment in gradient shaders.
R=robertphillips@google.com
Review URL: https://codereview.appspot.com/6814056
git-svn-id: http://skia.googlecode.com/svn/trunk@6201
2bbb7eff-a529-9590-31e7-
b0007b416f81
robertphillips@google.com [Tue, 30 Oct 2012 15:18:10 +0000 (15:18 +0000)]
Add GL texture validity check to GrGpuGL
https://codereview.appspot.com/6817053/
git-svn-id: http://skia.googlecode.com/svn/trunk@6200
2bbb7eff-a529-9590-31e7-
b0007b416f81
senorblanco@chromium.org [Tue, 30 Oct 2012 14:34:55 +0000 (14:34 +0000)]
Simple rebaseline tool: Add support for ANGLE, DirectWrite builders.
Set svn mime type to image/png.
Review URL: https://codereview.appspot.com/6820054
git-svn-id: http://skia.googlecode.com/svn/trunk@6199
2bbb7eff-a529-9590-31e7-
b0007b416f81
reed@google.com [Tue, 30 Oct 2012 14:28:03 +0000 (14:28 +0000)]
factor out computation for dy in SkEdge lines, so we can later try a fix.
git-svn-id: http://skia.googlecode.com/svn/trunk@6198
2bbb7eff-a529-9590-31e7-
b0007b416f81
bungeman@google.com [Tue, 30 Oct 2012 14:15:32 +0000 (14:15 +0000)]
Fix cross compilation with mingw.
Mingw is case sensitive, so use the correct capitaliztion of dwrite.h.
https://codereview.appspot.com/6588055
Props jacek.
git-svn-id: http://skia.googlecode.com/svn/trunk@6197
2bbb7eff-a529-9590-31e7-
b0007b416f81
bsalomon@google.com [Tue, 30 Oct 2012 12:34:25 +0000 (12:34 +0000)]
Expose vertex position to GrGLEffect via GrGLShaderBuilder.
R=robertphillips@google.com
Review URL: https://codereview.appspot.com/6814054
git-svn-id: http://skia.googlecode.com/svn/branches/gpu_dev@6195
2bbb7eff-a529-9590-31e7-
b0007b416f81
bungeman@google.com [Mon, 29 Oct 2012 20:16:30 +0000 (20:16 +0000)]
Use consistent globals in AttachCache.
https://codereview.appspot.com/6816052/
git-svn-id: http://skia.googlecode.com/svn/trunk@6188
2bbb7eff-a529-9590-31e7-
b0007b416f81
bsalomon@google.com [Mon, 29 Oct 2012 20:13:42 +0000 (20:13 +0000)]
Rebase gpu_dev up to r5182
git-svn-id: http://skia.googlecode.com/svn/branches/gpu_dev@6187
2bbb7eff-a529-9590-31e7-
b0007b416f81
bsalomon@google.com [Mon, 29 Oct 2012 20:02:06 +0000 (20:02 +0000)]
Add file accidentally omitted from r6182.
git-svn-id: http://skia.googlecode.com/svn/branches/gpu_dev@6186
2bbb7eff-a529-9590-31e7-
b0007b416f81
bsalomon@google.com [Mon, 29 Oct 2012 19:51:22 +0000 (19:51 +0000)]
Pass GrCustomStage to key-generation functions and emitCode().
R=robertphillips@google.com
Review URL: https://codereview.appspot.com/6819046
git-svn-id: http://skia.googlecode.com/svn/branches/gpu_dev@6182
2bbb7eff-a529-9590-31e7-
b0007b416f81
senorblanco@chromium.org [Mon, 29 Oct 2012 19:47:06 +0000 (19:47 +0000)]
Fix alpha computation for specular lighting filter (GPU path).
Change lighting GM background to show blending.
NOTE: This will require new results for the lighting GM.
Review URL: https://codereview.appspot.com/6812050
git-svn-id: http://skia.googlecode.com/svn/trunk@6181
2bbb7eff-a529-9590-31e7-
b0007b416f81
djsollen@google.com [Mon, 29 Oct 2012 19:24:45 +0000 (19:24 +0000)]
Allow default texture cache limit to be set within gyp.
Review URL: https://codereview.appspot.com/6818051
git-svn-id: http://skia.googlecode.com/svn/trunk@6177
2bbb7eff-a529-9590-31e7-
b0007b416f81
epoger@google.com [Mon, 29 Oct 2012 18:59:17 +0000 (18:59 +0000)]
Alphabetize gm options (in usage message and option parser).
Also add long-form option names for all options.
Review URL: https://codereview.appspot.com/6817050
git-svn-id: http://skia.googlecode.com/svn/trunk@6173
2bbb7eff-a529-9590-31e7-
b0007b416f81
senorblanco@chromium.org [Mon, 29 Oct 2012 18:06:26 +0000 (18:06 +0000)]
First stab at a simple rebaseline script.
Review URL: https://codereview.appspot.com/6775045
git-svn-id: http://skia.googlecode.com/svn/trunk@6170
2bbb7eff-a529-9590-31e7-
b0007b416f81
epoger@google.com [Mon, 29 Oct 2012 16:42:11 +0000 (16:42 +0000)]
Add option to gm: write out images into a hierarchy, rather than a flat set of files
BUG=https://code.google.com/p/skia/issues/detail?id=743
Review URL: https://codereview.appspot.com/6810047
git-svn-id: http://skia.googlecode.com/svn/trunk@6167
2bbb7eff-a529-9590-31e7-
b0007b416f81
bsalomon@google.com [Mon, 29 Oct 2012 16:25:04 +0000 (16:25 +0000)]
Make GrEffectStage keep a const ptr (rather than non-const) to GrEffect.
R=robertphillips@google.com
Review URL: https://codereview.appspot.com/6811045
git-svn-id: http://skia.googlecode.com/svn/branches/gpu_dev@6166
2bbb7eff-a529-9590-31e7-
b0007b416f81
bsalomon@google.com [Mon, 29 Oct 2012 14:53:53 +0000 (14:53 +0000)]
Make lighting filters directly inherit from GrGLEffect.
Delete GrGLLegacyEffect.
Review URL: https://codereview.appspot.com/6815050
git-svn-id: http://skia.googlecode.com/svn/branches/gpu_dev@6165
2bbb7eff-a529-9590-31e7-
b0007b416f81
bsalomon@google.com [Mon, 29 Oct 2012 12:47:51 +0000 (12:47 +0000)]
Make GrGLConvolutionEffect, GrGLMorphologyEffect, and GrGLMagnifierEffect derive directly from GrGLEffect.
R=robertphillips@google.com
Review URL: https://codereview.appspot.com/6786052
git-svn-id: http://skia.googlecode.com/svn/branches/gpu_dev@6164
2bbb7eff-a529-9590-31e7-
b0007b416f81
bsalomon@google.com [Mon, 29 Oct 2012 12:43:38 +0000 (12:43 +0000)]
Make GrGLGradientEffect derive directly from GrGLEffect.
Review URL: https://codereview.appspot.com/6784053
git-svn-id: http://skia.googlecode.com/svn/branches/gpu_dev@6163
2bbb7eff-a529-9590-31e7-
b0007b416f81
skia.committer@gmail.com [Sat, 27 Oct 2012 02:01:15 +0000 (02:01 +0000)]
Sanitizing source files in Skia_Periodic_House_Keeping
git-svn-id: http://skia.googlecode.com/svn/trunk@6161
2bbb7eff-a529-9590-31e7-
b0007b416f81
bsalomon@google.com [Fri, 26 Oct 2012 21:14:10 +0000 (21:14 +0000)]
Rebaseline gpu_dev from trunk at r6159.
git-svn-id: http://skia.googlecode.com/svn/branches/gpu_dev@6160
2bbb7eff-a529-9590-31e7-
b0007b416f81
caryclark@google.com [Fri, 26 Oct 2012 21:03:50 +0000 (21:03 +0000)]
shape ops work in progress
git-svn-id: http://skia.googlecode.com/svn/trunk@6159
2bbb7eff-a529-9590-31e7-
b0007b416f81
bungeman@google.com [Fri, 26 Oct 2012 20:48:54 +0000 (20:48 +0000)]
Fix generateMask to properly apply pre-blend.
git-svn-id: http://skia.googlecode.com/svn/trunk@6158
2bbb7eff-a529-9590-31e7-
b0007b416f81
senorblanco@chromium.org [Fri, 26 Oct 2012 19:37:00 +0000 (19:37 +0000)]
Add a factory Create function for SkColorFilterImageFilter, and move the matrix optimization there. This will allow the Chrome compositor to extract the optimized matrix, and potentially apply the color matrix itself, saving a buffer allocation & draw.
Review URL: https://codereview.appspot.com/6739057
git-svn-id: http://skia.googlecode.com/svn/trunk@6152
2bbb7eff-a529-9590-31e7-
b0007b416f81
bungeman@google.com [Fri, 26 Oct 2012 19:35:54 +0000 (19:35 +0000)]
Clean up usage of mask gamma.
https://codereview.appspot.com/6749061/
git-svn-id: http://skia.googlecode.com/svn/trunk@6151
2bbb7eff-a529-9590-31e7-
b0007b416f81
bsalomon@google.com [Fri, 26 Oct 2012 19:16:46 +0000 (19:16 +0000)]
Make a bunch of GrGLEffects derive directly from GrGLEffect rather than GrGLLegacyEffect.
Review URL: https://codereview.appspot.com/6783053
git-svn-id: http://skia.googlecode.com/svn/branches/gpu_dev@6150
2bbb7eff-a529-9590-31e7-
b0007b416f81
bsalomon@google.com [Fri, 26 Oct 2012 19:14:16 +0000 (19:14 +0000)]
Merging trunk revs up to 6147 into gpu_dev.
git-svn-id: http://skia.googlecode.com/svn/branches/gpu_dev@6149
2bbb7eff-a529-9590-31e7-
b0007b416f81
bsalomon@google.com [Fri, 26 Oct 2012 19:01:17 +0000 (19:01 +0000)]
Make the orientation of a texture accessible from and known by GrSurface.
R=robertphillips@google.com
Review URL: https://codereview.appspot.com/6801044
git-svn-id: http://skia.googlecode.com/svn/branches/gpu_dev@6148
2bbb7eff-a529-9590-31e7-
b0007b416f81
epoger@google.com [Fri, 26 Oct 2012 18:56:36 +0000 (18:56 +0000)]
object-ify gmmain.cpp (no functional change) to ease planned changes later
Review URL: https://codereview.appspot.com/6801043
git-svn-id: http://skia.googlecode.com/svn/trunk@6147
2bbb7eff-a529-9590-31e7-
b0007b416f81
borenet@google.com [Fri, 26 Oct 2012 18:03:09 +0000 (18:03 +0000)]
Whitespace change to trigger bots
git-svn-id: http://skia.googlecode.com/svn/trunk@6144
2bbb7eff-a529-9590-31e7-
b0007b416f81
bsalomon@google.com [Fri, 26 Oct 2012 17:53:18 +0000 (17:53 +0000)]
Make GrGLEffect::setData take GrEffectStage rather than GrEffect.
This allows the coord-change matrix to be communicated to setData(). An accessor for this matrix is also added to GrEffectStage.
R=robertphillips@google.com
Review URL: https://codereview.appspot.com/6779057
git-svn-id: http://skia.googlecode.com/svn/branches/gpu_dev@6143
2bbb7eff-a529-9590-31e7-
b0007b416f81
djsollen@google.com [Fri, 26 Oct 2012 14:07:13 +0000 (14:07 +0000)]
Refactor gm to minimize wasted passes through picture and pipe code paths.
Testing this CL shows around a 40% time reduction when running gm on a mac debug build.
Review URL: https://codereview.appspot.com/6791043
git-svn-id: http://skia.googlecode.com/svn/trunk@6140
2bbb7eff-a529-9590-31e7-
b0007b416f81
bsalomon@google.com [Fri, 26 Oct 2012 13:44:54 +0000 (13:44 +0000)]
Create a branch for continued GPU development during Chrome branching.
git-svn-id: http://skia.googlecode.com/svn/branches/gpu_dev@6139
2bbb7eff-a529-9590-31e7-
b0007b416f81
bsalomon@google.com [Fri, 26 Oct 2012 13:41:59 +0000 (13:41 +0000)]
Update comment in GrDrawState.h to reflect renaming changes and expansion of the scope of effects.
Review URL: https://codereview.appspot.com/6777059
git-svn-id: http://skia.googlecode.com/svn/trunk@6138
2bbb7eff-a529-9590-31e7-
b0007b416f81
borenet@google.com [Fri, 26 Oct 2012 13:26:55 +0000 (13:26 +0000)]
Make output path to render_pictures optional
Review URL: https://codereview.appspot.com/6779049
git-svn-id: http://skia.googlecode.com/svn/trunk@6136
2bbb7eff-a529-9590-31e7-
b0007b416f81
bsalomon@google.com [Fri, 26 Oct 2012 13:01:20 +0000 (13:01 +0000)]
Rename GrSamplerState to GrEffectStage.
R=robertphillips@google.com
Review URL: https://codereview.appspot.com/6777053
git-svn-id: http://skia.googlecode.com/svn/trunk@6135
2bbb7eff-a529-9590-31e7-
b0007b416f81
skia.committer@gmail.com [Fri, 26 Oct 2012 02:01:24 +0000 (02:01 +0000)]
Sanitizing source files in Skia_Periodic_House_Keeping
git-svn-id: http://skia.googlecode.com/svn/trunk@6133
2bbb7eff-a529-9590-31e7-
b0007b416f81
bsalomon@google.com [Thu, 25 Oct 2012 21:52:43 +0000 (21:52 +0000)]
Misc stage->effect renaming
R=robertphillips@google.com
Review URL: https://codereview.appspot.com/6787043
git-svn-id: http://skia.googlecode.com/svn/trunk@6132
2bbb7eff-a529-9590-31e7-
b0007b416f81
bsalomon@google.com [Thu, 25 Oct 2012 21:45:42 +0000 (21:45 +0000)]
GrGLGradientStage->GrGLGradientEffect
R=robertphillips@google.com
Review URL: https://codereview.appspot.com/6774046
git-svn-id: http://skia.googlecode.com/svn/trunk@6131
2bbb7eff-a529-9590-31e7-
b0007b416f81
bsalomon@google.com [Thu, 25 Oct 2012 21:42:05 +0000 (21:42 +0000)]
Rename StageKey and related stuff.
R=robertphillips@google.com
Review URL: https://codereview.appspot.com/6785049
git-svn-id: http://skia.googlecode.com/svn/trunk@6130
2bbb7eff-a529-9590-31e7-
b0007b416f81
scroggo@google.com [Thu, 25 Oct 2012 19:57:06 +0000 (19:57 +0000)]
Fix WIN64 break from variable redefinition.
Review URL: https://codereview.appspot.com/6782047
git-svn-id: http://skia.googlecode.com/svn/trunk@6129
2bbb7eff-a529-9590-31e7-
b0007b416f81
bsalomon@google.com [Thu, 25 Oct 2012 19:35:05 +0000 (19:35 +0000)]
Fix self assignment in GrGLShaderVar
R=robertphillips@google.com
Review URL: https://codereview.appspot.com/6776048
git-svn-id: http://skia.googlecode.com/svn/trunk@6127
2bbb7eff-a529-9590-31e7-
b0007b416f81
scroggo@google.com [Thu, 25 Oct 2012 19:12:40 +0000 (19:12 +0000)]
Add a callback to cleanup TLS data on Windows.
Add a test to ensure that it works.
BUG: http://code.google.com/p/skia/issues/detail?id=939
Review URL: https://codereview.appspot.com/6785045
git-svn-id: http://skia.googlecode.com/svn/trunk@6126
2bbb7eff-a529-9590-31e7-
b0007b416f81