1622 Commits

Author SHA1 Message Date
Chris Craik
835b5c9599 am f23132b9: am 4dae506c: am e27790db: Merge "Force isolation of clip and matrix within layer" into lmp-dev
* commit 'f23132b917f5f9f5dffae189c0be1e06cfcdb9ef':
  Force isolation of clip and matrix within layer
2014-09-16 08:40:20 +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
63af94c575 am 68386a68: am b5f00ba9: am cceffe72: Merge "Correctly initialize animator asynchronousity" into lmp-dev
* commit '68386a68c8e617831ea583a2e7170065c5160cc3':
  Correctly initialize animator asynchronousity
2014-09-13 03:29:40 +00:00
ztenghui
f864258242 am f37c3c18: am 35e78a38: am 84a7c1cc: Merge "Update the shadow strength" into lmp-dev
* commit 'f37c3c185f222263648f24cee16ca37d4a588762':
  Update the shadow strength
2014-09-13 03:05:47 +00:00
Chris Craik
c876b09e2e am 2f45d69d: am c168393b: am 3fd1ada4: Merge "Disable layer leak tracking" into lmp-dev
* commit '2f45d69d3374838839a0db7fa7dd9fb0ddbe2825':
  Disable layer leak tracking
2014-09-13 02:16:23 +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
a1cdb03cc1 am f97c7496: am c83a9ad6: am 3e39b8ad: Merge "Snap outline clipping to integer coordinates correctly" into lmp-dev
* commit 'f97c74962f1ff49835f54f71b847f7925206ea13':
  Snap outline clipping to integer coordinates correctly
2014-09-12 19:26:30 +00:00
ztenghui
5b447e1d28 am e1aea57f: am 7c23eaa7: am 0a64dc71: Merge "Finer tessellation can draw better looking shadows for circles." into lmp-dev
* commit 'e1aea57fdd6477b5871cd3c24acac2f5d82c88a4':
  Finer tessellation can draw better looking shadows for circles.
2014-09-12 19:22:46 +00:00
Chris Craik
079bffd015 am c87972fc: am 5707b4c6: am e4c0e03b: Merge "Update HWUI paint filter to understand new location of skia bitmap filter preference" into lmp-dev
* commit 'c87972fceab38aaf1757cc756291f3a32064294e':
  Update HWUI paint filter to understand new location of skia bitmap filter preference
2014-09-12 19:22:25 +00:00
ztenghui
932a87058b am 5a60b0f4: am 8c371807: am e1264a88: Merge "Re-triangulate the spot shadow." into lmp-dev
* commit '5a60b0f427ff6601825bedc3ec487dbc720c2109':
  Re-triangulate the spot shadow.
2014-09-12 19:18:19 +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
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
Chris Craik
2aaf53716a am 0ea0749a: am e7a5da38: am 093e3412: Merge "Additional layer logging" into lmp-dev
* commit '0ea0749a24070bfec3ea39a0a4ca0a7156f3dfe1':
  Additional layer logging
2014-09-11 17:26:29 +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
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
9984035cc3 am 3c1f32d5: am 78558652: am e46cfca2: Merge "hwui: Caches: use mBoundTextures only for GL_TEXTURE_2D" into lmp-dev
* commit '3c1f32d58760596eda85436e44c2ea9465eec7bc':
  hwui: Caches: use mBoundTextures only for GL_TEXTURE_2D
2014-09-09 22:07:41 +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
5b84d6cd82 am 895221fb: am 70cf8fba: am c9071002: Merge "Fix tessellation bounds computation" into lmp-dev
* commit '895221fbc5d0c7f8b631ccdbc8590a2306cbb6fd':
  Fix tessellation bounds computation
2014-09-09 18:58:29 +00:00
Chris Craik
69fb8a2399 Merge "Fix tessellation bounds computation" into lmp-dev 2014-09-09 18:34:08 +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
Chris Craik
ab065d7ea6 am 75710ba1: am 63fe87ff: am 2d0c82ad: Merge "Don\'t track TextureLayer lifecycles in RenderState" into lmp-dev
* commit '75710ba1b1def330d05415ecd635dcebe0fa8a39':
  Don't track TextureLayer lifecycles in RenderState
2014-09-09 00:11:39 +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
4e69b90f98 am fbfcc5e3: am f3f42ada: am 8bc6e915: Merge "Fix save count offsetting within DisplayList chunks" into lmp-dev
* commit 'fbfcc5e374d27a7fe563cc5b4e3251b93e31c962':
  Fix save count offsetting within DisplayList chunks
2014-09-08 18:52:23 +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
739136002f am ce7e1c41: am bf6afec1: am fd289c1c: Merge "Disable RT-anim for AnimatorSet" into lmp-dev
* commit 'ce7e1c41485cbc5dfdb6a11bde01d0d3aa5d15e6':
  Disable RT-anim for AnimatorSet
2014-09-06 00:49:41 +00:00
John Reck
3207ffe120 Merge "Disable RT-anim for AnimatorSet" into lmp-dev 2014-09-06 00:22:25 +00:00
John Reck
dbeef47096 am 5e2f494e: am fa097eea: am 4a94f088: Merge "Fix race condition" into lmp-dev
* commit '5e2f494ecbfb37f149819b88e38868c51b97fd4e':
  Fix race condition
2014-09-05 23:08:32 +00:00
Chris Craik
a2197d721d am 1bd57d8b: am 7ec137b7: am 6f6a8f2c: Merge "Add shadow/clipping properties to HierarchyViewer" into lmp-dev
* commit '1bd57d8b78d214a2bdeb0f11bba1a104b14ea84b':
  Add shadow/clipping properties to HierarchyViewer
2014-09-05 23:08:21 +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
Chris Craik
6f1cb04d0b am 20668eb5: am d6d88a21: am cde5e68d: Merge "Additional layer logging, and added mutex" into lmp-dev
* commit '20668eb51955439419932ca54a52d04859ff00a0':
  Additional layer logging, and added mutex
2014-09-05 22:51:47 +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
Chris Craik
599e254ea3 Additional layer logging, and added mutex
bug:17208461
Change-Id: I006d432a3b633235dde0b81ad2bf28b835b5335f
2014-09-05 15:17:11 -07:00
John Reck
d5a931e251 am 1c73a0fd: am 35137dd1: am 5347ddea: Merge "Yet more layer tracking logging" into lmp-dev
* commit '1c73a0fd6b9198e06aa3ab43776c5e45614dceed':
  Yet more layer tracking logging
2014-09-05 02:32:17 +00:00
John Reck
6dad93eff6 Merge "Yet more layer tracking logging" into lmp-dev 2014-09-05 01:06:08 +00:00
John Reck
443a714fa7 Yet more layer tracking logging
Bug: 17208461

Change-Id: I55e7d0921eb565867e966d68b798b7b92c391b55
2014-09-04 17:40:05 -07:00