drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
141,025 Commits 1 Branch 0 Tags
Commit Graph

1439 Commits

Author SHA1 Message Date
John Reck
d907e5b1ef Merge "Fix onTrimMemory for HardwareRenderer" 2014-06-30 22:27:39 +00:00
John Reck
f47a594f52 Fix onTrimMemory for HardwareRenderer 
Also fixes detachFunctor possibly drawing after return

 Bug: 15189843
 Bug: 15990672

Change-Id: I64c48cb674c461a8eeaba407b697e09f72c98ce3
 2014-06-30 16:36:26 -07:00
John Reck
711ecaf000 Merge "More cleanups" 2014-06-27 15:56:14 +00:00
John Reck
918ad523b2 More cleanups 
Change-Id: Id5967944b949a2aec57e4fe9fdcdc04c11b8c35a
 2014-06-27 22:34:16 +00:00
Chris Craik
f23b25abfb Remove isRecording() method from renderers 
DisplayListRenderer is all that's accessed from java, and is entirely
separate from OpenGLRenderer now.

Change-Id: Ie733be71520c13fdb55dfe3522bb445ae2b50ac1
 2014-06-27 17:49:52 -07:00
Chris Craik
906d47fd2b Deep copy SkPath parameter to PathCache task 
bug:15440706
Change-Id: I2b5b25f620df838cb1155cc8502d86ad3644c212
 2014-06-30 18:02:23 +00:00
John Reck
ca1b3b83bb Cleanup 
Change-Id: I8a75e6e32a4cb02e3978503305b4cdce1727e89a
 2014-06-27 19:25:16 +00:00
John Reck
68bfe0a37a Animator refactoring & fixes 
Tweaks animators to have less unnecessary refcounting

 Pull animator management out into seperate class

 More control to tweak animator lifecycle, such as doing
 Java-side handling of start delay by attaching but not
 starting the animator

Change-Id: I4ff8207580ca11fb38f45ef0007b406e0097281c
 2014-06-26 10:45:43 -07:00
John Reck
3faf67c9b3 Merge "Fix contants; RT-enable WebView pt2" 2014-06-23 21:44:43 +00:00
John Reck
cd028f336e Fix contants; RT-enable WebView pt2 
Bug: 15838537

 * Fix kSync_UIRedrawRequired constant value (woops)
 * Tell CanvasContext that WebView is now rt-safe

Change-Id: Idf15cf21115c2ca24b8ccd00025e8502864cd87c
 2014-06-24 08:44:29 -07:00
Derek Sollenberger
07126e12cc Cleanup unused includes in the hwui library. 
Change-Id: I94c188403f5fa541e47a03a3bd1c7cf00c29bf4e
 2014-06-24 14:37:07 +00:00
John Reck
6b39324d77 Merge "No-fail invokeFunctor" 2014-06-23 21:44:43 +00:00
John Reck
3b20251a35 No-fail invokeFunctor 
Bug: 15513308
 Bug: 15449247

Change-Id: I13a29f9c8d4975cdda6dcb33b6332c2555ff0f7c
 2014-06-23 15:26:49 -07:00
Bo Liu
61606cec5c Merge "Enable asynchronous RenderThread for WebView" 2014-06-20 21:00:34 +00:00
Bo Liu
826b564486 Enable asynchronous RenderThread for WebView 
BUG: 12179257

Change-Id: Ib7358dc84a0a58020d178d10b324b9631848c06d
 2014-06-23 11:26:03 -07:00
Chris Craik
a7090e0cfd Update 'DisplayList' vs 'RenderNode' naming in several places 
Change-Id: I635c6627d098b661fb9b0ba1bd42fa6d7277d287
 2014-06-23 09:57:07 -07:00
Chris Craik
3281442aa7 Merge "Wrap ViewGroup content in save/restore to protect composited children" 2014-06-20 02:09:17 +00:00
Chris Craik
80d4902196 Wrap ViewGroup content in save/restore to protect composited children 
bug:15570351

Pos Z composited children are drawn before the primary restore for a
RenderNode. This means that without an additional save/restore (which
wraps the content) they aren't protected from transformations/clips
that happen within the ViewGroup's DisplayList.

