Pyry Haulos [Tue, 13 Sep 2016 18:05:53 +0000 (18:05 +0000)]
Merge "CP: Reduce max iter count in alloc_callback_fail.device am:
ef5688dda6 am:
69c9f158f3 am:
212df0dd39" into nyc-mr1-dev-plus-aosp
am:
c0f9f273a9
Change-Id: I3e791639a39e2f46da37299a79455b55d2bc8965
Pyry Haulos [Tue, 13 Sep 2016 18:05:52 +0000 (18:05 +0000)]
CP: Reduce max iter count in alloc_callback_fail.device am:
ef5688dda6 am:
69c9f158f3 am:
212df0dd39
am:
827fe64146
Change-Id: Id3290c07ee9c8c2424e457f5f39fa00d93a04d8f
Daniel Xie [Tue, 13 Sep 2016 18:05:49 +0000 (18:05 +0000)]
Merge changes from topic 'am-
d93effc2c36944e2a5199ec02939cb56' into nyc-mr1-dev-plus-aosp
am:
a57a3a5e45
Change-Id: I578a721b99c32abad1ba471455355145ec38ea4b
Daniel Xie [Tue, 13 Sep 2016 18:05:47 +0000 (18:05 +0000)]
Merge changes I212a8bc2,I476b6586 into nougat-cts-dev am:
83683a367f am:
b97e86700f am:
636d5cdf56
am:
a1d816d27c
Change-Id: Ib37b60a82d0303916562e1ab909b9084180943c4
Pyry Haulos [Tue, 13 Sep 2016 18:05:36 +0000 (18:05 +0000)]
DO NOT MERGE Allow old behavior in image format property tests am:
0825a289c0 -s ours am:
29574ad7e7 am:
abbf2e05e4
am:
b7ebfc3c10 -s ours
Change-Id: I4329e4aa6e603a6663e6d34b4f0109f5afe55529
Nanley Chery [Tue, 13 Sep 2016 18:05:27 +0000 (18:05 +0000)]
CP: Fix required sample count tests am:
f6a815214a am:
dd22d24f36 am:
aa4fda92b6
am:
d6927f8d8b
Change-Id: Ibb6921f6a02293e6b53361bbbaea4a788c534e08
Daniel Xie [Tue, 13 Sep 2016 18:03:46 +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:
81ec722053" into nyc-mr1-dev-plus-aosp
am:
814066a531
Change-Id: I2c3930cbebc331d8acf6bfea8009803b45a89050
Daniel Xie [Tue, 13 Sep 2016 18:03:45 +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:
81ec722053
am:
51821d08a6
Change-Id: I38de2e5b2f435c15a973b8a44075bbc4286ae2bb
Daniel Xie [Tue, 13 Sep 2016 18:03:40 +0000 (18:03 +0000)]
Merge changes from topic 'am-
77ae52a26b474123bdafaa0a5618ec7b' into nyc-mr1-dev-plus-aosp
am:
d00efe50a8
Change-Id: Ie36ee583fb4ce3182390b234689c3bec8173e6c8
Daniel Xie [Tue, 13 Sep 2016 18:03:39 +0000 (18:03 +0000)]
Merge changes I212a8bc2,I476b6586 into nougat-cts-dev am:
83683a367f am:
b97e86700f am:
91a977c1d3 am:
fad5a803ae am:
9eb945b2c3
am:
56f5dd22e4
Change-Id: I8ed5d9ec1c12aae37b48fab47211a20b4b09b71c
Pyry Haulos [Tue, 13 Sep 2016 18:03:25 +0000 (18:03 +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
Change-Id: Icdee15ce17bc2a1e59a87aa7e22c27a6c985794e
Nanley Chery [Tue, 13 Sep 2016 18:03:09 +0000 (18:03 +0000)]
CP: Fix required sample count tests am:
f6a815214a am:
dd22d24f36 am:
8b3a1c98ee am:
732baa1049 am:
420d8d6542
am:
5ff29a5ba6
Change-Id: I716e2d3c05205350d9d84e2c9fd086e939b27aef
Daniel Xie [Tue, 13 Sep 2016 18:03:02 +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
Change-Id: Ia4b4bd072cd3bf19686b101cae530ad1e5631be5
Daniel Xie [Tue, 13 Sep 2016 18:03:01 +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
Change-Id: I7aecd370caf56b4d6cd707201df27447bba50dfa
Pyry Haulos [Tue, 13 Sep 2016 18:02:55 +0000 (18:02 +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
Change-Id: I2e13f1906934998b1cec58d323377eb74db1e2db
Pyry Haulos [Tue, 13 Sep 2016 18:02:53 +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
Change-Id: Id73ce6262cbca7fedc3abf8f520cee538e1f9bb9
Daniel Xie [Tue, 13 Sep 2016 18:02:44 +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
Change-Id: Idf3323736ca15d90b27b45f1ac690cdc21f556f7
Daniel Xie [Tue, 13 Sep 2016 17:49:43 +0000 (17:49 +0000)]
Merge "CP: Fix geometry shader support check" into nougat-cts-dev am:
54d4c9f476 am:
37f5919c34 am:
46b42733de am:
114ecc50a1 am:
f71fa09b2d
am:
1ab3bb626f
Change-Id: Ic7f936df24b5772dd216987bb613f0d3e139b48b
Pyry Haulos [Tue, 13 Sep 2016 17:49:35 +0000 (17:49 +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
Change-Id: I344bcc30fcccb1a2d5b7e2986f33e4a35d7ef7ad
Pyry Haulos [Tue, 13 Sep 2016 17:49:32 +0000 (17:49 +0000)]
CP: Fix geometry shader support check am:
0da63cfe1d am:
705c0dd3b0 am:
04702a9333 am:
22bac0ff72 am:
0fa6891dba
am:
a98a58911c
Change-Id: Id2e7d104ea4f2d3cfde7bf65bfa2041bfd85206a
Pyry Haulos [Tue, 13 Sep 2016 17:49:23 +0000 (17:49 +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
Change-Id: Ib1a14e18396ca4550344c91cec025db5d2dd117d
Pyry Haulos [Tue, 13 Sep 2016 17:49:22 +0000 (17:49 +0000)]
CP: Fix ext check in EXT_draw_buffers_indexed negative tests am:
3962010752 am:
f44a35c51b am:
61f4551451
am:
b46b642b4a
Change-Id: I01a7c5f17055c1362cb6c9bcb96f903310a29ada
Daniel Xie [Tue, 13 Sep 2016 17:47:57 +0000 (17:47 +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
Change-Id: Ic811e48ec88b410aaa04b33cdf2883d8bd35e4c3
Daniel Xie [Tue, 13 Sep 2016 17:47:56 +0000 (17:47 +0000)]
Merge "CP: Fix geometry shader support check" into nougat-cts-dev am:
54d4c9f476 am:
37f5919c34 am:
d84ea44b50
am:
ab281dafca
Change-Id: Id4bc4bf09fcb68abe0de58885b6d6b151e0b1203
Daniel Xie [Tue, 13 Sep 2016 17:47:52 +0000 (17:47 +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
Change-Id: Ieff79da1a84e2ecc0c431d2a2d0079f289004f79
Daniel Xie [Tue, 13 Sep 2016 17:47:51 +0000 (17:47 +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
Change-Id: I5446c8ea375d5375f862bd658e98bef493483dd6
Pyry Haulos [Tue, 13 Sep 2016 17:47:43 +0000 (17:47 +0000)]
Merge "CP: Fix geometry shader support check am:
0da63cfe1d am:
705c0dd3b0 am:
63ed9c7d75" into nyc-mr1-dev-plus-aosp
am:
91da015271
Change-Id: I0ba458c01992fb1211ce1d89e81fb307b746bbc6
Pyry Haulos [Tue, 13 Sep 2016 17:47:42 +0000 (17:47 +0000)]
CP: Fix geometry shader support check am:
0da63cfe1d am:
705c0dd3b0 am:
63ed9c7d75
am:
c37a528bc1
Change-Id: I19ccd34264777baa9d723fd17b833171ee6950a8
Pyry Haulos [Tue, 13 Sep 2016 17:47:38 +0000 (17:47 +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
Change-Id: I3f18dd31cdd2ff30ab757eed01f0231559a491e2
Pyry Haulos [Tue, 13 Sep 2016 17:47:36 +0000 (17:47 +0000)]
CP: Check and enable VK_KHR_sampler_mirror_clamp_to_edge am:
66ee615c37 am:
b040934957 am:
1d081fa2ba am:
ea0668830c am:
bfbd5bc0da
am:
ba341facc7
Change-Id: Ia349519ba2a372574d7278f569f512ac3507f1ae
Daniel Xie [Tue, 13 Sep 2016 17:47:29 +0000 (17:47 +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
Change-Id: I4ab0956bb841fa87d19f2c7e24cb8d72668b91b6
Daniel Xie [Tue, 13 Sep 2016 17:47:28 +0000 (17:47 +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
Change-Id: Id68a7fdf454fa1abebba82ebd7111aca1c2d3a40
Daniel Xie [Tue, 13 Sep 2016 17:46:29 +0000 (17:46 +0000)]
Merge changes from topic 'am-
47c303cab10f49afaaaf3929a6369684' into nyc-mr1-dev-plus-aosp
am:
5f034cee8b
Change-Id: I01dd2d39585be5003eda6ac2e211269864a7de85
Daniel Xie [Tue, 13 Sep 2016 17:46:27 +0000 (17:46 +0000)]
Merge changes I85492417,I93389a2c into nougat-cts-dev am:
37eaa88ac2 am:
a7dc5ef89b am:
4b783d2db9 am:
00ca87ab81 am:
1209ca758b
am:
5db7872ddd
Change-Id: I7888556b4eb7ea9495055a6665931b0d4b4ed083
Pyry Haulos [Tue, 13 Sep 2016 17:45:55 +0000 (17:45 +0000)]
CP: Limit VkInstance count in object_management.multithreaded* am:
1735b7bcaa am:
d030a8fd2b am:
fc557472cb am:
b4ba085af5 am:
7bf802cc00
am:
f1ddb551d7
Change-Id: I88b6302e8b639208aa8b829cda6f82c4ffaf59b4
Pyry Haulos [Tue, 13 Sep 2016 17:45:27 +0000 (17:45 +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
Change-Id: Ib86d92e9cfaf79578c4c4ce85bbac093b09fe1a1
Pyry Haulos [Tue, 13 Sep 2016 17:45:21 +0000 (17:45 +0000)]
CP: Check and enable VK_KHR_sampler_mirror_clamp_to_edge am:
66ee615c37 am:
b040934957 am:
e9ada378d5
am:
6242dc95cb
Change-Id: Ic7e2cfce70b250a07c96e0e9da8108adcaebb5fb
Daniel Xie [Tue, 13 Sep 2016 17:45:19 +0000 (17:45 +0000)]
Merge changes I85492417,I93389a2c into nougat-cts-dev am:
37eaa88ac2 am:
a7dc5ef89b am:
e081977eb5
am:
ef7affb8db
Change-Id: Ic422fdeacdab86ba3ee10aaa927471f5675db24d
Pyry Haulos [Tue, 13 Sep 2016 17:45:13 +0000 (17:45 +0000)]
CP: Limit VkInstance count in object_management.multithreaded* am:
1735b7bcaa am:
d030a8fd2b am:
ea33916bba
am:
cb63278c7e
Change-Id: I4f28f278b45e35362306bb3bbfcd5f0a35ef3ada
Pyry Haulos [Tue, 13 Sep 2016 17:45:07 +0000 (17:45 +0000)]
CP: Do not test VkDevice, VkInstance creation OOM paths in WSI tests am:
80ddee1f9b am:
96a5fefcf2 am:
37f3f35c88
am:
5fdc152997
Change-Id: Ieae4dbc287ed324250112a19d6fda44f02fa7848
Android Build Merger (Role) [Tue, 13 Sep 2016 17:12:53 +0000 (17:12 +0000)]
Merge "CP: Reduce max iter count in alloc_callback_fail.device am:
ef5688dda6 am:
69c9f158f3 am:
212df0dd39" into nyc-mr1-dev-plus-aosp
Android Build Merger (Role) [Tue, 13 Sep 2016 17:12:48 +0000 (17:12 +0000)]
Merge changes from topic 'am-
d93effc2c36944e2a5199ec02939cb56' into nyc-mr1-dev-plus-aosp
* changes:
Merge changes I212a8bc2,I476b6586 into nougat-cts-dev am:
83683a367f am:
b97e86700f am:
636d5cdf56
DO NOT MERGE Allow old behavior in image format property tests am:
0825a289c0 -s ours am:
29574ad7e7 am:
abbf2e05e4
CP: Fix required sample count tests am:
f6a815214a am:
dd22d24f36 am:
aa4fda92b6
Android Build Merger (Role) [Tue, 13 Sep 2016 17:12:42 +0000 (17:12 +0000)]
Merge "Merge "CP: Fix ext check in EXT_draw_buffers_indexed negative tests" into nougat-cts-dev am:
f594c550af am:
c961253471 am:
81ec722053" into nyc-mr1-dev-plus-aosp
Android Build Merger (Role) [Tue, 13 Sep 2016 17:12:39 +0000 (17:12 +0000)]
Merge changes from topic 'am-
77ae52a26b474123bdafaa0a5618ec7b' into nyc-mr1-dev-plus-aosp
* changes:
Merge changes I212a8bc2,I476b6586 into nougat-cts-dev am:
83683a367f am:
b97e86700f am:
91a977c1d3 am:
fad5a803ae am:
9eb945b2c3
DO NOT MERGE Allow old behavior in image format property tests am:
0825a289c0 -s ours am:
29574ad7e7 am:
48cfb69133 am:
19ac07e772 am:
03b5035568
CP: Fix required sample count tests am:
f6a815214a am:
dd22d24f36 am:
8b3a1c98ee am:
732baa1049 am:
420d8d6542
Android Build Merger (Role) [Tue, 13 Sep 2016 17:12:34 +0000 (17:12 +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
Android Build Merger (Role) [Tue, 13 Sep 2016 17:12:30 +0000 (17:12 +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
Android Build Merger (Role) [Tue, 13 Sep 2016 17:12:26 +0000 (17:12 +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
Pyry Haulos [Tue, 13 Sep 2016 17:12:26 +0000 (17:12 +0000)]
CP: Reduce max iter count in alloc_callback_fail.device am:
ef5688dda6 am:
69c9f158f3
am:
212df0dd39
Change-Id: Ia6583cf339042bb5a519f9e729724def67494ad8
Daniel Xie [Tue, 13 Sep 2016 17:12:25 +0000 (17:12 +0000)]
Merge changes I212a8bc2,I476b6586 into nougat-cts-dev am:
83683a367f am:
b97e86700f
am:
636d5cdf56
Change-Id: I4c2a49e924b8423bb01553e6127689bbfda26fdd
Android Build Merger (Role) [Tue, 13 Sep 2016 17:12:23 +0000 (17:12 +0000)]
Merge "CP: Fix geometry shader support check am:
0da63cfe1d am:
705c0dd3b0 am:
04702a9333 am:
22bac0ff72 am:
0fa6891dba" into nyc-mr1-dev-plus-aosp
Pyry Haulos [Tue, 13 Sep 2016 17:12:18 +0000 (17:12 +0000)]
DO NOT MERGE Allow old behavior in image format property tests am:
0825a289c0 -s ours am:
29574ad7e7
am:
abbf2e05e4
Change-Id: I964cfaf509b8f6253568a1245cd80d4c0488b2cc
Nanley Chery [Tue, 13 Sep 2016 17:12:10 +0000 (17:12 +0000)]
CP: Fix required sample count tests am:
f6a815214a am:
dd22d24f36
am:
aa4fda92b6
Change-Id: I3c129508f1f81c7580b4b2b8a37d4f04f62d55c1
Daniel Xie [Tue, 13 Sep 2016 17:12:09 +0000 (17:12 +0000)]
Merge "CP: Fix ext check in EXT_draw_buffers_indexed negative tests" into nougat-cts-dev am:
f594c550af am:
c961253471
am:
81ec722053
Change-Id: I314bfce6c8fde5242bc16a3ad1ea584dfbef1091
Daniel Xie [Tue, 13 Sep 2016 17:12:03 +0000 (17:12 +0000)]
Merge changes I212a8bc2,I476b6586 into nougat-cts-dev am:
83683a367f am:
b97e86700f am:
91a977c1d3 am:
fad5a803ae
am:
9eb945b2c3
Change-Id: I7ee71b88a41508adf514de850ea9237d26f77061
Pyry Haulos [Tue, 13 Sep 2016 17:12:01 +0000 (17:12 +0000)]
DO NOT MERGE Allow old behavior in image format property tests am:
0825a289c0 -s ours am:
29574ad7e7 am:
48cfb69133 am:
19ac07e772
am:
03b5035568
Change-Id: I81117c01ec8d6fab49c85eafb5c9576250a08791
Nanley Chery [Tue, 13 Sep 2016 17:11:58 +0000 (17:11 +0000)]
CP: Fix required sample count tests am:
f6a815214a am:
dd22d24f36 am:
8b3a1c98ee am:
732baa1049
am:
420d8d6542
Change-Id: I1f8b0b383e9139c96cd0505805a7bdf555567312
Daniel Xie [Tue, 13 Sep 2016 17:11:56 +0000 (17:11 +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
Change-Id: I28eca52dea3f31b58ade01af3d299fe830b5cfc7
Pyry Haulos [Tue, 13 Sep 2016 17:11:56 +0000 (17:11 +0000)]
CP: Fix ext check in EXT_draw_buffers_indexed negative tests am:
3962010752 am:
f44a35c51b am:
8fd6597ac6 am:
6cbc11b8ea
am:
95757ca384
Change-Id: I0d032d86db6b7a6fa3ae98864e4d64e6df32908b
Daniel Xie [Tue, 13 Sep 2016 17:11:54 +0000 (17:11 +0000)]
Merge "CP: Fix geometry shader support check" into nougat-cts-dev am:
54d4c9f476 am:
37f5919c34 am:
46b42733de am:
114ecc50a1
am:
f71fa09b2d
Change-Id: I0498ea1efd3ea57a6632eba0f678c3dc409fa021
Pyry Haulos [Tue, 13 Sep 2016 17:11:54 +0000 (17:11 +0000)]
CP: Fix geometry shader support check am:
0da63cfe1d am:
705c0dd3b0 am:
04702a9333 am:
22bac0ff72
am:
0fa6891dba
Change-Id: I1e841ccb6489e45ea07bbad9b2854da0e2f96f69
Android Build Merger (Role) [Tue, 13 Sep 2016 17:11:52 +0000 (17:11 +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
Android Build Merger (Role) [Tue, 13 Sep 2016 17:11:48 +0000 (17:11 +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
Android Build Merger (Role) [Tue, 13 Sep 2016 17:11:46 +0000 (17:11 +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
Android Build Merger (Role) [Tue, 13 Sep 2016 17:11:45 +0000 (17:11 +0000)]
Merge "CP: Fix geometry shader support check am:
0da63cfe1d am:
705c0dd3b0 am:
63ed9c7d75" into nyc-mr1-dev-plus-aosp
Android Build Merger (Role) [Tue, 13 Sep 2016 17:11:43 +0000 (17:11 +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
Android Build Merger (Role) [Tue, 13 Sep 2016 17:11:39 +0000 (17:11 +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
Android Build Merger (Role) [Tue, 13 Sep 2016 17:11:37 +0000 (17:11 +0000)]
Merge changes from topic 'am-
47c303cab10f49afaaaf3929a6369684' into nyc-mr1-dev-plus-aosp
* changes:
Merge changes I85492417,I93389a2c into nougat-cts-dev am:
37eaa88ac2 am:
a7dc5ef89b am:
4b783d2db9 am:
00ca87ab81 am:
1209ca758b
CP: Limit VkInstance count in object_management.multithreaded* am:
1735b7bcaa am:
d030a8fd2b am:
fc557472cb am:
b4ba085af5 am:
7bf802cc00
CP: Do not test VkDevice, VkInstance creation OOM paths in WSI tests am:
80ddee1f9b am:
96a5fefcf2 am:
f8e9fa9d52 am:
33bde8aa3e am:
3a0c9dfeba
Pyry Haulos [Tue, 13 Sep 2016 17:11:24 +0000 (17:11 +0000)]
CP: Fix ext check in EXT_draw_buffers_indexed negative tests am:
3962010752 am:
f44a35c51b
am:
61f4551451
Change-Id: I84e222e6509032fc00bac39a453541d0aa3d8704
Daniel Xie [Tue, 13 Sep 2016 17:11:23 +0000 (17:11 +0000)]
Merge "CP: Fix geometry shader support check" into nougat-cts-dev am:
54d4c9f476 am:
37f5919c34
am:
d84ea44b50
Change-Id: Icefa5fbe4f42a1e936435b306962a04d82d7e34a
Pyry Haulos [Tue, 13 Sep 2016 17:11:22 +0000 (17:11 +0000)]
CP: Fix geometry shader support check am:
0da63cfe1d am:
705c0dd3b0
am:
63ed9c7d75
Change-Id: I882df26eece143770db57fb25d5c6ec66ddb3f58
Daniel Xie [Tue, 13 Sep 2016 17:11:21 +0000 (17:11 +0000)]
Merge "CP: Check and enable VK_KHR_sampler_mirror_clamp_to_edge" into nougat-cts-dev am:
b03302d214 am:
c26f38fd47
am:
e924bf4dc7
Change-Id: I2c303f99b01b8034391edfef27b46e7c78312823
Daniel Xie [Tue, 13 Sep 2016 17:11:20 +0000 (17:11 +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
Change-Id: Ib2a071fb5216e522dbd4ff3323c2482e75685dc6
Pyry Haulos [Tue, 13 Sep 2016 17:11:20 +0000 (17:11 +0000)]
CP: Check and enable VK_KHR_sampler_mirror_clamp_to_edge am:
66ee615c37 am:
b040934957 am:
1d081fa2ba am:
ea0668830c
am:
bfbd5bc0da
Change-Id: Id7f52cecd158c5aca339848316f3986ad0681026
Pyry Haulos [Tue, 13 Sep 2016 17:11:20 +0000 (17:11 +0000)]
CP: Check and enable VK_KHR_sampler_mirror_clamp_to_edge am:
66ee615c37 am:
b040934957
am:
e9ada378d5
Change-Id: I96a0fc9fc72a69c84cb19f0652098bea62caf3b9
Daniel Xie [Tue, 13 Sep 2016 17:11:18 +0000 (17:11 +0000)]
Merge changes I85492417,I93389a2c into nougat-cts-dev am:
37eaa88ac2 am:
a7dc5ef89b am:
4b783d2db9 am:
00ca87ab81
am:
1209ca758b
Change-Id: Ic2253ffff67cc40db13f98a517ee994b950457b8
Pyry Haulos [Tue, 13 Sep 2016 17:11:16 +0000 (17:11 +0000)]
CP: Limit VkInstance count in object_management.multithreaded* am:
1735b7bcaa am:
d030a8fd2b am:
fc557472cb am:
b4ba085af5
am:
7bf802cc00
Change-Id: I759fbeff6e29dc2b200256b0e7a696c103180b73
Pyry Haulos [Tue, 13 Sep 2016 17:11:13 +0000 (17:11 +0000)]
CP: Do not test VkDevice, VkInstance creation OOM paths in WSI tests am:
80ddee1f9b am:
96a5fefcf2 am:
f8e9fa9d52 am:
33bde8aa3e
am:
3a0c9dfeba
Change-Id: I0d1f230d4428362ec51466a962eccefb193a58bd
Daniel Xie [Tue, 13 Sep 2016 17:09:26 +0000 (17:09 +0000)]
Merge changes I212a8bc2,I476b6586 into nougat-cts-dev am:
83683a367f am:
b97e86700f am:
91a977c1d3
am:
fad5a803ae
Change-Id: Ibfd51487f4238a90227e29c2d37a9b87c499f8bf
Pyry Haulos [Tue, 13 Sep 2016 17:09:23 +0000 (17:09 +0000)]
DO NOT MERGE Allow old behavior in image format property tests am:
0825a289c0 -s ours am:
29574ad7e7 am:
48cfb69133
am:
19ac07e772
Change-Id: Ibe523d2ab9d7a815e785b36a795ecac3e4c2acea
Nanley Chery [Tue, 13 Sep 2016 17:09:21 +0000 (17:09 +0000)]
CP: Fix required sample count tests am:
f6a815214a am:
dd22d24f36 am:
8b3a1c98ee
am:
732baa1049
Change-Id: I6f68333933a781a8e14c7026af4ad39339e361e9
Daniel Xie [Tue, 13 Sep 2016 17:09:20 +0000 (17:09 +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
Change-Id: Id0ebfbe619ac5ae5a0f37ca60e8fb58c0d507592
Pyry Haulos [Tue, 13 Sep 2016 17:09:20 +0000 (17:09 +0000)]
CP: Fix ext check in EXT_draw_buffers_indexed negative tests am:
3962010752 am:
f44a35c51b am:
8fd6597ac6
am:
6cbc11b8ea
Change-Id: Ic82b45fcac5706040f9506e4d30ddd4df3a891ff
Daniel Xie [Tue, 13 Sep 2016 17:09:19 +0000 (17:09 +0000)]
Merge "CP: Fix geometry shader support check" into nougat-cts-dev am:
54d4c9f476 am:
37f5919c34 am:
46b42733de
am:
114ecc50a1
Change-Id: Id4e31f7790b32a24ec11bdf7aa07748fb50ea5be
Pyry Haulos [Tue, 13 Sep 2016 17:09:18 +0000 (17:09 +0000)]
CP: Fix geometry shader support check am:
0da63cfe1d am:
705c0dd3b0 am:
04702a9333
am:
22bac0ff72
Change-Id: I84a29fcdf31a8b9cfe1ee988dcc4103053db2692
Daniel Xie [Tue, 13 Sep 2016 17:08:46 +0000 (17:08 +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
Change-Id: I0f759e611164efd4e105ca2d5a1fab538872a00d
Pyry Haulos [Tue, 13 Sep 2016 17:08:45 +0000 (17:08 +0000)]
CP: Check and enable VK_KHR_sampler_mirror_clamp_to_edge am:
66ee615c37 am:
b040934957 am:
1d081fa2ba
am:
ea0668830c
Change-Id: I1d89b4a3e9538886f2471718b8c6405e59f008ad
Daniel Xie [Tue, 13 Sep 2016 17:08:45 +0000 (17:08 +0000)]
Merge changes I85492417,I93389a2c into nougat-cts-dev am:
37eaa88ac2 am:
a7dc5ef89b am:
4b783d2db9
am:
00ca87ab81
Change-Id: Iaa554a2995f23acf71f7606d0ddf00cb8fc44c26
Pyry Haulos [Tue, 13 Sep 2016 17:08:42 +0000 (17:08 +0000)]
CP: Limit VkInstance count in object_management.multithreaded* am:
1735b7bcaa am:
d030a8fd2b am:
fc557472cb
am:
b4ba085af5
Change-Id: Ic774a7addb3fca63ae8f7eee3522b44021c31c91
Pyry Haulos [Tue, 13 Sep 2016 17:08:40 +0000 (17:08 +0000)]
CP: Do not test VkDevice, VkInstance creation OOM paths in WSI tests am:
80ddee1f9b am:
96a5fefcf2 am:
f8e9fa9d52
am:
33bde8aa3e
Change-Id: I04b011eca94b6499a2782ad55288b7561491ee72
Pyry Haulos [Tue, 13 Sep 2016 17:08:27 +0000 (17:08 +0000)]
CP: Reduce max iter count in alloc_callback_fail.device am:
ef5688dda6
am:
69c9f158f3
Change-Id: I4286998b8d23e86efdb8b808716334c53794d3f8
Daniel Xie [Tue, 13 Sep 2016 17:08:25 +0000 (17:08 +0000)]
Merge changes I212a8bc2,I476b6586 into nougat-cts-dev am:
83683a367f
am:
b97e86700f
Change-Id: Id15f3a2fff1eaee22c18bd5e5cbf9b30e54bfc6b
Pyry Haulos [Tue, 13 Sep 2016 17:08:23 +0000 (17:08 +0000)]
DO NOT MERGE Allow old behavior in image format property tests am:
0825a289c0 -s ours
am:
29574ad7e7
Change-Id: I6e04aa746a63e016bc4867c960df92192eea1509
Nanley Chery [Tue, 13 Sep 2016 17:08:21 +0000 (17:08 +0000)]
CP: Fix required sample count tests am:
f6a815214a
am:
dd22d24f36
Change-Id: Ie42409ea9f741e228b81753e1f090fc73b362467
Daniel Xie [Tue, 13 Sep 2016 17:08:19 +0000 (17:08 +0000)]
Merge "CP: Fix ext check in EXT_draw_buffers_indexed negative tests" into nougat-cts-dev am:
f594c550af
am:
c961253471
Change-Id: I6dc436e630eb32577c35e192f82f065ad0226e19
Pyry Haulos [Tue, 13 Sep 2016 17:07:49 +0000 (17:07 +0000)]
CP: Fix ext check in EXT_draw_buffers_indexed negative tests am:
3962010752
am:
f44a35c51b
Change-Id: Iea25996ca228f982e63cb5816b67fc91a34fe77a
Daniel Xie [Tue, 13 Sep 2016 17:07:46 +0000 (17:07 +0000)]
Merge "CP: Fix geometry shader support check" into nougat-cts-dev am:
54d4c9f476
am:
37f5919c34
Change-Id: I3e2fbcbaac1c76e48542dd2f53c55ead31679eae
Pyry Haulos [Tue, 13 Sep 2016 17:07:45 +0000 (17:07 +0000)]
CP: Fix geometry shader support check am:
0da63cfe1d
am:
705c0dd3b0
Change-Id: Ic7102e3b98b25acfeb356f185ba273cc49ef583a
Daniel Xie [Tue, 13 Sep 2016 17:07:43 +0000 (17:07 +0000)]
Merge "CP: Check and enable VK_KHR_sampler_mirror_clamp_to_edge" into nougat-cts-dev am:
b03302d214
am:
c26f38fd47
Change-Id: I7c1cae1d11b2235eaef139f3cff3c6627ed6484c
Pyry Haulos [Tue, 13 Sep 2016 17:07:42 +0000 (17:07 +0000)]
CP: Check and enable VK_KHR_sampler_mirror_clamp_to_edge am:
66ee615c37
am:
b040934957
Change-Id: I0ca3db2495d8fadf1bc897b383a9c2ebc07a0104
Daniel Xie [Tue, 13 Sep 2016 17:05:19 +0000 (17:05 +0000)]
Merge changes I85492417,I93389a2c into nougat-cts-dev am:
37eaa88ac2 am:
a7dc5ef89b
am:
e081977eb5
Change-Id: I982707d42ff59124aa59213ed9d95df294a3650e