AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
5,285 Commits 1 Branch 0 Tags 544 MiB
f78df33efc
Commit Graph

5285 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
caryclark@google.com
f839c0359c shape ops work in progress 
git-svn-id: http://skia.googlecode.com/svn/trunk@6159 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-10-26 21:03:50 +00:00
bungeman@google.com
0c5f3762e8 Fix generateMask to properly apply pre-blend. 
git-svn-id: http://skia.googlecode.com/svn/trunk@6158 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-10-26 20:48:54 +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
bungeman@google.com
a76de72a60 Clean up usage of mask gamma. 
https://codereview.appspot.com/6749061/


git-svn-id: http://skia.googlecode.com/svn/trunk@6151 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-10-26 19:35:54 +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
4d3f8b40e3 Merging trunk revs up to 6147 into gpu_dev. 
git-svn-id: http://skia.googlecode.com/svn/branches/gpu_dev@6149 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-10-26 19:14:16 +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
epoger@google.com
de96163a80 object-ify gmmain.cpp (no functional change) to ease planned changes later 
Review URL: https://codereview.appspot.com/6801043

git-svn-id: http://skia.googlecode.com/svn/trunk@6147 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-10-26 18:56:36 +00:00
borenet@google.com
a4615521e5 Whitespace change to trigger bots 
git-svn-id: http://skia.googlecode.com/svn/trunk@6144 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-10-26 18:03:09 +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
djsollen@google.com
ebce16d21b Refactor gm to minimize wasted passes through picture and pipe code paths. 
Testing this CL shows around a 40% time reduction when running gm on a mac debug build.

Review URL: https://codereview.appspot.com/6791043

git-svn-id: http://skia.googlecode.com/svn/trunk@6140 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-10-26 14:07:13 +00:00
bsalomon@google.com
c96982f806 Create a branch for continued GPU development during Chrome branching. 
git-svn-id: http://skia.googlecode.com/svn/branches/gpu_dev@6139 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-10-26 13:44:54 +00:00
bsalomon@google.com
1322134a3a Update comment in GrDrawState.h to reflect renaming changes and expansion of the scope of effects. 
Review URL: https://codereview.appspot.com/6777059

git-svn-id: http://skia.googlecode.com/svn/trunk@6138 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-10-26 13:41:59 +00:00
borenet@google.com
070d354d51 Make output path to render_pictures optional 
Review URL: https://codereview.appspot.com/6779049

git-svn-id: http://skia.googlecode.com/svn/trunk@6136 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-10-26 13:26:55 +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
skia.committer@gmail.com
27b40e9f36 Sanitizing source files in Skia_Periodic_House_Keeping 
git-svn-id: http://skia.googlecode.com/svn/trunk@6133 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-10-26 02:01:24 +00:00
bsalomon@google.com
c196b522d0 Misc stage->effect renaming 
R=robertphillips@google.com
Review URL: https://codereview.appspot.com/6787043

git-svn-id: http://skia.googlecode.com/svn/trunk@6132 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-10-25 21:52:43 +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
scroggo@google.com
0e36310919 Fix WIN64 break from variable redefinition. 
Review URL: https://codereview.appspot.com/6782047

git-svn-id: http://skia.googlecode.com/svn/trunk@6129 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-10-25 19:57:06 +00:00
bsalomon@google.com
b7f9a86b2d Fix self assignment in GrGLShaderVar 
R=robertphillips@google.com
Review URL: https://codereview.appspot.com/6776048

git-svn-id: http://skia.googlecode.com/svn/trunk@6127 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-10-25 19:35:05 +00:00
scroggo@google.com
93897637bc Add a callback to cleanup TLS data on Windows. 
Add a test to ensure that it works.

BUG: http://code.google.com/p/skia/issues/detail?id=939

Review URL: https://codereview.appspot.com/6785045

git-svn-id: http://skia.googlecode.com/svn/trunk@6126 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-10-25 19:12:40 +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
08afc843c0 Files accidentally omitted from r6123. 
git-svn-id: http://skia.googlecode.com/svn/trunk@6124 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-10-25 18:56:10 +00:00
bsalomon@google.com
16e3ddea6a Platform/Engine -> Backend 
createPlatform -> wrapBackend