Also changes RenderNode to use OpenGLRenderer tag for displaylist
dumping consistency, and simplifies the entry points into RenderNode
drawing, since the distinction between tree root vs tree internal is
no longer important.

Change-Id: I2621eba0592c74d71f85a91a4ab3d0da2d7468d3
 2014-06-20 16:18:58 -07:00
John Reck
b127713b58 Merge "Re-enable ViewPropAnimRT" 2014-06-20 02:09:17 +00:00
John Reck
2218472d23 Re-enable ViewPropAnimRT 
Change-Id: I2f30547c4e2212747c479760dff4f3f901d1eaf3
 2014-06-20 14:05:51 -07:00
Mike Reed
402c8f5a07 Merge "stop using (deprecated) SkBitmap::Config" 2014-06-20 00:30:35 +00:00
Mike Reed
b933055cf3 stop using (deprecated) SkBitmap::Config 
Change-Id: Ic75b5fc6996578e9d95bd3a220439ec1541d7c3b
 2014-06-20 10:28:37 -04:00
John Reck
7aab5a1f9f Add negative guard 
Bug: 15631600

Change-Id: Idd7740f58876e73694fafb8ef55ebaff511f6dca
 2014-06-20 09:59:56 -07:00
Chris Craik
e48df00575 Merge "Clean up tessellation cache in prep for other tesselation types" 2014-06-18 19:24:54 +00:00
Chris Craik
6ac174b972 Clean up tessellation cache in prep for other tesselation types 
bug:15536396

Also fixes compilation warning, avoids SkPaint deep copy

Change-Id: I74334f08b1d34c6789aabf968ff62db5bacbed1b
 2014-06-18 15:31:55 -07:00
John Reck
c25e506f7f Throw ISE on too-big-views-with-layers 
Bug: 12971954

Change-Id: I3ef995e91f236014b0a72a90846ef19ce6dc42b1
 2014-06-18 14:31:52 -07:00
John Reck
ce9f308063 Fix dirty calculation for layer updates 
Bug: 15682142

 Defer early return of alpha <= 0 for damage accumulation until
 popTransform() so that layer updates will be performed regardless
 of alpha

Change-Id: Ifb94dd3ed2d96d610e6f2f3071933903016273a5
 2014-06-18 07:19:50 -07:00
Chris Craik
75af3f3c96 Merge "Add abort logging for huge scales and tessellation recursion depth" 2014-06-17 20:49:29 +00:00
Chris Craik
fe02b4b344 Add abort logging for huge scales and tessellation recursion depth 
bug:15615144
Change-Id: I275732eb97f9d5179beed23eecd2ee3cc7112e10
 2014-06-17 12:23:29 -07:00
Chris Craik
c4fc71dec8 Merge "Interrupt canvas before invoke" 2014-06-17 04:56:28 +00:00
Chris Craik
734df4b427 Interrupt canvas before invoke 
Change-Id: I5b818958f6255c594339bd10d9efa99e9e2c00d4
 2014-06-17 10:15:46 -07:00
John Reck
81efa15fad Merge "Make sure the root node has a type" 2014-06-17 04:56:28 +00:00
John Reck
2dc223d237 Make sure the root node has a type 
Bug: 15686491

Change-Id: I4bd64a6470dd704740e99d21cfdbe84805961401
 2014-06-17 10:47:11 -07:00
John Reck
293e868bfc Handle Z in DA 
Bug: 15671775

Change-Id: I33c7a70e78ef523ffd03165fb6c39d8e04d04f1f
 2014-06-17 10:56:00 -07:00
Chris Craik
0732ba5756 am 88b1c9ad: am e709d53f: am 0d28bb47: Merge "Fix the texture ID reuse issue in HWUI." 
* commit '88b1c9ad87ca6d6faaf824bff4ee9d3c799362e5':
  Fix the texture ID reuse issue in HWUI.
 2014-06-17 01:31:21 +00:00
Chris Craik
11a8d4f8b9 am 678886fd: am b1fc06a4: am 5e7ef948: Merge "hwui: fix possible null pointer de-refrence" 
* commit '678886fde5cd779de79f8e38479aa6de82f8e755':
  hwui: fix possible null pointer de-refrence
 2014-06-17 01:31:16 +00:00
