1786 Commits

Author SHA1 Message Date
Chris Craik
06e7fe5a70 resolve merge conflicts of f2235b6 to master.
Change-Id: Ibcef3a37ca0749931d509b53bd52e53a7d30ddbb
2014-11-20 17:27:36 -08:00
Chris Craik
f2235b6a48 resolve merge conflicts of 57b641a to lmp-mr1-dev-plus-aosp.
Change-Id: I1be708f5a0cd4d64021a57f1063d54330f1d2d7e
2014-11-20 16:38:06 -08:00
Dan Albert
47249598cb am 582bdf9a: am d8c169fe: am 0c437fd3: Merge "Add appropriate casts for char16_t."
* commit '582bdf9a5961a32de27556832e23e0611c4d1cbb':
  Add appropriate casts for char16_t.
2014-11-20 23:19:06 +00:00
Dan Albert
582bdf9a59 am d8c169fe: am 0c437fd3: Merge "Add appropriate casts for char16_t."
* commit 'd8c169fedf883491e46b354484909694fd52cfaf':
  Add appropriate casts for char16_t.
2014-11-20 23:00:56 +00:00
Dan Albert
6698749dd4 Add appropriate casts for char16_t.
C++11 defines a real char16_t, which is not implicitly convertible to
uint16_t (and by extension jchar). Add casts as needed.

Bug: 18300613
Change-Id: I00752002ef2e938bdb57f70947e8fd53ec103293
2014-11-20 11:47:40 -08:00
Chris Craik
3b2ba44be3 Merge "Improve logging around performance critical events" into lmp-mr1-dev 2014-11-20 17:36:26 +00:00
Chris Craik
70850ea258 Improve logging around performance critical events
bug:17702227

Add details useful to developers (such as layer size/View name), and
switch away from logging implementation names/details, since they
are generally not relevant to developers.

Change-Id: Iee605d182f241450f7e75a6d0c283d51fa1312f5
2014-11-19 17:24:30 -08:00
John Reck
27eaec2388 am 842697a3: am decc26df: am f0f68117: Merge "Trace some interesting events" into lmp-mr1-dev
* commit '842697a3602204036e991cfea8b74da3df6e7f14':
  Trace some interesting events
2014-11-18 21:37:59 +00:00
John Reck
842697a360 am decc26df: am f0f68117: Merge "Trace some interesting events" into lmp-mr1-dev
* commit 'decc26df39b734ca1cbaccda1cbe3b355eba6898':
  Trace some interesting events
2014-11-18 21:33:19 +00:00
Chih-hung Hsieh
f7d0b20e9e am cb82b7f1: am a58336f6: Merge "Use fabsf() rather than abs()"
* commit 'cb82b7f1824dc7f9fa73c2bada7107c48290af8b':
  Use fabsf() rather than abs()
2014-11-17 23:07:29 +00:00
Chih-hung Hsieh
cb82b7f182 am a58336f6: Merge "Use fabsf() rather than abs()"
* commit 'a58336f6c8aa44373485e5a6d7ec32677387a935':
  Use fabsf() rather than abs()
2014-11-17 22:59:11 +00:00
Bernhard Rosenkränzer
c44958c786 Use fabsf() rather than abs()
abs() operates on integers -- to check floats accurately, fabsf
should be used.

Change-Id: I1a4e85f8f5e0d08ff38d307c5c31e2b6783ab7af
Signed-off-by: Bernhard Rosenkränzer <Bernhard.Rosenkranzer@linaro.org>
2014-11-17 23:12:18 +01:00
Rob Tsuk
4f2e052f3d Merge "Fix uninitialized member warning" 2014-11-17 21:43:29 +00:00
Rob Tsuk
a5f2e07074 Fix uninitialized member warning
The fact that mHasDeferredTranslate was unitialized couldn't cause any
problems, since mTranslateX and mTranslateY are intialized to zero and
the only use of mHasDeferredTranslate, in
DisplayListRenderer::flushTranslate(), doesn't do anything if those
values are both zero and then sets mHasDeferredTranslate to false.

Change-Id: Ia5aa2590b3ab956eaf74c90515353600253873f5
2014-11-17 12:57:32 -08:00
John Reck
fbc8df03e4 Trace some interesting events
Bug: 18337099
Change-Id: Ie2e60da2b9f06e0368061c944d8123ab6903355c
2014-11-17 10:18:31 -08:00
Dan Albert
57f81b86a2 Move hwui tests to libc++.
Bug: 15193147
Change-Id: I9a3a4104c49810173cbf59e0023baafc4693dd3f
2014-11-15 18:29:03 -08:00
Rob Tsuk
08ad1b05d2 Merge "Fix warnings in hwiu test app" 2014-11-13 17:38:24 +00:00
Rob Tsuk
95e5a82e1d Merge "Add a way to override Xfermode" 2014-11-13 17:17:06 +00:00
Rob Tsuk
cc3cfdbe8a Fix warnings in hwiu test app
So it's easier to see warnings about actual
problems with new changes.

