Commit Graph

7500 Commits

Author SHA1 Message Date
John Reck
5cc4428bec Merge "Don\'t reuse LOST_SURFACE for stopped" into nyc-dev
am: 9110429

* commit '9110429f0d8acac0d621d805050103fa58953fb9':
  Don't reuse LOST_SURFACE for stopped

Change-Id: Ia7c609029215da17c61eb77bd3279c077d1b7713
2016-04-19 14:53:31 +00:00
John Reck
9110429f0d Merge "Don't reuse LOST_SURFACE for stopped" into nyc-dev 2016-04-19 14:45:16 +00:00
John Reck
a7fcaabbe2 Merge "Make getFrameNumber lazy" into nyc-dev
am: 8cddce3

* commit '8cddce3f8f503b2aa8b993fef6406645c3e80da6':
  Make getFrameNumber lazy

Change-Id: If81ee9732424750465ceae5d2136bb23288f6a5f
2016-04-18 23:27:49 +00:00
John Reck
8cddce3f8f Merge "Make getFrameNumber lazy" into nyc-dev 2016-04-18 23:20:39 +00:00
Adam Lesinski
af2758a962 Merge "Optimize ResTable::getLocales() to improve bindApplication performance" into nyc-dev
am: bfdc202

* commit 'bfdc2020b94d6368a7a8cf97bf545d28c757e0fd':
  Optimize ResTable::getLocales() to improve bindApplication performance

Change-Id: I5148dabc722ec2c31008ba05adb3ccdfa357857a
2016-04-18 22:35:27 +00:00
Adam Lesinski
bfdc2020b9 Merge "Optimize ResTable::getLocales() to improve bindApplication performance" into nyc-dev 2016-04-18 22:24:09 +00:00
Adam Lesinski
b7e1ce0775 Optimize ResTable::getLocales() to improve bindApplication performance
Change from linear searching for uniqueness to binary search.

Bug:27198799
Change-Id: I1ccb6e93cc213810848f07d631d9d8de7c719803
2016-04-18 15:06:50 -07:00
John Reck
28912a5084 Make getFrameNumber lazy
Change-Id: I783de544ad9a3636ea90f1c8c4034738997bfbc8
Fixes: 28246085
2016-04-18 14:34:18 -07:00
Chris Craik
2554b09fc9 Merge "Improve multi-window render clipping logic" into nyc-dev
am: c79c324

* commit 'c79c3246c9a3e0d2aa34afd18fddc95a6aff0f30':
  Improve multi-window render clipping logic

Change-Id: I4be0f6cefba71f7928fec559481fe389d9de800b
2016-04-18 19:52:03 +00:00
Chris Craik
c79c3246c9 Merge "Improve multi-window render clipping logic" into nyc-dev 2016-04-18 19:40:50 +00:00
John Reck
9a17da8125 Don't reuse LOST_SURFACE for stopped
Fixes: 28218991

If a draw() happens while we are stopped, don't report
that the surface is lost because this will prompt
a tear-down of the surface which isn't desired. It can
result in ViewRootImpl ending up in an internally-bad state
in this case.

Change-Id: If3eb8c6bc8702299e5330bc0917952624dce3b7e
2016-04-18 11:29:35 -07:00
Chris Craik
9cd1bbe5c9 Improve multi-window render clipping logic
Fixes: 28125010

Restructures 'scene defer', to implement window backdrop overdraw
avoidance in new render pipeline, and disable clipping to content draw
bounds.

Also restructures FrameBuilder's constructors, to separate out into
multiple defer methods.

Change-Id: I53facb904c1a4a4acc493d8a489921a79a50494e
2016-04-18 10:39:02 -07:00
John Reck
b827a1cea9 Merge "Switch JankTracker to FrameInfo::duration()" into nyc-dev
am: f91cbc7

* commit 'f91cbc7fd24e58a8e87b16c21363da94c3e039ea':
  Switch JankTracker to FrameInfo::duration()

Change-Id: I6339004d6cca3f8efaa4bc70d3a5628fc8795ef5
2016-04-15 23:54:30 +00:00
John Reck
f91cbc7fd2 Merge "Switch JankTracker to FrameInfo::duration()" into nyc-dev 2016-04-15 23:47:01 +00:00
John Reck
126720aa65 Switch JankTracker to FrameInfo::duration()
Fixes: 27533462

FrameInfo::duration() will remove time spent waiting
in the queue from the duration. This is desired because
that time is otherwise accounted for by the previous frame,
so we don't want to double count it.

This shows up mostly in TestSceneRunner & shadowgrid2
due to a combination of slow frame times and continous rendering.

Change-Id: I27c42d5c24d266de4ada8ea00ec9164d518754f8
2016-04-15 15:19:50 -07:00
John Reck
93b93ed228 Merge "Turn off HWUI_ENABLE_OPENGL_VALIDATION" into nyc-dev
am: b8563f1

* commit 'b8563f1ae4c56da7ca7839739c1427ed0ca6a281':
  Turn off HWUI_ENABLE_OPENGL_VALIDATION

