6600 Commits

Author SHA1 Message Date
John Reck
6058251939 Merge "More colors, now with material colors" into mnc-dev 2015-06-02 23:16:31 +00:00
John Reck
bf3c602284 More colors, now with material colors
Bug: 18052916
Change-Id: I66c2573d796338ee7b7d0ddf240b90cc78a71ce5
2015-06-02 16:13:56 -07:00
John Reck
4db3d17deb FrameInfo header fixes
Bug: 21560187

Log column names as part of output in case of other such
issues

Change-Id: I16157ed968307e761d416ca54bd7af5453fe67bf
2015-06-02 15:58:43 -07:00
ztenghui
21ef8205a1 Tweak the threshold for conic path quads computation.
We still want it to be related to the threshold for bezier generation.

b/19903239

Change-Id: Ifdce32f1c28ecea9eac98d02c73afa948341fc7d
2015-05-29 15:12:55 -07:00
Chris Craik
da28c8681a Merge "Fix round cap approximation to understand scale" into mnc-dev 2015-05-28 22:50:03 +00:00
Chris Craik
469fb1efd6 Fix build
Change-Id: I7ee28c474aa821eb598f719723d87416a41537b9
2015-05-28 15:33:40 -07:00
Chris Craik
1cd7e4c3d0 Merge "Use path intersection instead of saveLayer+mesh to mask projected ripples" into mnc-dev 2015-05-28 22:03:08 +00:00
Chris Craik
ff29b5a5b9 Fix round cap approximation to understand scale
bug:19772120
Change-Id: I7b944faed1d1e8d5f55453802da57679217d9d9a
2015-05-27 18:17:55 -07:00
Chris Craik
1ec5e308a9 Merge "Fix assert when dumping view at 0 alpha" into mnc-dev 2015-05-27 19:22:59 +00:00
Chris Craik
1e6d566c5f Merge "Fix GL texture binding for TextureViews" into mnc-dev 2015-05-27 19:22:44 +00:00
Chris Craik
43a1d31a28 Fix assert when dumping view at 0 alpha
bug:21461177

Change-Id: Ib4aba7b9641254012471da44aa804813b9679423
2015-05-27 11:28:15 -07:00
Chris Craik
5f1356c80a Fix GL texture binding for TextureViews
bug:21431334

Should be explicitly passing target through, to ensure
GL_EXTERNAL_OES textures are bound correctly.

Change-Id: I997672ae292ea7fc016c02a59a3c7c8358ecfe0b
2015-05-27 11:06:22 -07:00
John Reck
302abd2246 Merge "Enable swapBuffersWithDamage by default" into mnc-dev 2015-05-27 17:39:18 +00:00
John Reck
4cd44f8110 Enable swapBuffersWithDamage by default
Bug: 20761426

Change-Id: I520e60ca4f182dea590bc86eebd522e1db7a018a
2015-05-27 10:28:28 -07:00
Chris Craik
fca52b7583 Use path intersection instead of saveLayer+mesh to mask projected ripples
bug:14297149

SaveLayer's performance cost is high, and proportional to the surface
being projected onto. Since ripples (even unbounded ones) are now
always projected to the arbitrary background content behind them, this
cost is especially important to avoid.

This removes the last semi-secret, saveLayer from the projected
ripple implementation.

Also fixes the HW test app to correctly demonstrate this projection
masking behavior.

Additionaly, alters PathTessellator to gracefully handle
counter-clockwise paths, and simplifies the work done by
ShadowTessellator to ensure all of its paths are counterclockwise.

Change-Id: Ibe9e12812bd10a774e20b1d444a140c368cbba8c
2015-05-26 17:53:16 -07:00
Chris Craik
7c7d71b184 Merge "Fix position snapping for drawBitmap(rect, rect)" into mnc-dev 2015-05-26 22:08:59 +00:00
Chris Craik
1e4c8074fa Fix position snapping for drawBitmap(rect, rect)
bug:20669049
Change-Id: Ied5f1d7e681409b6b7f6f582ed344b479df4c6d7
2015-05-26 15:04:27 -07:00
Chris Craik
87d8bb3d85 Merge "Unflip TextureView getBitmap readback" into mnc-dev 2015-05-26 17:19:03 +00:00
Chris Craik
c08f4ad785 Unflip TextureView getBitmap readback
bug:20165725

