summaryrefslogtreecommitdiffstats
path: root/libs
Commit message (Expand)AuthorAgeFilesLines
* am 855eadf9: Merge "Fix potential bug with reordered size/offset arguments."Stephen Hines2012-01-303-27/+27
|\
| * Merge "Fix potential bug with reordered size/offset arguments."Stephen Hines2012-01-303-27/+27
| |\
| | * Fix potential bug with reordered size/offset arguments.Stephen Hines2012-01-203-27/+27
* | | am 69726597: Merge "Add stencil buffer to the EGL config"Romain Guy2012-01-303-0/+11
|\ \ \ | |/ /
| * | Add stencil buffer to the EGL configRomain Guy2012-01-303-0/+11
* | | am dfbcee6c: fix buildMathias Agopian2012-01-293-6/+6
|\ \ \ | |/ /
| * | fix buildMathias Agopian2012-01-293-6/+6
* | | Merge "Add comment to confusing commands." into graphics-devJason Sams2012-01-271-0/+6
|\ \ \
| * | | Add comment to confusing commands.Jason Sams2012-01-271-0/+6
* | | | am cee905be: Merge "Don\'t wait forever if there are no commands to execute."Stephen Hines2012-01-271-2/+7
|\ \ \ \ | | |/ / | |/| |
| * | | Merge "Don't wait forever if there are no commands to execute."Stephen Hines2012-01-271-2/+7
| |\ \ \
| | * | | Don't wait forever if there are no commands to execute.Stephen Hines2012-01-261-2/+7
* | | | | am 7bea6502: Merge "SurfaceTexture: use fence sync on omap4 & s5pc110"Jamie Gennis2012-01-271-0/+7
|\ \ \ \ \ | |/ / / /
| * | | | Merge "SurfaceTexture: use fence sync on omap4 & s5pc110"Jamie Gennis2012-01-271-0/+7
| |\ \ \ \
| | * | | | SurfaceTexture: use fence sync on omap4 & s5pc110Daniel Lam2012-01-221-0/+7
* | | | | | am caaac348: Merge "Fix bugs with unsigned rsAtomicCas/Max/Min."Stephen Hines2012-01-262-3/+23
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge "Fix bugs with unsigned rsAtomicCas/Max/Min."Stephen Hines2012-01-262-3/+23
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| | * | | | Fix bugs with unsigned rsAtomicCas/Max/Min.Stephen Hines2012-01-252-3/+23
| | | |_|/ | | |/| |
* | | | | am 1a54368b: Merge "Add full support for Canvas.setDrawFilter()"Romain Guy2012-01-234-36/+113
|\ \ \ \ \ | |/ / / /
| * | | | Add full support for Canvas.setDrawFilter()Romain Guy2012-01-234-36/+113
* | | | | am 22d41843: Fix the build, for realRomain Guy2012-01-191-1/+1
|\ \ \ \ \ | |/ / / /
| * | | | Fix the build, for realRomain Guy2012-01-191-1/+1
* | | | | am 4785a6ff: Merge "Full support for Canvas.drawPosText"Romain Guy2012-01-183-68/+202
|\ \ \ \ \ | |/ / / /
| * | | | Merge "Full support for Canvas.drawPosText"Romain Guy2012-01-183-68/+202
| |\ \ \ \ | | |_|/ / | |/| | |
| | * | | Full support for Canvas.drawPosTextRomain Guy2012-01-183-68/+202
| | |/ /
* | | | am b41c96a3: am 43fda84e: am 6ad9ea7d: Merge "update overview page for rs api...Robert Ly2012-01-181-3/+3
|\ \ \ \ | |/ / /
| * | | am 43fda84e: am 6ad9ea7d: Merge "update overview page for rs api docs to open...Robert Ly2012-01-181-3/+3
| |\ \ \ | | |/ / | |/| |
| | * | update overview page for rs api docs to open iframe links in parentRobert Ly2012-01-131-3/+3
| | * | cherrypick from master - add overview description for RS API reference Change...Robert Ly2012-01-131-0/+25
* | | | am fb9ffe02: Merge "First pass at implementing Canvas.drawPosText() in GL"Romain Guy2012-01-174-1/+50
|\ \ \ \ | |/ / / | | | / | |_|/ |/| |
| * | First pass at implementing Canvas.drawPosText() in GLRomain Guy2012-01-174-1/+50
* | | am d36f7d24: Merge "Add support for new root.expand() calls."Stephen Hines2012-01-133-192/+22
|\ \ \ | |/ /
| * | Merge "Add support for new root.expand() calls."Stephen Hines2012-01-133-192/+22
| |\ \
| | * | Add support for new root.expand() calls.Stephen Hines2012-01-123-192/+22
* | | | am 1e808691: Get AID_GRAPHICS from right placeGlenn Kasten2012-01-131-9/+0
|\ \ \ \ | |/ / /
| * | | Get AID_GRAPHICS from right placeGlenn Kasten2012-01-131-9/+0
* | | | Merge "Start implementing SurfaceTexture streaming into RS allocations." into...Jason Sams2012-01-1310-3/+50
|\ \ \ \
| * | | | Start implementing SurfaceTexture streaming into RS allocations.Jason Sams2012-01-1310-3/+50
* | | | | Merge "Plumbing for RS priority." into graphics-devJason Sams2012-01-125-0/+17
|\ \ \ \ \ | |/ / / /
| * | | | Plumbing for RS priority.Jason Sams2012-01-125-0/+17
* | | | | am 2fdc357b: Merge "remove dead/usnused code"Mathias Agopian2012-01-123-108/+0
|\ \ \ \ \ | |/ / / / |/| / / / | |/ / /
| * | | remove dead/usnused codeMathias Agopian2012-01-113-108/+0
| |/ /
* | | Fix LOGE.Jason Sams2012-01-102-7/+7
* | | am 38e90751: Merge "Rename LOG_ASSERT to ALOG_ASSERT DO NOT MERGE"Steve Block2012-01-105-29/+29
|\ \ \ | |/ /
| * | Rename LOG_ASSERT to ALOG_ASSERT DO NOT MERGESteve Block2012-01-095-29/+29
* | | Merge "Now utilizing ability to bind constants. Fixing small copy/paste typo....Alex Sakhartchouk2012-01-101-3/+3
|\ \ \
| * | | Now utilizing ability to bind constants.Alex Sakhartchouk2012-01-101-3/+3
* | | | Merge "Adding ability to bind constants to shaders." into graphics-devAlex Sakhartchouk2012-01-104-0/+48
|\ \ \ \ | |/ / /
| * | | Adding ability to bind constants to shaders.Alex Sakhartchouk2012-01-104-0/+48
* | | | resolved conflicts for merge of 08289f55 to graphics-devSteve Block2012-01-0983-453/+453
|\ \ \ \ | | |/ / | |/| |