Commit Graph

1942 Commits

Author SHA1 Message Date
senorblanco@chromium.org
aadd9f8b19 GPU-based blur cleanup. Clean up some issues raised in code review:
- convolveRect() is too low-level; made it private and exposed convolveInX() and
convolveInY() instead
- added GrAutoTextureEntry to automatically unlock a texture entry
- the clipping and bounder checks were returning false from
drawWithGPUMaskFilter(), causing the software blur to kick in; return true
instead
- the Windows build was giving a spurious warning about reading an uninitialized
variable; rearrange the code to fix it

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



git-svn-id: http://skia.googlecode.com/svn/trunk@1842 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-07-12 19:44:51 +00:00
tomhudson@google.com
333d6cb244 Remove a few old uses of SK_RESTRICT on references.
Conditionally #defines SK_RESTRICT to be __restrict on Win32;
this successfully compiles in VS2008.



git-svn-id: http://skia.googlecode.com/svn/trunk@1841 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-07-12 19:19:03 +00:00
senorblanco@chromium.org
adec446b75 Fix windows build (unreviewed).
git-svn-id: http://skia.googlecode.com/svn/trunk@1840 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-07-12 17:02:06 +00:00
senorblanco@chromium.org
b08ea1b680 Implement blur types for GPU-based Gaussian blur.
Implements the remaining blur types (inner, outer, solid) in the
GPU-based Gaussian blur.  They are implemented using a post-upsampling blending
pass.  Also includes some code cleanup and comments.

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



git-svn-id: http://skia.googlecode.com/svn/trunk@1839 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-07-12 16:54:59 +00:00
epoger@google.com
877cfe380d "make" script to enable command-line build on Windows
http://codereview.appspot.com/4685051/



git-svn-id: http://skia.googlecode.com/svn/trunk@1838 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-07-11 19:52:00 +00:00
reed@google.com
e74e28df11 pass correct value for black
git-svn-id: http://skia.googlecode.com/svn/trunk@1836 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-07-11 12:24:41 +00:00
reed@google.com
1501803e93 limit clip to fixed-point range, so our edges don't overflow
git-svn-id: http://skia.googlecode.com/svn/trunk@1835 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-07-11 12:21:30 +00:00
mike@reedtribe.org
991e5535fa add new baselines
git-svn-id: http://skia.googlecode.com/svn/trunk@1834 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-07-09 01:55:55 +00:00
mike@reedtribe.org
ea52f43907 rebaseline
git-svn-id: http://skia.googlecode.com/svn/trunk@1833 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-07-09 01:51:52 +00:00
reed@google.com
4de4d60a1b add sample for 2ptradial where we divide by zero
git-svn-id: http://skia.googlecode.com/svn/trunk@1832 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-07-08 20:12:55 +00:00
reed@google.com
dbccc88f84 be sure to allocate space for kDone_DrawOp before we write it (thanks Yang)
git-svn-id: http://skia.googlecode.com/svn/trunk@1831 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-07-08 18:53:39 +00:00
senorblanco@chromium.org
027de5f922 GPU-based Gaussian blur.
This is a first stab at implementing a GPU-based
Gaussian blur in Ganesh.  The convolution shader is implemented as a new
filtering mode.  There are several known issues:

- no support for blur types other than "normal"
- FBO truncation problem at high zoom values
- uses bilinear for upsampling instead of Mitchell

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



git-svn-id: http://skia.googlecode.com/svn/trunk@1830 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-07-08 18:03:33 +00:00
tomhudson@google.com
47e0a09052 Replace vsnprintf with vsnprintf_s; add code to reproduce issue to StringTest;
fix another Windows test failure.



git-svn-id: http://skia.googlecode.com/svn/trunk@1829 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-07-08 17:49:22 +00:00
bsalomon@google.com
cd9cfd7de3 Modulate color shader's alpha with paint alpha when setting up gpu paint (fixes SampleTinyBitmap)
Review URL: http://codereview.appspot.com/4648076/



git-svn-id: http://skia.googlecode.com/svn/trunk@1828 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-07-08 16:55:04 +00:00
bsalomon@google.com
ab9ec23b78 Add gm baselines for windows
Review URL: http://codereview.appspot.com/4635095/



