Haixia Shi [Tue, 13 Sep 2016 20:11:37 +0000 (20:11 +0000)]
Increase no-data timeout to 5 seconds. am:
d00b71cbc3 am:
a7afa30111 am:
9dfb23aeaf am:
bce9c4d0eb am:
31c60e9172
am:
2ca1e9b94f
Change-Id: I59b7f14067140454dad73780b71a80118645ba88
Haixia Shi [Tue, 13 Sep 2016 19:09:27 +0000 (19:09 +0000)]
Increase no-data timeout to 5 seconds. am:
d00b71cbc3 am:
a7afa30111 am:
9dfb23aeaf am:
bce9c4d0eb
am:
31c60e9172
Change-Id: I3e0e783db33c0c0a1bae944758107eca4a2621da
Haixia Shi [Tue, 13 Sep 2016 19:04:29 +0000 (19:04 +0000)]
Increase no-data timeout to 5 seconds. am:
d00b71cbc3 am:
a7afa30111 am:
9dfb23aeaf
am:
bce9c4d0eb
Change-Id: If1acac260b92bdf81a8370e4d6257d2e28e4c3d8
Haixia Shi [Tue, 13 Sep 2016 19:01:32 +0000 (19:01 +0000)]
Increase no-data timeout to 5 seconds. am:
d00b71cbc3 am:
a7afa30111
am:
9dfb23aeaf
Change-Id: I914a0e22ba02c64e8db152ee10ff261f47261a34
Haixia Shi [Tue, 13 Sep 2016 18:46:52 +0000 (18:46 +0000)]
Increase no-data timeout to 5 seconds. am:
d00b71cbc3
am:
a7afa30111
Change-Id: Ice660fcf10955047eac6b2ef1c60114d2fb97b0e
Kenneth Graunke [Tue, 13 Sep 2016 18:19:36 +0000 (18:19 +0000)]
Merge "Fix sample_mask_in.bit_count_per_two_samples tests for 2x MSAA." am:
ba98ecd5d0 am:
96bef1f84e am:
347b5cdac0
am:
644058875a
Change-Id: I99d4a6650d9efb87299f9988c8896cfce8a96a1c
Daniel Xie [Tue, 13 Sep 2016 18:19:35 +0000 (18:19 +0000)]
Merge "Merge "CP: Require 'master' config to be supported in Android CTS" into nougat-cts-dev am:
84173082ee am:
72e1df9930 am:
f750d4ffc3 am:
de7e3e2be7 am:
5b059bb044" into nyc-mr1-dev-plus-aosp
am:
3381734324
Change-Id: I63ca6c744d27f88a933a0ce890e9a9fc7c799eb5
Daniel Xie [Tue, 13 Sep 2016 18:19:33 +0000 (18:19 +0000)]
Merge "CP: Require 'master' config to be supported in Android CTS" into nougat-cts-dev am:
84173082ee am:
72e1df9930 am:
f750d4ffc3 am:
de7e3e2be7 am:
5b059bb044
am:
55caa1ac8c
Change-Id: Iab524605cba2e0af1fb34f3b304e4924012910f0
Pyry Haulos [Tue, 13 Sep 2016 18:19:27 +0000 (18:19 +0000)]
Merge "CP: Require 'master' config to be supported in Android CTS am:
03d217bb53 am:
e0c1316159 am:
a2d72443d6 am:
0dd98a178b am:
a08f0162cf" into nyc-mr1-dev-plus-aosp
am:
636ad59ed8
Change-Id: I999e13d8d7f1cf88a4fbb463bb0092d3c0815773
Pyry Haulos [Tue, 13 Sep 2016 18:19:25 +0000 (18:19 +0000)]
CP: Require 'master' config to be supported in Android CTS am:
03d217bb53 am:
e0c1316159 am:
a2d72443d6 am:
0dd98a178b am:
a08f0162cf
am:
3f01dc6c00
Change-Id: Ib463be74c01c3bb56fcd049902b5d69785008dae
Daniel Xie [Tue, 13 Sep 2016 18:09:09 +0000 (18:09 +0000)]
Merge "Merge "CP: Handle EGL_EXT_yuv_surface in eglChooseConfig() tests" into nougat-cts-dev am:
1ad2703e25 am:
d93a153fd4 am:
2e528153da am:
83035b1ffd am:
4f0f622a6c" into nyc-mr1-dev-plus-aosp
am:
2720094d38
Change-Id: I3ff0a4c819ec56ff36e49a736d149ed360b6becf
Daniel Xie [Tue, 13 Sep 2016 18:09:07 +0000 (18:09 +0000)]
Merge "CP: Handle EGL_EXT_yuv_surface in eglChooseConfig() tests" into nougat-cts-dev am:
1ad2703e25 am:
d93a153fd4 am:
2e528153da am:
83035b1ffd am:
4f0f622a6c
am:
1845d28747
Change-Id: Ib901657ef6b5033140d360119c22351313001a01
Pyry Haulos [Tue, 13 Sep 2016 18:09:00 +0000 (18:09 +0000)]
Merge "CP: Handle EGL_EXT_yuv_surface in eglChooseConfig() tests am:
521bb16575 am:
fdd3db3693 am:
16ba586a00 am:
cbb5a33fb9 am:
e6443aa4bb" into nyc-mr1-dev-plus-aosp
am:
8fe45f3e93
Change-Id: If76ec63400191c65226bf74805fc53719d06723b
Pyry Haulos [Tue, 13 Sep 2016 18:08:59 +0000 (18:08 +0000)]
CP: Handle EGL_EXT_yuv_surface in eglChooseConfig() tests am:
521bb16575 am:
fdd3db3693 am:
16ba586a00 am:
cbb5a33fb9 am:
e6443aa4bb
am:
d02e13af9c
Change-Id: Id6984aaf83f7acc74244648e0f53c59fe65e6a0e
Daniel Xie [Tue, 13 Sep 2016 18:08:53 +0000 (18:08 +0000)]
Merge "Merge "Remove a few EGL tests using RGBA4 format from mustpass" into nougat-cts-dev am:
451fa7c581 am:
99925909af am:
1820fdbedc am:
bcb08cddcd am:
429bc243d4" into nyc-mr1-dev-plus-aosp
am:
52cd426d34
Change-Id: Icf75d9d9639df4fb1d5f4bdb2c68ab7be8d9f3ec
Daniel Xie [Tue, 13 Sep 2016 18:08:52 +0000 (18:08 +0000)]
Merge "Remove a few EGL tests using RGBA4 format from mustpass" into nougat-cts-dev am:
451fa7c581 am:
99925909af am:
1820fdbedc am:
bcb08cddcd am:
429bc243d4
am:
ee0b685f12
Change-Id: Ifd9e371b2b2d56f732585da2e2ec5f52712a0f3b
Pyry Haulos [Tue, 13 Sep 2016 18:08:46 +0000 (18:08 +0000)]
Merge "Remove a few EGL tests using RGBA4 format from mustpass am:
3ffc2f243a am:
04c959ca67 am:
9833f3493e am:
08ab72f183 am:
da40bb0fe5" into nyc-mr1-dev-plus-aosp
am:
9890fe3207
Change-Id: I3eaa206d3f9a8276737b1df99ae9d55142bbd60b
Pyry Haulos [Tue, 13 Sep 2016 18:08:45 +0000 (18:08 +0000)]
Remove a few EGL tests using RGBA4 format from mustpass am:
3ffc2f243a am:
04c959ca67 am:
9833f3493e am:
08ab72f183 am:
da40bb0fe5
am:
09a8e1b13f
Change-Id: Ic48e85cffd3aaf93a0588b35ee59b393d87c5165
Daniel Xie [Tue, 13 Sep 2016 18:08:39 +0000 (18:08 +0000)]
Merge "CP: Require 'master' config to be supported in Android CTS" into nougat-cts-dev am:
84173082ee am:
72e1df9930 am:
90bef986f4
am:
56270fdfb8
Change-Id: I13d70e83345a99fbc451721f00928b523634f7bf
Pyry Haulos [Tue, 13 Sep 2016 18:07:53 +0000 (18:07 +0000)]
CP: Require 'master' config to be supported in Android CTS am:
03d217bb53 am:
e0c1316159 am:
c1c16ccda1
am:
3b2f4f5e0f
Change-Id: I7568fbb21ec8d68ff3c15744db6c007e3a70c77a
Daniel Xie [Tue, 13 Sep 2016 18:07:52 +0000 (18:07 +0000)]
Merge "CP: Handle EGL_EXT_yuv_surface in eglChooseConfig() tests" into nougat-cts-dev am:
1ad2703e25 am:
d93a153fd4 am:
0e632cea70
am:
6afd772422
Change-Id: I6b7f1dc682883737872891dd4db0ff823362267b
Pyry Haulos [Tue, 13 Sep 2016 18:07:51 +0000 (18:07 +0000)]
CP: Handle EGL_EXT_yuv_surface in eglChooseConfig() tests am:
521bb16575 am:
fdd3db3693 am:
478b55b980
am:
8e3e68b496
Change-Id: I8172875068eba9140af4fd8d5381ac7a204b1584
Daniel Xie [Tue, 13 Sep 2016 18:07:50 +0000 (18:07 +0000)]
Merge "Remove a few EGL tests using RGBA4 format from mustpass" into nougat-cts-dev am:
451fa7c581 am:
99925909af am:
e5ca3b0f05
am:
298f95e762
Change-Id: I1edcfa1c2844c208e13462e5c3c321d76614325f
Pyry Haulos [Tue, 13 Sep 2016 18:07:48 +0000 (18:07 +0000)]
resolve merge conflicts of 04c959c to nyc-dev-plus-aosp am:
921c48e50a
am:
eeb08c7a18
Change-Id: I9d948105b5a8c37ec3d178011e4846861b873c52
Daniel Xie [Tue, 13 Sep 2016 18:06:15 +0000 (18:06 +0000)]
Merge "Merge "CP: Reduce max iter count in alloc_callback_fail.device" into nougat-cts-dev am:
a268fcbaff am:
a489f7548d am:
5e61259f2e" into nyc-mr1-dev-plus-aosp
am:
d635a0dd0b
Change-Id: I21d6522e2faf7dbfaa9822cda40fb78a14fbead6
Daniel Xie [Tue, 13 Sep 2016 18:06:13 +0000 (18:06 +0000)]
Merge "CP: Reduce max iter count in alloc_callback_fail.device" into nougat-cts-dev am:
a268fcbaff am:
a489f7548d am:
5e61259f2e
am:
64c469c34b
Change-Id: Idb07f56a688f9359ad1e79b7dd56d6c21ff4348c
Daniel Xie [Tue, 13 Sep 2016 18:06:08 +0000 (18:06 +0000)]
Merge "Merge "CP: Reduce max iter count in alloc_callback_fail.device" into nougat-cts-dev am:
a268fcbaff am:
a489f7548d am:
9efea4025d am:
56145b7325 am:
b706a204bf" into nyc-mr1-dev-plus-aosp
am:
4011b13ce3
Change-Id: I70b53ac99e2ffc36881a0932332e94e8cf390a25
Daniel Xie [Tue, 13 Sep 2016 18:06:08 +0000 (18:06 +0000)]
Merge "CP: Reduce max iter count in alloc_callback_fail.device" into nougat-cts-dev am:
a268fcbaff am:
a489f7548d am:
9efea4025d am:
56145b7325 am:
b706a204bf
am:
9bc066caca
Change-Id: I044625b579fdd93857d7ccbdd0847b7d91a3ab6d
Pyry Haulos [Tue, 13 Sep 2016 18:06:01 +0000 (18:06 +0000)]
Merge "CP: Reduce max iter count in alloc_callback_fail.device am:
ef5688dda6 am:
69c9f158f3 am:
41d571f045 am:
f35b2943fc am:
b5768ba6fa" into nyc-mr1-dev-plus-aosp
am:
15ebbdb224
Change-Id: I4d445e540ada40e4bfbf58fe20724c905209a826
Pyry Haulos [Tue, 13 Sep 2016 18:05:59 +0000 (18:05 +0000)]
CP: Reduce max iter count in alloc_callback_fail.device am:
ef5688dda6 am:
69c9f158f3 am:
41d571f045 am:
f35b2943fc am:
b5768ba6fa
am:
2f6f648a3f
Change-Id: Ic2387cd7b0f8ec7465e4cd285e9292124f36cf94
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
Kenneth Graunke [Tue, 13 Sep 2016 17:22:11 +0000 (17:22 +0000)]
Merge "Fix sample_mask_in.bit_count_per_two_samples tests for 2x MSAA." am:
ba98ecd5d0 am:
96bef1f84e
am:
347b5cdac0
Change-Id: I79e17d8463d191ad27c102f82f4624a0538eafa1
Kenneth Graunke [Tue, 13 Sep 2016 17:19:43 +0000 (17:19 +0000)]
Merge "Fix sample_mask_in.bit_count_per_two_samples tests for 2x MSAA." am:
ba98ecd5d0
am:
96bef1f84e
Change-Id: I370b5202f02268f6013db05c4056d0ba464ad0df
Android Build Merger (Role) [Tue, 13 Sep 2016 17:18:08 +0000 (17:18 +0000)]
Merge "Merge "CP: Require 'master' config to be supported in Android CTS" into nougat-cts-dev am:
84173082ee am:
72e1df9930 am:
f750d4ffc3 am:
de7e3e2be7 am:
5b059bb044" into nyc-mr1-dev-plus-aosp
Daniel Xie [Tue, 13 Sep 2016 17:18:02 +0000 (17:18 +0000)]
Merge "CP: Require 'master' config to be supported in Android CTS" into nougat-cts-dev am:
84173082ee am:
72e1df9930 am:
f750d4ffc3 am:
de7e3e2be7
am:
5b059bb044
Change-Id: Ifdf41fd7cc76a0dc13528ca8ebfee3c1d90fe7f1
Android Build Merger (Role) [Tue, 13 Sep 2016 17:17:55 +0000 (17:17 +0000)]
Merge "CP: Require 'master' config to be supported in Android CTS am:
03d217bb53 am:
e0c1316159 am:
a2d72443d6 am:
0dd98a178b am:
a08f0162cf" into nyc-mr1-dev-plus-aosp
Android Build Merger (Role) [Tue, 13 Sep 2016 17:17:51 +0000 (17:17 +0000)]
Merge "Merge "CP: Handle EGL_EXT_yuv_surface in eglChooseConfig() tests" into nougat-cts-dev am:
1ad2703e25 am:
d93a153fd4 am:
2e528153da am:
83035b1ffd am:
4f0f622a6c" into nyc-mr1-dev-plus-aosp
Android Build Merger (Role) [Tue, 13 Sep 2016 17:17:47 +0000 (17:17 +0000)]
Merge "CP: Handle EGL_EXT_yuv_surface in eglChooseConfig() tests am:
521bb16575 am:
fdd3db3693 am:
16ba586a00 am:
cbb5a33fb9 am:
e6443aa4bb" into nyc-mr1-dev-plus-aosp
Android Build Merger (Role) [Tue, 13 Sep 2016 17:17:44 +0000 (17:17 +0000)]
Merge "Merge "Remove a few EGL tests using RGBA4 format from mustpass" into nougat-cts-dev am:
451fa7c581 am:
99925909af am:
1820fdbedc am:
bcb08cddcd am:
429bc243d4" into nyc-mr1-dev-plus-aosp
Android Build Merger (Role) [Tue, 13 Sep 2016 17:17:40 +0000 (17:17 +0000)]
Merge "Remove a few EGL tests using RGBA4 format from mustpass am:
3ffc2f243a am:
04c959ca67 am:
9833f3493e am:
08ab72f183 am:
da40bb0fe5" into nyc-mr1-dev-plus-aosp
Pyry Haulos [Tue, 13 Sep 2016 17:17:29 +0000 (17:17 +0000)]
CP: Require 'master' config to be supported in Android CTS am:
03d217bb53 am:
e0c1316159 am:
a2d72443d6 am:
0dd98a178b
am:
a08f0162cf
Change-Id: I903d6f9392d5752ef1a61ec02a443f1abd1cac55
Daniel Xie [Tue, 13 Sep 2016 17:17:28 +0000 (17:17 +0000)]
Merge "CP: Require 'master' config to be supported in Android CTS" into nougat-cts-dev am:
84173082ee am:
72e1df9930
am:
90bef986f4
Change-Id: I3dba3f051942f62abb516597aec40d67ed4cda5a
Daniel Xie [Tue, 13 Sep 2016 17:17:26 +0000 (17:17 +0000)]
Merge "CP: Handle EGL_EXT_yuv_surface in eglChooseConfig() tests" into nougat-cts-dev am:
1ad2703e25 am:
d93a153fd4 am:
2e528153da am:
83035b1ffd
am:
4f0f622a6c
Change-Id: Iab3b2fdc8386d4cbe58fb66054ac4ff6a797e500
Pyry Haulos [Tue, 13 Sep 2016 17:17:24 +0000 (17:17 +0000)]
CP: Handle EGL_EXT_yuv_surface in eglChooseConfig() tests am:
521bb16575 am:
fdd3db3693 am:
16ba586a00 am:
cbb5a33fb9
am:
e6443aa4bb
Change-Id: I748bc7c3bc2f817c0292d64acd9b80bb754abdbc
Daniel Xie [Tue, 13 Sep 2016 17:17:23 +0000 (17:17 +0000)]
Merge "Remove a few EGL tests using RGBA4 format from mustpass" into nougat-cts-dev am:
451fa7c581 am:
99925909af am:
1820fdbedc am:
bcb08cddcd
am:
429bc243d4
Change-Id: Ie1956ed6394e4e2e9f2fc0e96cfcff457ff4f85e
Pyry Haulos [Tue, 13 Sep 2016 17:17:21 +0000 (17:17 +0000)]
Remove a few EGL tests using RGBA4 format from mustpass am:
3ffc2f243a am:
04c959ca67 am:
9833f3493e am:
08ab72f183
am:
da40bb0fe5
Change-Id: I03e7c240d57e18f6a9ed392d4a9d27642d92945f
Kenneth Graunke [Tue, 13 Sep 2016 17:17:12 +0000 (17:17 +0000)]
Merge "Fix sample_mask_in.bit_count_per_two_samples tests for 2x MSAA."
am:
ba98ecd5d0
Change-Id: I37c1c6e5070c6fa66d9bcec03d4ce22d6127106b
Pyry Haulos [Tue, 13 Sep 2016 17:16:56 +0000 (17:16 +0000)]
CP: Require 'master' config to be supported in Android CTS am:
03d217bb53 am:
e0c1316159
am:
c1c16ccda1
Change-Id: I6bcb7fa13f85b79facb6d2eef65a2d0310b4f5b6
Daniel Xie [Tue, 13 Sep 2016 17:16:55 +0000 (17:16 +0000)]
Merge "CP: Handle EGL_EXT_yuv_surface in eglChooseConfig() tests" into nougat-cts-dev am:
1ad2703e25 am:
d93a153fd4
am:
0e632cea70
Change-Id: Iee2324790734f7149b3e904f79b11c265bdc6331
Pyry Haulos [Tue, 13 Sep 2016 17:16:54 +0000 (17:16 +0000)]
CP: Handle EGL_EXT_yuv_surface in eglChooseConfig() tests am:
521bb16575 am:
fdd3db3693
am:
478b55b980
Change-Id: I6810d09ecee2e13faed2223b3d588446a0ad3143
Daniel Xie [Tue, 13 Sep 2016 17:16:54 +0000 (17:16 +0000)]
Merge "Remove a few EGL tests using RGBA4 format from mustpass" into nougat-cts-dev am:
451fa7c581 am:
99925909af
am:
e5ca3b0f05
Change-Id: Ic2099f88177511e96aae0e80d526b8621acf987f
Pyry Haulos [Tue, 13 Sep 2016 17:16:53 +0000 (17:16 +0000)]
resolve merge conflicts of 04c959c to nyc-dev-plus-aosp
am:
921c48e50a
Change-Id: Id4b14e5d72cec816be24b5a403aaf932f5279ea9
Daniel Xie [Tue, 13 Sep 2016 17:15:10 +0000 (17:15 +0000)]
Merge "CP: Require 'master' config to be supported in Android CTS" into nougat-cts-dev am:
84173082ee
am:
72e1df9930
Change-Id: I5a9374fdb7183b3a0a1f5bc4d880217d27edb3dd
Pyry Haulos [Tue, 13 Sep 2016 17:15:09 +0000 (17:15 +0000)]
CP: Require 'master' config to be supported in Android CTS am:
03d217bb53
am:
e0c1316159
Change-Id: I7fb762a09b8f7e004f11f64c1387bb120890d516
Daniel Xie [Tue, 13 Sep 2016 17:15:08 +0000 (17:15 +0000)]
Merge "CP: Handle EGL_EXT_yuv_surface in eglChooseConfig() tests" into nougat-cts-dev am:
1ad2703e25
am:
d93a153fd4
Change-Id: I7de86ea2c0785bbeb62f0fe881d2459247eedcab
Pyry Haulos [Tue, 13 Sep 2016 17:15:08 +0000 (17:15 +0000)]
CP: Handle EGL_EXT_yuv_surface in eglChooseConfig() tests am:
521bb16575
am:
fdd3db3693
Change-Id: I853620ed4b08bde808111b9f84fef9bd0e068b4b
Daniel Xie [Tue, 13 Sep 2016 17:15:05 +0000 (17:15 +0000)]
Merge "Remove a few EGL tests using RGBA4 format from mustpass" into nougat-cts-dev am:
451fa7c581
am:
99925909af
Change-Id: I87b00ff49e2c9f3016d5a4a88bac7fa15cd4ed48
Daniel Xie [Tue, 13 Sep 2016 17:14:16 +0000 (17:14 +0000)]
Merge "CP: Require 'master' config to be supported in Android CTS" into nougat-cts-dev am:
84173082ee am:
72e1df9930 am:
f750d4ffc3
am:
de7e3e2be7
Change-Id: I58554e0b05c826048a2851f8b0d42b2ebb24320a
Pyry Haulos [Tue, 13 Sep 2016 17:14:15 +0000 (17:14 +0000)]
CP: Require 'master' config to be supported in Android CTS am:
03d217bb53 am:
e0c1316159 am:
a2d72443d6
am:
0dd98a178b
Change-Id: I54298aabd2ef70a9c550e0199bc6cf3d5d233d51
Daniel Xie [Tue, 13 Sep 2016 17:14:15 +0000 (17:14 +0000)]
Merge "CP: Handle EGL_EXT_yuv_surface in eglChooseConfig() tests" into nougat-cts-dev am:
1ad2703e25 am:
d93a153fd4 am:
2e528153da
am:
83035b1ffd
Change-Id: I2afc0dc20f64adf45c272c3dbbeda14e938ba9b6
Pyry Haulos [Tue, 13 Sep 2016 17:14:14 +0000 (17:14 +0000)]
CP: Handle EGL_EXT_yuv_surface in eglChooseConfig() tests am:
521bb16575 am:
fdd3db3693 am:
16ba586a00
am:
cbb5a33fb9
Change-Id: I61116416eb47197ec5498c2fbc61d5eb98c64c4a
projects / platform / upstream / VK-GL-CTS.git / log