drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
176,499 Commits 1 Branch 0 Tags
Commit Graph

6237 Commits

Author SHA1 Message Date
John Reck
9fb42f0778 resolved conflicts for merge of a75b0ad3 to master 
Change-Id: I32a2d129c556407727ada909daa6470309d42499
 2014-12-04 13:51:41 -08:00
John Reck
a75b0ad384 resolved conflicts for merge of a51a0901 to lmp-mr1-dev-plus-aosp 
Change-Id: Id7df835f0bd3d5d276b162635ddfb7fe0918dfed
 2014-12-04 13:41:04 -08:00
Adam Lesinski
63377406f7 am 8e5362f2: am 503071ae: am a2b5067a: Merge "RRO: prevent duplicate system overlays" 
* commit '8e5362f20e2bc41b1dcf130a613b7e0b3cd1db58':
  RRO: prevent duplicate system overlays
 2014-12-04 16:17:12 +00:00
Adam Lesinski
8e5362f20e am 503071ae: am a2b5067a: Merge "RRO: prevent duplicate system overlays" 
* commit '503071ae41374a66f61e53e05a91243473db83b9':
  RRO: prevent duplicate system overlays
 2014-12-04 09:21:45 +00:00
John Reck
01a5ea35fb Resume RT-animations after a pauseSurface 
Bug: 18203577

The issue occurs as a result of performTraversals() both doing
a window relayout call *and* early-returning because it's not dirty.

To fix this pauseSurface() returns whether or not the RT-side is
"dirty" to force ViewRootImpl to do a draw even if mDirty is
otherwise empty.

Change-Id: I534f367e75d18d273ebf14df3927f5c464ef6bef
 2014-12-03 13:03:59 -08:00
Adam Lesinski
a2b5067aee Merge "RRO: prevent duplicate system overlays" 2014-12-03 17:44:18 +00:00
Adam Lesinski
625fa573b4 am 9438ad15: am e580d661: am e89a2865: Merge changes If2c7e09f,Ie21f227c 
* commit '9438ad1599716176fb6c593e77a2e93b265bbcb5':
  RRO idmap: pad with 0xffffffff, not 0x00000000
  RRO: reintroduce lost ResTable insert of assets
 2014-12-03 00:30:56 +00:00
Adam Lesinski
9438ad1599 am e580d661: am e89a2865: Merge changes If2c7e09f,Ie21f227c 
* commit 'e580d6617f67a1db5eff7ffe5450684cfc7e1a2b':
  RRO idmap: pad with 0xffffffff, not 0x00000000
  RRO: reintroduce lost ResTable insert of assets
 2014-12-02 23:07:43 +00:00
Adam Lesinski
e89a286541 Merge changes If2c7e09f,Ie21f227c 
* changes:
  RRO idmap: pad with 0xffffffff, not 0x00000000
  RRO: reintroduce lost ResTable insert of assets
 2014-12-02 22:52:37 +00:00
Chris Craik
e749bd2c72 am a22ab0da: am 9a04480e: am ef124887: Merge "Clip outline to View clip bounds for shadow computation" into lmp-mr1-dev 
* commit 'a22ab0da6f72b2e52166cc6e11f4c6d44c0fb714':
  Clip outline to View clip bounds for shadow computation
 2014-12-02 01:45:54 +00:00
Chris Craik
a22ab0da6f am 9a04480e: am ef124887: Merge "Clip outline to View clip bounds for shadow computation" into lmp-mr1-dev 
* commit '9a04480e36c42eb63d1d727221ba3ce6a6d533ef':
  Clip outline to View clip bounds for shadow computation
 2014-12-02 01:39:20 +00:00
Chris Craik
ef124887c6 Merge "Clip outline to View clip bounds for shadow computation" into lmp-mr1-dev 2014-12-02 01:27:26 +00:00
Chris Craik
faa79ff9d9 Clip outline to View clip bounds for shadow computation 
bug:18509823

This allows animations of View clipBounds (and other callers of
setClipBounds) to affect shadows, instead of leaving them floating.