R=robertphillips@google.com
Review URL: https://codereview.appspot.com/6785044

git-svn-id: http://skia.googlecode.com/svn/trunk@6123 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-10-25 18:43:28 +00:00
reed@google.com
b5a5a9dc75 don't send % by itself to printf 
git-svn-id: http://skia.googlecode.com/svn/trunk@6120 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-10-25 17:58:23 +00:00
reed@google.com
b03fe429e8 use subclasses instead of function-ptrs for hairline specializations. 
1. enables easy grouping of procs, e.g. cap -vs- line
2. easy to extend for more shared state (e.g. gamma table, etc.)



git-svn-id: http://skia.googlecode.com/svn/trunk@6119 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-10-25 17:37:03 +00:00
reed@google.com
1ca015bd59 add bench for hairlines 
git-svn-id: http://skia.googlecode.com/svn/trunk@6118 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-10-25 17:32:10 +00:00
reed@google.com
49a5b1967a add MACRO macros to help with concat. Stolen from gpu headers 
git-svn-id: http://skia.googlecode.com/svn/trunk@6117 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-10-25 17:31:39 +00:00
epoger@google.com
6714ea4e4d gyp: generate "everything" and "most" targets instead of "all" 
"make all" at the toplevel now chains to "make everything"

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

git-svn-id: http://skia.googlecode.com/svn/trunk@6116 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-10-25 16:32:07 +00:00
epoger@google.com
f28dd8ab10 clarify code/comments in gmmain.cpp (no functional change) 
Review URL: https://codereview.appspot.com/6749067

git-svn-id: http://skia.googlecode.com/svn/trunk@6115 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-10-25 16:27:34 +00:00
bungeman@google.com
1bdb857768 Remove SK_DISABLE_EXTRACTSUBSET_OPAQUE_FIX test since it has been rebaselined. 
https://codereview.appspot.com/6778044/


git-svn-id: http://skia.googlecode.com/svn/trunk@6111 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-10-25 15:48:17 +00:00
bsalomon@google.com
5fa2107842 Fix decl of gl_FragCoord in GLSL versions <= 1.20. 
We we're saying "in" instead of "varying".
Review URL: https://codereview.appspot.com/6779043

git-svn-id: http://skia.googlecode.com/svn/trunk@6104 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-10-25 14:57:46 +00:00
robertphillips@google.com
831c726f83 Correctly set width & height in filtered SkPictures 
https://codereview.appspot.com/6772047/



git-svn-id: http://skia.googlecode.com/svn/trunk@6103 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-10-25 14:45:08 +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
borenet@google.com
2ad1d6189f Whitespace change to trigger bot 
git-svn-id: http://skia.googlecode.com/svn/trunk@6092 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-10-25 13:59:14 +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
skia.committer@gmail.com
8b0e2340e1 Sanitizing source files in Skia_Periodic_House_Keeping 
git-svn-id: http://skia.googlecode.com/svn/trunk@6088 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-10-25 02:01:20 +00:00
reed@google.com
a8790debaa If a path is known to be nonfinite, don't forget that in our autobounds 
helper. "Once a non-finite, always a non-finite".

Inspired by crbug/157157
Review URL: https://codereview.appspot.com/6764047

git-svn-id: http://skia.googlecode.com/svn/trunk@6087 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-10-24 21:04:04 +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
robertphillips@google.com
63f1127a70 Make filter tool actually filter the read in SkPicture 
https://codereview.appspot.com/6765046/



git-svn-id: http://skia.googlecode.com/svn/trunk@6080 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-10-24 19:30:41 +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
bsalomon@google.com
96182216f1 Pass the GrCustomStage and key to GrGLProgramStage emitCode. 
The key computation may encode some analysis that emitCode may be able to skip by examining the key.
Review URL: https://codereview.appspot.com/6709075

git-svn-id: http://skia.googlecode.com/svn/trunk@6075 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-10-24 17:34:46 +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