Commit Graph

914 Commits

Author SHA1 Message Date
scroggo
b66365f5dd Updates to the unix sample app.
Rather than placing pixels, use XPutImage to place the bitmap on screen.

Modify the color arrangements for 8888 when building the sample app, so
they agree with X.

Add a title to simple sample.

Include SkTouchGesture.



git-svn-id: http://skia.googlecode.com/svn/trunk@963 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-03-18 21:43:03 +00:00
reed@google.com
3f0dcf96c3 fix scalar math to work with float and fixed
git-svn-id: http://skia.googlecode.com/svn/trunk@962 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-03-18 21:23:45 +00:00
reed@google.com
c31a9d6d39 fix warnings of int->float and double->float
git-svn-id: http://skia.googlecode.com/svn/trunk@961 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-03-18 20:53:44 +00:00
twiz@google.com
b65e0cb8ad Remove the compile-time selection of the GL implementation based on the
GR_SUPPORT_GLDESKTOP family of macros.  

Support for the platform is configured dynamically, by querying the
fBindingsExported member of active GrGLInterface instance.

Review: http://codereview.appspot.com/4298048/ 



git-svn-id: http://skia.googlecode.com/svn/trunk@960 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-03-18 20:41:44 +00:00
twiz@google.com
0f31ca79bd This CL removes all dependencies on GL headers across all of Ganesh. New
GrGLint, etc. types are introduced, and new GR_GL_XXXX constants for use at all
GL call-sites.

Review:  http://codereview.appspot.com/4272061/



git-svn-id: http://skia.googlecode.com/svn/trunk@959 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-03-18 17:38:11 +00:00
bsalomon@google.com
098611bd74 Revert GR_STATIC_RECT_VB in GrGLConfig_chrome.h
Review URL: http://codereview.appspot.com/4282057/


git-svn-id: http://skia.googlecode.com/svn/trunk@958 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-03-18 15:10:06 +00:00
reed@google.com
4b0f0b2758 fix warnings (local storage too small, int->scalar)
git-svn-id: http://skia.googlecode.com/svn/trunk@957 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-03-18 14:47:36 +00:00
reed@google.com
97fa34c5f0 change operator== to return bool instead of int
update dox formating



git-svn-id: http://skia.googlecode.com/svn/trunk@956 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-03-18 14:44:42 +00:00
bsalomon@google.com
c8ad63e5e4 Initial GYP file for skia / gr. Builds SampleApp on Mac, Windows, Linux.
Review URL: http://codereview.appspot.com/4282056/

git-svn-id: http://skia.googlecode.com/svn/trunk@955 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-03-18 14:29:44 +00:00
mike@reedtribe.org
2f834592b1 use SkSafeUnref()
git-svn-id: http://skia.googlecode.com/svn/trunk@954 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-03-18 10:33:47 +00:00
reed@google.com
2ade0863c3 abort drawing if srcRect is outside of the bitmap bounds
git-svn-id: http://skia.googlecode.com/svn/trunk@951 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-03-17 17:48:04 +00:00
twiz@google.com
6ecc33d794 Addition of missing file in Visual Studio sample app project file.
Regression introduced by revision:  http://code.google.com/p/skia/source/detail?r=946

Review:  http://codereview.appspot.com/4274065



git-svn-id: http://skia.googlecode.com/svn/trunk@950 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-03-17 04:14:52 +00:00
bsalomon@google.com
0078079b20 Make chrome use the static square vb when drawing rects.
Review URL: http://codereview.appspot.com/4280053/



git-svn-id: http://skia.googlecode.com/svn/trunk@949 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-03-16 20:10:48 +00:00
reed@google.com
9d07fec374 update dox for setLooper()
update some { } styles



git-svn-id: http://skia.googlecode.com/svn/trunk@948 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-03-16 20:02:59 +00:00
bsalomon@google.com
b52bb9b2cb Remove dependence on glew for creating SkOSWindow_Win's GL ctx.
Review URL: http://codereview.appspot.com/4276053/

git-svn-id: http://skia.googlecode.com/svn/trunk@947 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-03-16 12:52:03 +00:00
reed@google.com
52f57e1d11 add fling
git-svn-id: http://skia.googlecode.com/svn/trunk@946 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-03-16 12:10:02 +00:00
ctguil@chromium.org
109a2e3afa Add SK_API to SkCreateTypefaceFromLOGFONT.
Review URL: http://codereview.appspot.com/4273062

