6772 Commits

Author SHA1 Message Date
John Reck
a975a84498 am 70e5db94: Merge "Fix crash in kModeProcessNoContext" into mnc-dev
* commit '70e5db9413f82bf1f000bd99b3d2dbecf6e4ab04':
  Fix crash in kModeProcessNoContext
2015-08-04 19:48:30 +00:00
John Reck
95cd24bb9d Fix crash in kModeProcessNoContext
Bug: 22931143
Change-Id: I9897a28b1edd006aee67ae2343874ad92bbd15a0
2015-08-04 18:19:11 +00:00
Ben Wagner
a11ee3c413 Add Skia includes where needed.
A proposed change in Skia will forward declare more classes in more
headers. As a result, some Skia headers need to be explicitly
included.

Change-Id: I577095afde9de0e36b8f904aee91979b01e30726
2015-08-04 17:28:43 +00:00
Ye Ouyang
68eb3b22b0 animateNoDamage failed to remove from current frame list
runRemainingAnimations is used to animate the available animation handle
which were not yet run, it actually animate those animation handle and
removes from the list by notifyAnimationsRan(). In case if these animation
handles are not removed, it leads to the Fatal Assert of runRemainingAnimations.

Some usecases causes the addition of animation handle when there is
no animators, in these cases this check prevents execution of
notifyAnimationsRan() leads to Fatal Assert crash of runRemainingAnimations.

Allowing the animation to happen irrespective of animators solves the problem.

Change-Id: Ifa72286cdc6ff785fcc999f3b951dd787e7003e9
2015-08-04 10:42:32 -05:00
xiaozhengdong
d538d30e2f hwui: add extension to support unpack operations in OpenGL ES 2.0
OpenGL ES 3.0+ lets us specify the row length for unpack operations
such as glTexSubImage2D(). This allows us to upload a sub-rectangle
of a texture. Also, the GL_EXT_unpack_subimage extension can also
support this feature in OpenGL ES 2.0

Change-Id: Id43c2c55c5eaefbace67087c955f0b4324fb2c35
Signed-off-by: xiaozhengdong <xiaozhengdong@xiaomi.com>
2015-08-04 19:46:01 +08:00
John Reck
0d39408976 am 903e117e: am 0429246e: am 0c9ec1f2: am 2e529712: am c03ab87a: Merge "Disable skipping frames on empty damage" into mnc-dev
* commit '903e117e55d5b2ac58acdce3810fc47972d1c6cb':
  Disable skipping frames on empty damage
2015-08-04 01:41:02 +00:00
John Reck
903e117e55 am 0429246e: am 0c9ec1f2: am 2e529712: am c03ab87a: Merge "Disable skipping frames on empty damage" into mnc-dev
* commit '0429246eb85dd3c42f92bd5680fe2f6883faddbc':
  Disable skipping frames on empty damage
2015-08-04 01:31:03 +00:00
John Reck
2e529712e6 am c03ab87a: Merge "Disable skipping frames on empty damage" into mnc-dev
* commit 'c03ab87ac9f721ff22bfe5e9c0cd0e5be64f261e':
  Disable skipping frames on empty damage
2015-08-04 01:00:24 +00:00
Yusuke Sato
05f648e1d3 Clean up AssetManager::scanAndMergeZipLocked
Now that ZipFileRO::startIteration supports prefix/suffix matching,
we can pass dirName to the function for simpler code and slightly
better performance.

(cherry-pick of c796ad0a8be6df4a3b354690dfe5ce1df8136c09)

Change-Id: I0e2ac58de28020c2af8d8e569a97592b09596185
2015-08-03 17:24:42 -07:00
Yusuke Sato
957c23775f Let findSupportedAbi and hasRenderscriptBitcode scan only relevant files
for better performance. Without the optimization, these two functions
may check more than 100k file names in the pre-installed APK files,
which can take a few seconds to finish even on a recent device.

