summaryrefslogtreecommitdiffstats
path: root/libs
Commit message (Expand)AuthorAgeFilesLines
...
| | | * | | [Asset Manager] Fix memory leakage bugsean_lu2014-06-161-0/+1
| | | | |/ | | | |/|
* | | | | Merge "Interrupt canvas before invoke"Chris Craik2014-06-171-1/+4
|\ \ \ \ \
| * | | | | Interrupt canvas before invokeChris Craik2014-06-171-1/+4
| | |_|_|/ | |/| | |
* | | | | Merge "Make sure the root node has a type"John Reck2014-06-171-2/+4
|\ \ \ \ \
| * | | | | Make sure the root node has a typeJohn Reck2014-06-171-2/+4
* | | | | | Handle Z in DAJohn Reck2014-06-173-2/+12
|/ / / / /
* | | | | am 88b1c9ad: am e709d53f: am 0d28bb47: Merge "Fix the texture ID reuse issue ...Chris Craik2014-06-173-5/+16
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | am e709d53f: am 0d28bb47: Merge "Fix the texture ID reuse issue in HWUI."Chris Craik2014-06-163-5/+16
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | Merge "Fix the texture ID reuse issue in HWUI."Chris Craik2014-06-163-5/+16
| | |\ \ \
| | | * | | Fix the texture ID reuse issue in HWUI.jiayuanr2014-06-163-5/+16
| | | | |/ | | | |/|
* | | | | am 678886fd: am b1fc06a4: am 5e7ef948: Merge "hwui: fix possible null pointer...Chris Craik2014-06-171-1/+3
|\ \ \ \ \ | |/ / / / | | | | / | |_|_|/ |/| | |
| * | | am b1fc06a4: am 5e7ef948: Merge "hwui: fix possible null pointer de-refrence"Chris Craik2014-06-161-1/+3
| |\ \ \ | | |/ /
| | * | Merge "hwui: fix possible null pointer de-refrence"Chris Craik2014-06-161-1/+3
| | |\ \
| | | * | hwui: fix possible null pointer de-refrenceDigish Pandya2014-06-131-1/+3
| | | |/
* | | | resolved conflicts for merge of ecae1ffd to masterztenghui2014-06-162-18/+40
|\ \ \ \ | |/ / /
| * | | am df36dd20: am 386caf6c: Merge "update parameters in uploadToTexture() for G...Tenghui Zhu2014-06-162-18/+40
| |\ \ \ | | |/ /
| | * | update parameters in uploadToTexture() for GLES20Lu, Shenghua2014-06-132-18/+40
| | |/
* | | Merge "Move LayerType to RenderNode"John Reck2014-06-1211-88/+301
|\ \ \
| * | | Move LayerType to RenderNodeJohn Reck2014-06-1211-88/+301
* | | | am 9de2a8f4: Merge "Add AA flag to TessellationCache key" into lmp-preview-devChris Craik2014-06-122-0/+5
|\ \ \ \
| * | | | Add AA flag to TessellationCache keyChris Craik2014-06-122-0/+5
* | | | | am 98b10e48: Merge "Limit path approximation recursion depth" into lmp-previe...Chris Craik2014-06-122-10/+13
|\ \ \ \ \ | |/ / / /
| * | | | Merge "Limit path approximation recursion depth" into lmp-preview-devChris Craik2014-06-112-10/+13
| |\ \ \ \
| | * | | | Limit path approximation recursion depthChris Craik2014-06-112-10/+13
| * | | | | Workaround to avoid polygon flashing DO NOT MERGEChris Craik2014-06-111-5/+6
| |/ / / /
* | | | | Merge "Fix DA bugs"John Reck2014-06-109-76/+194
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Fix DA bugsJohn Reck2014-06-129-76/+194
* | | | | am 69453787: Merge "Fix race in shadow tessellation by deep copying task para...Chris Craik2014-06-121-12/+17
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Fix race in shadow tessellation by deep copying task paramsChris Craik2014-06-111-12/+17
* | | | | hwui: 64-bit compile issueMark Salyzyn2014-06-101-1/+1
| |/ / / |/| | |
* | | | am b1c76a1a: Merge "Tessellate on worker threads" into lmp-preview-devChris Craik2014-06-1026-213/+867
|\ \ \ \ | |/ / /
| * | | Merge "Tessellate on worker threads" into lmp-preview-devChris Craik2014-06-1026-213/+867
| |\ \ \
| | * | | Tessellate on worker threadsChris Craik2014-06-1026-213/+867
| * | | | DO NOT MERGE - Creating an empty package should be succesfullAdam Lesinski2014-06-101-1/+1
| |/ / /
* | | | Creating an empty package should be succesfullAdam Lesinski2014-06-091-1/+1
* | | | Merge changes Ie0773f85,Ie5e75505John Reck2014-06-0618-162/+391
|\ \ \ \
| * | | | Even FASTER damage calculations!John Reck2014-06-0417-52/+294
| * | | | Have all the setters return changedJohn Reck2014-06-042-110/+97
* | | | | am 8632b85b: Merge "Fix issues around GL on incorrect thread" into lmp-previe...Chris Craik2014-06-051-0/+5
|\ \ \ \ \ | |/ / / / |/| / / / | |/ / /
| * | | Merge "Fix issues around GL on incorrect thread" into lmp-preview-devChris Craik2014-06-051-0/+5
| |\ \ \
| | * | | Fix issues around GL on incorrect threadChris Craik2014-06-051-0/+5
* | | | | Merge "Cleanup"John Reck2014-06-022-14/+11
|\ \ \ \ \
| * | | | | CleanupJohn Reck2014-06-022-14/+11
* | | | | | am feccbdc4: Merge "Add setStartValue to RNA" into lmp-preview-devJohn Reck2014-06-022-4/+3
|\ \ \ \ \ \ | |/ / / / / |/| / / / / | |/ / / /
| * | | | Add setStartValue to RNAJohn Reck2014-06-022-4/+3
* | | | | am ea5af639: Merge "Re-jigger layers" into lmp-preview-devJohn Reck2014-05-308-69/+74
|\ \ \ \ \ | |/ / / /
| * | | | Re-jigger layersJohn Reck2014-05-308-69/+74
* | | | | resolved conflicts for merge of b68f5f09 to masterKenny Root2014-05-302-4/+5
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | am 4d31c547: am ce7fa780: Merge "Fix a resource race bug in PathCache"Chris Craik2014-05-302-4/+5
| |\ \ \ \ | | | |_|/ | | |/| |
| | * | | am ce7fa780: Merge "Fix a resource race bug in PathCache"Chris Craik2014-05-302-4/+5
| | |\ \ \