| Commit message (Expand) | Author | Age | Files | Lines |
|---|
| * | am 287c53f4: am 76507a64: am 72dc62ea: Merge "Track removal of refcounts from... | Narayan Kamath | 2015-02-24 | 2 | -4/+4 |
| |\ |
|
| | * | am 72dc62ea: Merge "Track removal of refcounts from FileMap." | Narayan Kamath | 2015-02-24 | 2 | -4/+4 |
| | |\ |
|
| | | * | Track removal of refcounts from FileMap. | Narayan Kamath | 2015-02-23 | 2 | -4/+4 |
| * | | | Merge "Fix atrace saveLayer flag logging" | Chris Craik | 2015-02-24 | 1 | -3/+4 |
| |\ \ \ |
|
| | * | | | Fix atrace saveLayer flag logging | Chris Craik | 2015-02-23 | 1 | -3/+4 |
| * | | | | Merge "Simplify Texture member initialization" | Chris Craik | 2015-02-23 | 5 | -66/+23 |
| |\ \ \ \ |
|
| | * | | | | Simplify Texture member initialization | Chris Craik | 2015-02-23 | 5 | -66/+23 |
| * | | | | | Merge "Correctly name the lightRadius" | ztenghui | 2015-02-20 | 3 | -7/+7 |
| |\ \ \ \ \ |
|
| | * | | | | | Correctly name the lightRadius | ztenghui | 2015-02-20 | 3 | -7/+7 |
| * | | | | | | Merge "C++11 style fixups" | John Reck | 2015-02-20 | 6 | -32/+43 |
| |\ \ \ \ \ \ |
|
| | * | | | | | | C++11 style fixups | John Reck | 2015-02-20 | 6 | -32/+43 |
| | |/ / / / / |
|
| * | | | | | | Merge "Glop layer mesh rendering" | Chris Craik | 2015-02-20 | 11 | -128/+192 |
| |\ \ \ \ \ \
| |/ / / / /
|/| / / / /
| |/ / / / |
|
| | * | | | | Glop layer mesh rendering | Chris Craik | 2015-02-19 | 11 | -128/+192 |
| | |/ / / |
|
| * | | | | Merge "Initial attempt at jank-tracking stat collection" | John Reck | 2015-02-20 | 18 | -57/+564 |
| |\ \ \ \ |
|
| | * | | | | Initial attempt at jank-tracking stat collection | John Reck | 2015-02-20 | 18 | -57/+564 |
| | |/ / / |
|
| * | | | | Fix onDrawText for non-absolute positioning | Tom Hudson | 2015-02-20 | 1 | -5/+7 |
| |/ / / |
|
| * | | | Merge "Glop text shadows, clearLayerRegions, and rectangleList" | Chris Craik | 2015-02-18 | 4 | -39/+131 |
| |\ \ \ |
|
| | * | | | Glop text shadows, clearLayerRegions, and rectangleList | Chris Craik | 2015-02-17 | 4 | -39/+131 |
| * | | | | Fix layer shader to store layer pointer | Chris Craik | 2015-02-18 | 1 | -1/+1 |
| |/ / / |
|
| * | | | Glop SkiaShader support | Chris Craik | 2015-02-17 | 10 | -53/+389 |
| * | | | Glop path texture support | Chris Craik | 2015-02-12 | 6 | -18/+71 |
| * | | | Glop Bitmap and RoundRect clipping support | Chris Craik | 2015-02-12 | 14 | -189/+421 |
| * | | | Fix Glop vertex alpha blending | Chris Craik | 2015-02-09 | 3 | -6/+17 |
| * | | | Glop support for indexed quads | Chris Craik | 2015-02-09 | 8 | -53/+123 |
| * | | | Merge "Glop ColorFilter & VertexBuffer support, initial enable" | Chris Craik | 2015-02-06 | 39 | -415/+443 |
| |\ \ \ |
|
| | * | | | Glop ColorFilter & VertexBuffer support, initial enable | Chris Craik | 2015-02-06 | 39 | -415/+443 |
| * | | | | Merge "Don't try to fully tear down program in terminate()" | Chris Craik | 2015-02-05 | 1 | -1/+1 |
| |\ \ \ \
| |/ / / |
|
| | * | | | Don't try to fully tear down program in terminate() | Chris Craik | 2015-02-05 | 1 | -1/+1 |
| * | | | | Merge "GlopBuilder, and test app refactor" | Chris Craik | 2015-02-05 | 15 | -112/+417 |
| |\ \ \ \
| |/ / / |
|
| | * | | | GlopBuilder, and test app refactor | Chris Craik | 2015-02-04 | 15 | -112/+417 |
| * | | | | resolved conflicts for merge of c7e6b93a to master | John Reck | 2015-02-04 | 4 | -13/+13 |
| |\ \ \ \
| | |/ /
| |/| | |
|
| | * | | | am af6eaf65: Merge "Fix ANR caused by hwuiTask thread" automerge: 5ad36d4 | John Reck | 2015-02-04 | 4 | -13/+13 |
| | |\ \ \
| | | |/
| | |/| |
|
| | | * | | Merge "Fix ANR caused by hwuiTask thread" | John Reck | 2015-02-04 | 4 | -13/+13 |
| | | |\ \ |
|
| | | | * | | Fix ANR caused by hwuiTask thread | Sangkyu Lee | 2015-01-12 | 4 | -13/+13 |
| * | | | | | Merge "Refactoring of Program ownership/lifecycle, and WIP Glop rendering path" | Chris Craik | 2015-02-03 | 17 | -124/+293 |
| |\ \ \ \ \
| | |_|_|/
| |/| | | |
|
| | * | | | | Refactoring of Program ownership/lifecycle, and WIP Glop rendering path | Chris Craik | 2015-02-02 | 17 | -124/+293 |
| * | | | | | Merge "Add a WAIT_FOR_GPU_COMPLETION option" | John Reck | 2015-01-30 | 4 | -115/+21 |
| |\ \ \ \ \ |
|
| | * | | | | | Add a WAIT_FOR_GPU_COMPLETION option | John Reck | 2015-01-30 | 4 | -115/+21 |
| * | | | | | | Merge "Refactor blending and texture gl state" | Chris Craik | 2015-01-30 | 26 | -345/+498 |
| |\ \ \ \ \ \
| | |/ / / /
| |/| | | | |
|
| | * | | | | | Refactor blending and texture gl state | Chris Craik | 2015-01-30 | 26 | -345/+498 |
| * | | | | | | Merge "Create proxy between Skia's SkCanvas and the framework Canvas." | Derek Sollenberger | 2015-01-30 | 6 | -12/+474 |
| |\ \ \ \ \ \ |
|
| | * | | | | | | Create proxy between Skia's SkCanvas and the framework Canvas. | Derek Sollenberger | 2015-01-30 | 6 | -12/+474 |
| | | |/ / / /
| |/| | | | |
|
| * | | | | | | Merge "Fix double create of Caches" | Chris Craik | 2015-01-30 | 1 | -1/+3 |
| |\ \ \ \ \ \
| |/ / / / /
|/| | | | | |
|
| | * | | | | | Fix double create of Caches | Chris Craik | 2015-01-30 | 1 | -1/+3 |
| | |/ / / / |
|
| * | | | | | Merge "Rename Canvas::getSkCanvas to Canvas::asSkCanvas" | Derek Sollenberger | 2015-01-30 | 3 | -54/+59 |
| |\ \ \ \ \
| |/ / / /
|/| | | | |
|
| | * | | | | Rename Canvas::getSkCanvas to Canvas::asSkCanvas | Derek Sollenberger | 2015-01-29 | 3 | -54/+59 |
| * | | | | | resolved conflicts for merge of fe5ac4fc to master | John Reck | 2015-01-29 | 5 | -7/+27 |
| |\ \ \ \ \
| | |/ / /
| |/| | | |
|
| | * | | | | am 5f3e21ce: am 6efc3ac6: Merge "Allow ~Layer() to happen after onGLContextDe... | John Reck | 2015-01-29 | 5 | -7/+26 |
| | |\ \ \ \ |
|
| | | * | | | | Allow ~Layer() to happen after onGLContextDestroyed | John Reck | 2015-01-29 | 5 | -7/+26 |
| * | | | | | | Move more GL state management to RenderState and its directory | Chris Craik | 2015-01-28 | 25 | -497/+683 |
