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

5851 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
4655420ba8 am 35137dd1: am 5347ddea: Merge "Yet more layer tracking logging" into lmp-dev 
* commit '35137dd1bf8f0a46702b2927035401c2ab78685c':
  Yet more layer tracking logging
 2014-09-05 02:12:04 +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
600dc4393a am 323e213d: am b25a4d5f: Merge "Prioritize reveal clipping over Outline clipping" into lmp-dev 
* commit '323e213d0aff4e4120ce183ac4c38d63b593ecee':
  Prioritize reveal clipping over Outline clipping
 2014-09-04 21:26:02 +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
8aed5f9032 am f19b8f33: am 5f535ec1: Merge "Remove invalid premul step from HWUI\'s matrix color filter." into lmp-dev 
* commit 'f19b8f33d19a6aa35360d6f7d3bfdac97e9d09f6':
  Remove invalid premul step from HWUI's matrix color filter.
 2014-09-04 15:19:12 +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
cc7c225f1b am 7499abd2: am 73339a99: Fix some wrong-thread issues around animator management 
* commit '7499abd2d4604e0bdbeb91ed6c7e0155fb51dc6b':
  Fix some wrong-thread issues around animator management
 2014-09-04 00:59:19 +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
842bb5be58 am 0f6c29dc: am ef908af6: Merge "Have destroy call freePrefetchedLayers" into lmp-dev 
* commit '0f6c29dc47d4a9607e79480460a67837c527fd56':
  Have destroy call freePrefetchedLayers
 2014-09-03 18:33:24 +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
John Reck
89cff0fde7 am 1c33dc49: am efb75031: Merge "Implement TODO" into lmp-dev 
* commit '1c33dc49d8ab4ecac90794090bba191e42bd6c04':
  Implement TODO
 2014-09-03 05:49:53 +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
de33841317 am 0d1a3fd3: am f9b26725: Merge "Fix precision issues for roundrect clipping" into lmp-dev 
* commit '0d1a3fd3b846d858c321c634b605fd9fc63b57cd':
  Fix precision issues for roundrect clipping
 2014-09-02 19:54:24 +00: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
e358dd6ac0 am f431aeab: am bb63ef12: Merge "Fix the (0,0) vector case for extra vertices computation" into lmp-dev 
* commit 'f431aeab0db82bc7fdd0c50446990c4b7496609b':
  Fix the (0,0) vector case for extra vertices computation
 2014-09-02 16:38:12 +00:00
Adam Lesinski
c5af80b462 am 834e328a: am a7e85db1: am fe622efc: Merge "Add test to ensure themes get copied from separate resource tables" into lmp-dev 
* commit '834e328a0facf1537d275e1d5c286a2d9df35161':
  Add test to ensure themes get copied from separate resource tables
 2014-09-02 07:10:16 +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
Adam Lesinski
1e5c761591 am 21813c19: am 0f885328: am b9095bac: Merge "Clean up test allocations so real memory leaks are more visible" into lmp-dev 
* commit '21813c197f044e7a569bd430d38e710d110c9a8f':
  Clean up test allocations so real memory leaks are more visible
 2014-09-01 11:25:08 +00:00
Chris Craik
68a73e8700 Fix precision issues for roundrect clipping 
bug:16984008
Change-Id: I941232d569293717f6bcd249d9e01f72a7409d2e
 2014-08-29 17:06:27 -07:00
Adam Lesinski
d299fef90c am a7e85db1: am fe622efc: Merge "Add test to ensure themes get copied from separate resource tables" into lmp-dev 
* commit 'a7e85db12557c0480e3836c414519b28331d502c':
  Add test to ensure themes get copied from separate resource tables
 2014-08-29 23:53:37 +00:00
ztenghui
28b4a5d058 am 04834f4d: am b379a6e9: Merge "Ambient shadow tessellation improvement." into lmp-dev 
* commit '04834f4d8f6d2a4d803b59a22f5b6d3b8dd97369':
  Ambient shadow tessellation improvement.
 2014-08-29 23:53:32 +00:00
Adam Lesinski
9d75e95f9b Merge "Add test to ensure themes get copied from separate resource tables" into lmp-dev 2014-08-29 21:38:02 +00:00
ztenghui
cbf4c08796 Merge "Ambient shadow tessellation improvement." into lmp-dev 2014-08-29 21:36:03 +00:00
Adam Lesinski
9d9cc6233c Add test to ensure themes get copied from separate resource tables 
Change-Id: I94e9966cf1e9d0e7e6c7daa0606a87bb0f67705e
 2014-08-29 14:34:54 -07: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
Adam Lesinski
1ff88036da am 0f885328: am b9095bac: Merge "Clean up test allocations so real memory leaks are more visible" into lmp-dev 
* commit '0f885328bc54e896d0f3cdf2faf25abaab95bece':
  Clean up test allocations so real memory leaks are more visible
 2014-08-29 20:05:19 +00:00
Adam Lesinski
d79e33379d Clean up test allocations so real memory leaks are more visible 
Change-Id: Ic405f08c8d8e3e7fc4e4a991671e980752c19899
 2014-08-29 12:29:31 -07: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
Adam Lesinski
c51cc683bc am 056468ef: am 1ec1f85d: am 995c771f: Merge "Fix memory leak in ResTable" into lmp-dev 
* commit '056468ef3b9b63d251c4aac867ae634f813d18cf':
  Fix memory leak in ResTable
 2014-08-29 19:14:28 +00:00
Adam Lesinski
1be18d56a1 am 9e186ec3: am 60f193fb: am e0cfbb61: Merge "Stamp platform version code into app Apks" into lmp-dev 
* commit '9e186ec3a0e87e612786b827c04b6c6e1b507196':
  Stamp platform version code into app Apks
 2014-08-29 19:14:01 +00:00
John Reck
b46c52209f am 724fff20: am ff6feade: Merge "Listener callbacks ordering fixups" into lmp-dev 
* commit '724fff2034e17c601a3787792f8fb73172862c18':
  Listener callbacks ordering fixups
 2014-08-29 19:06:53 +00:00
John Reck
ecb8785efc am 1099d64b: am 09a0c7c8: Merge "Free prefetched layers on TRIM_MEMORY" into lmp-dev 
* commit '1099d64b40f555da92a7aee56c55a20a6f5c24f8':
  Free prefetched layers on TRIM_MEMORY
 2014-08-29 18:52:48 +00:00
Adam Lesinski
ec187b726b am 1ec1f85d: am 995c771f: Merge "Fix memory leak in ResTable" into lmp-dev 
* commit '1ec1f85d6ebab39f3aad6f426e0fe0aeca2b04bb':
  Fix memory leak in ResTable
 2014-08-29 18:49:14 +00:00
Adam Lesinski
343cabb316 am 60f193fb: am e0cfbb61: Merge "Stamp platform version code into app Apks" into lmp-dev 
* commit '60f193fbe905f65750503cdaf8616d31c85016d6':
  Stamp platform version code into app Apks
 2014-08-29 18:48:33 +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