Change-Id: I9f46cbffaa702e62310dc4dfccb4b4c004206bf3
2016-04-15 20:20:50 +00:00
John Reck
b8563f1ae4 Merge "Turn off HWUI_ENABLE_OPENGL_VALIDATION" into nyc-dev 2016-04-15 20:12:29 +00:00
John Reck
9e06acf392 Merge "Add a callback for when a gl functor is released" into nyc-dev
am: 85cfc8c

* commit '85cfc8c368523359be8c12b8551e122b94972ab7':
  Add a callback for when a gl functor is released

Change-Id: Ie9f602710d46faf045d04ff425bee8428d6fe9c7
2016-04-15 19:32:51 +00:00
John Reck
85cfc8c368 Merge "Add a callback for when a gl functor is released" into nyc-dev 2016-04-15 19:26:16 +00:00
John Reck
756619da20 Turn off HWUI_ENABLE_OPENGL_VALIDATION
Fixes: 28212865

Disable glGetError() checking after every gl call

Change-Id: I849934172a56150122a8d0114b0307515d988fe7
2016-04-15 11:31:09 -07:00
John Reck
cd1c3eba69 Add a callback for when a gl functor is released
Bug: 27709981

Change-Id: Id5be3e8f88d6d84a9c59c7ed23e7e8862feefbe8
2016-04-15 10:56:53 -07:00
Doris Liu
7611bd1d96 Merge "Fix ref count of fillGradient and strokeGradient" into nyc-dev
am: da62de4

* commit 'da62de4f65ccffc4734299f82f1c9ce4836e1c58':
  Fix ref count of fillGradient and strokeGradient

Change-Id: Id4aa38d26fd568f4a312fd5ba507306b84ce8ac7
2016-04-15 17:56:30 +00:00
Doris Liu
da62de4f65 Merge "Fix ref count of fillGradient and strokeGradient" into nyc-dev 2016-04-15 17:47:25 +00:00
Doris Liu
ad21fe2762 Fix ref count of fillGradient and strokeGradient
Bug: 28086621
Change-Id: Ibb52bdfb20904f0ad102878fbb33d3679bb5132d
2016-04-14 18:33:27 -07:00
Tim Murray
62047f93d4 Merge "Revert "Optimize ResTable::getLocales() to improve bindApplication performance"" into nyc-dev
am: 117cff7

* commit '117cff790e34948e847d724be624ed2dd00bc82c':
  Revert "Optimize ResTable::getLocales() to improve bindApplication performance"

Change-Id: I86b5cc6eddf38cdd015fe80f1180ca246a97352a
2016-04-14 23:58:22 +00:00
Tim Murray
98e80076c6 Revert "Optimize ResTable::getLocales() to improve bindApplication performance"
This reverts commit 5520581b5f.

bug 28189634

Change-Id: I2d2b859f6d9bd44434fa901cce990583f514980c
2016-04-14 16:06:29 -07:00
Treehugger Robot
d4876ca8e5 Merge "libstorage needs libbinder include paths" am: c91f028
am: 17634ea

* commit '17634ea84db72ecafc31be9b85e7bbde7c919518':
  libstorage needs libbinder include paths

Change-Id: If949089e6ba990912d95881f30ca0664b59e5bf8
2016-04-14 18:16:41 +00:00
John Reck
fe16c4b105 Merge "Revert "Revert "Make stopped state a first-class thing""" into nyc-dev
am: d6a25c2

* commit 'd6a25c2b3e7fd5a98741e2f770cf54d539b29258':
  Revert "Revert "Make stopped state a first-class thing""

Change-Id: Iff85c259e93a54c3e3a9db3f3d2b2f826526de0a
2016-04-14 17:47:40 +00:00
John Reck
d6a25c2b3e Merge "Revert "Revert "Make stopped state a first-class thing""" into nyc-dev 2016-04-14 17:40:52 +00:00
John Reck
8afcc76920 Revert "Revert "Make stopped state a first-class thing""
This reverts commit eab3f2658a.

Fixes first-frame issue, mReportNextDraw needs to override
mStopped

Fixes: 28118961
Fixes: 27286867

Change-Id: I5c811759637d08ba9f3b342016d1b3006986d5a2
2016-04-14 10:39:03 -07:00
Chris Craik
8a851e5277 Merge "Avoid reentrance on ClipArea APIs" into nyc-dev
am: 5ce4e2e

* commit '5ce4e2e78f3f4e1c39423a79ad1787e05b961e14':
  Avoid reentrance on ClipArea APIs

Change-Id: Iac7810d1732fa2435436c324490bcc313f31c475
2016-04-14 17:18:29 +00:00
Christopher Wiley
1e06bde16e libstorage needs libbinder include paths
This library is almost all binder related.  It should be
using libbinder's published include path.

Bug: 27804373
Test: This library compiles with a slightly modified libbinder include
      path.

