summaryrefslogtreecommitdiffstats
path: root/libs
Commit message (Collapse)AuthorAgeFilesLines
* Merge "Use vertex assignment instead of manual copy"Chris Craik2013-12-171-36/+28
|\
| * Use vertex assignment instead of manual copyChris Craik2013-12-161-36/+28
| | | | | | | | Change-Id: I36c806e3370abca61e5bf5064f0f1a776a9ce487
* | Create private properties on GLCanvas for experimentation with 3dChris Craik2013-12-165-22/+64
|/ | | | Change-Id: I17772f61efce727cb4c1111f4d97f58c741786b8
* Calculate and show Ambient shadow.ztenghui2013-12-1311-95/+595
| | | | | | | | | Basically we compute the shadow as a strip of triangles, whose alpha value is the strength of the shadow. We use the normal to extend the geometry. And we use static function and try to avoid new/malloc in the computation. Change-Id: I382286f1cad351bd5ff983f76f446c075819dcaf
* Merge "Handle user-defined cache path for RS."Tim Murray2013-12-131-1/+3
|\
| * Handle user-defined cache path for RS.Tim Murray2013-12-131-1/+3
| | | | | | | | Change-Id: I92e3346dca331ae6a9dfbe4f95292bc604dfd196
* | Merge "3d view system!"Chris Craik2013-12-1313-132/+559
|\ \ | |/ |/|
| * 3d view system!Chris Craik2013-12-1213-132/+559
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | True 3d transformations are now supported by DisplayLists and the renderer, initially with the translationZ property on view. Renderer operations used directly by DisplayList (formerly, clip/save/restore/saveLayer) are now more simply managed by allocating them temporarily on the handler's allocator, which exists for a single frame. This is much simpler than continuing to expand the pool of pre-allocated DisplayListOps now that more operations are called directly by DisplayList, especially with z ordered drawing. Still TODO: -APIs for camera positioning, shadows -Make Z apis public, and expose through XML -Make invalidation / input 3d aware Change-Id: I95fe6fa03f9b6ddd34a7e0c6ec8dd9fe47c6c6eb
* | Unbreak display list debug dumpingJohn Reck2013-12-103-8/+1
| | | | | | | | Change-Id: I1c6a79f047b29fa60907f6e128cb843a45b88bff
* | RenderThread workJohn Reck2013-12-095-0/+223
| | | | | | | | | | | | Hacky prototype needs a private API to enable Change-Id: I21e0ddf3cdbd38a4036354b5d6012449e1a34849
* | Merge "Call SkBitmap::config() instead of ::getConfig()"Leon Scroggins III2013-12-042-7/+7
|\ \ | |/ |/|
| * Call SkBitmap::config() instead of ::getConfig()Leon Scroggins III2013-12-032-7/+7
| | | | | | | | | | | | getConfig() has been deprecated. Change-Id: I32066256ab82ac4760c752c80856d1b56d291fae
* | Deprecate Android-specific SkPaint functions.Victoria Lease2013-12-032-6/+9
|/ | | | | | | | | | | | | The following functions were problematic: const SkGlyph& getUnicharMetrics(SkUnichar, const SkMatrix*); const SkGlyph& getGlyphMetrics(uint16_t, const SkMatrix*); const void* findImage(const SkGlyph&, const SkMatrix*); Replacing them with calls through SkGlyphCache solved a nasty crash bug, so they have all been deprecated. Bug: 11968757 Change-Id: Id746315d41aec5b211b78b172a883c2061130f08
* Clean up quick rejection, especially surrounding points + lines.Chris Craik2013-11-228-76/+139
| | | | | | | | | | | | | | | | | | | | bug:4351353 quickReject and quickRejectNoScissor have been renamed and refactored: - to make the scissor side effect clear and explicit - dangerous methods no longer public - to make the simple quick reject check logic const - simple quick reject is now conservative This CL also fixes several issues with line and point quickRejection - sub-pixel and hairline lines are much less likely to be incorrectly rejected, especially at small canvas scale. Additionally, alpha modulation for AA points < 1px in size is now correct, dumplicating SW behavior (similar to lines and stroked shapes work). Change-Id: Ibb0710c721b9fb415d05acf54dd3d2b4d602156a
* Clean up modelView matrix logicChris Craik2013-11-183-96/+123
| | | | | | | | | bug:11359533 Also changes shader matrix to correctly account for modelView and currentTransform() Change-Id: I6ce18857dc6d08ea08ca7535385c2ad351ec3caa
* am 2f70da2b: am 6ed16a89: am 0b807d2e: Merge "Update the layer\'s alpha ↵Chris Craik2013-11-061-0/+6
|\ | | | | | | | | | | | | value upon composition of the layer" * commit '2f70da2bc5ce9f4766395cc9d848f0afe8f6a2a9': Update the layer's alpha value upon composition of the layer
| * am 6ed16a89: am 0b807d2e: Merge "Update the layer\'s alpha value upon ↵Chris Craik2013-11-061-0/+6
| |\ | | | | | | | | | | | | | | | | | | composition of the layer" * commit '6ed16a89d836a33b9242f91b05e8ecb149abf909': Update the layer's alpha value upon composition of the layer
| | * Update the layer's alpha value upon composition of the layerDigish Pandya2013-11-051-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes: This patch makes sure that the layer's alpha value is up-to-date and does not reflect the previous view's alpha value. it fixes the square block on marquee fading edge when text view is applied transparency. Change-Id: I110649db72a75fecc02ba56c201a05773f80328c
| * | am 8f592378: am 69920427: Merge "Fix a variety of small publicly-reported bugs."Elliott Hughes2013-10-292-12/+12
| |\ \ | | |/ | | | | | | | | | * commit '8f592378a1ea7f31d57253dc202f42707ef4da36': Fix a variety of small publicly-reported bugs.
| | * Fix a variety of small publicly-reported bugs.Elliott Hughes2013-10-292-12/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Possible NULL dereference in cmds/bootanimation/BootAnimation.cpp. https://code.google.com/p/android/issues/detail?id=61556 Missing fclose in core/jni/android_os_Debug.cpp. https://code.google.com/p/android/issues/detail?id=61546 Bad loop guards in core/jni/android_util_Process.cpp. https://code.google.com/p/android/issues/detail?id=61557 Assignment to wrong variable in libs/androidfw/AssetManager.cpp. https://code.google.com/p/android/issues/detail?id=61560 Missing delete[]s in libs/androidfw/ObbFile.cpp. https://code.google.com/p/android/issues/detail?id=61549 Leaks on error in tools/aapt/Images.cpp. https://code.google.com/p/android/issues/detail?id=61552 Two missing fclose calls in tools/aapt/Resource.cpp. https://code.google.com/p/android/issues/detail?id=61553 Missing fclose in tools/aidl/aidl.cpp. https://code.google.com/p/android/issues/detail?id=61554 Change-Id: I5820f3824e72d07a9acb776cf0af3e7443f5694a
* | | Clean unused parameters, disable warningsChris Craik2013-10-1712-40/+37
| | | | | | | | | | | | Change-Id: Iddb872f53075dd022eeef45265594d1c6a9e2bc0
* | | move libandroidfw to frameworks/nativeMike Lockwood2013-10-0319-14047/+0
| | | | | | | | | | | | Change-Id: Ic5b8a2742c7141156ab0f00ca29097bfe92bce60
* | | Merge "add a test for BackupData helpers."Chris Wren2013-10-012-0/+439
|\ \ \
| * | | add a test for BackupData helpers.Chris Wren2013-09-252-0/+439
| | | | | | | | | | | | | | | | | | | | Bug: 10821481 Change-Id: I3e28123d36927ae4a22d26378b8bf1cd4e87cfd2
* | | | am b4d4d687: am 318ae7bb: Take SkBitmap\'s stride into account when ↵Romain Guy2013-09-255-18/+29
|\ \ \ \ | |/ / / |/| / / | |/ / | | | | | | | | | uploading textures Bug #10151807 * commit 'b4d4d68795a10401e3cb50df491a2e5d5b1ac96e': Take SkBitmap's stride into account when uploading textures Bug #10151807
| * | Take SkBitmap's stride into account when uploading texturesRomain Guy2013-09-255-18/+29
| | | | | | | | | | | | | | | Bug #10151807 Change-Id: I7ba4804fa3619088fea70eb55f10519fff0bf5f0
* | | am bd842f96: am d8a84a86: Merge "Correct bitmap merging logic" into klp-devChris Craik2013-09-205-13/+8
|\ \ \ | |/ / | | | | | | | | | * commit 'bd842f96ed4a9b7887be4702828ea0034d66ef85': Correct bitmap merging logic
| * | Merge "Correct bitmap merging logic" into klp-devChris Craik2013-09-215-13/+8
| |\ \
| | * | Correct bitmap merging logicChris Craik2013-09-205-13/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug:10863163 This fixes two issues The check for pure translation was incorrect. It was fixed and renamed for clarity. Certain matrix paths weren't setting kTypePositiveScale. For simplicity (and because positive scale is simple to check) removed flag in favor of dynamic checking. Change-Id: Ic5ce235653ef49a68b8b242bd89fc2e95874ecc9
* | | | am ab99b39d: am ddc0a63d: Merge "fix emoji clipping in hw draw path" into ↵Victoria Lease2013-09-201-1/+1
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | klp-dev * commit 'ab99b39d7d152de35ea02a364190ff325da4015b': fix emoji clipping in hw draw path
| * | | fix emoji clipping in hw draw pathVictoria Lease2013-09-191-1/+1
| |/ / | | | | | | | | | | | | | | | | | | | | | I guess we don't want to overwrite the last line in every RGBA glyph with our one-line texture atlas spacer? Bug: 10841207 Change-Id: Ief85ca58650c731e9d21dbf90942b7b44670abcc
* | | resolved conflicts for merge of d97303a7 to masterChris Craik2013-09-174-18/+43
|\ \ \ | |/ / | | | | | | Change-Id: I29e2e64e0ec241675762482cbe5c5e9dc58adca6
| * | Merge "Conservatively estimate geometry bounds" into klp-devChris Craik2013-09-184-18/+43
| |\ \
| | * | Conservatively estimate geometry boundsChris Craik2013-09-174-18/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug:10761696 Avoids a case where a rect with top coordinate of (e.g.) 0.51f is assumed to not draw in the first row of pixels, which leads to it not being clipped. Since rounding can cause it to render in this first pixel anyway, we very slightly expand geometry bounds. Now, in ambiguous cases, the geometry bounds are expanded so clipping is more likely to happen. Change-Id: I119b7c7720de07bac1634549724ffb63935567fc
* | | | am 7cb404dd: am a42ceb03: Merge "Disallow negative scale matrices in merged ↵Chris Craik2013-09-174-3/+21
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | Bitmap drawing" into klp-dev * commit '7cb404dda770da24aaf1b484d6575d5480cf080f': Disallow negative scale matrices in merged Bitmap drawing
| * | | Merge "Disallow negative scale matrices in merged Bitmap drawing" into klp-devChris Craik2013-09-184-3/+21
| |\ \ \
| | * | | Disallow negative scale matrices in merged Bitmap drawingChris Craik2013-09-164-3/+21
| | |/ / | | | | | | | | | | | | | | | | | | | | bug:10622962 Change-Id: I55ac18ad56b53dc9e6e6ea14cd3ec4bdafa98ac3
* | | | am bb451bda: am 0d3c52d3: Merge "Fix merged operation clipping" into klp-devChris Craik2013-09-131-1/+1
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit 'bb451bda4a08f79b60f84242647bdb40962f01b5': Fix merged operation clipping
| * | | Fix merged operation clippingChris Craik2013-09-131-1/+1
| |/ / | | | | | | | | | | | | | | | | | | | | | bug:10745870 Missing 'const' meant MergingDrawBatch would never clip anything. Change-Id: Ia6367eff94cf5f437efafbc3ba7f0da102ffd956
* | | am 0885b291: am 4801a4f9: Merge "Always disable the clip for layers Bug ↵Romain Guy2013-09-121-4/+2
|\ \ \ | |/ / | | | | | | | | | | | | | | | #8149344" into klp-dev * commit '0885b291650c1b85220645943c9eab3080170aca': Always disable the clip for layers Bug #8149344
| * | Always disable the clip for layersRomain Guy2013-09-121-4/+2
| | | | | | | | | | | | | | | Bug #8149344 Change-Id: Ifd413cadb171232eb846b3d91b05b2d2457b9f35
* | | am 3f30e67a: am 88ee0dac: Merge "Move DeferredDisplayState out of ops" into ↵Chris Craik2013-09-126-143/+195
|\ \ \ | |/ / | | | | | | | | | | | | | | | klp-dev * commit '3f30e67afbceb185c52833cec539cc0199716ef0': Move DeferredDisplayState out of ops
| * | Merge "Move DeferredDisplayState out of ops" into klp-devChris Craik2013-09-126-143/+195
| |\ \
| | * | Move DeferredDisplayState out of opsChris Craik2013-09-126-143/+195
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug:9969358 Instead of storing DeferredDisplayState within an op (thus forcing ops to be tied to a single state instance), associate each op with a new state at DeferredDisplayList insertion time. Now, DisplayLists (and the ops within) can be reused in a single DeferredDisplayList draw call, as ops will use different state instances at different points in the frame. Change-Id: I525ab2abe0c3883679f2fa00b219b293e9ec53d9
* | | | am efbfe81d: am 931f6f87: Merge "Fix another off-by-one error in ZipFileRO" ↵Kenny Root2013-09-111-1/+1
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | into klp-dev * commit 'efbfe81d2607221170a7fcb1d22a82c198e789f4': Fix another off-by-one error in ZipFileRO
| * | | Fix another off-by-one error in ZipFileROKenny Root2013-09-111-1/+1
| | | | | | | | | | | | | | | | | | | | Bug: 10424836 Change-Id: I491458bd31ef39e87127d061427b32a3d59ac807
* | | | am d9141d93: am d292f790: Merge "Reconcile differences between zip ↵Kenny Root2013-09-111-65/+129
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | implementations" into klp-dev * commit 'd9141d939eff2e53c95f92a6a2c34116fd7a868b': Reconcile differences between zip implementations
| * | | Reconcile differences between zip implementationsKenny Root2013-09-111-65/+129
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reconcile the difference between ZipFileRO and java.util.ZipFile to have the same behavior. Bug: 10424836 Change-Id: I6bde1bad7e20065ee650945fd43a913c05ce5ac7
| * | | Revert "Reconcile differences between zip implementations"Kenny Root2013-09-111-129/+65
| | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 9ffddc7eb50653cf60ce6b27a0e1945eed5b5ce1. Change-Id: Ifeba63511211bfc2b375f2205e319e91403b7d06
* | | | Revert "Reconcile differences between zip implementations"Kenny Root2013-09-111-129/+65
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 9ffddc7eb50653cf60ce6b27a0e1945eed5b5ce1. (cherry picked from commit 0c4b3646b0feb1bed89bf374ff03af797834d8c3) Change-Id: Ifeba63511211bfc2b375f2205e319e91403b7d06