5875 Commits

Author SHA1 Message Date
Chris Craik
1f8eb8caac am 4dae506c: am e27790db: Merge "Force isolation of clip and matrix within layer" into lmp-dev
* commit '4dae506c27327a3ddced29fc15880c86abe3a3a5':
  Force isolation of clip and matrix within layer
2014-09-15 22:04:10 +00:00
Chris Craik
025207b3cf Merge "Force isolation of clip and matrix within layer" into lmp-dev 2014-09-15 15:59:57 +00:00
Chris Craik
4ace730560 Force isolation of clip and matrix within layer
bug:17379260

Unclipped save layers need to isolate their clips and matrices
so that the save time readout of background content matches clip and
position with the restore/compose step.

Change-Id: I2de474cda76e960d080852f1716d6ddfa8a512d4
2014-09-14 15:49:54 -07:00
Chris Craik
2fea335b3e am b5f00ba9: am cceffe72: Merge "Correctly initialize animator asynchronousity" into lmp-dev
* commit 'b5f00ba90ff201153de8386a3ebcd4eb5c06cb9e':
  Correctly initialize animator asynchronousity
2014-09-13 03:13:01 +00:00
ztenghui
0099def245 am 35e78a38: am 84a7c1cc: Merge "Update the shadow strength" into lmp-dev
* commit '35e78a38dc3a1080ef215b385dc96e67f6388791':
  Update the shadow strength
2014-09-13 02:32:16 +00:00
Chris Craik
2f25901632 Merge "Correctly initialize animator asynchronousity" into lmp-dev 2014-09-13 00:46:11 +00:00
Chris Craik
572d9acd59 Correctly initialize animator asynchronousity
bug:17483792
Change-Id: Icb6b6e6318d4c79ee94228806cb60b275424b9c9
2014-09-12 17:40:20 -07:00
ztenghui
692737be4f Merge "Update the shadow strength" into lmp-dev 2014-09-12 23:02:32 +00:00
ztenghui
f7d76dffd8 Update the shadow strength
b/17486691

Change-Id: I8e8f0b64e757772c18f038f6b329ef91a4e155a5
2014-09-12 15:29:44 -07:00
Chris Craik
7f00c69b7c am c168393b: am 3fd1ada4: Merge "Disable layer leak tracking" into lmp-dev
* commit 'c168393b3ba99721be2c2d9629d687431aa6b9e0':
  Disable layer leak tracking
2014-09-12 19:19:10 +00:00
Chris Craik
1aec711b2e Merge "Disable layer leak tracking" into lmp-dev 2014-09-12 17:41:13 +00:00
Chris Craik
21029ef131 Disable layer leak tracking
bug:17208461
Change-Id: Ibbdf3ec79c4fd19e1935a559d425d074b611e162
2014-09-12 09:29:31 -07:00
Chris Craik
db14386587 am c83a9ad6: am 3e39b8ad: Merge "Snap outline clipping to integer coordinates correctly" into lmp-dev
* commit 'c83a9ad69474fdc75cdf5f84c47bd89b61640377':
  Snap outline clipping to integer coordinates correctly
2014-09-12 05:47:41 +00:00
ztenghui
db848170b7 am 7c23eaa7: am 0a64dc71: Merge "Finer tessellation can draw better looking shadows for circles." into lmp-dev
* commit '7c23eaa73f6f03b1e3ec69c37b021d45fa387a5f':
  Finer tessellation can draw better looking shadows for circles.
2014-09-12 05:44:14 +00:00
Chris Craik
93a0f8aa38 am 5707b4c6: am e4c0e03b: Merge "Update HWUI paint filter to understand new location of skia bitmap filter preference" into lmp-dev
* commit '5707b4c67898f3e828c08204da64a32240449165':
  Update HWUI paint filter to understand new location of skia bitmap filter preference
2014-09-12 05:43:55 +00:00
Chris Craik
4340c260c0 Snap outline clipping to integer coordinates correctly
bug:17403105
Change-Id: I65b5d7103aac58ba6feb4b021c276c67e9341716
2014-09-11 18:58:45 -07:00
ztenghui
24a95a10db Merge "Finer tessellation can draw better looking shadows for circles." into lmp-dev 2014-09-11 21:09:51 +00:00
Chris Craik
5be52c11d9 Merge "Update HWUI paint filter to understand new location of skia bitmap filter preference" into lmp-dev 2014-09-11 19:43:52 +00:00
Chris Craik
591be6c7af Update HWUI paint filter to understand new location of skia bitmap filter preference
bug:17455286
Change-Id: I3b0e04833f0c2699a1322fdd7e98c155841c0d93
2014-09-11 12:16:38 -07:00
ztenghui
1fe740fcc8 am 8c371807: am e1264a88: Merge "Re-triangulate the spot shadow." into lmp-dev
* commit '8c371807fff0553321f544a8e87eed76a853066c':
  Re-triangulate the spot shadow.
2014-09-11 18:30:24 +00:00
ztenghui
25e5a02d1c Finer tessellation can draw better looking shadows for circles.
b/14976551