Change-Id: I09035f43be140145c54221d6865206ce486994c9
2015-05-22 17:47:52 -07:00
Chih-Hung Hsieh
1aa800e884 Suppress benign clang warning.
To unblock continuous clang/llvm builds.

BUG: 21337624
Change-Id: I38e5d11fd3c44f50430a3a8519c5071674b3df9f
2015-05-22 12:28:03 -07:00
John Reck
d7db4d7672 Eliminate requireGlContext
Bug: 20297820

Change-Id: I37c63bab6f6c0d2337c8c6002046d2ef17e74097
2015-05-20 11:24:57 -07:00
Chih-Hung Hsieh
2f1e21d995 Add missing const qualifier to compile with clang/llvm.
BUG: 21298442
Change-Id: Iad211237fdb0128d8f4490419687bf1da1cd261c
2015-05-19 10:44:53 -07:00
Adam Lesinski
2738c96d99 Add -round and -notround qualifier to android runtime/aapt
The round qualifier denotes a device with a screen shape that
is round. The qualifier shows up after the 'long/notlong' qualifier
and before the orientation 'port/land/square' qualifiers.

Change-Id: I3044258b2703a9165694b79725bade770fa6cea1
2015-05-15 15:10:58 -07:00
Alan Viverette
50210d9129 Adjust light source for window position
Bug: 16523629
Change-Id: I2f3fed1edcac0a3cfd5034aded45e08ececfebaf
2015-05-14 18:05:36 -07:00
Chris Craik
30bc0b9ebb Merge "Add tracing for path texture upload" into mnc-dev 2015-05-14 15:53:18 +00:00
Chris Craik
cf8426c4eb Add tracing for path texture upload
Change-Id: I4918e5a3c7e01b321d428b20babd48bf69a708e4
2015-05-13 17:05:48 -07:00
Chris Craik
6b4ace298e Merge "Add back alpha atrace log" into mnc-dev 2015-05-13 23:53:48 +00:00
Chris Craik
1a0808e64c Add back alpha atrace log
bug:20922838

Change-Id: I70ccbffdd5f140cd1dd71fbf456fb5b085e74a4a
2015-05-13 16:47:19 -07:00
John Reck
75e7d7eb0e Merge "Unify DrawProfiler/JankStats" into mnc-dev 2015-05-13 16:30:09 +00:00
John Reck
4c9e59d03c Unify DrawProfiler/JankStats
Bug: 20822400

Change-Id: I24345c3120440bfce14e8cbe7e880b39f10b744a
2015-05-12 11:02:07 -07:00
Chris Craik
dc9230b14e Merge "Shrink default path cache size" into mnc-dev 2015-05-12 16:39:34 +00:00
Chris Craik
bf9c5c13cd Merge "Remove usage of Texture::cleanup in PathCache" into mnc-dev 2015-05-12 15:48:55 +00:00
Narayan Kamath
5a7587fa90 Fix file descriptor leak when opening invalid archives.
I've inspected all other callers of OpenArchive and this seems
to be the only broken one. The easiest way to reproduce this is
by using getPackageArchiveInfo or by adding an asset path that
isn't a valid APK.

bug: https://code.google.com/p/android/issues/detail?id=171099
Change-Id: I41cd85d20f26ad47968e2a6f1384cc03330b558b
2015-05-12 10:37:18 +00:00
Chris Craik
8d34aaff3c Shrink default path cache size
Change-Id: Id9139945837d41cc1822b796cb9837591686fcbf
2015-05-11 19:18:11 -07:00
Chris Craik
42455fc918 Remove usage of Texture::cleanup in PathCache
bug:21039605

Was causing double-deletes, is unneeded.

