6600 Commits

Author SHA1 Message Date
John Reck
91d01e5d8b am 0cec5293: am d7580333: Merge "Use std::sort instead of quickSortX" into mnc-dev
* commit '0cec52933306b0e268bb6b4f8bf73648addf0df6':
  Use std::sort instead of quickSortX
2015-07-02 01:00:52 +00:00
Chris Craik
c3988e0aa3 am b4c02e8f: am d3ecb3e6: Merge "Switch from fminf/fmaxf to std::min/max" into mnc-dev
* commit 'b4c02e8ffd0c37b645fa8bb9fc03918a8cfc9a81':
  Switch from fminf/fmaxf to std::min/max
2015-07-02 00:59:49 +00:00
John Reck
d758033368 Merge "Use std::sort instead of quickSortX" into mnc-dev 2015-07-01 20:55:23 +00:00
Chris Craik
d3ecb3e6f0 Merge "Switch from fminf/fmaxf to std::min/max" into mnc-dev 2015-07-01 18:10:33 +00:00
John Reck
1e4209e387 Use std::sort instead of quickSortX
Bug: 22208220

Libcxx has a really good sort algorithm, use that
instead. This speeds up shadow tesellation by about 10%.

Also less code

Change-Id: Iaad424187121d7644076f94ba8a3cf4c110da2f2
2015-07-01 09:54:47 -07:00
Chris Craik
df72b63928 Switch from fminf/fmaxf to std::min/max
bug:22208220

Shows considerable improvement in performance, especially in tight
loops.

Change-Id: I4bcf6584a3c145bfc55e73c9c73dcf6199290b3c
2015-06-30 17:58:21 -07:00
Chris Craik
6aa9b4abf3 am cf225194: am a763bb83: Merge "Saturate alpha values when overlaying glyphs" into mnc-dev
* commit 'cf225194a61db1558ead673fd67365ff9a61f3bb':
  Saturate alpha values when overlaying glyphs
2015-06-30 21:40:41 +00:00
Chris Craik
de25a672b1 Saturate alpha values when overlaying glyphs
bug:19062769

Glyphs were stored to the output buffer with the assumption of
non-overlap, which is incorrect for certain fonts/strings. Instead,
blend src into dst, so new glyphs don't clobber existing content.

Change-Id: I6e22037500e67d5348ee2a43d939416c23c4d1ea
2015-06-30 13:24:18 -07:00
Yusuke Sato
53a19bb967 resolved conflicts for merge of d3d6e9a3 to mnc-dev-plus-aosp
Change-Id: Ie32db11e6c1062df32b16a5cd6fcd219e0bdc017
2015-06-29 13:09:51 -07:00
Yusuke Sato
16d520fce6 Merge "Rename ZipEntryName to ZipString" 2015-06-29 17:49:33 +00:00
Chris Craik
f8d25ea8eb Merge "Don't promote functors onto layers due to outline rect clipping" into mnc-dev 2015-06-26 20:28:36 +00:00
Chris Craik
b60d3e7856 Don't promote functors onto layers due to outline rect clipping
bug:21320333

Change-Id: Ie70982c88498395148dab6eaca861de66e6207ed
2015-06-25 17:15:17 -07:00
Yusuke Sato
f162faaa12 Rename ZipEntryName to ZipString
Also add a 4th parameter to StartIteration(). This is for
https://android-review.googlesource.com/#/c/156771/.

Bug: 21957428
Change-Id: Ifbf9aec2f04b214b57e99c306282d7c0d39675a9
2015-06-25 14:58:16 -07:00
Tenghui Zhu
5daee1dc27 Merge "Limit dotProduct value to 1.0f, so acosf would not return NaN." into mnc-dev 2015-06-25 21:45:32 +00:00
Lazar Trsic
1240752c44 Limit dotProduct value to 1.0f, so acosf would not return NaN.
Cherry pick of b561f39d01c211425bfefaaa7b31ebe097e7ba79 from AOSP master.

Due to precision loss of float math, we sometimes get 1.000001f for
dotProduct. This causes NaN result from acosf() and floor() funcs.

At the moment, this does not cause any problems on ARM, as casting
NaN to int results in 0. On mips however (possibly on x86), such cast
gives INT_MAX, so crash occurs when trying to use the resulting value.

Change-Id: I8e0285a0306a65b8469d9f4885c19665066fc4c8
2015-06-25 14:22:13 -07:00
Yusuke Sato
0f61c7dcc4 Merge "Let findSupportedAbi and hasRenderscriptBitcode scan only relevant files" into mnc-dev 2015-06-25 17:34:01 +00:00
Lazar Trsic
b561f39d01 Limit dotProduct value to 1.0f, so acosf would not return NaN.
Due to precision loss of float math, we sometimes get 1.000001f for
dotProduct. This causes NaN result from acosf() and floor() funcs.

