summaryrefslogtreecommitdiffstats
path: root/libs
Commit message (Collapse)AuthorAgeFilesLines
* Merge "Clipping performance improvements"Rob Tsuk2015-01-1515-204/+884
|\
| * Clipping performance improvementsRob Tsuk2015-01-1415-204/+884
| | | | | | | | | | | | | | | | | | | | | | | | Create a ClipArea class to handle tracking clip regions. This class can select the most efficient implementation depending on the types of clipping presented. ClipArea re-used the rectangle and region-based clipping implementations as well as adding a "list of rotated rectangles" approach that is more efficient for rotated views with children. Change-Id: I2133761a2462ebc0852b394220e265974b3086f0
* | am cefeb34e: am 2c9f86aa: am 53af1cd3: Merge "Vsyncs are hard" into lmp-mr1-devJohn Reck2015-01-151-0/+8
|\ \ | | | | | | | | | | | | * commit 'cefeb34e4866209e2ccf4c520919fe31a3f1aeb5': Vsyncs are hard
| * \ am 2c9f86aa: am 53af1cd3: Merge "Vsyncs are hard" into lmp-mr1-devJohn Reck2015-01-151-0/+8
| |\ \ | | | | | | | | | | | | | | | | * commit '2c9f86aa21b8d7ea6a77eaca9a49ccdb31245129': Vsyncs are hard
| | * \ Merge "Vsyncs are hard" into lmp-mr1-devJohn Reck2015-01-151-0/+8
| | |\ \
| | | * | Vsyncs are hardJohn Reck2015-01-141-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | Bug: 18866485 Change-Id: I7d304df0f20a3296956cb6887a72adba9243f117
* | | | | Restore write_delete_fileBrian Carlstrom2015-01-141-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (cherry picked from commit 5baa164aec06a9973a68303bc7752aa76e5c68e5) Change-Id: Ifa9a157346edd479ce03982baf435ab213dc2e79
* | | | | am 49138184: am 9568307c: am 43a4a8c7: Fix redundant file backupsChristopher Tate2015-01-151-36/+41
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * commit '49138184dee54357b1923f302e4b3fedd73ca34f': Fix redundant file backups
| * | | | am 9568307c: am 43a4a8c7: Fix redundant file backupsChristopher Tate2015-01-151-36/+41
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | * commit '9568307cf32c8abc6703dc7a1b0b0fee56c4f8f5': Fix redundant file backups
| | * | | Fix redundant file backupsChristopher Tate2015-01-141-38/+41
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We'd observed a bug in which an unchanged file was nevertheless being redundantly transmitted for backup on every backup pass. The underlying issue turns out to have been the FileBackupHelper base implementation's logic for diffing the prior-state file set against the current state, in the case when there had been deletions of prior files. In addition, there was also a parallel bug in which file checksums were not calculated properly in some cases, leading to at least one additional redundant backup of the file in question. Bug 18694053 Change-Id: Ie0dec06486b5fef4624561737019569c85d6b2a0
* | | | Merge "Update HWUI to store its own SkBitmap objects"Derek Sollenberger2015-01-1413-186/+113
|\ \ \ \
| * | | | Update HWUI to store its own SkBitmap objectsDerek Sollenberger2015-01-0913-186/+113
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This enables us to... 1) simplify the lifecycle/ownership between Java and HWUI 2) remove DisplayListRenderer::drawBitmapData and associated logic 3) track pixel lifecycle using standard SkPixelRef refcounting 4) Remove uncessary calls to ref/unref the bitmap's pixels and colorTable Change-Id: I3c95078da20995444f6388a029414280fd654318
* | | | | am 1e147221: am d6c475dc: am 595ae39f: Merge "Use more intention-revealing ↵Elliott Hughes2015-01-131-1/+3
|\ \ \ \ \ | |/ / / / |/| / / / | |/ / / | | | | | | | | | | | | tests for S_ISLNK and S_ISSOCK." * commit '1e14722167210e176cc1f6e702f1a7a98271c6d2': Use more intention-revealing tests for S_ISLNK and S_ISSOCK.
| * | | am d6c475dc: am 595ae39f: Merge "Use more intention-revealing tests for ↵Elliott Hughes2015-01-131-1/+3
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | S_ISLNK and S_ISSOCK." * commit 'd6c475dc246b1681f5c9af9e00ac74183812329c': Use more intention-revealing tests for S_ISLNK and S_ISSOCK.
| | * | | Use more intention-revealing tests for S_ISLNK and S_ISSOCK.Elliott Hughes2015-01-121-1/+3
| | | | | | | | | | | | | | | | | | | | Change-Id: Ia7f13eb7d5a36cf2b4c0a253b2b4d7f7af396951
* | | | | Merge "Replace sleep() hack with vsync listening"John Reck2015-01-083-30/+83
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Replace sleep() hack with vsync listeningJohn Reck2015-01-063-30/+83
| | | | | | | | | | | | | | | | | | | | Change-Id: I4eb744d9a5abe40cf4f8bbaafa03e59b7360608a
* | | | | Merge frameworks/base changes from master-skia to master.Mike Reed2015-01-062-2/+2
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adaptations to changes in Skia upstream since Oct 2014. (https://code.google.com/p/skia/issues/detail?id=2377) cbb922d use new roundOut signature 77082de Call SkColorTable::readColors(). 5456ab1 Handle the result of SkMatrix::asAffine. 25cfc78 Remove dependence on SK_LEGACY_PICTURE_SIZE_API. BUG:18468293 Change-Id: I5a4d274e854298843891410b1ffd5e24f038b88a
* | | | Add overrides and switch to nullptr keyword for all filesChris Craik2015-01-0560-544/+550
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds remaining missing overrides and nullptr usages, missed due to an extreme failure in tool usage. Change-Id: I56abd72975a3999ad13330003c348db40f59aebf
* | | | Make DisplayListRenderer inherit from Canvas, merge JNITom Hudson2015-01-058-201/+329
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Incrementally unify the upper layers for Skia and HWUI. Remove redundant code from GLES20Canvas.java; instead use inherited mNativeCanvasWrapper and superclass method definitions. Moves some unrelated SkPaint utility functions from Renderer to new utils/PaintUtils. bug: 15672762 Change-Id: I4ddd4214b8e9eeb95289d054ef423f2542bb5fa5
* | | | Cleanup various clang warnings, use unique_ptrs in several placesChris Craik2014-12-2330-226/+133
| | | | | | | | | | | | | | | | Change-Id: I347904b25e51fcc7de14b1e72f1acd0f6ba26f3f
* | | | Add overrides and switch to nullptr keywordChris Craik2014-12-2232-247/+262
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changes generated with clang-modernize. Additionally, fixed some struct-vs-class usage to make clang happy. Change-Id: Ic6ef2427401ff1e794d26f21f7b44868fc75fb72
* | | | CleanupChris Craik2014-12-227-46/+19
| | | | | | | | | | | | | | | | Change-Id: I91ffb9c66697741116fdeaa31abdf6cfd79155df
* | | | am 165fb8f5: am f89dac47: Merge "Tweak RT-animator scheduling" into lmp-mr1-devJohn Reck2014-12-194-15/+22
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | automerge: ed3c296 * commit 'ed3c2962be1e2966c3b46f20e81d2902a8302d8b': Tweak RT-animator scheduling
| * | | am 165fb8f5: am f89dac47: Merge "Tweak RT-animator scheduling" into lmp-mr1-devJohn Reck2014-12-194-15/+22
| |\ \ \ | | | |/ | | |/| | | | | | | | | * commit '165fb8f5aa0709a8dc35f99a9b81f6906452a648': Tweak RT-animator scheduling
| | * | Tweak RT-animator schedulingJohn Reck2014-12-194-15/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 18226391 The issue occurs as a result of a dispatchFrame itself taking longer than 12ms, the alloted budget. The result is that a vsync request (which occured at the end) would miss the vsync that occured 1ms prior to the end of the frame. As a result it would end up waiting for the following vsync, essentially dropping to 30fps even though 60 could have been sustained. Fix this with a few tweaks. First, adjust the UI thread's delay bias from (now + 4ms) to (vsync + 4ms), this prevents RT animators from slowly drifting if the vsync occurs mid-task. Second, request a vsync preemptively prior to running callbacks. This way if any callbacks needs the next vsync and it takes "too long", we will catch that vsync. Finally, fix an issue where the display event queue was always drained & rejected at the end of a task loop. Instead, drain and reject all stale vsyncs. This still prevents the issue of both UI thread & RT thread trying to drive 2 frames in a single pulse, but also allows RT to notice that it missed a vsync pulse it needed and that it should speed-up a bit in response Change-Id: I9d6be037737e9283297898cac2e3563453e797cd
* | | | Stop pretending USE_OPENGL_RENDERER is a thingJohn Reck2014-12-185-17/+7
| | | | | | | | | | | | | | | | Change-Id: I732b490431fe90eafa00a00f3b5429f0d3a067e6
* | | | Split hwui's makefileJohn Reck2014-12-183-134/+113
| | | | | | | | | | | | | | | | Change-Id: I7ad1a692e708cad052e8ca5b412c17e25992862c
* | | | resolved conflicts for merge of fd461ede to masterChris Craik2014-12-173-8/+13
|\ \ \ \ | |/ / / | | | | | | | | Change-Id: I36f263c7e6d96355dd8a2c3565581b9a983ae481
| * | | am 93492d1a: am c748832f: Merge "Revert overdraw avoidance visualization ↵Chris Craik2014-12-173-8/+13
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | change" into lmp-mr1-dev * commit '93492d1a478770783abab764855c8d47e0264f71': Revert overdraw avoidance visualization change
| | * | Merge "Revert overdraw avoidance visualization change" into lmp-mr1-devChris Craik2014-12-173-8/+13
| | |\ \
| | | * | Revert overdraw avoidance visualization changeChris Craik2014-12-173-8/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug:18787324 Partial revert of 23d307c8d88f4a3849163b9e5b7cd11d0d4f372c. Change-Id: Ic8b91b046707fc5b8fa53c35ea7b37bb19c3c943
| * | | | Fix styleJohn Reck2014-12-1221-175/+175
| | | | | | | | | | | | | | | | | | | | Change-Id: I7227b0eac126bf470ed50249a7809b845872983b
* | | | | am ec9b598c: am b9a4d15d: Merge "Force-flush state sync on texid change" ↵John Reck2014-12-121-0/+6
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | into lmp-mr1-dev automerge: b21a7ad * commit 'ec9b598c7be65abb5ceb9d82e752c50f7e93deab': Force-flush state sync on texid change
| * | | | am b9a4d15d: Merge "Force-flush state sync on texid change" into lmp-mr1-devJohn Reck2014-12-121-0/+6
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | automerge: b21a7ad * commit 'b21a7ad02e43900ea5480e796cb1518bd5829e3f': Force-flush state sync on texid change
| | * | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 18718646 Caused because the Texture object thought the GLES texture was in a different state than it was as it persists across EGL/GL contexts. Fix this by force-flushing the default values when the texid has changed. Change-Id: I264bac9a2beb08df8e2ba8a85ad15f0dd1fce22a
* | | | | | am 3f454e7d: am 63c7b246: Merge "Correct layer size formatting in trace" ↵Chris Craik2014-12-121-2/+2
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into lmp-mr1-dev automerge: 00905a9 * commit '3f454e7d1cf7103e312f67f745f01f00fa49df13': Correct layer size formatting in trace
| * | | | | am 63c7b246: Merge "Correct layer size formatting in trace" into lmp-mr1-devChris Craik2014-12-121-2/+2
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | automerge: 00905a9 * commit '00905a984c07ffc9960ce83548631c59aae37ec6': Correct layer size formatting in trace
| | * | | | 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
| | | |/ / | | | | | | | | | | | | | | | | | | | | bug:18722704 Change-Id: Icef9aaa62633b2d86ad250f43d4c8fa5cc0b6842
* | | | | resolved conflicts for merge of d67bb501 to masterYohann Roussel2014-12-1111-73/+76
|\ \ \ \ \ | |/ / / / | | | | | | | | | | Change-Id: I40698ce1e382cb41eec7af5ea49ac0e2f997d555
| * | | | am eb2dcc79: Merge "Don\'t preload textures for AssetAtlas" into lmp-mr1-devJohn Reck2014-12-1111-73/+75
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | automerge: e4a6ed9 * commit 'e4a6ed9d6d8721c9fad018b0d43dfe7daf4b24e7': Don't preload textures for AssetAtlas
| | * | | 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
| | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 18317479 RenderNode::prepareSubTree calls prefetchAndMarkInUse on every bitmapResoruce in the DisplayList. However, this resulted in textures being uploaded for bitmaps that would be drawn from the AssetAtlas instead. To fix this we teach TextureCache about the AssetAtlas so that calls to TextureCache return the Texture from AssetAtlas if it exists. Thus usage of AssetAtlas is now purely to allow for further optimizations via draw merging instead of a requirement to get any benefit at all. Change-Id: I65282fa05bac46f4e93822b3467ffa0261ccf200
* | | | | am 347040cf: am 740acf21: am c7801877: Merge "Fix issue where non-resource ↵Adam Lesinski2014-12-111-0/+17
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | attributes would cause obtainStyleAttributes to fail" into lmp-mr1-dev * commit '347040cf84401601b0d5cbb1d76e4648d1c8a461': Fix issue where non-resource attributes would cause obtainStyleAttributes to fail
| * | | | am 740acf21: am c7801877: Merge "Fix issue where non-resource attributes ↵Adam Lesinski2014-12-111-0/+17
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | would cause obtainStyleAttributes to fail" into lmp-mr1-dev * commit '740acf213c56c406132294790fa2fadd0380cfa7': Fix issue where non-resource attributes would cause obtainStyleAttributes to fail
| | * | | Merge "Fix issue where non-resource attributes would cause ↵Adam Lesinski2014-12-101-0/+17
| | |\ \ \ | | | | | | | | | | | | | | | | | | obtainStyleAttributes to fail" into lmp-mr1-dev
| | | * | | Fix issue where non-resource attributes would cause obtainStyleAttributes to ↵Adam Lesinski2014-12-101-0/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fail A sentinal value of 0x00000000 was used to mark the first time an AttributeFinder was used. If the resource ID of an attribute was also 0x00000000 (which occurs with non-resource attributes, like 'style'), then it would be mistaken as the sentinel start value. Bug:18421787 Change-Id: I4be353e0f8c940cb6f262d155129f048dcc444ae
* | | | | | resolved conflicts for merge of 5369b769 to masterChris Craik2014-12-104-8/+19
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | Change-Id: Iccb2ce948321534e05d67e64dc40a38332adb1a7
generated by cgit v1.1 at 2025-03-12 09:36:08 +0000