7130 Commits

Author SHA1 Message Date
John Reck
541b193fc4 Merge "Fix mismatch in assumed defaults vs. actual defaults" 2016-01-22 19:18:54 +00:00
John Reck
a5b2029e1b Merge "Fix accidental activateTexture(0)" 2016-01-22 19:18:43 +00:00
John Reck
48247a2956 Fix mismatch in assumed defaults vs. actual defaults
Bug: 26584230
Change-Id: Ia0271b097a40123c18f6b3540c1168cba109b5ce
2016-01-22 11:10:32 -08:00
John Reck
bd41ded590 Fix accidental activateTexture(0)
Bug: 26584230

activateTexture(0) was accidentally refactored into
Texture::upload. Only OffscreenBuffer intended for the
texture unit to change

Change-Id: I5dbfc3eab8843733084ce1ce38a0a946abf0e05b
2016-01-22 09:31:28 -08:00
John Reck
1a2d84acbd ALOGE is not ALOGV
Change-Id: I973cd7ce28bed38934aab0818e581a948a12cb42
2016-01-22 09:17:41 -08:00
Derek Sollenberger
a83c1e545e Merge "Add support for bitmaps with Grey_8 color type." 2016-01-22 14:07:37 +00:00
John Reck
c080f112b5 Merge "resolve merge conflicts of 32a95af029 to master." 2016-01-22 00:46:34 +00:00
John Reck
e5530ec0b4 resolve merge conflicts of 32a95af029 to master.
Change-Id: I35b7cea1d34cb24f431ba2b76433a5b0ef1cb602
2016-01-21 16:45:31 -08:00
Michael Wright
6cfa1cc4b0 Merge "Add choreographer API to the NDK." 2016-01-22 00:31:40 +00:00
Michael Wright
3d3fe5026a Add choreographer API to the NDK.
Change-Id: Icb8cffd3cd3bd06814466be72db3e26f6a62cbc6
2016-01-21 16:30:33 -08:00
Roozbeh Pournader
2d05094209 Merge "Implement smarter locale resource selection" 2016-01-21 22:17:31 +00:00
John Reck
32a95af029 Merge "libhwui: fix texture memory leak"
am: 550d46d9da

* commit '550d46d9dae8a4de5abd36a5e2d3c101135da696':
  libhwui: fix texture memory leak
2016-01-21 22:08:44 +00:00
Doris Liu
7f193c5b03 Merge "Create SkCanvas on the stack to avoid leaking memeory" 2016-01-21 21:49:54 +00:00
Roozbeh Pournader
b927c559e1 Implement smarter locale resource selection
* Add support for determining script from language and region.
* Add support for determining special parents of locales.
* Add support for smart comparison of locales with only a difference
  in region, using the locale parentage tree.
* Fix LocaleData.matchScore() to not fallback to old locale matching
  behavior if we can't determine a script.
* Allow four-character variant codes. (Previously, only five- to
  eight-character variant codes were allowed.)

Bug: 7296673
Bug: 26589793
Change-Id: Ibde0a48c0564ff383b41068095a5cbacfe7b94bc
2016-01-21 13:47:22 -08:00
Doris Liu
c2de46fadd Create SkCanvas on the stack to avoid leaking memeory
Bug: 26447978
Change-Id: Ied022c103c3b08e9cfc3cb775a8c95fd5461e81d
2016-01-21 13:05:48 -08:00
John Reck
66f65cb345 Ensure Texture always binds to self
Bug: 26584230

In the event that Texture decides it doesn't
need to actually call glTexImage2D/glSubTexImage2D
it needs to still activateTexture(0) and bindTexture(mId)
as this is the expected state after Texture::upload()
is called.

Change-Id: I62d689a9057907a10dda2bc8f40c3113e43b93b2
2016-01-21 09:08:42 -08:00
Dohyun Lee
c5a3efd286 libhwui: fix texture memory leak
When there is not enough space and we cannot delete any
Texture in TextureCache to secure space, a new Texture is
created over and over again for the same SkBitmap and
there is the case that it is not deleted.
This patch avoids such cases.