git-svn-id: http://skia.googlecode.com/svn/trunk@1827 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-07-08 16:47:44 +00:00
bsalomon@google.com
583572252d little bit of gyp cleanup (fixes windows build of sktime_unix)
Review URL: http://codereview.appspot.com/4685045/



git-svn-id: http://skia.googlecode.com/svn/trunk@1826 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-07-08 16:10:53 +00:00
tomhudson@google.com
d6caf2eefd Replace reference parameter with pointer so that we can pass NULL
in SkDrawPaint::add(); check the pointer when it's used to avoid
dereferencing NULL.

Add title to Animator sample slide.



git-svn-id: http://skia.googlecode.com/svn/trunk@1825 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-07-08 14:41:12 +00:00
reed@google.com
895ce131de remove dead code
git-svn-id: http://skia.googlecode.com/svn/trunk@1824 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-07-07 20:04:22 +00:00
yangsu@google.com
033bee3106 Changed Bundler identifier to com.google in iOSSampleApp
git-svn-id: http://skia.googlecode.com/svn/trunk@1823 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-07-07 19:50:59 +00:00
yangsu@google.com
6eece45cf3 Fixed iOSSampleApp dependencies
git-svn-id: http://skia.googlecode.com/svn/trunk@1822 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-07-07 19:45:39 +00:00
yangsu@google.com
3c1b28db4d Deleted the #endif that's caused the compiler erro
git-svn-id: http://skia.googlecode.com/svn/trunk@1821 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-07-07 19:34:18 +00:00
yangsu@google.com
2e20c248f3 Updated iOSSampleApp and related files.
Removed include guard in SkTime_Unix.cpp, which the iOSSampleApp now uses.


git-svn-id: http://skia.googlecode.com/svn/trunk@1820 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-07-07 19:26:42 +00:00
reed@google.com
e6ea606fb9 re-enable SSE2 blitmask procs, only excluding if we're black (in which case
the protable version is still faster)



git-svn-id: http://skia.googlecode.com/svn/trunk@1819 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-07-07 19:12:50 +00:00
reed@google.com
5b69ddafa4 update macbook baselines
git-svn-id: http://skia.googlecode.com/svn/trunk@1818 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-07-07 17:39:48 +00:00
bsalomon@google.com
22c5deaf75 Fix div by zero in GPU degenerate radials (and add sample and gm baselines)
Review URL: http://codereview.appspot.com/4675062/


git-svn-id: http://skia.googlecode.com/svn/trunk@1817 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-07-07 14:38:03 +00:00
reed@google.com
2b75f4279a add asABlur() to maskfilters, so devices like gpu and pdf can query them.
git-svn-id: http://skia.googlecode.com/svn/trunk@1816 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-07-07 13:43:38 +00:00
reed@google.com
9c49bc3e64 Allow texture-backed bitmaps to perform a read-back when lockPixels is called.
This means we have to be even more cautious about when we call lock, and we should
always check getTexture() first if we can handle a texture directly, rather than
forcing the read-back to get the bits.



git-svn-id: http://skia.googlecode.com/svn/trunk@1815 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-07-07 13:42:37 +00:00
mike@reedtribe.org
63e5e34c4e be sure to call setupPaint, so we can respect the command-line args like alpha
git-svn-id: http://skia.googlecode.com/svn/trunk@1814 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-07-07 01:17:07 +00:00
mike@reedtribe.org
6757a1a2bb Be sure to call context->flush() before we swapbuffers, otherwise we might miss
some deferred drawing calls (esp. text). SkGpuCanvas was doing this for us, so
now we have to do it explicitly.



git-svn-id: http://skia.googlecode.com/svn/trunk@1813 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-07-07 01:10:34 +00:00
vandebo@chromium.org
2ef12d4bb5 [PDF] Add a concept of a substitute object to the SkPDFCatalog class.
Code by Arthur Hsu, original code review: http://codereview.appspot.com/4650060/

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

