Nicolas Boichat [Tue, 20 Dec 2016 22:35:30 +0000 (22:35 +0000)]
Merge "GetDevices: Also allow `\.` to be part of the host name am:
dbf9715509 am:
a44c013aaf am:
79041623c9 am:
639a3b82f5 am:
fddf33bdd1 am:
a6d2c746fa am:
4004893d31 am:
d6734426ee am:
ea87ae8483 am:
cc4458b117" into nyc-mr2-dev-plus-aosp
am:
bfdf5ec1fd
Change-Id: Ida8a1e34b9ce79b597db93d829e9fab721f7ba82
Nicolas Boichat [Tue, 20 Dec 2016 22:35:27 +0000 (22:35 +0000)]
GetDevices: Also allow `\.` to be part of the host name am:
dbf9715509 am:
a44c013aaf am:
79041623c9 am:
639a3b82f5 am:
fddf33bdd1 am:
a6d2c746fa am:
4004893d31 am:
d6734426ee am:
ea87ae8483 am:
cc4458b117
am:
fd6006a7da
Change-Id: Ic1b08171ddbf6262ecb76894e7c9bc54a911475e
Nicolas Boichat [Tue, 20 Dec 2016 22:35:05 +0000 (22:35 +0000)]
Merge "GetDevices: Also allow `\.` to be part of the host name am:
dbf9715509 am:
a44c013aaf am:
79041623c9 am:
639a3b82f5 am:
fddf33bdd1 am:
a6d2c746fa am:
4004893d31 am:
d6734426ee am:
ea87ae8483 am:
323ee30ce8" into nyc-mr2-dev-plus-aosp
am:
843b458f27
Change-Id: I3a97f8be70e765a6f4a5d0a82e0451013cacdfbe
Nicolas Boichat [Tue, 20 Dec 2016 22:35:03 +0000 (22:35 +0000)]
GetDevices: Also allow `\.` to be part of the host name am:
dbf9715509 am:
a44c013aaf am:
79041623c9 am:
639a3b82f5 am:
fddf33bdd1 am:
a6d2c746fa am:
4004893d31 am:
d6734426ee am:
ea87ae8483 am:
323ee30ce8
am:
daaf183bf3
Change-Id: Ic7f6f3b03c3bc32018b43737d7981cba887d3564
Nicolas Boichat [Tue, 20 Dec 2016 22:34:42 +0000 (22:34 +0000)]
Merge "resolve merge conflicts of cc5cabd to nyc-mr1-dev am:
7a338a6626 am:
b64869c70f am:
52bab3789f" into nyc-mr2-dev-plus-aosp
am:
a048f0632d
Change-Id: I8ec1b04a550e3f8329d29556aac89612ea03088e
Nicolas Boichat [Tue, 20 Dec 2016 22:34:40 +0000 (22:34 +0000)]
resolve merge conflicts of cc5cabd to nyc-mr1-dev am:
7a338a6626 am:
b64869c70f am:
52bab3789f
am:
108d39675d
Change-Id: Iee9f8deb6d1fee977e59d58a97d0b0f2b4e56129
Nicolas Boichat [Tue, 20 Dec 2016 22:34:24 +0000 (22:34 +0000)]
resolve merge conflicts of cc5cabd to nyc-mr1-dev am:
7a338a6626 am:
b64869c70f am:
1486f7ae07
am:
53e70a911c
Change-Id: Ie8639f12c0a664c24011c35d16259c0ca7ffe568
Android Build Merger (Role) [Tue, 20 Dec 2016 22:25:13 +0000 (22:25 +0000)]
Merge "GetDevices: Also allow `\.` to be part of the host name am:
dbf9715509 am:
a44c013aaf am:
79041623c9 am:
639a3b82f5 am:
fddf33bdd1 am:
a6d2c746fa am:
4004893d31 am:
d6734426ee am:
ea87ae8483 am:
cc4458b117" into nyc-mr2-dev-plus-aosp
Android Build Merger (Role) [Tue, 20 Dec 2016 22:25:13 +0000 (22:25 +0000)]
Merge "GetDevices: Also allow `\.` to be part of the host name am:
dbf9715509 am:
a44c013aaf am:
79041623c9 am:
639a3b82f5 am:
fddf33bdd1 am:
a6d2c746fa am:
4004893d31 am:
d6734426ee am:
ea87ae8483 am:
323ee30ce8" into nyc-mr2-dev-plus-aosp
Nicolas Boichat [Tue, 20 Dec 2016 22:25:07 +0000 (22:25 +0000)]
GetDevices: Also allow `\.` to be part of the host name am:
dbf9715509 am:
a44c013aaf am:
79041623c9 am:
639a3b82f5 am:
fddf33bdd1 am:
a6d2c746fa am:
4004893d31 am:
d6734426ee am:
ea87ae8483
am:
cc4458b117
Change-Id: I06df05dafcd443b274d6765def8afdad3ab6109e
Nicolas Boichat [Tue, 20 Dec 2016 22:25:06 +0000 (22:25 +0000)]
GetDevices: Also allow `\.` to be part of the host name am:
dbf9715509 am:
a44c013aaf am:
79041623c9 am:
639a3b82f5 am:
fddf33bdd1 am:
a6d2c746fa am:
4004893d31 am:
d6734426ee am:
ea87ae8483
am:
323ee30ce8
Change-Id: I5c8fd548ab5bc54b97047eefa983964902f8d074
Android Build Merger (Role) [Tue, 20 Dec 2016 22:25:02 +0000 (22:25 +0000)]
Merge "resolve merge conflicts of cc5cabd to nyc-mr1-dev am:
7a338a6626 am:
b64869c70f am:
52bab3789f" into nyc-mr2-dev-plus-aosp
Nicolas Boichat [Tue, 20 Dec 2016 22:24:55 +0000 (22:24 +0000)]
resolve merge conflicts of cc5cabd to nyc-mr1-dev am:
7a338a6626 am:
b64869c70f
am:
52bab3789f
Change-Id: Ie5115233fc6bef645f14f03e69039188dfd6d908
Nicolas Boichat [Tue, 20 Dec 2016 22:24:54 +0000 (22:24 +0000)]
resolve merge conflicts of cc5cabd to nyc-mr1-dev am:
7a338a6626 am:
b64869c70f
am:
1486f7ae07
Change-Id: I0a5d182b1c76e979346eb244c1b25bc3014e8208
Nicolas Boichat [Tue, 20 Dec 2016 22:20:35 +0000 (22:20 +0000)]
GetDevices: Also allow `\.` to be part of the host name am:
dbf9715509 am:
a44c013aaf am:
79041623c9 am:
639a3b82f5 am:
fddf33bdd1 am:
a6d2c746fa am:
4004893d31 am:
d6734426ee
am:
ea87ae8483
Change-Id: I2e77efb8ba46959a0457184ced3e19cb79984403
Nicolas Boichat [Tue, 20 Dec 2016 22:20:34 +0000 (22:20 +0000)]
GetDevices: Also allow `\.` to be part of the host name am:
dbf9715509 am:
133c610be6 am:
cc0eaf79f0 am:
b6d32610cf am:
b3c1c2cf9b
am:
7385ca9aba
Change-Id: Iede6043f615559ed62fdf5c7b0bf2a0b61bd3cb5
Nicolas Boichat [Tue, 20 Dec 2016 22:20:33 +0000 (22:20 +0000)]
GetDevices: Also allow `\.` to be part of the host name am:
dbf9715509 am:
a44c013aaf am:
79041623c9 am:
639a3b82f5 am:
fddf33bdd1 am:
a6d2c746fa am:
4004893d31 am:
d6734426ee
am:
ea87ae8483
Change-Id: I2275b7c4ea5516fcac695717559179ed1df7f6df
Nicolas Boichat [Tue, 20 Dec 2016 22:20:24 +0000 (22:20 +0000)]
resolve merge conflicts of cc5cabd to nyc-mr1-dev am:
7a338a6626
am:
b64869c70f
Change-Id: I1a875a589c43630fc3f1baf7fdff6902aacbca95
Nicolas Boichat [Tue, 20 Dec 2016 22:20:21 +0000 (22:20 +0000)]
resolve merge conflicts of cc5cabd to nyc-mr1-dev am:
7a338a6626
am:
b64869c70f
Change-Id: If0d874b08fb01e0c603f711675e6b2e1a52c3b87
Kalle Raita [Tue, 20 Dec 2016 22:20:20 +0000 (22:20 +0000)]
resolve merge conflicts of b6d3261 to nyc-mr1-dev-plus-aosp am:
ed852bf557
am:
900673646e
Change-Id: Ie357de73c562ce54ef3b8192c156822dc45f78c7
Nicolas Boichat [Tue, 20 Dec 2016 22:16:33 +0000 (22:16 +0000)]
GetDevices: Also allow `\.` to be part of the host name am:
dbf9715509 am:
a44c013aaf am:
79041623c9 am:
639a3b82f5 am:
fddf33bdd1 am:
a6d2c746fa am:
4004893d31
am:
d6734426ee
Change-Id: Ia252fe1d37932ca3059e2b831e0131e836ab21c3
Nicolas Boichat [Tue, 20 Dec 2016 22:16:21 +0000 (22:16 +0000)]
resolve merge conflicts of cc5cabd to nyc-mr1-dev
am:
7a338a6626
Change-Id: I195a7d513828433103a20331bbe5eb1ee167a4f3
Nicolas Boichat [Tue, 20 Dec 2016 22:16:02 +0000 (22:16 +0000)]
GetDevices: Also allow `\.` to be part of the host name am:
dbf9715509 am:
133c610be6 am:
cc0eaf79f0 am:
b6d32610cf
am:
b3c1c2cf9b
Change-Id: Ibd863d1d528cf0f2ac8158e5f55646f65c0d2ccd
Kalle Raita [Tue, 20 Dec 2016 22:15:49 +0000 (22:15 +0000)]
resolve merge conflicts of b6d3261 to nyc-mr1-dev-plus-aosp
am:
ed852bf557
Change-Id: If6f52d32b3875bba642d0215831a634404872a73
Nicolas Boichat [Tue, 20 Dec 2016 22:11:55 +0000 (22:11 +0000)]
GetDevices: Also allow `\.` to be part of the host name am:
dbf9715509 am:
133c610be6 am:
cc0eaf79f0
am:
b6d32610cf
Change-Id: I9bf7977a59b947d4e9ef7e2a8a66f4d5a96fcbbd
Nicolas Boichat [Tue, 20 Dec 2016 22:11:54 +0000 (22:11 +0000)]
GetDevices: Also allow `\.` to be part of the host name am:
dbf9715509 am:
a44c013aaf am:
79041623c9 am:
639a3b82f5 am:
fddf33bdd1 am:
a6d2c746fa
am:
4004893d31
Change-Id: Ie547c5910391a4e3f4fbb1700f20feab9a7f64e8
Kalle Raita [Tue, 20 Dec 2016 21:38:32 +0000 (13:38 -0800)]
resolve merge conflicts of b6d3261 to nyc-mr1-dev-plus-aosp
Test: Tried to run the install script locally
Change-Id: I2c34fa110c811741ad53bd42143bfd2a371b459a
Nicolas Boichat [Tue, 20 Dec 2016 19:56:55 +0000 (03:56 +0800)]
resolve merge conflicts of cc5cabd to nyc-mr1-dev
It appears
4ccc9fd56c9c0305c1cc325d2be8435cb68476e0
"Add the support to device connection via TCP/IP" was not automerged
to nyc-mr1-dev, for whatever reason, this merge also includes
that change.
Change-Id: Ifa9243f7ebc5d4ea7aa3030728a9cfe96789ab96
Nicolas Boichat [Tue, 20 Dec 2016 19:22:51 +0000 (19:22 +0000)]
GetDevices: Also allow `\.` to be part of the host name am:
dbf9715509 am:
a44c013aaf am:
79041623c9 am:
639a3b82f5 am:
fddf33bdd1
am:
a6d2c746fa
Change-Id: I1023988b48ed6b133c9cd9a35e5bd16ce6101882
Nicolas Boichat [Tue, 20 Dec 2016 19:17:12 +0000 (19:17 +0000)]
GetDevices: Also allow `\.` to be part of the host name am:
dbf9715509 am:
a44c013aaf am:
79041623c9 am:
639a3b82f5
am:
fddf33bdd1
Change-Id: I9b18b64c9e09af46abca64378f410c5819757001
Nicolas Boichat [Tue, 20 Dec 2016 19:12:40 +0000 (19:12 +0000)]
GetDevices: Also allow `\.` to be part of the host name am:
dbf9715509 am:
a44c013aaf am:
79041623c9
am:
639a3b82f5
Change-Id: Ia47d588dc3bf3ade9552ab45c9eb1e13389b7216
Nicolas Boichat [Tue, 20 Dec 2016 19:09:12 +0000 (19:09 +0000)]
GetDevices: Also allow `\.` to be part of the host name am:
dbf9715509 am:
133c610be6
am:
cc0eaf79f0
Change-Id: I4bb85c1dce1fc225077a5c46911d39dd395c3e40
Nicolas Boichat [Tue, 20 Dec 2016 19:09:09 +0000 (19:09 +0000)]
GetDevices: Also allow `\.` to be part of the host name am:
dbf9715509 am:
a44c013aaf
am:
79041623c9
Change-Id: I571901bbc48bffdad90e2a5f278d75a2fe1833ba
Nicolas Boichat [Tue, 20 Dec 2016 19:09:00 +0000 (19:09 +0000)]
GetDevices: Also allow `\.` to be part of the host name am:
dbf9715509 am:
133c610be6
am:
4c63135524
Change-Id: I9d337977ac0e01e8c8fd0b079a3f25c9e2cdcaaa
Nicolas Boichat [Tue, 20 Dec 2016 19:04:09 +0000 (19:04 +0000)]
GetDevices: Also allow `\.` to be part of the host name am:
dbf9715509
am:
a44c013aaf
Change-Id: Ic6181b284d350dedca354ddd60706903f639ba4a
Nicolas Boichat [Tue, 20 Dec 2016 18:59:57 +0000 (18:59 +0000)]
GetDevices: Also allow `\.` to be part of the host name
am:
dbf9715509
Change-Id: Id812eaa1a85dded4241ae6d760de072532228109
Nicolas Boichat [Tue, 20 Dec 2016 18:59:40 +0000 (18:59 +0000)]
GetDevices: Also allow `\.` to be part of the host name am:
dbf9715509
am:
133c610be6
Change-Id: I21054992a16e3e6847a8af086528f4172602d614
Nicolas Boichat [Tue, 20 Dec 2016 18:59:39 +0000 (18:59 +0000)]
GetDevices: Also allow `\.` to be part of the host name am:
dbf9715509
am:
133c610be6
Change-Id: I8938bf6b769de3d2da911243f203181f191ec89f
Nicolas Boichat [Tue, 20 Dec 2016 18:55:24 +0000 (18:55 +0000)]
GetDevices: Also allow `\.` to be part of the host name
am:
dbf9715509
Change-Id: I659ce579867c7ca0c9b47e3b53a734265e0fbb26
Tina Zhou [Fri, 16 Dec 2016 22:58:22 +0000 (22:58 +0000)]
Merge "merge in nyc-mr1-cts-release history after reset to nyc-mr1-dev am:
9412810768 am:
01c922fc26 am:
bd9e51a20d am:
6d8a37d043" into nyc-mr2-dev-plus-aosp
am:
f2a1b18656
Change-Id: Ib977f145a7a9687adfde54f6e183088f42434962
Tina Zhou [Fri, 16 Dec 2016 22:58:19 +0000 (22:58 +0000)]
merge in nyc-mr1-cts-release history after reset to nyc-mr1-dev am:
9412810768 am:
01c922fc26 am:
bd9e51a20d am:
6d8a37d043
am:
af8af530a4
Change-Id: I338006fb5baf08a9a36e308e7f0ddc87ea51aa55
Tina Zhou [Fri, 16 Dec 2016 22:57:56 +0000 (22:57 +0000)]
Merge "merge in nyc-mr1-cts-release history after reset to nyc-mr1-dev am:
9412810768 am:
01c922fc26 am:
bd9e51a20d am:
2ed6dadb09" into nyc-mr2-dev-plus-aosp
am:
7fd095c093
Change-Id: I72027ebfeb52da7b53c54e940f8483d9be39416e
Tina Zhou [Fri, 16 Dec 2016 22:57:54 +0000 (22:57 +0000)]
merge in nyc-mr1-cts-release history after reset to nyc-mr1-dev am:
9412810768 am:
01c922fc26 am:
bd9e51a20d am:
2ed6dadb09
am:
5ef6916f16
Change-Id: Ia2e9d2a2fc5f98372d2a1232bf5b4614eb235236
Pyry Haulos [Fri, 16 Dec 2016 22:57:30 +0000 (22:57 +0000)]
Merge "merge in nyc-mr1-release history after reset to nyc-mr1-dev am:
868a8938ca am:
aea1bbfaa2 am:
5c1cc6ba46 am:
f7c84f0b66" into nyc-mr2-dev-plus-aosp
am:
dbffc02c54
Change-Id: I58f29cc17fbd4af72d6253c03e01d26c6a4bdeb9
Pyry Haulos [Fri, 16 Dec 2016 22:57:28 +0000 (22:57 +0000)]
merge in nyc-mr1-release history after reset to nyc-mr1-dev am:
868a8938ca am:
aea1bbfaa2 am:
5c1cc6ba46 am:
f7c84f0b66
am:
acb7586309
Change-Id: Ic9022e196cff5379896f16afb306a79e65ebba1b
Pyry Haulos [Fri, 16 Dec 2016 22:57:10 +0000 (22:57 +0000)]
merge in nyc-mr1-release history after reset to nyc-mr1-dev am:
868a8938ca am:
aea1bbfaa2 am:
5c1cc6ba46 am:
faa38a20ac
am:
5d20376574
Change-Id: Iff62553b3037feb207fba5e356ec46d32d78fbb7
Android Build Merger (Role) [Fri, 16 Dec 2016 22:45:14 +0000 (22:45 +0000)]
Merge "merge in nyc-mr1-cts-release history after reset to nyc-mr1-dev am:
9412810768 am:
01c922fc26 am:
bd9e51a20d am:
6d8a37d043" into nyc-mr2-dev-plus-aosp
Tina Zhou [Fri, 16 Dec 2016 22:45:06 +0000 (22:45 +0000)]
merge in nyc-mr1-cts-release history after reset to nyc-mr1-dev am:
9412810768 am:
01c922fc26 am:
bd9e51a20d
am:
6d8a37d043
Change-Id: I732dea11ae0a0e48b107676ac1d2fec21d56af36
Android Build Merger (Role) [Fri, 16 Dec 2016 22:45:04 +0000 (22:45 +0000)]
Merge "merge in nyc-mr1-cts-release history after reset to nyc-mr1-dev am:
9412810768 am:
01c922fc26 am:
bd9e51a20d am:
2ed6dadb09" into nyc-mr2-dev-plus-aosp
Android Build Merger (Role) [Fri, 16 Dec 2016 22:45:00 +0000 (22:45 +0000)]
Merge "merge in nyc-mr1-release history after reset to nyc-mr1-dev am:
868a8938ca am:
aea1bbfaa2 am:
5c1cc6ba46 am:
f7c84f0b66" into nyc-mr2-dev-plus-aosp
Tina Zhou [Fri, 16 Dec 2016 22:44:56 +0000 (22:44 +0000)]
merge in nyc-mr1-cts-release history after reset to nyc-mr1-dev am:
9412810768 am:
01c922fc26 am:
bd9e51a20d
am:
2ed6dadb09
Change-Id: I1103a856fd087aecd2019b7a262a2195d959d80a
Pyry Haulos [Fri, 16 Dec 2016 22:44:54 +0000 (22:44 +0000)]
merge in nyc-mr1-release history after reset to nyc-mr1-dev am:
868a8938ca am:
aea1bbfaa2 am:
5c1cc6ba46
am:
f7c84f0b66
Change-Id: I544ccd22b9b46f2a922f5afb8bc51c5ed399a8da
Pyry Haulos [Fri, 16 Dec 2016 22:44:42 +0000 (22:44 +0000)]
merge in nyc-mr1-release history after reset to nyc-mr1-dev am:
868a8938ca am:
aea1bbfaa2 am:
5c1cc6ba46
am:
faa38a20ac
Change-Id: I9621cf33b43c0795c9b2c343ff3bdac81cd0cfbf
Tina Zhou [Fri, 16 Dec 2016 22:36:56 +0000 (22:36 +0000)]
merge in nyc-mr1-cts-release history after reset to nyc-mr1-dev am:
9412810768 am:
01c922fc26
am:
bd9e51a20d
Change-Id: Ibf40a64c8168f2e0e94e140efb335743f022a0a7
Tina Zhou [Fri, 16 Dec 2016 22:36:55 +0000 (22:36 +0000)]
merge in nyc-mr1-cts-release history after reset to nyc-mr1-dev am:
9412810768 am:
01c922fc26
am:
bd9e51a20d
Change-Id: I7bfddfdc33311a88817c88a25b9370abf4088371
Pyry Haulos [Fri, 16 Dec 2016 22:36:43 +0000 (22:36 +0000)]
merge in nyc-mr1-release history after reset to nyc-mr1-dev am:
868a8938ca am:
aea1bbfaa2
am:
5c1cc6ba46
Change-Id: Idb776bc95d3dc7bb5b88f12079f5c579a44547b1
Pyry Haulos [Fri, 16 Dec 2016 22:36:41 +0000 (22:36 +0000)]
merge in nyc-mr1-release history after reset to nyc-mr1-dev am:
868a8938ca am:
aea1bbfaa2
am:
5c1cc6ba46
Change-Id: Id23dbea96fcdde835b825a49af5fe10a87715350
Tina Zhou [Fri, 16 Dec 2016 22:28:18 +0000 (22:28 +0000)]
merge in nyc-mr1-cts-release history after reset to nyc-mr1-dev am:
9412810768
am:
01c922fc26
Change-Id: I8a81f63fe2b8462c4697435a2ed9436dfcfe3937
Pyry Haulos [Fri, 16 Dec 2016 22:28:05 +0000 (22:28 +0000)]
merge in nyc-mr1-release history after reset to nyc-mr1-dev am:
868a8938ca
am:
aea1bbfaa2
Change-Id: I82c416fb663418dd6bd062fa1b5375ec7c99fa5a
Tina Zhou [Fri, 16 Dec 2016 22:19:20 +0000 (22:19 +0000)]
merge in nyc-mr1-cts-release history after reset to nyc-mr1-dev
am:
9412810768
Change-Id: I822bfa3fba4335717f34be9cfb4ff4c621c7ed8c
Pyry Haulos [Fri, 16 Dec 2016 22:19:07 +0000 (22:19 +0000)]
merge in nyc-mr1-release history after reset to nyc-mr1-dev
am:
868a8938ca
Change-Id: I07a0249da8ae52fb82ad6120dec0897f63d5e567
Kalle Raita [Fri, 16 Dec 2016 03:47:54 +0000 (03:47 +0000)]
Merge "Non-compressed copy image target size (64,64,8)" am:
beba5d481a am:
9bbc395b49 am:
c842de9d14
am:
392263d752
Change-Id: If5ba6f76846f272d317c51d36592d4f52cd2e2db
Kalle Raita [Fri, 16 Dec 2016 01:41:07 +0000 (01:41 +0000)]
Merge "Non-compressed copy image target size (64,64,8)" am:
beba5d481a am:
9bbc395b49
am:
c842de9d14
Change-Id: Idf191a6797e7ae9aec9e8e2de2583c17e1a6bdae
Kalle Raita [Fri, 16 Dec 2016 01:19:07 +0000 (01:19 +0000)]
Merge "Non-compressed copy image target size (64,64,8)" am:
beba5d481a
am:
9bbc395b49
Change-Id: Ic9236cb82742f188a0c8a385ab1371d37e852f7f
Kalle Raita [Thu, 15 Dec 2016 23:37:37 +0000 (23:37 +0000)]
Merge "Non-compressed copy image target size (64,64,8)"
am:
beba5d481a
Change-Id: Ifa9d096019e7944b67f1bea9b7ab98214f932673
Kalle Raita [Thu, 15 Dec 2016 23:29:39 +0000 (23:29 +0000)]
Merge "Non-compressed copy image target size (64,64,8)"
Jamie Madill [Wed, 14 Dec 2016 13:21:26 +0000 (13:21 +0000)]
Merge "Allow ANGLE_depth_texture for FBO completeness." am:
a8249e3a00 am:
8542846868 am:
c7265ec450
am:
41bf5eddb0
Change-Id: I0da1dfdb87247e3a488f40d299e8f73f478d0d4e
Jamie Madill [Wed, 14 Dec 2016 13:14:26 +0000 (13:14 +0000)]
Merge "Allow ANGLE_depth_texture for FBO completeness." am:
a8249e3a00 am:
8542846868
am:
c7265ec450
Change-Id: I0b1b03a6f363a122a28497332bb99014ec3033eb
Jamie Madill [Wed, 14 Dec 2016 13:07:24 +0000 (13:07 +0000)]
Merge "Allow ANGLE_depth_texture for FBO completeness." am:
a8249e3a00
am:
8542846868
Change-Id: I77672e3e1d50f8c3fb5082022393865544e7acd5
Jamie Madill [Wed, 14 Dec 2016 13:00:26 +0000 (13:00 +0000)]
Merge "Allow ANGLE_depth_texture for FBO completeness."
am:
a8249e3a00
Change-Id: I54ce3f2e3fef94bdb53136afa6cf70c116418b73
John Richardson [Wed, 14 Dec 2016 12:53:56 +0000 (12:53 +0000)]
Merge "Extend primitive_bounding_box negative tests" am:
1975e3bd28 am:
4983f5a49f am:
a4941127f1
am:
a4ffba40b9
Change-Id: Ided0f0dde165be7677d74039f65ba77d443208c7
Treehugger Robot [Wed, 14 Dec 2016 12:50:45 +0000 (12:50 +0000)]
Merge "Allow ANGLE_depth_texture for FBO completeness."
John Richardson [Wed, 14 Dec 2016 12:46:25 +0000 (12:46 +0000)]
Merge "Extend primitive_bounding_box negative tests" am:
1975e3bd28 am:
4983f5a49f
am:
a4941127f1
Change-Id: Ide3ef1acb809aecfa6b4d2204b8194a6fb9faa97
John Richardson [Wed, 14 Dec 2016 12:39:26 +0000 (12:39 +0000)]
Add shader storage negative coverage tests am:
51e20f1e25 am:
299bbc9a59 am:
c960c8b34e
am:
d9e474e1dc
Change-Id: I93029e7a46b54a4d0ee2494cf1b7c9266fd47cb4
John Richardson [Wed, 14 Dec 2016 12:39:25 +0000 (12:39 +0000)]
Merge "Extend primitive_bounding_box negative tests" am:
1975e3bd28
am:
4983f5a49f
Change-Id: I880f77b4d13fe64389797cacc76ed7fcd95b17cd
John Richardson [Wed, 14 Dec 2016 12:32:25 +0000 (12:32 +0000)]
Merge "Extend primitive_bounding_box negative tests"
am:
1975e3bd28
Change-Id: Icdf2606c4583f234bf3e7a4a7eaa853e90c75885
John Richardson [Wed, 14 Dec 2016 12:32:25 +0000 (12:32 +0000)]
Add shader storage negative coverage tests am:
51e20f1e25 am:
299bbc9a59
am:
c960c8b34e
Change-Id: I7cc94a19feb7f191a55260f9e319a1cbe082f254
John Richardson [Wed, 14 Dec 2016 12:25:25 +0000 (12:25 +0000)]
Add shader storage negative coverage tests am:
51e20f1e25
am:
299bbc9a59
Change-Id: I7f229d582e19869cd25a10e1a77fe6950bd9ea33
Treehugger Robot [Wed, 14 Dec 2016 12:23:50 +0000 (12:23 +0000)]
Merge "Extend primitive_bounding_box negative tests"
John Richardson [Wed, 14 Dec 2016 12:18:24 +0000 (12:18 +0000)]
Add shader storage negative coverage tests
am:
51e20f1e25
Change-Id: I27ab45d397c7fe775a19b724dd3b7e271583210f
Jamie Madill [Thu, 8 Dec 2016 19:51:07 +0000 (14:51 -0500)]
Allow ANGLE_depth_texture for FBO completeness.
This extension enables the same depth attachment formats as
GL_OES_depth_texture. The few restrictions on usage aren't
relevant for the completeness tests.
Bug:
33453991
John Richardson [Tue, 1 Nov 2016 13:06:53 +0000 (13:06 +0000)]
Extend primitive_bounding_box negative tests
Tests groups added to
- dEQP-GLES31.functional.debug.negative_coverage.*.
Extended tests:
- shader_directive.primitive_bounding_box
Change-Id: I38b698e3bd594f71b15d3bce4dc9a809298eb95e
John Richardson [Wed, 26 Oct 2016 08:43:56 +0000 (09:43 +0100)]
Add shader storage negative coverage tests
Tests groups added to:
- dEQP-GLES31.functional.debug.negative_coverage.*.
New tests:
- shader_storage.block_number_limits
- shader_storage.max_combined_block_number_limit
Extended tests:
- state.get_integeri_v
- state.get_integer64i_v
- shader.compile_compute_shader
Fixed tests:
- buffer.bind_buffer_base
- buffer.bind_buffer_range
Change-Id: Id71fb997e14ad026f0d6634298993f1638c67dde
Jamie Madill [Wed, 7 Dec 2016 20:28:50 +0000 (20:28 +0000)]
Encode es3pBufferDataUploadTests.cpp as utf-8 am:
455d82c60b am:
ee11c5503a am:
48a17ce6e5
am:
d026022f0b
Change-Id: I814ce8f6a6c104bc56143683adf576a2cac7647a
Jamie Madill [Wed, 7 Dec 2016 20:24:19 +0000 (20:24 +0000)]
Encode es3pBufferDataUploadTests.cpp as utf-8 am:
455d82c60b am:
ee11c5503a
am:
48a17ce6e5
Change-Id: Ib014124c232e81a9217b243d99d517da6ab65755
Jamie Madill [Wed, 7 Dec 2016 20:19:48 +0000 (20:19 +0000)]
Encode es3pBufferDataUploadTests.cpp as utf-8 am:
455d82c60b
am:
ee11c5503a
Change-Id: I1cbd873f141a00f52c1e4cd90b863a502fc238db
Jamie Madill [Wed, 7 Dec 2016 20:15:20 +0000 (20:15 +0000)]
Encode es3pBufferDataUploadTests.cpp as utf-8
am:
455d82c60b
Change-Id: I6b11c3c9a75b7da2da78a5022d9e7e6d7268498a
Kalle Raita [Wed, 7 Dec 2016 17:41:41 +0000 (09:41 -0800)]
Non-compressed copy image target size (64,64,8)
Non-compressed copy image tests target size reduced to (64,64,8). The
compressed cases retain old size of (128,128,16) to ensure coverage of
all block size combinations.
Test: Run tests on N6 and N9 on L MR 1 with known failures.
Change-Id: I7ddc7c55d73731d0a8cc2fcc04f2391f78d2d7de
Jamie Madill [Wed, 7 Dec 2016 17:34:25 +0000 (12:34 -0500)]
Encode es3pBufferDataUploadTests.cpp as utf-8
This test was using "Mac Ndash". Change this to plain "-".
BUG=chromium:671021
Julien Desprez [Wed, 7 Dec 2016 10:41:47 +0000 (10:41 +0000)]
Merge "DeqpRunner implements IStrictShardableTest"
Pyry Haulos [Sat, 3 Dec 2016 04:24:22 +0000 (04:24 +0000)]
Merge gerrit/vulkan-cts-1.0-dev into aosp/master am:
6c4fe5bd7a am:
ebebe7d3b9 am:
99ddee4d78
am:
95e52cd9ec
Change-Id: I5ba36880a49c269b07477b884825154fd7245bed
Pyry Haulos [Sat, 3 Dec 2016 04:20:53 +0000 (04:20 +0000)]
Merge gerrit/vulkan-cts-1.0-dev into aosp/master am:
6c4fe5bd7a am:
ebebe7d3b9
am:
99ddee4d78
Change-Id: I8a49d35cc9cb413a5e0f5dc3b9e9a6d0e2f1edbb
Pyry Haulos [Sat, 3 Dec 2016 04:17:48 +0000 (04:17 +0000)]
Merge gerrit/vulkan-cts-1.0-dev into aosp/master am:
6c4fe5bd7a
am:
ebebe7d3b9
Change-Id: Ie5adae071148ed2d2a00a0d2840110dffddb6d30
Pyry Haulos [Sat, 3 Dec 2016 04:12:46 +0000 (04:12 +0000)]
Merge gerrit/vulkan-cts-1.0-dev into aosp/master
am:
6c4fe5bd7a
Change-Id: I4048f85f24ef24c8825cb5bbfb62033742a04657
Pyry Haulos [Fri, 2 Dec 2016 21:38:22 +0000 (13:38 -0800)]
Merge gerrit/vulkan-cts-1.0-dev into aosp/master
Change-Id: Ic9e43c0554d8976766507fab6916be6a037505a7
Pyry Haulos [Fri, 2 Dec 2016 21:36:36 +0000 (13:36 -0800)]
Add new files to Android.mk
Change-Id: I75be28ac1a62e9ee3f797e8eb4adaffc75486826
Maciej Jesionowski [Mon, 28 Nov 2016 15:12:23 +0000 (16:12 +0100)]
Bugfix: Use PointSize in draw tests
Tests that rasterize points have to write to PointSize variable.
Also fix nonCoherentAtomSize errors from validation.
Affected tests:
- dEQP-VK.draw.basic_draw.draw.point_list.*
- dEQP-VK.draw.basic_draw.draw_indexed.point_list.*
- dEQP-VK.draw.basic_draw.draw_indirect.point_list.*
- dEQP-VK.draw.basic_draw.draw_indexed_indirect.point_list.*
- dEQP-VK.draw.instanced.draw_vk_primitive_topology_point_list
- dEQP-VK.draw.instanced.draw_indexed_vk_primitive_topology_point_list
- dEQP-VK.draw.instanced.draw_indirect_vk_primitive_topology_point_list
- dEQP-VK.draw.instanced.draw_indexed_indirect_vk_primitive_topology_point_list
Fixes #536
Change-Id: Ief9df51887babfc3765b0d11c6431765f322c634
Lei Zhang [Wed, 30 Nov 2016 23:10:36 +0000 (18:10 -0500)]
Fix variable declaring location in SPIR-V assembly.
The spec validation rules require that all OpVariable instructions
in a function must be as the first instructions in the first block.
Change-Id: If054bd7882eaf5ffc00899fbdef9a9b71d544019
Maciej Jesionowski [Wed, 30 Nov 2016 11:37:01 +0000 (12:37 +0100)]
Bugfix: upload stencil data in pipeline image util
Fixes:
- Upload stencil data to the image with mixed DS formats
- Respect 4 byte offset alignment for formats <4 bytes
- Fix some nonCoherentAtomSize validation errors
Affected tests:
- dEQP-VK.texture.shadow.*d16_unorm
- dEQP-VK.texture.shadow.*x8_d24_unorm_pack32
- dEQP-VK.texture.shadow.*d32_sfloat
- dEQP-VK.texture.shadow.*s8_uint
- dEQP-VK.texture.shadow.*d16_unorm_s8_uint
- dEQP-VK.texture.shadow.*d24_unorm_s8_uint
- dEQP-VK.texture.shadow.*d32_sfloat_s8_uint
Issue #556
Change-Id: I56c0e7eef9c1bfc82790eb8ba6e48b95dc65f521
Arkadiusz Sarwa [Tue, 22 Nov 2016 13:05:03 +0000 (14:05 +0100)]
Add new tests Render To Image
New tests:
- dEQP-VK.pipeline.render_to_image.*
Issue #535
Change-Id: I3854942c69d95b034cd9358cc7970f04b1c85d5b
projects / platform / upstream / VK-GL-CTS.git / log