AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
3,664 Commits 1 Branch 0 Tags 544 MiB
ac2c666e27
Commit Graph

3664 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
robertphillips@google.com
ac2c666e27 Rolling back r4049 
git-svn-id: http://skia.googlecode.com/svn/trunk@4051 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-05-25 12:46:55 +00:00
robertphillips@google.com
57f0b62b52 Whitespace change - could not reproduce r4049's Debug Android failure locally 
git-svn-id: http://skia.googlecode.com/svn/trunk@4050 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-05-25 12:26:30 +00:00
robertphillips@google.com
837576bf89 Altered GrDrawState to always ref textures and render target 
http://codereview.appspot.com/6251049/



git-svn-id: http://skia.googlecode.com/svn/trunk@4049 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-05-25 11:45:40 +00:00
reed@google.com
fd4be26c42 Change patheffect to take a (new) StrokeRec object, which encapsulates the fill 
or stroke parameters for a path.

Today, the patheffect only sees if the caller was going to stroke or fill, and
if stroke, it just sees the width. With this change, the effect can see all of the
related parameters (e.g. cap/join/miter). No other change is intended at this
time.

After this change, I hope to use this additional data to allow SkDashPathEffect
to, at times, apply the stroke as part of its effect, which may be much more
efficient than first dashing, and then reading that and stroking it.

Most of these files changed just because of the new parameter to filterPath. The
key changes are in SkPathEffect.[h,cpp], SkPaint.cpp and SkScalerContext.cpp
Review URL: https://codereview.appspot.com/6250051

git-svn-id: http://skia.googlecode.com/svn/trunk@4048 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-05-25 01:04:12 +00:00
reed@google.com
d3521f1a8d revert 4046 -- GM:pathfill failed on one bot, maybe uninitialized memory somewhere? 
git-svn-id: http://skia.googlecode.com/svn/trunk@4047 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-05-24 20:32:22 +00:00
reed@google.com
9797272edf Change patheffect to take a (new) StrokeRec object, which encapsulates the fill 
or stroke parameters for a path.

Today, the patheffect only sees if the caller was going to stroke or fill, and if
stroke, it just sees the width. With this change, the effect can see all of the
related parameters (e.g. cap/join/miter). No other change is intended at this
time.

After this change, I hope to use this additional data to allow SkDashPathEffect
to, at times, apply the stroke as part of its effect, which may be much more
efficient than first dashing, and then reading that and stroking it.

Most of these files changed just because of the new parameter to filterPath. The
key changes are in SkPathEffect.[h,cpp], SkPaint.cpp and SkScalerContext.cpp
Review URL: https://codereview.appspot.com/6249050

git-svn-id: http://skia.googlecode.com/svn/trunk@4046 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-05-24 20:13:57 +00:00
tomhudson@google.com
5259814305 Move swizzle & modulation computation, non-virtual functions onto 
GrGLShaderBuilder. This lets us access all the default computations
when there's no GrCustomStage specified, and means that GrGLProgramStage
is effectively an interface class, all of whose functions can/should
be overriden.

http://codereview.appspot.com/6242051/



git-svn-id: http://skia.googlecode.com/svn/trunk@4045 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-05-24 17:44:30 +00:00
reed@google.com
3fd979874c add baselines for macpro 
git-svn-id: http://skia.googlecode.com/svn/trunk@4044 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-05-24 16:28:11 +00:00
reed@google.com
434d467e92 add baselines for macpro 
git-svn-id: http://skia.googlecode.com/svn/trunk@4043 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-05-24 16:25:13 +00:00
reed@google.com
7f40631b72 add baselines for macpro 
git-svn-id: http://skia.googlecode.com/svn/trunk@4042 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-05-24 16:22:53 +00:00
reed@google.com
444335fd1f add baselines for macpro 
git-svn-id: http://skia.googlecode.com/svn/trunk@4041 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-05-24 15:15:04 +00:00
tomhudson@google.com
6a820b652e First stage of reworking custom shader infrastructure to allow 
radial mappings.

http://codereview.appspot.com/6239043/



git-svn-id: http://skia.googlecode.com/svn/trunk@4040 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-05-24 15:10:14 +00:00
bsalomon@google.com
8137fcfa7d Fix some EOLs, mark files with the LF property. 
Review URL: http://codereview.appspot.com/6230046/




git-svn-id: http://skia.googlecode.com/svn/trunk@4039 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-05-24 12:43:36 +00:00
robertphillips@google.com
8a4fc40b02 Updated useSWOnlyPath method to use path chain instead of raw path renderer methods 
http://codereview.appspot.com/6211083/



