Commit Graph

8747 Commits

Author SHA1 Message Date
Yi Kong
0164f5e101 Merge "Merge "Remove no-op std::max call" am: c00af4c533 am: ef5e579cec am: f3310cb3b1" into oc-dev-plus-aosp
am: d1a0cdc85f

Change-Id: I5ba3c71615c0c4bbb777d5c31458a586243c67eb
2017-05-01 19:02:56 +00:00
Yi Kong
5edbb34dd2 Merge "Remove no-op std::max call" am: c00af4c533 am: ef5e579cec
am: f3310cb3b1

Change-Id: I553be70f9ba04feaf4da01041bfb3edc6ae38252
2017-05-01 18:51:59 +00:00
Yi Kong
06a2d2bf23 Remove no-op std::max call
This was calling std::max on an unsigned integer and 0, which is
essentially no-op. Remove this code.

Test: Build
Bug: 37752547
Change-Id: I74ce45b95960621dff11f574fbe1af60ad147cf0
2017-04-30 23:54:08 -07:00
Chris Craik
e8f9d61bcc Merge "Merge "Revert "Temporarily enable GL validation"" into oc-dev am: 8f4ac4ac05" into oc-dev-plus-aosp
am: ed6ebc5b09

Change-Id: I908b67fb00b1e5846601541038c7e856f9234091
2017-04-28 23:34:02 +00:00
Chris Craik
5805cfdbc1 Merge "Revert "Temporarily enable GL validation"" into oc-dev
am: 8f4ac4ac05

Change-Id: I7a44ab6a8a2a05c124bbe0d84475f5c21b1b7bf4
2017-04-28 23:15:34 +00:00
Chris Craik
8f4ac4ac05 Merge "Revert "Temporarily enable GL validation"" into oc-dev 2017-04-28 23:04:02 +00:00
Chris Craik
05cdededbe Merge "Add conic support for Path#approximate" into oc-dev am: ebd44d0076
am: a1e500ebf4

Change-Id: Ifc5033fbb595a672a29539599e39ac7e56c62d50
2017-04-28 19:11:02 +00:00
Chris Craik
a1e500ebf4 Merge "Add conic support for Path#approximate" into oc-dev
am: ebd44d0076

Change-Id: I68f5924aef7526de1c801f529dd5a304a1a1d287
2017-04-28 18:53:15 +00:00
TreeHugger Robot
ebd44d0076 Merge "Add conic support for Path#approximate" into oc-dev 2017-04-28 18:47:37 +00:00
Adam Lesinski
82e26c9214 Merge "AAPT2: Add workaround for non-standard package IDs" into oc-dev am: e7172ff9fb
am: 65c42a5569

Change-Id: I1238656a9edb9984d36412dba506b869f574e3d4
2017-04-28 01:27:30 +00:00
Adam Lesinski
65c42a5569 Merge "AAPT2: Add workaround for non-standard package IDs" into oc-dev
am: e7172ff9fb

Change-Id: I7b8e53f8394e41433ceebe4f6e477f8561e49807
2017-04-28 01:04:51 +00:00
Derek Sollenberger
4220989601 Merge "Disable Vulkan backend when running hwui_unit_tests." into oc-dev am: f9dc09f4ea
am: 1c9c7b867c

Change-Id: I9550af0105210cdf24483f8dfe219833ff7812c8
2017-04-28 00:25:46 +00:00
TreeHugger Robot
e7172ff9fb Merge "AAPT2: Add workaround for non-standard package IDs" into oc-dev 2017-04-27 23:45:44 +00:00
Derek Sollenberger
1c9c7b867c Merge "Disable Vulkan backend when running hwui_unit_tests." into oc-dev
am: f9dc09f4ea

Change-Id: I613b0f380995d88bbda6c916af68b96ab69e8dff
2017-04-27 23:41:25 +00:00
Chris Craik
96202d56ad Add conic support for Path#approximate
Fixes: 37722722
Test: bit CtsGraphicsTestCases:PathTest
Test: bit CtsUiRenderingTestCases:android.uirendering.cts.testclasses.PathTests

Also adds static asserts to path-walking code, to avoid this problem
in the future.

Also adds annotations, since this is public API now.

Change-Id: Ic39b167968b98fd8197be2d0f9aca79949717237
2017-04-27 16:24:18 -07:00
TreeHugger Robot
f9dc09f4ea Merge "Disable Vulkan backend when running hwui_unit_tests." into oc-dev 2017-04-27 22:10:49 +00:00
Derek Sollenberger
0f89539de6 Disable Vulkan backend when running hwui_unit_tests.
The Vulkan backend fails to run on devices without vulkan drivers.
Until we can stub out the vulkan drivers for those devices we find
an acceptable solution.

