Anuj Phogat [Tue, 22 Aug 2017 19:15:36 +0000 (19:15 +0000)]
Merge "ES{2,3}: Clamp the x, y location of the viewport's bottom-left corner" am:
132a3ba810 am:
097b678fca am:
7634e2ea68 am:
5f7cf3f541
am:
daad88847a
Change-Id: I5b5c9a9420c1a09c9dd267c79acb0e8170cdce3f
Xin Li [Tue, 22 Aug 2017 19:15:01 +0000 (19:15 +0000)]
Merge changes from topic 'am-
3e509cc2c5f147e5b2d84c53284e013e' into nyc-mr2-dev-plus-aosp am:
52ad7b0022
am:
9332507f29
Change-Id: Ia915b29cd4da81f46a25737f64e3f54f63e2a16e
Xin Li [Tue, 22 Aug 2017 19:14:55 +0000 (19:14 +0000)]
Skip commit '
302bd7c6b3d468e33b19b693a25d67f2b54b961c' on nougat-mr1-cts-dev. am:
c5bbebc46a -s ours am:
c40b13062c am:
c58c0d9cc6 am:
be02537646 am:
47d6cb634f
am:
6520707bb8
Change-Id: I75631389e4457f521d0d5570805035deb6986d4d
Xin Li [Tue, 22 Aug 2017 19:14:48 +0000 (19:14 +0000)]
Merge commit '
09e8b66d03077e9a9b310145112cfd0e747e06f3' from nougat-cts-dev to nougat-cts-mr1-dev. am:
2a9d42a651 am:
c3801f447c am:
43afd5fa99 am:
d7680c7cc0 am:
323062fb5e
am:
a4bf1f8d02
Change-Id: Ie41bb91478ca5642814fdc571276f967ef69cce5
Xin Li [Tue, 22 Aug 2017 19:14:28 +0000 (19:14 +0000)]
Skip commit '
302bd7c6b3d468e33b19b693a25d67f2b54b961c' on nougat-mr1-cts-dev. am:
c5bbebc46a -s ours am:
c40b13062c am:
c58c0d9cc6 am:
c6868a4a91 am:
b08d9c90ca
am:
7fa904153a
Change-Id: I898153fe307837cca84e3b885e7580644e6d64fb
Xin Li [Tue, 22 Aug 2017 19:14:19 +0000 (19:14 +0000)]
Merge commit '
09e8b66d03077e9a9b310145112cfd0e747e06f3' from nougat-cts-dev to nougat-cts-mr1-dev. am:
2a9d42a651 am:
c3801f447c am:
43afd5fa99 am:
53454dcae6 am:
f8ffd1d896
am:
5fdb13fc11
Change-Id: I600549327c2134e8e21728f7406b217566b925c5
Tapani Plli [Tue, 22 Aug 2017 19:14:05 +0000 (19:14 +0000)]
tcuX11: fix to wait for matching ConfigureNotify am:
0cfa22d49d am:
0cf2b91e28 am:
f62cbc3258 am:
195b079afd
am:
caa4311374
Change-Id: I2e181dfae636e9aee9d2dfd3e9c0bdd643883581
Pyry Haulos [Tue, 22 Aug 2017 19:13:53 +0000 (19:13 +0000)]
Merge aosp/upstream-vulkan-cts-1.0-dev into aosp/master am:
47d74e847e am:
c7c28e6fa6 am:
9f0de1066b am:
76d1c8c075
am:
99742a81cf
Change-Id: I3640deb1afed3b79fb47f5bcf05afb9c975d48b1
Kalle Raita [Tue, 22 Aug 2017 19:13:40 +0000 (19:13 +0000)]
Merge "Remove two read-backs from copy image tests" am:
7c1eed0087 am:
000f76f35b am:
000857e231 am:
2a1cf8c522
am:
2287e5fd2b
Change-Id: I4e09f622e2c8836509086908174a5d7bb5dbe90d
Pyry Haulos [Tue, 22 Aug 2017 19:13:17 +0000 (19:13 +0000)]
Merge aosp/upstream-vulkan-cts-1.0-dev into aosp/master am:
dd932ed858 am:
a0b7513d8a am:
411501013d am:
d98580d2a3
am:
c2641a0223
Change-Id: I17ccdac38833ca484f047ed774d74bf1f6be9475
Pyry Haulos [Tue, 22 Aug 2017 19:12:49 +0000 (19:12 +0000)]
DO NOT MERGE: Remove changed texel buffer access tests from mustpass am:
302bd7c6b3 -s ours am:
fb82c2f3ed am:
0ae27e7ebe am:
4f3a58d096 am:
05dbe9e32b -s ours am:
ef6ea5e119 am:
671d60dd51 -s ours
am:
d1fad12029 -s ours
Change-Id: I3b9290731f606eed2a7e2dc3ea35dbb6d23eaf55
Pyry Haulos [Tue, 22 Aug 2017 19:12:28 +0000 (19:12 +0000)]
DO NOT MERGE: Remove a few changed Vulkan tests from mustpass am:
09e8b66d03 -s ours am:
5cdea1cc60 am:
7bc5d2910f am:
d45c6244d5 am:
d4f55ad2fc -s ours am:
263983df1a am:
190b46cea3 -s ours
am:
db1927b791 -s ours
Change-Id: I79c69680a03653e3b537fa9dd463f134d48e29bc
Pyry Haulos [Tue, 22 Aug 2017 19:12:02 +0000 (19:12 +0000)]
DO NOT MERGE: Remove changed texel buffer access tests from mustpass am:
302bd7c6b3 -s ours am:
fb82c2f3ed am:
0ae27e7ebe am:
4f3a58d096 am:
05dbe9e32b am:
e4a68e1243 -s ours am:
6264c6a63e -s ours
am:
7d304c128d -s ours
Change-Id: I662f0c7fd7c3e0619a8842d9410377f5f45ed1de
Pyry Haulos [Tue, 22 Aug 2017 19:11:49 +0000 (19:11 +0000)]
DO NOT MERGE: Remove a few changed Vulkan tests from mustpass am:
09e8b66d03 -s ours am:
5cdea1cc60 am:
7bc5d2910f am:
d45c6244d5 am:
d4f55ad2fc am:
3c52169d8d -s ours am:
e35c23aec7 -s ours
am:
6059948883 -s ours
Change-Id: I18c66ebf30962ab9fcbbcdf57b4662360774288c
Pyry Haulos [Tue, 22 Aug 2017 19:11:33 +0000 (19:11 +0000)]
Merge "Merge aosp/upstream-vulkan-cts-1.0-dev into aosp/master" am:
736c624044 am:
932d0bdeb9 am:
a01755fe6a am:
61c907f0c7
am:
050f17a002
Change-Id: Iff0aead3ae819fb095efd43565300787e097c6a5
Pyry Haulos [Tue, 22 Aug 2017 19:11:12 +0000 (19:11 +0000)]
Merge aosp/upstream-vulkan-cts-1.0-dev into aosp/master am:
2d64b0f13c am:
8777374f40 am:
bc83b2482a am:
24a8ccd37c
am:
0112aff473
Change-Id: I7ecafd1786ac3df008b2a1785eb667ad9fa0240b
Pyry Haulos [Tue, 22 Aug 2017 19:10:53 +0000 (19:10 +0000)]
DO NOT MERGE: Remove changed texel buffer access tests from mustpass am:
302bd7c6b3 -s ours am:
6e07797321 -s ours am:
59cbc8ca5c -s ours am:
da64283477 am:
8bfaa4ed9f -s ours
am:
64dfce5044 -s ours
Change-Id: I6c89d67639a72e6b98babb2a3f6b5b2e37d4a5ab
Pyry Haulos [Tue, 22 Aug 2017 19:10:45 +0000 (19:10 +0000)]
DO NOT MERGE: Remove a few changed Vulkan tests from mustpass am:
09e8b66d03 -s ours am:
bea56ac1e8 -s ours am:
f3191b63b7 -s ours am:
eb8fced4b9 am:
5ee70d0770 -s ours
am:
29fc22c45b -s ours
Change-Id: I5d01917a7522e4e2ba7190fd804904aac9acb5ef
Mark Adams [Tue, 22 Aug 2017 19:10:31 +0000 (19:10 +0000)]
Add support for EGL_EXT_pixel_format_float am:
08d24954e0 am:
571b73ee95 am:
c0294985c1 am:
813fe4d237
am:
07f214e26e
Change-Id: Ifd32901a5989eea06645462673b5cb27f39bcb90
Kalle Raita [Tue, 22 Aug 2017 19:10:17 +0000 (19:10 +0000)]
install.py continues if adb uninstall fails am:
a8253801a6 am:
282854f393 am:
eec4581321 am:
1f3ae31525
am:
317afd3d0d
Change-Id: Ibb7f57fad578a0c78422a9b76388d00102df50c6
Xin Li [Tue, 22 Aug 2017 19:10:05 +0000 (19:10 +0000)]
Merge "Cherry-pick the following missing commits from nyc-mr1-dev prior to b/
33090058, which was lost as a result of merge
01c922fc267ea41cc1c6cb83cde7ba6da200dc38: am:
77f62518ec am:
3d11686e0e am:
3d0f2fb381" into nyc-mr2-dev-plus-aosp am:
231078fb46
am:
2533d1e095
Change-Id: Ifcda7f4220122ac10efb926e472f61f6724c018b
Xin Li [Tue, 22 Aug 2017 19:09:48 +0000 (19:09 +0000)]
Cherry-pick the following missing commits from nyc-mr1-dev prior to b/
33090058, which was lost as a result of merge
01c922fc267ea41cc1c6cb83cde7ba6da200dc38: am:
77f62518ec am:
3d11686e0e am:
3d0f2fb381 am:
ed086fd003
am:
dbf8a43c5d
Change-Id: I13a79cf86bb5691d28333c7f507d29d1a68579fc
Xin Li [Tue, 22 Aug 2017 19:09:27 +0000 (19:09 +0000)]
Cherry-pick the following missing commits from nyc-mr1-dev prior to b/
33090058, which was lost as a result of merge
01c922fc267ea41cc1c6cb83cde7ba6da200dc38: am:
77f62518ec am:
3d11686e0e am:
72d633abbd am:
2c3475cb3a
am:
b8356b461c
Change-Id: I189332f4d10687f78dd34f04cf3305002a3e541d
Kalle Raita [Tue, 22 Aug 2017 19:09:05 +0000 (19:09 +0000)]
Merge "Add options for reading in filters from files"
am:
749fc8934e
Change-Id: I3c38d2207e9c664b613287b4518381842455c32e
Tina Zhou [Tue, 22 Aug 2017 19:08:44 +0000 (19:08 +0000)]
Merge "Blacklist match_different_[member_]struct_names SSO validation tests." into nougat-cts-dev am:
4acf725866 am:
22bf0dfa43 am:
2d0cce04d9 am:
8d55e05ba8 am:
6f7af0f1fd am:
399626de90 am:
57b0f45347
am:
0e22621731
Change-Id: I9fb826e11b54976883f4d1cdf79052f8a230a528
Kenneth Graunke [Tue, 22 Aug 2017 19:08:05 +0000 (19:08 +0000)]
Blacklist match_different_[member_]struct_names SSO validation tests. am:
b81edb4477 am:
c823e5456f am:
42c0ad1d1b am:
8c2c2894e4 am:
f611e70b3d am:
15fe9ce8a2 am:
33b578aa61
am:
2eed8d84dc
Change-Id: I8da3c1bbe4b2a26af0075f0dd7a948e041bd4b73
Tina Zhou [Tue, 22 Aug 2017 19:07:49 +0000 (19:07 +0000)]
Merge "Merge "Blacklist match_different_[member_]struct_names SSO validation tests." into nougat-cts-dev am:
4acf725866 am:
22bf0dfa43 am:
2d0cce04d9 am:
8d55e05ba8 am:
6f7af0f1fd am:
d4d6d9753b" into nyc-mr2-dev-plus-aosp am:
4fbdeebb2f
am:
9e17f4de95
Change-Id: I3647755f8d0aa08df6e54f23b116613b87f180de
Tina Zhou [Tue, 22 Aug 2017 19:07:33 +0000 (19:07 +0000)]
Merge "Blacklist match_different_[member_]struct_names SSO validation tests." into nougat-cts-dev am:
4acf725866 am:
22bf0dfa43 am:
2d0cce04d9 am:
8d55e05ba8 am:
6f7af0f1fd am:
d4d6d9753b am:
e563dd6699
am:
eafa282f5b
Change-Id: I46ba29b24c872c163a2bf5a7338f90705377aa71
Kenneth Graunke [Tue, 22 Aug 2017 19:07:19 +0000 (19:07 +0000)]
Merge "Blacklist match_different_[member_]struct_names SSO validation tests. am:
b81edb4477 am:
c823e5456f am:
42c0ad1d1b am:
8c2c2894e4 am:
f611e70b3d am:
beccdd90c3" into nyc-mr2-dev-plus-aosp am:
732ec7c09e
am:
fc5b53be97
Change-Id: I5ba0a2309f5dc0c4c45155e59dab1aa87f909396
Kenneth Graunke [Tue, 22 Aug 2017 19:07:05 +0000 (19:07 +0000)]
Blacklist match_different_[member_]struct_names SSO validation tests. am:
b81edb4477 am:
c823e5456f am:
42c0ad1d1b am:
8c2c2894e4 am:
f611e70b3d am:
beccdd90c3 am:
827c0a734b
am:
a73b2140c4
Change-Id: Iadfe7e29cb3783ea77b321517d536658c9f7e177
Tina Zhou [Tue, 22 Aug 2017 19:06:36 +0000 (19:06 +0000)]
Merge "Blacklist match_different_[member_]struct_names SSO validation tests." into nougat-cts-dev am:
4acf725866 am:
736369667b am:
53c8574bda am:
29003e52d0 am:
c1757958a7
am:
86bf2dd78b
Change-Id: I882d54216015327f3089c5afea7c8613ad841f30
David Sodman [Tue, 22 Aug 2017 19:06:21 +0000 (19:06 +0000)]
resolve merge conflicts of
b81edb4 to master am:
ce5292f584 am:
49ddc6319b am:
f07ca045e6 am:
8122cc866a
am:
52f20bd5fe
Change-Id: I7bb0e908ba72467a0c8d80ff5cc4218b156e513c
Tina Zhou [Tue, 22 Aug 2017 19:06:04 +0000 (19:06 +0000)]
Merge "Change GL_MAX_TESS_CONTROL_TOTAL_OUTPUT_COMPONENTS minmax to 2048" into nougat-cts-dev am:
ce7ccaab4a am:
a164d23f5c am:
490048f2a6 am:
c056a421a1 am:
3d24f19c31
am:
b1e8479dd7
Change-Id: Iaa1eae22d3686e55d812d1efdb0f8392dff55db6
Pyry Haulos [Tue, 22 Aug 2017 19:05:43 +0000 (19:05 +0000)]
Change GL_MAX_TESS_CONTROL_TOTAL_OUTPUT_COMPONENTS minmax to 2048 am:
a42836566d am:
c1e020bec5 am:
5ca19fdb34 am:
d5fa5e4357 am:
2f030d9731
am:
002f6f7424
Change-Id: I900296b1e54b2a91fb161ab2aa71ad3b1a52091d
Tina Zhou [Tue, 22 Aug 2017 19:05:04 +0000 (19:05 +0000)]
Merge changes I7c2ffd66,Ib53b245d,I4862cca3 into nougat-cts-dev am:
4812d6d47f am:
f2ab59be70 am:
a911a04556 am:
aa9cd15468 am:
2597c25fd9
am:
8c889579e3
Change-Id: I0821549683c6ee00467742304abb0e2be3f5f5da
Pyry Haulos [Tue, 22 Aug 2017 19:04:55 +0000 (19:04 +0000)]
Update glslang to
d02dc5d am:
b0ce1f083e -s ours am:
ce56d4629c am:
ad154a3284 am:
62f7b49be7 am:
80758ecfbf
am:
7415fb41cd
Change-Id: I7f5f5632e295ca3020ac2f192a95f7de15e672d3
Pyry Haulos [Tue, 22 Aug 2017 19:04:49 +0000 (19:04 +0000)]
Cherry-pick SPIR-V ClipDistance validation fixes am:
ef29b7735d -s ours am:
6503fc0e0d am:
835ca88406 am:
de68c1bac2 am:
fb964cbc1f
am:
2c17118c33
Change-Id: I6dbb40e34c6135827da2946663f242db086ea3c9
Pyry Haulos [Tue, 22 Aug 2017 19:04:40 +0000 (19:04 +0000)]
Cherry-pick dEQP-VK.pipeline.cache fixes to nougat-cts-dev am:
e71e3bbacd am:
7994095bf2 am:
35fd8bafe2 am:
2a9e6a68e3 am:
3e7afc94e1
am:
b37a759352
Change-Id: I0275d08f71ea3be068c077622a9790d8abba8fe4
Tina Zhou [Tue, 22 Aug 2017 19:04:26 +0000 (19:04 +0000)]
Merge "Change GL_MAX_TESS_CONTROL_TOTAL_OUTPUT_COMPONENTS minmax to 2048" into nougat-cts-dev am:
ce7ccaab4a am:
073e32f72f am:
3e3b90e9d6 am:
9959179887 am:
8ab0548300 am:
29fa182895 am:
bad040d8c9
am:
0205344487
Change-Id: Iae2dfb6921123c1872d2779c8cb060ea6b014060
Pyry Haulos [Tue, 22 Aug 2017 19:03:58 +0000 (19:03 +0000)]
Change GL_MAX_TESS_CONTROL_TOTAL_OUTPUT_COMPONENTS minmax to 2048 am:
a42836566d am:
020b95377e am:
2da2988f32 am:
96f1cc8ba9 am:
d7e6b5159d am:
438f8c11ab am:
9a18a2125d
am:
6eaf545f5f
Change-Id: I3a389612220ac4a1b08116536bb064f6d0e27a4a
Tina Zhou [Tue, 22 Aug 2017 19:03:17 +0000 (19:03 +0000)]
Merge changes I7c2ffd66,Ib53b245d,I4862cca3 into nougat-cts-dev am:
4812d6d47f am:
b44fae0a8a am:
4045968a8e am:
d1e1ca812f am:
6a64e395a5 am:
ffc44cfca7 am:
4fedaa18d0
am:
6ac7ba534d
Change-Id: Ie9e34cec5822fd091e779e20792f21e2731db50c
Pyry Haulos [Tue, 22 Aug 2017 19:03:04 +0000 (19:03 +0000)]
Update glslang to
d02dc5d am:
b0ce1f083e am:
62137a913c am:
a03e8e8556 am:
092f056a9b am:
e4e623db59 am:
3ae98f7a99 am:
6ff9efe58c
am:
e43f97f3e1
Change-Id: I1affde60036132fa13603ac628918eeaa860be92
Pyry Haulos [Tue, 22 Aug 2017 19:02:53 +0000 (19:02 +0000)]
Cherry-pick SPIR-V ClipDistance validation fixes am:
ef29b7735d am:
9b853f5259 am:
ae704400e8 am:
91b53912e4 am:
a5b5961f77 am:
b18013c548 -s ours am:
2509c96ece
am:
5f4f5935f2
Change-Id: I748c6ff1c869aff5556d3ea6da30108fd2ad5fb7
Pyry Haulos [Tue, 22 Aug 2017 19:02:43 +0000 (19:02 +0000)]
Cherry-pick dEQP-VK.pipeline.cache fixes to nougat-cts-dev am:
e71e3bbacd am:
5332103bc2 am:
f066c9a577 am:
df90278080 am:
3ff1767250 am:
1f280cdeb3 am:
6f5c2dace4
am:
003c1f7890
Change-Id: Ia220cec24897a2b419ff80aa870dc00181339626
Tina Zhou [Tue, 22 Aug 2017 19:02:31 +0000 (19:02 +0000)]
Merge "Change GL_MAX_TESS_CONTROL_TOTAL_OUTPUT_COMPONENTS minmax to 2048" into nougat-cts-dev am:
ce7ccaab4a am:
073e32f72f am:
3e3b90e9d6 am:
9959179887 am:
8ab0548300 am:
bd83a918f8 am:
174a602315
am:
57b26aef8a
Change-Id: I9746c6f7cc6e89f758e5cb448a8dbc6325870500
Pyry Haulos [Tue, 22 Aug 2017 19:02:18 +0000 (19:02 +0000)]
Change GL_MAX_TESS_CONTROL_TOTAL_OUTPUT_COMPONENTS minmax to 2048 am:
a42836566d am:
020b95377e am:
2da2988f32 am:
96f1cc8ba9 am:
d7e6b5159d am:
e7edfc1088 am:
50c1f09126
am:
0a31a8db02
Change-Id: I93d27affb24715187f5a8c64fca9350cc068b18b
Tina Zhou [Tue, 22 Aug 2017 19:01:50 +0000 (19:01 +0000)]
Merge changes I7c2ffd66,Ib53b245d,I4862cca3 into nougat-cts-dev am:
4812d6d47f am:
b44fae0a8a am:
4045968a8e am:
d1e1ca812f am:
6a64e395a5 am:
c54f821620 am:
39f956ac28
am:
ffe9309ee0
Change-Id: I1d3a1e1c7c77909280b51630e44dc31c12a89146
Pyry Haulos [Tue, 22 Aug 2017 19:01:39 +0000 (19:01 +0000)]
Update glslang to
d02dc5d am:
b0ce1f083e am:
62137a913c am:
a03e8e8556 am:
092f056a9b am:
e4e623db59 -s ours am:
7ef5a2e2c8 am:
48e4480038
am:
6eb7357e9b
Change-Id: I29405a3e4a5e984d764d4e07292e6b6543edd97e
Pyry Haulos [Tue, 22 Aug 2017 19:01:30 +0000 (19:01 +0000)]
Cherry-pick SPIR-V ClipDistance validation fixes am:
ef29b7735d am:
9b853f5259 am:
ae704400e8 am:
91b53912e4 am:
a5b5961f77 -s ours am:
519b83426e am:
b44b1338b4
am:
a36f3a2946
Change-Id: I3c99d0bdd0482a9dff51aae2454629048d4443f8
Pyry Haulos [Tue, 22 Aug 2017 19:01:19 +0000 (19:01 +0000)]
Cherry-pick dEQP-VK.pipeline.cache fixes to nougat-cts-dev am:
e71e3bbacd am:
5332103bc2 am:
f066c9a577 am:
df90278080 am:
3ff1767250 am:
ee947f1770 am:
7ba3b0654b
am:
2ddd033ddc
Change-Id: I62ecafedfeb3b6c80843842ea52f6049ceff5264
Nicolas Boichat [Tue, 22 Aug 2017 19:01:05 +0000 (19:01 +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
am:
92be39e267
Change-Id: Idc1f54a73d914ea95f7cd2e834bd8df21d264ec9
Nicolas Boichat [Tue, 22 Aug 2017 19:00:43 +0000 (19:00 +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
am:
ce87edda71
Change-Id: Ia125c233464e47e30041c89896645493c92ca6f2
Nicolas Boichat [Tue, 22 Aug 2017 19:00:23 +0000 (19:00 +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
am:
96ab99f3a5
Change-Id: I0c8665ba56f18091105fc47f222c5edc80d226fd
Nicolas Boichat [Tue, 22 Aug 2017 19:00:09 +0000 (19:00 +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
am:
07f9a4fa8e
Change-Id: I3a8a29f9ceffb95eea62739325e297e8387666c3
Nicolas Boichat [Tue, 22 Aug 2017 18:59:55 +0000 (18:59 +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
am:
4f3d8a3a2c
Change-Id: Id18f7aeb4b4dd286dd1a0917b3610dd8964913b5
Nicolas Boichat [Tue, 22 Aug 2017 18:59:40 +0000 (18:59 +0000)]
resolve merge conflicts of
cc5cabd to nyc-mr1-dev am:
7a338a6626 am:
b64869c70f am:
52bab3789f am:
108d39675d
am:
e5b456769b
Change-Id: I15227817d75df45542f020b0131d7d2c1845f74c
Nicolas Boichat [Tue, 22 Aug 2017 18:59:23 +0000 (18:59 +0000)]
resolve merge conflicts of
cc5cabd to nyc-mr1-dev am:
7a338a6626 am:
b64869c70f am:
1486f7ae07 am:
53e70a911c
am:
670588f810
Change-Id: I402245e7b1b743be1cc862805a0768b67d15e930
Nicolas Boichat [Tue, 22 Aug 2017 18:59:08 +0000 (18:59 +0000)]
GetDevices: Also allow `\.` to be part of the host name am:
dbf9715509 am:
133c610be6 am:
cc0eaf79f0 am:
b6d32610cf am:
b3c1c2cf9b am:
7385ca9aba
am:
139dddc36e
Change-Id: If29060aad0bfe0f883ede1eeeda98f944c1ade23
Kalle Raita [Tue, 22 Aug 2017 18:58:52 +0000 (18:58 +0000)]
resolve merge conflicts of
b6d3261 to nyc-mr1-dev-plus-aosp am:
ed852bf557 am:
900673646e
am:
82e17969c1
Change-Id: I37f666532b72218b61f66f3b72c8f92be6dd8963
Tina Zhou [Tue, 22 Aug 2017 18:58:37 +0000 (18: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
am:
296c5d3d48
Change-Id: Ifb687bf70917be6382e2f4683ab7110c7c738b0f
Tina Zhou [Tue, 22 Aug 2017 18:58:10 +0000 (18: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
am:
313703f0bd
Change-Id: I8f267d6601bfdb988ce90de97a83d6cc3cce4e67
Tina Zhou [Tue, 22 Aug 2017 18:57:54 +0000 (18: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
am:
382932a932
Change-Id: Ie9840353f7c491c781d241f8c5ea7ee11fe50e77
Tina Zhou [Tue, 22 Aug 2017 18:57:41 +0000 (18: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
am:
d87605ed8b
Change-Id: Idcb3f4153b88cca889ec5b29383863eb308689ff
Pyry Haulos [Tue, 22 Aug 2017 18:57:25 +0000 (18: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
am:
1c5b856cf9
Change-Id: Iaef55d319c3619b1e1cb0d210a83220117c2850a
Pyry Haulos [Tue, 22 Aug 2017 18:57:09 +0000 (18:57 +0000)]
merge in nyc-mr1-release history after reset to nyc-mr1-dev am:
868a8938ca am:
aea1bbfaa2 am:
5c1cc6ba46 am:
f7c84f0b66 am:
acb7586309
am:
5c0942ae16
Change-Id: I66e62580ecba64ca4e90d0719672d8acaa261487
Pyry Haulos [Tue, 22 Aug 2017 18:56:53 +0000 (18:56 +0000)]
merge in nyc-mr1-release history after reset to nyc-mr1-dev am:
868a8938ca am:
aea1bbfaa2 am:
5c1cc6ba46 am:
faa38a20ac am:
5d20376574
am:
c378c709c2
Change-Id: I6c43cd22a8a69de4e0d5481a72deb38540cac188
Kalle Raita [Tue, 22 Aug 2017 18:56:37 +0000 (18:56 +0000)]
Merge "Non-compressed copy image target size (64,64,8)" am:
beba5d481a am:
9bbc395b49 am:
c842de9d14 am:
392263d752
am:
30d9a77bde
Change-Id: I7045f41815b643edc954fb1f42e16521029459f5
Jamie Madill [Tue, 22 Aug 2017 18:56:21 +0000 (18:56 +0000)]
Merge "Allow ANGLE_depth_texture for FBO completeness." am:
a8249e3a00 am:
8542846868 am:
c7265ec450 am:
41bf5eddb0
am:
794f107e3e
Change-Id: I6f4235e021c84d804bfd734a00818f4716a31131
John Richardson [Tue, 22 Aug 2017 18:56:04 +0000 (18:56 +0000)]
Merge "Extend primitive_bounding_box negative tests" am:
1975e3bd28 am:
4983f5a49f am:
a4941127f1 am:
a4ffba40b9
am:
3e404892e9
Change-Id: I07410be853752e5b8cd49d6bf335cb0d9df69699
John Richardson [Tue, 22 Aug 2017 18:55:49 +0000 (18:55 +0000)]
Add shader storage negative coverage tests am:
51e20f1e25 am:
299bbc9a59 am:
c960c8b34e am:
d9e474e1dc
am:
ae05b8b4d4
Change-Id: Ife14bc75ba0f037e99116cdf177b195a19d0b744
Jamie Madill [Tue, 22 Aug 2017 18:55:06 +0000 (18:55 +0000)]
Encode es3pBufferDataUploadTests.cpp as utf-8 am:
455d82c60b am:
ee11c5503a am:
48a17ce6e5 am:
d026022f0b
am:
6dd9ba50ea
Change-Id: I22b2d9c0898e6ac6fd9b47633641c0e4538bc203
Julien Desprez [Tue, 22 Aug 2017 18:54:47 +0000 (18:54 +0000)]
Merge "DeqpRunner implements IStrictShardableTest"
am:
d946418057
Change-Id: I1a7c96a7b8e788aadc56213d321331692f41b5c1
Pyry Haulos [Tue, 22 Aug 2017 18:54:31 +0000 (18:54 +0000)]
Merge gerrit/vulkan-cts-1.0-dev into aosp/master am:
6c4fe5bd7a am:
ebebe7d3b9 am:
99ddee4d78 am:
95e52cd9ec
am:
7a77e52d43
Change-Id: I4a496c17332afb3ffd03a7d92491322a14596dcb
Tina Zhou [Tue, 22 Aug 2017 18:54:15 +0000 (18:54 +0000)]
Merge "Fix sample_mask_in.bit_count_per_two_samples tests for 2x MSAA." into marshmallow-cts-dev am:
a5af1b076f am:
c1a3067570 am:
effd4e62e5 am:
225502d2cc am:
4d04016fad am:
67dc3662e1 am:
d64c35a5e6 am:
87a4ffcd07 am:
1094f351d1 am:
03feaffb1a am:
efcf4f78ee
am:
74ef4ab285
Change-Id: I29e74330979d3b57f482b4f283c1467c59d5949f
Kenneth Graunke [Tue, 22 Aug 2017 18:53:54 +0000 (18:53 +0000)]
Fix sample_mask_in.bit_count_per_two_samples tests for 2x MSAA. am:
ea5589c748 am:
5613abd15f am:
1d0056de13 am:
a4c8f24941 am:
1f1491167d am:
5ac1b7c804 am:
f9ca1468a7 am:
9ee0dc70fc am:
62d5098093 am:
e312424670 am:
9af7fa21c6
am:
7bf60302b5
Change-Id: Ibc1d7880fa423a2f9e630f3aa0aac5037577ccdb
Tina Zhou [Tue, 22 Aug 2017 18:53:36 +0000 (18:53 +0000)]
Merge "Fix internal format/type for 3D + depth/stencil negative API tests." into marshmallow-cts-dev am:
d962b86909 am:
b5ef7ae649 am:
5702f3e5ae am:
a8564b49db am:
3126b25e64 am:
d1109cef09 am:
bd34d84e25 am:
94862a44ee am:
ec07f24c86 am:
5ed58f8a01 am:
4e8fdb91b5
am:
ecdc707ec4
Change-Id: If50744cf102cd11d270c6ccc708b07397ef99967
Kenneth Graunke [Tue, 22 Aug 2017 18:53:18 +0000 (18:53 +0000)]
Fix internal format/type for 3D + depth/stencil negative API tests. am:
d2f3b468db am:
1d20a4108b am:
200b407779 am:
c6382e2e23 am:
a9d8fe46b4 am:
4cf7816eac am:
ca0f4e0cbb am:
84b462d0fb am:
7551b11773 am:
4fd6e71479 am:
ca6b5e82b6
am:
4e6060126e
Change-Id: I87caa33e5330c5ae0711d3366947741b39e21d2c
Tina Zhou [Tue, 22 Aug 2017 18:52:59 +0000 (18:52 +0000)]
Merge "Fix sample_mask_in.bit_count_per_two_samples tests for 2x MSAA." into marshmallow-cts-dev am:
a5af1b076f am:
c2c27aa562 am:
e5d1db1d75 am:
5eed9806da am:
ac4f7241a1 am:
5fa7a52fee am:
9a321f7ce8 am:
bffab895c0
am:
7e8b6796a2
Change-Id: Icb54b7c061cd1440635627e57de1522ba0385ac4
Kenneth Graunke [Tue, 22 Aug 2017 18:52:46 +0000 (18:52 +0000)]
Fix sample_mask_in.bit_count_per_two_samples tests for 2x MSAA. am:
ea5589c748 am:
ab691d3f7e am:
5a273080f0 am:
6558869cb1 am:
f9dac85ad7 am:
d0e437bcd7 am:
6e33228e52 am:
f91febb8f8
am:
ca0848cd6d
Change-Id: I8f599f7520531811a1961712229f6383f4e5e284
Tina Zhou [Tue, 22 Aug 2017 18:52:28 +0000 (18:52 +0000)]
Merge "Fix internal format/type for 3D + depth/stencil negative API tests." into marshmallow-cts-dev am:
d962b86909 am:
080d0d5005 am:
fa420a10e2 am:
54684887a6 am:
4c9703fccd am:
ac60fa9f6c am:
0fa50ddbfb am:
d815f2956a
am:
dedab45cf8
Change-Id: Ic28c35dee7f4c23be6b27573a44621e8ed091531
Kenneth Graunke [Tue, 22 Aug 2017 18:52:14 +0000 (18:52 +0000)]
Fix internal format/type for 3D + depth/stencil negative API tests. am:
d2f3b468db am:
f5414b15bb am:
3a520ad416 am:
24aa8651ff am:
081007dbd3 am:
0209a8e015 am:
c8400b10a3 am:
11b6b6353f
am:
1be822ebcd
Change-Id: Id18f2341a08c50fe4b8400cdbabdac55ad3f9a2b
Tina Zhou [Tue, 22 Aug 2017 18:51:57 +0000 (18:51 +0000)]
Merge "Add the support to device connection via TCP/IP" into marshmallow-cts-dev am:
6cea9dbc62 am:
fa02db7127 am:
c099989faf am:
6570dc4744 am:
2cb5f272cf am:
1dabb154d5 am:
a7d55ba5a8 am:
ab0806ca20 am:
4b9b3cda97 am:
3cddb833e9 am:
0eb4e456b9
am:
dc66ee85f1
Change-Id: I78db38565336bc29680261c5ed908d1ef5021467
Chun-Ta Lin [Tue, 22 Aug 2017 18:51:37 +0000 (18:51 +0000)]
Add the support to device connection via TCP/IP am:
4ccc9fd56c am:
548e356569 am:
cceb936715 am:
c627567fb6 am:
41db2c5a2a am:
71e9173e0f am:
f1855db31d am:
da8bbdcb87 am:
a01270f22a am:
9f9439f10a am:
91dd1a43d2
am:
9560ef36a9
Change-Id: If6b2f829015110d39b3cfe4d51732077200a2dd5
Tina Zhou [Tue, 22 Aug 2017 18:51:16 +0000 (18:51 +0000)]
Merge "Add the support to device connection via TCP/IP" into marshmallow-cts-dev am:
6cea9dbc62 am:
87d5ca1e30 am:
7ab3863a95 am:
889e4ea697 am:
e82b53127b am:
2b6f277417 am:
4eb2933ecd am:
87d753030d
am:
3c63160390
Change-Id: Iea04b4304a30a16f60bb854f6c544d835a0640a4
Chun-Ta Lin [Tue, 22 Aug 2017 18:50:52 +0000 (18:50 +0000)]
Add the support to device connection via TCP/IP am:
4ccc9fd56c am:
7e2d9f83ff am:
1fcf1c0083 am:
6cab656d32 am:
f6caf46da6 am:
ba4c42a3d4 am:
a91e820425 am:
2d0071593e
am:
29dc0b5601
Change-Id: I3506a93f603d8521bdf363c5da7872362fc54b5e
Aaron Holden [Tue, 22 Aug 2017 18:50:30 +0000 (18:50 +0000)]
Add runtime to CtsDeqpTestCases am:
bf0076a424 am:
dc61e9cf25 am:
b2c1391b7b am:
7e127cca59 am:
3b7ad55647 am:
08aa70d2e1 am:
87aab30098
am:
d953d1d2cf
Change-Id: I1689ba71914f65c7f50f30a1252dc895f5b52e4f
Pyry Haulos [Tue, 22 Aug 2017 18:50:13 +0000 (18:50 +0000)]
Do not remove old SPIR-V binaries before running vk-build-programs am:
b28ca98dd6 am:
799a2912dc am:
f252de8900 am:
44272886a5
am:
ea499cffd5
Change-Id: Ia5393c881ce8ae8161a1e4c897b9cb4555525dae
Pyry Haulos [Tue, 22 Aug 2017 18:49:52 +0000 (18:49 +0000)]
Merge aosp/upstream-vulkan-cts-1.0-dev into aosp/master am:
c9061d1b52 am:
3e3c5a179e am:
249f158858 am:
1c1ca2aea2
am:
5fa25468f3
Change-Id: I1fa8b7359186148cbc72bdb049bcd7e01ce32c1c
Tina Zhou [Tue, 22 Aug 2017 18:49:16 +0000 (18:49 +0000)]
Merge "Fix sample_mask_in.bit_count_per_two_samples tests for 2x MSAA." into marshmallow-cts-dev am:
a5af1b076f am:
c1a3067570 am:
effd4e62e5 am:
225502d2cc am:
4d04016fad am:
67dc3662e1 am:
d64c35a5e6 am:
87a4ffcd07 am:
1094f351d1 am:
5d63743a35 am:
a1b92b6629
am:
2cd0a51dff
Change-Id: Ie579618f0c936d201a57ed72470f556cd161f278
Kenneth Graunke [Tue, 22 Aug 2017 18:48:54 +0000 (18:48 +0000)]
Fix sample_mask_in.bit_count_per_two_samples tests for 2x MSAA. am:
ea5589c748 am:
5613abd15f am:
1d0056de13 am:
a4c8f24941 am:
1f1491167d am:
5ac1b7c804 am:
f9ca1468a7 am:
9ee0dc70fc am:
62d5098093 am:
c32e4661f4 am:
d6c2c7e3ec
am:
419280b223
Change-Id: I6061fbcebba6c6a59b02f80b225f7d449276a951
Tina Zhou [Tue, 22 Aug 2017 18:48:34 +0000 (18:48 +0000)]
Merge "Fix internal format/type for 3D + depth/stencil negative API tests." into marshmallow-cts-dev am:
d962b86909 am:
b5ef7ae649 am:
5702f3e5ae am:
a8564b49db am:
3126b25e64 am:
d1109cef09 am:
bd34d84e25 am:
94862a44ee am:
ec07f24c86 am:
f7f5ebb64f am:
cb58846360
am:
cdb2188db6
Change-Id: I35cbd64a9ab0152edbae7f281b7adb7ba2f87d17
Kenneth Graunke [Tue, 22 Aug 2017 18:48:15 +0000 (18:48 +0000)]
Fix internal format/type for 3D + depth/stencil negative API tests. am:
d2f3b468db am:
1d20a4108b am:
200b407779 am:
c6382e2e23 am:
a9d8fe46b4 am:
4cf7816eac am:
ca0f4e0cbb am:
84b462d0fb am:
7551b11773 am:
74de83305b am:
be0897e375
am:
4761de18a4
Change-Id: I251ae582f114fca2e9c976055a427a07eb39cffa
Tina Zhou [Tue, 22 Aug 2017 18:47:58 +0000 (18:47 +0000)]
Merge "Fix sample_mask_in.bit_count_per_two_samples tests for 2x MSAA." into marshmallow-cts-dev am:
a5af1b076f am:
c2c27aa562 am:
e5d1db1d75 am:
5eed9806da am:
ac4f7241a1 am:
5fa7a52fee am:
1a64a06d85 am:
d7549d5820
am:
a018587f17
Change-Id: I0de435189751a73f7a566c5ed1dc7f8d49c05936
Kenneth Graunke [Tue, 22 Aug 2017 18:47:43 +0000 (18:47 +0000)]
Fix sample_mask_in.bit_count_per_two_samples tests for 2x MSAA. am:
ea5589c748 am:
ab691d3f7e am:
5a273080f0 am:
6558869cb1 am:
f9dac85ad7 am:
d0e437bcd7 am:
11905e704d am:
9264518ac0
am:
9fd02961a0
Change-Id: Ib6c2deffb6fe5a10d600703b9921560eecd4372e
Tina Zhou [Tue, 22 Aug 2017 18:47:27 +0000 (18:47 +0000)]
Merge "Fix internal format/type for 3D + depth/stencil negative API tests." into marshmallow-cts-dev am:
d962b86909 am:
080d0d5005 am:
fa420a10e2 am:
54684887a6 am:
4c9703fccd am:
ac60fa9f6c am:
4471efc917 am:
1027374bcb
am:
483f1c32d6
Change-Id: I214192106a477b6ddf0b7ed81a14a984e8eaad45
Kenneth Graunke [Tue, 22 Aug 2017 18:47:12 +0000 (18:47 +0000)]
Fix internal format/type for 3D + depth/stencil negative API tests. am:
d2f3b468db am:
f5414b15bb am:
3a520ad416 am:
24aa8651ff am:
081007dbd3 am:
0209a8e015 am:
d0280b2a59 am:
2fb1860fe7
am:
0e4bb636b7
Change-Id: Ifc3606075c4a514cee89df3f24102bf8fd654a76
Tina Zhou [Tue, 22 Aug 2017 18:46:56 +0000 (18:46 +0000)]
Merge "Fix sample_mask_in.bit_count_per_two_samples tests for 2x MSAA." into marshmallow-cts-dev am:
a5af1b076f am:
c2c27aa562 am:
3dda7ae2d2 am:
68289ab9d7 am:
9116124d63 am:
6b756fb6c2
am:
f92dfc438c
Change-Id: Ie6b73cbf1c7b5b8ce3c43a1ed64cdd28b076dc98
Kenneth Graunke [Tue, 22 Aug 2017 18:46:39 +0000 (18:46 +0000)]
Fix sample_mask_in.bit_count_per_two_samples tests for 2x MSAA. am:
ea5589c748 am:
ab691d3f7e am:
d131139629 am:
fe70f6f1db am:
8392b8aa99 am:
674221ac33
am:
f63e79f56a
Change-Id: I910338e36f2020cd86f4d6e326dc81b68e990cff
Tina Zhou [Tue, 22 Aug 2017 18:46:21 +0000 (18:46 +0000)]
Merge "Fix internal format/type for 3D + depth/stencil negative API tests." into marshmallow-cts-dev am:
d962b86909 am:
080d0d5005 am:
e5f339cae5 am:
d7a4a648f5 am:
a01fd2a043 am:
aa14c3049e
am:
7baaa148df
Change-Id: Id5e799d3be384628ae3046d2ff8157e7e7c231df
Kenneth Graunke [Tue, 22 Aug 2017 18:45:58 +0000 (18:45 +0000)]
Fix internal format/type for 3D + depth/stencil negative API tests. am:
d2f3b468db am:
f5414b15bb am:
7098357b48 am:
a660b9fc59 am:
4c20e47b95 am:
345a4506b6
am:
76bd78b3d9
Change-Id: I23be5946a2ae86876031859fd94a83a3d0b40f87
projects / platform / upstream / VK-GL-CTS.git / log