Change-Id: I992711bf12bb25fbfd87fcab15993d5c5f66f46c
2014-11-12 16:24:59 -08:00
ztenghui
952de42b45 am 5679d937: am ab6515f6: am 4e50ee4f: Merge "Shadow: Fix the crash in spot shadow" into lmp-mr1-dev
* commit '5679d937ff033ff1fa86245d646b6e5dbf23d635':
  Shadow: Fix the crash in spot shadow
2014-11-12 23:59:49 +00:00
Rob Tsuk
c495e611b9 Add a way to override Xfermode
Add a non-public API to Canvas/GLES20Canvas to provide a way to draw
the touch ripple animation without using a save layer.

Bug: 18226391
Change-Id: I6f8fb8938505e976892c4e14f6f864362c43e73c
2014-11-12 15:49:45 -08:00
Rob Tsuk
6552afa878 am ccc956b2: am 41a8043b: Merge "Add a way to override Xfermode DO NOT MERGE" into lmp-mr1-dev
* commit 'ccc956b2b4602dca28f7c79d1155df29bcc0d696':
  Add a way to override Xfermode DO NOT MERGE
2014-11-12 23:49:19 +00:00
ztenghui
5679d937ff am ab6515f6: am 4e50ee4f: Merge "Shadow: Fix the crash in spot shadow" into lmp-mr1-dev
* commit 'ab6515f6214a09e23deee4b432b41d1849ae403f':
  Shadow: Fix the crash in spot shadow
2014-11-12 23:49:08 +00:00
Rob Tsuk
41a8043b30 Merge "Add a way to override Xfermode DO NOT MERGE" into lmp-mr1-dev 2014-11-12 21:42:00 +00:00
Dan Albert
45670c1dc5 am b28ff487: resolved conflicts for merge of 5e6cf242 to lmp-mr1-dev-plus-aosp
* commit 'b28ff487fb6db4a44e4d18aa17d8253f00a63bb6':
  Move frameworks/base over to libc++.
2014-11-12 21:31:33 +00:00
Dan Albert
b28ff487fb resolved conflicts for merge of 5e6cf242 to lmp-mr1-dev-plus-aosp
Change-Id: If21bd328a5c8ea3474abfe624e910d4830c72dc9
2014-11-12 13:24:42 -08:00
ztenghui
4e50ee4f42 Merge "Shadow: Fix the crash in spot shadow" into lmp-mr1-dev 2014-11-12 21:16:31 +00:00
ztenghui
3932063bc7 Shadow: Fix the crash in spot shadow
Fix the crash from searching for closest umbra vertex by initialized the
starting index correctly.

Fix another potential crash related to ray intersection by introducing epsilon.

b/18315089

Change-Id: I9ac9a781a885701a8388714d44f79a1d905e5d33
2014-11-12 12:58:08 -08:00
Dan Stoza
a41f29cc00 Change GraphicBuffer fields from uint to int
This changes fields which are tracking GraphicBuffer width and height
to use int instead of uint32_t, which is in keeping with a recent
change to GraphicBuffer itself and avoids a warning (error since this
build uses -Werror).

Change-Id: I66c5c3e3d321d4ef5ea2c40c86ac068111c18662
2014-11-12 12:35:42 -08:00
Rob Tsuk
4678dcc552 Add a way to override Xfermode DO NOT MERGE
Add a non-public API to Canvas/GLES20Canvas to provide a way to draw
the touch ripple animation without using a save layer.

Change-Id: I6e2095adffe515194f669fb75bb67abf813bd518
2014-11-12 12:25:24 -08:00
Dan Albert
ff1d8a6635 Move frameworks/base over to libc++.
Bug: 15193147
Change-Id: I96109d2d383f0c8a4aaa611f29fcf887afb3c69e
2014-11-12 11:22:20 -08:00
Andreas Gampe
edaecc1db0 resolved conflicts for merge of 1d03b816 to lmp-mr1-dev-plus-aosp
(cherry picked from commit 1272887050a269d6d506b42099c2857847ad100b)

Change-Id: Ib673768fe5fc03615626ef4b10590e5317f22172
2014-11-10 21:29:52 -08:00
Andreas Gampe
1272887050 resolved conflicts for merge of 1d03b816 to lmp-mr1-dev-plus-aosp
Change-Id: Ib673768fe5fc03615626ef4b10590e5317f22172
2014-11-10 20:54:07 -08:00
Andreas Gampe
1e19674107 Frameworks/base: Wall Werror in libs/hwui
Turn on -Wall -Werror in libs/hwui. Fix errors.

