Commit Graph

7540 Commits

Author SHA1 Message Date
Chris Craik
85bf1a85bd Merge "Add layer tracing tags in new pipeline" into nyc-dev
am: f8892359b0

* commit 'f8892359b0ae07031160a71cf3f7e3a86604c2b1':
  Add layer tracing tags in new pipeline

Change-Id: Id77f8234013d6bdbfd75b8fbc6a63b724820fd95
2016-05-05 20:10:42 +00:00
TreeHugger Robot
f8892359b0 Merge "Add layer tracing tags in new pipeline" into nyc-dev 2016-05-05 19:57:08 +00:00
Chris Craik
aff230f6f9 Add layer tracing tags in new pipeline
bug:28596354

Change-Id: I351cb50c8c9ddfc73be73d28a1af94d2a8f9992e
2016-05-04 16:27:29 -07:00
Chris Craik
92e7158f81 Merge "Use LUT for computing final shadow alpha" into nyc-dev
am: b2e36d7939

* commit 'b2e36d7939610de538a6ec95a821b61b365b3073':
  Use LUT for computing final shadow alpha

Change-Id: Ia17e3b93e9ade0633aee5a1e9edd60b92dd1e062
2016-05-04 01:11:15 +00:00
TreeHugger Robot
b2e36d7939 Merge "Use LUT for computing final shadow alpha" into nyc-dev 2016-05-04 01:03:42 +00:00
Chris Craik
138c21fbec Use LUT for computing final shadow alpha
bug:27415250

Significantly reduces shadow fragment shader computation.

Change-Id: Ie9b3c712700754b3734d0ae9cda8751c298fc59e
2016-05-03 14:36:29 -07:00
Chris Craik
f921dfc23d Merge "Add LightingFilter behavior test" into nyc-dev
am: 7039adafa9

* commit '7039adafa9a99f8eb4f8ccab9a6f9d2208454150':
  Add LightingFilter behavior test

Change-Id: Iab2b353423990cfe78c72e980d76ba7fec6b7f7b
2016-05-03 21:20:03 +00:00
Chris Craik
7039adafa9 Merge "Add LightingFilter behavior test" into nyc-dev 2016-05-03 21:12:04 +00:00
Doris Liu
031fc2de5c Merge "Count native allocation for VD against Java heap" into nyc-dev
am: 6543533f29

* commit '6543533f29d869d5cbbc1c403e4e0ed219fcc300':
  Count native allocation for VD against Java heap

Change-Id: I2bc21681d07d759f7fd668ec286f719b7ea6707a
2016-05-03 16:51:48 +00:00
Doris Liu
6543533f29 Merge "Count native allocation for VD against Java heap" into nyc-dev 2016-05-03 16:41:20 +00:00
John Reck
d023da1fa9 Merge "Remove high-overhead low-signal trace section" into nyc-dev
am: a2c10caef2

* commit 'a2c10caef20bbdb447844c09a822073fd0c9d62f':
  Remove high-overhead low-signal trace section

Change-Id: I26b96da6906374c7ed86b93d8e0594a2e7066f9d
2016-05-03 15:05:08 +00:00
John Reck
ded1d3c45b Remove high-overhead low-signal trace section
Bug: 28519669

This trace tag makes shadows look way more expensive
than they actually are, particularly troublesome
when tracing things with large number of shadows.

Change-Id: Ib6558b1388edd4b006ec15127470cb9ab563f954
2016-05-02 16:24:28 -07:00
Doris Liu
f8d131cc8d Count native allocation for VD against Java heap
There are two parts to VD's native allocation:
1) VD's internal data structure (i.e. groups, paths, etc that make
   up of the VD tree). This structure can change, when a VD is used
   to load a different drawable resource.
2) Two bitmap caches, not both of which will necessarily be allocated
   The size of the bitmap cache depends on canvas matrix and drawable
   bounds, and therefore can often change.

We need to count the native allocation from the above against Java heap.

Bug: 26269056
Change-Id: If833aedcf7f3efe00ea73a41ddccb1b48066ffd8
2016-05-02 15:34:40 -07:00
Chris Craik
20136f3194 Add LightingFilter behavior test
bug:28519669

Change-Id: I81ca4109bae04387f2eb73374d0f11821745fea1
2016-05-02 09:43:30 -07:00
John Reck
1fd9f81745 Merge "Support transform\'d GraphicBuffers" into nyc-dev
am: 6d42b5c6e3

* commit '6d42b5c6e399a10799d2bba3f7113dd198cbcae6':
  Support transform'd GraphicBuffers