Change-Id: I249fa4b371a170cb0c54001f5b0e0097e109b8b8
 2014-12-01 15:47:10 -08:00
John Reck
76de89820c Merge "Prevent calling GL functions with an invalid surface" into lmp-mr1-dev 2014-12-01 22:39:31 +00:00
John Reck
c5cf471758 am d7af6eaa: am d51205fd: am 6afc5cf3: Merge "Prevent calling GL functions with an invalid surface" 
* commit 'd7af6eaace4ffdd3635a1cdeff65e9dc1af39f67':
  Prevent calling GL functions with an invalid surface
 2014-12-01 21:47:03 +00:00
John Reck
d7af6eaace am d51205fd: am 6afc5cf3: Merge "Prevent calling GL functions with an invalid surface" 
* commit 'd51205fda7351ca32e54ef34b32e72f6c7c79847':
  Prevent calling GL functions with an invalid surface
 2014-12-01 21:40:32 +00:00
Sangkyu Lee
a12b2405df Prevent calling GL functions with an invalid surface 
Bug: 18518580

When destroying CanvasContext, the surface can be invalid
state. So the surface should be updated to null prior to
destroying GL resources to ensure that GL functions
are not called with an invalid surface.
Some GL implementation makes an error if GL functions
are called with an invalid surface. (Adreno 3xx)

Cherry picked from AOSP: f76d36f96bf221672e98e440c9df7cbf0e02e84e

Change-Id: Ie6f6ea081ec931fc9df30b2c3ed066ec1ae9d294
 2014-12-01 21:38:34 +00:00
John Reck
6afc5cf3d9 Merge "Prevent calling GL functions with an invalid surface" 2014-12-01 21:28:27 +00:00
Chris Craik
659de832b9 Merge "Enable stencil clipping within clearLayerRegions" into lmp-mr1-dev 2014-12-01 20:08:29 +00:00
Chris Craik
62bdf2c863 am e986817a: am 6eac26a4: am ca84c8b1: Merge "Revert "Force-use the pbuffer surface for destroy"" into lmp-mr1-dev 
* commit 'e986817a2dc8a412c12e456319965a67ac60f236':
  Revert "Force-use the pbuffer surface for destroy"
 2014-11-26 21:08:00 +00:00
Chris Craik
e986817a2d am 6eac26a4: am ca84c8b1: Merge "Revert "Force-use the pbuffer surface for destroy"" into lmp-mr1-dev 
* commit '6eac26a49957eda233ad22ad75da43379f220bbc':
  Revert "Force-use the pbuffer surface for destroy"
 2014-11-26 21:02:24 +00:00
Chris Craik
ca84c8b1b0 Merge "Revert "Force-use the pbuffer surface for destroy"" into lmp-mr1-dev 2014-11-26 20:50:10 +00:00
Chris Craik
9f81485a76 Revert "Force-use the pbuffer surface for destroy" 
bug:18528859

This reverts commit b945f2313aee6e49a082ba5caaf95334d2570d52.

Change-Id: I6915624d356cb8570471eb3a5b8921f59b58db6d
 2014-11-26 18:59:58 +00:00
Dohyun Lee
52b2cf9fdf Enable stencil clipping within clearLayerRegions 
bug:18538502

Cherry-pick of adc0d9da8648abfea1035fb1108eceea9fd9b5b1 from AOSP

Previously stencil clipping within clearLayerRegions is disabled by commit
62d307c2402777d5e53b4590af5f32f8c55afd81. However, clearing whole layer
regions causes black-colored triangle regions when a TextView has
RotateAnimation because the draw within clearLayerRegions does not
affected by the current stencil clip.

Change-Id: Id32a0b16754b109905f833e063ebfa156bd953f2
Signed-off-by: Dohyun Lee <dohyun.lee@lge.com>
 2014-11-26 10:51:32 -08:00