(cherry-pick of 34fe3df8519523dbb4bc27010fa57f259d5e868d)

Bug: 21957428
Change-Id: I5ebe0438019958d883a7fda6bd92ea4484211d23
2015-08-03 17:24:32 -07:00
John Reck
6d4d0db312 Disable skipping frames on empty damage
Bug: 22592975

Optimization added in MNC is not quite correct, occasionally
it will fail to repaint when it was supposed to leading
to buffer corruption. Disable the optimization for now.

Change-Id: I34dfdfb357eda298198043ded7335d4588a003fd
2015-08-03 22:47:49 +00:00
Yusuke Sato
7bfd7048f2 Merge "Clean up AssetManager::scanAndMergeZipLocked" 2015-08-03 17:41:19 +00:00
John Reck
49286e8540 Merge "Tune LA's initial size better" 2015-07-30 21:29:03 +00:00
John Reck
afb052142a Tune LA's initial size better
Reduces wasted memory from ~80% to ~40% on a
handful of apps.

Change-Id: Idd5fb6477341925156d5f1f0ce2a535ec4e1aa4f
2015-07-30 14:22:32 -07:00
John Reck
0818228a57 Merge "Remove the rest of utils/Vector.h usage" 2015-07-30 20:37:49 +00:00
Chris Craik
9a579f58a6 am e375685a: am 9c458148: am 3d208671: am 7dfb1d99: am 730c0f65: Merge "Fix stencil mask usage in HWUI" into mnc-dev
* commit 'e375685aa4b8d7f31b2cbe08170c32bd4150468d':
  Fix stencil mask usage in HWUI
2015-07-30 20:07:06 +00:00
Fred Fettinger
2ccb5030c6 animateNoDamage failed to remove from current frame list
runRemainingAnimations is used to animate the available animation handle
which were not yet run, it actually animate those animation handle and
removes from the list by notifyAnimationsRan(). In case if these animation
handles are not removed, it leads to the Fatal Assert of runRemainingAnimations.

Some usecases causes the addition of animation handle when there is
no animators, in these cases this check prevents execution of
notifyAnimationsRan() leads to Fatal Assert crash of runRemainingAnimations.

Allowing the animation to happen irrespective of animators solves the problem

Change-Id: I685dc7ebf736268927a536595910fc63353306eb
Signed-off-by: Parasuraman <parasur@motorola.com>
Signed-off-by: Fred Fettinger <fettinge@motorola.com>
2015-07-30 13:03:00 -07:00
Chris Craik
e375685aa4 am 9c458148: am 3d208671: am 7dfb1d99: am 730c0f65: Merge "Fix stencil mask usage in HWUI" into mnc-dev
* commit '9c458148e9c113ee7092f05ede90a71a64a01adb':
  Fix stencil mask usage in HWUI
2015-07-30 19:59:20 +00:00
Chris Craik
7dfb1d9931 am 730c0f65: Merge "Fix stencil mask usage in HWUI" into mnc-dev
* commit '730c0f6591b1c99699e9d0ecf36d696f7d87629f':
  Fix stencil mask usage in HWUI
2015-07-30 19:37:15 +00:00
Chris Craik
730c0f6591 Merge "Fix stencil mask usage in HWUI" into mnc-dev 2015-07-30 19:30:58 +00:00
Chris Craik
fa51a0e1ce Fix stencil mask usage in HWUI
bug:21588246

Ensure we always set the mask before clearing, and removes
some unneeded optimizations around mask usage in
debug (overdraw) mode.

