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

1575 Commits

Author SHA1 Message Date
John Reck
d5a931e251 am 1c73a0fd: am 35137dd1: am 5347ddea: Merge "Yet more layer tracking logging" into lmp-dev 
* commit '1c73a0fd6b9198e06aa3ab43776c5e45614dceed':
  Yet more layer tracking logging
 2014-09-05 02:32:17 +00:00
John Reck
6dad93eff6 Merge "Yet more layer tracking logging" into lmp-dev 2014-09-05 01:06:08 +00:00
John Reck
443a714fa7 Yet more layer tracking logging 
Bug: 17208461

Change-Id: I55e7d0921eb565867e966d68b798b7b92c391b55
 2014-09-04 17:40:05 -07:00
Chris Craik
225c9d49d9 am fa5643ec: am 323e213d: am b25a4d5f: Merge "Prioritize reveal clipping over Outline clipping" into lmp-dev 
* commit 'fa5643ec4f0c51d09fbf4278351d3147d7f6cd15':
  Prioritize reveal clipping over Outline clipping
 2014-09-04 21:29:04 +00:00
Chris Craik
2d3f9033f8 Merge "Prioritize reveal clipping over Outline clipping" into lmp-dev 2014-09-04 21:06:10 +00:00
Chris Craik
e83cbd4518 Prioritize reveal clipping over Outline clipping 
bug:15780987
bug:17350602

Also update docs around clipping nesting behavior,
and some Z ordering behavior.

Change-Id: Iaa204350a0adfdcbd8c4b821fb4a9c0ae22f2613
 2014-09-04 14:05:10 -07:00
Derek Sollenberger
bde4b91ba6 am 36563491: am f19b8f33: am 5f535ec1: Merge "Remove invalid premul step from HWUI\'s matrix color filter." into lmp-dev 
* commit '365634917c6f488ff73aa6d8db0d0f0f2e8d2941':
  Remove invalid premul step from HWUI's matrix color filter.
 2014-09-04 15:28:51 +00:00
Derek Sollenberger
e23b8dd58f Merge "Remove invalid premul step from HWUI's matrix color filter." into lmp-dev 2014-09-04 15:01:28 +00:00
John Reck
e74166a618 am 51c4d458: am 7499abd2: am 73339a99: Fix some wrong-thread issues around animator management 
* commit '51c4d458b0fcb9b9cc393ca89afcc44c0fb80c1d':
  Fix some wrong-thread issues around animator management
 2014-09-04 01:18:35 +00:00
John Reck
e2478d45cc Fix some wrong-thread issues around animator management 
Bug: 17372309

 Fixes a case where UI thread and RT thread both used the same method
 which wasn't safe for either of them.

 Adds additional assertions & logging in unusual circumstances to
 try and track down where the issue is occuring from.

Change-Id: I93d31a6fd0c5927259b67bdf96a475944226eee6
 2014-09-03 17:37:59 -07:00
John Reck
385052e24b am e31c5e7e: am 0f6c29dc: am ef908af6: Merge "Have destroy call freePrefetchedLayers" into lmp-dev 
* commit 'e31c5e7e07556d6b8775ab05cb61683b78c9bb4e':
  Have destroy call freePrefetchedLayers
 2014-09-03 19:57:34 +00:00
John Reck
17035b0211 Have destroy call freePrefetchedLayers 
Bug: 17208461

 There's a potential race condition between HardwareRenderer.destroy()
 being called (which calls destroyCanvasAndSurface()) and the renderer
 being finalized (which is what calls freePrefetchedLayers), during which
 time it's possible we get a TRIM_MEMORY_COMPLETE and destroy the EGL
 context.

 Fix this race condition by moving stopDrawing() and freePrefetchedLayers()
 into destroyCanvasAndSurface() where they should have been in the first
 place.

 Also, if we hit the assertion failure, dump the current state of
 Caches to try and provide more context for the failure.

Change-Id: Ife0ba3562041e8b08e87e3e13640472b3004eed6
 2014-09-03 11:13:53 -07:00
John Reck
ecfdb697cc am 94141a94: am 1c33dc49: am efb75031: Merge "Implement TODO" into lmp-dev 
* commit '94141a9430e145b4c72c6a5406f53cedee847635':
  Implement TODO
 2014-09-03 09:13:59 +00:00
Chris Craik
319a11dfed am 6fc3a9be: am 0d1a3fd3: am f9b26725: Merge "Fix precision issues for roundrect clipping" into lmp-dev 
* commit '6fc3a9bec89a7cc0556726b708faf45772e13d91':
  Fix precision issues for roundrect clipping
 2014-09-03 05:02:41 +00:00