Change-Id: Ic5353995e6d0716c31fe3bb49c60ec1a71574643
Signed-off-by: Dohyun Lee <leedhyun11@gmail.com>
2016-01-21 13:46:21 +09:00
John Reck
2de7771740 Normalize GL_UNPACK_ALIGNMENT
Several places were setting GL_UNPACK_ALIGNMENT
unneccessarily, whereas other places were assuming an
unpack alignment of 1. Since we never actually
do explicit row-alignment, set GL_UNPACK_ALIGNMENT
to 1 at context creation time and never change it

Bug: 26584230

Also turns on aggressive glGetError checking to
better catch potential problem zones

Change-Id: I190c8f0f0494a7f046d5ed769405c75d363be59a
2016-01-20 13:16:24 -08:00
Derek Sollenberger
88d842fedf Add support for bitmaps with Grey_8 color type.
bug: 26679788
Change-Id: Ib5524e3e204e1478461c7371c411e96285feb9c7
2016-01-20 10:48:55 -05:00
John Reck
dcdbba7c95 Re-enable new pipeline
Change-Id: I0d0b2a109a3756d404e4e244348a863a9afa3f9b
2016-01-19 13:57:48 -08:00
John Reck
0c540849d7 Merge "Fix ordering of texture->upload arguments" 2016-01-19 21:21:33 +00:00
John Reck
9372ac3621 Fix ordering of texture->upload arguments
Caught by scatter-shotting GL_CHECKPOINTS which
seem generally useful to have

Bug: 26609444

Change-Id: Ie31d9297d8dae56405126720f338b4256c8bae77
2016-01-19 12:58:48 -08:00
John Reck
465eefb9f3 Merge "fix race condition between HWUI cache and renderThread" am: 2c2b5e8514
am: 4354ae9883

* commit '4354ae9883ae1282ac457539f46d529bdfa89fec':
  fix race condition between HWUI cache and renderThread
2016-01-19 18:42:21 +00:00
John Reck
4354ae9883 Merge "fix race condition between HWUI cache and renderThread"
am: 2c2b5e8514

* commit '2c2b5e8514247d8524778d209f26b7dbde19d142':
  fix race condition between HWUI cache and renderThread
2016-01-19 18:38:11 +00:00
John Reck
1b94f9b77c Revert "Switch to new rendering pipeline"
This reverts commit 3daf4d3272f2cc6ce3b5a572b9d4dcce1654086d.

Temporarily disable due to high rate of crashes from endLayer check

Bug: 26609444
Change-Id: I7583a77bf5cc1e722fa4042db0542f80cd978760
2016-01-19 09:44:39 -08:00
John Reck
7d569db936 Merge "Hard-abort tests if LOG_ALWAYS_FATAL" 2016-01-19 15:38:16 +00:00
Thomas Buhot
c0a0e1a66d fix race condition between HWUI cache and renderThread
getMaximumBitmapWidth() and getMaximumBitmapHeight() of DisplayListCanvas
need HWUI cache instance. Since the initialization of the cache is
asynchronous it may crash if not yet ready. Add a staticFence() call
to guarantee the cache has been created prior issuing the call.

Change-Id: I5ed9e5cc084444c8d1872a77fef50e294ae14e93
Signed-off-by: Thomas Buhot <thomas.buhot@intel.com>
Signed-off-by: Zhiquan Liu <zhiquan.liu@intel.com>
2016-01-19 15:00:42 +08:00
John Reck
f1dafb5962 Hard-abort tests if LOG_ALWAYS_FATAL
Bug: 26591625

Also fixes it so debuggerd runs and we get stacks

Change-Id: I55b376e6a4e12ddcd21fa251fbfe5bd521fc0985
2016-01-15 16:58:23 -08:00
John Reck
7db5ffb7db Revert "Revert "Fix leak in unclipped save layer""
This reverts commit a6fc36d4cd7f27147fd304960acdd1d2f47fc1c6.

Change-Id: I6b96afe4a32dc894d5b17cfb870b45063257aed2
2016-01-15 13:59:37 -08:00
Daniel Chapin
a6fc36d4cd Revert "Fix leak in unclipped save layer"
This reverts commit 8e068d5fd38dd103a122215fb6d185135182edf3.

Change-Id: Icd8ad5a2450db34aacecf748d6103df9faaa4c81
2016-01-15 03:02:58 +00:00
John Reck
8e068d5fd3 Fix leak in unclipped save layer
Change-Id: I31f146af2cb6f5cb8dd19bb0feff0ae35b864eba
2016-01-14 16:28:28 -08:00
John Reck
a55b5d6c65 Fix "leak" in FrameBuilder.textureLayer test
DeferredLayerUpdater always did a post to delete itself, which
would result in the test thinking it had leaked an object since
it wasn't deleted when it returned. Fix this by deleting immediately
if we're already on the right thread.