Change-Id: Ib8e00b59604cdda69ec36cf1c90150b4b9033879
2016-04-14 10:16:33 -07:00
Chris Craik
5ce4e2e78f Merge "Avoid reentrance on ClipArea APIs" into nyc-dev 2016-04-14 17:12:20 +00:00
Chris Craik
bf27b995ae Avoid reentrance on ClipArea APIs
bug:28144676

Calling ClipArea::clipRegion from within ClipArea::clipPathWithTransform
has us handling op-based special casing twice, which caused all clip
paths to appear to be replace ops.

Change-Id: Ib842db53ffed4eee29470f773d59a3a1d07a1a0e
2016-04-13 15:59:32 -07:00
Adam Lesinski
eaf83ef61b Merge "Optimize ResTable::getLocales() to improve bindApplication performance" into nyc-dev
am: b5abb78

* commit 'b5abb78b7c329069d5d5e7fd9c6a6e5e81f79c90':
  Optimize ResTable::getLocales() to improve bindApplication performance

Change-Id: I9b2e5d8488f15a400287f8cfacc3531bdb007068
2016-04-13 22:25:45 +00:00
Adam Lesinski
b5abb78b7c Merge "Optimize ResTable::getLocales() to improve bindApplication performance" into nyc-dev 2016-04-13 21:53:47 +00:00
Adam Lesinski
5520581b5f Optimize ResTable::getLocales() to improve bindApplication performance
Change from linear searching for uniqueness to binary search.

Bug:27198799
Change-Id: Ifa4672929df286c4693ab1f77716f08945941b0c
2016-04-13 13:25:09 -07:00
Doris Liu
61ce25a24b Merge "Allow leading spaces in path string (to keep behavior consistent)" into nyc-dev
am: a184abe

* commit 'a184abe4b0348b7c4633fb2c9922d2ec82cee34a':
  Allow leading spaces in path string (to keep behavior consistent)

Change-Id: I9340d31fe79251de3a37f999c0d7228bbd759e23
2016-04-13 17:35:56 +00:00
Doris Liu
d3473ffd95 Merge "rm log spam" into nyc-dev
am: 70eff90

* commit '70eff906ad6d944fab92608e2ad11deb3fbb396e':
  rm log spam

Change-Id: I6c2a4865ba4146ffdec555346c35b5f77fa147bd
2016-04-13 17:28:33 +00:00
Doris Liu
da6c6ebebc Merge "Fix translationY not being set correctly for VD during animation" into nyc-dev
am: 3513035

* commit '351303531f440b661215cb35394331d11568ac68':
  Fix translationY not being set correctly for VD during animation

Change-Id: I340fb647e4475607658f64eb9a6233aeccff8d37
2016-04-13 17:28:31 +00:00
Doris Liu
a184abe4b0 Merge "Allow leading spaces in path string (to keep behavior consistent)" into nyc-dev 2016-04-13 17:26:54 +00:00
Doris Liu
70eff906ad Merge "rm log spam" into nyc-dev 2016-04-13 17:22:57 +00:00
Doris Liu
351303531f Merge "Fix translationY not being set correctly for VD during animation" into nyc-dev 2016-04-13 17:22:19 +00:00
Doris Liu
952670d9cf rm log spam
Bug: 27385133
Change-Id: Ia97fbba61da691e2fde91ed1a857e0478046f8c0
2016-04-12 17:43:00 -07:00
Doris Liu
32d7cda0b8 Fix translationY not being set correctly for VD during animation
Bug: 28056917
Change-Id: Ic5b7d14ac3dff8cad1c62f08b6d3389f979a2b00
2016-04-12 17:32:21 -07:00
John Reck
aa21d56cfa Merge "Fix reset() to zero slowFrameCounts" into nyc-dev
am: 7239d95

* commit '7239d957e9cd30c28c6d06fff0320258f0ae3a4f':
  Fix reset() to zero slowFrameCounts

Change-Id: I8a15edd4b1e672998438d1befc986cfac2b02b4e
2016-04-12 22:22:55 +00:00
Doris Liu
b35da39060 Allow leading spaces in path string (to keep behavior consistent)
Bug: 28132454
Change-Id: Iee799c13a85738db3d6940aca0fe917f284fa651
2016-04-12 21:38:07 +00:00
John Reck
8f55d00c2a Fix reset() to zero slowFrameCounts
Change-Id: I9f7f7280bcd28c361e5665de39a4bd7c594ab521
Fixes: 26386641
2016-04-12 13:10:19 -07:00
John Reck
f3c2dee3e1 Merge "Framework-side of SurfaceView#getBitmap" into nyc-dev
am: d2eec0e

* commit 'd2eec0efb2e47b23b2a12ab2967e422f0be49094':
  Framework-side of SurfaceView#getBitmap

Change-Id: I4da75d89a536c11dbaa9ee1feba8e5838fbb5a41
2016-04-12 14:45:44 +00:00
John Reck
d2eec0efb2 Merge "Framework-side of SurfaceView#getBitmap" into nyc-dev 2016-04-12 14:36:11 +00:00