John Reck
3d3f5f8c68 Merge "Implement TODO" into lmp-dev 2014-09-02 22:58:51 +00:00
John Reck
1661715d40 Implement TODO 
Change-Id: I551ad0dab6356baa4c7787718b54d5b7337a3f26
 2014-09-02 15:44:14 -07:00
Chris Craik
0fd79c955b Merge "Fix precision issues for roundrect clipping" into lmp-dev 2014-09-02 19:25:09 +00:00
ztenghui
38421e5990 am 8083b5f7: am f431aeab: am bb63ef12: Merge "Fix the (0,0) vector case for extra vertices computation" into lmp-dev 
* commit '8083b5f7e21103505497f70ffb155b7b8ac53d1d':
  Fix the (0,0) vector case for extra vertices computation
 2014-09-02 17:45:12 +00:00
ztenghui
bbefc1e076 am 01dca3f6: am 04834f4d: am b379a6e9: Merge "Ambient shadow tessellation improvement." into lmp-dev 
* commit '01dca3f6ed92137bce9cd981bc7283520eccd64d':
  Ambient shadow tessellation improvement.
 2014-09-02 07:10:11 +00:00
ztenghui
26131368ec Fix the (0,0) vector case for extra vertices computation 
TODO: Figure out why we have collided vertices from input polygon.

b/17340792

Change-Id: I6636ff957ef17514bd11cf290ccc0a2c302aca0b
 2014-09-01 17:23:27 -07:00
Chris Craik
68a73e8700 Fix precision issues for roundrect clipping 
bug:16984008
Change-Id: I941232d569293717f6bcd249d9e01f72a7409d2e
 2014-08-29 17:06:27 -07:00
ztenghui
cbf4c08796 Merge "Ambient shadow tessellation improvement." into lmp-dev 2014-08-29 21:36:03 +00:00
ztenghui
d5e8ade498 Ambient shadow tessellation improvement. 
Using the vertices, instead of ray casting for the triangulation.

This request a dynamic index buffer associated with vertex buffer,
so we update the VertexBuffer to support it.

The ambient shadow could be 3x-6x times faster for circle and rect now.

b/16712006
b/14257173

Change-Id: I2f22a8fe19bc59acee5c18e4a3a395acd5042a66
 2014-08-29 13:40:42 -07:00
John Reck
f8d104eed8 am 05b4e21e: am 724fff20: am ff6feade: Merge "Listener callbacks ordering fixups" into lmp-dev 
* commit '05b4e21ecda890ca20381384a772b4f7d66157a5':
  Listener callbacks ordering fixups
 2014-08-29 20:33:33 +00:00
John Reck
cd64ea06c1 am 54655a70: am 1099d64b: am 09a0c7c8: Merge "Free prefetched layers on TRIM_MEMORY" into lmp-dev 
* commit '54655a70133597998f1ec8be18f47e4573a7d214':
  Free prefetched layers on TRIM_MEMORY
 2014-08-29 19:16:00 +00:00
John Reck
7da70ed6a5 Merge "Listener callbacks ordering fixups" into lmp-dev 2014-08-29 17:59:24 +00:00
John Reck
4d2c47206a Listener callbacks ordering fixups 
Bug: 17228458
Bug: 17317816

Ensure that onStart is called prior to onCancel/onFinished if those
happen prior to the UI-thread handled start delay.

Ensure that onFinished is called if cancel/end is called

Change-Id: I23c16ea1c4f925d59d41ec5281d62dfc0c38595b
 2014-08-29 10:40:56 -07:00
John Reck
dff9957cc2 Free prefetched layers on TRIM_MEMORY 
Bug: 17208461

Change-Id: I831c10d29d5920274b90e11a67d6cd106972a058
 2014-08-29 09:59:43 -07:00
John Reck
1f9d2dffca am e310b356: am cfa308dc: am f26df60e: Merge "Track buildLayer calls, destroy if unused" into lmp-dev 
* commit 'e310b35694e88b1d25eeea81204d3495c698d557':
  Track buildLayer calls, destroy if unused
 2014-08-28 23:45:13 +00:00
John Reck
80068b735e Merge "Track buildLayer calls, destroy if unused" into lmp-dev 2014-08-28 23:04:32 +00:00
John Reck
998a6d8189 Track buildLayer calls, destroy if unused 
Bug: 17208461

Change-Id: Ibdb104a493285d77a6891c5e74e38a52c7014da9
 2014-08-28 15:55:26 -07:00
Chris Craik
8ef4bf20e5 am da573fa7: am c00a7298: am 19b7a03f: Merge "Update transform isolation to handle command chunks" into lmp-dev 
* commit 'da573fa7f1701359839cbf2659e171e4f7938a9b':
  Update transform isolation to handle command chunks
 2014-08-28 18:08:22 +00:00
