John Reck
97054254d4
am 141823ec: Merge "Be more conservative about current buffer" into lmp-mr1-dev
...
automerge: a27e1a3
* commit 'a27e1a366a2d83165e71b68669fbd21ced6a4b08':
Be more conservative about current buffer
2014-10-30 19:16:14 +00:00
Narayan Kamath
3cad510e27
am 4ed472ab: resolved conflicts for merge of 3028394c to stage-aosp-master
...
* commit '4ed472ab33e78391c0b084ed3908019e06b7dfe5':
Suppress Clang compilation warnings.
2014-10-29 19:34:32 +00:00
John Reck
141823ec63
Merge "Be more conservative about current buffer" into lmp-mr1-dev
2014-10-29 14:40:02 +00:00
Narayan Kamath
4ed472ab33
resolved conflicts for merge of 3028394c to stage-aosp-master
...
Change-Id: I980e4c95cdc6a4778cef3298338692656d23e7c6
2014-10-29 12:12:37 +00:00
John Reck
c7c8b06940
Merge "Cleanup debug options" into lmp-mr1-dev automerge: b0aeaad
...
automerge: 49a01fc
* commit '49a01fc7dc8d2b9cc7591a94d19f3c209e470aea':
Cleanup debug options
2014-10-28 00:35:14 +00:00
John Reck
950ff1b88c
Be more conservative about current buffer
...
Bug: 18065565
Change-Id: I0b9c85ecf384ebe525e3a38803ab77d7ee37f33a
2014-10-27 13:23:20 -07:00
John Reck
23d307c8d8
Cleanup debug options
...
Bug: 18138852
Bug: 18065434
Change-Id: Ibb07b73b147c2a8b287fe8aee3f6624582f21b00
2014-10-27 12:43:25 -07:00
Chih-Hung Hsieh
d3448e437a
Suppress Clang compilation warnings.
...
Ignore warnings about unused parameters and initialization of static
constant float data members.
Change one potential error of allocating variable length
array of non-POD element type on stack.
Fix mismatch of class and struct declaration tags.
BUG: 17512760
Change-Id: I3a09c945fb1c17f27aff74a7e439dd4c35d1fb32
2014-10-24 15:42:14 -07:00
John Reck
b64e4372bb
am 82572cc4: am badac04d: Merge "Add some free zoom to lockHardwareCanvas" into lmp-mr1-dev
...
* commit '82572cc458053e8cec292a708e18d0de7cfbead2':
Add some free zoom to lockHardwareCanvas
2014-10-23 22:15:46 +00:00
John Reck
badac04dfd
Merge "Add some free zoom to lockHardwareCanvas" into lmp-mr1-dev
2014-10-23 21:59:26 +00:00
John Reck
1125d1fa92
Add some free zoom to lockHardwareCanvas
...
Bug: 18099195
Don't use EGL_SWAP_BUFFER_PRESERVED on surfaces that will
never benefit. Also clean up some confusing naming
Change-Id: I674ca64e0464a3282cff79e5ecd350d08f47c014
2014-10-23 13:59:47 -07:00
John Reck
41707d01e9
am ebcfd24b: am 68335df6: Merge "Fix damage bug" into lmp-mr1-dev
...
* commit 'ebcfd24b8f1fc8e000a08c0bbce3a4215083ae8a':
Fix damage bug
2014-10-23 20:41:07 +00:00
John Reck
5c9d717d3e
Fix damage bug
...
Bug: 18087374
Change-Id: Ie183392122c73f93010fb3f4be071c924b352966
2014-10-22 11:32:27 -07:00
John Reck
a2590d595f
am 733bb3bc: Merge "Fix memory corruption in test" into lmp-mr1-dev
...
automerge: a91c5ca
* commit 'a91c5ca78a0e9b24445126895a0070d399506849':
Fix memory corruption in test
2014-10-22 14:29:45 +00:00
John Reck
733bb3bc78
Merge "Fix memory corruption in test" into lmp-mr1-dev
2014-10-22 14:18:21 +00:00
John Reck
76f24bde78
am e73a54f3: am bf463af2: Merge "Surface:lockHardwareCanvas" into lmp-mr1-dev
...
* commit 'e73a54f33c029552469fcf1cda46eed2f360a38e':
Surface:lockHardwareCanvas
2014-10-21 21:39:36 +00:00
John Reck
bb2d0cc7e1
Surface:lockHardwareCanvas
...
Bug: 17440886
Change-Id: I1f2d98c63ec1a2814c2258cf7e0096139263770a
2014-10-21 13:23:56 -07:00
John Reck
af608319f2
Fix memory corruption in test
...
Bug: 18012918
Change-Id: I8d69624e9be9f0399ddba10ce3903f93177d5930
2014-10-16 09:18:11 -07:00
John Reck
1467c54d85
am f3259620: am 94c40fe9: CARD LAND!
...
* commit 'f325962096663a5264f2ec613293818f7f3ea2f9':
CARD LAND!
2014-10-14 17:51:07 +00:00
John Reck
94c40fe921
CARD LAND!
...
Bug: 16712006
Initial work towards benchmarking HWUI systems
Currently this will just create a screen full of
"cards" to simulate a high load scenario for
shadows and clipping
Change-Id: Ie9f9a9570844e136db8053e8fc62fe06cb922a5f
2014-10-14 09:02:04 -07:00
Jorim Jaggi
638829c58a
am 906fb5b6: am 786afcb3: Trim graphics memory when closing the shade
...
* commit '906fb5b6969a4e7ad8367a052f6c1a1598ae32f5':
Trim graphics memory when closing the shade
2014-10-08 19:08:35 +00:00
Jorim Jaggi
786afcb3ee
Trim graphics memory when closing the shade
...
Graphics memory usually gets trimmed in applications when the
activity goes into the background. We use quite a lot of graphics
memory when the shade/lockscreen is open, and some of them never gets
freed unless the recents activity is closed, because we don't have
these activity-trimming-heuristics for the shade. This change
proactively trims the graphics memory when the shade gets closed or
when the lockscreen is hidden, to emulate the same heuristics as for
activities.
This change also adds trimMemory on RenderThread to systrace to
verify that no jank is introduced with this change.
This change immediately saves around 10-30 MB on an xxhdpi device
after the shade is closed.
Bug: 17581375
Change-Id: I4fb622efb51815fe08187be97ba15d012d4de5d4
2014-10-08 18:30:54 +00:00
ztenghui
0a04e31198
am f11d9de4: am 8cdb0bc0: Merge "Use float instead of double to increase spot shadow perf" into lmp-mr1-dev
...
* commit 'f11d9de43af807ad9d72a62fd1167ff6f9e7b903':
Use float instead of double to increase spot shadow perf
2014-10-06 22:31:33 +00:00
ztenghui
8cdb0bc087
Merge "Use float instead of double to increase spot shadow perf" into lmp-mr1-dev
2014-10-06 20:04:08 +00:00
John Reck
6e4140c6e2
am c4694796: am 6a2296d8: am 9da6e743: am d988a45d: Merge "Cleanup DeferredLayerUpdater" into lmp-dev
...
* commit 'c4694796a952014d07e6d083749d2f8b7d06afee':
Cleanup DeferredLayerUpdater
2014-10-04 15:45:20 +00:00
John Reck
6a2296d856
am 9da6e743: am d988a45d: Merge "Cleanup DeferredLayerUpdater" into lmp-dev
...
* commit '9da6e7435945e34d05e0c8c5c9a324218480c6ff':
Cleanup DeferredLayerUpdater
2014-10-03 23:57:30 +00:00
John Reck
b0d6cd236c
am d988a45d: Merge "Cleanup DeferredLayerUpdater" into lmp-dev
...
* commit 'd988a45d60cd2ff05e41a44c78cb09d307bd90cb':
Cleanup DeferredLayerUpdater
2014-10-03 23:57:09 +00:00
ztenghui
9122b1b168
Use float instead of double to increase spot shadow perf
...
This is helping spot shadow for 15%-20% increase.
With the new algorithm, we are less sensitive to the floating point error.
b/16712006
Change-Id: Ie30a6ce01e73d56054a0cf65a84549454339a7fd
2014-10-03 15:30:53 -07:00
John Reck
749906b468
Cleanup DeferredLayerUpdater
...
Bug: 17765082
DeferredLayerUpdater had fallen behind RT updates. Re-snap to
latest expectations, ensuring to call requireGlContext() prior
to detachSurfaceTexture to avoid leaking SurfaceTextures
Change-Id: Ic65fb9831e5284f658866da8da9ad5af1d227699
2014-10-03 15:02:19 -07:00
Chris Craik
d297b1b994
am ab8f73a7: am 497cb6c0: Merge "Avoid creating Caches instance with gfxinfo dump" into lmp-mr1-dev
...
* commit 'ab8f73a7f17d07bdb4ccb3b6971d3ddc8534bd7d':
Avoid creating Caches instance with gfxinfo dump
2014-10-02 20:12:59 +00:00
Chris Craik
497cb6c0a9
Merge "Avoid creating Caches instance with gfxinfo dump" into lmp-mr1-dev
2014-10-02 20:02:43 +00:00
Chris Craik
f7b96c8e2f
am 00d96e7d: am 59e129fb: Merge "Account for colorfilter transparency in determining paint opacity" into lmp-mr1-dev
...
* commit '00d96e7dd161067473b24d9bee57497fa56fb3f5':
Account for colorfilter transparency in determining paint opacity
2014-10-02 19:45:15 +00:00
Chris Craik
59e129fbc8
Merge "Account for colorfilter transparency in determining paint opacity" into lmp-mr1-dev
2014-10-02 19:28:09 +00:00
ztenghui
79ef48239d
am 3fb45865: am 5f243860: am 9ad17521: am f9033048: Merge "+ correcting shadow visual appearance (b/17610926)" into lmp-dev
...
* commit '3fb458653e50e350e9e377d071cb79573d531748':
+ correcting shadow visual appearance (b/17610926)
2014-10-02 13:37:47 +00:00
ztenghui
5f243860a7
am 9ad17521: am f9033048: Merge "+ correcting shadow visual appearance (b/17610926)" into lmp-dev
...
* commit '9ad17521ac073562991cddb78f14d6df8d5fd05a':
+ correcting shadow visual appearance (b/17610926)
2014-10-01 23:41:00 +00:00
Chris Craik
c5b5f0556b
Account for colorfilter transparency in determining paint opacity
...
bug:17765601
Change-Id: I90d76ee199bb357c71fc8f537c1abfa20d848416
2014-10-01 16:40:16 -07:00
ztenghui
6d0eaf45a9
am f9033048: Merge "+ correcting shadow visual appearance (b/17610926)" into lmp-dev
...
* commit 'f903304896809039430c5e52bd0c24052f51b14f':
+ correcting shadow visual appearance (b/17610926)
2014-10-01 23:33:51 +00:00
ztenghui
8def74de33
+ correcting shadow visual appearance (b/17610926)
...
+ adjusting spot and ambient shadow opacity constants to achieve desired appearance
+ reducing ambient scale ratio back to 1.0 to address over-lightening at higher elevations
+ partially revert ag/546290
Change-Id: I9d7f664f73a7b9b83df73b739103c97054bd4f6e
2014-10-01 16:12:28 -07:00
Chris Craik
059476a245
Avoid creating Caches instance with gfxinfo dump
...
bug:17509891
Change-Id: I182851068ba04926d60226b3ace95efea59eac45
2014-10-01 11:14:55 -07:00
Chris Craik
edb3ebfd3f
am bb5f8f5c: am 08897806: Merge "Add tracing for saveLayer" into lmp-mr1-dev
...
* commit 'bb5f8f5c94610f8eb23a6f74c3f0a5a7dd402606':
Add tracing for saveLayer
2014-10-01 01:42:24 +00:00
Chris Craik
a8bea8edde
Add tracing for saveLayer
...
bug:17702227
Change-Id: Ia9cbf31b360c93f712e021bea406cb63e4cc4c2a
2014-09-29 17:19:05 -07:00
Chris Craik
3bf8c64d78
am 808583ff: am 1918d884: am a0d0798a: am 737dfe57: Merge "Reject transparent draws more conservatively" into lmp-dev
...
* commit '808583ffbbb461c429a8308034dba632d167f2c6':
Reject transparent draws more conservatively
2014-09-23 15:51:57 +00:00
Chris Craik
ed2f0f53df
am fd0a1df1: am 737dfe57: Merge "Reject transparent draws more conservatively" into lmp-dev
...
* commit 'fd0a1df16fba712fb569eb637d960a7e78e3e62c':
Reject transparent draws more conservatively
2014-09-23 03:07:05 +00:00
Chris Craik
bc341912b1
Reject transparent draws more conservatively
...
bug:17600162
Transparent draws are not safe to reject for all xfermodes other than
clear. Now, to be safe, only perform the rejection for SrcOver draws
since other modes are fairly uncommon.
We could specifically determine whether the xfermode could change the
output given a transparent input, but there's little to be gained from
the additional complexity.
Change-Id: Ia699ac4bdc4da3353955840b53f1922d3cb1d85d
2014-09-23 01:22:00 +00:00
Chris Craik
f1c91fec09
am 30dca470: am f0a80b68: am ea74883e: am fe01ab10: Merge "Account for alpha in hasShadow()" into lmp-dev
...
* commit '30dca470d6b261433f0ad11117e5dff7d9124d9e':
Account for alpha in hasShadow()
2014-09-20 00:19:38 +00:00
Chris Craik
4d4b3aa3d9
am 91a40be0: am fe01ab10: Merge "Account for alpha in hasShadow()" into lmp-dev
...
* commit '91a40be04f8d1822c27888cc47124bf965633f4f':
Account for alpha in hasShadow()
2014-09-19 23:56:46 +00:00
Chris Craik
9e7c919191
Merge "Account for alpha in hasShadow()" into lmp-dev
2014-09-19 23:36:22 +00:00
Dan Albert
8ab25d82b5
resolved conflicts for merge of 1a4527ce to lmp-mr1-dev-plus-aosp
...
Change-Id: If649bd9ef98181a1e1e341cc5b73d237586fb72c
2014-09-19 16:13:49 -07:00
Chris Craik
9fa364dc72
Account for alpha in hasShadow()
...
bug:17587220
Change-Id: Ic7f2dea95302b713dc93edb4a0193a7be77fb2eb
2014-09-19 16:04:45 -07:00
Dan Albert
c04d92cac9
resolved conflicts for merge of 1a4527ce to lmp-dev-plus-aosp
...
Change-Id: Iee4e93e3a2b049ec5f13166dbbffdd77b301fe5c
2014-09-19 15:57:26 -07:00