Change-Id: I620f9ef9e1e2ce4df6471b37d1ec06b0fcdb2a88
2016-04-29 14:55:28 +00:00
John Reck
6d42b5c6e3 Merge "Support transform'd GraphicBuffers" into nyc-dev 2016-04-29 14:49:21 +00:00
John Reck
2f69d6d4fd Support transform'd GraphicBuffers
Bug: 28428955
Change-Id: I23e2fc9b96a67c7cfda42d9d7319e478194a7fa7
2016-04-28 13:32:27 -07:00
Chih-Hung Hsieh
85e0c89ba5 resolve merge conflicts of 1599b981 to nyc-dev-plus-aosp
Change-Id: I90807581e10b6a0024515ff634ac8b29eaa5fc9f
2016-04-28 12:08:15 -07:00
Chih-hung Hsieh
6e35557ad3 Merge "Fix google-explicit-constructor warnings." 2016-04-28 18:47:00 +00:00
Shammi Khattar
7134ce3540 ZipUtils: Fix wrong timestamps when getEntryInfo
"tm_mon" format should align with "ZipEntry::setModWhen" in aapt.
"tm_isdst" should be initialized, or it will because random value
and cause error in function mktime().

BUG:28021145

(cherry picked from commit bb0eb3f4cb33c077b296a18555a9a1a966ff696b)

Change-Id: Ia39cf63fcd4bb39c24af080562960279106f526c
2016-04-28 15:07:34 +00:00
Narayan Kamath
e53f65897d Merge "ZipUtils: Fix wrong timestamps when getEntryInfo" am: 3f0355f
am: b7dd102

* commit 'b7dd1026f3ee076a5620aeb09125719147c99116':
  ZipUtils: Fix wrong timestamps when getEntryInfo

Change-Id: I964fcec6b7b88dae0d2b53cafe40707f814271ca
2016-04-28 12:26:53 +00:00
Shammi Khattar
1ead474f61 ZipUtils: Fix wrong timestamps when getEntryInfo
"tm_mon" format should align with "ZipEntry::setModWhen" in aapt.
"tm_isdst" should be initialized, or it will because random value
and cause error in function mktime().

BUG:28021145
Change-Id: I1e8d5c14e5d7b875bf9cd940cb7f4c5b93a1bcd6
2016-04-28 12:13:16 +00:00
Chris Craik
eb7bb568d2 Merge "Fix oval positioning when drawn with patheffect" into nyc-dev
am: 8438a72

* commit '8438a7297c16c1ee73f4e67efef18ad9062e15f1':
  Fix oval positioning when drawn with patheffect

Change-Id: If367a59c4faef13e6f43f3c7512abceb14bf7f42
2016-04-27 21:05:28 +00:00
Chris Craik
8438a7297c Merge "Fix oval positioning when drawn with patheffect" into nyc-dev 2016-04-27 20:52:51 +00:00
Chih-Hung Hsieh
c6baf563ba Fix google-explicit-constructor warnings.
Bug: 28341362
Change-Id: Ibdd6a210bb7ff228e3624cc319169f77aca3b51e
2016-04-27 11:38:12 -07:00
John Reck
f97dca612e Merge "API tweaks to PixelCopy and make it public" into nyc-dev
am: 7f209d3

* commit '7f209d37f17d4df09475137c38b84a3338c84023':
  API tweaks to PixelCopy and make it public

Change-Id: I1aac8afacfd054fe10fc26a73552608c51dfa9f5
2016-04-27 14:44:38 +00:00
John Reck
7f209d37f1 Merge "API tweaks to PixelCopy and make it public" into nyc-dev 2016-04-27 14:36:53 +00:00
John Reck
e94cbc76d5 API tweaks to PixelCopy and make it public
Bug: 27708453
Change-Id: I81667ce42f9ca1c1a13e1e61299927900845fc84
2016-04-26 15:41:43 -07:00
Chris Craik
e98a046d31 Fix oval positioning when drawn with patheffect
Fixes: 28396277

Change-Id: I9e21696d81d7cd219f3eaa081bf3d9ba988fe051
2016-04-26 15:38:33 -07:00
sergeyv
55d2936f4c Merge "Stop always set OffsetByFudgeFactor in renderVertexBuffer" into nyc-dev
am: b7d1657

* commit 'b7d1657016d5f5b384e231979c6dcf18b0334ca4':
  Stop always set OffsetByFudgeFactor in renderVertexBuffer

Change-Id: If537a4039c3490737ad35b3d537098f0328ea391
2016-04-26 21:44:50 +00:00
Sergei Vasilinetc
b7d1657016 Merge "Stop always set OffsetByFudgeFactor in renderVertexBuffer" into nyc-dev 2016-04-26 21:39:09 +00:00
John Reck
187c1d4822 Merge "PixelCopy fixes" into nyc-dev
am: a5bbbe5

* commit 'a5bbbe55b74d3a835b64fa18959f487da2df967e':
  PixelCopy fixes

Change-Id: I4a49425cea5316ac4c977432c60caf9a6f667b76
2016-04-25 15:05:03 +00:00
John Reck
a5bbbe55b7 Merge "PixelCopy fixes" into nyc-dev 2016-04-25 14:55:28 +00:00
John Reck
2f78327cfc PixelCopy fixes
Bug: 27708453