Remove RenderState's requireGlContext assert as it's now
covered by GpuMemoryTracker, which is also more test friendly.
RenderState's assert required an actual EGL context, which we
don't mock away in unit tests.

Change-Id: Ic23eb54e7151355f7acca483d7464350c9d6a87f
2016-01-14 15:09:10 -08:00
John Reck
00159554e0 Fix leak in OffscreenBufferPoolTests
Change-Id: Ic16df75bdc01d902639df98bc6798d9383510342
2016-01-14 14:47:07 -08:00
John Reck
cbc5bd57f0 Merge "Track texture memory globally" 2016-01-14 21:49:42 +00:00
John Reck
f6762aca4a Merge "Trap SIGABRT in RenderThread for unit tests" 2016-01-14 21:49:30 +00:00
John Reck
e5da4ef971 Trap SIGABRT in RenderThread for unit tests
Change-Id: Icc1039543d975497808a8062e9d909537c4a29c9
2016-01-14 13:43:55 -08:00
John Reck
38e0c32852 Track texture memory globally
Also mostly consolidates texture creation

Change-Id: Ifea01303afda531dcec99b8fe2a0f64cf2f24420
2016-01-14 13:42:12 -08:00
Derek Sollenberger
3d5278b638 Update TestWindowContext to work with new HWUI ops.
This enables HWUI to be testing within Skia's infrastructure and
fixes skia bug 4775.

Change-Id: I242b9e4c5ed0f4523b6075d8825a2624235a01c7
2016-01-14 19:26:04 +00:00
Chris Craik
6fb775521a Merge "Log render pipeline in gfxinfo dump" 2016-01-14 18:58:54 +00:00
Chris Craik
ff3edce12d Log render pipeline in gfxinfo dump
Change-Id: Ia50c445b29d918f274ec45632d61d8b8479c72eb
2016-01-14 10:29:38 -08:00
Doris Liu
e410a357f5 Properly handle the negative scaling factor of canvas in VectorDrawable
Bug: 26489687
Change-Id: I91cce34759fbbac206cd59f4636fd92194396c87
2016-01-13 17:23:33 -08:00
Chris Craik
3cfc373127 Merge "Skip layer updates for layerless nodes" 2016-01-13 19:16:16 +00:00
Chris Craik
e9c5fd888b Skip layer updates for layerless nodes
bug:26535405

Change-Id: I4d5ea8401f59815715c5b51f88d549474876160c
2016-01-13 11:13:01 -08:00
Matthew Bouyack
b79151759a Merge "In CanvasContext::doFrame, make a separate call to computeFrameTimeNanos and save the result. Then pass that value to UiFrameInfoBuilder::setVsync as both arguments." into cw-e-dev am: eebf168e43 am: e0845e8629 am: 6222bb0f6a
am: 099bd9ca8f

* commit '099bd9ca8fea02795424d62c05c723290d68ae14':
  In CanvasContext::doFrame, make a separate call to computeFrameTimeNanos and save the result. Then pass that value to UiFrameInfoBuilder::setVsync as both arguments.
2016-01-13 19:00:07 +00:00
Chris Craik
8e77ff5eff Merge "Disable buildLayer crash" 2016-01-13 18:50:56 +00:00
Chris Craik
3145247b3e Disable buildLayer crash
Change-Id: Ia51e8da01d5c694fb1a084cea8dfce865c56a456
2016-01-12 18:55:15 -08:00
Chris Craik
48cb62018c Fix the build
Change-Id: I11aaa6dabdc3998155ee7f1ee58083bb88f19aad
2016-01-12 18:26:55 -08:00
Chris Craik
477e26cf93 Merge "Switch to new rendering pipeline" 2016-01-13 01:13:32 +00:00
Chris Craik
3daf4d3272 Switch to new rendering pipeline
bug:22480459

Change-Id: I3ca94c4b6c556ba6d133e2314ac0307e874651fa
2016-01-12 16:11:06 -08:00
Chris Craik
27182321dc Merge "Fix shadow bounds calculation" 2016-01-12 23:44:02 +00:00