reed@google.com [Wed, 26 Jan 2011 20:32:23 +0000 (20:32 +0000)]
move into core for now, so we can build SkFontHost_FreeType.cpp
git-svn-id: http://skia.googlecode.com/svn/trunk@738
2bbb7eff-a529-9590-31e7-
b0007b416f81
reed@google.com [Wed, 26 Jan 2011 17:20:51 +0000 (17:20 +0000)]
work around framebuffer_blit confusion on linux -- better fix on the way
git-svn-id: http://skia.googlecode.com/svn/trunk@737
2bbb7eff-a529-9590-31e7-
b0007b416f81
reed@google.com [Wed, 26 Jan 2011 17:11:51 +0000 (17:11 +0000)]
fix linux gpu build (don't need egl.h)
-This line, and those below, will be ignored--
M trunk/gpu/include/GrGLConfig.h
git-svn-id: http://skia.googlecode.com/svn/trunk@736
2bbb7eff-a529-9590-31e7-
b0007b416f81
reed@google.com [Wed, 26 Jan 2011 15:18:33 +0000 (15:18 +0000)]
remove debugging code around gUseExt
git-svn-id: http://skia.googlecode.com/svn/trunk@735
2bbb7eff-a529-9590-31e7-
b0007b416f81
reed@google.com [Wed, 26 Jan 2011 04:55:57 +0000 (04:55 +0000)]
close quotes on #error
git-svn-id: http://skia.googlecode.com/svn/trunk@734
2bbb7eff-a529-9590-31e7-
b0007b416f81
reed@google.com [Wed, 26 Jan 2011 04:37:53 +0000 (04:37 +0000)]
fix mac build (don't need typedef struct foo foo)
git-svn-id: http://skia.googlecode.com/svn/trunk@733
2bbb7eff-a529-9590-31e7-
b0007b416f81
reed@google.com [Wed, 26 Jan 2011 01:44:18 +0000 (01:44 +0000)]
fix warnings, including using GrTCast<> to go from &Obj -> uint32_t*
git-svn-id: http://skia.googlecode.com/svn/trunk@732
2bbb7eff-a529-9590-31e7-
b0007b416f81
reed@google.com [Tue, 25 Jan 2011 23:50:57 +0000 (23:50 +0000)]
embed a refdict inside SkDevice
udate unittests to test refdict's destructor
git-svn-id: http://skia.googlecode.com/svn/trunk@731
2bbb7eff-a529-9590-31e7-
b0007b416f81
reed@google.com [Tue, 25 Jan 2011 23:36:05 +0000 (23:36 +0000)]
add refdict class, for holding a dictionary of reference-counted objects
-- experimental
git-svn-id: http://skia.googlecode.com/svn/trunk@730
2bbb7eff-a529-9590-31e7-
b0007b416f81
vandebo@chromium.org [Tue, 25 Jan 2011 22:06:29 +0000 (22:06 +0000)]
Update SkPDFDevice::drawPath signature to match SkDevice.
Review URL: http://codereview.appspot.com/4068044
git-svn-id: http://skia.googlecode.com/svn/trunk@729
2bbb7eff-a529-9590-31e7-
b0007b416f81
vandebo@chromium.org [Tue, 25 Jan 2011 21:01:34 +0000 (21:01 +0000)]
Add Truetype and Type 1 font embedding support
Sorry this is such a large CL. It was very exploratory for me to make this
work.
- Add an interface to SkFontHost to retrieve font information and provide NULL implementations on all platforms except Linux.
- Segment large Type 1 fonts into fonts with shared resources with 255 glyphs each.
- Convert the various Type 1 formats to the form PDF wants.
- Update font as we draw text instead of as part of the graphical state.
- Remove built-in font support, we can't really use it.
Other changes I can pull out to a separate CL if you like.
- Add SkTScopedPtr class.
- Fix double free of resources.
- Fix bug in resource unique-ifying code.
- Don't print anything for any empty clip path.
- Fix copy paste error - MiterLimit.
- Fix sign extension bug in SkPDFString
- Fix FlateTest rename that was missed on a previous commit.
Review URL: http://codereview.appspot.com/4082042
git-svn-id: http://skia.googlecode.com/svn/trunk@728
2bbb7eff-a529-9590-31e7-
b0007b416f81
reed@google.com [Tue, 25 Jan 2011 19:05:12 +0000 (19:05 +0000)]
fixes for some warnings:
- #if of something that was not defined
- explicit constructor call for baseclass in copy-constructor of subclass
http://code.google.com/p/skia/issues/detail?id=112
git-svn-id: http://skia.googlecode.com/svn/trunk@727
2bbb7eff-a529-9590-31e7-
b0007b416f81
bsalomon@google.com [Tue, 25 Jan 2011 18:43:06 +0000 (18:43 +0000)]
Add SampleShaderText to vs project.
git-svn-id: http://skia.googlecode.com/svn/trunk@726
2bbb7eff-a529-9590-31e7-
b0007b416f81
bsalomon@google.com [Tue, 25 Jan 2011 18:35:26 +0000 (18:35 +0000)]
Add shaded text sample and gm test.
git-svn-id: http://skia.googlecode.com/svn/trunk@725
2bbb7eff-a529-9590-31e7-
b0007b416f81
reed@google.com [Tue, 25 Jan 2011 15:24:55 +0000 (15:24 +0000)]
chrome always assumes BGRA for its textures
git-svn-id: http://skia.googlecode.com/svn/trunk@724
2bbb7eff-a529-9590-31e7-
b0007b416f81
reed@google.com [Tue, 25 Jan 2011 14:55:42 +0000 (14:55 +0000)]
fix comments for U8CPU and S16CPU
http://code.google.com/p/skia/issues/detail?id=113
git-svn-id: http://skia.googlecode.com/svn/trunk@723
2bbb7eff-a529-9590-31e7-
b0007b416f81
bsalomon@google.com [Mon, 24 Jan 2011 18:19:55 +0000 (18:19 +0000)]
Add GrGpuGLShaders2 to gr_files.mk
git-svn-id: http://skia.googlecode.com/svn/trunk@722
2bbb7eff-a529-9590-31e7-
b0007b416f81
bsalomon@google.com [Mon, 24 Jan 2011 17:41:47 +0000 (17:41 +0000)]
Increase number of stages from 1 to 2
Move GrTextContext from stage 0 to stage 1 so it doesn't conflict with GrPaint (allow textured text)
Switch to dynamically generated shaders
git-svn-id: http://skia.googlecode.com/svn/trunk@721
2bbb7eff-a529-9590-31e7-
b0007b416f81
reed@google.com [Fri, 21 Jan 2011 22:08:29 +0000 (22:08 +0000)]
make xfermode warning printf be debug-only
git-svn-id: http://skia.googlecode.com/svn/trunk@720
2bbb7eff-a529-9590-31e7-
b0007b416f81
reed@google.com [Fri, 21 Jan 2011 22:04:38 +0000 (22:04 +0000)]
fix release build
git-svn-id: http://skia.googlecode.com/svn/trunk@719
2bbb7eff-a529-9590-31e7-
b0007b416f81
bsalomon@google.com [Fri, 21 Jan 2011 21:03:59 +0000 (21:03 +0000)]
Rev the GrContext interface. Context has draw* functions that take a new GrPaint object. Removed many of the lower-level GrGpu function call-throughs on context.
Remove unused/unsupported point size (we don't draw non-hairline points using GL points).
Change current* getter functions to get* for consistency.
Fix bounds when drawing inverse-filled paths.
git-svn-id: http://skia.googlecode.com/svn/trunk@718
2bbb7eff-a529-9590-31e7-
b0007b416f81
bsalomon@google.com [Thu, 20 Jan 2011 14:13:13 +0000 (14:13 +0000)]
In GrMatrix's setScale, setSkew, & setTranslate check whether the values passed in make the matrix identity before setting the typemask.
git-svn-id: http://skia.googlecode.com/svn/trunk@717
2bbb7eff-a529-9590-31e7-
b0007b416f81
reed@google.com [Thu, 20 Jan 2011 02:18:00 +0000 (02:18 +0000)]
replace GR_GL(GetIntegerv with GR_GL_GetIntegerv to ensure that we zero-init
the var-arg (needed for chrome)
git-svn-id: http://skia.googlecode.com/svn/trunk@716
2bbb7eff-a529-9590-31e7-
b0007b416f81
reed@google.com [Wed, 19 Jan 2011 19:04:04 +0000 (19:04 +0000)]
update chrome-specific glconfig (should make versions of this for mac/win/linux)
git-svn-id: http://skia.googlecode.com/svn/trunk@715
2bbb7eff-a529-9590-31e7-
b0007b416f81
reed@google.com [Wed, 19 Jan 2011 17:35:08 +0000 (17:35 +0000)]
add experimental custom GL header for chrome
git-svn-id: http://skia.googlecode.com/svn/trunk@714
2bbb7eff-a529-9590-31e7-
b0007b416f81
bsalomon@google.com [Wed, 19 Jan 2011 17:19:40 +0000 (17:19 +0000)]
Cleanup including of GL headers and provide way to include custom headers, extension getter.
git-svn-id: http://skia.googlecode.com/svn/trunk@713
2bbb7eff-a529-9590-31e7-
b0007b416f81
reed@google.com [Wed, 19 Jan 2011 14:30:26 +0000 (14:30 +0000)]
fix fEntryCount when we purge a cache entry (bug caught by our validate())
git-svn-id: http://skia.googlecode.com/svn/trunk@712
2bbb7eff-a529-9590-31e7-
b0007b416f81
reed@google.com [Wed, 19 Jan 2011 13:19:27 +0000 (13:19 +0000)]
document new (temporary) build flags
git-svn-id: http://skia.googlecode.com/svn/trunk@711
2bbb7eff-a529-9590-31e7-
b0007b416f81
reed@google.com [Wed, 19 Jan 2011 13:15:36 +0000 (13:15 +0000)]
add compile flag GR_SKIP_2POINTRADIAL_PROGRAMS to ignore the 2point-radial
shader programs (for now), which have problematic on some GPUs
git-svn-id: http://skia.googlecode.com/svn/trunk@710
2bbb7eff-a529-9590-31e7-
b0007b416f81
reed@google.com [Tue, 18 Jan 2011 21:50:41 +0000 (21:50 +0000)]
add getter/setter for TextureCache, so that clients can make their budget
decisions at runtime or per-context, rather than just at compile-time. Leaving
in the default values as is.
git-svn-id: http://skia.googlecode.com/svn/trunk@709
2bbb7eff-a529-9590-31e7-
b0007b416f81
reed@google.com [Tue, 18 Jan 2011 21:32:14 +0000 (21:32 +0000)]
add GR_BUILD_CHROME for now. hopefully we can replace it with other,
non-chrome-specific refactoring to accomodate those differences.
git-svn-id: http://skia.googlecode.com/svn/trunk@708
2bbb7eff-a529-9590-31e7-
b0007b416f81
reed@google.com [Tue, 18 Jan 2011 21:05:42 +0000 (21:05 +0000)]
add new 2nd argument for rendertarget to SkGpuCanvas
git-svn-id: http://skia.googlecode.com/svn/trunk@707
2bbb7eff-a529-9590-31e7-
b0007b416f81
bsalomon@google.com [Tue, 18 Jan 2011 20:57:22 +0000 (20:57 +0000)]
Remove notion of default rendertarget. This doesn't map well to usage patterns outside sample app. Make binding between SkGpuDevice and a GrRenderTarget more explicit. Create method on GrContext to wrap the current target in the 3D API with a GrRenderTarget.
git-svn-id: http://skia.googlecode.com/svn/trunk@706
2bbb7eff-a529-9590-31e7-
b0007b416f81
reed@google.com [Tue, 18 Jan 2011 20:55:57 +0000 (20:55 +0000)]
detect empty/inverted rect before using autobounds helper (as with prev. rev.)
git-svn-id: http://skia.googlecode.com/svn/trunk@705
2bbb7eff-a529-9590-31e7-
b0007b416f81
reed@google.com [Tue, 18 Jan 2011 20:35:51 +0000 (20:35 +0000)]
don't use SkAutoPathBoundsUpdate until after we've checked for degenerate
dimensions, otherwise we might set the bounds, only to then abort and not
set any points.
Fixes assert if you call addRoundRect(r, 10, 10) when r is inverted
(i.e. r.fLeft > r.fRight)
git-svn-id: http://skia.googlecode.com/svn/trunk@704
2bbb7eff-a529-9590-31e7-
b0007b416f81
bsalomon@google.com [Tue, 18 Jan 2011 17:14:52 +0000 (17:14 +0000)]
Fix stencil format array.
git-svn-id: http://skia.googlecode.com/svn/trunk@703
2bbb7eff-a529-9590-31e7-
b0007b416f81
bsalomon@google.com [Tue, 18 Jan 2011 16:54:04 +0000 (16:54 +0000)]
Fix BGRA on ES Issue 109.
git-svn-id: http://skia.googlecode.com/svn/trunk@702
2bbb7eff-a529-9590-31e7-
b0007b416f81
bsalomon@google.com [Tue, 18 Jan 2011 15:30:57 +0000 (15:30 +0000)]
Fix vertex buffer size computation when deferred text is disabled. This change makes it consistent with recent changes to the vertex layout bitfield in Issue 106.
git-svn-id: http://skia.googlecode.com/svn/trunk@701
2bbb7eff-a529-9590-31e7-
b0007b416f81
reed@google.com [Mon, 17 Jan 2011 19:45:43 +0000 (19:45 +0000)]
add black, opaque, blend variants for text blits, to exercise different
special cases in blitmask
git-svn-id: http://skia.googlecode.com/svn/trunk@700
2bbb7eff-a529-9590-31e7-
b0007b416f81
reed@google.com [Mon, 17 Jan 2011 18:46:37 +0000 (18:46 +0000)]
add SK_DISABLE_DITHER_32BIT_GRADIENT flag. If defined, disables the newly added
dithering for 32bit linear gradients.
git-svn-id: http://skia.googlecode.com/svn/trunk@699
2bbb7eff-a529-9590-31e7-
b0007b416f81
reed@google.com [Mon, 17 Jan 2011 18:41:23 +0000 (18:41 +0000)]
enable sse2 source in makefile
git-svn-id: http://skia.googlecode.com/svn/trunk@698
2bbb7eff-a529-9590-31e7-
b0007b416f81
reed@google.com [Mon, 17 Jan 2011 18:37:43 +0000 (18:37 +0000)]
add SSE2 opt files to xcode
git-svn-id: http://skia.googlecode.com/svn/trunk@697
2bbb7eff-a529-9590-31e7-
b0007b416f81
bsalomon@google.com [Thu, 13 Jan 2011 21:28:12 +0000 (21:28 +0000)]
Use macro to call gl.
git-svn-id: http://skia.googlecode.com/svn/trunk@696
2bbb7eff-a529-9590-31e7-
b0007b416f81
reed@google.com [Thu, 13 Jan 2011 20:02:47 +0000 (20:02 +0000)]
Remove static from template specilizations (linux build complained)
git-svn-id: http://skia.googlecode.com/svn/trunk@695
2bbb7eff-a529-9590-31e7-
b0007b416f81
bsalomon@google.com [Thu, 13 Jan 2011 19:52:45 +0000 (19:52 +0000)]
Towards issue #106
Adds notion of texture multiple stages but currently just uses 1.
git-svn-id: http://skia.googlecode.com/svn/trunk@694
2bbb7eff-a529-9590-31e7-
b0007b416f81
reed@google.com [Thu, 13 Jan 2011 18:30:42 +0000 (18:30 +0000)]
If you #define SK_ALLOW_OVER_32K_BITMAPS, then skia will try to draw bitmaps
whose dimensions exceed 32K. In my testing, this is fine, but I'm coding this
as an opt-in feature for now, to allow for more testing before its enabled
by default.
git-svn-id: http://skia.googlecode.com/svn/trunk@693
2bbb7eff-a529-9590-31e7-
b0007b416f81
reed@google.com [Thu, 13 Jan 2011 16:33:36 +0000 (16:33 +0000)]
initialize SkGlyph::fMaskFormat to avoid valgrind warnings
rebaseline gradients now that we dither our 32bit src
git-svn-id: http://skia.googlecode.com/svn/trunk@692
2bbb7eff-a529-9590-31e7-
b0007b416f81
reed@google.com [Thu, 13 Jan 2011 16:22:35 +0000 (16:22 +0000)]
add dithering to 32bit linear gradients
git-svn-id: http://skia.googlecode.com/svn/trunk@691
2bbb7eff-a529-9590-31e7-
b0007b416f81
bsalomon@google.com [Wed, 12 Jan 2011 21:20:18 +0000 (21:20 +0000)]
Should be calculating alignment based on the vertex size.
git-svn-id: http://skia.googlecode.com/svn/trunk@690
2bbb7eff-a529-9590-31e7-
b0007b416f81
reed@google.com [Wed, 12 Jan 2011 18:14:28 +0000 (18:14 +0000)]
rename DrawState to DrState -- MS decided to #define DrawState, complicating
our (compiler) lives :(
git-svn-id: http://skia.googlecode.com/svn/trunk@689
2bbb7eff-a529-9590-31e7-
b0007b416f81
reed@google.com [Wed, 12 Jan 2011 17:14:53 +0000 (17:14 +0000)]
add helpers to initialize our var-int args before calling GL. Some drivers
assert that those are zero on input, even though they are logically
output-only parameters.
git-svn-id: http://skia.googlecode.com/svn/trunk@688
2bbb7eff-a529-9590-31e7-
b0007b416f81
reed@google.com [Wed, 12 Jan 2011 17:14:04 +0000 (17:14 +0000)]
fix refcount bug - as picture gets referenced by canvas when canvas is a
picture-recording canvas, so it can't live on the stack. Probably a bug:
nested pictures should probably ref some internal impl, so that callers can be
free to use the stack when they want to.
git-svn-id: http://skia.googlecode.com/svn/trunk@687
2bbb7eff-a529-9590-31e7-
b0007b416f81
reed@google.com [Tue, 11 Jan 2011 19:45:38 +0000 (19:45 +0000)]
git-svn-id: skia.googlecode.com/svn/trunk@685
2bbb7eff-a529-9590-31e7-
b0007b416f81
reed@google.com [Tue, 11 Jan 2011 18:59:23 +0000 (18:59 +0000)]
expose gpu-device-factory
use that factory in gpucanvas, rather than overriding createDevice
note: I think we now don't need the canvas parameter in device-factory
git-svn-id: http://skia.googlecode.com/svn/trunk@684
2bbb7eff-a529-9590-31e7-
b0007b416f81
reed@google.com [Tue, 11 Jan 2011 18:32:13 +0000 (18:32 +0000)]
add getter/setter for device-factory on canvas
git-svn-id: http://skia.googlecode.com/svn/trunk@683
2bbb7eff-a529-9590-31e7-
b0007b416f81
reed@google.com [Tue, 11 Jan 2011 15:53:52 +0000 (15:53 +0000)]
add port for Brew - untested
git-svn-id: http://skia.googlecode.com/svn/trunk@682
2bbb7eff-a529-9590-31e7-
b0007b416f81
reed@google.com [Mon, 10 Jan 2011 14:54:30 +0000 (14:54 +0000)]
use -O2 for release, -g for debug (so we can get symbols for gdb)
git-svn-id: http://skia.googlecode.com/svn/trunk@681
2bbb7eff-a529-9590-31e7-
b0007b416f81
reed@google.com [Mon, 10 Jan 2011 14:04:07 +0000 (14:04 +0000)]
init src either opaquely (e.g. white), or with a valid ctable index (e.g. 0)
git-svn-id: http://skia.googlecode.com/svn/trunk@680
2bbb7eff-a529-9590-31e7-
b0007b416f81
reed@google.com [Fri, 7 Jan 2011 15:34:36 +0000 (15:34 +0000)]
remove obsolete, unsupported sound files
git-svn-id: http://skia.googlecode.com/svn/trunk@679
2bbb7eff-a529-9590-31e7-
b0007b416f81
reed@google.com [Fri, 7 Jan 2011 15:00:44 +0000 (15:00 +0000)]
fix issue 99 -- unneeded assignment inside find_y
move find_y to right above its only caller (Spanerator)
reformat Spanerator methods to match coding style
git-svn-id: http://skia.googlecode.com/svn/trunk@678
2bbb7eff-a529-9590-31e7-
b0007b416f81
bsalomon@google.com [Wed, 5 Jan 2011 16:34:41 +0000 (16:34 +0000)]
Make SampleApp build on Win32 (still requires glew, this needs to be fixed)
In fbo test funciton set min filter to nearest (for systems that don't support rendering to level of a texture that isn't mip map complete.)
Add a lot more sample slides to the win32 build
Fix texture red/blue color swap on windows.
git-svn-id: http://skia.googlecode.com/svn/trunk@677
2bbb7eff-a529-9590-31e7-
b0007b416f81
reed@google.com [Wed, 5 Jan 2011 16:29:02 +0000 (16:29 +0000)]
update dox to reflect that the default colorspace is CGColorSpaceCreateDeviceRGB()
git-svn-id: http://skia.googlecode.com/svn/trunk@676
2bbb7eff-a529-9590-31e7-
b0007b416f81
reed@google.com [Wed, 5 Jan 2011 16:07:35 +0000 (16:07 +0000)]
revert to DeviceRGB colorspace by default, which was changed accidentially
in rev. 637
git-svn-id: http://skia.googlecode.com/svn/trunk@675
2bbb7eff-a529-9590-31e7-
b0007b416f81
reed@google.com [Wed, 5 Jan 2011 15:50:27 +0000 (15:50 +0000)]
add template macro to "safely" perform casts w/o breaking strict-aliasing
fix aliasing warnings
git-svn-id: http://skia.googlecode.com/svn/trunk@674
2bbb7eff-a529-9590-31e7-
b0007b416f81
reed@google.com [Wed, 5 Jan 2011 15:49:43 +0000 (15:49 +0000)]
rev. 637 changed the settings for premultiplied on the info parameter. This
change incorrectly assumed that all cases wanted premultipled-last, which was
incorrect.
Reverting to the previous values.
git-svn-id: http://skia.googlecode.com/svn/trunk@673
2bbb7eff-a529-9590-31e7-
b0007b416f81
reed@google.com [Tue, 4 Jan 2011 21:25:43 +0000 (21:25 +0000)]
fix for issue 93: need to rewind the shared stream each time openStream() is called
git-svn-id: http://skia.googlecode.com/svn/trunk@672
2bbb7eff-a529-9590-31e7-
b0007b416f81
reed@google.com [Tue, 4 Jan 2011 19:58:20 +0000 (19:58 +0000)]
fix build for scalar==fixed
git-svn-id: http://skia.googlecode.com/svn/trunk@671
2bbb7eff-a529-9590-31e7-
b0007b416f81
bsalomon@google.com [Tue, 4 Jan 2011 14:31:49 +0000 (14:31 +0000)]
Remove user-specific visual studio project files.
(Issue 71)
git-svn-id: http://skia.googlecode.com/svn/trunk@670
2bbb7eff-a529-9590-31e7-
b0007b416f81
reed@google.com [Tue, 4 Jan 2011 12:52:02 +0000 (12:52 +0000)]
fix uninitialized warning
git-svn-id: http://skia.googlecode.com/svn/trunk@669
2bbb7eff-a529-9590-31e7-
b0007b416f81
reed@android.com [Tue, 4 Jan 2011 01:29:52 +0000 (01:29 +0000)]
static inline eliminates multiple definitions (and makes it zero-cost, since
it will be inlined)
git-svn-id: http://skia.googlecode.com/svn/trunk@668
2bbb7eff-a529-9590-31e7-
b0007b416f81
reed@android.com [Mon, 3 Jan 2011 19:52:17 +0000 (19:52 +0000)]
make inline helper static, so it can be included from than one .cpp
git-svn-id: http://skia.googlecode.com/svn/trunk@667
2bbb7eff-a529-9590-31e7-
b0007b416f81
reed@android.com [Mon, 3 Jan 2011 13:48:50 +0000 (13:48 +0000)]
add colorspace option to SkBitmap -> CGImageRef utility (patch from nico)
git-svn-id: http://skia.googlecode.com/svn/trunk@666
2bbb7eff-a529-9590-31e7-
b0007b416f81
reed@android.com [Sat, 1 Jan 2011 16:06:43 +0000 (16:06 +0000)]
remove unneeded file (will be automatically generated)
git-svn-id: http://skia.googlecode.com/svn/trunk@665
2bbb7eff-a529-9590-31e7-
b0007b416f81
reed@google.com [Fri, 31 Dec 2010 18:11:59 +0000 (18:11 +0000)]
replace various png_[type]_NULL defines with just NULL
libpng 1.4 removed some of these from their headers :(
git-svn-id: http://skia.googlecode.com/svn/trunk@664
2bbb7eff-a529-9590-31e7-
b0007b416f81
bsalomon@google.com [Thu, 23 Dec 2010 20:59:40 +0000 (20:59 +0000)]
Fix bug where createTexture may bind a texture to GL without ever updating fHWState.fTexture (when texture is not bound to FBO).
Other minor changes:
Add commented out GL logging define to GrUserConfig
Remove dead GrGpuD3D9 file from xcode proj
git-svn-id: http://skia.googlecode.com/svn/trunk@663
2bbb7eff-a529-9590-31e7-
b0007b416f81
reed@google.com [Thu, 23 Dec 2010 20:34:08 +0000 (20:34 +0000)]
update copyright
git-svn-id: http://skia.googlecode.com/svn/trunk@662
2bbb7eff-a529-9590-31e7-
b0007b416f81
reed@google.com [Thu, 23 Dec 2010 20:20:51 +0000 (20:20 +0000)]
fix build for linux
partial impl for GPU on linux (need getProcAddress and SkEGLContext)
git-svn-id: http://skia.googlecode.com/svn/trunk@661
2bbb7eff-a529-9590-31e7-
b0007b416f81
reed@google.com [Thu, 23 Dec 2010 19:29:18 +0000 (19:29 +0000)]
add gpu to gm tool
add pass-through read/write pixels API to canvas
git-svn-id: http://skia.googlecode.com/svn/trunk@660
2bbb7eff-a529-9590-31e7-
b0007b416f81
bsalomon@google.com [Thu, 23 Dec 2010 16:53:57 +0000 (16:53 +0000)]
Stop using GrSamplerState to track the texture parameters for GL textures. It has become larger and now holds state that isn't tracked per-texture by GL. Also remove unused setSamplerStateImm from GrGpuGL
git-svn-id: http://skia.googlecode.com/svn/trunk@659
2bbb7eff-a529-9590-31e7-
b0007b416f81
reed@google.com [Thu, 23 Dec 2010 16:45:33 +0000 (16:45 +0000)]
update baselines to add 2point-radial gradients, and use gpu-friendly xfermode code
git-svn-id: http://skia.googlecode.com/svn/trunk@658
2bbb7eff-a529-9590-31e7-
b0007b416f81
reed@google.com [Thu, 23 Dec 2010 16:34:58 +0000 (16:34 +0000)]
require lpng12 for gm tool (since Mac encoder tweaks the results for colorspace "correction")
update baselines using png
git-svn-id: http://skia.googlecode.com/svn/trunk@657
2bbb7eff-a529-9590-31e7-
b0007b416f81
bsalomon@google.com [Thu, 23 Dec 2010 16:04:36 +0000 (16:04 +0000)]
Delete D3D9 gpu class. Was fixed-function only, had significant defeciencies around vertex array formats, and is hasn't been updated with respect to parent class changes (won't compile).
git-svn-id: http://skia.googlecode.com/svn/trunk@656
2bbb7eff-a529-9590-31e7-
b0007b416f81
reed@google.com [Thu, 23 Dec 2010 15:19:47 +0000 (15:19 +0000)]
merge in gpu changes to gradientshaders
git-svn-id: http://skia.googlecode.com/svn/trunk@655
2bbb7eff-a529-9590-31e7-
b0007b416f81
reed@google.com [Thu, 23 Dec 2010 15:12:59 +0000 (15:12 +0000)]
silence some of our startup spew
tie skia and gr's debug symbols together in the Makefile
git-svn-id: http://skia.googlecode.com/svn/trunk@654
2bbb7eff-a529-9590-31e7-
b0007b416f81
reed@google.com [Thu, 23 Dec 2010 15:00:45 +0000 (15:00 +0000)]
add gpu to the default makefile
move skia-gpu files into skia/src/gpu
git-svn-id: http://skia.googlecode.com/svn/trunk@653
2bbb7eff-a529-9590-31e7-
b0007b416f81
wjmaclean@chromium.org [Thu, 23 Dec 2010 14:23:25 +0000 (14:23 +0000)]
Fixing results of incorrect conflict resolution in r646.
git-svn-id: http://skia.googlecode.com/svn/trunk@652
2bbb7eff-a529-9590-31e7-
b0007b416f81
reed@google.com [Wed, 22 Dec 2010 22:16:59 +0000 (22:16 +0000)]
flush inorder drawtarget (i.e. flushText) before we purge the atlas/cache
git-svn-id: http://skia.googlecode.com/svn/trunk@651
2bbb7eff-a529-9590-31e7-
b0007b416f81
bsalomon@google.com [Wed, 22 Dec 2010 22:13:51 +0000 (22:13 +0000)]
Force bool StageDesc to be a byte so that our memcmp equality test will work. Fixes static assert failure in xcode release build.
git-svn-id: http://skia.googlecode.com/svn/trunk@650
2bbb7eff-a529-9590-31e7-
b0007b416f81
reed@google.com [Wed, 22 Dec 2010 21:39:39 +0000 (21:39 +0000)]
add gpu backend (not hooked up yet)
git-svn-id: http://skia.googlecode.com/svn/trunk@649
2bbb7eff-a529-9590-31e7-
b0007b416f81
reed@google.com [Wed, 22 Dec 2010 21:10:33 +0000 (21:10 +0000)]
remove obsolete test
git-svn-id: http://skia.googlecode.com/svn/trunk@648
2bbb7eff-a529-9590-31e7-
b0007b416f81
wjmaclean@chromium.org [Wed, 22 Dec 2010 17:43:58 +0000 (17:43 +0000)]
Fixed tab character.
git-svn-id: http://skia.googlecode.com/svn/trunk@647
2bbb7eff-a529-9590-31e7-
b0007b416f81
wjmaclean@chromium.org [Wed, 22 Dec 2010 17:43:54 +0000 (17:43 +0000)]
Security fixes re getSize().
git-svn-id: http://skia.googlecode.com/svn/trunk@646
2bbb7eff-a529-9590-31e7-
b0007b416f81
reed@google.com [Tue, 21 Dec 2010 16:26:39 +0000 (16:26 +0000)]
add for quick gl-offscreen context (so we can draw and then readpixels for GM)
git-svn-id: http://skia.googlecode.com/svn/trunk@645
2bbb7eff-a529-9590-31e7-
b0007b416f81
reed@google.com [Mon, 20 Dec 2010 21:10:29 +0000 (21:10 +0000)]
-d dir will write out a difference-bitmap for each compare that failes
git-svn-id: http://skia.googlecode.com/svn/trunk@644
2bbb7eff-a529-9590-31e7-
b0007b416f81
reed@google.com [Mon, 20 Dec 2010 20:53:13 +0000 (20:53 +0000)]
remove ZLIB include from SkUserConfig for how (doesn't work on mac sampleapp) but,
add it to Makefile if SKIA_PDF_SUPPORT is true
Use compile_assert (yea!)
git-svn-id: http://skia.googlecode.com/svn/trunk@643
2bbb7eff-a529-9590-31e7-
b0007b416f81
reed@google.com [Mon, 20 Dec 2010 19:46:07 +0000 (19:46 +0000)]
add option to write PDFs from gm
fix some compile warnings (reorder initializers, init local ptr)
git-svn-id: http://skia.googlecode.com/svn/trunk@642
2bbb7eff-a529-9590-31e7-
b0007b416f81
reed@google.com [Mon, 20 Dec 2010 18:48:46 +0000 (18:48 +0000)]
add SkFlate.cpp
git-svn-id: http://skia.googlecode.com/svn/trunk@641
2bbb7eff-a529-9590-31e7-
b0007b416f81
reed@android.com [Mon, 20 Dec 2010 18:34:17 +0000 (18:34 +0000)]
add
git-svn-id: http://skia.googlecode.com/svn/trunk@640
2bbb7eff-a529-9590-31e7-
b0007b416f81
reed@android.com [Mon, 20 Dec 2010 18:33:15 +0000 (18:33 +0000)]
add
git-svn-id: http://skia.googlecode.com/svn/trunk@639
2bbb7eff-a529-9590-31e7-
b0007b416f81
reed@android.com [Mon, 20 Dec 2010 18:32:39 +0000 (18:32 +0000)]
update for GPU backend
git-svn-id: http://skia.googlecode.com/svn/trunk@638
2bbb7eff-a529-9590-31e7-
b0007b416f81