Chih-hung Hsieh
25c9f6cede
Merge "Fix google-explicit-constructor warnings in libs/hwui." am: 7207562ff7 am: d7a69e04eb am: 842f1e48e7
...
am: 1f50f80aab
Change-Id: I713bd07fee150cc684e630045e02872b23062a5a
2016-09-01 01:26:40 +00:00
Chih-hung Hsieh
1f50f80aab
Merge "Fix google-explicit-constructor warnings in libs/hwui." am: 7207562ff7 am: d7a69e04eb
...
am: 842f1e48e7
Change-Id: I401bb7ef3a46bb317ba664667fab4a16c129e5aa
2016-08-31 17:43:44 +00:00
Chih-hung Hsieh
842f1e48e7
Merge "Fix google-explicit-constructor warnings in libs/hwui." am: 7207562ff7
...
am: d7a69e04eb
Change-Id: I78ea5c2e7036c5d5c7f5573b4eef208b0ff93b99
2016-08-31 17:39:44 +00:00
Chih-Hung Hsieh
258e0e0f04
Merge "Fix misc-macro-parentheses warnings in hwui/tests." am: e2732e5e38 am: e33f3472f3 am: 007c463e64
...
am: 4529b6300e
Change-Id: I8bd575002330360a3bb2fe06fc31d8d4e08e6e3e
2016-08-31 00:37:25 +00:00
Chih-Hung Hsieh
a619ec70cf
Fix google-explicit-constructor warnings in libs/hwui.
...
* Add explicit keyword to conversion constructors,
or add NOLINT for implicit converters.
Bug: 28341362
Test: build with WITH_TIDY=1
Change-Id: Id8ca42433a4fc3652e4cb13787c4cb169f20d9a9
2016-08-29 14:56:58 -07:00
Chih-Hung Hsieh
4529b6300e
Merge "Fix misc-macro-parentheses warnings in hwui/tests." am: e2732e5e38 am: e33f3472f3
...
am: 007c463e64
Change-Id: Idb404e8f99289a1492d7d3f1af938cf5c0f1c7f0
2016-08-27 00:08:36 +00:00
Chih-Hung Hsieh
007c463e64
Merge "Fix misc-macro-parentheses warnings in hwui/tests." am: e2732e5e38
...
am: e33f3472f3
Change-Id: I4601d7072c16322b70de9620a6bbaa41772d612b
2016-08-27 00:01:59 +00:00
Chih-Hung Hsieh
474081eee1
Fix misc-macro-parentheses warnings in hwui/tests.
...
* Add parentheses around macro parameters.
Bug: 28705665
Test: build with WITH_TIDY=1
Change-Id: I04f6dd1a180ed1191bf68b685facf6fb9020b4b0
2016-08-26 15:19:47 -07:00
Martijn Coenen
2cc64692ce
Merge changes from topic 'utf' am: 0a357a1a73 am: de8a6a66f6
...
am: 1657493c22
Change-Id: Ie675738a4f9042929d1ffb5e1ffcc7bbb5c7b217
2016-08-25 20:31:31 +00:00
Martijn Coenen
1657493c22
Merge changes from topic 'utf' am: 0a357a1a73
...
am: de8a6a66f6
Change-Id: If82cb8e885e6a378be2b85ff7dea4c7279758444
2016-08-25 20:24:03 +00:00
Sergio Giro
8f7b8a1f6c
Unicode: specify destination length in utf8_to_utf16 methods
...
Change-Id: I5223caa7d42f4582a982609a898a02043265c6d3
2016-08-25 12:04:40 +02:00
John Reck
e986be325c
resolve merge conflicts of 24e38ab to stage-aosp-master am: 621fb590e3
...
am: f929ef6cbd
Change-Id: Ie7d5ff6858f95cf7725fa12df8d33420bc3954b2
2016-08-23 23:08:32 +00:00
John Reck
f929ef6cbd
resolve merge conflicts of 24e38ab to stage-aosp-master
...
am: 621fb590e3
Change-Id: Ia1b617a13012a8d475feb91bfbabb6ace264a29e
2016-08-23 22:56:52 +00:00
John Reck
621fb590e3
resolve merge conflicts of 24e38ab to stage-aosp-master
...
Change-Id: I02db3eb317ccb182b563ec9350a116bd5de063b6
2016-08-23 15:10:47 -07:00
John Reck
4a3b0c7587
resolve merge conflicts of 24e38ab to stage-aosp-master
...
Change-Id: I25844e17d2d6371ed786833c756051d19d0abec4
2016-08-22 15:13:01 -07:00
John Reck
24e38ab322
Merge "Fix native memory leak caused by small HWUI path cache creation"
2016-08-22 21:48:31 +00:00
John Reck
5abc1fb1d4
Add RoundRectClipping benchmarks
...
Change-Id: I9a30fbe22d40d37428e29eb328ee03ba9582ee8e
2016-08-22 10:41:53 -07:00
caiqinl
4b505376cb
Fix native memory leak caused by small HWUI path cache creation
...
HWUI calculates the texture size as w*h*bpp. In some cases, the
calculated path cache is small, but the actual memory allocated
in driver is 4k/8k/16k, much bigger than HWUI calculates.
Example: a 5*65 alpha texture, HWUI think it is 5*65*1 = 325 bytes,
but driver allocates 8K. An app can allocates up to 32M path textures,
which actually consumes 32M*(8*1024/325) = 806M memory.
Here we limit the number of path texture in the cache to 256, it
should be a pretty generous global limit.
Change-Id: I890819b73bb0b7f63e96bc3d9d0ff9469c16838c
2016-08-22 11:22:43 +05:30
Chih-hung Hsieh
03546f3d26
Merge "Fix google-explicit-constructor warnings in common_time." am: 67d47e0ca6 am: 9b36ce973e am: f121917e51
...
am: 4797b44d0c
Change-Id: I528bf2f36b385f25b2cb5387fa19e94743807cb9
2016-08-17 23:59:45 +00:00
Chih-hung Hsieh
4797b44d0c
Merge "Fix google-explicit-constructor warnings in common_time." am: 67d47e0ca6 am: 9b36ce973e
...
am: f121917e51
Change-Id: Id90b589066e93fee5f956dc2bf31e1e8405a5d5c
2016-08-17 18:28:00 +00:00
Chih-hung Hsieh
f121917e51
Merge "Fix google-explicit-constructor warnings in common_time." am: 67d47e0ca6
...
am: 9b36ce973e
Change-Id: I8a9e9d09a48da636a8256aec1c0000441d986d4e
2016-08-17 18:18:22 +00:00
Chih-hung Hsieh
9b36ce973e
Merge "Fix google-explicit-constructor warnings in common_time."
...
am: 67d47e0ca6
Change-Id: I2548e50d2654d3dfacd175b4db118983848bf15c
2016-08-17 18:06:22 +00:00
Chih-hung Hsieh
67d47e0ca6
Merge "Fix google-explicit-constructor warnings in common_time."
2016-08-17 17:42:52 +00:00
Sergei Vasilinetc
a4f1697d15
Merge "HWUI: reanimate HWUI_ENABLE_OPENGL_VALIDATION"
2016-08-17 16:14:19 +00:00
sergeyv
50939505dd
HWUI: reanimate HWUI_ENABLE_OPENGL_VALIDATION
...
Change-Id: Iff0956d156b79ed20f2af2f6467fe468a9be38e7
2016-08-16 11:10:05 -07:00
Chih-Hung Hsieh
ad3dea12ee
Fix google-explicit-constructor warnings in common_time.
...
* Add explicit keyword to conversion constructors.
Bug: 28341362
Test: build with WITH_TIDY=1
Change-Id: Ieab4756042e77cfadda35e34f78f515058ae0bb3
2016-08-15 14:51:48 -07:00
Elliott Hughes
20a4822b15
Merge "recvfrom takes a non-const pointer." am: 96660b37a1 am: 2f4c6e3d0d am: c41a11a0ee
...
am: 59d4a4ddd0
Change-Id: I6b762f35f7f9bc28e893a058d0c87056786aae2d
2016-08-12 22:26:37 +00:00
Elliott Hughes
59d4a4ddd0
Merge "recvfrom takes a non-const pointer." am: 96660b37a1 am: 2f4c6e3d0d
...
am: c41a11a0ee
Change-Id: I48c43a9675568c6b6edbf2a94f51a21770196f2c
2016-08-12 20:19:16 +00:00
Elliott Hughes
c41a11a0ee
Merge "recvfrom takes a non-const pointer." am: 96660b37a1
...
am: 2f4c6e3d0d
Change-Id: I84f726f12c27f66c668026f913708bb8d2a7cfff
2016-08-12 20:09:56 +00:00
Elliott Hughes
2f4c6e3d0d
Merge "recvfrom takes a non-const pointer."
...
am: 96660b37a1
Change-Id: Ief2e969ec0498ac2c9264fa34a3de36773bc43fa
2016-08-12 19:58:55 +00:00
Elliott Hughes
2fa54ef232
recvfrom takes a non-const pointer.
...
Change-Id: Ib2c8f2710cb333904106f849f492c83697fdd937
2016-08-12 10:53:48 -07:00
TreeHugger Robot
188af3373a
Merge "HWUI unit test for AVD on HwLayer"
2016-08-12 02:16:57 +00:00
Chih-Hung Hsieh
56996ff61e
resolve merge conflicts of 76ce8e5 to stage-aosp-master am: ed935c32f4
...
am: ef57a0d629
Change-Id: Ifcc24ad835f2e74a25954bf3fd7090c75abdc084
2016-08-12 00:40:25 +00:00
Doris Liu
5876e7df04
HWUI unit test for AVD on HwLayer
...
This test puts AVD on a HWLayer and check that after prepareTree
the correct damage rect for the layer is enqueued.
This verifies the fix for bug 30166063
Change-Id: Ia37847357bb00d54f08ee253013db83d46783fbd
2016-08-11 17:33:21 -07:00
Chih-Hung Hsieh
ef57a0d629
resolve merge conflicts of 76ce8e5 to stage-aosp-master
...
am: ed935c32f4
Change-Id: Ibb7415686469d7b15e8dbe0cd04226c4e0cd7d76
2016-08-12 00:31:29 +00:00
Chih-Hung Hsieh
ed935c32f4
resolve merge conflicts of 76ce8e5 to stage-aosp-master
...
Change-Id: I4b4ca9906373a95776d2da8ba2fa39a4a78e2a30
2016-08-11 16:48:46 -07:00
Treehugger Robot
76ce8e5242
Merge "Fix clang-tidy warnings in libs/hwui."
2016-08-11 23:20:47 +00:00
Chih-Hung Hsieh
f35c939cd7
Fix clang-tidy warnings in libs/hwui.
...
* Add explicit keyword to conversion constructors.
Bug: 28341362
* Use const reference type for read-only parameters.
Bug: 30407689
Test: build with WITH_TIDY=1
Change-Id: Iab3e6636f60a70cb124f29dc19f20f842fa8dfda
Merged-In: Iab3e6636f60a70cb124f29dc19f20f842fa8dfda
2016-08-10 23:26:59 +00:00
Chih-Hung Hsieh
49796451cb
Fix clang-tidy warnings in libs/hwui.
...
* Add explicit keyword to conversion constructors.
Bug: 28341362
* Use const reference type for read-only parameters.
Bug: 30407689
Test: build with WITH_TIDY=1
Change-Id: Iab3e6636f60a70cb124f29dc19f20f842fa8dfda
2016-08-10 16:01:29 -07:00
TreeHugger Robot
f957826dfb
Merge "resolve merge conflicts of 1d7ee6b to master"
2016-08-10 19:18:07 +00:00
Sergei Vasilinetc
39978d0012
Merge "HWUI: reimplement rendernode ouput for single stream"
2016-08-10 18:19:32 +00:00
John Reck
712765ff34
resolve merge conflicts of 1d7ee6b to master
...
Change-Id: I2ed0f2c3233151e890bd8bde825d306ec8f0d8fd
2016-08-10 11:04:39 -07:00
John Reck
1d7ee6b5a3
Make updateSurface non-blocking am: cd68212f08
...
am: 9dd91dec3f
Change-Id: I8a27b5bcff0781e90c9d061da0c1fe03eb6d8176
2016-08-10 17:44:40 +00:00
sergeyv
c3849aa786
HWUI: reimplement rendernode ouput for single stream
...
bug: 26565102
Change-Id: I90b449b2dce52683c50b48091354104d76a5e44a
2016-08-09 16:29:44 -07:00
John Reck
cd68212f08
Make updateSurface non-blocking
...
Bug: 30442298
We already do this for initialize(), fix
it so that update() is parallel with the
UI thread as well.
Shaves ~7ms off of the 99th percentile on
NotificationShade open & close
Change-Id: I1791df495453fb9e1e12362c68e3d20e837e62be
2016-08-09 12:11:13 -07:00
Chris Craik
97ec95c212
Prevent EndLayerOps when Begin was rejected am: 3c53ec51ef am: 152f76ee50
...
am: 674965822b
Change-Id: Icfa8cb2ad7c97fdbbf37f01abe7b5a22f6b33cfd
2016-08-09 00:20:12 +00:00
Chris Craik
674965822b
Prevent EndLayerOps when Begin was rejected am: 3c53ec51ef
...
am: 152f76ee50
Change-Id: Id942f3b0495a4e3c9eb7aa6d8647987e72ddb77a
2016-08-09 00:06:51 +00:00
Chris Craik
152f76ee50
Prevent EndLayerOps when Begin was rejected
...
am: 3c53ec51ef
Change-Id: I075b68a1b7bdee4cbebd734748dd485ff6cd67b3
2016-08-08 23:57:22 +00:00
Chris Craik
a9bef43149
Merge "Prevent EndLayerOps when Begin was rejected" into nyc-mr1-dev
2016-08-08 23:44:08 +00:00
Chris Craik
3c53ec51ef
Prevent EndLayerOps when Begin was rejected
...
bug:30537130
BeginLayerOps were being rejected in a way that allowed the associated
EndLayerOps to still be recorded. This was a violation of DisplayList
content expectations, and caused crashes in FrameBuilder when trying to
play these DisplayLists back.
Change-Id: I531b840aa5c4ffb1ee458da3f4b366978eaeafbe
2016-08-08 15:15:58 -07:00