aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2017-08-17Merge "Build support for 32-bit armv8-a" am: 52ecb76af4 am: d9ead8a8b9android-o-mr1-iot-preview-6o-mr1-iot-preview-6Isaac Chen
am: 6abfec9e98 Change-Id: I0fa4441bbb7652e17c85de47253a9b5283e018f7
2017-08-17Merge "Build support for 32-bit armv8-a" am: 52ecb76af4Isaac Chen
am: d9ead8a8b9 Change-Id: Ibbcb666dd36dedd36942e19ce4f95b8f4be00da1
2017-08-17Merge "Build support for 32-bit armv8-a"android-o-mr1-preview-2android-o-mr1-preview-1Isaac Chen
am: 52ecb76af4 Change-Id: I9a01882dff31afa12ff82574d20378ab5902386d
2017-08-17Merge "Build support for 32-bit armv8-a"Isaac Chen
2017-08-10Build support for 32-bit armv8-aIsaac Chen
Since both armv7-a-neon and 32-bit armv8-a have NEON, we can treat them the same in Android.bp. Bug: 62895439 Test: Built modified aosp_arm64 with armv8-a as its TARGET_2ND_CPU_ARCH successfully. Change-Id: Ib6db0c1515b0b59d76b2a3a2798cc12a7eea5914
2017-06-23Merge "Cherry-pick a revert "sk_fgetsize to not use ftell." am: e14a0aa7ea ↵Android Build Merger (Role)
am: 4ab6ab40cb" into oc-dr1-dev-plus-aosp
2017-06-23Cherry-pick a revert "sk_fgetsize to not use ftell." am: e14a0aa7eaLeon Scroggins
am: c8877a4726 Change-Id: Ib639262b4f8bba374ab56910de0bcf10e7f0f34b
2017-06-23Cherry-pick a revert "sk_fgetsize to not use ftell." am: e14a0aa7eaLeon Scroggins
am: 4ab6ab40cb Change-Id: I61323e6cb6d0ccdcbaaa89a964ad1ccc301978d8
2017-06-23Cherry-pick a revert "sk_fgetsize to not use ftell."oreo-dr1-devLeon Scroggins
am: e14a0aa7ea Change-Id: I3ad177dbda5da06984ae48764b99ce77101b32f7
2017-06-23Cherry-pick a revert "sk_fgetsize to not use ftell."Leon Scroggins
am: e14a0aa7ea Change-Id: I7c16b4d2b1c646a7e47a8cb1ee3ca4c3cb6e4398
2017-06-22Cherry-pick a revert "sk_fgetsize to not use ftell."android-vts-8.0_r2android-vts-8.0_r1oreo-devLeon Scroggins
Test: verified public sample documentation properly decodes Bug: 62779478 This reverts commit eefa289a214ea3917e5e00554f231adb5ad6f712. Reason for revert: Causing failures in BitmapFactoryTest. b/38233042 Original change's description: > sk_fgetsize to not use ftell. > > The previous version of sk_fgetsize used ftell and fseek to compute > the size of a file. There are so many issues with this that it is called > out by securecoding.cert.org as FIO19-C as a thing not to do. We already > have correct code for computing the size of a file in the mmap code, so > use that instead. > > Change-Id: I1d771124989d0ec1523f6d858814ee563263213a > Reviewed-on: https://skia-review.googlesource.com/9860 > Reviewed-by: Leon Scroggins <scroggo@google.com> > Commit-Queue: Ben Wagner <bungeman@google.com> > TBR=bungeman@google.com,scroggo@google.com Change-Id: Ie9392dde8747ae7c74ebfa00153705e316e841a2 Reviewed-on: https://skia-review.googlesource.com/17705 Reviewed-by: Leon Scroggins <scroggo@google.com> Commit-Queue: Leon Scroggins <scroggo@google.com>
2017-06-16Merge "Defend against ICOs with large BMPs embedded DO NOT MERGE" into ↵Leon Scroggins III
oc-dev am: 5bf7ed94cf am: 7d37d0950e Change-Id: I923e026aec4897244fa9ecbddff429c2ce3aff44
2017-06-16Merge "Defend against ICOs with large BMPs embedded DO NOT MERGE" into ↵Leon Scroggins III
oc-dev am: 5bf7ed94cf am: 030785bb5c Change-Id: Ib270ccf076a435dba017914a020da61d41300d0c
2017-06-16Merge "Defend against ICOs with large BMPs embedded DO NOT MERGE" into oc-devLeon Scroggins III
am: 5bf7ed94cf Change-Id: I324ec3aa7dfed3defebaa654eefd1b9438f0775c
2017-06-16Merge "Defend against ICOs with large BMPs embedded DO NOT MERGE" into oc-devLeon Scroggins III
am: 5bf7ed94cf Change-Id: If3fabc05a2e75e4f9876b9d21262c282052ea077
2017-06-16Merge "Defend against ICOs with large BMPs embedded DO NOT MERGE" into oc-devTreeHugger Robot
2017-06-16Defend against ICOs with large BMPs embedded DO NOT MERGELeon Scroggins III
Test: TODO If the ICO reports that it has a large BMP file embedded, do not crash if we attempt to allocate too much memory. Bug: 38116746 Bug: 37624243 Change-Id: I70eb66f5e4ffc15587007b398bbe843665eae500 Reviewed-on: https://skia-review.googlesource.com/18447 Reviewed-by: Matt Sarett <msarett@google.com> Commit-Queue: Leon Scroggins <scroggo@google.com>
2017-06-16Merge "Defend against ICOs with large BMPs embedded DO NOT MERGE am: ↵Android Build Merger (Role)
6029322ad7 am: a7857dd90c am: c0e1e9fb47 am: 99ee7256eb am: 6df4eff07e -s ours am: 37a097de93 -s ours am: a7b6a6186f -s ours" into oc-dr1-dev-plus-aosp
2017-06-16Defend against ICOs with large BMPs embedded DO NOT MERGE am: 6029322ad7 am: ↵Leon Scroggins III
a7857dd90c am: c0e1e9fb47 am: 99ee7256eb am: 6df4eff07e -s ours am: 37a097de93 am: 4b5de9cdc6 -s ours Change-Id: I4ba61f2ff0e78a4d9b23714bd3620263c0c1cd2c
2017-06-16Defend against ICOs with large BMPs embedded DO NOT MERGE am: 6029322ad7 am: ↵Leon Scroggins III
a7857dd90c am: c0e1e9fb47 am: 99ee7256eb am: 6df4eff07e -s ours am: 37a097de93 -s ours am: a7b6a6186f -s ours Change-Id: I32354aefbffb907b6d1f8480240a2279c39653fe
2017-06-16Defend against ICOs with large BMPs embedded DO NOT MERGE am: 6029322ad7 am: ↵Leon Scroggins III
a7857dd90c am: c0e1e9fb47 am: 99ee7256eb am: 6df4eff07e -s ours am: 37a097de93 -s ours Change-Id: I0873873ca375ce9515f8066c4b4aab4a75e13607
2017-06-16Defend against ICOs with large BMPs embedded DO NOT MERGE am: 6029322ad7 am: ↵Leon Scroggins III
a7857dd90c am: c0e1e9fb47 am: 99ee7256eb am: 6df4eff07e -s ours am: 37a097de93 Change-Id: I01fcb6aa2789aebfeffe8bb5999ce08c038a21c6
2017-06-16Defend against ICOs with large BMPs embedded DO NOT MERGE am: 6029322ad7 am: ↵Leon Scroggins III
a7857dd90c am: c0e1e9fb47 am: 99ee7256eb am: 6df4eff07e -s ours Change-Id: If8dd66b422f0317b87033d2d9a590c5839df796b
2017-06-16Defend against ICOs with large BMPs embedded DO NOT MERGE am: 6029322ad7 am: ↵Leon Scroggins III
a7857dd90c am: c0e1e9fb47 am: 99ee7256eb Change-Id: If1476da95e9b4663eefcbb6765e9f3c4ea5229ad
2017-06-16Defend against ICOs with large BMPs embedded DO NOT MERGE am: 6029322ad7 am: ↵Leon Scroggins III
a7857dd90c am: c0e1e9fb47 Change-Id: Ife708718061f8b2ee1cd7968ff90fc54ea6e570e
2017-06-16Defend against ICOs with large BMPs embedded DO NOT MERGE am: 6029322ad7Leon Scroggins III
am: a7857dd90c Change-Id: Idbe1b7495c9f4ebdd4363153cd916b2716cd621b
2017-06-16Defend against ICOs with large BMPs embedded DO NOT MERGELeon Scroggins III
am: 6029322ad7 Change-Id: I65a8f1fb8588a9e1f457f926e9575d80b4d24d01
2017-06-16Defend against ICOs with large BMPs embedded DO NOT MERGELeon Scroggins III
If the ICO reports that it has a large BMP file embedded, do not crash if we attempt to allocate too much memory. Bug: 38116746 Merged-In: Ie6665dc8ade3beb19c276c4d48d1fabc077a2e6c Change-Id: I70eb66f5e4ffc15587007b398bbe843665eae500 Reviewed-on: https://skia-review.googlesource.com/18447 Reviewed-by: Matt Sarett <msarett@google.com> Commit-Queue: Leon Scroggins <scroggo@google.com>
2017-06-14Fix encoding of F16 imagesMike Klein
am: be34bc4fc9 Change-Id: I18a37f25f8a4f168061cbdf5b1b40ee6e9e701e8
2017-06-14Fix encoding of F16 imagesMike Klein
This is a combination of two Skia commits: https://skia-review.googlesource.com/c/19813/ https://skia-review.googlesource.com/c/19814/ Test: CTS and Skia unit tests. Bug: 62538716
2017-06-13Roll external/skia 556d5c7d4..0c9402ed8 (1 commits) am: a24e12f1fdSkia_Android Canary Bot
am: 9ad894843f -s ours Change-Id: I8409a5707c98c7b3ed4d049304db33436ae06bd3
2017-06-13Roll external/skia 556d5c7d4..0c9402ed8 (1 commits) am: a24e12f1fd -s oursSkia_Android Canary Bot
am: fb908bf469 Change-Id: I24447c50380baf26605cf7ec60a9303c54c037ee
2017-06-13Roll external/skia 556d5c7d4..0c9402ed8 (1 commits)Skia_Android Canary Bot
am: a24e12f1fd -s ours Change-Id: I320956d74de0705dc796092b44e5095aaead9bcb
2017-06-13Roll external/skia 556d5c7d4..0c9402ed8 (1 commits)Skia_Android Canary Bot
am: a24e12f1fd Change-Id: I392d3aa7f6c092370eb65599e880acc81b3524a0
2017-06-12Roll external/skia 556d5c7d4..0c9402ed8 (1 commits)Skia_Android Canary Bot
https://skia.googlesource.com/skia.git/+log/556d5c7d4..0c9402ed8 2017-06-12 msarett@google.com Encode F16 with correct color space tag Test: Presubmit checks will test this change. Test: CTS and Skia unit tests. Bug: 62538716 Change-Id: I17f14ae75d4091fe589fdba6de8af0edaf6e9328
2017-06-12Encode F16 with correct color space tagMatt Sarett
Test: CTS and Skia unit tests. Bug: b/62538716 NOTREECHECKS=true NOTRY=true NOPRESUBMIT=true Change-Id: I1467b012771442404f7401f2c3bf949ee5c59fa6 Reviewed-on: https://skia-review.googlesource.com/19543 Reviewed-by: Mike Klein <mtklein@google.com>
2017-06-07Roll external/skia 3b5a3fa8b..6c3c1d621 (1 commits)Skia_Android Canary Bot
https://skia.googlesource.com/skia.git/+log/3b5a3fa8b..6c3c1d621 2017-06-07 reed@google.com remove unneeded class declarations Test: Presubmit checks will test this change. Change-Id: Idf1ab59dc2cbf20fae9ed88093cea01d6eaa2f65
2017-06-07remove unneeded class declarationsMike Reed
Bug: skia: Change-Id: I7ca7f69e444279fe85d8aa66367194768736995f Reviewed-on: https://skia-review.googlesource.com/18964 Reviewed-by: Mike Reed <reed@google.com> Commit-Queue: Mike Reed <reed@google.com>
2017-06-07Roll external/skia 8b06ed7c9..3b5a3fa8b (2 commits)Skia_Android Canary Bot
https://skia.googlesource.com/skia.git/+log/8b06ed7c9..3b5a3fa8b 2017-06-07 senorblanco@chromium.org GrTessellator: implement out-of-range splitting and AEL rewinding. 2017-06-06 mtklein@google.com Revert "Revert "Workaround Adreno driver issue with stencil clears."" Test: Presubmit checks will test this change. Change-Id: I32f2ae17b6c14086bb9152968978b1a4e42c6418
2017-06-07GrTessellator: implement out-of-range splitting and AEL rewinding.Stephen White
Due to floating point inaccuracy, when intersecting edges, the intersection point may fall above one of the edges' top vertices or below one of the bottom vertices. In these cases, we were simply splitting one edge on the relevant endpoint of the other edge. This is incorrect if the intersection is far from the endpoint (e.g., the test case in the linked bug, where one of the intersected edges is near-horizontal but the intersection falls below both of its endpoints, in the middle of the edge.) The correct solution is to split both edges as normal, and take care to produce edges with the correct ordering where the intersection is above or below an edge. However, since the new vertex may be above the current vertex, simply restarting intersection checks at the current vertex won't work. We need to process the intersection vertex before the current one. This introduces another problem: unlike all other splitting modes (which always shorten edges), splitting an edge above the top or below the bottom can lengthen it, causing it to violate the AEL with an adjacent edge which then shortens it back to the original point (in cleanup_active_edges()). Since the splitting and merging code can't agree, we loop forever. Instead of simply fusing neighboring edges in cleanup_active_edges(), the proper fix to this problem is to detect the AEL violation and rewind all processing to the vertex above it. For performance, we only rewind when we detect that a split edge is no longer ordered within the mesh (merge_enclosing_edges()) or within the the AEL (rewind_if_necessary()). We also store the enclosing edges of each vertex, which allows us to rewind quickly, since we know exactly which edges need to be added/removed from the AEL. cleanup_active_edges(), fix_active_state() and Vertex::fProcessed have been removed. In their place are rewind_active_edges() and rewind_if_necessary(), which uses the same logic as cleanup_active_edges() but uses it to know when to rewind. Bug: skia:5026 Change-Id: I3638a429f5428498d6df6bb7b98c67374dc291aa Reviewed-on: https://skia-review.googlesource.com/18900 Reviewed-by: Brian Salomon <bsalomon@google.com> Commit-Queue: Stephen White <senorblanco@chromium.org>
2017-06-06Revert "Revert "Workaround Adreno driver issue with stencil clears.""Mike Klein
This reverts commit 8b06ed7c9f76760563ed3c46716e8e8f27ec2311. Reason for revert: try again. Original change's description: > Revert "Workaround Adreno driver issue with stencil clears." > > This reverts commit 4e8c581f2aa911bf49f97a246cc26134da292a8c. > > Reason for revert: breaks Google3 roll > > Original change's description: > > Workaround Adreno driver issue with stencil clears. > > > > This also removes the "debug wire rect" which was not used and not implemented for Vulkan. > > > > Also some declared but not implemented methods are removed from GrGLGpu. > > > > Bug: skia:5587 > > > > Change-Id: I750051e90e6cfbfad6a6fe20792226182f698bcf > > Reviewed-on: https://skia-review.googlesource.com/18639 > > Reviewed-by: Chris Dalton <csmartdalton@google.com> > > Commit-Queue: Brian Salomon <bsalomon@google.com> > > TBR=bsalomon@google.com,csmartdalton@google.com > No-Presubmit: true > No-Tree-Checks: true > No-Try: true > Bug: skia:5587 > > Change-Id: I65aa16b3f8c70cdef56ff16e16304ba09604c475 > Reviewed-on: https://skia-review.googlesource.com/18924 > Reviewed-by: Mike Klein <mtklein@google.com> > Commit-Queue: Mike Klein <mtklein@google.com> TBR=mtklein@google.com,bsalomon@google.com,reviews@skia.org,csmartdalton@google.com No-Presubmit: true No-Tree-Checks: true No-Try: true Bug: skia:5587 Change-Id: Ice49027bda1c1ff7e0362d0680341ac862159850 Reviewed-on: https://skia-review.googlesource.com/18928 Reviewed-by: Mike Klein <mtklein@google.com>
2017-06-06Roll external/skia 7f5af0c28..8b06ed7c9 (2 commits)Skia_Android Canary Bot
https://skia.googlesource.com/skia.git/+log/7f5af0c28..8b06ed7c9 2017-06-06 mtklein@google.com Revert "Workaround Adreno driver issue with stencil clears." 2017-06-06 csmartdalton@google.com Fix invalid assert in GrMesh::setIndexed Test: Presubmit checks will test this change. Change-Id: I4e74d9935fac86dc1a62b4fba72b04c3d9d13cec
2017-06-06Revert "Workaround Adreno driver issue with stencil clears."Mike Klein
This reverts commit 4e8c581f2aa911bf49f97a246cc26134da292a8c. Reason for revert: breaks Google3 roll Original change's description: > Workaround Adreno driver issue with stencil clears. > > This also removes the "debug wire rect" which was not used and not implemented for Vulkan. > > Also some declared but not implemented methods are removed from GrGLGpu. > > Bug: skia:5587 > > Change-Id: I750051e90e6cfbfad6a6fe20792226182f698bcf > Reviewed-on: https://skia-review.googlesource.com/18639 > Reviewed-by: Chris Dalton <csmartdalton@google.com> > Commit-Queue: Brian Salomon <bsalomon@google.com> TBR=bsalomon@google.com,csmartdalton@google.com No-Presubmit: true No-Tree-Checks: true No-Try: true Bug: skia:5587 Change-Id: I65aa16b3f8c70cdef56ff16e16304ba09604c475 Reviewed-on: https://skia-review.googlesource.com/18924 Reviewed-by: Mike Klein <mtklein@google.com> Commit-Queue: Mike Klein <mtklein@google.com>
2017-06-06Fix invalid assert in GrMesh::setIndexedChris Dalton
When drawing a single point it's valid for the first and last indices to be equal. Bug: skia:6728 Change-Id: Ice8cd89b306ed9564cdd9a77c557628662e18abb Reviewed-on: https://skia-review.googlesource.com/18904 Reviewed-by: Brian Salomon <bsalomon@google.com> Commit-Queue: Chris Dalton <csmartdalton@google.com>
2017-06-06Roll external/skia ca9fb3bfe..7f5af0c28 (7 commits)Skia_Android Canary Bot
https://skia.googlesource.com/skia.git/+log/ca9fb3bfe..7f5af0c28 2017-06-06 csmartdalton@google.com Use more stable root finding methods for cubics 2017-06-06 mtklein@chromium.org more exclusion of SkImageEncoder_none.cpp 2017-06-06 bsalomon@google.com Workaround Adreno driver issue with stencil clears. 2017-06-06 msarett@google.com Image encoder cleanup: speculative fix for bzl roll 2017-06-06 fmalita@chromium.org Opt-in burst mechanism for pipeline shaders 2017-06-06 msarett@google.com Revert "Handle different types of streams in different jpeg source managers" 2017-06-06 recipe-roller@chromium.org Roll recipe dependencies (trivial). Test: Presubmit checks will test this change. Change-Id: If48f4c79f949c03f9a76a433df533942f6767fce
2017-06-06Use more stable root finding methods for cubicsChristopher Dalton
Applies the quadratic formula from "Numerical Recipes in C", Section 5.6, to the homogeneous quadratic equations that find cubic inflection points and loop intersections. Also addresses KLM orientation ahead of time, rather than negating K and L after the fact. Bug: skia: Change-Id: Ic7e0818e2fe49b7724f9b583bae52281cfb1aea1 Reviewed-on: https://skia-review.googlesource.com/13481 Commit-Queue: Chris Dalton <csmartdalton@google.com> Reviewed-by: Cary Clark <caryclark@google.com>
2017-06-06more exclusion of SkImageEncoder_none.cppMike Klein
The current roll is failing due to double linking: multiple definition of 'SkEncodeImage(SkWStream*, SkPixmap const&, SkEncodedImageFormat, int)' src/images/SkImageEncoder.pic.o: previous definition here Change-Id: I64ada3591b4c4c0cb8deada0dc796d9a0376b6a7 Reviewed-on: https://skia-review.googlesource.com/18855 Reviewed-by: Matt Sarett <msarett@google.com>
2017-06-06Workaround Adreno driver issue with stencil clears.Brian Salomon
This also removes the "debug wire rect" which was not used and not implemented for Vulkan. Also some declared but not implemented methods are removed from GrGLGpu. Bug: skia:5587 Change-Id: I750051e90e6cfbfad6a6fe20792226182f698bcf Reviewed-on: https://skia-review.googlesource.com/18639 Reviewed-by: Chris Dalton <csmartdalton@google.com> Commit-Queue: Brian Salomon <bsalomon@google.com>
2017-06-06Image encoder cleanup: speculative fix for bzl rollMatt Sarett
Bug: skia: Change-Id: I1e09e66e4d257eebcf959cec44b5d4f0fa876545 Reviewed-on: https://skia-review.googlesource.com/18851 Reviewed-by: Mike Klein <mtklein@google.com>
2017-06-06Opt-in burst mechanism for pipeline shadersFlorin Malita
Add a dedicated virtual for shaders to select burst mode. Enabled for linear gradients with more than 8 stops, as a start. BUG=skia:6710 Change-Id: I1b19124f42d1d805de27a5db6a26601c386bb9ff Reviewed-on: https://skia-review.googlesource.com/18628 Commit-Queue: Florin Malita <fmalita@chromium.org> Reviewed-by: Mike Reed <reed@google.com> Reviewed-by: Mike Klein <mtklein@chromium.org>