senorblanco@chromium.org
c2594f4106
This changes the signature of SkImageFilter::filterImageGPU() to use SkBitmaps for input and output, and removes the rect param. This allows us to return textures which are larger than the actual result, such as when GrAutoScratchTextures are used. The SkBitmap's size represents the active region, while the GrTexture's size is the full texture size.
...
This fixes the bicubic image filter GM on the GPU, which otherwise draws garbage outside the filtered region. It also moves us closer to unifying the signatures of SkImageFilter::onFilterImage() and SkImageFilter::filterImageGPU().
Review URL: https://codereview.appspot.com/7180048
git-svn-id: http://skia.googlecode.com/svn/trunk@7467 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-01-30 19:08:47 +00:00
skia.committer@gmail.com
cdcb2ce274
Sanitizing source files in Skia_Periodic_House_Keeping
...
git-svn-id: http://skia.googlecode.com/svn/trunk@7439 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-01-29 07:05:52 +00:00
robertphillips@google.com
68f670fa72
Fix assert
...
https://codereview.appspot.com/7234050/
git-svn-id: http://skia.googlecode.com/svn/trunk@7428 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-01-28 20:55:42 +00:00
robertphillips@google.com
4991b8f234
Added toString to SkDrawLooper-derived classes
...
https://codereview.appspot.com/7195054/
git-svn-id: http://skia.googlecode.com/svn/trunk@7422 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-01-28 20:21:59 +00:00
senorblanco@chromium.org
ef5dbe1cd9
Add an origin flag for backend (external) textures. Some textures in WebKit have a topdown orientation, and skia needs to be notified of this, so that they are not drawn upside-down.
...
Review URL: https://codereview.appspot.com/7200048
git-svn-id: http://skia.googlecode.com/svn/trunk@7414 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-01-28 16:42:38 +00:00
skia.committer@gmail.com
e16efc1882
Sanitizing source files in Skia_Periodic_House_Keeping
...
git-svn-id: http://skia.googlecode.com/svn/trunk@7406 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-01-26 07:06:02 +00:00
reed@google.com
70375529cc
doh: use *srcPtr instead of src (which is now obsolete) when we check for specialLine
...
git-svn-id: http://skia.googlecode.com/svn/trunk@7392 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-01-25 14:52:11 +00:00
robertphillips@google.com
d760073266
Hid large dashed line optimization behind compiler flag
...
https://codereview.appspot.com/7133078/
git-svn-id: http://skia.googlecode.com/svn/trunk@7391 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-01-25 14:47:48 +00:00
skia.committer@gmail.com
4024f32d99
Sanitizing source files in Skia_Periodic_House_Keeping
...
git-svn-id: http://skia.googlecode.com/svn/trunk@7385 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-01-25 07:06:46 +00:00
reed@google.com
4bbdeac58c
add optional cull-rect to patheffects, so they can do less work if their results
...
lie outside of the current clip-bounds (the cull rect).
Review URL: https://codereview.appspot.com/7206044
git-svn-id: http://skia.googlecode.com/svn/trunk@7378 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-01-24 21:03:11 +00:00
bsalomon@google.com
95ed55adc6
Make all GrContext members that return a texture also ref the texture for the caller.
...
Review URL: https://codereview.appspot.com/7198049
git-svn-id: http://skia.googlecode.com/svn/trunk@7362 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-01-24 14:46:47 +00:00
skia.committer@gmail.com
98ded84b80
Sanitizing source files in Skia_Periodic_House_Keeping
...
git-svn-id: http://skia.googlecode.com/svn/trunk@7332 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-01-23 07:06:17 +00:00
bsalomon@google.com
8a252f7962
Switch GrEffect::onIsEqual signature back to GrEffect from GrEffectRef.
...
R=robertphillips@google.com
Review URL: https://codereview.appspot.com/7188046
git-svn-id: http://skia.googlecode.com/svn/trunk@7326 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-01-22 20:35:13 +00:00
bsalomon@google.com
6340a41108
Let them eat GrEffectRef.
...
Changes the remaining existing code that operates on naked GrEffects to GrEffectRef.
Review URL: https://codereview.appspot.com/7124058
git-svn-id: http://skia.googlecode.com/svn/trunk@7321 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-01-22 19:55:59 +00:00
robertphillips@google.com
b83b6b4f76
Added toString to SkXfermode-derived classes (for debugger)
...
https://codereview.appspot.com/7139058/
git-svn-id: http://skia.googlecode.com/svn/trunk@7308 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-01-22 14:32:09 +00:00
skia.committer@gmail.com
36df7ed46b
Sanitizing source files in Skia_Periodic_House_Keeping
...
git-svn-id: http://skia.googlecode.com/svn/trunk@7293 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-01-19 07:05:38 +00:00
senorblanco@chromium.org
3f2d45aff6
(Relanding r7275 with assert fix, plus fixes from r7276, r7280, r7283.)
...
Implement a bicubic resampling image filter, with raster and GPU backends.
In order to get this to work on the GPU side, I had to modify the width and height of the drawn texture in drawSprite() and drawDevice() to use the filtered texture's dimensions, instead of the source texture. (This wasn't a problem before since all other image filters produce results the same dimensions as their input texture.)
For now, this implementation only does axis-aligned scaling (same as the Lanczos-3 implementation in Chrome). It's also done for correctness and clarity, not speed, so there are lots of opportunities for speedups.
Committed: https://code.google.com/p/skia/source/detail?r=7275
Review URL: https://codereview.appspot.com/7033049
git-svn-id: http://skia.googlecode.com/svn/trunk@7287 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-01-18 20:48:20 +00:00
robertphillips@google.com
c51f752554
Reverting chain of SkBicubicImageFilter changes (7275, 7276, 7280 & 7283)
...
git-svn-id: http://skia.googlecode.com/svn/trunk@7285 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-01-18 19:20:52 +00:00
reed@google.com
2124446ebb
fix unused-variable warning in src/effects/SkBicubicImageFilter.cpp
...
git-svn-id: http://skia.googlecode.com/svn/trunk@7283 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-01-18 18:31:19 +00:00
robertphillips@google.com
9f4965270f
Removed unused variable in SkBicubicImageFilter.cpp
...
git-svn-id: http://skia.googlecode.com/svn/trunk@7280 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-01-18 17:56:31 +00:00
senorblanco@chromium.org
92435a4364
Fix GPU-less build. Unreviewed.
...
git-svn-id: http://skia.googlecode.com/svn/trunk@7276 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-01-18 17:32:50 +00:00
senorblanco@chromium.org
744820e657
Implement a bicubic resampling image filter, with raster and GPU backends.
...
In order to get this to work on the GPU side, I had to modify the width and height of the drawn texture in drawSprite() and drawDevice() to use the filtered texture's dimensions, instead of the source texture. (This wasn't a problem before since all other image filters produce results the same dimensions as their input texture.)
For now, this implementation only does axis-aligned scaling (same as the Lanczos-3 implementation in Chrome). It's also done for correctness and clarity, not speed, so there are lots of opportunities for speedups.
Review URL: https://codereview.appspot.com/7033049
git-svn-id: http://skia.googlecode.com/svn/trunk@7275 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-01-18 17:29:15 +00:00
bsalomon@google.com
70db51fc09
Fix call to INHERITED::isEqual in GrRadial2Gradient. Should be INHERITED::onIsEqual.
...
git-svn-id: http://skia.googlecode.com/svn/trunk@7260 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-01-17 18:39:59 +00:00
bsalomon@google.com
68b58c9538
Remove default implementation of GrEffect::isEqual. Make GrSingleTextureEffect abstract.
...
Review URL: https://codereview.appspot.com/7142049
git-svn-id: http://skia.googlecode.com/svn/trunk@7254 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-01-17 16:50:08 +00:00
bsalomon@google.com
a1ebbe447d
Change some function/vars from EffectPtr to EffectRef to reflect GrEffectPtr->GrEffectRef renaming.
...
git-svn-id: http://skia.googlecode.com/svn/trunk@7226 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-01-16 15:51:47 +00:00
bsalomon@google.com
5d2cd20790
Fix GPU-less build.
...
git-svn-id: http://skia.googlecode.com/svn/trunk@7224 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-01-16 15:31:06 +00:00
bsalomon@google.com
0ac6af4997
Wrap GrEffects in GrEffectPtr.
...
This is the first step towards automatic recycling of scratch resouces in the cache via ref-cnts.
R=robertphillips@google.com
Review URL: https://codereview.appspot.com/7092061
git-svn-id: http://skia.googlecode.com/svn/trunk@7222 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-01-16 15:16:18 +00:00
skia.committer@gmail.com
ff21c2e0ae
Sanitizing source files in Skia_Periodic_House_Keeping
...
git-svn-id: http://skia.googlecode.com/svn/trunk@7215 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-01-16 07:05:56 +00:00
bsalomon@google.com
23595a59a7
Fix busted texture coords in GrGLBlendEffect.
...
Review URL: https://codereview.appspot.com/7095062
git-svn-id: http://skia.googlecode.com/svn/trunk@7209 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-01-15 20:58:17 +00:00
robertphillips@google.com
76f9e938df
Added print out of SkShader information to debugger
...
https://codereview.appspot.com/7105045/
git-svn-id: http://skia.googlecode.com/svn/trunk@7201 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-01-15 20:17:47 +00:00
sugoi@google.com
4d69227d90
Unreviewed mac build fix : Removing unused variable
...
git-svn-id: http://skia.googlecode.com/svn/trunk@7186 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-01-15 16:35:31 +00:00
sugoi@google.com
8cec63e477
Added missing include in non GPU case.
...
Review URL: https://codereview.appspot.com/7093067
git-svn-id: http://skia.googlecode.com/svn/trunk@7185 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-01-15 15:59:45 +00:00
sugoi@google.com
781cc76e0f
Implementation of the displacement effect (both CPU and GPU)
...
TEST=Added new GM called "displacement"
Review URL: https://codereview.appspot.com/7058075
git-svn-id: http://skia.googlecode.com/svn/trunk@7182 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-01-15 15:40:19 +00:00
robertphillips@google.com
5c4d5582c9
dashing asPoints could draw excessively long first dash
...
https://codereview.appspot.com/7098054/
Will require rebaselining of dashing gm.
git-svn-id: http://skia.googlecode.com/svn/trunk@7177 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-01-15 12:53:31 +00:00
humper@google.com
84831acfad
fix all the false --> NULL issues in the gradient code
...
BUG=
Review URL: https://codereview.appspot.com/7095056
git-svn-id: http://skia.googlecode.com/svn/trunk@7170 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-01-14 22:09:54 +00:00
senorblanco@chromium.org
027c10207a
Fix a problem in the matrix convolution image filter exposed by https://code.google.com/p/skia/source/detail?r=7152 : when offsetting texture coordinates in a GrEffect, take the origin of the source bitmap origin into account, and flip Y coordinates when we need to.
...
NOTE: this will cause the matrixconvolution GM's to need to be rebaselined (again!).
Review URL: https://codereview.appspot.com/7086054
git-svn-id: http://skia.googlecode.com/svn/trunk@7168 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-01-14 21:53:45 +00:00
bsalomon@google.com
00835cc550
Fix debug build after r7153 (removed param referenced in assertion)
...
git-svn-id: http://skia.googlecode.com/svn/trunk@7154 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-01-14 17:07:22 +00:00
bsalomon@google.com
e197cbf9a3
Change signature of SkShader::asNewEffect(), implement for SkBitmapProcShader.
...
Review URL: https://codereview.appspot.com/7086051
git-svn-id: http://skia.googlecode.com/svn/trunk@7153 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-01-14 16:46:26 +00:00
bsalomon@google.com
61be7946ed
Fix typo bug caught by mac warn-as-error (= should have been &=).
...
git-svn-id: http://skia.googlecode.com/svn/trunk@7148 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-01-14 14:36:40 +00:00
bsalomon@google.com
0263fcd72e
Implement getConstantColorComponents() for matrix convolution.
...
R=senorblanco@chromium.org
Review URL: https://codereview.appspot.com/7092047
git-svn-id: http://skia.googlecode.com/svn/trunk@7146 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-01-11 22:24:04 +00:00
bsalomon@google.com
371e105da5
Add GrEffect::updateKnownColorComponents(). It is used to determine whether the output of an effect has a constant output value for r,g,b, or a.
...
Review URL: https://codereview.appspot.com/7064057
git-svn-id: http://skia.googlecode.com/svn/trunk@7144 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-01-11 21:08:55 +00:00
bsalomon@google.com
33cdbdea3d
Fix leaks in blurrect benchs and gm.
...
Review URL: https://codereview.appspot.com/7071060
git-svn-id: http://skia.googlecode.com/svn/trunk@7142 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-01-11 20:54:44 +00:00
bsalomon@google.com
50db75c871
Make GrEffect::textureAccess non-virtual. Require subclasses to append their GrTAs.
...
Review URL: https://codereview.appspot.com/7062063
git-svn-id: http://skia.googlecode.com/svn/trunk@7129 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-01-11 13:54:30 +00:00
senorblanco@chromium.org
171f5c76b9
Rename onFilterImageGPU to filterImageGPU(), to match skia convention. No change in functionality.
...
(Note that this does mean that clients must override onFilterImage() to implement the raster path, but filterImageGPU() to implement the GPU path.)
Review URL: https://codereview.appspot.com/7058078
git-svn-id: http://skia.googlecode.com/svn/trunk@7123 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-01-10 19:55:18 +00:00
humper@google.com
0e51577a14
fix warning from scalar --> int32 conversion
...
BUG=
Review URL: https://codereview.appspot.com/7065050
git-svn-id: http://skia.googlecode.com/svn/trunk@7061 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-01-07 19:54:40 +00:00
jvanverth@google.com
9c4e5ac5b7
Cleaned up warnings in Windows build.
...
git-svn-id: http://skia.googlecode.com/svn/trunk@7057 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-01-07 18:41:28 +00:00
humper@google.com
05af1afd42
eliminate all warnings in non-thirdparty code on mac
...
Most of these issues were due to functions whose definitions appear in header files; I changed those functions to be 'static inline' instead of just 'static' or 'inline', which kills the warning for such functions.
Other functions that were static or anonymous-namespaced but were unused in cpp files were probably called at some point but are no longer; someone who knows more than I do should probably scrub all the functions I either deleted or #if 0'ed out and make sure that the right thing is happening here.
Lots of unused variables removed, and one nasty const issue handled.
There remains a single warning in thirdparty/externals/cityhash/src/city.cc on line 146 related to a signed/unsigned mismatch. I don't know if we have control over this library so I didn't fix this one, but perhaps someone could do something about that one.
BUG=
Review URL: https://codereview.appspot.com/7067044
git-svn-id: http://skia.googlecode.com/svn/trunk@7051 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-01-07 16:47:43 +00:00
skia.committer@gmail.com
8ae714b186
Sanitizing source files in Skia_Periodic_House_Keeping
...
git-svn-id: http://skia.googlecode.com/svn/trunk@7038 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-01-05 02:02:05 +00:00
humper@google.com
7c7292c607
Added a new function to directly generate a blurred rectangle analytically.
...
Added two new microbenchmarks to demonstrate speedup over existing BlurSeparable approach.
Added new GM tests for blurred rectangles.
Review URL: https://codereview.appspot.com/7037050
git-svn-id: http://skia.googlecode.com/svn/trunk@7034 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-01-04 20:29:03 +00:00
bsalomon@google.com
34cccde630
Allow GrEffects with multiple textures.
...
It will work as long as the total number of textures sis less than GrDrawState::kNumStages. That will be fixed in a follow up CL.
Review URL: https://codereview.appspot.com/7040052
git-svn-id: http://skia.googlecode.com/svn/trunk@7023 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-01-04 18:34:30 +00:00
epoger@google.com
a59df04b68
Delete no-longer compiled SkRectShape.cpp
...
(This should have been removed in https://code.google.com/p/skia/source/detail?r=5033 )
Review URL: https://codereview.appspot.com/7035052
git-svn-id: http://skia.googlecode.com/svn/trunk@6969 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-01-02 18:32:53 +00:00
mike@reedtribe.org
3eafe9b221
Fix break from eariler change to colorfilters. clang's warnings found that some of these
...
virtuals were hidden due to missing const.
git-svn-id: http://skia.googlecode.com/svn/trunk@6944 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-12-24 18:11:05 +00:00
mike@reedtribe.org
61490fa4d2
fix warnings related to constness in overrides of SkColorFilter
...
update samples for circle testing
git-svn-id: http://skia.googlecode.com/svn/trunk@6943 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-12-24 14:38:46 +00:00
reed@google.com
30711b764b
change SkMaskFilter methods to const, in preparation for making the class as
...
immutable and re-entrant safe.
Review URL: https://codereview.appspot.com/6944069
git-svn-id: http://skia.googlecode.com/svn/trunk@6881 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-12-18 19:18:39 +00:00
reed@google.com
457d8a77be
remove experimental setAsABlur, as it forces the instance to be mutable, and was
...
not adopted by chrome
Review URL: https://codereview.appspot.com/6939071
git-svn-id: http://skia.googlecode.com/svn/trunk@6879 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-12-18 18:20:44 +00:00
reed@google.com
fdba4041c3
change all interfaces for SkRasterizer to const, in preparation for marking it
...
as immutable/re-entrant safe.
Review URL: https://codereview.appspot.com/6936064
git-svn-id: http://skia.googlecode.com/svn/trunk@6878 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-12-18 16:57:03 +00:00
reed@google.com
548a1f3210
change all patheffect methods to const, in preparation for marking its
...
subclasses as immutable/re-entrant safe.
Review URL: https://codereview.appspot.com/6949071
git-svn-id: http://skia.googlecode.com/svn/trunk@6877 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-12-18 16:12:09 +00:00
skia.committer@gmail.com
7a03d86a3d
Sanitizing source files in Skia_Periodic_House_Keeping
...
git-svn-id: http://skia.googlecode.com/svn/trunk@6872 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-12-18 02:03:03 +00:00
reed@google.com
57850b9dad
we do not correctly handle inner-style in blurmaskfilter w/ the 9patch
...
trick, so don't use it (until we fix it).
extend blurrect gm to test all 4 blurstyles
Review URL: https://codereview.appspot.com/6940075
git-svn-id: http://skia.googlecode.com/svn/trunk@6864 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-12-17 21:20:53 +00:00
reed@google.com
bada64428a
Make all colorfilter methods const, in preparation for declaring them
...
to be immutable and reentrant-safe
git-svn-id: http://skia.googlecode.com/svn/trunk@6856 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-12-17 20:21:44 +00:00
reed@google.com
30da745bbf
Mark all methods on SkXfermode as const, in preparation for declaring all
...
xfermodes as immutable/reentrant-safe
Review URL: https://codereview.appspot.com/6941065
git-svn-id: http://skia.googlecode.com/svn/trunk@6855 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-12-17 19:55:24 +00:00
robertphillips@google.com
6d87557278
3on/3off dashing optimization
...
https://codereview.appspot.com/6891046/
git-svn-id: http://skia.googlecode.com/svn/trunk@6851 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-12-17 18:56:29 +00:00
fmalita@google.com
6b18d2471f
Limit the maximum number of dash segments per path
...
https://crbug.com/165432
In order to avoid trivial out-of-memory exploits, cap path dashing at 1000000 segments per path.
R=reed@google.com
BUG=
Review URL: https://codereview.appspot.com/6948063
git-svn-id: http://skia.googlecode.com/svn/trunk@6845 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-12-17 16:27:34 +00:00
skia.committer@gmail.com
a7aedfec9e
Sanitizing source files in Skia_Periodic_House_Keeping
...
git-svn-id: http://skia.googlecode.com/svn/trunk@6829 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-12-15 02:03:10 +00:00
robertphillips@google.com
441a005810
Fix r6808 fix & some compiler warnings
...
https://codereview.appspot.com/6948047/
git-svn-id: http://skia.googlecode.com/svn/trunk@6820 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-12-14 13:55:06 +00:00
reed@google.com
a641f3f18e
reland 6798 w/ fix for bitmap-as-mask pixel-locking
...
git-svn-id: http://skia.googlecode.com/svn/trunk@6806 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-12-13 22:16:30 +00:00
reed@google.com
135e16cd8e
revert 6798 (assert in GM)
...
git-svn-id: http://skia.googlecode.com/svn/trunk@6802 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-12-13 21:53:41 +00:00
reed@google.com
1adcf8859c
Goal: ensure we always balance lock/unlock pixels calls.
...
A big caller of lockPixels is setContext in the bitmapshader.
This change replaces beginSession/endSession with adding endContext(), and
adds debugging code to ensure that
1. setContext calls are never nested
2. endContext is always called after each setContext call.
Review URL: https://codereview.appspot.com/6937046
git-svn-id: http://skia.googlecode.com/svn/trunk@6798 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-12-13 21:39:56 +00:00
fmalita@google.com
bfa0401ab6
Use double precision when iterating in SkDashPathEffect::filterPath()
...
Extremely large path_length/dash_length ratios may cause us to loop
indefinitely otherwise.
R=reed@google.com
BUG=
Review URL: https://codereview.appspot.com/6926051
git-svn-id: http://skia.googlecode.com/svn/trunk@6773 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-12-12 22:13:58 +00:00
bsalomon@google.com
fb883bf804
Fix generation of random two point gradients for program unit test.
...
git-svn-id: http://skia.googlecode.com/svn/trunk@6751 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-12-11 15:32:04 +00:00
robertphillips@google.com
935ad02682
Add drawPoints dash bench
...
https://codereview.appspot.com/6866053/
git-svn-id: http://skia.googlecode.com/svn/trunk@6678 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-12-05 19:07:21 +00:00
senorblanco@chromium.org
4a9a612b52
Pull SkMergeImageFilter out into its own file.
...
Review URL: https://codereview.appspot.com/6873052
git-svn-id: http://skia.googlecode.com/svn/trunk@6662 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-12-04 14:18:50 +00:00
robertphillips@google.com
93f0332418
Fixed remaining clang compiler warnings
...
https://codereview.appspot.com/6865053/
git-svn-id: http://skia.googlecode.com/svn/trunk@6646 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-12-03 17:35:19 +00:00
senorblanco@chromium.org
528952b5af
Clean up some Windows compiler warnings.
...
Review URL: https://codereview.appspot.com/6844111
git-svn-id: http://skia.googlecode.com/svn/trunk@6628 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-11-29 22:39:10 +00:00
senorblanco@chromium.org
0cb6e5355b
Turn on the separable blur (release the hounds!). This will require rebaselines of the following Skia tests: tilemodes, texteffects, shadows, drawlooper, drawbitmaprect, circles, blurrect_grad, blurrect, blurs, drawbitmapmatrix (max. pixel change in 8888 is 5).
...
NOTE: This will require adding SK_DISABLE_SEPARABLE_MASK_BLUR to skia.gyp on the next roll into Chrome, until the Chrome rebaselines are done.
Review URL: https://codereview.appspot.com/6845111
git-svn-id: http://skia.googlecode.com/svn/trunk@6606 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-11-29 19:00:22 +00:00
senorblanco@chromium.org
91f489a65d
Modify the blur bench to add tests for high-quality blurs, and large non-integer blurs. Change the Coarse flag (which just turns on separable blurs) to an #ifdef, since separable is no longer just Coarse. (This #ifdef will hopefully be shortlived, once Chrome has switched).
...
The separable blur algorithm gives +45% on SampleBlur, +84% on SampleBigBlur, +31% on TheVerge, +35 to +85% on blurbench in HQ (depending on size), +8 to +35% in low quality. (All of these on 32bit MacPro).
Review URL: https://codereview.appspot.com/6851117
git-svn-id: http://skia.googlecode.com/svn/trunk@6601 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-11-29 17:09:27 +00:00
robertphillips@google.com
629ab54066
Added dashing fast path
...
https://codereview.appspot.com/6844067/
git-svn-id: http://skia.googlecode.com/svn/trunk@6585 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-11-28 17:18:11 +00:00
senorblanco@chromium.org
9b0d4d79f0
Implement radius interpolation for separable blur. Unroll both separable implementations, which yields up to 2X perf improvement.
...
Review URL: https://codereview.appspot.com/6850088
git-svn-id: http://skia.googlecode.com/svn/trunk@6576 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-11-27 22:57:41 +00:00
reed@google.com
d198a5b8a7
don't leak *every* src mask in the ninepatch case. doh.
...
git-svn-id: http://skia.googlecode.com/svn/trunk@6560 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-11-27 15:18:04 +00:00
reed@google.com
971aca7557
change SkDrawFilter::filter to return a bool, where false means don't-draw
...
Review URL: https://codereview.appspot.com/6851111
git-svn-id: http://skia.googlecode.com/svn/trunk@6551 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-11-26 20:26:54 +00:00
reed@google.com
f276fa74f5
limit the rects width/height as well as its coords, when avoiding too-large
...
rects for blur special-case.
Review URL: https://codereview.appspot.com/6850084
git-svn-id: http://skia.googlecode.com/svn/trunk@6523 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-11-21 14:14:10 +00:00
senorblanco@chromium.org
336b4da6b0
Separable mask blurs: Add compile-time flag. Fix reversed offsets in asymmetrical blurs (this bug cancels itself out, but I thought it might be confusing for future readers). Use correct stride in asymmetrical blurs (this is a real bug).
...
Review URL: https://codereview.appspot.com/6782089
git-svn-id: http://skia.googlecode.com/svn/trunk@6508 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-11-20 17:09:40 +00:00
skia.committer@gmail.com
3458716b52
Sanitizing source files in Skia_Periodic_House_Keeping
...
git-svn-id: http://skia.googlecode.com/svn/trunk@6500 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-11-20 02:01:23 +00:00
reed@google.com
07784a0419
skip very large rects (for now) until we can pre-clip them to avoid floating
...
point precision errors.
git-svn-id: http://skia.googlecode.com/svn/trunk@6497 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-11-19 21:09:14 +00:00
reed@google.com
dab9b4fe03
use SkPath::isNestedRects() to apply blurred nine-patch
...
Review URL: https://codereview.appspot.com/6855063
git-svn-id: http://skia.googlecode.com/svn/trunk@6483 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-11-19 16:45:14 +00:00
senorblanco@chromium.org
1542354487
Revert r6469, "Turn on separable blur."
...
git-svn-id: http://skia.googlecode.com/svn/trunk@6474 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-11-17 15:08:29 +00:00
senorblanco@chromium.org
2c48c5eefc
Turn on separable blur.
...
git-svn-id: http://skia.googlecode.com/svn/trunk@6469 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-11-16 19:26:22 +00:00
senorblanco@chromium.org
c438130964
Separable blur: subpixel blurring. We approximate intermediate values of blur for even kernel sizes by using a kernel of size N offset to the left in the first pass, a kernel of size N offset to the right in the second pass, and a centered kernel of size N + 1 in the third pass. This required adding support for asymmetrical radii to the box blur.
...
Since this can only be done in the 3-pass blur for separable blurs, we turn off the optimization that drops to low quality for blurs of < 3 pixels.
Review URL: https://codereview.appspot.com/6843072
git-svn-id: http://skia.googlecode.com/svn/trunk@6464 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-11-16 17:22:33 +00:00
skia.committer@gmail.com
884e60be30
Sanitizing source files in Skia_Periodic_House_Keeping
...
git-svn-id: http://skia.googlecode.com/svn/trunk@6447 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-11-16 02:01:17 +00:00
senorblanco@chromium.org
908276b396
Reorder the separable blur passes into XXX/YYY, with an image transpose on the last pass of each group. This results in continuguous memory reads in all passes, giving a 22% speedup on theverge.skp over the previous separable implementation, and a 30%-50% improvement over the existing implementation (depending on platform).
...
Review URL: https://codereview.appspot.com/6851053
git-svn-id: http://skia.googlecode.com/svn/trunk@6445 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-11-15 20:27:35 +00:00
senorblanco@chromium.org
72fac3533e
Build fix. Unreviewed.
...
git-svn-id: http://skia.googlecode.com/svn/trunk@6406 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-11-13 20:41:43 +00:00
senorblanco@chromium.org
71f0f34f7d
A new implementation of mask blurs, using separable X/Y passes. Disabled for now.
...
Review URL: https://codereview.appspot.com/6826086
git-svn-id: http://skia.googlecode.com/svn/trunk@6404 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-11-13 20:35:21 +00:00
skia.committer@gmail.com
453995e01d
Sanitizing source files in Skia_Periodic_House_Keeping
...
git-svn-id: http://skia.googlecode.com/svn/trunk@6376 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-11-10 02:01:26 +00:00
reed@google.com
d729b3e504
add entry-point to SkMaskFilter to fast-path rectangles.
...
have blurmaskfilter override this new method.
#define SK_IGNORE_FAST_BLURRECT if you want to disable this (not sure if we'll need this)
Review URL: https://codereview.appspot.com/6815087
git-svn-id: http://skia.googlecode.com/svn/trunk@6363 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-11-09 14:30:48 +00:00
robertphillips@google.com
91c2f07990
Fix for Chrome mac_gpu compiler failure
...
unreviewed
git-svn-id: http://skia.googlecode.com/svn/trunk@6343 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-11-08 00:38:22 +00:00
caryclark@google.com
8f0a7b8e73
Add temporary interfaces in blur and clip to
...
permit testing if it is to our advantage
to selectively disable soft clipping and
high quality blurs during animations.
Review URL: https://codereview.appspot.com/6812092
git-svn-id: http://skia.googlecode.com/svn/trunk@6328 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-11-07 14:54:49 +00:00
senorblanco@chromium.org
9daf96afb3
Break out SkOffsetImageFilter into its own file, and derive it from
...
SkSingleInputImageFilter, to make it DAG-friendly.
Review URL: https://codereview.appspot.com/6822086
git-svn-id: http://skia.googlecode.com/svn/trunk@6315 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-11-06 20:29:39 +00:00
bsalomon@google.com
dbe49f7354
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
2012-11-05 16:36:02 +00:00
robertphillips@google.com
4187a2fc71
Attempt to patch Chrome compiler failures
...
git-svn-id: http://skia.googlecode.com/svn/trunk@6289 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-11-05 01:31:44 +00:00
bsalomon@google.com
17fc651dbe
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
2012-11-02 21:45:01 +00:00
bsalomon@google.com
b4a55b7b68
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
2012-11-02 20:45:37 +00:00
skia.committer@gmail.com
760f2d95dd
Sanitizing source files in Skia_Periodic_House_Keeping
...
git-svn-id: http://skia.googlecode.com/svn/trunk@6258 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-11-02 02:01:24 +00:00
bsalomon@google.com
b9086a0268
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
2012-11-01 18:02:54 +00:00
bsalomon@google.com
8171288341
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
2012-11-01 17:12:34 +00:00
bsalomon@google.com
d8b5faca04
Reland r6233 with fix.
...
git-svn-id: http://skia.googlecode.com/svn/trunk@6241 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-11-01 17:02:46 +00:00
bsalomon@google.com
115b06f3d5
Re-revert r6233.
...
git-svn-id: http://skia.googlecode.com/svn/trunk@6239 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-11-01 15:47:55 +00:00
bsalomon@google.com
c3a58f345d
Reland r6233 with fix for config conversion texture matrices.
...
git-svn-id: http://skia.googlecode.com/svn/trunk@6238 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-11-01 15:40:47 +00:00
bsalomon@google.com
66e534da8e
Revert r6233 while investigating bot failures.
...
git-svn-id: http://skia.googlecode.com/svn/trunk@6235 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-11-01 14:02:43 +00:00
bsalomon@google.com
ce49e16d3b
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
2012-11-01 13:50:50 +00:00
bsalomon@google.com
f94b3a4ceb
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
2012-10-31 18:09:01 +00:00
skia.committer@gmail.com
e862d16162
Sanitizing source files in Skia_Periodic_House_Keeping
...
git-svn-id: http://skia.googlecode.com/svn/trunk@6210 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-10-31 02:01:18 +00:00
bsalomon@google.com
175fe75654
Upstreaming changes from gpu_dev to trunk.
...
git-svn-id: http://skia.googlecode.com/svn/trunk@6207 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-10-30 20:17:54 +00:00
bsalomon@google.com
a21ad18618
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
2012-10-30 15:50:22 +00:00
bsalomon@google.com
4b2e1c8807
Rebase gpu_dev up to r5182
...
git-svn-id: http://skia.googlecode.com/svn/branches/gpu_dev@6187 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-10-29 20:13:42 +00:00
bsalomon@google.com
2eaaefd7e6
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
2012-10-29 19:51:22 +00:00
senorblanco@chromium.org
7b734e0843
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
2012-10-29 19:47:06 +00:00
bsalomon@google.com
ae5ef113eb
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
2012-10-29 14:53:53 +00:00
bsalomon@google.com
47d7a8885b
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
2012-10-29 12:47:51 +00:00
bsalomon@google.com
f78df33efc
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
2012-10-29 12:43:38 +00:00
bsalomon@google.com
ee2ef02d3d
Rebaseline gpu_dev from trunk at r6159.
...
git-svn-id: http://skia.googlecode.com/svn/branches/gpu_dev@6160 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-10-26 21:14:10 +00:00
senorblanco@chromium.org
cd9f55989e
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
2012-10-26 19:37:00 +00:00
bsalomon@google.com
22a800a257
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
2012-10-26 19:16:46 +00:00
bsalomon@google.com
2d0baded0f
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
2012-10-26 19:01:17 +00:00
bsalomon@google.com
28a15fb8d6
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
2012-10-26 17:53:18 +00:00
bsalomon@google.com
08283afc26
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
2012-10-26 13:01:20 +00:00
bsalomon@google.com
0707c29413
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
2012-10-25 21:45:42 +00:00
bsalomon@google.com
46fba0d793
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
2012-10-25 21:42:05 +00:00
bsalomon@google.com
396e61fe44
Rename GrProgramStageFactory to GrBackendEffectFactory.
...
Review URL: https://codereview.appspot.com/6773044
git-svn-id: http://skia.googlecode.com/svn/trunk@6125 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-10-25 19:00:29 +00:00
bsalomon@google.com
422e81aeb1
GrGLProgramStage Renaming Part 3
...
s/GLProgramStage/GLEffect
minor whitespace/spelling fixup
R=robertphillips@google.com
Review URL: https://codereview.appspot.com/6767054
git-svn-id: http://skia.googlecode.com/svn/trunk@6095 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-10-25 14:11:03 +00:00
bsalomon@google.com
aa60093d00
GrGLProgramStage Renaming Part 2
...
s/GrGLLegacyProgramStage/GrGLLegacyEffect
Review URL: https://codereview.appspot.com/6761056
git-svn-id: http://skia.googlecode.com/svn/trunk@6091 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-10-25 13:29:20 +00:00
bsalomon@google.com
d698f77c13
GrGLProgramStage Renaming Part 1.
...
Renamed cpp and h
s/GrGLProgramStage/GrGLEffect/
Review URL: https://codereview.appspot.com/6759054
git-svn-id: http://skia.googlecode.com/svn/trunk@6090 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-10-25 13:22:00 +00:00
bsalomon@google.com
021fc736f8
GrCustomStage Renaming Part 5
...
Stuff found by searching for "stage".
R=robertphillips@google.com
Review URL: https://codereview.appspot.com/6772043
git-svn-id: http://skia.googlecode.com/svn/trunk@6089 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-10-25 12:47:42 +00:00
bsalomon@google.com
8ea78d83dc
GrCustomStage Renaming Part 4
...
Rename a bunch of things found by searching for "custom".
Review URL: https://codereview.appspot.com/6765048
git-svn-id: http://skia.googlecode.com/svn/trunk@6085 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-10-24 20:11:30 +00:00
bsalomon@google.com
f271cc7183
GrCustomStage Renaming Part 3
...
Rename all things *CUSTOM_STAGE*, customStage*, and other miscellany
R=robertphillips@google.com
Review URL: https://codereview.appspot.com/6769048
git-svn-id: http://skia.googlecode.com/svn/trunk@6081 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-10-24 19:35:13 +00:00
bsalomon@google.com
6f261bed02
GrCustomStage Renaming Part 2
...
GrSamplerState member rename
GrCustomStageUnitTest rename
some comment updates
Review URL: https://codereview.appspot.com/6771043
git-svn-id: http://skia.googlecode.com/svn/trunk@6078 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-10-24 19:07:10 +00:00
bsalomon@google.com
a469c28c3c
CustomStage Renaming Part 1
...
Search and replace:
GrCustomStage->GrEffect
GrCustomStageTestFactory->GrEffectTestFactory
renamed the cpp/h files from customStage->effect
reordered gypi, #includes, forward decls to maintain alphabetical sort.
manually fixed up some whitespace and linewraps
deleted a commented out #include
R=robertphillips@google.com
Review URL: https://codereview.appspot.com/6758046
git-svn-id: http://skia.googlecode.com/svn/trunk@6076 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-10-24 18:28:34 +00:00
senorblanco@chromium.org
985fa79141
Protect filter_texture() against render target change.
...
Fix blend filters when input textures are "sloppy" (approx scratch texture match)
Add a new test case to gm/imagefiltersgraph, and reduce its size.
NOTE: this will require new baselines for the imagefiltersgraph GM.
BUG=950
Review URL: https://codereview.appspot.com/6769043
git-svn-id: http://skia.googlecode.com/svn/trunk@6073 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-10-24 15:14:26 +00:00
bsalomon@google.com
374e75956e
Combine the emit functions in GrGLProgramStage.
...
R=robertphillips@google.com
Review URL: https://codereview.appspot.com/6741064
git-svn-id: http://skia.googlecode.com/svn/trunk@6057 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-10-23 17:30:45 +00:00
bsalomon@google.com
706f66831a
Reland r6330 thru r6333 but do without enabling GL_ARB_fragment_coord_conventions on Intel GPUs.
...
git-svn-id: http://skia.googlecode.com/svn/trunk@6048 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-10-23 14:53:55 +00:00
bsalomon@google.com
d3353646c3
Revert r6330 thru 6333 while we figure out what to do about Intel bots (possible driver bug).
...
git-svn-id: http://skia.googlecode.com/svn/trunk@6037 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-10-22 20:36:53 +00:00
bsalomon@google.com
159d42b546
Remove two params from GrGLProgramStage::setData that are no longer necessary.
...
R=senorblanco@chromium.org
Review URL: https://codereview.appspot.com/6744062
git-svn-id: http://skia.googlecode.com/svn/trunk@6031 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-10-22 17:47:22 +00:00
bsalomon@google.com
4fe9b1b740
Automatically handle converting gl_FragCoord to Skia's y-down device coords.
...
NOTE: THIS WILL LIKELY REQUIRE GM REBASELINING.
R=robertphillips@google.com ,senorblanco@chromium.org
Review URL: https://codereview.appspot.com/6744061
git-svn-id: http://skia.googlecode.com/svn/trunk@6030 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-10-22 17:40:14 +00:00
senorblanco@chromium.org
c2e8cef479
Remove use of varargs in SkImageFilter. This is causing a crash in recent
...
builds of clang. (It was also masking the fact that SkMergeImageFilter was
calling the wrong constructor!)
Review URL: https://codereview.appspot.com/6709066
git-svn-id: http://skia.googlecode.com/svn/trunk@6029 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-10-22 15:07:14 +00:00
skia.committer@gmail.com
989a95ea77
Sanitizing source files in Skia_Periodic_House_Keeping
...
git-svn-id: http://skia.googlecode.com/svn/trunk@5989 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-10-18 02:01:23 +00:00
bsalomon@google.com
b2ad101313
Make table color filter use asNewCustomStage.
...
R=robertphillips@google.com
Review URL: https://codereview.appspot.com/6713051
git-svn-id: http://skia.googlecode.com/svn/trunk@5976 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-10-17 15:00:32 +00:00
bsalomon@google.com
67e78c9e47
Use GrCustomStage to implement color matrix.
...
R=robertphillips@google.com
Review URL: https://codereview.appspot.com/6716044
git-svn-id: http://skia.googlecode.com/svn/trunk@5975 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-10-17 13:36:14 +00:00
skia.committer@gmail.com
20c301bd1a
Sanitizing source files in Skia_Periodic_House_Keeping
...
git-svn-id: http://skia.googlecode.com/svn/trunk@5972 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-10-17 02:01:13 +00:00
bsalomon@google.com
dfdb7e5240
Reland r5963 with two fixes:
...
Missing ref in GrSweepGradient::TestCreate.
Must reset() the sampler in setup_drawstate_aaclip() to avoid hitting a (dubious) assert.
git-svn-id: http://skia.googlecode.com/svn/trunk@5964 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-10-16 15:19:45 +00:00
bsalomon@google.com
f6eac8af58
Revert r5962 because of failures.
...
git-svn-id: http://skia.googlecode.com/svn/trunk@5963 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-10-16 14:31:26 +00:00
bsalomon@google.com
b022177777
Require matrix for custom stage to be set when custom stage is installed.
...
Review URL: https://codereview.appspot.com/6696044
git-svn-id: http://skia.googlecode.com/svn/trunk@5962 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-10-16 14:16:11 +00:00