git-svn-id: http://skia.googlecode.com/svn/trunk@1812 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-07-06 23:31:24 +00:00
bsalomon@google.com
840e9f3776 make sure size change posts at sample app startup.
git-svn-id: http://skia.googlecode.com/svn/trunk@1811 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-07-06 21:59:09 +00:00
reed@google.com
2be9e8b407 ColorShaders report no bitmaps, but only a color_gradient, which we now detect
on the gpu side.



git-svn-id: http://skia.googlecode.com/svn/trunk@1810 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-07-06 21:18:09 +00:00
reed@google.com
f78e78da58 add option to test 1x1 bitmapshader
git-svn-id: http://skia.googlecode.com/svn/trunk@1809 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-07-06 21:01:29 +00:00
reed@google.com
cde92111d5 remove SkDeviceFactory from the collective consciousness, now that devices know
how to create compatible siblings.



git-svn-id: http://skia.googlecode.com/svn/trunk@1808 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-07-06 20:00:52 +00:00
bsalomon@google.com
1e257a5db3 Remove nested scope resolutions in GrGpuGLShaders and use enum counts for generating random values in unit test.
git-svn-id: http://skia.googlecode.com/svn/trunk@1807 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-07-06 19:52:16 +00:00
reed@google.com
45f9ce7a62 make the mac window resizeable again
git-svn-id: http://skia.googlecode.com/svn/trunk@1806 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-07-06 19:45:53 +00:00
reed@google.com
13636fe4b9 add debugging code for degenerate gradients (to be removed later)
git-svn-id: http://skia.googlecode.com/svn/trunk@1805 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-07-06 18:25:08 +00:00
reed@google.com
5f068f15cc notice if the bitmap failed to load
git-svn-id: http://skia.googlecode.com/svn/trunk@1804 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-07-06 18:16:00 +00:00
reed@google.com
a03c97943b fix typo:
this-make3DReady()

should be

this->make3DReady()



git-svn-id: http://skia.googlecode.com/svn/trunk@1803 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-07-06 18:01:20 +00:00
reed@google.com
29038ed2ab always use grcontext to get the bits to the screen
git-svn-id: http://skia.googlecode.com/svn/trunk@1802 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-07-06 17:56:47 +00:00
bsalomon@google.com
2c17fcdc45 Reduce gets of ext string and check validity of stencil format enums
Review URL: http://codereview.appspot.com/4678043/



git-svn-id: http://skia.googlecode.com/svn/trunk@1801 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-07-06 17:47:02 +00:00
bsalomon@google.com
25fd36c7ef Indexed drawing for paths with multiple contours
Review URL: http://codereview.appspot.com/4648071/



git-svn-id: http://skia.googlecode.com/svn/trunk@1800 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-07-06 17:41:08 +00:00
reed@google.com
57c8d833cd revert prev hack around make3DReady
git-svn-id: http://skia.googlecode.com/svn/trunk@1799 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-07-06 15:27:03 +00:00
reed@google.com
c157531aa2 force grcontext to be created at startup
git-svn-id: http://skia.googlecode.com/svn/trunk@1798 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-07-06 15:11:07 +00:00
reed@google.com
1b195bc8fd fix return value for make_bitmap
git-svn-id: http://skia.googlecode.com/svn/trunk@1797 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-07-06 15:10:25 +00:00
reed@google.com
3cec4d71e6 check-point for testing drawBitmap [raster,gpu] -> [raster,gpu]
git-svn-id: http://skia.googlecode.com/svn/trunk@1796 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-07-06 13:59:47 +00:00
reed@google.com
a3237875f8 suppress printfs
git-svn-id: http://skia.googlecode.com/svn/trunk@1795 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-07-05 19:20:48 +00:00
reed@google.com
65d8bb096a add SK_API to SkMatrix44
git-svn-id: http://skia.googlecode.com/svn/trunk@1794 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-07-05 19:12:59 +00:00
reed@google.com
3ef80cf14c suppress printfs
git-svn-id: http://skia.googlecode.com/svn/trunk@1793 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-07-05 19:09:47 +00:00
reed@google.com
37a201231b add SkEmptyShader, and return it from CreateBitmapShader if the bitmap is empty
(i.e. has no pixels at all)



git-svn-id: http://skia.googlecode.com/svn/trunk@1792 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-07-05 18:54:12 +00:00