Test: hwui_unit_tests on device w/out vulkan
Bug: 37422708
Change-Id: I3d7c21882053459f25ca1eb5648cdf5dfd4c333e
2017-04-27 11:30:20 -04:00
TreeHugger Robot
cf5ef927e2 Merge "Remove uses of SkBitmap::copyTo" 2017-04-27 06:54:52 +00:00
Adam Lesinski
4ca56978a9 AAPT2: Add workaround for non-standard package IDs
The dynamic ref table used to map build-time IDs to runtime IDs
is mainly used for shared resource libraries and has a few built-in
mappings (app 0x7f and framework 0x01).

Using a non-standard package ID like 0x80 causes a failure in package ID
lookup. The solution is to ship the dynamic_ref_table with an identity mapping
with any resource table that uses a non-standard package ID.

Adds some tests to ensure this works correctly.

Bug: 37498913
Test: make libandroidfw_tests
Test: make aapt2_tests
Change-Id: Ic3f67942384d34e7fdcbc94ded360e940e3ebc8a
2017-04-26 21:55:31 -07:00
Matt Sarett
155d52155b Remove uses of SkBitmap::copyTo
This API is being deleted:
skbug.com/6464

Test: Refactor

Change-Id: Id78653ca45d6bfee2e4f9c9c24c2414b888f0df5
2017-04-26 16:17:46 -04:00
Chris Craik
6e84287277 Merge "Fix include" into oc-dev am: 7e44951bb7
am: 4554fa6b7c

Change-Id: I44871c8098ffc01ca86dd8c16657cacaf26be3b3
2017-04-26 01:04:02 +00:00
Chris Craik
005275d238 Revert "Temporarily enable GL validation"
Fixes: 35387665
Test: none

This reverts commit b5544d0308.

Change-Id: I4cf3fa0c65aaee38d0fa9cfea15b72c8ef42acb1
2017-04-26 00:47:42 +00:00
Chris Craik
4554fa6b7c Merge "Fix include" into oc-dev
am: 7e44951bb7

Change-Id: I6e7ec68d95dc12fa3d87a0e366cf924a4dba32bc
2017-04-25 23:39:39 +00:00
TreeHugger Robot
7e44951bb7 Merge "Fix include" into oc-dev 2017-04-25 23:32:11 +00:00
Chris Craik
66c3a829dc Fix include
Bug: 35387665
Test: builds with HWUI_ENABLE_OPENGL_VALIDATION := false

Dependency on gl3.h was added while that header was auto-included for
error checking purposes. Add the include to enable us to disable gl
error checking.

Change-Id: Ic969da716e2323f8e42d20da8fd0a6fa653f9775
2017-04-25 13:42:53 -07:00
Greg Daniel
53a354365b Use new GrVkBackendContext::Create api
Test: manual testing

Change-Id: Ia8daebd2e028082a8b3d58f29057648746398735
2017-04-25 13:44:51 -04:00
TreeHugger Robot
6205e158f3 Merge "Create helper script to parse systrace files" 2017-04-21 14:09:24 +00:00
Colin Cross
8cf0d0d2b0 Convert libinputservice to Android.bp
See build/soong/README.md for more information.

Test: m -j checkbuild
Change-Id: I3cd2bb05ec89c40ebd1240e352a19f99d00dc114
(cherry picked from commit 3fc8f2df30)
2017-04-20 18:31:02 +00:00
Stan Iliev
2ccaec63ff Create helper script to parse systrace files
Create a script that can parse systrace files and calculates
metrics. The example metrics are average DrawFrame and average
time to record a View.

Test: ran the script and compared outputs with numbers visible,
when systrace file is opened in a browser.

Change-Id: If37322e7838e177efb3e2e4a00cb6e97755aa453
2017-04-20 10:08:11 -04:00
Matt Sarett
31e44d8e92 Merge "Add unit test for Skia path behavior" into oc-dev am: dc3ab163d3
am: 515222acd2

Change-Id: I214885c57e77ffd8a991478c96fb70582ce43e6c
2017-04-20 12:37:24 +00:00
Colin Cross
ece22cf115 Convert libinputservice to Android.bp
See build/soong/README.md for more information.

Test: m -j checkbuild
Change-Id: I3cd2bb05ec89c40ebd1240e352a19f99d00dc114
Merged-In: I3cd2bb05ec89c40ebd1240e352a19f99d00dc114
(cherry picked from commit 3fc8f2df30)
2017-04-20 03:18:38 +00:00
Colin Cross
3fc8f2df30 Convert libinputservice to Android.bp
See build/soong/README.md for more information.

Test: m -j checkbuild
Change-Id: I3cd2bb05ec89c40ebd1240e352a19f99d00dc114
2017-04-19 17:39:21 -07:00
Matt Sarett
e07a91a8db Add unit test for Skia path behavior
Test: This is a test.
Bug: 35369941

