Commit Graph

7252 Commits

Author SHA1 Message Date
John Reck
0bb8d5f95c Merge "Disable HWUI_NEW_OPS" into nyc-dev am: 4dfd6c0abc
am: af367e47f5

* commit 'af367e47f56da35f498a5fb6c7eaef6d8589ba97':
  Disable HWUI_NEW_OPS
2016-02-26 00:04:45 +00:00
John Reck
4dfd6c0abc Merge "Disable HWUI_NEW_OPS" into nyc-dev 2016-02-25 23:28:38 +00:00
John Reck
0bed032eb2 Disable HWUI_NEW_OPS
Bug: 27365711

Change-Id: Ife7ecc7c688738df4028f30847a2ff914e433b99
2016-02-25 15:03:48 -08:00
Chris Craik
fe2d47a181 Merge "Cleanup vertex attrib management" into nyc-dev am: dc32185b92
am: 623df47294

* commit '623df4729482115d9f8a8729c1c95aab872ac67a':
  Cleanup vertex attrib management
2016-02-25 17:43:22 +00:00
Chris Craik
dc32185b92 Merge "Cleanup vertex attrib management" into nyc-dev 2016-02-25 17:31:47 +00:00
Chris Craik
1b7db4000e Cleanup vertex attrib management
bug:27289007

Also removes unused code in MeshState

Change-Id: I46116631111cc82e1cdffb5706344bbb6d4c6600
2016-02-24 18:33:41 -08:00
John Reck
94c4959fe0 Merge "Aggressively unbind GL_PIXEL_UNPACK_BUFFER" into nyc-dev am: 106c651aef
am: b4541890a4

* commit 'b4541890a447c40ddbdf7168c71dff65cd47c4b2':
  Aggressively unbind GL_PIXEL_UNPACK_BUFFER
2016-02-25 01:01:21 +00:00
John Reck
f3ad324a8d Aggressively unbind GL_PIXEL_UNPACK_BUFFER
Bug: 27186019

Theory: It appears to be possible for FontRenderer
to not unbind its PBO prior to textures being uploaded,
resulting in trying to glSubTexImage2D with a bound
GL_PIXEL_UNPACK_BUFFER. In that scenario the void* is
the offset into the PBO which given a non-null data
will almost certainly overrun the end of the buffer. This
in turn produces a GL_INVALID_OPERATION error.

Change PixelBuffer to avoid leaking this state for now.
This will result in more calls to glBindBuffer/glUnbindBuffer
in the worst case, but the worst case is already bad so this
shouldn't be a problem. In the normal case we avoid binding
the PBO at all ever, so this doesn't impact that.

Change-Id: I05473f0d2f9a3a5da0e33d8f9ddea4731ce970e3
2016-02-24 15:40:05 -08:00
Chris Craik
0ec89c88ff Merge "Fix drawColor/drawPaint bounds" into nyc-dev am: 388e43f419
am: 5dc1772563

* commit '5dc17725637ed17e233f5a2fc88282087a788946':
  Fix drawColor/drawPaint bounds
2016-02-23 23:53:29 +00:00
Chris Craik
388e43f419 Merge "Fix drawColor/drawPaint bounds" into nyc-dev 2016-02-23 23:33:53 +00:00
Chris Craik
a15762ef76 Support op dumping in new pipeline am: 91eff22b5d
am: d39f57e0a7

* commit 'd39f57e0a7bb669adc4aab2a3b40db771dbd23a2':
  Support op dumping in new pipeline
2016-02-23 19:11:47 +00:00
Chris Craik
91eff22b5d Support op dumping in new pipeline
bug:26565102

Change-Id: I266e420a2f18ba9ad62942b8a0de295dfa3a2a88
2016-02-23 18:52:54 +00:00
Chris Craik
1c1a99f790 Merge "Fix positioning in path fallback case" into nyc-dev am: cf1f7304ca
am: 171079af05

* commit '171079af05295f069b29325c5f344bf768692f81':
  Fix positioning in path fallback case
2016-02-23 01:16:02 +00:00
Chris Craik
cf1f7304ca Merge "Fix positioning in path fallback case" into nyc-dev 2016-02-23 00:54:29 +00:00
Chris Craik
e2822e4c79 Fix positioning in path fallback case
bug:26923968
Change-Id: Iaf686fb69b629cf5c8762188073e57c8664150a8
2016-02-22 16:42:24 -08:00
Ben Wagner
c38dd0a95d Merge "Use utf32_from_utf8_at instead of SkUTF8_NextUnichar." 2016-02-22 21:55:53 +00:00
Chris Craik
a17b5366d5 Merge "Add create_trivial_array" into nyc-dev am: 339fc0a1d2
am: 064b467718