Chris Craik
88b1c9ad87 am e709d53f: am 0d28bb47: Merge "Fix the texture ID reuse issue in HWUI." 
* commit 'e709d53ff31c74a6abf2a27350966d18d8dad4f7':
  Fix the texture ID reuse issue in HWUI.
 2014-06-16 23:47:34 +00:00
Chris Craik
678886fde5 am b1fc06a4: am 5e7ef948: Merge "hwui: fix possible null pointer de-refrence" 
* commit 'b1fc06a4321f13360fcca49bbf87f87f34c22d58':
  hwui: fix possible null pointer de-refrence
 2014-06-16 23:47:26 +00:00
Chris Craik
0d28bb47d7 Merge "Fix the texture ID reuse issue in HWUI." 2014-06-16 22:13:20 +00:00
Chris Craik
5e7ef9489f Merge "hwui: fix possible null pointer de-refrence" 2014-06-16 22:13:20 +00:00
Tenghui Zhu
ecae1ffd77 am df36dd20: am 386caf6c: Merge "update parameters in uploadToTexture() for GLES20" 
* commit 'df36dd200c55a6ad463b46bab0ffff49d21206ff':
  update parameters in uploadToTexture() for GLES20
 2014-06-16 17:18:51 +00:00
jiayuanr
4a473c7d94 Fix the texture ID reuse issue in HWUI. 
Issue: When the layer of previous frame is destroyed, it doesn't clear the
texture id in mBoundTextures[mTextureUnit], so in the next frame, if
glGenTexture returns same texture ID of the previous frame,
the new texture is not bound.

CRs-fixed: 671736

Change-Id: Ifc5fd2115fb1863b3c006ab14b0faabeaeb4eab4
 2014-06-16 09:29:22 +05:30
Digish Pandya
1fa4cef34a hwui: fix possible null pointer de-refrence 
add layer check for  null before de-refrencing it.

issue link: http://code.google.com/p/android/issues/detail?id=61622

Change-Id: I54fc21ec594effcfb1eededd80dd5b0b52645c4c
 2014-06-13 17:14:50 +05:30
Lu, Shenghua
c5e0a29541 update parameters in uploadToTexture() for GLES20 
Google optimized the uploadToTexture with GLES3.0+,
This allows us to upload a sub-rectangle of texture,
but this has compliance issue with GLES 2.0.

With OpenGL ES 2.0 we need to copy the bitmap in a
temporary buffer if the stride doesn't match the width,
and then upload entire temporary stripes.

Change-Id: I8987cd8347913c61b7fa45bd47be1189aa6bdb05
Signed-off-by: Shenghua Lu <shenghua.lu@intel.com>
Signed-off-by: Shuo Gao <shuo.gao@intel.com>
Signed-off-by: Guobin Zhang<guobin.zhang@intel.com>
 2014-06-13 09:42:33 +08:00
ztenghui
2357d72ce2 resolved conflicts for merge of ecae1ffd to master 
Change-Id: I1ba660ce832e3360fa136be6aa0415645bfda328
 2014-06-16 10:39:33 -07:00
John Reck
816f71b7e0 Merge "Move LayerType to RenderNode" 2014-06-12 05:34:42 +00:00
John Reck
25fbb3fa11 Move LayerType to RenderNode 
Change-Id: Icb79a5015cb0362b1f3a66d09007450730135a97
 2014-06-12 19:25:33 -07:00
John Reck
a447d29c65 Fix DA bugs 
* Now aware of transform of DrawDisplayListOp
 * Supports projection

 Bug: 15539677
 Bug: 15506680

Change-Id: Ic16f482cd48c3add12e49eca529281be12b93491
 2014-06-12 09:13:45 -07:00
Chris Craik
bd2d97f2b7 am 9de2a8f4: Merge "Add AA flag to TessellationCache key" into lmp-preview-dev 
* commit '9de2a8f42d88e50146947a7bf21b212ea134ee83':
  Add AA flag to TessellationCache key
 2014-06-12 22:51:27 +00:00
Chris Craik
ed4ef0bc17 Add AA flag to TessellationCache key 
bug:15539571
Change-Id: I7cf470ca962041ab3c00c740e87c6ae9a95f06a8
 2014-06-12 13:39:34 -07:00