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

6244 Commits

Author SHA1 Message Date
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
945701126b am 41707d01: am ebcfd24b: am 68335df6: Merge "Fix damage bug" into lmp-mr1-dev 
* commit '41707d01e9e950ebd00642ef3564edcff8c539e7':
  Fix damage bug
 2014-10-23 20:48:43 +00: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
Bill Yi
5a71f83227 Merge lmp-dev-plus-aosp-without-vendor into stage-aosp-master 
Change-Id: I7063b7b52e9c09a57eb6bf3b4ffa3716d58ebf43
 2014-10-22 09:00:49 -07:00
Derek Sollenberger
425cc668a9 Merge "Refactor HWUI to better handle Canvas DrawFilters." 2014-10-22 15:59:28 +00:00
Andreas Gampe
2b3a8cd808 Frameworks/base: Wall Werror in libs/storage 
Turn on -Wall -Werror in libs/storage.

Change-Id: I314cb32d0a917f9261488f7709d9a78a07b10fea
 2014-10-22 08:15:54 -07:00
John Reck
c54a20d9c5 am a2590d59: am 733bb3bc: Merge "Fix memory corruption in test" into lmp-mr1-dev automerge: a91c5ca 
* commit 'a2590d595fbf688e7bcff5014c1d442ca4243e79':
  Fix memory corruption in test
 2014-10-22 14:36:31 +00: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
7ab73f1e98 am e73a54f3: am bf463af2: Merge "Surface:lockHardwareCanvas" into lmp-mr1-dev 
automerge: 76f24bd

* commit '76f24bde7816dd97ed2375ec41c9817be0330d9f':
  Surface:lockHardwareCanvas
 2014-10-21 23:34:46 +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
Dan Albert
c96ac3900c am 827d00f2: am 3d23d557: am 7f2bc6c7: Merge "More LOCAL_ADDITIONAL_DEPENDENCIES." 
* commit '827d00f2f416a4271249b7a345b1fcdf7f8a10ae':
  More LOCAL_ADDITIONAL_DEPENDENCIES.
 2014-10-21 16:16:31 +00:00
Dan Albert
827d00f2f4 am 3d23d557: am 7f2bc6c7: Merge "More LOCAL_ADDITIONAL_DEPENDENCIES." 
* commit '3d23d557ff00010c041ec3fc655472db3d12509e':
  More LOCAL_ADDITIONAL_DEPENDENCIES.
 2014-10-21 16:11:52 +00:00
Dan Albert
00b4e773ab More LOCAL_ADDITIONAL_DEPENDENCIES. 
Change-Id: I9bf20507442b0722e93446fdb32d8236be974e28
 2014-10-21 08:58:39 -07:00
Derek Sollenberger
1383d1e60f Remove error case 
bug: 18051326
Change-Id: I4f2f4abf80b89e540a91251ce55cd65375f6ca65
 2014-10-20 16:59:27 -04:00
Derek Sollenberger
5865172542 Add back include that ensures RENDER_TEXT_AS_GLYPHS is set consistently. 
bug: 18051326
Change-Id: I1ee9f8acb25fb1684e156c61e2cf2669d15a99cb
 2014-10-20 16:26:24 -04:00
Derek Sollenberger
09c2d4fe15 Refactor HWUI to better handle Canvas DrawFilters. 
First, this CL removes the need to decompose the DrawFilters
in Java and instead passes the SkDrawFilter to HWUI directly.
This also allows the removal of duplicated logic between HWUI
and other Canvas implementations regarding Paint filter levels.

Second, the DrawFilter is now stored in the DisplayListRenderer
where we apply it to every paint BEFORE it is stored in the
DisplayList.  This eliminates the need to filter all Paints on
playback and removes additional complexity at playback.

Finally, as a result of storing the filtered paint we can now
do a better job caching the paints.  This takes advantage of
recent changes in Skia to quickly enable quick hashing and
comparison of paint objects.

Change-Id: Iec507a2d894827975cc4f1d22241542bb0534b4e
 2014-10-17 10:44:29 -04:00
John Reck
af608319f2 Fix memory corruption in test 
Bug: 18012918
Change-Id: I8d69624e9be9f0399ddba10ce3903f93177d5930
 2014-10-16 09:18:11 -07:00
Tom Hudson
b4b7f64921 Merge "Fix build breakage in HWUI JNI" 2014-10-16 13:15:16 +00:00
Tom Hudson
73edbfeed0 Fix build breakage in HWUI JNI 
R=djsollen@google.com