Change-Id: I4b9e320b025dbee37cd1893881ddbaad62e3a6e2
2014-09-11 10:10:25 -07:00
ztenghui
ca517b97e0 Merge "Re-triangulate the spot shadow." into lmp-dev 2014-09-11 16:32:05 +00:00
ztenghui
512e643ce8 Re-triangulate the spot shadow.
Fix the valid umbra detection.

This looks better b/c every vertex will have one ray shooting at it, such that
we don't miss the corner.

This performs better too, due to the polygon intersection is removed and less ray
intersection. 2x performance for rect and circle for spot shadow in test app.

    b/17288227
    b/15598793
    b/16712006

Change-Id: I4a5ee397b9e192e93c8e35e6260b499e3e38a6f4
2014-09-10 17:05:59 -07:00
Chris Craik
95ebea4f17 am e7a5da38: am 093e3412: Merge "Additional layer logging" into lmp-dev
* commit 'e7a5da38eca971db5a44042f4cb68d334a4d8cf7':
  Additional layer logging
2014-09-10 23:38:06 +00:00
Chris Craik
bfd1cd6209 Additional layer logging
bug:17208461

Track layer's last known state.

Change-Id: Ic1799191f5839a1d6cc56f598f2ac2671dc27a6f
2014-09-10 16:10:24 -07:00
Chris Craik
e938707a64 am 78558652: am e46cfca2: Merge "hwui: Caches: use mBoundTextures only for GL_TEXTURE_2D" into lmp-dev
* commit '785586526d97aab356acbcb4d8b4a79904ff3424':
  hwui: Caches: use mBoundTextures only for GL_TEXTURE_2D
2014-09-09 21:55:44 +00:00
Chris Craik
b2201151f3 Merge "hwui: Caches: use mBoundTextures only for GL_TEXTURE_2D" into lmp-dev 2014-09-09 20:03:09 +00:00
Fred Fettinger
70735bd5dd hwui: Caches: use mBoundTextures only for GL_TEXTURE_2D
bug:17441218

GLConsumer uses glBindTexture() directly instead of going through
Caches::bindTexture(). This can cause libhwui to draw with the wrong
texture bound in the following case which involves 2 TextureViews:

Frame 1:
GLConsumer::updateTexImage() calls glBindTexture(GL_TEXTURE_EXTERNAL_OES, 1)
HWUI renders TextureView A:
    calls Caches::bindTexture(GL_TEXTURE_EXTERNAL_OES, 1) and draws

Frame 2:
GLConsumer::updateTexImage() calls glBindTexture(GL_TEXTURE_EXTERNAL_OES, 1)
GLConsumer::updateTexImage() calls glBindTexture(GL_TEXTURE_EXTERNAL_OES, 2)
HWUI renders TextureView A:
    calls Caches::bindTexture(GL_TEXTURE_EXTERNAL_OES, 1) and draws
HWUI renders TextureView B:
    calls Caches::bindTexture(GL_TEXTURE_EXTERNAL_OES, 2) and draws

In this case, HWUI will incorrectly draw TextureView A using texture 2 on
frame 2, because mBoundTextures[0]=1, even though the texture currently
bound to GL_TEXTURE_EXTERNAL_OES is 2.

Since GLConsumer is always used with a target of GL_TEXTURE_EXTERNAL_OES,
work around this problem by having mBoundTextures[] store only the
textures bound to the target GL_TEXTURE_2D. This is the common case
where the extra performance is needed. Since it's legal to have
different textures bound to GL_TEXTURE_2D and GL_TEXTURE_EXTERNAL_OES
on one texture unit, Caches::bindTexture() does not need to clear
mBoundTextures[mTextureUnit] when target != GL_TEXTURE_2D.

Change-Id: I8bc54ab8adcfacad7f3ed17a31236dc7a86c967a
Signed-off-by: Fred Fettinger <fred.fettinger@motorola.com>
2014-09-09 20:00:52 +00:00
Chris Craik
a23fc5877b am 70cf8fba: am c9071002: Merge "Fix tessellation bounds computation" into lmp-dev
* commit '70cf8fba276269c6d162819bf4cbcdf06f6d22ea':
  Fix tessellation bounds computation
2014-09-09 18:47:43 +00:00
Chris Craik
69fb8a2399 Merge "Fix tessellation bounds computation" into lmp-dev 2014-09-09 18:34:08 +00:00
Dan Albert
20ec4fa229 resolved conflicts for merge of 6c585756 to lmp-dev-plus-aosp
Change-Id: I5a25f2bac44ac5efcd7462af91005e09680a1d96
2014-09-08 22:25:54 -07:00
Dan Albert
2ffa4aabd7 Merge "Use char16_t for char things." 2014-09-09 04:30:35 +00:00
Chris Craik
21bcfc4ff8 Fix tessellation bounds computation
bug:17401066