John Reck
e39f788950 am 0d4ab958: am 4e3404d9: am dec3f138: Merge "Force-use the pbuffer surface for destroy" into lmp-mr1-dev 
* commit '0d4ab958c11801f5453e999f930416c87c63d100':
  Force-use the pbuffer surface for destroy
 2014-11-26 12:09:42 +00:00
Chris Craik
3c96a2b8fe am 1fb141f8: am 9c5b7b09: am ee660651: Merge "Improve DisplayList state output" into lmp-mr1-dev 
* commit '1fb141f83bad3884e2199c7acdc23932afaefe0c':
  Improve DisplayList state output
 2014-11-26 12:09:28 +00:00
John Reck
0d4ab958c1 am 4e3404d9: am dec3f138: Merge "Force-use the pbuffer surface for destroy" into lmp-mr1-dev 
* commit '4e3404d90fe33a0ff790aff4a97b6bb55e4c0e8f':
  Force-use the pbuffer surface for destroy
 2014-11-26 12:02:19 +00:00
Chris Craik
1fb141f83b am 9c5b7b09: am ee660651: Merge "Improve DisplayList state output" into lmp-mr1-dev 
* commit '9c5b7b094254cad0a8a90ece5ea650c49694087d':
  Improve DisplayList state output
 2014-11-26 12:01:46 +00:00
Sangkyu Lee
f76d36f96b Prevent calling GL functions with an invalid surface 
When destroying CanvasContext, the surface can be invalid
state. So the surface should be updated to null prior to
destroying GL resources to ensure that GL functions
are not called with an invalid surface.
Some GL implementation makes an error if GL functions
are called with an invalid surface. (Adreno 3xx)

Change-Id: Ie6f6ea081ec931fc9df30b2c3ed066ec1ae9d294
 2014-11-26 09:59:39 +09:00
Chris Craik
47414be761 am ab1a53c5: am bf62d307: am af5bd75b: Merge "Enable stencil clipping within clearLayerRegions" 
* commit 'ab1a53c509edbc8bacd944233335587dffd95999':
  Enable stencil clipping within clearLayerRegions
 2014-11-26 00:14:29 +00:00
Chris Craik
ab1a53c509 am bf62d307: am af5bd75b: Merge "Enable stencil clipping within clearLayerRegions" 
* commit 'bf62d3070c1653b79f4edcc0729b6a1a833d3ca1':
  Enable stencil clipping within clearLayerRegions
 2014-11-26 00:08:05 +00:00
John Reck
dec3f138c2 Merge "Force-use the pbuffer surface for destroy" into lmp-mr1-dev 2014-11-25 19:52:53 +00:00
John Reck
fb7ff703e0 am 5ab86ba0: am 89a63f02: am 0c31d97a: Merge "Switch TextureCache to SkPixelRef::fStableId" into lmp-mr1-dev 
* commit '5ab86ba05decf12e8ee3f693aab6b265905049c6':
  Switch TextureCache to SkPixelRef::fStableId
 2014-11-25 18:51:29 +00:00
John Reck
5ab86ba05d am 89a63f02: am 0c31d97a: Merge "Switch TextureCache to SkPixelRef::fStableId" into lmp-mr1-dev 
* commit '89a63f02f5d0814435e72b515b792bc6737014dc':
  Switch TextureCache to SkPixelRef::fStableId
 2014-11-25 18:45:48 +00:00
Chris Craik
ee6606519d Merge "Improve DisplayList state output" into lmp-mr1-dev 2014-11-25 18:45:11 +00:00
Dan Stoza
031cfc8f3f Merge "Cast buffer width and height to int" 2014-11-25 18:33:34 +00:00
John Reck
b945f2313a Force-use the pbuffer surface for destroy 
Bug: 18518580

If CanvasContext is being destroyed() the Surface
is probably no longer valid as well, so make sure to
makeCurrent() to the pbuffer surface so that the
subsequent GL operations are not using an invalid
EGLSurface

Change-Id: Ica5d6a065841772c47e00ad65aa7894c7e27e043
 2014-11-25 09:54:13 -08:00
