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

5308 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
bsalomon@google.com
175fe75654 Upstreaming changes from gpu_dev to trunk. 
git-svn-id: http://skia.googlecode.com/svn/trunk@6207 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-10-30 20:17:54 +00:00
junov@chromium.org
d4501a0aba Eliminating implicit conversion from enum to bool. Fixes compiler warning 
Review URL: https://codereview.appspot.com/6819053

git-svn-id: http://skia.googlecode.com/svn/trunk@6206 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-10-30 19:05:17 +00:00
epoger@google.com
41d0d2f905 comment-only: add "this may change" warning to SkChecksum.h 
Review URL: https://codereview.appspot.com/6810054

git-svn-id: http://skia.googlecode.com/svn/trunk@6205 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-10-30 17:33:09 +00:00
epoger@google.com
11b0dddd59 Revert r6051, re-adding json to DEPS file 
Review URL: https://codereview.appspot.com/6816059

git-svn-id: http://skia.googlecode.com/svn/trunk@6202 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-10-30 16:25:17 +00:00
bsalomon@google.com
a21ad18618 Remove unnecessary mul and assignment in gradient shaders. 
R=robertphillips@google.com
Review URL: https://codereview.appspot.com/6814056

git-svn-id: http://skia.googlecode.com/svn/trunk@6201 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-10-30 15:50:22 +00:00
robertphillips@google.com
b72e5d3138 Add GL texture validity check to GrGpuGL 
https://codereview.appspot.com/6817053/



git-svn-id: http://skia.googlecode.com/svn/trunk@6200 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-10-30 15:18:10 +00:00
senorblanco@chromium.org
5682f21f99 Simple rebaseline tool: Add support for ANGLE, DirectWrite builders. 
Set svn mime type to image/png.

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

git-svn-id: http://skia.googlecode.com/svn/trunk@6199 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-10-30 14:34:55 +00:00
reed@google.com
09a029b687 factor out computation for dy in SkEdge lines, so we can later try a fix. 
git-svn-id: http://skia.googlecode.com/svn/trunk@6198 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-10-30 14:28:03 +00:00
bungeman@google.com
4284388015 Fix cross compilation with mingw. 
Mingw is case sensitive, so use the correct capitaliztion of dwrite.h.
https://codereview.appspot.com/6588055

Props jacek.


git-svn-id: http://skia.googlecode.com/svn/trunk@6197 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-10-30 14:15:32 +00:00
bsalomon@google.com
17504f5d5e Expose vertex position to GrGLEffect via GrGLShaderBuilder. 
R=robertphillips@google.com
Review URL: https://codereview.appspot.com/6814054

git-svn-id: http://skia.googlecode.com/svn/branches/gpu_dev@6195 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-10-30 12:34:25 +00:00
bungeman@google.com
0c3b9cfeba Use consistent globals in AttachCache. 
https://codereview.appspot.com/6816052/


git-svn-id: http://skia.googlecode.com/svn/trunk@6188 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-10-29 20:16:30 +00:00
bsalomon@google.com
4b2e1c8807 Rebase gpu_dev up to r5182 
git-svn-id: http://skia.googlecode.com/svn/branches/gpu_dev@6187 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-10-29 20:13:42 +00:00
bsalomon@google.com
56315b979b Add file accidentally omitted from r6182. 
git-svn-id: http://skia.googlecode.com/svn/branches/gpu_dev@6186 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-10-29 20:02:06 +00:00
bsalomon@google.com
2eaaefd7e6 Pass GrCustomStage to key-generation functions and emitCode(). 
R=robertphillips@google.com
Review URL: https://codereview.appspot.com/6819046

git-svn-id: http://skia.googlecode.com/svn/branches/gpu_dev@6182 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-10-29 19:51:22 +00:00
senorblanco@chromium.org
7b734e0843 Fix alpha computation for specular lighting filter (GPU path). 
Change lighting GM background to show blending.

NOTE:  This will require new results for the lighting GM.

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

git-svn-id: http://skia.googlecode.com/svn/trunk@6181 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-10-29 19:47:06 +00:00
djsollen@google.com
42041e6de8 Allow default texture cache limit to be set within gyp. 
Review URL: https://codereview.appspot.com/6818051

git-svn-id: http://skia.googlecode.com/svn/trunk@6177 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-10-29 19:24:45 +00:00
epoger@google.com
82cb65ba18 Alphabetize gm options (in usage message and option parser). 
Also add long-form option names for all options.
Review URL: https://codereview.appspot.com/6817050

git-svn-id: http://skia.googlecode.com/svn/trunk@6173 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-10-29 18:59:17 +00:00
senorblanco@chromium.org
782f3b4230 First stab at a simple rebaseline script. 
Review URL: https://codereview.appspot.com/6775045

git-svn-id: http://skia.googlecode.com/svn/trunk@6170 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-10-29 18:06:26 +00:00
epoger@google.com
e8ebeb1f8f Add option to gm: write out images into a hierarchy, rather than a flat set of files 
BUG=https://code.google.com/p/skia/issues/detail?id=743
Review URL: https://codereview.appspot.com/6810047

git-svn-id: http://skia.googlecode.com/svn/trunk@6167 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-10-29 16:42:11 +00:00
bsalomon@google.com
484ee2a5fe Make GrEffectStage keep a const ptr (rather than non-const) to GrEffect. 
R=robertphillips@google.com
Review URL: https://codereview.appspot.com/6811045

git-svn-id: http://skia.googlecode.com/svn/branches/gpu_dev@6166 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-10-29 16:25:04 +00:00
bsalomon@google.com
ae5ef113eb Make lighting filters directly inherit from GrGLEffect. 
Delete GrGLLegacyEffect.
Review URL: https://codereview.appspot.com/6815050

git-svn-id: http://skia.googlecode.com/svn/branches/gpu_dev@6165 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-10-29 14:53:53 +00:00
bsalomon@google.com
47d7a8885b Make GrGLConvolutionEffect, GrGLMorphologyEffect, and GrGLMagnifierEffect derive directly from GrGLEffect. 
R=robertphillips@google.com
Review URL: https://codereview.appspot.com/6786052

git-svn-id: http://skia.googlecode.com/svn/branches/gpu_dev@6164 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-10-29 12:47:51 +00:00
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
skia.committer@gmail.com
549c93ef97 Sanitizing source files in Skia_Periodic_House_Keeping 
git-svn-id: http://skia.googlecode.com/svn/trunk@6161 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-10-27 02:01:15 +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