Change-Id: I5c0a21d076fae7039d777ca09b21492f97fea98b
2015-05-11 19:10:24 -07:00
John Reck
9aa7b45e79 Merge "Fix kSkippedFrame setting" into mnc-dev 2015-05-08 21:19:54 +00:00
John Reck
aef9dc8d18 Fix kSkippedFrame setting
It was only set previously if RenderThread dropped the frame,
but not if the UI thread frame was dropped. Unify the
two paths

Change-Id: If2574edde3cb0949deed4e47f3daaddb890a1b28
2015-05-08 14:12:32 -07:00
John Reck
d04794a9a3 Add eglSwapBuffersWithDamageKHR support
BUG: 20761426
Disabled temporarily

Change-Id: I0b6b6f0eebab886145e13fa35aefe76826965cf5
2015-05-08 10:48:57 -07:00
Alan Viverette
6a8c79bb2b Merge "Improve keying for theme caches, rebase system theme on config change" into mnc-dev 2015-05-07 21:19:59 +00:00
John Reck
98ae4dfbbc Fix build
Change-Id: I233f943041ce46b0d69e0e2f5e0dcda9aa9b7d4b
2015-05-07 13:50:55 -07:00
Chih-Hung Hsieh
ff357a9cd4 Merge "Fix clang warnings on unused variable, mismatched tag, print format." into mnc-dev 2015-05-07 20:29:22 +00:00
John Reck
d530a5e5ae Merge "Remove SkBitmap from ResourceCache" into mnc-dev 2015-05-07 20:28:57 +00:00
John Reck
e75ab4c26a Remove SkBitmap from ResourceCache
Bug: 18928352

Fully-proper refcounting via SkBitmap/SkPixelRef, no more
side-channel refcounting via ResourceCache. Makes HWUI
more resilient to the bitmap being modified as well as
the SkBitmap's info & rowBytes() is updated every time
a DisplayList is recorded instead of relying on buggy
cache eviction logic

Change-Id: I2e8292d62ab6c257a2cfa1542387bf2bf1ade816
2015-05-07 13:17:18 -07:00
Chih-Hung Hsieh
9eb9dd326a Fix clang warnings on unused variable, mismatched tag, print format.
BUG: 20890093
Change-Id: I91588f481d80b69823bc9d104b8bd09167ee5373
2015-05-07 12:30:13 -07:00
John Reck
a039182d61 Delete a bunch of dead code
Rotation wasn't supported, so just nuke all the code
around it. Fixes some unused field warnings

Change-Id: Ic33d56ed3b42e3261bddc5007c5a029831254f83
2015-05-07 11:06:46 -07:00
Tim Murray
bfbcd88aee Add frame count option to hwuitest. Also add shadowgrid2 to hwuitest
Change-Id: I069a2836cf1405adfd018ba0a058bf8f4a1cd39c
2015-05-06 13:52:06 -07:00
Dan Albert
30d0fcb95a Don't use stlport.
Bug: http://b/15193147
Change-Id: I8afa633d2c100393e5501553ea389d71a2701c8d
2015-05-06 19:51:33 +00:00
Tim Murray
1a0f1c7c16 Add loop option to hwuitest.
Change-Id: I15b6b121bd6bd963e5b433bdd93d6dc3e83645b8
2015-05-06 12:22:35 -07:00
Alan Viverette
e54d245b99 Improve keying for theme caches, rebase system theme on config change
Themes now use an array of applied styles rather than a String to store
their history. They are keyed based on a hash code computed from the
history of applied styles. The themed drawable cache has been abstracted
out into its own class.

Also updates system context to use DayNight as the default and ensures
that GlobalActions uses the correct context, which exercises the change.

CTS tests have been added in another CL.

Bug: 20421157
Change-Id: I9eb4b7dffd198ad24d02f656eaf0839570b59caa
2015-05-06 10:41:43 -07:00
Chris Craik
356b177709 Merge "Cleanup properties" into mnc-dev 2015-05-05 21:30:08 +00:00