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

203 Commits

Author SHA1 Message Date
caryclark@google.com
cf6285b89b fix warnings on Mac in src/gpu and include/gpu 
Fix these class of warnings:
- unused functions
- unused locals
- sign mismatch
- missing function prototypes
- missing newline at end of file
- 64 to 32 bit truncation

The changes prefer to link in dead code in the debug build
with 'if (false)' than to comment it out, but trivial cases
are commented out or sometimes deleted if it appears to be
a copy/paste error.
Review URL: https://codereview.appspot.com/6296044

git-svn-id: http://skia.googlecode.com/svn/trunk@4180 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-06-06 12:09:01 +00:00
robertphillips@google.com
977b9c8af3 Instance counting for SkRefCnt-derived objects (w/ CanvasTest fix) 
http://codereview.appspot.com/6242070/



git-svn-id: http://skia.googlecode.com/svn/trunk@4170 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-06-05 19:35:09 +00:00
robertphillips@google.com
25c199343d Reverting r4162 
git-svn-id: http://skia.googlecode.com/svn/trunk@4164 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-06-05 16:24:32 +00:00
robertphillips@google.com
3227ab5f64 Added instance counting system for SkRefCnt-derived objects 
http://codereview.appspot.com/6242070/



git-svn-id: http://skia.googlecode.com/svn/trunk@4162 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-06-05 15:40:54 +00:00
bsalomon@google.com
d2ae1fad78 remove 4x4 downsample filter mode 
Review URL: http://codereview.appspot.com/6267046/



git-svn-id: http://skia.googlecode.com/svn/trunk@4149 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-06-04 20:06:02 +00:00
robertphillips@google.com
a1e5795279 GrTexture can now create its own cache key 
http://codereview.appspot.com/6269047/



git-svn-id: http://skia.googlecode.com/svn/trunk@4148 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-06-04 20:05:28 +00:00
tomhudson@google.com
83e5eb8d02 Clean up likely reference leak in Ganesh custom stages. 
http://codereview.appspot.com/6286047/



git-svn-id: http://skia.googlecode.com/svn/trunk@4146 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-06-04 19:58:30 +00:00
robertphillips@google.com
07ef911f18 Fixed Linux compiler complaints 
http://codereview.appspot.com/6269045/



git-svn-id: http://skia.googlecode.com/svn/trunk@4135 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-06-04 13:22:14 +00:00
robertphillips@google.com
3271628342 Move texture descriptor into GrTexture 
http://codereview.appspot.com/6258068/



git-svn-id: http://skia.googlecode.com/svn/trunk@4133 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-06-04 12:48:45 +00:00
tomhudson@google.com
898e7b568f Flip the switch to turn on GrCustomStage implementation of gradients; 
remove old implementation, including enums & state on various structs.

http://codereview.appspot.com/6245078/



git-svn-id: http://skia.googlecode.com/svn/trunk@4129 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-06-01 20:42:15 +00:00
tomhudson@google.com
0bdbed3802 Fix GrSamplerState::operator=() to take a reference rather than a copy. 
Visual review by bsalomon@.



git-svn-id: http://skia.googlecode.com/svn/trunk@4128 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-06-01 19:50:02 +00:00
tomhudson@google.com
194de08484 Zero out GrSamplerState in constructor to recover performance loss on Linux from r4102. 
(Noise in padding bytes was breaking operator==())
Visual review by bsalomon@.



git-svn-id: http://skia.googlecode.com/svn/trunk@4108 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-05-31 20:35:27 +00:00
bsalomon@google.com
b505a128ef Implement morphology as a custom effect 
Review URL: http://codereview.appspot.com/6250073/



git-svn-id: http://skia.googlecode.com/svn/trunk@4102 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-05-31 18:40:36 +00:00
bsalomon@google.com
4d063dea5e Add glTexParameteriv to GL interface 
Comitted on behalf of jin.a.yang@intel.com

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



git-svn-id: http://skia.googlecode.com/svn/trunk@4099 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-05-31 17:59:23 +00:00
tomhudson@google.com
67794f5e37 Fix typo in r4092. 
git-svn-id: http://skia.googlecode.com/svn/trunk@4094 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-05-31 14:31:14 +00:00
tomhudson@google.com
111755936d Use element-by-element assignment in GrSamplerState::operator= instead of memcpy 
so that we can handle refcounting correctly.

http://codereview.appspot.com/6262049/



git-svn-id: http://skia.googlecode.com/svn/trunk@4092 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-05-31 14:23:28 +00:00
bsalomon@google.com
4196c0e0e8 Fix line ending, mark svn:eol-style LF 
git-svn-id: http://skia.googlecode.com/svn/trunk@4060 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-05-29 19:44:14 +00:00
robertphillips@google.com
c077d1eaa8 Rolling back 4053 
git-svn-id: http://skia.googlecode.com/svn/trunk@4054 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-05-28 14:10:15 +00:00
robertphillips@google.com
ab303ef6e8 Speculative fix for Android Debug only crash in r4049 
http://codereview.appspot.com/6251049/



git-svn-id: http://skia.googlecode.com/svn/trunk@4053 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-05-28 13:37:25 +00:00
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
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
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
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
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
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
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
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
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
robertphillips@google.com
f105b10926 Made clip mask cache use Scratch Texture system 
http://codereview.appspot.com/6210044/



git-svn-id: http://skia.googlecode.com/svn/trunk@3920 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-05-14 12:18:26 +00:00
bsalomon@google.com
341767c9fc Remove support for vertex attribute matrices 
Review URL: http://codereview.appspot.com/6200065/