At the moment, this does not cause any problems on ARM, as casting
NaN to int results in 0. On mips however (possibly on x86), such cast
gives INT_MAX, so crash occurs when trying to use the resulting value.

Change-Id: I8e0285a0306a65b8469d9f4885c19665066fc4c8
2015-06-25 11:11:55 +02:00
Chris Craik
6659ac77ed Merge "Avoid over-damaging layer area for multidraws" into mnc-dev 2015-06-24 17:58:01 +00:00
Chris Craik
3375f8ad30 Avoid over-damaging layer area for multidraws
bug:19608961

Change-Id: Ib7495f155da62a352e9a010a362fd40ec0acad21
2015-06-24 09:43:54 -07:00
Tom Hudson
a81a0c8647 Merge "Sync canvas proxy CTM (b/21945972)" into mnc-dev 2015-06-24 14:53:58 +00:00
Tom Hudson
90fb1f6732 Sync canvas proxy CTM (b/21945972)
SkiaCanvasProxy was being created with an identity transform, ignoring
any transform that may have been applied in Java (or C++) to the
android graphics Canvas it was proxy for. This CL makes sure the
DisplayListCanvas transform is propagated to the Proxy every time
asSkCanvas() is called.

We could instead move the code to the SkiaCanvasProxy constructor
if we got rid of the cached proxy on DisplayListCanvas; nobody's
using the proxy heavily enough that that should be a performance
hit at this time.

BUG:21945972
R=djsollen@google.com

Change-Id: I99ed1563802a2449bb9939cb67976cd60dd8611c
2015-06-24 10:43:16 -04:00
Chris Craik
c686757a18 Merge "Unify clipping return value behavior - true if not empty" into mnc-dev 2015-06-24 00:12:51 +00:00
Chris Craik
5ec6a2878b Unify clipping return value behavior - true if not empty
bug:22035484

Change-Id: I23ecca38554a60c590181290900deb0e2c48cea1
2015-06-23 15:42:43 -07:00
Chris Craik
0d99d43e81 Merge "Dump GL errors and crash on failure to allocate texture for layer" into mnc-dev 2015-06-23 18:01:02 +00:00
Chris Craik
5686bae289 Dump GL errors and crash on failure to allocate texture for layer
bug:22029728

Change-Id: Ib6f778975225b36567b12e30967955640ec185b3
2015-06-23 10:34:54 -07:00
Yusuke Sato
34fe3df851 Let findSupportedAbi and hasRenderscriptBitcode scan only relevant files
for better performance. Without the optimization, these two functions
may check more than 100k file names in the pre-installed APK files,
which can take a few seconds to finish even on a recent device.

Bug: 21957428
Change-Id: I315fd3c6d5aa1076b993752525de449a9933de12
2015-06-22 16:11:32 -07:00
Chris Craik
772687d242 Avoid flushing DisplayListCanvas state for noop calls
bug:22006795

Change-Id: I2eceee69772b08f5319ea882be429a5b36860b7d
2015-06-22 14:51:18 -07:00
Narayan Kamath
407753c456 ZipFileRO: Use precise widths for zip file types.
getEntryInfo crashes on 64-bit devices because "long" types
were being passed int pointers (that pointed to a stack frame)
that were reinterpret_cast'ed to long* (sigh.). To fix this issue
once and for all, use types with explicitly defined widths.

This change also removes some dead invariant checking from
Asset.cpp instead of cleaning it up.

Note that we've introduced a wart in NativeLibraryHelper, where
we need to deal with zlib's uLong type, which is "at least 32 bits
wide".

bug: 21622286

(cherry picked from commit 4600dd053dbdbd4b95f3b11057a1cc55b99f9c77)

Change-Id: I7886cb37a229cc27c625699c80e6a6a6117d2203
2015-06-17 13:13:16 +00:00
Narayan Kamath
4600dd053d ZipFileRO: Use precise widths for zip file types.
getEntryInfo crashes on 64-bit devices because "long" types
were being passed int pointers (that pointed to a stack frame)
that were reinterpret_cast'ed to long* (sigh.). To fix this issue
once and for all, use types with explicitly defined widths.

This change also removes some dead invariant checking from
Asset.cpp instead of cleaning it up.

Note that we've introduced a wart in NativeLibraryHelper, where
we need to deal with zlib's uLong type, which is "at least 32 bits
wide".

bug: 21622286

Change-Id: Iae675a9601db7aae03a8b80b40321d2cc1d97f50
2015-06-17 08:40:25 +00:00
John Reck
3f725f0a5a Fix null deref
Bug: 21857172

willHaveFunctor was assuming that either mStagingDisplayList
or mDisplayList would be non-null but this isn't true. Both
can be null in some scenarios (notably after a trimMemory)