Change-Id: I74962d08c889712dacbd0d86d6760fc10802b6bd
2014-11-10 15:58:04 -08:00
John Reck
e19093cad8 am f1923c36: am 8dda03a0: am ca93f69c: Merge "Have an actual fallback if the surface is lost" into lmp-mr1-dev
* commit 'f1923c368c5c08a477b9f94dea6a499798d91d4f':
  Have an actual fallback if the surface is lost
2014-11-07 23:01:00 +00:00
John Reck
f1923c368c am 8dda03a0: am ca93f69c: Merge "Have an actual fallback if the surface is lost" into lmp-mr1-dev
* commit '8dda03a08603f45b3c2c90633491ce2c1fea266b':
  Have an actual fallback if the surface is lost
2014-11-07 22:55:32 +00:00
John Reck
ca93f69c96 Merge "Have an actual fallback if the surface is lost" into lmp-mr1-dev 2014-11-07 22:41:03 +00:00
John Reck
130a3a081f Fix DisplayListRenderer breakage
Change-Id: I30babebd2b50efe6830be466209341057601544f
2014-11-07 12:42:10 -08:00
John Reck
65f2defdfc resolve merge conflicts of cabf8a7 to master.
Change-Id: If0ca1c37d05f5dc471d88a3bf158dd68a1880bbf
2014-11-07 11:29:08 -08:00
John Reck
aa95a88327 Have an actual fallback if the surface is lost
Bug: 17516789

This will force a relayout/reinitialize pass if the Surface
is lost mid-render instead of crashing on the next frame

Change-Id: If08bfa16f740728fa7c05904fa11e26f07b81e2e
2014-11-07 11:02:07 -08:00
John Reck
cabf8a7064 am f7d3ce6a: am 4b19b7aa: Merge "Fix wrong-thread issue" into lmp-mr1-dev
* commit 'f7d3ce6a3ca88b23a227e29a5fa3285e24f7b2b1':
  Fix wrong-thread issue
2014-11-07 18:48:43 +00:00
John Reck
4b19b7aaff Merge "Fix wrong-thread issue" into lmp-mr1-dev 2014-11-07 18:34:55 +00:00
John Reck
12f5e34332 Fix wrong-thread issue
Bug: 18259560

Change-Id: Ic63a86efba9c86f21defac0695a73db8b09ae284
2014-11-07 10:31:53 -08:00
ztenghui
94745ccb33 am 86f289fb: am 0b70c09c: am 7ae6fc81: Merge "A better looking and faster spot shadow." into lmp-mr1-dev
* commit '86f289fb505a8fef9e5aae822631a738540c31df':
  A better looking and faster spot shadow.
2014-11-07 04:09:18 +00:00
ztenghui
86f289fb50 am 0b70c09c: am 7ae6fc81: Merge "A better looking and faster spot shadow." into lmp-mr1-dev
* commit '0b70c09c1df3a5c359b8a93a8ac08e945805b693':
  A better looking and faster spot shadow.
2014-11-07 00:17:09 +00:00
ztenghui
7ae6fc81ef Merge "A better looking and faster spot shadow." into lmp-mr1-dev 2014-11-06 23:59:17 +00:00
ztenghui
d2dcd6fded A better looking and faster spot shadow.
1. This improve the looking, the star shape (spike) on long action bar is gone.
Shadow is more smooth now.

2. The performance is better, too. For averaging around rect, round rect and
circle, the spot shadow itself is 3 times faster. On N7 v1, it could be less than
0.1 ms.

b/14976551
b/16712006

Change-Id: I61ed546ee56e7c8dbe504dfcaef12d084904b4b8
2014-11-06 15:09:46 -08:00
John Reck
088c514cb1 resolved conflicts for merge of be70c771 to master
Change-Id: I469905bef7361c18aab725778694567d1987c06d
2014-11-06 13:04:49 -08:00
John Reck
be70c7713d am 327cb318: Merge "Yank ResourceCache out of Caches" into lmp-mr1-dev automerge: 9c13b8c
* commit '327cb3184d5f5d9f22db9ab18a07bb71081bb446':
  Yank ResourceCache out of Caches
2014-11-06 19:22:28 +00:00
John Reck
a35778c799 Yank ResourceCache out of Caches
Bug: 17947547

Pull the ResourceCache (aka, ref-counting side channel) out of
Caches so that DisplayListRenderer doesn't use Caches, avoiding
the risk of instantiating Caches on the wrong thread or
without a GL context

Change-Id: I7d63b70b3b0a0163308c5dedd6ef255eadebe8fd
2014-11-06 09:45:10 -08:00