Daniel Xie [Tue, 22 Aug 2017 18:04:33 +0000 (18:04 +0000)]
Merge changes from topic 'am-
77ae52a26b474123bdafaa0a5618ec7b' into nyc-mr1-dev-plus-aosp am:
d00efe50a8
am:
0a7531fe41
Change-Id: I4fd4702e8de5b857cf79028833b0746d758d6189
Daniel Xie [Tue, 22 Aug 2017 18:04:24 +0000 (18:04 +0000)]
Merge changes I212a8bc2,I476b6586 into nougat-cts-dev am:
83683a367f am:
b97e86700f am:
91a977c1d3 am:
fad5a803ae am:
9eb945b2c3 am:
56f5dd22e4
am:
3b98365063
Change-Id: Ic9543265c1777380b344b7a9585dbb1ba07ec343
Pyry Haulos [Tue, 22 Aug 2017 18:04:11 +0000 (18:04 +0000)]
DO NOT MERGE Allow old behavior in image format property tests am:
0825a289c0 -s ours am:
29574ad7e7 am:
48cfb69133 am:
19ac07e772 am:
03b5035568 am:
6b074dd8e6 -s ours
am:
fe55de4ec7 -s ours
Change-Id: I2f952623ab4f4e18c39560be9866076f3ca3d26c
Nanley Chery [Tue, 22 Aug 2017 18:04:01 +0000 (18:04 +0000)]
CP: Fix required sample count tests am:
f6a815214a am:
dd22d24f36 am:
8b3a1c98ee am:
732baa1049 am:
420d8d6542 am:
5ff29a5ba6
am:
c232760bc6
Change-Id: Iab8ddecf49f0f30c5e827c057fc0a2c07082af39
Daniel Xie [Tue, 22 Aug 2017 18:03:47 +0000 (18:03 +0000)]
Merge "Merge "CP: Fix ext check in EXT_draw_buffers_indexed negative tests" into nougat-cts-dev am:
f594c550af am:
c961253471 am:
52d1a05322 am:
1f5739d5f0 am:
a1245f0e16" into nyc-mr1-dev-plus-aosp am:
0fc90c08f6
am:
bc8bbfa18b
Change-Id: I4bb0297a792aaee0c209f58d2e30fbc326cb846e
Daniel Xie [Tue, 22 Aug 2017 18:03:34 +0000 (18:03 +0000)]
Merge "CP: Fix ext check in EXT_draw_buffers_indexed negative tests" into nougat-cts-dev am:
f594c550af am:
c961253471 am:
52d1a05322 am:
1f5739d5f0 am:
a1245f0e16 am:
2af88196dd
am:
c3e87bd780
Change-Id: I803706bb776c7b56c6f681fab5bd35ca51497d51
Pyry Haulos [Tue, 22 Aug 2017 18:03:21 +0000 (18:03 +0000)]
Merge "CP: Fix ext check in EXT_draw_buffers_indexed negative tests am:
3962010752 am:
f44a35c51b am:
8fd6597ac6 am:
6cbc11b8ea am:
95757ca384" into nyc-mr1-dev-plus-aosp am:
70922577c0
am:
60712c385b
Change-Id: Ie9d7d16c89b0bcc468b35dfef8b313e57599ca23
Pyry Haulos [Tue, 22 Aug 2017 18:02:59 +0000 (18:02 +0000)]
CP: Fix ext check in EXT_draw_buffers_indexed negative tests am:
3962010752 am:
f44a35c51b am:
8fd6597ac6 am:
6cbc11b8ea am:
95757ca384 am:
037b6e5c96
am:
81b8019406
Change-Id: I9497b87ca482560322339c58f506b833a69705e4
Daniel Xie [Tue, 22 Aug 2017 18:02:34 +0000 (18:02 +0000)]
Merge "Merge "CP: Fix geometry shader support check" into nougat-cts-dev am:
54d4c9f476 am:
37f5919c34 am:
46b42733de am:
114ecc50a1 am:
f71fa09b2d" into nyc-mr1-dev-plus-aosp am:
ce7f533f2e
am:
f570035a0c
Change-Id: I136d2d720cfaf5126a3dd40442127863cc7caa4f
Daniel Xie [Tue, 22 Aug 2017 18:02:18 +0000 (18:02 +0000)]
Merge "CP: Fix geometry shader support check" into nougat-cts-dev am:
54d4c9f476 am:
37f5919c34 am:
46b42733de am:
114ecc50a1 am:
f71fa09b2d am:
1ab3bb626f
am:
2daba7a4e4
Change-Id: Ibe2779b489f22e615c5afc1bf5709d91bbb6792b
Pyry Haulos [Tue, 22 Aug 2017 18:02:05 +0000 (18:02 +0000)]
Merge "CP: Fix geometry shader support check am:
0da63cfe1d am:
705c0dd3b0 am:
04702a9333 am:
22bac0ff72 am:
0fa6891dba" into nyc-mr1-dev-plus-aosp am:
2712b19cdd
am:
84ea73f76e
Change-Id: Ic013a70ab0631e2e3c8beec9b94af1d333c6c608
Pyry Haulos [Tue, 22 Aug 2017 18:01:51 +0000 (18:01 +0000)]
CP: Fix geometry shader support check am:
0da63cfe1d am:
705c0dd3b0 am:
04702a9333 am:
22bac0ff72 am:
0fa6891dba am:
a98a58911c
am:
c0e67420bf
Change-Id: Ic4af2c6eb8bb74fae117f127c8dc57e70625cdab
Pyry Haulos [Tue, 22 Aug 2017 18:01:36 +0000 (18:01 +0000)]
Merge "CP: Fix ext check in EXT_draw_buffers_indexed negative tests am:
3962010752 am:
f44a35c51b am:
61f4551451" into nyc-mr1-dev-plus-aosp am:
0fad76f642
am:
85ea68823a
Change-Id: Id28630c8015d53daf277fffd9a3f072187935c5a
Pyry Haulos [Tue, 22 Aug 2017 18:01:15 +0000 (18:01 +0000)]
CP: Fix ext check in EXT_draw_buffers_indexed negative tests am:
3962010752 am:
f44a35c51b am:
61f4551451 am:
b46b642b4a
am:
fa82666210
Change-Id: Ic2b553c35d570089abdf548fb8bdde65a8c2f3a0
Daniel Xie [Tue, 22 Aug 2017 18:00:50 +0000 (18:00 +0000)]
Merge "Merge "CP: Fix geometry shader support check" into nougat-cts-dev am:
54d4c9f476 am:
37f5919c34 am:
d84ea44b50" into nyc-mr1-dev-plus-aosp am:
70c033812e
am:
d37f310198
Change-Id: I0549db32e9bf0f60d14e79640592c7f93822e4aa
Daniel Xie [Tue, 22 Aug 2017 18:00:21 +0000 (18:00 +0000)]
Merge "CP: Fix geometry shader support check" into nougat-cts-dev am:
54d4c9f476 am:
37f5919c34 am:
d84ea44b50 am:
ab281dafca
am:
bb7ac9cac9
Change-Id: I57fbe13a917900b4e4a98a9a719b0de64bbc6004
Daniel Xie [Tue, 22 Aug 2017 17:59:47 +0000 (17:59 +0000)]
Merge "Merge "CP: Check and enable VK_KHR_sampler_mirror_clamp_to_edge" into nougat-cts-dev am:
b03302d214 am:
c26f38fd47 am:
c488b48152 am:
4931f183ed am:
9107fc2ae7" into nyc-mr1-dev-plus-aosp am:
25ccc023e7
am:
962662cc18
Change-Id: If9658129bf13ab36ecac4480952f8b0fbbf01e37
Daniel Xie [Tue, 22 Aug 2017 17:59:33 +0000 (17:59 +0000)]
Merge "CP: Check and enable VK_KHR_sampler_mirror_clamp_to_edge" into nougat-cts-dev am:
b03302d214 am:
c26f38fd47 am:
c488b48152 am:
4931f183ed am:
9107fc2ae7 am:
505e2fe5e3
am:
c7ab8a45ae
Change-Id: Iec3f78208dfb4d2016bd3bdd58e26bb8d8f57671
Pyry Haulos [Tue, 22 Aug 2017 17:59:15 +0000 (17:59 +0000)]
Merge "CP: Fix geometry shader support check am:
0da63cfe1d am:
705c0dd3b0 am:
63ed9c7d75" into nyc-mr1-dev-plus-aosp am:
91da015271
am:
25a1bea61c
Change-Id: I15bf1b9c6b7780ff105d8cc02b438f089252074b
Pyry Haulos [Tue, 22 Aug 2017 17:59:01 +0000 (17:59 +0000)]
CP: Fix geometry shader support check am:
0da63cfe1d am:
705c0dd3b0 am:
63ed9c7d75 am:
c37a528bc1
am:
757551abd5
Change-Id: Ib0a04f54dac7673aa94d54e2af25969845521fda
Pyry Haulos [Tue, 22 Aug 2017 17:58:44 +0000 (17:58 +0000)]
Merge "CP: Check and enable VK_KHR_sampler_mirror_clamp_to_edge am:
66ee615c37 am:
b040934957 am:
1d081fa2ba am:
ea0668830c am:
bfbd5bc0da" into nyc-mr1-dev-plus-aosp am:
8b610581ea
am:
91f53e4412
Change-Id: Ia6fb8312c78f5c0ba4b275fe0c0eac912a5428ac
Pyry Haulos [Tue, 22 Aug 2017 17:58:26 +0000 (17:58 +0000)]
CP: Check and enable VK_KHR_sampler_mirror_clamp_to_edge am:
66ee615c37 am:
b040934957 am:
1d081fa2ba am:
ea0668830c am:
bfbd5bc0da am:
ba341facc7
am:
ebb171458e
Change-Id: I3655c4267bb8006d554995d4190063090e406190
Daniel Xie [Tue, 22 Aug 2017 17:58:08 +0000 (17:58 +0000)]
Merge "Merge "CP: Check and enable VK_KHR_sampler_mirror_clamp_to_edge" into nougat-cts-dev am:
b03302d214 am:
c26f38fd47 am:
e924bf4dc7" into nyc-mr1-dev-plus-aosp am:
2bf1fe2a18
am:
2efaafe55a
Change-Id: Ie71592e4450fbbc77afbfde5eaf65c2a51dedde0
Daniel Xie [Tue, 22 Aug 2017 17:57:52 +0000 (17:57 +0000)]
Merge "CP: Check and enable VK_KHR_sampler_mirror_clamp_to_edge" into nougat-cts-dev am:
b03302d214 am:
c26f38fd47 am:
e924bf4dc7 am:
af09e94107
am:
39e811a828
Change-Id: I0358776e69edda5b64b4d18be1d2600c112f3586
Daniel Xie [Tue, 22 Aug 2017 17:57:11 +0000 (17:57 +0000)]
Merge changes from topic 'am-
47c303cab10f49afaaaf3929a6369684' into nyc-mr1-dev-plus-aosp am:
5f034cee8b
am:
e20de5492e
Change-Id: Ie743ab03ca7f6199d9e36eb958b875b1ed81fc1f
Daniel Xie [Tue, 22 Aug 2017 17:57:05 +0000 (17:57 +0000)]
Merge changes I85492417,I93389a2c into nougat-cts-dev am:
37eaa88ac2 am:
a7dc5ef89b am:
4b783d2db9 am:
00ca87ab81 am:
1209ca758b am:
5db7872ddd
am:
c7295524be
Change-Id: Ie99e239159617ea101d5658d1d020f23822fc823
Pyry Haulos [Tue, 22 Aug 2017 17:56:59 +0000 (17:56 +0000)]
CP: Limit VkInstance count in object_management.multithreaded* am:
1735b7bcaa am:
d030a8fd2b am:
fc557472cb am:
b4ba085af5 am:
7bf802cc00 am:
f1ddb551d7
am:
8e31302e8c
Change-Id: Ie0ce720bf395cf356cc22027da5abfcf4b139ada
Pyry Haulos [Tue, 22 Aug 2017 17:56:52 +0000 (17:56 +0000)]
CP: Do not test VkDevice, VkInstance creation OOM paths in WSI tests am:
80ddee1f9b am:
96a5fefcf2 am:
f8e9fa9d52 am:
33bde8aa3e am:
3a0c9dfeba am:
abbd2c3424
am:
4ad869d008
Change-Id: Ic427b90a18474b1a86449d8c397910a4d06a9b90
Pyry Haulos [Tue, 22 Aug 2017 17:56:34 +0000 (17:56 +0000)]
CP: Check and enable VK_KHR_sampler_mirror_clamp_to_edge am:
66ee615c37 am:
b040934957 am:
e9ada378d5 am:
6242dc95cb
am:
2be63f801c
Change-Id: I300cfb86618e8dd15462e9e9ed6304d4673a3ec2
Daniel Xie [Tue, 22 Aug 2017 17:56:02 +0000 (17:56 +0000)]
Merge changes I85492417,I93389a2c into nougat-cts-dev am:
37eaa88ac2 am:
a7dc5ef89b am:
e081977eb5 am:
ef7affb8db
am:
275fec0f42
Change-Id: I27b4fa6e9612439821d891516a761f3f819217d6
Pyry Haulos [Tue, 22 Aug 2017 17:55:45 +0000 (17:55 +0000)]
CP: Limit VkInstance count in object_management.multithreaded* am:
1735b7bcaa am:
d030a8fd2b am:
ea33916bba am:
cb63278c7e
am:
4fd2100344
Change-Id: Ic4e17a9dbaa095f7b80ca01aa34eee5308ba2d56
Pyry Haulos [Tue, 22 Aug 2017 17:55:32 +0000 (17:55 +0000)]
CP: Do not test VkDevice, VkInstance creation OOM paths in WSI tests am:
80ddee1f9b am:
96a5fefcf2 am:
37f3f35c88 am:
5fdc152997
am:
691f130e04
Change-Id: Id3f881b3e8403f3719c3424d150aa359e9ebcfbe
Kenneth Graunke [Tue, 22 Aug 2017 17:54:45 +0000 (17:54 +0000)]
Fix internal format/type for 3D + depth/stencil negative API tests. am:
ae7f8e0a07 am:
15c4abf347 am:
eb043f5932 am:
5605935110
am:
d61a690534
Change-Id: Id6095fd16e4ed1ce54ae0a33ff877929c11f2106
Dan Albert [Tue, 22 Aug 2017 17:54:25 +0000 (17:54 +0000)]
Bump libdeqp to android-22. am:
e0ef7118f8 am:
ce83935903 am:
e695cc060c am:
fb3620d081
am:
e8413ab074
Change-Id: Ia489c3cf584ee6c82f57cff1b24d86aa619ee0dd
Pyry Haulos [Tue, 22 Aug 2017 17:53:59 +0000 (17:53 +0000)]
Remove XML mustpass lists am:
af8270690a am:
0988065e4f am:
ad823700e2 am:
8097b35e68
am:
c918575f53
Change-Id: I2a0fecff210496b3223ec753fe4787eba0f84293
Pyry Haulos [Tue, 22 Aug 2017 17:53:47 +0000 (17:53 +0000)]
Merge aosp/upstream-vulkan-cts-1.0-dev into aosp/master am:
42d91db0aa am:
eb419455ef am:
0df9f6a487 am:
09fec6cb5c
am:
d5f2bd663c
Change-Id: I4cbb1214c1278e430739b94b62be30323d4aac14
Pyry Haulos [Tue, 22 Aug 2017 17:52:58 +0000 (17:52 +0000)]
Merge aosp/upstream-vulkan-cts-1.0-dev into aosp/master am:
f2ed7081f2 am:
0f428ec334 am:
0e39b0c893 am:
d998efd030
am:
bd0a06839c
Change-Id: Iee10bae84609615b0a3c705a4ec66dc48bf53914
Unsuk Jung [Tue, 22 Aug 2017 17:52:37 +0000 (17:52 +0000)]
Merge "Don't require supported binary formats in negative tests." into marshmallow-cts-dev am:
3aa5258338 am:
26449babc6 am:
3b524eaf98 am:
b5668f25eb am:
33a50549c0 am:
645b74d517 am:
782593182a am:
71dc8179e6 am:
c3b8da9cca am:
28c20a24a9
am:
6cfef28b53
Change-Id: Iab59fbf7ce7735142ee1dacddd8429b07896d840
Haixia Shi [Tue, 22 Aug 2017 17:52:20 +0000 (17:52 +0000)]
Don't require supported binary formats in negative tests. am:
7cd59a4409 am:
d7b53b803a am:
da87d1a895 am:
fbd60126d8 am:
9f9397285c am:
b275e16083 am:
d32629cd9c am:
0c72826968 am:
1f944cd475 am:
4245c92715
am:
b5ed3e7f3c
Change-Id: I53d6538288dc71c5d39b022d7cc87907a86be542
Unsuk Jung [Tue, 22 Aug 2017 17:52:07 +0000 (17:52 +0000)]
Merge "Don't require supported binary formats in negative tests." into marshmallow-cts-dev am:
3aa5258338 am:
26449babc6 am:
3b524eaf98 am:
b5668f25eb am:
33a50549c0 am:
645b74d517 am:
dfb887b2b8 am:
38b1caead0
am:
eb5d46230d
Change-Id: Ib6ec26987523bcd1e24574cc0989f4080f5a4dce
Haixia Shi [Tue, 22 Aug 2017 17:51:53 +0000 (17:51 +0000)]
Don't require supported binary formats in negative tests. am:
7cd59a4409 am:
d7b53b803a am:
da87d1a895 am:
fbd60126d8 am:
9f9397285c am:
b275e16083 am:
0611665e73 am:
df2f8439ac
am:
592cf678d9
Change-Id: I69901115a5a1ffaa6fe7eb4deaf76cd792f9e087
Unsuk Jung [Tue, 22 Aug 2017 17:51:10 +0000 (17:51 +0000)]
Merge "Don't require supported binary formats in negative tests." into marshmallow-cts-dev am:
3aa5258338 am:
9ebe97f0a6 am:
7172745842 am:
9cb847787f am:
572542e25a am:
5aa10fb844 am:
42f4fbc400
am:
b4b7d5ea04
Change-Id: Iea922638c64765cae0c51e0cd36917cdf5e43b10
Haixia Shi [Tue, 22 Aug 2017 17:50:08 +0000 (17:50 +0000)]
Don't require supported binary formats in negative tests. am:
7cd59a4409 am:
635f454667 am:
cb0a43030f am:
aa3b3981d6 am:
1c5c354bea am:
375105a676 am:
3d3da7bab5
am:
3cd8cf7826
Change-Id: Ic0fe66d30e21a2434afcdf1e2660c76da9c40da1
Unsuk Jung [Tue, 22 Aug 2017 17:49:29 +0000 (17:49 +0000)]
Merge "Don't require supported binary formats in negative tests." into marshmallow-cts-dev am:
3aa5258338 am:
9ebe97f0a6 am:
7172745842 am:
229e5bb911 am:
1a01b7413f
am:
a63153b4c6
Change-Id: I5a755c6c047161e0c3b1ade3da70582eb485ba1f
Haixia Shi [Tue, 22 Aug 2017 17:48:55 +0000 (17:48 +0000)]
Don't require supported binary formats in negative tests. am:
7cd59a4409 am:
635f454667 am:
cb0a43030f am:
2b00aba040 am:
982ac86b00
am:
8c41e4699b
Change-Id: I8141312fa3b3be614a3d99a3f1d39057896df021
Kalle Raita [Tue, 22 Aug 2017 17:48:33 +0000 (17:48 +0000)]
Merge "Use empty region when buffer age is not supported" am:
04ff065bb8 am:
bcf725ead2 am:
714643aa8f am:
e43e265968
am:
ff6943ff76
Change-Id: Ifa467caaa0da3f0794a19b3ab8e817b1b68cadb5
Pyry Haulos [Tue, 22 Aug 2017 17:48:07 +0000 (17:48 +0000)]
Merge "Handle EGL_EXT_yuv_surface in eglChooseConfig() tests" am:
d4591cd2d7 am:
28bca4db95 am:
2d88a7be92 am:
4a3c6e8b0b
am:
12dd3ee90b
Change-Id: Iba2bc9053a69a84a7565b943420e7af8f6b870ae
Pyry Haulos [Tue, 22 Aug 2017 17:47:41 +0000 (17:47 +0000)]
Reduce max iter count in alloc_callback_fail.device am:
3b17fd4c4e am:
e7119d922a am:
fac3b6f0f1 am:
25fb6cebb7
am:
c509f4c57f
Change-Id: I3770f8d449ef79990fc26dfe3e1b39c76db0e793
Daniel Xie [Tue, 22 Aug 2017 17:47:24 +0000 (17:47 +0000)]
Merge "DO NOT MERGE CP vertex array test and warning fixes" into marshmallow-cts-dev am:
b9c3777b77 -s ours am:
245bd3ffc4 -s ours am:
26f19c81f9 am:
a39ebfe9c3 am:
0e802c4e0e am:
d0b2b3957f am:
32653a6bff -s ours
am:
125394f08a -s ours
Change-Id: Ibae97018e2399d9fbfde4e831ac4c2c7d34b0589
Jarkko Pyry [Tue, 22 Aug 2017 17:47:11 +0000 (17:47 +0000)]
DO NOT MERGE CP vertex array test and warning fixes am:
c63640e53a -s ours am:
b136cc9a59 -s ours am:
92c0bc5e13 am:
fa9b0a2d1d am:
54c18e5ac4 am:
1465834a6f am:
44e736e1a3 -s ours
am:
28512eb821 -s ours
Change-Id: I860b4544992f144121c1898bca87c6fb55fb6b01
Daniel Xie [Tue, 22 Aug 2017 17:46:54 +0000 (17:46 +0000)]
Merge "Fix GLES2 format mismatch" into marshmallow-cts-dev am:
98dd6ac745 am:
5dee7d519c am:
ad2ff2cee6 am:
1c0e65455b am:
bfb286324f am:
e4bb5c7380 am:
78da664fe3
am:
c9a28c5854
Change-Id: I21fbb557831633b9a8f12cd57a9d717d5bb496af
Stphane Marchesin [Tue, 22 Aug 2017 17:46:29 +0000 (17:46 +0000)]
Fix GLES2 format mismatch am:
4b80682693 am:
9a9c641a84 am:
1369e6796f am:
2021e578a5 am:
e99b668de1 am:
82930763b9 am:
201aaabe6a
am:
912f515db3
Change-Id: Iaac1acdf8163b2291b509ec589489d8c61d90759
Haixia Shi [Tue, 22 Aug 2017 17:45:59 +0000 (17:45 +0000)]
Increase no-data timeout to 5 seconds. am:
d00b71cbc3 am:
a7afa30111 am:
dbeebd4714 am:
bf408ea638 am:
4fbb89056a am:
380c4214d7 am:
d5987b434e
am:
df399e17d7
Change-Id: Ib25cacf68a6ce5b4dbb8ac6671e93acc11b2b4ba
Pyry Haulos [Tue, 22 Aug 2017 17:45:37 +0000 (17:45 +0000)]
Limit VkInstance count in object_management.multithreaded* am:
fe2c3850aa am:
f4fc7b5325 am:
a4ba868448 am:
5cc580a901
am:
bdc8a088e1
Change-Id: I5882689ce9e073795b7c401868086b3215784a20
Daniel Xie [Tue, 22 Aug 2017 17:45:23 +0000 (17:45 +0000)]
Merge "DO NOT MERGE CP vertex array test and warning fixes" into marshmallow-cts-dev am:
b9c3777b77 -s ours am:
245bd3ffc4 -s ours am:
26f19c81f9 am:
57bef37373 am:
11f3112a88 -s ours
am:
810e5b7f36 -s ours
Change-Id: I0b36668636ccbf1a5f791c86cbc2be23acb051ea
Jarkko Pyry [Tue, 22 Aug 2017 17:45:10 +0000 (17:45 +0000)]
DO NOT MERGE CP vertex array test and warning fixes am:
c63640e53a -s ours am:
b136cc9a59 -s ours am:
92c0bc5e13 am:
6a9945d0ea am:
74ce10a66a -s ours
am:
27c4c0770c -s ours
Change-Id: I3f8cec1cf8e7082c5046c00603ee02414cb4e1a0
Daniel Xie [Tue, 22 Aug 2017 17:44:22 +0000 (17:44 +0000)]
Merge "Fix GLES2 format mismatch" into marshmallow-cts-dev am:
98dd6ac745 am:
5dee7d519c am:
ad2ff2cee6 am:
d3d8d1f780 am:
baad168d2d
am:
dc19c7434c
Change-Id: If92b461561aedd0ae7017644bbf6e48b9860d871
Stphane Marchesin [Tue, 22 Aug 2017 17:44:09 +0000 (17:44 +0000)]
Fix GLES2 format mismatch am:
4b80682693 am:
9a9c641a84 am:
1369e6796f am:
a13a4a71c6 am:
0fefe2c6dd
am:
fbec8e0884
Change-Id: I7a1fdd084d2d875b5843303399b80448fb0e4009
Haixia Shi [Tue, 22 Aug 2017 17:43:46 +0000 (17:43 +0000)]
Increase no-data timeout to 5 seconds. am:
d00b71cbc3 am:
a7afa30111 am:
dbeebd4714 am:
4f82e0a41d am:
1f472a5ac7
am:
6f5adea6e6
Change-Id: I3396fcc74e21326e073d6dfe0a26a3d7f1f1639c
Pyry Haulos [Tue, 22 Aug 2017 17:43:31 +0000 (17:43 +0000)]
Do not test VkDevice, VkInstance creation OOM paths in WSI tests am:
2dd2c2dc56 am:
a5e0f24431 am:
de4fd3d929 am:
1e7173fc56
am:
4fceeee261
Change-Id: Ic46d5d472032524285a350fadf8a16074157a345
Pyry Haulos [Tue, 22 Aug 2017 17:43:17 +0000 (17:43 +0000)]
Merge aosp/upstream-vulkan-cts-1.0-dev into aosp/master am:
a18cb02cb8 am:
c1ec0ab210 am:
e009aa14ff am:
adbdbcd51f
am:
c42e5ed1bb
Change-Id: Ic364291d9e8ca4aad14cef9b61be8a0c8ddcec24
Pyry Haulos [Tue, 22 Aug 2017 17:42:57 +0000 (17:42 +0000)]
Require 'master' config to be supported in Android CTS am:
e232a6e83c am:
9fcccc3d5e am:
814861d962 am:
984f215b5a
am:
9b98b25ebc
Change-Id: I4d3ce08455331ced67da83b10d0eb295ba375fb2
Aaron Holden [Tue, 22 Aug 2017 17:42:45 +0000 (17:42 +0000)]
Merge "Copy collect-tests-only option in DeqpTestRunner" into nyc-mr1-dev am:
b9152fed9f am:
f20ead93a0 am:
2297e749d9
am:
d3df95e783
Change-Id: Iab0238a84d7e2084752c92481d32a472775b40ce
Aaron Holden [Tue, 22 Aug 2017 17:42:11 +0000 (17:42 +0000)]
Copy collect-tests-only option in DeqpTestRunner am:
ab73207152 am:
f7a6073043 am:
224b9e83c7
am:
780e5eb3f9
Change-Id: Idfbdeda00ad132ef4436b6cd97dc463323651b6f
Kalle Raita [Tue, 22 Aug 2017 17:41:57 +0000 (17:41 +0000)]
Split load/store image tests into sub-groups am:
90763f1f7d am:
0630204ed0 am:
1ac83f0744 am:
918c2463df
am:
088026dcbd
Change-Id: I6e7d1c37eb64d98033862dbeea0a1fee773fce98
Pyry Haulos [Tue, 22 Aug 2017 17:41:41 +0000 (17:41 +0000)]
Merge upstream-vulkan-cts-1.0-dev into master am:
c641c2e631 am:
ff17828d24 am:
cac2638e0b am:
9093b91cc6
am:
d80cc10978
Change-Id: I4b5e6ce6a693153c5973fd9498edd67bb78a0d47
Pyry Haulos [Tue, 22 Aug 2017 17:41:26 +0000 (17:41 +0000)]
Exclude new AOSP tests from Vulkan CTS mustpass am:
2856c4a882 am:
e7411e4375 am:
c944a160f3 am:
f92a0057e1
am:
386e18193c
Change-Id: Ib1b05874aaa163309ded5f15e4dd8a74bdb581ae
Pyry Haulos [Tue, 22 Aug 2017 17:41:14 +0000 (17:41 +0000)]
Merge "Add script for build- and sanity-checking source code" am:
032db4ee79 am:
332b86e954 am:
5c1193ac0e am:
360456a9e2
am:
f2f091b553
Change-Id: Ie151cd12e21a1155cf73f888f8b2c98a8ce21ce8
Collin Baker [Tue, 22 Aug 2017 17:40:59 +0000 (17:40 +0000)]
Merge "Fix const-correctness in texture filtering test cases" am:
201bdd03b9 am:
a7654e4aa7 am:
1b5b849a13 am:
3c5c0f29f4
am:
67ccf173ed
Change-Id: I6842dfdd5ab404611cb282622154afa348481bce
Pyry Haulos [Tue, 22 Aug 2017 17:40:44 +0000 (17:40 +0000)]
Merge "Fix ext check in EXT_draw_buffers_indexed negative tests" am:
316e998b08 am:
0d795e0b74 am:
b4dc232687 am:
47fc8fa835
am:
bcfff5f7bd
Change-Id: I6502df773f9610f960d048d977768bd8787e6ea4
Pyry Haulos [Tue, 22 Aug 2017 17:40:32 +0000 (17:40 +0000)]
Merge "Do not rewrite .inl files if existing content is identical" am:
522806fb48 am:
dc0e613e09 am:
5abad2aa10 am:
5115651099
am:
e729842534
Change-Id: I42b3964efb053f6b0b8d395bb94b4d836150acde
Pyry Haulos [Tue, 22 Aug 2017 17:40:18 +0000 (17:40 +0000)]
Merge aosp/upstream-vulkan-cts-1.0-dev into aosp/master am:
68e9111d15 am:
0e5e3a7b7d am:
29ad585c71 am:
ee64653c61
am:
d443f1996a
Change-Id: I23b55718da770db6043f43f8957e0fcd6cf04884
Pyry Haulos [Tue, 22 Aug 2017 17:40:03 +0000 (17:40 +0000)]
Merge "MSVC: set exception handling model" am:
ac343841e4 am:
199e67724d am:
2aed524afb am:
9e8e7fab52
am:
9af3b4b634
Change-Id: If1d42b10bd8d81a6c98ab3f893a8d9cb20633840
Kalle Raita [Tue, 22 Aug 2017 17:39:50 +0000 (17:39 +0000)]
Merge "Tex array negative test fixes for FBTextureLayer" am:
13e9c5295c am:
78a609ac42 am:
e3ceb38d90 am:
bf994843a1
am:
f938ebb83a
Change-Id: Ied7055454b1b25d8bede71aea6d281fcbb41467e
Collin Baker [Tue, 22 Aug 2017 17:39:34 +0000 (17:39 +0000)]
Merge "Fix implicit conversion to bool" am:
95d03db971 am:
5c51a0e9ab am:
8dff83a942 am:
4bdc401b1f
am:
20d96f559b
Change-Id: Ic742f8a8b1f5acb7344f1ed869eb5fe8e6e519ba
Pyry Haulos [Tue, 22 Aug 2017 17:39:22 +0000 (17:39 +0000)]
fetch_souces.py: cache extracted hash and only extract if necessary am:
30e2e7b423 am:
bb1518d839 am:
c62f0007f6 am:
8c45816a40
am:
bd35fe0f97
Change-Id: I8a3e43a1e649618cba3e29db97529903e3bc849b
Pyry Haulos [Tue, 22 Aug 2017 17:39:07 +0000 (17:39 +0000)]
Merge "Improvements to sample verification code" am:
9e25446699 am:
a0931a720d am:
2b6ecc3f84 am:
3e59e6fe91
am:
1416b8427a
Change-Id: I0e775a4c9c753ed945a3ca023ec1a740ca7633a1
Pyry Haulos [Tue, 22 Aug 2017 17:38:52 +0000 (17:38 +0000)]
Merge "Let linker find libm on unix" am:
0ae9f0d744 am:
c38f0231db am:
af0d09d5ba am:
da711466fe
am:
6dfd9480c3
Change-Id: Ia57b674c228631f67c37a10451bd46441cbcce4f
Pyry Haulos [Tue, 22 Aug 2017 17:38:32 +0000 (17:38 +0000)]
Merge "Use 3rd party cflags in zlib" am:
12289a3151 am:
4cbe6899d2 am:
2b871a5022 am:
584b9fabc1
am:
4deb3cab68
Change-Id: Id70c2fec16048ad5072584e97d7a60a219c65c67
Pyry Haulos [Tue, 22 Aug 2017 17:38:08 +0000 (17:38 +0000)]
Merge "Fix deUint64 -> size_t warning in deSha1" am:
2a7d53ca19 am:
17a3ef9c00 am:
6bf3e1cb65 am:
828b476e7a
am:
85a8945553
Change-Id: I1fd1cb2d6e65bdf67b1c7b1756614950af4f148b
Pyry Haulos [Tue, 22 Aug 2017 17:37:36 +0000 (17:37 +0000)]
Fix clang launch control builds am:
2011fb57b8 am:
c91abc37d2 am:
5801dce433 am:
10fc41e1d1
am:
7707290337
Change-Id: I46be67979e5188b03797e4b051796308645ae3cc
Pyry Haulos [Tue, 22 Aug 2017 17:37:12 +0000 (17:37 +0000)]
Merge "Modify deqp install script to accept build-root" am:
98faf68f01 am:
4dafa58484 am:
f8f1a31678 am:
4261897184
am:
ba012e1c5b
Change-Id: Ie5df96f77da7e7901d838959f9573fde3ccf18c8
Pyry Haulos [Tue, 22 Aug 2017 17:36:51 +0000 (17:36 +0000)]
Merge "Enable -Werror in launch control builds" am:
5d3110410c am:
84d16a0eb4 am:
478283f842 am:
3e535537e5
am:
47a4cc4afc
Change-Id: I4c8a99271a3553e8d2c117dcf34e5262bf70557b
Pyry Haulos [Tue, 22 Aug 2017 17:36:37 +0000 (17:36 +0000)]
Merge "Merge upstream-vulkan-cts-1.0-dev into master" am:
553f24edf2 am:
ecfd015f05 am:
51879177a6 am:
d7a232b7bb
am:
698d9be9c4
Change-Id: I7e6df1b840110c5e7f6d114c0ad836f208615ac4
Pyry Haulos [Tue, 22 Aug 2017 17:36:19 +0000 (17:36 +0000)]
Merge upstream-vulkan-cts-1.0-dev into master am:
fb20fc5f5d am:
c0d5f3c3bd am:
93a21800dd am:
8019cb7387
am:
f9135a42f1
Change-Id: Ia18a0bac3ccb8d058728eb3d415de5e230b0cc54
Collin Baker [Tue, 22 Aug 2017 17:36:04 +0000 (17:36 +0000)]
Quick fix for warning in vktSampleVerifier.cpp am:
5bffef48d5 am:
cddd73d649 am:
6e53a18230 am:
4ecd6f333f
am:
1b1cf8779b
Change-Id: I2fefdc9d10d50f72479a4873030d5a594a7a9843
Mika Isojrvi [Tue, 22 Aug 2017 17:35:24 +0000 (17:35 +0000)]
Add support for rendering vertex combined sampled images. am:
5fe6837872 am:
6003e58af4 am:
673aaf7079 am:
b1e6beaaaa
am:
1a62ada5ff
Change-Id: I59b28e18f42f4bd36efc35c54fc9f0d699d3238c
Pyry Haulos [Tue, 22 Aug 2017 17:35:02 +0000 (17:35 +0000)]
Fix geometry shader support check am:
83470b2dcb am:
276e8bac4c am:
d3c11ad0b0 am:
22fd4e6f44
am:
bbaab7ec9f
Change-Id: I1a0af158cbdda4f6d96c7e71e824b515ad063689
Mika Isojärvi [Tue, 22 Aug 2017 17:34:49 +0000 (17:34 +0000)]
Update mustpass list. am:
fc145f5198 am:
de3b7ebf4d am:
888de2570b am:
08b189c546
am:
8e0c54c449
Change-Id: Ie91c3d4db5c3d8fa3a5931bd785d2ed9b452dc86
Mika Isojärvi [Tue, 22 Aug 2017 17:32:32 +0000 (17:32 +0000)]
Add support for rendering vertex storage images. am:
cb6eb243c9 am:
62768ad130 am:
707ceeb7cf am:
d2d821fd2d
am:
88fc806f0b
Change-Id: Ie7257fa1ae4ba38c02dde0375a455d9714c51017
Mika Isojärvi [Tue, 22 Aug 2017 17:31:52 +0000 (17:31 +0000)]
Add support for rendering vertex storage texel buffers. am:
b214c63910 am:
11d666264a am:
26ed604750 am:
bf5a6c3559
am:
a3762678b6
Change-Id: Ic6a574e85cb1f0783947ab3c9b69bb7d184c117f
Mika Isojärvi [Tue, 22 Aug 2017 17:31:31 +0000 (17:31 +0000)]
Add vertex storage buffers to pipeline barrier tests. am:
7da6a1a373 am:
f59346fb51 am:
e86a141a32 am:
d4106a60c0
am:
d50c8bef5f
Change-Id: Ia9d3b02292ccce902df5a9f0afcdc8d08ae4b2b5
Mika Isojärvi [Tue, 22 Aug 2017 17:31:18 +0000 (17:31 +0000)]
Add support for rendering vertex uniform texel buffers am:
2e5fc5db2b am:
d0f428f62a am:
b36342af95 am:
bdb0ef31ee
am:
903370fb7c
Change-Id: Ib20314d381517a0b10a202e4a6157d443972458b
Mika Isojärvi [Tue, 22 Aug 2017 17:31:00 +0000 (17:31 +0000)]
Add vertex uniform buffers to pipeline barrier tests. am:
da19a054c2 am:
490d86c2cb am:
36a205ed7e am:
26d98dcce7
am:
205f491df8
Change-Id: Ide8ce2b837e7a60021af58ef300c63af65926fef
Mika Isojärvi [Tue, 22 Aug 2017 17:30:35 +0000 (17:30 +0000)]
Merge "Split RenderBuffer class into RenderVertexBuffer and RenderIndexBuffer." am:
92f15137d6 am:
70554ff097 am:
9d58952197 am:
4ed16eb734
am:
25dbdcb639
Change-Id: I685f84f69b032df4236452fdfe2c1fd7e0e807d3
Mika Isojärvi [Tue, 22 Aug 2017 17:30:32 +0000 (17:30 +0000)]
Split RenderBuffer class into RenderVertexBuffer and RenderIndexBuffer. am:
6c7a842e61 am:
230cacdd3a am:
5057f4b3fa am:
3e6593f8c2
am:
44776863af
Change-Id: Ie53f4f82ca43decd299a2e8874c9c158ca18cf87
Collin Baker [Tue, 22 Aug 2017 17:30:19 +0000 (17:30 +0000)]
Merge "Fix warnings in texture_filtering tests" am:
083240d0d8 am:
49f5c1f518 am:
2386c56d97 am:
9547ebbc4e
am:
3af10c88cf
Change-Id: I1cf4af30594ce25b14ad8770219127cf0fe6bb1b
Mika Isojärvi [Tue, 22 Aug 2017 17:30:05 +0000 (17:30 +0000)]
Merge "Fix image layout in pipeline barrier tests" am:
f61183a55c am:
a42dcee85a am:
fb0de07694 am:
417bb5b04a
am:
07fcfcaa7f
Change-Id: Ibe6cb65f6eb7a1d52f0a2b192c88082f49f93847
Chih-Hung Hsieh [Tue, 22 Aug 2017 17:29:14 +0000 (17:29 +0000)]
Suppress the google-explicit-constructor warning locally. am:
bded0f944e am:
a33c79fccc am:
46d16db55d am:
11d130b7bf
am:
627caea064
Change-Id: Ic20e5da4d0d410f49b1538825fd398b3517ad8fd
Jarkko Pöyry [Tue, 22 Aug 2017 17:28:50 +0000 (17:28 +0000)]
Merge \\\\\\\\"DO NOT MERGE CP vertex array test and warning fixes\\\\\\\\" into marshmallow-cts-dev am:
b9c3777b77 -s ours am:
7bc41121c1 am:
3acfedf2ab am:
19de695b8d am:
f0e6d6563c -s ours am:
17c2446a15 am:
45a8f91070 am:
449abdbd00 am:
697b769d40 -s ours
am:
5982c681cd -s ours
Change-Id: Iee63a827b5b71c794f54c800c79b29effb558423