Change-Id: I71ed06c16f8d9f158953d5aa160098514f0f7f00
2015-07-30 11:06:53 -07:00
John Reck
cef25e5319 Merge "Replace most usages of utils/Vector.h" 2015-07-30 17:38:35 +00:00
John Reck
bef837dc57 Remove the rest of utils/Vector.h usage
Change-Id: I90ab2c17ba1903a8241cba7f623b74ed136dd845
2015-07-30 09:51:57 -07:00
John Reck
272a685f17 Replace most usages of utils/Vector.h
Change-Id: I540d1b3523244d6c71fc52d6fb30555271c25644
2015-07-30 09:51:52 -07:00
Chris Craik
70cfdc9137 Merge "Add fast path for roundrect Outline changes" 2015-07-30 16:37:11 +00:00
John Reck
d416398c3f Merge "Re-enable -Werror on clang" 2015-07-30 16:26:29 +00:00
Elliott Hughes
734ae3554d am 1db1b582: am 204b4157: am f8a6a2f6: Merge "Use _WIN32 rather than HAVE_WINSOCK."
* commit '1db1b5821f6819a602f2dda5950d12b6f6183c36':
  Use _WIN32 rather than HAVE_WINSOCK.
2015-07-30 16:01:20 +00:00
Elliott Hughes
1db1b5821f am 204b4157: am f8a6a2f6: Merge "Use _WIN32 rather than HAVE_WINSOCK."
* commit '204b4157b3fdbeea8859c4ad0e29be18d74e6f5f':
  Use _WIN32 rather than HAVE_WINSOCK.
2015-07-30 15:47:11 +00:00
Elliott Hughes
59cbe8d107 Use _WIN32 rather than HAVE_WINSOCK.
Change-Id: I0821d2af8473c359e8b73aec455000cb7c42f690
2015-07-29 17:49:27 -07:00
Derek Sollenberger
6578a98956 Support High Contrast Text for all canvas types
Change-Id: Iee324446798fe1a1cb32cb991f181a4af24aa93c
2015-07-29 16:02:14 -04:00
Chris Craik
40de9f28f4 Add fast path for roundrect Outline changes
bug:22724385

Additionally, move all outline/related methods on RenderNode to use
fast JNI.

Change-Id: Idc462099638bdae0391d35975f3161a2f0540b9b
2015-07-29 12:57:41 -07:00
Chris Craik
c9a6ca5d6b Merge "Revert "Support High Contrast Text for all canvas types"" 2015-07-29 18:15:16 +00:00
Chris Craik
749e67438c Revert "Support High Contrast Text for all canvas types"
bug:22820834

This reverts commit 876d56612ab8ec7032f702905d694670e6c4febd.

Change-Id: I4e07a0894095caaaf2fd36bfa6073d033542bfc4
2015-07-29 18:14:46 +00:00
John Reck
c36df95229 Re-enable -Werror on clang
Change-Id: I582bd0665752c7a9deb4f9de094d0dd0a50cda6a
2015-07-29 10:09:36 -07:00
Derek Sollenberger
2d35cf953a Merge "Support High Contrast Text for all canvas types" 2015-07-29 14:36:09 +00:00
Adam Lesinski
de4c02645e am 3ab63f63: am 68d982da: am f02a02c2: am e1e94c7d: am fd44b56d: Merge "AAPT: Fix printing of resource configurations" into mnc-dev
* commit '3ab63f637f4ff4a6783bdd197734d67d605c453d':
  AAPT: Fix printing of resource configurations
2015-07-28 18:46:41 +00:00
Chris Craik
504070587b Merge "Fix comment about swap buffers with damage" 2015-07-28 18:06:19 +00:00
Chris Craik
7cd262a59c Fix comment about swap buffers with damage
Change-Id: I7957bed4488453019ad9f09427d81741bca4e5e9
2015-07-28 10:46:52 -07:00
Andreas Gampe
cb4af9b10a Hwui: Remove unused variables
For build-system CFLAGS clean-up, remove unused variables.

Bug: 18632512
Change-Id: Ic58bedc84234325512193991fc64315e3aad6f9e
2015-07-27 18:22:08 -07:00
Adam Lesinski
3ab63f637f am 68d982da: am f02a02c2: am e1e94c7d: am fd44b56d: Merge "AAPT: Fix printing of resource configurations" into mnc-dev
* commit '68d982dab9ebba2accb7aa37f55cf68548d24818':
  AAPT: Fix printing of resource configurations
