summaryrefslogtreecommitdiffstats
path: root/libs/hwui
Commit message (Expand)AuthorAgeFilesLines
* Fix styleJohn Reck2014-12-1221-175/+175
* am b9a4d15d: Merge "Force-flush state sync on texid change" into lmp-mr1-devJohn Reck2014-12-121-0/+6
|\
| * Merge "Force-flush state sync on texid change" into lmp-mr1-devJohn Reck2014-12-111-0/+6
| |\
| | * Force-flush state sync on texid changeJohn Reck2014-12-111-0/+6
* | | am 63c7b246: Merge "Correct layer size formatting in trace" into lmp-mr1-devChris Craik2014-12-121-2/+2
|\ \ \ | |/ /
| * | Merge "Correct layer size formatting in trace" into lmp-mr1-devChris Craik2014-12-111-2/+2
| |\ \ | | |/ | |/|
| | * Correct layer size formatting in traceChris Craik2014-12-111-2/+2
* | | am eb2dcc79: Merge "Don\'t preload textures for AssetAtlas" into lmp-mr1-devJohn Reck2014-12-1111-73/+75
|\ \ \ | |/ /
| * | Merge "Don't preload textures for AssetAtlas" into lmp-mr1-devJohn Reck2014-12-1111-73/+75
| |\ \
| | * | Don't preload textures for AssetAtlasJohn Reck2014-12-1011-73/+75
| | |/
* | | resolve merge conflicts of ed211b9 to lmp-mr1-dev-plus-aosp.Chris Craik2014-12-104-8/+19
|\ \ \ | |/ /
| * | Fix frame-allocated path lifecyclesChris Craik2014-12-104-8/+19
| |/
* | resolved conflicts for merge of fe11126d to lmp-mr1-dev-plus-aospJohn Reck2014-12-091-4/+6
|\ \ | |/
| * Merge "Teach AssetAtlas about more drawables" into lmp-mr1-devJohn Reck2014-12-091-2/+4
| |\
| | * Teach AssetAtlas about more drawablesJohn Reck2014-12-091-2/+4
* | | am 497499b1: am 04c2bf4f: Merge "Remove unnecessary/erroneous reference count...Derek Sollenberger2014-12-091-8/+0
|\ \ \ | |/ /
| * | Remove unnecessary/erroneous reference countingDerek Sollenberger2014-12-091-8/+0
| |/
* | resolved conflicts for merge of a51a0901 to lmp-mr1-dev-plus-aospJohn Reck2014-12-046-12/+13
|\ \ | |/
| * Resume RT-animations after a pauseSurfaceJohn Reck2014-12-036-12/+13
* | am 9a04480e: am ef124887: Merge "Clip outline to View clip bounds for shadow ...Chris Craik2014-12-021-4/+23
|\ \ | |/
| * Merge "Clip outline to View clip bounds for shadow computation" into lmp-mr1-devChris Craik2014-12-021-4/+23
| |\
| | * Clip outline to View clip bounds for shadow computationChris Craik2014-12-011-4/+23
| * | Merge "Prevent calling GL functions with an invalid surface" into lmp-mr1-devJohn Reck2014-12-011-1/+1
| |\ \
| | * | Prevent calling GL functions with an invalid surfaceSangkyu Lee2014-12-011-1/+1
| * | | Merge "Enable stencil clipping within clearLayerRegions" into lmp-mr1-devChris Craik2014-12-011-7/+1
| |\ \ \ | | |/ / | |/| |
| | * | Enable stencil clipping within clearLayerRegionsDohyun Lee2014-11-261-7/+1
* | | | am d51205fd: am 6afc5cf3: Merge "Prevent calling GL functions with an invalid...John Reck2014-12-011-1/+1
|\ \ \ \
| * \ \ \ Merge "Prevent calling GL functions with an invalid surface"John Reck2014-12-011-1/+1
| |\ \ \ \
| | * | | | Prevent calling GL functions with an invalid surfaceSangkyu Lee2014-11-261-1/+1
* | | | | | am 6eac26a4: am ca84c8b1: Merge "Revert "Force-use the pbuffer surface for de...Chris Craik2014-11-261-2/+1
|\ \ \ \ \ \ | | |_|/ / / | |/| | | |
| * | | | | Merge "Revert "Force-use the pbuffer surface for destroy"" into lmp-mr1-devChris Craik2014-11-261-2/+1
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | |
| | * | | | Revert "Force-use the pbuffer surface for destroy"Chris Craik2014-11-261-2/+1
* | | | | | am 4e3404d9: am dec3f138: Merge "Force-use the pbuffer surface for destroy" i...John Reck2014-11-261-1/+2
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge "Force-use the pbuffer surface for destroy" into lmp-mr1-devJohn Reck2014-11-251-1/+2
| |\ \ \ \ \ | | |/ / / /
| | * | | | Force-use the pbuffer surface for destroyJohn Reck2014-11-251-1/+2
* | | | | | am 9c5b7b09: am ee660651: Merge "Improve DisplayList state output" into lmp-m...Chris Craik2014-11-263-3/+7
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge "Improve DisplayList state output" into lmp-mr1-devChris Craik2014-11-253-3/+7
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | Improve DisplayList state outputChris Craik2014-11-213-3/+7
| | | |_|/ | | |/| |
* | | | | am bf62d307: am af5bd75b: Merge "Enable stencil clipping within clearLayerReg...Chris Craik2014-11-261-7/+1
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | Enable stencil clipping within clearLayerRegionsDohyun Lee2014-11-241-7/+1
| * | | | Revert "Frameworks/base: Unused parameters in hwui"John Reck2014-11-2225-196/+180
* | | | | am 89a63f02: am 0c31d97a: Merge "Switch TextureCache to SkPixelRef::fStableId...John Reck2014-11-254-32/+30
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Switch TextureCache to SkPixelRef::fStableIdJohn Reck2014-11-244-32/+30
* | | | | am 1ae8a98e: am 29dc496a: Merge "Revert "Add a way to override Xfermode DO NO...Chris Craik2014-11-212-34/+12
|\ \ \ \ \ | |/ / / /
| * | | | Merge "Revert "Add a way to override Xfermode DO NOT MERGE"" into lmp-mr1-devChris Craik2014-11-212-34/+12
| |\ \ \ \
| | * | | | Revert "Add a way to override Xfermode DO NOT MERGE"Chris Craik2014-11-212-34/+12
* | | | | | resolved conflicts for merge of 99377df1 to lmp-mr1-dev-plus-aospAndreas Gampe2014-11-2125-180/+192
|\ \ \ \ \ \ | | |_|/ / / | |/| | | |
| * | | | | Frameworks/base: Unused parameters in hwuiAndreas Gampe2014-11-2125-180/+196
| | |_|_|/ | |/| | |
* | | | | resolve merge conflicts of 57b641a to lmp-mr1-dev-plus-aosp.Chris Craik2014-11-209-36/+89
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Merge "Improve logging around performance critical events" into lmp-mr1-devChris Craik2014-11-209-37/+89
| |\ \ \ \
generated by cgit v1.1 at 2024-12-25 16:08:58 +0000