git-svn-id: http://skia.googlecode.com/svn/trunk@4038 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-05-24 12:42:24 +00:00
caryclark@google.com
65f9f0a166 shape ops work in progress (get rid of some warnings) 
git-svn-id: http://skia.googlecode.com/svn/trunk@4037 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-05-23 18:09:25 +00:00
robertphillips@google.com
72176b2d38 Removed SoftwarePathRenderer from GrContext's path renderer chain 
http://codereview.appspot.com/6221065/



git-svn-id: http://skia.googlecode.com/svn/trunk@4036 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-05-23 13:19:12 +00:00
robertphillips@google.com
87baf8985a "fix" for r4034 issues 
git-svn-id: http://skia.googlecode.com/svn/trunk@4035 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-05-23 12:02:21 +00:00
robertphillips@google.com
49d9fd5fdb Plumbing to propagate save & restore from SkCanvas down to GrContext & lower 
http://codereview.appspot.com/6203067/



git-svn-id: http://skia.googlecode.com/svn/trunk@4034 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-05-23 11:44:08 +00:00
caryclark@google.com
af46cff4ee shape ops work in progress 
git-svn-id: http://skia.googlecode.com/svn/trunk@4033 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-05-22 21:12:00 +00:00
robertphillips@google.com
2c75681e36 Remove GrClipMaskManager's path renderer chain (in favor of GrContext's) 
http://codereview.appspot.com/6211078/



git-svn-id: http://skia.googlecode.com/svn/trunk@4032 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-05-22 20:28:23 +00:00
epoger@google.com
0f645b68a3 download_baselines.py : only set svn properties of files whose content has changed 
and while I was at it, sort the filenames before acting on them, to make the output easier to read

BUG=http://code.google.com/p/skia/issues/detail?id=618
Review URL: https://codereview.appspot.com/6223061

git-svn-id: http://skia.googlecode.com/svn/trunk@4031 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-05-22 19:14:01 +00:00
robertphillips@google.com
a3e5c63ab0 Minor tweaks to SW-only clip mask generation logic 
http://codereview.appspot.com/6218064/



git-svn-id: http://skia.googlecode.com/svn/trunk@4030 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-05-22 18:09:26 +00:00
caryclark@google.com
1577e8f9c5 shape ops work in progress 
git-svn-id: http://skia.googlecode.com/svn/trunk@4029 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-05-22 17:01:14 +00:00
bsalomon@google.com
bcc8486ad4 Commit comment change that was supposed to go into r4024 but wasn't because I forgot to save. 
git-svn-id: http://skia.googlecode.com/svn/trunk@4028 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-05-22 15:44:03 +00:00
epoger@google.com
46256ea736 Add to skdiff: test images for bitwise equality before testing for pixel-wise equality 
- we now check for bitwise equality of files before bothering with pixel 
  comparisons (this will help with formats for which we don't have good
  decoders, like PDF)
- unparsable files are now reported as differing, unless they are bitwise equal
  (before, they were always reported as matching!)
- "largest area mismatch" is now based on same-size image pairs only;
  previously, if any image pairs had mismatching size, it was 100%
- removed repetitive "image size mismatch, so no diff to display" messages
- changed format of leftmost table cells to be more readable

BUG=http://code.google.com/p/skia/issues/detail?id=473
Review URL: https://codereview.appspot.com/6208089

git-svn-id: http://skia.googlecode.com/svn/trunk@4027 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-05-22 13:45:35 +00:00
robertphillips@google.com
21ddae75b2 White space change 
git-svn-id: http://skia.googlecode.com/svn/trunk@4026 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-05-22 12:59:59 +00:00
robertphillips@google.com
67febd9506 Converted AAClips SampleApp slide to GM:simpleaaclip 
http://codereview.appspot.com/6220043/



git-svn-id: http://skia.googlecode.com/svn/trunk@4025 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-05-22 12:14:50 +00:00
bsalomon@google.com
f3fcbbea08 Kill GrGpuGL::fHWDrawState 
Review URL: http://codereview.appspot.com/6227048/




git-svn-id: http://skia.googlecode.com/svn/trunk@4024 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-05-21 22:15:46 +00:00
bsalomon@google.com
255fa16fac Changes accidentally omitted from 4022. 
git-svn-id: http://skia.googlecode.com/svn/trunk@4023 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-05-21 21:44:59 +00:00
bsalomon@google.com
8d49d93bb3 Stop Tracking const vertex attrib color and coverage using GrDrawState 
Review URL: http://codereview.appspot.com/6219056/




git-svn-id: http://skia.googlecode.com/svn/trunk@4022 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-05-21 21:40:12 +00:00
bsalomon@google.com
457b8a3b49 Stop using GrDrawState to track stencil state 
Review URL: http://codereview.appspot.com/6227047/