Change-Id: Ia2915b84cfc907ec9c7cbec54ed6dc26283ec998
2015-06-16 10:29:31 -07:00
Chris Craik
4c9dafbfec Merge "Put WebViews with on a HW layer if stencil/shader clipping is needed" into mnc-dev 2015-06-12 22:46:21 +00:00
Chris Craik
eaef7b6cb1 Merge "Fix roundrect clipping / blending ordering" into mnc-dev 2015-06-12 21:23:23 +00:00
Chris Craik
a766cb2bce Put WebViews with on a HW layer if stencil/shader clipping is needed
bug:17322378
Change-Id: I0de574bf116b30e2ad4194366e19d47d49708902
2015-06-12 13:34:58 -07:00
Chris Craik
b1f990de40 Fix roundrect clipping / blending ordering
bug:21803918

Also, don't consider rr clipped ops opaque, and put stage
checking behind a debug flag.

Change-Id: I9304ae571337a7cf835524682d1a590a21d30fa4
2015-06-12 13:20:37 -07:00
Chris Craik
4e9d9b2a59 Revert to save-layer based alpha if layer would be too large
bug:21011574
Change-Id: I323f2398188ffc2bbed6a98578d25d7e5f6c337d
2015-06-12 11:07:23 -07:00
John Reck
475c545fa8 Merge "Upload bitmaps in SkShader* safely" into mnc-dev 2015-06-09 22:32:33 +00:00
John Reck
37b0824a46 Upload bitmaps in SkShader* safely
Bug: 19412589
Change-Id: Id50c08ff523d5540f60c39b435c0ab1b4c685655
2015-06-09 15:27:52 -07:00
ywen
f087c828cd Fix a GL error leak issue
glFinish() dequeues a native buffer, and it fails when
the bufeer has been abandoned, this is ok and will not
casue the app crash

GL_OUT_OF_MEMORY is generated in this case, and it is
not reset until glGetError called. This is happened in
build layer function, glGetError is called after glTexImg2d,
and get GL_OUT_OF_MEMORY, then this function return as OOM,
and app crash

Fix it by adding a glGetError after glFinish

Change-Id: I8803a726b6f609c4a2f8a6aa6bb7ff7064808932
2015-06-09 17:51:35 +05:30
John Reck
62043203df Merge "Delete unused" into mnc-dev 2015-06-08 22:51:43 +00:00
John Reck
4538ef2abc Delete unused
Change-Id: If27e1eb8e42313eae14df58a24ca54fafb2992fa
2015-06-08 15:45:58 -07:00
Chris Craik
37cf077171 Merge "Add projection info to RenderNode dumps" into mnc-dev 2015-06-08 20:00:37 +00:00
Chris Craik
bf72eb80d9 Add projection info to RenderNode dumps
bug:21502154

Also fixes several issues around DISPLAY_LIST_DEBUG

Change-Id: I726f5bc071f8c037ffe1b224175fe5c1e2b1c5bd
2015-06-08 11:39:02 -07:00
John Reck
5b688e848c Merge "Disable -Werror on Clang" into mnc-dev 2015-06-08 18:08:33 +00:00
John Reck
0f43c3998c Fix clang warnings
Bug: 21695880
Change-Id: I2985a42a52ab27c546b4317ea70f94d1506c5347
2015-06-08 11:06:18 -07:00
John Reck
e6178208c2 Disable -Werror on Clang
Bug: 21698669
Change-Id: I90549599ed52cff028a29f56d3d8ffe80c9afab4
2015-06-08 11:01:24 -07:00
John Reck
41300274cf Iterate step of launch & iterate
Bug: 18052916

Tweaked colors, merged some categories
Reduced significance of fast frames
Increased visual weight of janky frames

Change-Id: I5b4e86164c4d51debad7de0e0f8715dda34c7a60
2015-06-04 10:49:08 -07:00
Chris Craik
1b54fb27ac Delete MAKE_ENUM_FLAGS
bug:21595702

Settle on namespace-enum for consistency. Also removes k prefix.

Change-Id: Ib89f94cb9263de40b6e4636577dca4860867d0d8
2015-06-03 13:42:21 -07:00
John Reck
2a8bb05a31 Fix warning
Bug: 21608208
Change-Id: I1d1cf1fbc8c0a4561bf76e307c56be580fb4baef
2015-06-03 09:53:42 -07:00
Chris Craik
38f4396ebd Merge "Handle shader matrix correctly when ignoring canvas transform" into mnc-dev 2015-06-03 00:27:01 +00:00
Chris Craik
53e51e4aa9 Handle shader matrix correctly when ignoring canvas transform
bug:20063841

Restores old SkShader matrix behavior from before the Glop refactor.

Many drawing operations draw without sending the canvas transform to
the GL shader. In such cases, we need to adapt the matrix sent to the
SkShader logic to invert the canvas transform that's built into
the mesh.

Change-Id: I42b6f59df36ce46436322b95bf9ad2140795ee58
2015-06-02 16:28:39 -07:00