2015-07-28 00:57:35 +00:00
Adam Lesinski
e1e94c7d58 am fd44b56d: Merge "AAPT: Fix printing of resource configurations" into mnc-dev
* commit 'fd44b56d599bc6c6e7397dcdfaa6d613805a88cb':
  AAPT: Fix printing of resource configurations
2015-07-28 00:16:38 +00:00
Adam Lesinski
5b0f1be0a2 AAPT: Fix printing of resource configurations
Print out proper, copied configuration. We add fields to ResTable_config
and if we don't copy and fill in defaults when reading old configurations,
we end up with garbage values. This can potentially cause a crash as well.

Bug:22773426
Change-Id: I64f5ebe73ee72453bcdad3a19e48f8e7ad58e9c2
2015-07-27 17:04:43 -07:00
Leon Scroggins III
0e9059b454 Change from SkDeviceProperties to SkSurfaceProps.
Fixes build.

Change-Id: Id6b0f96830761f8b6896169327de90f3b390e3c9
(cherry picked from commit 8ebf97a668e7a53bb9810aa5049a8b28435143d2)
2015-07-24 15:55:48 +00:00
John Reck
83b8832397 am 23861bb9: am 78d491ac: am 452b62e1: am c5d3dde6: am 8b1154c4: Merge "Move updateMatrix() call to animateCommon" into mnc-dev
* commit '23861bb9d0f4bfeb11ba0989418d567207eb06f3':
  Move updateMatrix() call to animateCommon
2015-07-24 05:16:21 +00:00
John Reck
9e5f4af1ed am 11f9da31: am bdb2a905: am d08fb687: am e5783e58: am 2abf0f24: Fix a race condition that could cause lockup
* commit '11f9da310ac3129cd859ef98f7f10d897308a59b':
  Fix a race condition that could cause lockup
2015-07-24 05:14:44 +00:00
John Reck
23861bb9d0 am 78d491ac: am 452b62e1: am c5d3dde6: am 8b1154c4: Merge "Move updateMatrix() call to animateCommon" into mnc-dev
* commit '78d491ac8dbf85424e87386bedeee0016df6f7fb':
  Move updateMatrix() call to animateCommon
2015-07-24 04:06:47 +00:00
John Reck
11f9da310a am bdb2a905: am d08fb687: am e5783e58: am 2abf0f24: Fix a race condition that could cause lockup
* commit 'bdb2a90570b6fcdcb85d010070f77f7cea61e41a':
  Fix a race condition that could cause lockup
2015-07-24 04:05:13 +00:00
John Reck
c5d3dde6c7 am 8b1154c4: Merge "Move updateMatrix() call to animateCommon" into mnc-dev
* commit '8b1154c487c25388107dc024376435f3b0ae2385':
  Move updateMatrix() call to animateCommon
2015-07-24 00:02:23 +00:00
John Reck
49dec430e8 Move updateMatrix() call to animateCommon
Bug: 22667315

HWUI internally always assumes that RenderNode->properties()
has a fully-baked matrix. However, RenderThread animations violate
this and will perform an update of that matrix after they run. This
was missing in the fallback scenario where an animation was
running on a View that is detached from the tree.

If a RenderThread animation is started on an attached view, it becomes
detached, and is then re-attached it will crash in the staging
properties push. The fix for this is to move the call to updateMatrix
from animate() to animateCommon() so that the animateNoDamage()
path will similarly perform the necessary matrix update.

Change-Id: I4c899a6f68659342a6515f1d7f20d3c4af65caf0
2015-07-23 22:37:21 +00:00
John Reck
e5783e58db am 2abf0f24: Fix a race condition that could cause lockup
* commit '2abf0f24af60b8644d5b61eed9666793083546ee':
  Fix a race condition that could cause lockup
2015-07-23 19:20:47 +00:00