* commit '064b467718e02e42360fce45c985d88333a35cdf':
  Add create_trivial_array
2016-02-22 21:53:15 +00:00
Chris Craik
339fc0a1d2 Merge "Add create_trivial_array" into nyc-dev 2016-02-22 21:40:58 +00:00
Ben Wagner
f4cf5d3b01 Use utf32_from_utf8_at instead of SkUTF8_NextUnichar.
Skia would like to make the SkUTF* methods private to Skia. This CL
makes this Android test code use Android methods for the same function.

Change-Id: I544847c70030c818aa72dd3ec21b1926834a3e78
2016-02-22 20:39:13 +00:00
Doris Liu
c7a2a61d57 Merge "Ensure animator\'s interpolator is set" into nyc-dev am: 045e5a78a2
am: a97a9f5188

* commit 'a97a9f5188e95c850cc957ec777b99a680ecc8d8':
  Ensure animator's interpolator is set
2016-02-22 18:28:12 +00:00
Doris Liu
045e5a78a2 Merge "Ensure animator's interpolator is set" into nyc-dev 2016-02-22 18:08:07 +00:00
Ben Wagner
ed87fa2a2d Use android_memset32 instead of sk_memset32.
Android code should use the Android version. Also, Skia is interested
in making sk_memset32 private.

BUG:27290333

Change-Id: Id5c8bc190cdd21673c8844eaa48e8b6a93e2e9df
2016-02-22 16:26:02 +00:00
Doris Liu
148f57fc26 Ensure animator's interpolator is set
Animator's play state can go from NotStarted to Finished directly
in the case of calling start() and end() within one frame. Previously
we only set animator's interpolator when the animator is transitioning
to Running state. So when Running state is skipped, the interpolator
is left unset.

Bug: 27224373
Change-Id: I5a53106fe1aae38ccaf1df8debd553be3bc56133
2016-02-19 17:19:24 -08:00
Chris Craik
1fd5f379d7 Merge "Support drawing circles with drawArc in new pipeline" into nyc-dev 2016-02-20 00:18:15 +00:00
Chris Craik
043aeb8224 Merge "Cleanup cached state in TestUtils::runOnRenderThread" into nyc-dev 2016-02-20 00:13:29 +00:00
Chris Craik
caa2418473 Support drawing circles with drawArc in new pipeline
bug:26764636

Change-Id: I37d2384fa5e6c1074bb8de85821d58c15659b762
2016-02-19 16:12:53 -08:00
Chris Craik
1bc4ee4506 Cleanup cached state in TestUtils::runOnRenderThread
Change-Id: I097217c80db5c509d97ef050633946110fccbc80
2016-02-19 15:57:45 -08:00
Chris Craik
7a89600bac Add create_trivial_array
Change-Id: I5e4236ff59fdaceb95105c5590f4deeda6d0b4c8
2016-02-19 15:51:02 -08:00
Doris Liu
e87a74e1a3 Merge "Revert "Revert "Check RenderNode's owning view before attaching animators""" into nyc-dev 2016-02-19 22:45:16 +00:00
Doris Liu
0a1cdee33e Merge "VectorDrawable native rendering - Step 5 of MANY" into nyc-dev 2016-02-19 22:44:52 +00:00
Doris Liu
8b083206ae Revert "Revert "Check RenderNode's owning view before attaching animators""
This reverts commit eb40178af3.

Change-Id: I6838ecb35b50847746ee66ac204f14eb5f579b91
2016-02-19 13:52:41 -08:00
Doris Liu
c4bb185d41 VectorDrawable native rendering - Step 5 of MANY
This is reverting the revert of what reverts the revert of the original
implementation. Fourth revert is a charm!

This reverts commit df7fdb1e0b.

Change-Id: I6fc3a5accfd8b79c3da31bbc101ad9e9b4d6e7dd
2016-02-19 13:51:31 -08:00
John Reck
6cc3a25db5 Temporarily enable fine-grained error checking
Bug: 27186019

Quick testing shows negligable performance impact, so turn
this on temporarily to track down some GL errors

Change-Id: I5700075d5640af0951d832acfde3179ec7511912
2016-02-19 10:39:17 -08:00
Chris Craik
1713c7773c Fix drawColor/drawPaint bounds
bug:26591194