git-svn-id: http://skia.googlecode.com/svn/trunk@945 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-03-16 00:31:36 +00:00
ctguil@chromium.org
7ffb1b21ab Add code needed to build skia as a windows dll within the chromium project.
- Export/import skia APIs if SKIA_DLL is defined.
- This change has no effect on skia.

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

git-svn-id: http://skia.googlecode.com/svn/trunk@944 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-03-15 21:27:08 +00:00
reed@google.com
f67e4cf4c1 add filterTextFlags() to SkDevice (virtual) to allow device subclasses to
filter what text features we try to use. The filtering allows for implementation
limitations to dictate when we turn off certain text features.



git-svn-id: http://skia.googlecode.com/svn/trunk@943 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-03-15 20:56:58 +00:00
reed@google.com
759c16e20d need a separate texture for each maskformat in atlasmgr
git-svn-id: http://skia.googlecode.com/svn/trunk@942 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-03-15 19:15:15 +00:00
bsalomon@google.com
080773ca79 Add blend constant color and use it for lcd text common case (no fancy blend or shaded text)
Review URL: http://codereview.appspot.com/4274057/

git-svn-id: http://skia.googlecode.com/svn/trunk@941 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-03-15 19:09:25 +00:00
twiz@google.com
dc008e1710 Correction of GLES build issue introduced by in revision:
http://code.google.com/p/skia/source/detail?r=937

Issue: http://code.google.com/p/skia/issues/detail?id=174
Review: http://codereview.appspot.com/4288047/ 



git-svn-id: http://skia.googlecode.com/svn/trunk@940 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-03-15 16:12:21 +00:00
reed@google.com
98539c607b support lcd16 in text atlas (sans shader support)
git-svn-id: http://skia.googlecode.com/svn/trunk@939 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-03-15 15:40:16 +00:00
scroggo
b7e9aee1ac Add a sample application that runs on unix.
git-svn-id: http://skia.googlecode.com/svn/trunk@938 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-03-15 15:15:15 +00:00
twiz@google.com
59a190bcab Implementation of a GL-virtualization layer for Skia. This allows for
environments using skia to specify a GL implementation at run-time, instead of
relying on the linker to pull in the appropriate GL impl.

A new structure, GrGLInterface is exposed.  This struct contains a set of
function pointers that should point to an appropriate GL implementation.

This change also removes the reliance on GLew on windows builds.

Review: http://codereview.appspot.com/4254059/



git-svn-id: http://skia.googlecode.com/svn/trunk@937 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-03-14 21:23:01 +00:00
djsollen@google.com
cd9d69b9ce Upstreaming changes from android.
- fix compile warnings in the GPU code
- upstream android specific code (ifdef protected)
- fail gracefully when a custom allocator fails