Change-Id: Iaa4e7f22bec8e15748beab1b25d307c48d277c59
 2014-10-16 09:10:41 -04:00
Tom Hudson
07c05e38a1 Merge "Clean up physical coupling" 2014-10-16 11:57:16 +00:00
Tom Hudson
2dc236b2ba Clean up physical coupling 
Narrow the use of #include directives in hwui, replacing with forward
declarations where straightforward. Speeds compiles; doesn't do any
restructuring of code.

Change-Id: Icac2baffb5896f55d8c6718e9bd9d4bfa02d3ca0
 2014-10-15 15:51:39 -04:00
Derek Sollenberger
413995e0be Change in Skia APIs require update to HWUI font implementation 
Change-Id: Ib89a27381f740499e26706716f39ad62fa10778c
 2014-10-15 14:29:46 +00:00
John Reck
cc1b97965d am 1467c54d: am f3259620: am 94c40fe9: CARD LAND! 
* commit '1467c54d857fbfc03fb52b9ba95db72c6acbae32':
  CARD LAND!
 2014-10-14 19:04:29 +00: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
Adam Lesinski
c34a7c9ca2 am 97ce1a6a: am 983b668b: am be003a35: am f23e3ea6: am aeef612f: Merge "Search all packages for a given type string when looking up resources by name" into lmp-dev 
* commit '97ce1a6a23bdb4213303384c6cf73b43cce6aa8f':
  Search all packages for a given type string when looking up resources by name
 2014-10-10 22:07:09 +00:00
Adam Lesinski
97ce1a6a23 am 983b668b: am be003a35: am f23e3ea6: am aeef612f: Merge "Search all packages for a given type string when looking up resources by name" into lmp-dev 
* commit '983b668bd8deb58cbd3faabb931c4fb2dd80bf2f':
  Search all packages for a given type string when looking up resources by name
 2014-10-10 17:14:41 +00:00
Adam Lesinski
be003a3570 am f23e3ea6: am aeef612f: Merge "Search all packages for a given type string when looking up resources by name" into lmp-dev 
* commit 'f23e3ea629f29060f34ea10a0d89c6ec22766789':
  Search all packages for a given type string when looking up resources by name
 2014-10-10 00:30:39 +00:00
Adam Lesinski
73587de154 am aeef612f: Merge "Search all packages for a given type string when looking up resources by name" into lmp-dev 
* commit 'aeef612f200b6b5cee214230271e1c3d718151ee':
  Search all packages for a given type string when looking up resources by name
 2014-10-09 19:15:36 +00:00
Adam Lesinski
e60a87f552 Search all packages for a given type string when looking up resources by name 
Previously we would stop at the first match when looking for a type string,
but we should search all packages in case a feature Split added a type
with the same name.

Bug:17924027

Change-Id: I6bc7ef073324db99448538cd8bdf566658f066ff
 2014-10-09 11:26:19 -07:00
Jorim Jaggi
4b200fd299 am 638829c5: am 906fb5b6: am 786afcb3: Trim graphics memory when closing the shade 
* commit '638829c58a811c56d339246e3a13fe57b31c0e00':
  Trim graphics memory when closing the shade
 2014-10-08 19:24:31 +00: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
f681de2d4b am 0a04e311: am f11d9de4: am 8cdb0bc0: Merge "Use float instead of double to increase spot shadow perf" into lmp-mr1-dev 
* commit '0a04e3119891d52f69c08d0ce42777cba3566b39':
  Use float instead of double to increase spot shadow perf
 2014-10-06 22:36:31 +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
b9ba53d088 am 6e4140c6: am c4694796: am 6a2296d8: am 9da6e743: am d988a45d: Merge "Cleanup DeferredLayerUpdater" into lmp-dev 
* commit '6e4140c6e2d6f14ba225b2ae5926cc0f2794056a':
  Cleanup DeferredLayerUpdater
 2014-10-04 16:05:59 +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
7886751ec9 am d297b1b9: am ab8f73a7: am 497cb6c0: Merge "Avoid creating Caches instance with gfxinfo dump" into lmp-mr1-dev 
* commit 'd297b1b9949904fb815e98765d882d4cd3ca9b10':
  Avoid creating Caches instance with gfxinfo dump
 2014-10-02 21:35:13 +00: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
92016923b6 am f7b96c8e: am 00d96e7d: am 59e129fb: Merge "Account for colorfilter transparency in determining paint opacity" into lmp-mr1-dev 
* commit 'f7b96c8e2fb14647d4a4e6695704eb12fefada3f':
  Account for colorfilter transparency in determining paint opacity
 2014-10-02 19:51:09 +00:00