Change-Id: Icda9b6e6cdd0c12a10e06469ace02b4a89df044b
2016-02-18 17:49:46 -08:00
Doris Liu
5b7188aebc Merge "Revert "Revert "Revert "VectorDrawable native rendering - Step 5 of MANY"""" into nyc-dev 2016-02-18 19:06:20 +00:00
Doris Liu
b9fb8fdf78 Merge "Revert "Check RenderNode's owning view before attaching animators"" into nyc-dev 2016-02-18 19:04:28 +00:00
Doris Liu
df7fdb1e0b Revert "Revert "Revert "VectorDrawable native rendering - Step 5 of MANY"""
This reverts commit 0d20a275a5.

Change-Id: I97c782f1164a5d39ab74dc098cca71d9e1b30cd8
2016-02-18 18:37:02 +00:00
Doris Liu
eb40178af3 Revert "Check RenderNode's owning view before attaching animators"
This reverts commit 12abdeb3c7.

Change-Id: I938deddf5f294127f87a0e70f940fe5b9a85e0b2
2016-02-18 18:34:59 +00:00
Andres Morales
8e1206bfff Merge "allow for slow FrameMetricsListeners" into nyc-dev 2016-02-17 20:59:45 +00:00
Andres Morales
11f02d7e52 allow for slow FrameMetricsListeners
A slow listener could cause a race in the NotifyHandler
where the single reference to the buffer to send would get
updated when it shouldn't have been.

Switch to a queue of available buffers to prevent this race.

Also, stop setting and clearing the observer reference and instead
incStrong/decStrong to mark temporary strong ownership without
colliding with other owners in flight.

Bug: 27097094
Change-Id: Iee647bfae8b80019b6d8290179eed3973230901f
2016-02-17 12:16:06 -08:00
Doris Liu
e6e57a9d51 Merge "Check RenderNode's owning view before attaching animators" into nyc-dev 2016-02-16 23:38:57 +00:00
Doris Liu
5b49c6f31b Merge "Revert "Revert "VectorDrawable native rendering - Step 5 of MANY""" into nyc-dev 2016-02-16 23:38:43 +00:00
Doris Liu
12abdeb3c7 Check RenderNode's owning view before attaching animators
-Only add animators to a RenderNode when its owning view is attached
-When changing animator's target RenderNode, remove the animator from
 the old target RenderNode that it's currently running on, if any.
Bug: 27141983
Bug: 27145149
Change-Id: I9c9592382d64ecc0390f7ec743a59ce1ad7d9798
2016-02-16 14:25:48 -08:00
Leon Scroggins III
c46813d724 Clean up some Skia includes
Neither of these files need SkScalerContext.h. Remove those includes.
One really needs SkGlyph.h, so include it instead.

Change-Id: Ic7cfce9e7784c9290c5a2dfdd8385b65d32f9b76
2016-02-16 16:32:13 +00:00
Doris Liu
0d20a275a5 Revert "Revert "VectorDrawable native rendering - Step 5 of MANY""
This reverts commit e03ef25a3e.

Change-Id: I9c2e1c891667451a3ee668e414bf337ad67279ab
2016-02-12 19:49:29 -08:00
John Reck
623d223193 Fix bytesPerPixel for SurfaceTexture
Bug: 27158985
Change-Id: I148a86d76314681eb778292dd0eb64503375f328
2016-02-12 08:08:29 -08:00
Derek Sollenberger
67b1684a07 Merge "Update HWUI makefiles to support use by other targets (e.g. Skia)" into nyc-dev 2016-02-12 13:40:43 +00:00
Roozbeh Pournader
79f7dc8fa2 Merge "Fix locale matching algorithm for resources" into nyc-dev 2016-02-12 05:19:37 +00:00
Roozbeh Pournader
4de4596ac1 Fix locale matching algorithm for resources
We get ResTables two different ways: one is from AAPT, another from
settings-based requests from the Java side. In the settings-based
requests, localeScript will be autocomputed, but for AAPT-filled
tables (especially if they come from older versions of AAPT), we need
to compute the script.

Previously, locales that came from packages were incorrectly assumed
to have "undeterminable" scripts, rather than "undetermined" scripts.
This led to us mistakenly falling back to the old logic of requiring
the locales' countries to match, rather than just looking at computed
scripts.

Bug: 27157452

Change-Id: Id7e346d3ecfb17273ffb63de5bcb4849a6eafbbd
2016-02-12 05:18:38 +00:00
John Reck
9036f9989b Merge "Fix build" into nyc-dev 2016-02-11 22:35:36 +00:00