Now correctly accounts for scale, both in hairline case (where scale
needs to be accounted for), and in standard case (where scale
shouldn't be applied, since bounds are in local space)

Change-Id: I597a20834dce42ddb741b46e4c1a4f3169a48ccc
2014-09-08 18:43:30 -07:00
Dan Albert
be23d47d1c Make string literal concatenation play nice with C++11.
In C++11 mode, "foo"MACRO_THAT_EXPANDS_TO_STRING gets lexed as a user
defined literal. Add space around the macro.

Change-Id: I24fbe1fda483db4a8c606e80dbe17430ad070dc2
2014-09-08 18:38:35 -07:00
Dan Albert
f348c15ecf Use char16_t for char things.
When compiling in C++ mode, the compiler will complain about conversions
from uint16_t to char16_t. Be consistent in using char16_t for strings.

Change-Id: I052b6176ced635162920b31560052d9a64f92764
2014-09-08 18:30:08 -07:00
Chris Craik
edc121c249 am 63fe87ff: am 2d0c82ad: Merge "Don\'t track TextureLayer lifecycles in RenderState" into lmp-dev
* commit '63fe87ffece32b234323322621467b6bbb3b1b6f':
  Don't track TextureLayer lifecycles in RenderState
2014-09-09 00:04:27 +00:00
Chris Craik
8a226d24b8 Don't track TextureLayer lifecycles in RenderState
bug:17208461

They are destroyed via finalizer-enqueued destroy method, so it's not
valid to check that they've been destroyed at gl context destruction
time.

Change-Id: I670f69825547facd5f31d44acb406418881fee00
2014-09-08 16:44:47 -07:00
Chris Craik
7273458a14 am f3f42ada: am 8bc6e915: Merge "Fix save count offsetting within DisplayList chunks" into lmp-dev
* commit 'f3f42ada99cb0fcd9901714221ca09f18e512f89':
  Fix save count offsetting within DisplayList chunks
2014-09-08 18:36:38 +00:00
Chris Craik
5f5df97df9 Merge "Fix save count offsetting within DisplayList chunks" into lmp-dev 2014-09-08 17:09:01 +00:00
Chris Craik
c166b6c4fc Fix save count offsetting within DisplayList chunks
bug:17388541
Change-Id: I7cb1139b8cd30f72ae7c6de2074c3c5865b8f309
2014-09-05 19:55:30 -07:00
John Reck
ab95330acf am bf6afec1: am fd289c1c: Merge "Disable RT-anim for AnimatorSet" into lmp-dev
* commit 'bf6afec12bf123684c7e4893465dd8e1d13817bd':
  Disable RT-anim for AnimatorSet
2014-09-06 00:39:35 +00:00
John Reck
3207ffe120 Merge "Disable RT-anim for AnimatorSet" into lmp-dev 2014-09-06 00:22:25 +00:00
John Reck
f5945a0c8b Disable RT-anim for AnimatorSet
Bug: 17317184

 Unfortunately this will disable *all* RT animations in a scene,
 but we don't have more selective targetting currently

Change-Id: I57e1c0ae43957f45229473bdcdaf34c05825fab7
2014-09-05 15:58:26 -07:00
John Reck
07d90c4866 am fa097eea: am 4a94f088: Merge "Fix race condition" into lmp-dev
* commit 'fa097eea8620158eef3592376afbcadca39b2e74':
  Fix race condition
2014-09-05 22:56:49 +00:00
Chris Craik
33f71d9b32 am 7ec137b7: am 6f6a8f2c: Merge "Add shadow/clipping properties to HierarchyViewer" into lmp-dev
* commit '7ec137b7f9edb41117f822ef16bdaf5accbcc31c':
  Add shadow/clipping properties to HierarchyViewer
2014-09-05 22:56:41 +00:00
Chris Craik
8db569764f am d6d88a21: am cde5e68d: Merge "Additional layer logging, and added mutex" into lmp-dev
* commit 'd6d88a21cfd226440b6e7f1f758a30d39b932a9e':
  Additional layer logging, and added mutex
2014-09-05 22:40:00 +00:00
John Reck
4e849178ef Merge "Fix race condition" into lmp-dev 2014-09-05 22:38:42 +00:00
Chris Craik
83eb430270 Merge "Add shadow/clipping properties to HierarchyViewer" into lmp-dev 2014-09-05 22:36:41 +00:00
John Reck
ec845a215e Fix race condition
Bug: 17372309

 AnimationContext::startFrame() happens both with and without
 the UI thread lock. Pass the TraversalMode into it so
 that ThreadedRenderer's subclass can correctly decide
 when it is safe to push over mPendingAnimatingRenderNodes, as doing
 so outside of the lock is Very Bad.

Change-Id: Ife5dd3a2b46b0a207cd9234c159a674afdbf5efd
2014-09-05 15:23:38 -07:00
Chris Craik
5c75c52e04 Add shadow/clipping properties to HierarchyViewer
bug:15777980

Change-Id: Ic3d24326f585d2d2b9889486f0ed322eb98b5af8
2014-09-05 15:23:08 -07:00