Change-Id: Iaf21d3a903702f81a20e08e8b50b782f311ce7f3
2017-04-19 12:38:30 +00:00
TreeHugger Robot
6954897620 Merge "bitmaps and pixelrefs no longer need lock/unlock" 2017-04-18 18:35:20 +00:00
Derek Sollenberger
0bbc82cba1 Merge "Remove round rect clipping optimization." into oc-dev am: 190fe086df
am: c421f748a9

Change-Id: I6fe0b0eabb2ad17a7dd6df8c695029f36f8b3cd6
2017-04-18 16:29:39 +00:00
Derek Sollenberger
190fe086df Merge "Remove round rect clipping optimization." into oc-dev 2017-04-18 16:06:41 +00:00
Mike Reed
7c0ae0f58b bitmaps and pixelrefs no longer need lock/unlock
Test: covered by CtsGraphicsTestCases and hwui_unit_tests

Change-Id: I42a25961a2eb3755d2fd22a617aa21a24ec0994f
2017-04-18 10:22:42 -04:00
Chris Craik
2a8ec1014b Merge "Disable crashing drop shadow tests" into oc-dev am: 9d67b50308
am: 9c66ae77a0

Change-Id: I2bc2fdd8c6921dda826b35244fe880e8301b11a2
2017-04-18 02:01:41 +00:00
Chris Craik
c84824942d Disable crashing drop shadow tests
Bug: 36272398
Test: HWUI unit tests now run without crashing

Change-Id: I2877ed184640e5043d33b10605db71dde501fd2a
2017-04-17 13:58:22 -07:00
Romain Guy
6be819522d resolve merge conflicts of 2439e19d41 to master
Test: built locally
Change-Id: Idc922c7fa3306e6884b88c79e73f5375d8e65888
2017-04-17 12:31:09 -07:00
Derek Sollenberger
f7d98f436c Remove round rect clipping optimization.
This optimization fails to account for inverse fill.

Test: bit CtsGraphicsTestCases.CanvasTest
Bug: 37417782
Change-Id: I04adfa93542b1bd1f5d905c64bb40e521242e29d
2017-04-17 18:05:42 +00:00
TreeHugger Robot
71483a891a Merge "use sk_sp to manage colortables" 2017-04-17 17:11:33 +00:00
Romain Guy
5545518123 Properly decode colors spaces in BitmapRegionDecoder
Reusing a bitmap with BitmapRegionDecoder would preserve the
previous color space. This change also tweaks color space
matching to make sure we pick Display P3 with parameter d=0.039
or d=0.04045

Bug: 36905374
Test: CtsGraphicsTestCases
Change-Id: I4d2d66e5babebb0b5ce5cbdc7e8244177b4b7f9c
2017-04-15 21:41:22 -07:00
Matt Sarett
00ce770070 Merge "Bug fix: use legacy SkCanvas regardless of color space tag" into oc-dev am: 101dc265a8
am: 7e92ac449b

Change-Id: Ic50bd5fe0358390024bdb9a34e14906dba669f25
2017-04-14 19:02:54 +00:00
Seigo Nonaka
24c6464663 Merge "Use provided style for fallback font selection" into oc-dev am: 43112fd26e
am: 83c52e0a40

Change-Id: Ia42f6a377c2617c8da9a84cb8bd7781326e464a1
2017-04-14 18:09:55 +00:00
Matt Sarett
ca9b703b88 Bug fix: use legacy SkCanvas regardless of color space tag
Test: Added unit test. CtsGraphicsModule.

Bug: 32984164

Change-Id: If72e1e31c98e01f97f3a05d763f5d4c71cf88313
2017-04-14 16:26:50 +00:00
Jim Van Verth
99effcccbc Merge "Add uncached and perspective shadows to Skia renderer" into oc-dev am: 1be9766a68
am: c7fd8db8a6

Change-Id: If7f3bfc01496a9fe9b198dc63bd7c064943c9008
2017-04-14 16:03:13 +00:00
Seigo Nonaka
659c9cfac3 Merge "Introduce setFallbackTypeface" into oc-dev am: 729a515e5e
am: 17452ee553

Change-Id: I66fe816727aae3fdf617c41796b25478090704fe
2017-04-14 15:31:25 +00:00
Seigo Nonaka
d154829cb1 Use provided style for fallback font selection
If the developer gives some weight/italic to the Typeface.Builder
the fallback used the metadata in the font file. We should use
provided data instead.

This CL also adjusts upper and lower limits on weight, from 100..900 to
1..1000

Bug: 37257745
Bug: 37251569
Test: android.graphics.cts.TypefaceTest passes
Change-Id: I7cf390d96b49afcce359928373698b0c9a9babd8
2017-04-14 00:54:46 +00:00
Jim Van Verth
1be9766a68 Merge "Add uncached and perspective shadows to Skia renderer" into oc-dev 2017-04-13 20:01:47 +00:00