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

1417 Commits

Author SHA1 Message Date
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
Chris Craik
5b368b3d9f am 98b10e48: Merge "Limit path approximation recursion depth" into lmp-preview-dev 
* commit '98b10e480279d331e54b9f28546629687244a01c':
  Limit path approximation recursion depth
 2014-06-12 19:57:36 +00:00
Chris Craik
0adb6d6e50 Merge "Limit path approximation recursion depth" into lmp-preview-dev 2014-06-11 23:10:23 +00:00
Chris Craik
9c3dd62d0f Limit path approximation recursion depth 
bug:15369119
Change-Id: I6f009f5e8790129e1aa8a51e1fc6cdd1415dd617
 2014-06-11 17:24:51 -07:00
Chris Craik
1b3be0877a Fix race in shadow tessellation by deep copying task params 
bug:15369119
Change-Id: Ica1445f06693b1cfd038cf3494afe1210d5507c1
 2014-06-11 13:49:34 -07:00
Chris Craik
6ef8e0178d Workaround to avoid polygon flashing DO NOT MERGE 
b/15539571

Temporarily disables caching of tessellation.

Change-Id: If014b8c40664711aef761eec606d28aff1859b14
 2014-06-11 19:10:26 -07:00
John Reck
e830c37a4a Merge "Fix DA bugs" 2014-06-10 21:38:43 +00:00
Chris Craik
3e136626da am 69453787: Merge "Fix race in shadow tessellation by deep copying task params" into lmp-preview-dev 
* commit '6945378752381a04d81eb426876a6495488cd459':
  Fix race in shadow tessellation by deep copying task params
 2014-06-12 16:54:18 +00:00
Mark Salyzyn
546f353e7f hwui: 64-bit compile issue 
Change-Id: Ic3e3dbc6cde4bc58b23a8ab267b0868f370ad149
 2014-06-10 12:29:14 -07:00
Chris Craik
1e5cf9aced am b1c76a1a: Merge "Tessellate on worker threads" into lmp-preview-dev 
* commit 'b1c76a1abcfb2f33e12fef37ec71d20724863b5e':
  Tessellate on worker threads
 2014-06-10 17:22:31 +00:00
Chris Craik
05f3d6e511 Tessellate on worker threads 
Tessellate and cache (where possible) shadow and round rect
tessellation tasks.

Change-Id: I2cfda8e11d83d51ea74af871235cf26e8f831d40
 2014-06-10 01:53:17 +00:00
John Reck
743922e9df Merge changes Ie0773f85,Ie5e75505 
* changes:
  Even FASTER damage calculations!
  Have all the setters return changed
 2014-06-06 14:41:37 +00:00
Chris Craik
c229c2a6a8 am 8632b85b: Merge "Fix issues around GL on incorrect thread" into lmp-preview-dev 
* commit '8632b85b3ceca1b64ca37843ffd87bc10f4ae72f':
  Fix issues around GL on incorrect thread
 2014-06-05 22:22:51 +00:00
Chris Craik
56f46abdcd Merge "Fix issues around GL on incorrect thread" into lmp-preview-dev 2014-06-05 21:53:48 +00:00
Chris Craik
18bf85d4ae Fix issues around GL on incorrect thread 
bug:15416165
bug:15414673

DisplayListRenderer must override these callbacks from
StatefulBaseRenderer, since the super implementations call GL.
Eventually, we'll just have DisplayListRenderer inherit from
StatefulBaseRenderer directly.

Change-Id: I7b20aa0ac6cae3bf6c6969c63bf9ba98ab2831ff
 2014-06-05 12:22:15 -07:00
John Reck
e4267ea4f2 Even FASTER damage calculations! 
* Now with more native!
 * Less matrix math thanks to bulk-property-update support!
 * Zero JNI on the View.damageInParent() path!
 * Fully aware of RT-driven animators!
 * Likely full of new and exciting bugs!
 * But it also fixes at least 1 existing invalidate bug!

Change-Id: Ie0773f85a60850ff2668370c58defef2e8aa079f
 2014-06-04 12:21:26 -07:00
John Reck
79c7de77a7 Have all the setters return changed 
Change-Id: Ie5e755058a7094bb0c2fce60ec3cef47c23823ce
 2014-06-04 11:01:04 -07:00
John Reck
982e28cafd Merge "Cleanup" 2014-06-02 22:44:50 +00:00
John Reck
ce444ca400 Cleanup 
Change-Id: Ie366390272724a2c1dfda99b0e85806b7a612744
 2014-06-02 15:12:36 -07:00
John Reck
776512d4b6 am feccbdc4: Merge "Add setStartValue to RNA" into lmp-preview-dev 
* commit 'feccbdc4d0bee3eb4c395bd93ba51cbc6616527a':
  Add setStartValue to RNA
 2014-06-02 18:19:44 +00:00
John Reck
c6b3264e16 Add setStartValue to RNA 
Bug: 15198607
 Should be good-enough for Ripples to use for pseudo-chaining
 support.

Change-Id: Ia8666928ccb69ae401cb583751632a52bd928b63
 2014-06-02 11:00:09 -07:00
John Reck
c6b6154ac1 am ea5af639: Merge "Re-jigger layers" into lmp-preview-dev 
* commit 'ea5af63965bf323580aa1e2854efb2f8cc3dc396':
  Re-jigger layers
 2014-05-30 21:39:04 +00:00
John Reck
d72e0a339b Re-jigger layers 
Bug: 15185239
 Bug: 15238382

 Make DeferredLayerUpdater ref counted so that
 HardwareLayer:finalizer() works non-crashily on
 leaked layers
 Give DeferredLayerUpdater the ability to have a layer destroyer
 set so that leaked layers can still be recycled on the
 RenderThread
 Order layer updates based off of pushLayerUpdate() calls to fix
 issue with nested layers

Change-Id: I4449cee607f7e5126e02fed7464cf48038e3dfdf
 2014-05-30 12:19:33 -07:00