Fixes some issues with camera sources. Previously
it was using GL_TEXTURE_2D target which doesn't
work properly if the source is YUV. It is critical
to ensure GL_TEXTURE_EXTERNAL_OES is used throughout
so the right sampler is used.

Change-Id: I0dcd8941ba08331f24809467b0e828663a38e93b
2016-04-22 16:31:17 -07:00
sergeyv
92a5d4b99a Stop always set OffsetByFudgeFactor in renderVertexBuffer
bug:27857128
Change-Id: Id92e0a5790b14f76cfa8bb38e8b11ce649775da0
2016-04-21 15:20:27 -07:00
Adam Lesinski
da749ed997 Merge "Fix order of operation issue with ResStringPool" into nyc-dev
am: b53e8a7a8a

* commit 'b53e8a7a8aa495289ab2872032f80501edd472ef':
  Fix order of operation issue with ResStringPool

Change-Id: Idaca4dee242389680b82b9d58728d281a65f9116
2016-04-21 19:15:47 +00:00
Adam Lesinski
b53e8a7a8a Merge "Fix order of operation issue with ResStringPool" into nyc-dev 2016-04-21 19:08:39 +00:00
Chris Craik
4293527405 Merge "Fix shadow radius too large for RS" into nyc-dev
am: 924d8227c4

* commit '924d8227c4c790f05fb90d6140de15fa8abb704b':
  Fix shadow radius too large for RS

Change-Id: I14e606d89f456bedb240f564acc7867b629bf8ed
2016-04-21 17:16:16 +00:00
Adam Lesinski
666b6fbba1 Fix order of operation issue with ResStringPool
Due to ! taking precedence over bitwise &, the condition for
checking non-null terminated string blocks is incorrect.

Adds parentheses for the correct behavior.

Bug:28288210
Change-Id: Ie31fa239e5f869e6bb28deb6ae190f41f1aa4d92
2016-04-21 10:05:06 -07:00
Chris Craik
f3754a8428 Fix shadow radius too large for RS
bug:28276925

Change-Id: I3d962ace75be7bbf49f5a95320390d8f5a9bf951
2016-04-19 18:15:51 -07:00
John Reck
5cc4428bec Merge "Don\'t reuse LOST_SURFACE for stopped" into nyc-dev
am: 9110429

* commit '9110429f0d8acac0d621d805050103fa58953fb9':
  Don't reuse LOST_SURFACE for stopped

Change-Id: Ia7c609029215da17c61eb77bd3279c077d1b7713
2016-04-19 14:53:31 +00:00
John Reck
9110429f0d Merge "Don't reuse LOST_SURFACE for stopped" into nyc-dev 2016-04-19 14:45:16 +00:00
John Reck
a7fcaabbe2 Merge "Make getFrameNumber lazy" into nyc-dev
am: 8cddce3

* commit '8cddce3f8f503b2aa8b993fef6406645c3e80da6':
  Make getFrameNumber lazy

Change-Id: If81ee9732424750465ceae5d2136bb23288f6a5f
2016-04-18 23:27:49 +00:00
John Reck
8cddce3f8f Merge "Make getFrameNumber lazy" into nyc-dev 2016-04-18 23:20:39 +00:00
Adam Lesinski
af2758a962 Merge "Optimize ResTable::getLocales() to improve bindApplication performance" into nyc-dev
am: bfdc202

* commit 'bfdc2020b94d6368a7a8cf97bf545d28c757e0fd':
  Optimize ResTable::getLocales() to improve bindApplication performance

Change-Id: I5148dabc722ec2c31008ba05adb3ccdfa357857a
2016-04-18 22:35:27 +00:00
Adam Lesinski
bfdc2020b9 Merge "Optimize ResTable::getLocales() to improve bindApplication performance" into nyc-dev 2016-04-18 22:24:09 +00:00
Adam Lesinski
b7e1ce0775 Optimize ResTable::getLocales() to improve bindApplication performance
Change from linear searching for uniqueness to binary search.

Bug:27198799
Change-Id: I1ccb6e93cc213810848f07d631d9d8de7c719803
2016-04-18 15:06:50 -07:00
John Reck
28912a5084 Make getFrameNumber lazy
Change-Id: I783de544ad9a3636ea90f1c8c4034738997bfbc8
Fixes: 28246085
2016-04-18 14:34:18 -07:00
Chris Craik
2554b09fc9 Merge "Improve multi-window render clipping logic" into nyc-dev
am: c79c324

* commit 'c79c3246c9a3e0d2aa34afd18fddc95a6aff0f30':
  Improve multi-window render clipping logic

Change-Id: I4be0f6cefba71f7928fec559481fe389d9de800b
2016-04-18 19:52:03 +00:00
Chris Craik
c79c3246c9 Merge "Improve multi-window render clipping logic" into nyc-dev 2016-04-18 19:40:50 +00:00