John Reck
71d08a0718 Switch TextureCache to SkPixelRef::fStableId 
Bug: 18245805
Change-Id: I08e6792dbeed86b13e569c7f2137de0e50dc2763
 2014-11-24 15:24:02 -08:00
Dohyun Lee
adc0d9da86 Enable stencil clipping within clearLayerRegions 
Previously stencil clipping within clearLayerRegions is disabled by commit
62d307c2402777d5e53b4590af5f32f8c55afd81. However, clearing whole layer
regions causes black-colored triangle regions when a TextView has
RotateAnimation because the draw within clearLayerRegions does not
affected by the current stencil clip.

Change-Id: Id32a0b16754b109905f833e063ebfa156bd953f2
Signed-off-by: Dohyun Lee <dohyun.lee@lge.com>
 2014-11-24 21:08:15 +09:00
Elliott Hughes
476edb5701 am ee46d162: am 08e2fd72: am ff4dd15c: Merge "We HAVE_LITTLE_ENDIAN." 
* commit 'ee46d1621f817d626e8dd42e9ffe7051f4a829eb':
  We HAVE_LITTLE_ENDIAN.
 2014-11-22 08:04:38 +00:00
Elliott Hughes
ee46d1621f am 08e2fd72: am ff4dd15c: Merge "We HAVE_LITTLE_ENDIAN." 
* commit '08e2fd7238c50b5d06af41bc944ee08acb023d51':
  We HAVE_LITTLE_ENDIAN.
 2014-11-22 07:56:46 +00:00
Elliott Hughes
9d074a1fb7 We HAVE_LITTLE_ENDIAN. 
Change-Id: I5b5d0ef3f91fe84d629d2ddac436bd22019edfd4
 2014-11-21 23:36:45 -08:00
Andreas Gampe
64bb413a66 Revert "resolved conflicts for merge of 220c3f4f to master" 
Reverted as hwui doesn't agree.

This reverts commit 8a902d9f24e83c87b054adb5836b4a5b8a257be9.

Change-Id: I109e7b02bee2921e2155ded6df36f52e6f574b5a
 2014-11-22 00:35:09 +00:00
Chris Craik
b5a5435a77 Improve DisplayList state output 
bug:17991451

Log hardware layers and shadow casting

Change-Id: I2ae40f270d18f5b2a5af985513e0f5e8841216c2
 2014-11-21 16:23:00 -08:00
John Reck
8b59a528b5 Revert "Frameworks/base: Unused parameters in hwui" 
This reverts commit 42ddc18d108f789705ad4eb697ce9599ad322507.

Change-Id: I3574a936a39a96314db6437d0a1eb58d260d893d
 2014-11-22 00:10:02 +00:00
Andreas Gampe
8a902d9f24 resolved conflicts for merge of 220c3f4f to master 
Change-Id: I37ecce8fddecdff82b0eace16f1ee75152f7171e
 2014-11-21 15:51:04 -08:00
Dan Stoza
32d2e769ea Cast buffer width and height to int 
GraphicBuffer::get{Width,Height} are going to start returning uint32_t
values soon, so add the cast now to avoid breaking the build later.

Change-Id: Ied33700fdf81e8aecbad95d66583818d15987b93
 2014-11-21 14:48:04 -08:00
Chris Craik
90102e1009 am 1ae8a98e: am 29dc496a: Merge "Revert "Add a way to override Xfermode DO NOT MERGE"" into lmp-mr1-dev 
* commit '1ae8a98e8a6ba82396955c0b6ab0e02568a3494b':
  Revert "Add a way to override Xfermode DO NOT MERGE"
 2014-11-21 22:21:02 +00:00
Andreas Gampe
2ab8298dc3 resolved conflicts for merge of 99377df1 to lmp-mr1-dev-plus-aosp 
Change-Id: I3a98f55832ac447b1ed0dd129c7a93d088025943
 2014-11-21 14:19:06 -08:00
Chris Craik
6bcf223bf6 Merge "Revert "Add a way to override Xfermode"" 2014-11-21 22:11:14 +00:00