git-svn-id: http://skia.googlecode.com/svn/trunk@3917 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-05-11 20:47:39 +00:00
robertphillips@google.com
bf5cad4e9c Added documentation of stage/TU allocation 
http://codereview.appspot.com/6199058/



git-svn-id: http://skia.googlecode.com/svn/trunk@3888 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-05-10 12:40:40 +00:00
tomhudson@google.com
d8f856c32b Move convolution from code in GrGLProgram to new GrConvolutionEffect 
class. This is the first test of the new Ganesh shader pipeline.

Also includes some cleanup of the gpu.gyp file: added src/gpu, allowing
us to remove ../ from many #include directives.

http://codereview.appspot.com/6199053/



git-svn-id: http://skia.googlecode.com/svn/trunk@3887 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-05-10 12:13:36 +00:00
bsalomon@google.com
cc61b17628 Comment improvements to GrGLInterface 
git-svn-id: http://skia.googlecode.com/svn/trunk@3865 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-05-07 21:45:48 +00:00
bsalomon@google.com
637d5e9297 Move GL function prototype typdefs to a separate header 
Review URL: http://codereview.appspot.com/6189054/



git-svn-id: http://skia.googlecode.com/svn/trunk@3864 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-05-07 21:33:56 +00:00
bsalomon@google.com
2717d56b22 move more stuff that should be private out from GrGLConfig.h 
Review URL: http://codereview.appspot.com/6202053/




git-svn-id: http://skia.googlecode.com/svn/trunk@3856 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-05-07 19:10:52 +00:00
bsalomon@google.com
91bcc94e87 Make GrGLDefines.h be a private header 
Review URL: http://codereview.appspot.com/6198048/



git-svn-id: http://skia.googlecode.com/svn/trunk@3851 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-05-07 17:28:41 +00:00
bsalomon@google.com
9c1f1ac5d3 Move function decls and macros out of public headers that are meant for internal use. 
git-svn-id: http://skia.googlecode.com/svn/trunk@3849 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-05-07 17:09:37 +00:00
tomhudson@google.com
b88bbd2a53 Make GrSamplerState::operator==() use GrCustomStage::isEquivalent() rather 
than just bit-compare all fields.



git-svn-id: http://skia.googlecode.com/svn/trunk@3805 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-05-01 12:48:07 +00:00
tomhudson@google.com
02b1ea24fd Add comparison and assignment operators to GrSamplerState. 
http://codereview.appspot.com/6137058/



git-svn-id: http://skia.googlecode.com/svn/trunk@3803 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-04-30 20:19:07 +00:00
robertphillips@google.com
443e5a52b7 Re-adding red texture support (by rolling back r3800) 
http://code.google.com/p/skia/source/detail?r=3622 - for original review
http://crbug.com/125596 ('M20 windows renderer stability maze') - for issue



git-svn-id: http://skia.googlecode.com/svn/trunk@3802 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-04-30 20:01:21 +00:00
epoger@google.com
0048469578 Roll back http://code.google.com/p/skia/source/detail?r=3622 to deal with http://crbug.com/125596 ('M20 windows renderer stability maze') 
git-svn-id: http://skia.googlecode.com/svn/trunk@3800 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-04-30 19:02:08 +00:00
bsalomon@google.com
76b7fcc79e Some cleanup of GrResource 
Review URL: http://codereview.appspot.com/6139043/



git-svn-id: http://skia.googlecode.com/svn/trunk@3782 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-04-27 17:24:09 +00:00
bsalomon@google.com
8d033a1b12 Remove GrPath typedef 
Review URL: http://codereview.appspot.com/6128045/



git-svn-id: http://skia.googlecode.com/svn/trunk@3780 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-04-27 15:52:53 +00:00
bsalomon@google.com
93c9660cd1 draw circle paths directly via GPU 
Review URL: http://codereview.appspot.com/5696086/

Submitted on behalf of Guanqun.Lu@gmail.com




git-svn-id: http://skia.googlecode.com/svn/trunk@3772 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-04-27 13:05:21 +00:00
robertphillips@google.com
0f191f30af Minor refactoring to remove duplicate enum from Ganesh (_SetOp -> SkRegion::Op) 
http://codereview.appspot.com/6116047/



git-svn-id: http://skia.googlecode.com/svn/trunk@3763 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-04-25 15:23:36 +00:00
tomhudson@google.com
07eecdca3e Hooks up the GrCustomStage/GrGLProgramStageFactory/GrGLProgramStage 
classes from r3726 so they can be used. Does not implement any actual
effect stages.

Has one large known bug: if custom stages are provided, GrSamplerState
comparisons will break; this should preserve correct drawing, but decrease
performance - among other things, we'll break draw batching. To fix this
we'll need a RTTI system for GrCustomState objects, and we'll need to change
the GrSamplerState comparison from a memcmp to something that also does a
deep type-sensitive compare of any GrCustomState objects present.

http://codereview.appspot.com/6074043/



git-svn-id: http://skia.googlecode.com/svn/trunk@3742 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-04-20 18:35:38 +00:00
bsalomon@google.com
b3400badf0 Fix undefined GLint in Mac builds 
git-svn-id: http://skia.googlecode.com/svn/trunk@3736 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-04-19 19:27:19 +00:00
bsalomon@google.com
7361f54294 Make GM able to run MSAA modes and multiple GPU configs in a single run. 
Review URL: http://codereview.appspot.com/6061051/



git-svn-id: http://skia.googlecode.com/svn/trunk@3734 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-04-19 19:15:35 +00:00