Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| | | * | | | [Asset Manager] Fix memory leakage bug | sean_lu | 2014-06-16 | 1 | -0/+1 | |
| | | | |/ | | | |/| | ||||||
* | | | | | Merge "Interrupt canvas before invoke" | Chris Craik | 2014-06-17 | 1 | -1/+4 | |
|\ \ \ \ \ | ||||||
| * | | | | | Interrupt canvas before invoke | Chris Craik | 2014-06-17 | 1 | -1/+4 | |
| | |_|_|/ | |/| | | | ||||||
* | | | | | Merge "Make sure the root node has a type" | John Reck | 2014-06-17 | 1 | -2/+4 | |
|\ \ \ \ \ | ||||||
| * | | | | | Make sure the root node has a type | John Reck | 2014-06-17 | 1 | -2/+4 | |
* | | | | | | Handle Z in DA | John Reck | 2014-06-17 | 3 | -2/+12 | |
|/ / / / / | ||||||
* | | | | | am 88b1c9ad: am e709d53f: am 0d28bb47: Merge "Fix the texture ID reuse issue ... | Chris Craik | 2014-06-17 | 3 | -5/+16 | |
|\ \ \ \ \ | | |/ / / | |/| | | | ||||||
| * | | | | am e709d53f: am 0d28bb47: Merge "Fix the texture ID reuse issue in HWUI." | Chris Craik | 2014-06-16 | 3 | -5/+16 | |
| |\ \ \ \ | | | |/ / | | |/| | | ||||||
| | * | | | Merge "Fix the texture ID reuse issue in HWUI." | Chris Craik | 2014-06-16 | 3 | -5/+16 | |
| | |\ \ \ | ||||||
| | | * | | | Fix the texture ID reuse issue in HWUI. | jiayuanr | 2014-06-16 | 3 | -5/+16 | |
| | | | |/ | | | |/| | ||||||
* | | | | | am 678886fd: am b1fc06a4: am 5e7ef948: Merge "hwui: fix possible null pointer... | Chris Craik | 2014-06-17 | 1 | -1/+3 | |
|\ \ \ \ \ | |/ / / / | | | | / | |_|_|/ |/| | | | ||||||
| * | | | am b1fc06a4: am 5e7ef948: Merge "hwui: fix possible null pointer de-refrence" | Chris Craik | 2014-06-16 | 1 | -1/+3 | |
| |\ \ \ | | |/ / | ||||||
| | * | | Merge "hwui: fix possible null pointer de-refrence" | Chris Craik | 2014-06-16 | 1 | -1/+3 | |
| | |\ \ | ||||||
| | | * | | hwui: fix possible null pointer de-refrence | Digish Pandya | 2014-06-13 | 1 | -1/+3 | |
| | | |/ | ||||||
* | | | | resolved conflicts for merge of ecae1ffd to master | ztenghui | 2014-06-16 | 2 | -18/+40 | |
|\ \ \ \ | |/ / / | ||||||
| * | | | am df36dd20: am 386caf6c: Merge "update parameters in uploadToTexture() for G... | Tenghui Zhu | 2014-06-16 | 2 | -18/+40 | |
| |\ \ \ | | |/ / | ||||||
| | * | | update parameters in uploadToTexture() for GLES20 | Lu, Shenghua | 2014-06-13 | 2 | -18/+40 | |
| | |/ | ||||||
* | | | Merge "Move LayerType to RenderNode" | John Reck | 2014-06-12 | 11 | -88/+301 | |
|\ \ \ | ||||||
| * | | | Move LayerType to RenderNode | John Reck | 2014-06-12 | 11 | -88/+301 | |
* | | | | am 9de2a8f4: Merge "Add AA flag to TessellationCache key" into lmp-preview-dev | Chris Craik | 2014-06-12 | 2 | -0/+5 | |
|\ \ \ \ | ||||||
| * | | | | Add AA flag to TessellationCache key | Chris Craik | 2014-06-12 | 2 | -0/+5 | |
* | | | | | am 98b10e48: Merge "Limit path approximation recursion depth" into lmp-previe... | Chris Craik | 2014-06-12 | 2 | -10/+13 | |
|\ \ \ \ \ | |/ / / / | ||||||
| * | | | | Merge "Limit path approximation recursion depth" into lmp-preview-dev | Chris Craik | 2014-06-11 | 2 | -10/+13 | |
| |\ \ \ \ | ||||||
| | * | | | | Limit path approximation recursion depth | Chris Craik | 2014-06-11 | 2 | -10/+13 | |
| * | | | | | Workaround to avoid polygon flashing DO NOT MERGE | Chris Craik | 2014-06-11 | 1 | -5/+6 | |
| |/ / / / | ||||||
* | | | | | Merge "Fix DA bugs" | John Reck | 2014-06-10 | 9 | -76/+194 | |
|\ \ \ \ \ | | |/ / / | |/| | | | ||||||
| * | | | | Fix DA bugs | John Reck | 2014-06-12 | 9 | -76/+194 | |
* | | | | | am 69453787: Merge "Fix race in shadow tessellation by deep copying task para... | Chris Craik | 2014-06-12 | 1 | -12/+17 | |
|\ \ \ \ \ | | |/ / / | |/| | | | ||||||
| * | | | | Fix race in shadow tessellation by deep copying task params | Chris Craik | 2014-06-11 | 1 | -12/+17 | |
* | | | | | hwui: 64-bit compile issue | Mark Salyzyn | 2014-06-10 | 1 | -1/+1 | |
| |/ / / |/| | | | ||||||
* | | | | am b1c76a1a: Merge "Tessellate on worker threads" into lmp-preview-dev | Chris Craik | 2014-06-10 | 26 | -213/+867 | |
|\ \ \ \ | |/ / / | ||||||
| * | | | Merge "Tessellate on worker threads" into lmp-preview-dev | Chris Craik | 2014-06-10 | 26 | -213/+867 | |
| |\ \ \ | ||||||
| | * | | | Tessellate on worker threads | Chris Craik | 2014-06-10 | 26 | -213/+867 | |
| * | | | | DO NOT MERGE - Creating an empty package should be succesfull | Adam Lesinski | 2014-06-10 | 1 | -1/+1 | |
| |/ / / | ||||||
* | | | | Creating an empty package should be succesfull | Adam Lesinski | 2014-06-09 | 1 | -1/+1 | |
* | | | | Merge changes Ie0773f85,Ie5e75505 | John Reck | 2014-06-06 | 18 | -162/+391 | |
|\ \ \ \ | ||||||
| * | | | | Even FASTER damage calculations! | John Reck | 2014-06-04 | 17 | -52/+294 | |
| * | | | | Have all the setters return changed | John Reck | 2014-06-04 | 2 | -110/+97 | |
* | | | | | am 8632b85b: Merge "Fix issues around GL on incorrect thread" into lmp-previe... | Chris Craik | 2014-06-05 | 1 | -0/+5 | |
|\ \ \ \ \ | |/ / / / |/| / / / | |/ / / | ||||||
| * | | | Merge "Fix issues around GL on incorrect thread" into lmp-preview-dev | Chris Craik | 2014-06-05 | 1 | -0/+5 | |
| |\ \ \ | ||||||
| | * | | | Fix issues around GL on incorrect thread | Chris Craik | 2014-06-05 | 1 | -0/+5 | |
* | | | | | Merge "Cleanup" | John Reck | 2014-06-02 | 2 | -14/+11 | |
|\ \ \ \ \ | ||||||
| * | | | | | Cleanup | John Reck | 2014-06-02 | 2 | -14/+11 | |
* | | | | | | am feccbdc4: Merge "Add setStartValue to RNA" into lmp-preview-dev | John Reck | 2014-06-02 | 2 | -4/+3 | |
|\ \ \ \ \ \ | |/ / / / / |/| / / / / | |/ / / / | ||||||
| * | | | | Add setStartValue to RNA | John Reck | 2014-06-02 | 2 | -4/+3 | |
* | | | | | am ea5af639: Merge "Re-jigger layers" into lmp-preview-dev | John Reck | 2014-05-30 | 8 | -69/+74 | |
|\ \ \ \ \ | |/ / / / | ||||||
| * | | | | Re-jigger layers | John Reck | 2014-05-30 | 8 | -69/+74 | |
* | | | | | resolved conflicts for merge of b68f5f09 to master | Kenny Root | 2014-05-30 | 2 | -4/+5 | |
|\ \ \ \ \ | | |_|/ / | |/| | | | ||||||
| * | | | | am 4d31c547: am ce7fa780: Merge "Fix a resource race bug in PathCache" | Chris Craik | 2014-05-30 | 2 | -4/+5 | |
| |\ \ \ \ | | | |_|/ | | |/| | | ||||||
| | * | | | am ce7fa780: Merge "Fix a resource race bug in PathCache" | Chris Craik | 2014-05-30 | 2 | -4/+5 | |
| | |\ \ \ |