git-svn-id: http://skia.googlecode.com/svn/trunk@4021 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-05-21 21:19:58 +00:00
bsalomon@google.com
16fd21ba22 Rename GrProgramStageFactory::stageKey to GrProgramStageFactory::glStageKey since it is GL-specific 
Review URL: http://codereview.appspot.com/6218060/



git-svn-id: http://skia.googlecode.com/svn/trunk@4020 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-05-21 21:18:13 +00:00
bsalomon@google.com
289efe014a Tunnel name requests through factory, forcing custom effect and custom prog stage to use same impl 
Review URL: http://codereview.appspot.com/6220061/



git-svn-id: http://skia.googlecode.com/svn/trunk@4019 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-05-21 20:57:59 +00:00
bsalomon@google.com
469d0dd944 When GL context is reset set some desktop-only GL state to values that we assume later. 
Review URL: http://codereview.appspot.com/6222052/



git-svn-id: http://skia.googlecode.com/svn/trunk@4018 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-05-21 20:14:29 +00:00
reed@google.com
1f1db4cc5b update dox for NewFromMalloc() to clarify ownership 
git-svn-id: http://skia.googlecode.com/svn/trunk@4017 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-05-21 20:00:39 +00:00
bsalomon@google.com
bed9bd40f1 Rebaseline from r4015. Also set PNG mime type on recently added images that were marked octet-stream. 
git-svn-id: http://skia.googlecode.com/svn/trunk@4016 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-05-21 19:17:17 +00:00
bsalomon@google.com
4d5f3fe581 Use tristate in HW AA tracking, fix msaa disabled for non-smoothed lines bug 
Review URL: http://codereview.appspot.com/6222051/



git-svn-id: http://skia.googlecode.com/svn/trunk@4015 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-05-21 17:11:44 +00:00
reed@google.com
de1837bb96 remove bogus nearlyzero checks 
Review URL: https://codereview.appspot.com/6213060

git-svn-id: http://skia.googlecode.com/svn/trunk@4014 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-05-21 16:47:43 +00:00
bsalomon@google.com
c811ea3d3c Stop using GrDrawState to track bound textures and render target 
Review URL: http://codereview.appspot.com/6208086/



git-svn-id: http://skia.googlecode.com/svn/trunk@4013 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-05-21 15:33:09 +00:00
bsalomon@google.com
7c4d06de41 Make static const var that is only used in an assert be defined in the debug build only to suppress an unused var warning. 
git-svn-id: http://skia.googlecode.com/svn/trunk@4012 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-05-21 15:31:00 +00:00
reed@google.com
7b578928a5 ~glyphcache_globals needs to actually delete its cache 
git-svn-id: http://skia.googlecode.com/svn/trunk@4011 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-05-21 15:29:27 +00:00
reed@google.com
b6a4b7363f add 
git-svn-id: http://skia.googlecode.com/svn/trunk@4010 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-05-21 15:27:23 +00:00
bsalomon@google.com
978c8c61ba Stop using GrDrawState to track draw face, dither, and color mask 
Review URL: http://codereview.appspot.com/6215071/



git-svn-id: http://skia.googlecode.com/svn/trunk@4009 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-05-21 14:45:49 +00:00
bungeman@google.com
e9bbee397c Fix assignment of non-copyable. 
see http://connect.microsoft.com/VisualStudio/feedback/details/552586/inherting-noncopyable-base-allows-equal-sign-initialization


git-svn-id: http://skia.googlecode.com/svn/trunk@4008 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-05-21 13:46:13 +00:00
bsalomon@google.com
a4d8fc2473 Stop using GrDrawState to track GPU's blend state 
git-svn-id: http://skia.googlecode.com/svn/trunk@4007 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-05-21 13:21:46 +00:00
caryclark@google.com
b45a1b46ee shape ops work in progress 
git-svn-id: http://skia.googlecode.com/svn/trunk@4006 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-05-18 20:50:33 +00:00
epoger@google.com
a611c3ea53 Remove chromium mode from skdiff, because it is no longer actively used. 
Ran tools/tests/run.sh to validate this change.

TBR=caryclark1
Review URL: https://codereview.appspot.com/6222045

git-svn-id: http://skia.googlecode.com/svn/trunk@4005 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-05-18 20:10:06 +00:00
bsalomon@google.com
8e520fc249 fix build? 
git-svn-id: http://skia.googlecode.com/svn/trunk@4004 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-05-18 20:06:45 +00:00
bsalomon@google.com
ae4f96a9e0 Some refactoring of GrCustomStage and friends 
Review URL: http://codereview.appspot.com/6209071/



git-svn-id: http://skia.googlecode.com/svn/trunk@4003 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-05-18 19:54:48 +00:00
bungeman@google.com
e9678a21ed Fix obviously disallowed copy that Visual Studio allows. 
git-svn-id: http://skia.googlecode.com/svn/trunk@4002 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-05-18 19:12:21 +00:00