John Reck
f76acc5ce3 am 22ad4f00: am d4e0267a: am f29b2624: Merge "Fix log line" into lmp-dev 
* commit '22ad4f00bf3a2e9aedf2c2a771b98a72f77df6f2':
  Fix log line
 2014-08-28 17:48:49 +00:00
Chris Craik
bf939b2671 Merge "Update transform isolation to handle command chunks" into lmp-dev 2014-08-28 17:27:24 +00:00
John Reck
8df7949d48 am 0ed484c5: am 16c66174: am 2b21f462: Merge "Actually end animators on tree destruction" into lmp-dev 
* commit '0ed484c59b308080617037e11a6100e8176dc974':
  Actually end animators on tree destruction
 2014-08-28 17:22:17 +00:00
John Reck
c7e2993628 Fix log line 
Change-Id: I290491f559281c7b3d1d132495ea2fffcfaf4725
 2014-08-28 09:56:20 -07:00
John Reck
d0cd9db316 Actually end animators on tree destruction 
Bug: 17313962

Change-Id: I66b86d50b415f9aa33da23297f22e2cf7f96f565
 2014-08-28 08:43:39 -07:00
John Reck
d21fb2fe93 am 7a86c785: am 969f3860: am ad0faa70: Merge "Animator stuff" into lmp-dev 
* commit '7a86c7859b2ccdb4f424c4b9bd946ebf0b4cdf3f':
  Animator stuff
 2014-08-28 04:17:37 +00:00
John Reck
4c5a27b5f6 Merge "Animator stuff" into lmp-dev 2014-08-28 01:38:58 +00:00
John Reck
119907cd25 Animator stuff 
Bug: 17228458

Change-Id: Id884a429a512f9cd2be0ed16dbd0f10e92b4440d
 2014-08-27 17:44:25 -07:00
Chris Craik
c3e75f9d54 Update transform isolation to handle command chunks 
bug:15570351

Prevent drawing transformations on a ViewGroup's canvas from directly
affecting the transformation of the children through the renderer,
since it's already baked into mTransformFromParent at record time.

Change-Id: I6310a2260dfe4def0bde1fd2c5b93791a645d586
 2014-08-27 15:43:42 -07:00
Chris Craik
4be698fad5 am 11ed894a: am f55719bc: am 7d3073a4: Merge "Crash instead of leaking layers/textures between GL contexts" into lmp-dev 
* commit '11ed894a043a193baa5ec004e0cf376eab9f21eb':
  Crash instead of leaking layers/textures between GL contexts
 2014-08-27 04:34:26 +00:00
Chris Craik
1d47742333 Crash instead of leaking layers/textures between GL contexts 
bug:17208461
Change-Id: I4d58f301cf0f5e8145e808a5d6ade4de7801970b
 2014-08-26 17:30:15 -07:00
ztenghui
8abc808479 am 9b7e3ef5: am acd21c96: am fadaa2cb: Merge "Correctly detect the wrong Z value for the light" into lmp-dev 
* commit '9b7e3ef5bc00552939b544eacef7e6568cdeb1cd':
  Correctly detect the wrong Z value for the light
 2014-08-26 18:42:04 +00:00
ztenghui
bed17d21b0 Merge "Correctly detect the wrong Z value for the light" into lmp-dev 2014-08-26 18:18:31 +00:00
ztenghui
3bd3fa1f1d Correctly detect the wrong Z value for the light 
b/17221975

Change-Id: I2b46da95ad12ca5260d7fe9514a75558b6b6393b
 2014-08-26 10:45:27 -07:00
John Reck
1698297daf Merge "DO NOT MERGE Copy shaders" into lmp-dev 2014-08-26 14:53:34 +00:00
Chris Craik
8afd0f245c Create z reordering boundaries around dispatchDraw 
bug:16012254

This means rendernodes with a Z will no longer be drawn at the end of
their parent's DisplayList, but at the end of the associated reorder
region (DisplayListData::Chunk).

Change-Id: Ia033fee9d9a4db567b2a8d5e90fc57a4d0a64544
 2014-08-25 15:35:40 -07:00
John Reck
c1469f39b5 DO NOT MERGE Copy shaders 
Bug: 16733996

Change-Id: I84afc1b24a23dd6ddf5ab48fb2bfcbe779f8d3e3
 2014-08-25 15:27:11 -07:00
ztenghui
190ead730f Merge "Improve the spot shadow computation." into lmp-dev 2014-08-22 21:04:49 +00:00