git-svn-id: http://skia.googlecode.com/svn/trunk@936 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-03-14 20:30:14 +00:00
reed@google.com
260db92d49 trim 3-byte column at start and end of freetype bitmap
git-svn-id: http://skia.googlecode.com/svn/trunk@935 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-03-14 18:09:32 +00:00
reed@google.com
8abde0a15d disable lcd format for lcd16 as well
git-svn-id: http://skia.googlecode.com/svn/trunk@934 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-03-14 17:45:33 +00:00
twiz@google.com
06c3b6bfd5 Correction of Windows SampleApp build break introduced by r925.
(http://code.google.com/p/skia/source/detail?r=925)

Issue: http://codereview.appspot.com/4286053/



git-svn-id: http://skia.googlecode.com/svn/trunk@933 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-03-14 16:58:39 +00:00
reed@google.com
ea2333de1e add LCD16 copy routine
git-svn-id: http://skia.googlecode.com/svn/trunk@932 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-03-14 16:44:56 +00:00
reed@google.com
6016962f72 use system font path when building on the mac
git-svn-id: http://skia.googlecode.com/svn/trunk@931 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-03-14 15:08:44 +00:00
reed@google.com
8a5d692c03 work around linker-error when building on the Mac
git-svn-id: http://skia.googlecode.com/svn/trunk@930 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-03-14 15:08:03 +00:00
reed@google.com
65dd8f8310 Don't use LCD16 if SK_SUPPORT_LCDTEXT is defined (for compatibility)
git-svn-id: http://skia.googlecode.com/svn/trunk@928 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-03-14 13:31:16 +00:00
reed@google.com
ed8c4d186d rebaseline shadows on gpu
git-svn-id: http://skia.googlecode.com/svn/trunk@927 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-03-14 13:20:04 +00:00
reed@google.com
e31241cfe3 undo recent addition of kLCD16_Format to FormatIsLCD()
git-svn-id: http://skia.googlecode.com/svn/trunk@926 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-03-11 20:09:42 +00:00
reed@google.com
f0b5f68807 add tristate toggle 'l' for lcd text drawing
git-svn-id: http://skia.googlecode.com/svn/trunk@925 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-03-11 20:08:25 +00:00
junov@google.com
a639891117 Fixes shadow colors with alpha value smaller that one. Results were too transparent.
code review: codereview.appspot.com/4267052
skia bug: 170



git-svn-id: http://skia.googlecode.com/svn/trunk@924 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-03-11 16:45:00 +00:00
reed@google.com
ac6b97972d support lcd16 mask format
convert line-endings to unix style (the default for skia)



git-svn-id: http://skia.googlecode.com/svn/trunk@923 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-03-11 15:42:51 +00:00
vandebo@chromium.org
f77e27deb9 Use Type3 fonts for platforms that don't yet support SkFontHost::GetAdvancedTypefaceMetrics.
Review URL: http://codereview.appspot.com/4273041

git-svn-id: http://skia.googlecode.com/svn/trunk@922 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-03-10 22:50:28 +00:00
reed@google.com
5ba2d5b187 Fix warnings of SkScalar -> int conversions, by using SkScalarRound()
git-svn-id: http://skia.googlecode.com/svn/trunk@921 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-03-10 19:40:34 +00:00
reed@google.com
8bd4c7964f add kLCD16_Format to the list in FormatIsLCD()
git-svn-id: http://skia.googlecode.com/svn/trunk@920 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-03-10 19:25:22 +00:00
bsalomon@google.com
807cec4397 Add complex clip gm sample and cleanup unused headers/code in SampleComplexClip
git-svn-id: http://skia.googlecode.com/svn/trunk@919 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-03-10 19:20:15 +00:00
bsalomon@google.com
498a623e2e Remove offscreen GL support from SampleApp and SkOSWindow. This never worked anywhere but Mac and it doesn't work there anymore.
git-svn-id: http://skia.googlecode.com/svn/trunk@918 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-03-10 18:24:15 +00:00
reed@google.com
f88d6765a5 check-point for kLCD16_Format mask support
disabled for now in SkPaint.cpp (for further testing)



git-svn-id: http://skia.googlecode.com/svn/trunk@917 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-03-10 15:06:27 +00:00
bsalomon@google.com
649a862186 Remove "true ||" in conditional that was accidentally checked in.
git-svn-id: http://skia.googlecode.com/svn/trunk@916 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-03-10 14:53:38 +00:00
bsalomon@google.com
1da0746fa1 Delete GL tex ID when last of GrGLTexture or GrGLRenderTarget that reference it is destroyed
git-svn-id: http://skia.googlecode.com/svn/trunk@915 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-03-10 14:51:57 +00:00
bsalomon@google.com
a7f84e150c Make flush discardable and lazily reset context
Review URL: http://codereview.appspot.com/4259059/



git-svn-id: http://skia.googlecode.com/svn/trunk@914 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-03-10 14:13:19 +00:00
reed@google.com
63a6060fcd add realloc() to SkAutoSMalloc, plus some documentation
git-svn-id: http://skia.googlecode.com/svn/trunk@913 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-03-10 13:07:35 +00:00
twiz@google.com
316338a4eb Correction of the non-portable use of dynamically allocated stack arrays in the
pdf shader code.

I briefly looked into making use of alloca, but that is also non-portable, and
deprecated in many environments.  Fell back to the SkTDArray class as a common
denominator.

This problem was introduce by the following CL:
http://codereview.appspot.com/4239061/



git-svn-id: http://skia.googlecode.com/svn/trunk@912 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-03-09 23:14:04 +00:00
reed@google.com
ee467ee79d Correct blitmask procs to recognize that we pass them an SkColor, and if they
want a SkPMColor, they need to call SkPreMultiplyColor()

Add Opaque and Black optimizations for blitmask_d32



git-svn-id: http://skia.googlecode.com/svn/trunk@911 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-03-09 13:23:57 +00:00