Chad Versace [Tue, 22 Aug 2017 20:45:37 +0000 (20:45 +0000)]
x11: Call XInitThreads() am:
5d11c9d2c0 am:
f465d82fa5 am:
0ed6cc912e am:
e7ee6541a9 am:
587123a671 am:
e5286dbaf7 am:
8d7c277158
am:
b6ec89e9af
Change-Id: I9db697b46540291c194702a3e331ae6284b6a266
Tina Zhou [Tue, 22 Aug 2017 20:45:17 +0000 (20:45 +0000)]
Merge "Merge "x11: Call XInitThreads()" into nougat-cts-dev am:
cbdbf95222 am:
a74d50ffda am:
b92f7d676f am:
d46ac1a0ca am:
bb7e6b4f15 am:
120b5fb421" into nyc-mr2-dev-plus-aosp am:
305270d6d6
am:
6b748a77a5
Change-Id: If41c2d0446c27ce0d70c103587f4169eb9a153ed
Tina Zhou [Tue, 22 Aug 2017 20:44:50 +0000 (20:44 +0000)]
Merge "x11: Call XInitThreads()" into nougat-cts-dev am:
cbdbf95222 am:
a74d50ffda am:
b92f7d676f am:
d46ac1a0ca am:
bb7e6b4f15 am:
120b5fb421 am:
7dcbcecdc3
am:
808646a680
Change-Id: I6455ad239a2ab7e1166e39ebaaac8be54df530ba
Tina Zhou [Tue, 22 Aug 2017 20:44:21 +0000 (20:44 +0000)]
Merge "Merge "x11: Fix deadlock" into nougat-cts-dev am:
34b869eeea am:
05f26155f0 am:
7bb5047d5e am:
1b341143c0 am:
d737e16da8 am:
100bd75cb7" into nyc-mr2-dev-plus-aosp am:
6cf94e941b
am:
a1ad9965da
Change-Id: I948a07f2e4401225266751d70eb2a1d21f6f81c9
Tina Zhou [Tue, 22 Aug 2017 20:43:47 +0000 (20:43 +0000)]
Merge "x11: Fix deadlock" into nougat-cts-dev am:
34b869eeea am:
05f26155f0 am:
7bb5047d5e am:
1b341143c0 am:
d737e16da8 am:
100bd75cb7 am:
0520585424
am:
af1267ba5f
Change-Id: I2690658581e2641cd61282e22e8ad37c3b3dc958
Chad Versace [Tue, 22 Aug 2017 20:43:13 +0000 (20:43 +0000)]
Merge "x11: Call XInitThreads() am:
5d11c9d2c0 am:
f465d82fa5 am:
0ed6cc912e am:
e7ee6541a9 am:
587123a671 am:
b57d3123ac" into nyc-mr2-dev-plus-aosp am:
c3ee6c9e59
am:
4571e7c02d
Change-Id: I26ce1e5b648c349e03b2bc0882533e629985d855
Chad Versace [Tue, 22 Aug 2017 20:42:38 +0000 (20:42 +0000)]
x11: Call XInitThreads() am:
5d11c9d2c0 am:
f465d82fa5 am:
0ed6cc912e am:
e7ee6541a9 am:
587123a671 am:
b57d3123ac am:
a3d1fd9bc6
am:
f7546773aa
Change-Id: Ib74b4a5f19f403f3a41d61277fb75aae108d263f
Chad Versace [Tue, 22 Aug 2017 20:41:58 +0000 (20:41 +0000)]
Merge "x11: Fix deadlock am:
5e863331b2 am:
7d0ad652ff am:
ca5a475223 am:
319a51d5dd am:
97cc16aa0a am:
ab54c5b0ef" into nyc-mr2-dev-plus-aosp am:
a366b6e884
am:
c2525d73af
Change-Id: I60a472ea05cd389eda50e9910bb27046f5c56507
Chad Versace [Tue, 22 Aug 2017 20:41:15 +0000 (20:41 +0000)]
x11: Fix deadlock am:
5e863331b2 am:
7d0ad652ff am:
ca5a475223 am:
319a51d5dd am:
97cc16aa0a am:
ab54c5b0ef am:
5e2981c0c7
am:
f1b483026f
Change-Id: Ib667fd553ab87f43a5f534c2f3e527be53c2ec32
Tina Zhou [Tue, 22 Aug 2017 20:40:58 +0000 (20:40 +0000)]
Merge "Merge "x11: Fix deadlock" into nougat-cts-dev am:
34b869eeea am:
05f26155f0 am:
7bb5047d5e am:
1b341143c0 am:
d737e16da8 am:
b969431bfd" into nyc-mr2-dev-plus-aosp am:
417cdbb829
am:
8caded009f
Change-Id: Ifccc6ac9ae444ef2fbacaead3c343e0ba605c122
Tina Zhou [Tue, 22 Aug 2017 20:40:43 +0000 (20:40 +0000)]
Merge "x11: Fix deadlock" into nougat-cts-dev am:
34b869eeea am:
05f26155f0 am:
7bb5047d5e am:
1b341143c0 am:
d737e16da8 am:
b969431bfd am:
f837b00a7e
am:
16444b303f
Change-Id: I0a70107b4820a2c837539701ac7e7c47a61de6e5
Tina Zhou [Tue, 22 Aug 2017 20:40:27 +0000 (20:40 +0000)]
Merge "Merge "x11: Call XInitThreads()" into nougat-cts-dev am:
cbdbf95222 am:
6aef236dd0 am:
f23a03362a am:
40ff9476c8 am:
ac78f3c5b7" into nyc-mr2-dev-plus-aosp am:
508ef296d8
am:
db3f6f0f48
Change-Id: Ic188fb635893ed60130bc0ad1c2d7231109fd780
Tina Zhou [Tue, 22 Aug 2017 20:40:10 +0000 (20:40 +0000)]
Merge "x11: Call XInitThreads()" into nougat-cts-dev am:
cbdbf95222 am:
6aef236dd0 am:
f23a03362a am:
40ff9476c8 am:
ac78f3c5b7 am:
5f2ae2d09c
am:
5901732d26
Change-Id: Ic20824a3c4716697a368b23a817085b141f96a08
Chad Versace [Tue, 22 Aug 2017 20:39:52 +0000 (20:39 +0000)]
Merge "x11: Fix deadlock am:
5e863331b2 am:
7d0ad652ff am:
ca5a475223 am:
319a51d5dd am:
97cc16aa0a am:
8b86967b6f" into nyc-mr2-dev-plus-aosp am:
e5b8804c39
am:
046abc286f
Change-Id: I8f8fd362feb657149c3705d9fe39d5039d08d1a5
Chad Versace [Tue, 22 Aug 2017 20:39:32 +0000 (20:39 +0000)]
x11: Fix deadlock am:
5e863331b2 am:
7d0ad652ff am:
ca5a475223 am:
319a51d5dd am:
97cc16aa0a am:
8b86967b6f am:
d7d2897995
am:
2bdcc4700a
Change-Id: I1a08a30f9daf55f15108e3faec8ca2105f49cb07
Chad Versace [Tue, 22 Aug 2017 20:39:08 +0000 (20:39 +0000)]
Merge "x11: Call XInitThreads() am:
5d11c9d2c0 am:
0fe4efcfa8 am:
8c04df2e48 am:
c6bf22467b am:
9c925d6e4b" into nyc-mr2-dev-plus-aosp am:
85a4283f70
am:
b8b59d006f
Change-Id: I7df3da1da3479c93bd3bdbc4619e8487123b2140
Chad Versace [Tue, 22 Aug 2017 20:38:42 +0000 (20:38 +0000)]
x11: Call XInitThreads() am:
5d11c9d2c0 am:
0fe4efcfa8 am:
8c04df2e48 am:
c6bf22467b am:
9c925d6e4b am:
064f3b12bf
am:
8a0850e289
Change-Id: I150f04e03a545432dc81e658bbccb5b935abb2cf
Tina Zhou [Tue, 22 Aug 2017 20:38:07 +0000 (20:38 +0000)]
Merge "Merge "x11: Call XInitThreads()" into nougat-cts-dev am:
cbdbf95222 am:
6aef236dd0 am:
f23a03362a am:
40ff9476c8 am:
e775b6f623" into nyc-mr2-dev-plus-aosp am:
33b8a60c2e
am:
85ec913b61
Change-Id: I2a2b245bfbfa5e7c88fce3581c6a35bf8239b00d
Tina Zhou [Tue, 22 Aug 2017 20:37:27 +0000 (20:37 +0000)]
Merge "x11: Call XInitThreads()" into nougat-cts-dev am:
cbdbf95222 am:
6aef236dd0 am:
f23a03362a am:
40ff9476c8 am:
e775b6f623 am:
ebd824c364
am:
1c8f10e814
Change-Id: If98a7b295ab097ce2b906a39bead26114c726309
Tina Zhou [Tue, 22 Aug 2017 20:36:57 +0000 (20:36 +0000)]
Merge "Merge "x11: Fix deadlock" into nougat-cts-dev am:
34b869eeea am:
b6766f9949 am:
7b1b2f4509 am:
ce18fbd526 am:
243a52b3c7" into nyc-mr2-dev-plus-aosp am:
513d6ae450
am:
6642262b18
Change-Id: Ie411be7ba420eecaaba6e029d8c28739cc09a26d
Tina Zhou [Tue, 22 Aug 2017 20:36:22 +0000 (20:36 +0000)]
Merge "x11: Fix deadlock" into nougat-cts-dev am:
34b869eeea am:
b6766f9949 am:
7b1b2f4509 am:
ce18fbd526 am:
243a52b3c7 am:
b2b1341dbf
am:
eb4d5280cf
Change-Id: I78e1e5c0c71e787f0a37278e2e03bf8425cad17b
Chad Versace [Tue, 22 Aug 2017 20:35:53 +0000 (20:35 +0000)]
Merge "x11: Call XInitThreads() am:
5d11c9d2c0 am:
0fe4efcfa8 am:
8c04df2e48 am:
c6bf22467b am:
6d9bd5e858" into nyc-mr2-dev-plus-aosp am:
8e18c56bea
am:
66d79158cc
Change-Id: I824cb1c6099369471b3d727f2d2e40c9eacd389b
Chad Versace [Tue, 22 Aug 2017 20:35:36 +0000 (20:35 +0000)]
x11: Call XInitThreads() am:
5d11c9d2c0 am:
0fe4efcfa8 am:
8c04df2e48 am:
c6bf22467b am:
6d9bd5e858 am:
c0ae8e7cc0
am:
7cf10533bf
Change-Id: Iac399500107d0902f2836a7f2fb35dc3936f2e33
Chad Versace [Tue, 22 Aug 2017 20:35:20 +0000 (20:35 +0000)]
Merge "x11: Fix deadlock am:
5e863331b2 am:
f49e8bfc0e am:
1eb4f43dc4 am:
c1c16c73e6 am:
a2c167bef6" into nyc-mr2-dev-plus-aosp am:
5655d18351
am:
7bd0c1202c
Change-Id: I506f14d59c5a91b9c65b92ae2a778599ec2ecda4
Chad Versace [Tue, 22 Aug 2017 20:35:03 +0000 (20:35 +0000)]
x11: Fix deadlock am:
5e863331b2 am:
f49e8bfc0e am:
1eb4f43dc4 am:
c1c16c73e6 am:
a2c167bef6 am:
3ce8a6bb44
am:
b58209d17b
Change-Id: I3d4773c590102a77439b56c5e191affbed9cc216
Tina Zhou [Tue, 22 Aug 2017 20:34:46 +0000 (20:34 +0000)]
Merge "x11: Fix deadlock" into nougat-cts-dev am:
34b869eeea am:
b6766f9949 am:
7b1b2f4509 am:
ce18fbd526 am:
aee042a887 am:
e721cf66ec
am:
f0ef04cf5d
Change-Id: I79b829d6df5d39f58dcf649cb19736be2edd0b76
Chad Versace [Tue, 22 Aug 2017 20:34:29 +0000 (20:34 +0000)]
x11: Fix deadlock am:
5e863331b2 am:
f49e8bfc0e am:
1eb4f43dc4 am:
c1c16c73e6 am:
5a37f3c8ca am:
dc23d8bda4
am:
347d7ec658
Change-Id: Ib18ce720a7178f615d900f23d646a3c118c0e66f
Tina Zhou [Tue, 22 Aug 2017 20:34:11 +0000 (20:34 +0000)]
Merge "x11: Call XInitThreads()" into nougat-cts-dev am:
cbdbf95222 am:
a6f61be6c3 am:
63d6f4041f am:
977c4c7527 am:
99638edf78
am:
7daa34fc2f
Change-Id: I58b7773d52d88d663bba5517a181a1167f0e269a
Chad Versace [Tue, 22 Aug 2017 20:33:47 +0000 (20:33 +0000)]
x11: Call XInitThreads() am:
5d11c9d2c0 am:
91a1b97b09 am:
f7dc04d927 am:
7e99d9d115 am:
5ce2636243
am:
6f5aed9611
Change-Id: I4686cdcaf5fc2a65f3056094a5420b739b15b8d2
Tina Zhou [Tue, 22 Aug 2017 20:33:23 +0000 (20:33 +0000)]
Merge "x11: Fix deadlock" into nougat-cts-dev am:
34b869eeea am:
f1dcdc55d5 am:
011e9a2331 am:
2c73a05f63 am:
7212d76131
am:
80b7cbe0fb
Change-Id: I02a1d15148a0461073ace47e5781526ce7786a63
Chad Versace [Tue, 22 Aug 2017 20:32:57 +0000 (20:32 +0000)]
x11: Fix deadlock am:
5e863331b2 am:
cef17b4f69 am:
cc7bb08734 am:
2e6b99b9f2 am:
df22ad0da3
am:
15f8a6d785
Change-Id: I45176d563b0ed1be961371921e2c0c01cfc2f39c
Kalle Raita [Tue, 22 Aug 2017 20:32:13 +0000 (20:32 +0000)]
Merge changes from topic 'am-
afbe65226c664d438460b33cb5a405a8' into nyc-mr1-dev am:
59cabbec64 am:
30d7647d1a am:
e6a281d8fd am:
d3fe6938e0
am:
f67751d540
Change-Id: I556bbe60d8720358e8dfcdafdd5a97c4370e827a
Kalle Raita [Tue, 22 Aug 2017 20:31:43 +0000 (20:31 +0000)]
CP: Remove two read-backs from copy image tests am:
263e135474 am:
a691d5ca5c am:
133b1f4004 am:
d027dbfab7 am:
c6600427cf am:
f80e687d4b
am:
d350f2eb82
Change-Id: Ie42476c707fdfeb108ef6ef562298e8673b1ff3b
Kalle Raita [Tue, 22 Aug 2017 20:31:11 +0000 (20:31 +0000)]
CP: Non-compressed copy image target size (64,64,8 am:
7aff1a044f am:
8afffd6f14 am:
26033dda95 am:
a589a9c3e7 am:
0b8845ead5 am:
5aedc50789
am:
4aa30153c2
Change-Id: I485ad40dbff7e5e24af4b99b7a4cadc695a97925
Kalle Raita [Tue, 22 Aug 2017 20:30:37 +0000 (20:30 +0000)]
CP: Remove two read-backs from copy image tests am:
263e135474 am:
15f98c4682 am:
1e01d9996c am:
46a71ac84b am:
55222675a2 am:
b392aa0efd am:
0d785aba32
am:
6771c7c482
Change-Id: I96e70ff2062211abfbc7ade805c599ab4560dffb
Kalle Raita [Tue, 22 Aug 2017 20:30:21 +0000 (20:30 +0000)]
CP: Non-compressed copy image target size (64,64,8 am:
7aff1a044f am:
0a8b1151da am:
7e383871b1 am:
a49a3b9496 am:
db0570a3fb am:
60583880da am:
951fe8aff8
am:
3958f63d3f
Change-Id: Ifd0b280f496900c947e31399e02178ec8687b9c2
Kalle Raita [Tue, 22 Aug 2017 20:29:49 +0000 (20:29 +0000)]
Merge changes from topic 'am-
afbe65226c664d438460b33cb5a405a8' into nyc-mr1-dev am:
59cabbec64 am:
30d7647d1a am:
f390386f29 am:
89aee89302
am:
9c4a1afa50
Change-Id: Ica1b4657f130b048827c595f6e892cb1d0fa2e86
Kalle Raita [Tue, 22 Aug 2017 20:29:39 +0000 (20:29 +0000)]
CP: Remove two read-backs from copy image tests am:
263e135474 am:
a691d5ca5c am:
133b1f4004 am:
d027dbfab7 am:
60623645b1 am:
47f02beb9e
am:
46ff8823f8
Change-Id: I122fc74dd18e5c3f69ea1fe91ccb5cb984fe6268
Kalle Raita [Tue, 22 Aug 2017 20:29:28 +0000 (20:29 +0000)]
CP: Non-compressed copy image target size (64,64,8 am:
7aff1a044f am:
8afffd6f14 am:
26033dda95 am:
a589a9c3e7 am:
ae4278b487 am:
15dc7ab507
am:
e5e3660015
Change-Id: Ie5e0504d1f9864e027eca6d44a04f3036986436a
Kalle Raita [Tue, 22 Aug 2017 20:29:08 +0000 (20:29 +0000)]
CP: Remove two read-backs from copy image tests am:
263e135474 am:
15f98c4682 am:
1e01d9996c am:
46a71ac84b am:
55222675a2 am:
8c8ba6b6e7 am:
bd239739e4
am:
873898d4b0
Change-Id: I08d179485b5ceb219c5ecb04f94659d93e9853f0
Kalle Raita [Tue, 22 Aug 2017 20:28:56 +0000 (20:28 +0000)]
CP: Non-compressed copy image target size (64,64,8 am:
7aff1a044f am:
0a8b1151da am:
7e383871b1 am:
a49a3b9496 am:
db0570a3fb am:
6626543a3a am:
6050c77b48
am:
f80019343b
Change-Id: I721301af93caa8356d773e4321d4ab6d89ee5f94
Kalle Raita [Tue, 22 Aug 2017 20:28:24 +0000 (20:28 +0000)]
CP: Remove two read-backs from copy image tests am:
263e135474 -s ours am:
462575748a am:
86e2ff7051 am:
33eec04a9a am:
9c27db80ef
am:
c9244da7c9
Change-Id: Ibd814c66c30f29ccb66e4293bc288a0ab502ad97
Kalle Raita [Tue, 22 Aug 2017 20:28:00 +0000 (20:28 +0000)]
CP: Non-compressed copy image target size (64,64,8 am:
7aff1a044f am:
8bb21c1262 am:
c080a2efba am:
0670d1bd72 am:
54a9810ee1
am:
f359e01ac7
Change-Id: If658cd17078100499c490df5009ac70c7229d605
Tina Zhou [Tue, 22 Aug 2017 20:27:34 +0000 (20:27 +0000)]
Merge "Remove tests affected by NV/OES_viewport_array extension" into nougat-cts-dev am:
e98444b9bf am:
41c599b77e am:
9d74d882df am:
b3182128b8 am:
a9eaaaca53 -s ours am:
fd5c16b5cc -s ours am:
8b23a3675e -s ours
am:
cc956d5af9 -s ours
Change-Id: Idb7215a99963eff80f0aaa826a46c42b69fed74d
Pyry Haulos [Tue, 22 Aug 2017 20:26:55 +0000 (20:26 +0000)]
Remove tests affected by NV/OES_viewport_array extension am:
267c765690 am:
e4ed95024e am:
578afa4c88 am:
22a8808370 am:
7b177f2f34 -s ours am:
d8fcc99946 -s ours am:
afa9925458 -s ours
am:
53e4033507 -s ours
Change-Id: I5b2b53076638a1eb9cb1c43ee9f0d4554dd1a191
Tina Zhou [Tue, 22 Aug 2017 20:26:23 +0000 (20:26 +0000)]
Merge "Generate flat triangles in polygon offset tests." into nougat-cts-dev am:
61d6d95a66 am:
5611bf398b am:
e2d1c25650 am:
d368eb8664 am:
8cfa8cb220 am:
cb5a254427 am:
bcd9ecefa9
am:
4662208829
Change-Id: I4bc3ec32c475fded78bbe87f0191101088091210
Alexander Galazin [Tue, 22 Aug 2017 20:25:52 +0000 (20:25 +0000)]
Generate flat triangles in polygon offset tests. am:
975a59ebca am:
0bde00f9d6 am:
b57eb2d24f am:
aa9a995cfc am:
afc69d0dd1 am:
0e3f2fcb41 am:
fa5e828111
am:
9055b0aac5
Change-Id: I054b985a97409b82a16f96597f4da58fb959c0d1
Tina Zhou [Tue, 22 Aug 2017 20:24:48 +0000 (20:24 +0000)]
Merge "Relax line width verification in primitive bbox tests" into nougat-cts-dev am:
312a550657 am:
f3d81a3cd9 am:
3b0479c233 am:
0a2fdff220 am:
d8355f769b am:
49858ea9f7 am:
d4fbf4c6bb
am:
249c4337c7
Change-Id: I9cbfe2869f6e399895222b4f15e719d4001ced3a
Pyry Haulos [Tue, 22 Aug 2017 20:24:28 +0000 (20:24 +0000)]
Relax line width verification in primitive bbox tests am:
ba45591407 am:
b4fbc02e3c am:
b9b63c17d2 am:
4f191e12a9 am:
c29aba4a88 am:
a9cd3623d3 am:
102133f902
am:
7842edb00c
Change-Id: I010e2d0054a5ead58995c37ef5baf2e6cf39b66f
Tina Zhou [Tue, 22 Aug 2017 20:24:11 +0000 (20:24 +0000)]
Merge "Fix eglBindAPI negative test" into nougat-cts-dev am:
6068dfbf3a am:
365f81e68c am:
15cde0b466 am:
b21dbe99b2 am:
930d6894e5 am:
02a44043d8 am:
36e6937809
am:
b136c8668e
Change-Id: Ib2fc8904714a10b5b1f8720d1e8dff48129c058c
Nicolas Boichat [Tue, 22 Aug 2017 20:23:53 +0000 (20:23 +0000)]
Fix eglBindAPI negative test am:
09784f8510 am:
3342150f5a am:
1af587d644 am:
52211c87ed am:
fc116aa764 am:
9e92f92f57 am:
0075efc88a
am:
9436a00607
Change-Id: I710a9445ac54af8364b4a42cf7835be273825ac0
Tina Zhou [Tue, 22 Aug 2017 20:23:36 +0000 (20:23 +0000)]
Merge "Drop incorrect framebuffer texture subtests." into nougat-cts-dev am:
3baf7e3be2 am:
a580ae91f8 am:
816d6bdb88 am:
f49c7ce972 am:
a91d8f9bf5 am:
c9e3a51cd3 am:
a87887160e
am:
444141f34c -s ours
Change-Id: Ie9a7ee1e1b320381a459a9fda5726c84d308bd8c
Kenneth Graunke [Tue, 22 Aug 2017 20:23:13 +0000 (20:23 +0000)]
Drop incorrect framebuffer texture subtests. am:
625d685874 am:
25b6d76b01 am:
6f6f3d78fc am:
18805bd38c am:
ce197d0f27 am:
ac112a3efa am:
4f51a66b4b
am:
c796f582c8 -s ours
Change-Id: I63a56e945233e3e776051141c4040928fb20621b
Tina Zhou [Tue, 22 Aug 2017 20:22:43 +0000 (20:22 +0000)]
Merge "Optimize swapchain OOM tests" into nougat-cts-dev am:
c811d42d99 am:
6d4c0dca61 am:
d64bb66820 am:
ec68ba0951 am:
b7985f162a am:
4e37c3bcf2 am:
34555e78f1
am:
c8124c1184
Change-Id: I3fe6fcb5ce8ad48add0016659cab38d5bf512c32
Pyry Haulos [Tue, 22 Aug 2017 20:22:18 +0000 (20:22 +0000)]
Optimize swapchain OOM tests am:
1614827a71 am:
2cfe132119 am:
00ab17bd23 am:
c9b7dae8a8 am:
acce97d998 am:
dda77bf145 am:
c08b02f568
am:
7a03ba225f
Change-Id: I5a2a1eb991df309068fffa5f49d2b396ec2de527
Tina Zhou [Tue, 22 Aug 2017 20:21:45 +0000 (20:21 +0000)]
Merge "Fix internal format/type for ES3 3D + depth/stencil negative API tests." into nougat-cts-dev am:
0991459ed1 am:
e19d6a6859 am:
e0e2260a4a am:
222ef92210 am:
c6747b082f am:
1a84cd74f0 am:
ee8fb54633
am:
a5fe056c67
Change-Id: Iacafecf55a168ded027bb8de97ee8f27ccfc6a9c
Kenneth Graunke [Tue, 22 Aug 2017 20:21:14 +0000 (20:21 +0000)]
Merge "Fix internal format/type for ES3 3D + depth/stencil negative API tests. am:
2ed3a5a66f am:
6a6f549150 am:
f9b870fb5b am:
b47baae90a am:
76a7f607a5 am:
bdbc876fc7" into nyc-mr2-dev-plus-aosp am:
eed66f190e
am:
cd2f7a60f9
Change-Id: I2a860ddfa96d9613f976f84dd5a1338efef8beb7
Kenneth Graunke [Tue, 22 Aug 2017 20:20:43 +0000 (20:20 +0000)]
Fix internal format/type for ES3 3D + depth/stencil negative API tests. am:
2ed3a5a66f am:
6a6f549150 am:
f9b870fb5b am:
b47baae90a am:
76a7f607a5 am:
bdbc876fc7 am:
517bc8386f
am:
112b6c5a69
Change-Id: Ic5fb002953590b41e90a69a4619274679c220817
Tina Zhou [Tue, 22 Aug 2017 20:20:14 +0000 (20:20 +0000)]
Merge "Merge "Add support for EGL_EXT_pixel_format_float" into nougat-cts-dev am:
13a05434cc am:
5f30178321 am:
764cd6e60b am:
0a683a56e7 am:
e961416ca6 -s ours am:
8cddd0f806 -s ours" into nyc-mr2-dev-plus-aosp am:
54349c2293 -s ours
am:
d1ce66946a -s ours
Change-Id: Icb23e3126e0ecf4c8cc9740e6c7843549b649ffc
Tina Zhou [Tue, 22 Aug 2017 20:19:38 +0000 (20:19 +0000)]
Merge "Add support for EGL_EXT_pixel_format_float" into nougat-cts-dev am:
13a05434cc am:
5f30178321 am:
764cd6e60b am:
0a683a56e7 am:
e961416ca6 -s ours am:
8cddd0f806 -s ours am:
11baa951a3 -s ours
am:
de04a2812a -s ours
Change-Id: I750cbf47934704fb2534045ff2df0180aa03b39d
Mark Adams [Tue, 22 Aug 2017 20:19:18 +0000 (20:19 +0000)]
Merge "Add support for EGL_EXT_pixel_format_float am:
521bf8a7c3 am:
4b7baeace7 am:
86683f95c7 am:
0624edb1ce am:
234daba7b4 -s ours am:
7f9e23d176 -s ours" into nyc-mr2-dev-plus-aosp am:
1fe7e3fe7c -s ours
am:
d66143a1d0 -s ours
Change-Id: I087a3bbc5e84b0df2cc954f4ebcb750ef30326de
Mark Adams [Tue, 22 Aug 2017 20:19:00 +0000 (20:19 +0000)]
Add support for EGL_EXT_pixel_format_float am:
521bf8a7c3 am:
4b7baeace7 am:
86683f95c7 am:
0624edb1ce am:
234daba7b4 -s ours am:
7f9e23d176 -s ours am:
d65e9700af -s ours
am:
bc14bffa0b -s ours
Change-Id: I3635f6ace9531e9cb34327fb963f943b2f8b080a
Tina Zhou [Tue, 22 Aug 2017 20:18:44 +0000 (20:18 +0000)]
Merge "Merge "Remove tests affected by NV/OES_viewport_array extension" into nougat-cts-dev am:
e98444b9bf am:
ce3144c3e5 am:
29dde7d04d am:
4ac909cfeb -s ours am:
50df351a0f -s ours" into nyc-mr2-dev-plus-aosp am:
37b8c78167 -s ours
am:
f870fb12f7 -s ours
Change-Id: Ic4ee609ee486d52df4e1168c2010018d9d28c7ff
Tina Zhou [Tue, 22 Aug 2017 20:18:26 +0000 (20:18 +0000)]
Merge "Remove tests affected by NV/OES_viewport_array extension" into nougat-cts-dev am:
e98444b9bf am:
ce3144c3e5 am:
29dde7d04d am:
4ac909cfeb -s ours am:
50df351a0f -s ours am:
fc588a0281 -s ours
am:
24371c5d2d -s ours
Change-Id: I62879bb73f6dda65caa1b16b6be6c8d212eb3ac4
Pyry Haulos [Tue, 22 Aug 2017 20:17:46 +0000 (20:17 +0000)]
Merge "Remove tests affected by NV/OES_viewport_array extension am:
267c765690 am:
0004ce1767 am:
ee2a180f00 am:
20860eb2df -s ours am:
a4982bfb72 -s ours" into nyc-mr2-dev-plus-aosp am:
4b45e7bd91 -s ours
am:
0a44212786 -s ours
Change-Id: Ic6d2983615eba973b6a12ec9a54509420af1d76d
Pyry Haulos [Tue, 22 Aug 2017 20:17:12 +0000 (20:17 +0000)]
Remove tests affected by NV/OES_viewport_array extension am:
267c765690 am:
0004ce1767 am:
ee2a180f00 am:
20860eb2df -s ours am:
a4982bfb72 -s ours am:
22f1c94794 -s ours
am:
46144bbf64 -s ours
Change-Id: I99da23fc96ef2f176be8f90bd6762b69eb6e787a
Tina Zhou [Tue, 22 Aug 2017 20:16:41 +0000 (20:16 +0000)]
Merge "Merge "Merge "Generate flat triangles in polygon offset tests." into nougat-cts-dev am:
61d6d95a66 am:
73b7f271a9 am:
0b9596cb35 am:
436488b78f" into nyc-mr1-dev-plus-aosp am:
715c4b7814" into nyc-mr2-dev-plus-aosp am:
adf01af3de
am:
8e8c90ec5a
Change-Id: Ie71e61bac4bc13779fed78645c7aa391f6080d6b
Tina Zhou [Tue, 22 Aug 2017 20:16:11 +0000 (20:16 +0000)]
Merge "Merge "Generate flat triangles in polygon offset tests." into nougat-cts-dev am:
61d6d95a66 am:
73b7f271a9 am:
0b9596cb35 am:
436488b78f" into nyc-mr1-dev-plus-aosp am:
715c4b7814 am:
2b9d5aeaed
am:
efd459637b
Change-Id: Ifbccc95fa9680f6e60a05d4490e4b4e4d7b06d3d
Tina Zhou [Tue, 22 Aug 2017 20:15:41 +0000 (20:15 +0000)]
Merge "Merge "Generate flat triangles in polygon offset tests." into nougat-cts-dev am:
61d6d95a66 am:
73b7f271a9 am:
0b9596cb35 am:
436488b78f am:
336f66bfc4" into nyc-mr2-dev-plus-aosp am:
f91ebf94ee
am:
58b2d980ab
Change-Id: I409a88ace31615016f5794ceb2992a1c07dd800c
Tina Zhou [Tue, 22 Aug 2017 20:15:12 +0000 (20:15 +0000)]
Merge "Generate flat triangles in polygon offset tests." into nougat-cts-dev am:
61d6d95a66 am:
73b7f271a9 am:
0b9596cb35 am:
436488b78f am:
336f66bfc4 am:
b292b527a2
am:
34f90f1d46
Change-Id: I2fdaadd983cf92f9aa607a4351f343cbdd765d58
Alexander Galazin [Tue, 22 Aug 2017 20:14:42 +0000 (20:14 +0000)]
Merge "Merge "Generate flat triangles in polygon offset tests. am:
975a59ebca am:
02c67b12c1 am:
0e7da13770 am:
0dbb18ee84" into nyc-mr1-dev-plus-aosp am:
146f745175" into nyc-mr2-dev-plus-aosp am:
4e03af8651
am:
1802612324
Change-Id: Idd513cf6b95bd5ccab502fe5f5330b825cf09854
Alexander Galazin [Tue, 22 Aug 2017 20:14:12 +0000 (20:14 +0000)]
Merge "Generate flat triangles in polygon offset tests. am:
975a59ebca am:
02c67b12c1 am:
0e7da13770 am:
0dbb18ee84" into nyc-mr1-dev-plus-aosp am:
146f745175 am:
530e6896b9
am:
9c916450da
Change-Id: I7fabffca27cce11e466173096f08c7a2921c3990
Alexander Galazin [Tue, 22 Aug 2017 20:13:48 +0000 (20:13 +0000)]
Merge "Generate flat triangles in polygon offset tests. am:
975a59ebca am:
02c67b12c1 am:
0e7da13770 am:
0dbb18ee84 am:
4c08ce83d1" into nyc-mr2-dev-plus-aosp am:
301456c250
am:
1e1b35c19d
Change-Id: I33b296b272d63bb5fd2693ba65f3b9f3e7811611
Alexander Galazin [Tue, 22 Aug 2017 20:13:31 +0000 (20:13 +0000)]
Generate flat triangles in polygon offset tests. am:
975a59ebca am:
02c67b12c1 am:
0e7da13770 am:
0dbb18ee84 am:
4c08ce83d1 am:
01ccf676e3
am:
1cc4fc41ae
Change-Id: I6b6e143f8581a7bf23daa5b0516b0428f49f943d
Tina Zhou [Tue, 22 Aug 2017 20:13:16 +0000 (20:13 +0000)]
Merge "Merge "Merge "Relax line width verification in primitive bbox tests" into nougat-cts-dev am:
312a550657 am:
36d3dd2ab1 am:
5debc545bf am:
ee10cd68f7" into nyc-mr1-dev-plus-aosp am:
977fa4ba31" into nyc-mr2-dev-plus-aosp am:
ae5446cbdc
am:
315e51f00f
Change-Id: I6ef6f3ec353223115308e3a8d55a6ca6b5079164
Tina Zhou [Tue, 22 Aug 2017 20:13:00 +0000 (20:13 +0000)]
Merge "Merge "Relax line width verification in primitive bbox tests" into nougat-cts-dev am:
312a550657 am:
36d3dd2ab1 am:
5debc545bf am:
ee10cd68f7" into nyc-mr1-dev-plus-aosp am:
977fa4ba31 am:
1fb18eaaf9
am:
e29a1603ff
Change-Id: Ie6be7d6721cd5d04e0e89b8364e554e63f268031
Tina Zhou [Tue, 22 Aug 2017 20:12:43 +0000 (20:12 +0000)]
Merge "Merge "Relax line width verification in primitive bbox tests" into nougat-cts-dev am:
312a550657 am:
36d3dd2ab1 am:
5debc545bf am:
ee10cd68f7 am:
bc02b9f045" into nyc-mr2-dev-plus-aosp am:
d065cd796c
am:
19229c4e69
Change-Id: I3b876bc68bc37ec044f912d85bf47f360146b630
Tina Zhou [Tue, 22 Aug 2017 20:12:23 +0000 (20:12 +0000)]
Merge "Relax line width verification in primitive bbox tests" into nougat-cts-dev am:
312a550657 am:
36d3dd2ab1 am:
5debc545bf am:
ee10cd68f7 am:
bc02b9f045 am:
54491f9f70
am:
29e0383930
Change-Id: I912cee9e4cbf3b9c0b9a40e8e88224a64d9a3c8d
Tina Zhou [Tue, 22 Aug 2017 20:12:07 +0000 (20:12 +0000)]
Merge "Merge "Merge "Remove tests affected by NV/OES_viewport_array extension" into nougat-cts-dev am:
e98444b9bf -s ours am:
1d2a009979 -s ours am:
2c6307af33 -s ours" into nyc-mr1-dev-plus-aosp am:
cf38dd18f9 -s ours" into nyc-mr2-dev-plus-aosp am:
8ddf92f83f -s ours
am:
965c7d51e7 -s ours
Change-Id: Ib1b6362db1d314733942b5eb002414bd78b52a23
Tina Zhou [Tue, 22 Aug 2017 20:11:39 +0000 (20:11 +0000)]
Merge "Merge "Remove tests affected by NV/OES_viewport_array extension" into nougat-cts-dev am:
e98444b9bf -s ours am:
1d2a009979 -s ours am:
2c6307af33 -s ours" into nyc-mr1-dev-plus-aosp am:
cf38dd18f9 -s ours am:
731f55380c -s ours
am:
cfaa19e31c -s ours
Change-Id: Ie1f567d1163b2608d0c78ccc65be46b6f55fad1f
Tina Zhou [Tue, 22 Aug 2017 20:11:11 +0000 (20:11 +0000)]
Merge "Merge "Remove tests affected by NV/OES_viewport_array extension" into nougat-cts-dev am:
e98444b9bf -s ours am:
1d2a009979 -s ours am:
2c6307af33 -s ours am:
57ac8058b6 -s ours" into nyc-mr2-dev-plus-aosp am:
85830e3e45 -s ours
am:
b63867c2a7 -s ours
Change-Id: I6501fbc0c7bb67914bb95033a7395b22762ada39
Tina Zhou [Tue, 22 Aug 2017 20:10:40 +0000 (20:10 +0000)]
Merge "Remove tests affected by NV/OES_viewport_array extension" into nougat-cts-dev am:
e98444b9bf -s ours am:
1d2a009979 -s ours am:
2c6307af33 -s ours am:
57ac8058b6 -s ours am:
91f0b198ee -s ours
am:
7bc2a136f9 -s ours
Change-Id: Idf2c88674a7adbe4e96f7ae01b17bbc5b2980be2
Pyry Haulos [Tue, 22 Aug 2017 20:09:50 +0000 (20:09 +0000)]
Merge "Merge "Remove tests affected by NV/OES_viewport_array extension am:
267c765690 -s ours am:
55fe6e8997 -s ours am:
7bab558fb8 -s ours" into nyc-mr1-dev-plus-aosp am:
a185466ba9 -s ours" into nyc-mr2-dev-plus-aosp am:
9f321a7874 -s ours
am:
7023b4e3dd -s ours
Change-Id: I2c4064b7df787b76555a5709a3190a53d9518c26
Pyry Haulos [Tue, 22 Aug 2017 20:09:12 +0000 (20:09 +0000)]
Merge "Remove tests affected by NV/OES_viewport_array extension am:
267c765690 -s ours am:
55fe6e8997 -s ours am:
7bab558fb8 -s ours" into nyc-mr1-dev-plus-aosp am:
a185466ba9 -s ours am:
3b908a5583 -s ours
am:
6b37ec2382 -s ours
Change-Id: I5e698854a23f2a0a7e93c357affe0f40f7bf9366
Pyry Haulos [Tue, 22 Aug 2017 20:08:42 +0000 (20:08 +0000)]
Merge "Remove tests affected by NV/OES_viewport_array extension am:
267c765690 -s ours am:
55fe6e8997 -s ours am:
7bab558fb8 -s ours am:
578e9af267 -s ours" into nyc-mr2-dev-plus-aosp am:
00e79d6cb0 -s ours
am:
50a7d61bbe -s ours
Change-Id: I34ffc412dbe315f28cb6e749de45a2d9b0257f3f
Pyry Haulos [Tue, 22 Aug 2017 20:08:14 +0000 (20:08 +0000)]
Remove tests affected by NV/OES_viewport_array extension am:
267c765690 -s ours am:
55fe6e8997 -s ours am:
7bab558fb8 -s ours am:
578e9af267 -s ours am:
a98fc6842f -s ours
am:
823c4b28f5 -s ours
Change-Id: Idb3634ca4d497d77b243b2622993b18446b855f0
Tina Zhou [Tue, 22 Aug 2017 20:07:53 +0000 (20:07 +0000)]
Merge "Merge "Remove tests affected by NV/OES_viewport_array extension" into nougat-cts-dev am:
e98444b9bf am:
41c599b77e am:
9d74d882df am:
b3182128b8 am:
a9eaaaca53 am:
c0d6b5c22b -s ours" into nyc-mr2-dev-plus-aosp am:
1a7a472c46 -s ours
am:
742f1b4a4d -s ours
Change-Id: Ibd8f506fdc2fceebec11a44466719a10a8e0b785
Tina Zhou [Tue, 22 Aug 2017 20:07:36 +0000 (20:07 +0000)]
Merge "Remove tests affected by NV/OES_viewport_array extension" into nougat-cts-dev am:
e98444b9bf am:
41c599b77e am:
9d74d882df am:
b3182128b8 am:
a9eaaaca53 am:
c0d6b5c22b -s ours am:
ab3c5142fa -s ours
am:
68064c940c -s ours
Change-Id: I704816838b9336c1a14599a4dd5d541cd91169ce
Pyry Haulos [Tue, 22 Aug 2017 20:07:19 +0000 (20:07 +0000)]
Merge "Remove tests affected by NV/OES_viewport_array extension am:
267c765690 am:
e4ed95024e am:
578afa4c88 am:
22a8808370 am:
7b177f2f34 am:
3665d90d07 -s ours" into nyc-mr2-dev-plus-aosp am:
0814dedc8b -s ours
am:
e553090f6a -s ours
Change-Id: Ie51159d7cdb90ffe8f3ef41be3b6e5295f041f6a
Pyry Haulos [Tue, 22 Aug 2017 20:07:00 +0000 (20:07 +0000)]
Remove tests affected by NV/OES_viewport_array extension am:
267c765690 am:
e4ed95024e am:
578afa4c88 am:
22a8808370 am:
7b177f2f34 am:
3665d90d07 -s ours am:
606e0ad44f -s ours
am:
147a43941b -s ours
Change-Id: Ic5ef0dc2ca678dcec85cd121e19740970c9d2613
Tina Zhou [Tue, 22 Aug 2017 20:06:24 +0000 (20:06 +0000)]
Merge "Merge "Generate flat triangles in polygon offset tests." into nougat-cts-dev am:
61d6d95a66 am:
5611bf398b am:
e2d1c25650 am:
d368eb8664 am:
8cfa8cb220 am:
987939f284" into nyc-mr2-dev-plus-aosp am:
c4617ac622
am:
5d201524b3
Change-Id: Ib4e43da1c9acc82d58f5ba0ad89c2cb241046a05
Tina Zhou [Tue, 22 Aug 2017 20:05:54 +0000 (20:05 +0000)]
Merge "Generate flat triangles in polygon offset tests." into nougat-cts-dev am:
61d6d95a66 am:
5611bf398b am:
e2d1c25650 am:
d368eb8664 am:
8cfa8cb220 am:
987939f284 am:
92f412bb50
am:
2f6cf734f8
Change-Id: Ie6888f76dfc8b936b79d28d7d50acf7ba4015b28
Alexander Galazin [Tue, 22 Aug 2017 20:05:17 +0000 (20:05 +0000)]
Merge "Generate flat triangles in polygon offset tests. am:
975a59ebca am:
0bde00f9d6 am:
b57eb2d24f am:
aa9a995cfc am:
afc69d0dd1 am:
f7bcd5d876" into nyc-mr2-dev-plus-aosp am:
d6eee093f9
am:
ed947b61ab
Change-Id: I55afec651c6b6a70c15c3993e6cdf9517d110839
Alexander Galazin [Tue, 22 Aug 2017 20:04:05 +0000 (20:04 +0000)]
Generate flat triangles in polygon offset tests. am:
975a59ebca am:
0bde00f9d6 am:
b57eb2d24f am:
aa9a995cfc am:
afc69d0dd1 am:
f7bcd5d876 am:
4fdce7d4d1
am:
1ead02dfc6
Change-Id: I6ef16bc7b94ebb962fe8744da97cf36e94e7d36a
Tina Zhou [Tue, 22 Aug 2017 20:03:25 +0000 (20:03 +0000)]
Merge "Merge "Relax line width verification in primitive bbox tests" into nougat-cts-dev am:
312a550657 am:
f3d81a3cd9 am:
3b0479c233 am:
0a2fdff220 am:
d8355f769b am:
a4ca32e8d3" into nyc-mr2-dev-plus-aosp am:
bb99be6bcd
am:
178fdad625
Change-Id: Id93307c696c142e2be99248dadc5ac6f93526733
Tina Zhou [Tue, 22 Aug 2017 20:02:50 +0000 (20:02 +0000)]
Merge "Relax line width verification in primitive bbox tests" into nougat-cts-dev am:
312a550657 am:
f3d81a3cd9 am:
3b0479c233 am:
0a2fdff220 am:
d8355f769b am:
a4ca32e8d3 am:
10374df5c4
am:
8a09cd85d6
Change-Id: Icb30357f1001ecedbc972820076cc450014b0ad7
Pyry Haulos [Tue, 22 Aug 2017 20:02:32 +0000 (20:02 +0000)]
Merge "Relax line width verification in primitive bbox tests am:
ba45591407 am:
b4fbc02e3c am:
b9b63c17d2 am:
4f191e12a9 am:
c29aba4a88 am:
e29f3de157" into nyc-mr2-dev-plus-aosp am:
140a9f7e32
am:
76d12d66d0
Change-Id: I6920670e0cdbbc732ae34d79cbb712e579e616e5
Pyry Haulos [Tue, 22 Aug 2017 20:02:10 +0000 (20:02 +0000)]
Relax line width verification in primitive bbox tests am:
ba45591407 am:
b4fbc02e3c am:
b9b63c17d2 am:
4f191e12a9 am:
c29aba4a88 am:
e29f3de157 am:
befdc5649a
am:
a4f27e56a9
Change-Id: I6f7c04425b5556f1fef027a425bfa6d18e32619a
Tina Zhou [Tue, 22 Aug 2017 20:01:53 +0000 (20:01 +0000)]
Merge "Merge "Fix eglBindAPI negative test" into nougat-cts-dev am:
6068dfbf3a am:
365f81e68c am:
15cde0b466 am:
b21dbe99b2 am:
930d6894e5 am:
1a09b5270f" into nyc-mr2-dev-plus-aosp am:
1a22842512
am:
ba94cb3ad6
Change-Id: I6dfa2ebe25c7fdf18dbbdff645b8333de7ecff02
Tina Zhou [Tue, 22 Aug 2017 20:01:37 +0000 (20:01 +0000)]
Merge "Fix eglBindAPI negative test" into nougat-cts-dev am:
6068dfbf3a am:
365f81e68c am:
15cde0b466 am:
b21dbe99b2 am:
930d6894e5 am:
1a09b5270f am:
5999552dcf
am:
5d26ea8bed
Change-Id: I8655ebf9f352cec3cb25bf1d3c34cc1104ccf1b6