Chad Versace [Mon, 23 Jan 2017 19:43:51 +0000 (19:43 +0000)]
x11: Fix deadlock am:
5e863331b2 am:
f49e8bfc0e am:
1eb4f43dc4
am:
c1c16c73e6
Change-Id: Icb646126efe9305543fea1668983d89b53035a32
Chad Versace [Mon, 23 Jan 2017 19:37:08 +0000 (19:37 +0000)]
x11: Fix deadlock am:
5e863331b2 am:
f49e8bfc0e
am:
1eb4f43dc4
Change-Id: Ifa42ea781f68bf222c085febb068690003c52f6b
Tina Zhou [Mon, 23 Jan 2017 19:26:32 +0000 (19:26 +0000)]
Merge "x11: Call XInitThreads()" into nougat-cts-dev am:
cbdbf95222 am:
a6f61be6c3
am:
63d6f4041f
Change-Id: I79544764c0d1fabba79afd3becfd1ab7509b444f
Chad Versace [Mon, 23 Jan 2017 19:26:20 +0000 (19:26 +0000)]
x11: Call XInitThreads() am:
5d11c9d2c0 am:
91a1b97b09
am:
f7dc04d927
Change-Id: I01428702676d7f668336ca5a4ccd1766c7df92af
Tina Zhou [Mon, 23 Jan 2017 19:26:10 +0000 (19:26 +0000)]
Merge "x11: Fix deadlock" into nougat-cts-dev am:
34b869eeea am:
f1dcdc55d5
am:
011e9a2331
Change-Id: I22272cc5f66c360d4bb6245dbd9f806414c49ae7
Chad Versace [Mon, 23 Jan 2017 19:25:59 +0000 (19:25 +0000)]
x11: Fix deadlock am:
5e863331b2 am:
cef17b4f69
am:
cc7bb08734
Change-Id: I535072d2ce803040e456bc03e7a7b735b568a3d3
Chad Versace [Mon, 23 Jan 2017 19:24:25 +0000 (19:24 +0000)]
x11: Fix deadlock am:
5e863331b2
am:
f49e8bfc0e
Change-Id: I369a74b5b264d481506b413fcacc1f845c3ab68f
Tina Zhou [Mon, 23 Jan 2017 19:22:38 +0000 (19:22 +0000)]
Merge "x11: Call XInitThreads()" into nougat-cts-dev am:
cbdbf95222
am:
a6f61be6c3
Change-Id: I8f6e08168004906b53c8317556bbad339aea875e
Chad Versace [Mon, 23 Jan 2017 19:22:25 +0000 (19:22 +0000)]
x11: Call XInitThreads() am:
5d11c9d2c0
am:
91a1b97b09
Change-Id: I91ec061ca04588ab8fc0d14b881f5ee77218994c
Tina Zhou [Mon, 23 Jan 2017 19:22:13 +0000 (19:22 +0000)]
Merge "x11: Fix deadlock" into nougat-cts-dev am:
34b869eeea
am:
f1dcdc55d5
Change-Id: Ic823ceca5963c2fcb5ab4be0324cb57cfb102561
Chad Versace [Mon, 23 Jan 2017 19:22:02 +0000 (19:22 +0000)]
x11: Fix deadlock am:
5e863331b2
am:
cef17b4f69
Change-Id: Ib421c76250a51295f84e792c095128e7f065aaba
Chad Versace [Mon, 23 Jan 2017 19:12:10 +0000 (19:12 +0000)]
x11: Fix deadlock
am:
5e863331b2
Change-Id: Ic938e269f89e59fc9ab8b43c97efcb49e0317180
Tina Zhou [Mon, 23 Jan 2017 19:11:49 +0000 (19:11 +0000)]
Merge "x11: Call XInitThreads()" into nougat-cts-dev
am:
cbdbf95222
Change-Id: I063e616e5eb47560c87e4e550cb41e29bddca05a
Chad Versace [Mon, 23 Jan 2017 19:11:47 +0000 (19:11 +0000)]
x11: Call XInitThreads()
am:
5d11c9d2c0
Change-Id: Ibdd37ad696a32e47d56e7138949cac34cb6245a8
Tina Zhou [Mon, 23 Jan 2017 19:11:34 +0000 (19:11 +0000)]
Merge "x11: Fix deadlock" into nougat-cts-dev
am:
34b869eeea
Change-Id: I7af8485bb0a56711f3dfe09bd16bf26bc7b5588a
Chad Versace [Mon, 23 Jan 2017 19:11:32 +0000 (19:11 +0000)]
x11: Fix deadlock
am:
5e863331b2
Change-Id: I1de362ce859395f3c7c932b1d6ad652925516dda
Tina Zhou [Mon, 23 Jan 2017 19:09:19 +0000 (19:09 +0000)]
Merge "x11: Call XInitThreads()" into nougat-cts-dev
Tina Zhou [Mon, 23 Jan 2017 19:06:21 +0000 (19:06 +0000)]
Merge "x11: Fix deadlock" into nougat-cts-dev
Kalle Raita [Sat, 21 Jan 2017 00:49:06 +0000 (00:49 +0000)]
Merge changes from topic 'am-
afbe65226c664d438460b33cb5a405a8' into nyc-mr1-dev am:
59cabbec64
am:
30d7647d1a
Change-Id: I30204d8e3c73d29c648e638a7d3b85a2369e7c87
Kalle Raita [Sat, 21 Jan 2017 00:49:03 +0000 (00:49 +0000)]
CP: Remove two read-backs from copy image tests am:
263e135474 am:
a691d5ca5c am:
133b1f4004
am:
d027dbfab7
Change-Id: Ife58d5d957a2155b5ffdd91391e2e9340c88d1af
Kalle Raita [Sat, 21 Jan 2017 00:48:59 +0000 (00:48 +0000)]
CP: Non-compressed copy image target size (64,64,8 am:
7aff1a044f am:
8afffd6f14 am:
26033dda95
am:
a589a9c3e7
Change-Id: I3e79ade547c5f44d9a5a2324c387e4a0023cee87
Kalle Raita [Sat, 21 Jan 2017 00:48:40 +0000 (00:48 +0000)]
CP: Remove two read-backs from copy image tests am:
263e135474 am:
15f98c4682 am:
1e01d9996c am:
46a71ac84b
am:
55222675a2
Change-Id: Iadef15a7a4ae8b61083b20d63485e7d80391eb93
Kalle Raita [Sat, 21 Jan 2017 00:48:37 +0000 (00:48 +0000)]
CP: Non-compressed copy image target size (64,64,8 am:
7aff1a044f am:
0a8b1151da am:
7e383871b1 am:
a49a3b9496
am:
db0570a3fb
Change-Id: Ibb970484e64bc979af48e079d6b6fae6d01fabde
Kalle Raita [Sat, 21 Jan 2017 00:44:39 +0000 (00:44 +0000)]
CP: Remove two read-backs from copy image tests am:
263e135474 -s ours am:
462575748a
am:
86e2ff7051
Change-Id: Ief01ede52502fbec19a0b11d68ec3ea0ecb89c47
Kalle Raita [Sat, 21 Jan 2017 00:44:35 +0000 (00:44 +0000)]
CP: Non-compressed copy image target size (64,64,8 am:
7aff1a044f am:
8bb21c1262
am:
c080a2efba
Change-Id: I8ffe404a5e7735c351c5291ccd88f8835051c195
Kalle Raita [Sat, 21 Jan 2017 00:41:12 +0000 (00:41 +0000)]
CP: Remove two read-backs from copy image tests am:
263e135474 -s ours
am:
462575748a
Change-Id: Ib7de359a842c02a280f8970e6d6e3221043722dc
Kalle Raita [Sat, 21 Jan 2017 00:41:05 +0000 (00:41 +0000)]
CP: Non-compressed copy image target size (64,64,8 am:
7aff1a044f
am:
8bb21c1262
Change-Id: I11185aeebe3f3ad4cfb51015f1e0087514a2ce09
Kalle Raita [Sat, 21 Jan 2017 00:35:05 +0000 (00:35 +0000)]
CP: Remove two read-backs from copy image tests
am:
263e135474 -s ours
Change-Id: I3145b66433218cbd2d7a13452d2626cda66f001e
Kalle Raita [Sat, 21 Jan 2017 00:35:03 +0000 (00:35 +0000)]
CP: Non-compressed copy image target size (64,64,8
am:
7aff1a044f
Change-Id: I263ee368df721429983ace2e80a4ddeb17c2e2c3
Kalle Raita [Sat, 21 Jan 2017 00:35:00 +0000 (00:35 +0000)]
Merge changes from topic 'am-
afbe65226c664d438460b33cb5a405a8' into nyc-mr1-dev
am:
59cabbec64
Change-Id: I4fc12577f16110122dcd4d2c5abaff4403835380
Kalle Raita [Sat, 21 Jan 2017 00:34:59 +0000 (00:34 +0000)]
CP: Remove two read-backs from copy image tests am:
263e135474 am:
a691d5ca5c
am:
133b1f4004
Change-Id: I9f0472bb2e93a25d51df3173ccea79c4b4c826c9
Kalle Raita [Sat, 21 Jan 2017 00:34:56 +0000 (00:34 +0000)]
CP: Non-compressed copy image target size (64,64,8 am:
7aff1a044f am:
8afffd6f14
am:
26033dda95
Change-Id: Ie3ad754240b856142109b620bb81fa5ef104b5fe
Kalle Raita [Sat, 21 Jan 2017 00:34:37 +0000 (00:34 +0000)]
CP: Remove two read-backs from copy image tests am:
263e135474 am:
15f98c4682 am:
1e01d9996c
am:
46a71ac84b
Change-Id: Ic9ace513b43236bfe49f834ffef729d8040530e7
Kalle Raita [Sat, 21 Jan 2017 00:34:34 +0000 (00:34 +0000)]
CP: Non-compressed copy image target size (64,64,8 am:
7aff1a044f am:
0a8b1151da am:
7e383871b1
am:
a49a3b9496
Change-Id: I918615688004719fb19964cbbe4473b0f1114086
Android Build Merger (Role) [Sat, 21 Jan 2017 00:30:49 +0000 (00:30 +0000)]
Merge changes from topic 'am-
afbe65226c664d438460b33cb5a405a8' into nyc-mr1-dev
* changes:
CP: Remove two read-backs from copy image tests am:
263e135474 am:
a691d5ca5c
CP: Non-compressed copy image target size (64,64,8 am:
7aff1a044f am:
8afffd6f14
Kalle Raita [Sat, 21 Jan 2017 00:30:36 +0000 (00:30 +0000)]
CP: Remove two read-backs from copy image tests am:
263e135474
am:
a691d5ca5c
Change-Id: I642aa8095127a59e1f8afd5f007c5f2eb8648fb9
Kalle Raita [Sat, 21 Jan 2017 00:30:35 +0000 (00:30 +0000)]
CP: Remove two read-backs from copy image tests am:
263e135474 am:
15f98c4682
am:
1e01d9996c
Change-Id: I4c822bda73622190ac818df7b6c98b1d76ebb277
Kalle Raita [Sat, 21 Jan 2017 00:30:34 +0000 (00:30 +0000)]
CP: Non-compressed copy image target size (64,64,8 am:
7aff1a044f
am:
8afffd6f14
Change-Id: I61eb1f9bab9ae8deb773335829a6d7b20b02ad3a
Kalle Raita [Sat, 21 Jan 2017 00:30:33 +0000 (00:30 +0000)]
CP: Non-compressed copy image target size (64,64,8 am:
7aff1a044f am:
0a8b1151da
am:
7e383871b1
Change-Id: I82784ce881898adccdb369aff0ddfdf1809b0a47
Kalle Raita [Sat, 21 Jan 2017 00:26:34 +0000 (00:26 +0000)]
CP: Remove two read-backs from copy image tests am:
263e135474
am:
15f98c4682
Change-Id: Icd48f284f4eca51f9e9a43c8e18fdbb0bf5d4329
Kalle Raita [Sat, 21 Jan 2017 00:26:32 +0000 (00:26 +0000)]
CP: Non-compressed copy image target size (64,64,8 am:
7aff1a044f
am:
0a8b1151da
Change-Id: I5e5fdb849745a918172aeeb7a02b2ea50aa5452c
Kalle Raita [Sat, 21 Jan 2017 00:23:35 +0000 (00:23 +0000)]
CP: Remove two read-backs from copy image tests
am:
263e135474
Change-Id: I9926edda54ffa5bdb0b5b7f9aeac08aab58237e8
Kalle Raita [Sat, 21 Jan 2017 00:23:33 +0000 (00:23 +0000)]
CP: Non-compressed copy image target size (64,64,8
am:
7aff1a044f
Change-Id: I55e1c77eb6558a7a396707cf541d529394be34b7
Kalle Raita [Sat, 21 Jan 2017 00:23:04 +0000 (00:23 +0000)]
CP: Remove two read-backs from copy image tests
am:
263e135474
Change-Id: I95d4c24ff9a12d774586e02e96a80bd91e045b7d
Kalle Raita [Sat, 21 Jan 2017 00:23:02 +0000 (00:23 +0000)]
CP: Non-compressed copy image target size (64,64,8
am:
7aff1a044f
Change-Id: Ie7f9febff6fb0ffa17d98ba3885fbdefb7335a6f
Chad Versace [Fri, 20 Jan 2017 22:59:10 +0000 (14:59 -0800)]
x11: Fix deadlock
When waiting for a window's MapNotify event, drain only that window's
event queue. Do NOT drain the global event queue, which includes all
windows' events.
Fixes deadlock in test 'dEQP-EGL.functional.multithread.window_context'
on Mesa master@
f57bdd48 with Intel Skylake.
Change-Id: I8c7f2db6c145f59493cb7572b20c4799e9a2cd0a
Depends-On: Ib3b535cec8295e062994fd759ae083c78641cf13
Chad Versace [Tue, 27 Dec 2016 21:47:33 +0000 (13:47 -0800)]
x11: Call XInitThreads()
Because the X11 manual says we must.
From man:XInitThreads(3):
The XInitThreads function initializes Xlib support for concurrent
threads. This function must be the first Xlib function
a multi-threaded program calls, and it must complete before any other
Xlib call is made.
Fixes crash in multithreaded test:
Test case 'dEQP-EGL.functional.multithread.window_context'..
[xcb] Unknown sequence number while processing queue
[xcb] Most likely this is a multi-threaded client and XInitThreads has not been called
[xcb] Aborting, sorry about that.
deqp-egl: xcb_io.c:259: poll_for_event: Assertion `!xcb_xlib_threads_sequence_lost' failed.
Change-Id: Ib3b535cec8295e062994fd759ae083c78641cf13
Kalle Raita [Thu, 1 Sep 2016 20:21:50 +0000 (13:21 -0700)]
CP: Remove two read-backs from copy image tests
Cherry pick commit
b2fb8ad5ceefe26964101bd403e7786ae83274a9
from master.
Bug:
33965234
Remove two read-backs from copy image tests
Test: Ran copy_image on N6 & N9 with L MR1 image to check for
false-negatives. PixelC and Pixel XL for passing with current OS image.
Change-Id: I9f7028eb550012f8d9abe2f7afee2d1402f5abf3
Kalle Raita [Wed, 7 Dec 2016 17:41:41 +0000 (09:41 -0800)]
CP: Non-compressed copy image target size (64,64,8
Cherry-pick commit
8076c97ac0fc706288ef266b0cbe748012c4e0c4 from master:
Non-compressed copy image tests target size reduced to (64,64,8). The
compressed cases retain old size of (128,128,16) to ensure coverage of
all block size combinations.
Bug:
33965234
Test: Run tests on N6 and N9 on L MR 1 with known failures
Change-Id: If22e8722c1de58aa239cf6fe29e79d3bdd13c589
Tina Zhou [Fri, 20 Jan 2017 20:43:38 +0000 (20:43 +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
Change-Id: I1f9541e557c882d978b2f28ac19d661d966a7fc7
Pyry Haulos [Fri, 20 Jan 2017 20:43:23 +0000 (20:43 +0000)]
Remove tests affected by NV/OES_viewport_array extension am:
267c765690 am:
e4ed95024e am:
578afa4c88 am:
22a8808370
am:
7b177f2f34 -s ours
Change-Id: Ib3c92fbb2286febb1edc3d3cbd98c885238c4918
Tina Zhou [Fri, 20 Jan 2017 20:43:10 +0000 (20:43 +0000)]
Merge "Generate flat triangles in polygon offset tests." into nougat-cts-dev am:
61d6d95a66 am:
5611bf398b am:
e2d1c25650 am:
d368eb8664
am:
8cfa8cb220
Change-Id: I8436c1b5cbdc9eb0777f4a3514c9504ba55e1650
Alexander Galazin [Fri, 20 Jan 2017 20:42:58 +0000 (20:42 +0000)]
Generate flat triangles in polygon offset tests. am:
975a59ebca am:
0bde00f9d6 am:
b57eb2d24f am:
aa9a995cfc
am:
afc69d0dd1
Change-Id: Icd93b4e1f8011e015efbd0635306ff0b3a4be290
Tina Zhou [Fri, 20 Jan 2017 20:42:45 +0000 (20:42 +0000)]
Merge "Relax line width verification in primitive bbox tests" into nougat-cts-dev am:
312a550657 am:
f3d81a3cd9 am:
3b0479c233 am:
0a2fdff220
am:
d8355f769b
Change-Id: I1d2a295e6d58c3a92b40c2ff6d6ac7886ba47225
Pyry Haulos [Fri, 20 Jan 2017 20:42:31 +0000 (20:42 +0000)]
Relax line width verification in primitive bbox tests am:
ba45591407 am:
b4fbc02e3c am:
b9b63c17d2 am:
4f191e12a9
am:
c29aba4a88
Change-Id: I2cab9d14f0dfc30ac564d54ac5bbf6265da9f80e
Tina Zhou [Fri, 20 Jan 2017 20:42:18 +0000 (20:42 +0000)]
Merge "Fix eglBindAPI negative test" into nougat-cts-dev am:
6068dfbf3a am:
365f81e68c am:
15cde0b466 am:
b21dbe99b2
am:
930d6894e5
Change-Id: I8d8b61c5fbbc9bdbd13a6099508b5550ff469bb5
Nicolas Boichat [Fri, 20 Jan 2017 20:42:05 +0000 (20:42 +0000)]
Fix eglBindAPI negative test am:
09784f8510 am:
3342150f5a am:
1af587d644 am:
52211c87ed
am:
fc116aa764
Change-Id: I8c60841464302f2623b6766086499623eef4dd23
Tina Zhou [Fri, 20 Jan 2017 20:41:52 +0000 (20:41 +0000)]
Merge "Drop incorrect framebuffer texture subtests." into nougat-cts-dev am:
3baf7e3be2 am:
a580ae91f8 am:
816d6bdb88 am:
f49c7ce972
am:
a91d8f9bf5
Change-Id: I6f66ea6c3de27d24cfcfb9e802f432653779c6b0
Kenneth Graunke [Fri, 20 Jan 2017 20:41:40 +0000 (20:41 +0000)]
Drop incorrect framebuffer texture subtests. am:
625d685874 am:
25b6d76b01 am:
6f6f3d78fc am:
18805bd38c
am:
ce197d0f27
Change-Id: Id8c7bbe84ea9f0039805f46005bd61e6f1883229
Tina Zhou [Fri, 20 Jan 2017 20:41:27 +0000 (20:41 +0000)]
Merge "Optimize swapchain OOM tests" into nougat-cts-dev am:
c811d42d99 am:
6d4c0dca61 am:
d64bb66820 am:
ec68ba0951
am:
b7985f162a
Change-Id: I19990dc29eda0b601694d9c78727b5a6d0b8234a
Pyry Haulos [Fri, 20 Jan 2017 20:41:14 +0000 (20:41 +0000)]
Optimize swapchain OOM tests am:
1614827a71 am:
2cfe132119 am:
00ab17bd23 am:
c9b7dae8a8
am:
acce97d998
Change-Id: Ib5d26c891a7b8dd3dd297efca0d5346c0d30203d
Tina Zhou [Fri, 20 Jan 2017 20:41:00 +0000 (20:41 +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
Change-Id: Ifeb85870fcb7a6ce2373d72a31a0ab94cdb4fe9c
Kenneth Graunke [Fri, 20 Jan 2017 20:40:48 +0000 (20:40 +0000)]
Fix internal format/type for ES3 3D + depth/stencil negative API tests. am:
2ed3a5a66f am:
6a6f549150 am:
f9b870fb5b am:
b47baae90a
am:
76a7f607a5
Change-Id: I965058dde5f55cb5d35a54ae6d8bf9fa3611ab9f
Tina Zhou [Fri, 20 Jan 2017 20:40:36 +0000 (20:40 +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
Change-Id: I8f32699958d680c42818e1c8faa57b0c2f904213
Mark Adams [Fri, 20 Jan 2017 20:40:25 +0000 (20:40 +0000)]
Add support for EGL_EXT_pixel_format_float am:
521bf8a7c3 am:
4b7baeace7 am:
86683f95c7 am:
0624edb1ce
am:
234daba7b4 -s ours
Change-Id: Ief161f1656f33ccbbc698b90faafaec3fe1a06b2
Tina Zhou [Fri, 20 Jan 2017 20:40:12 +0000 (20:40 +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
Change-Id: I7bfd9c1447e4540c39f4e02e560eff2a46b94a72
Pyry Haulos [Fri, 20 Jan 2017 20:39:59 +0000 (20:39 +0000)]
Remove tests affected by NV/OES_viewport_array extension am:
267c765690 am:
0004ce1767 am:
ee2a180f00
am:
20860eb2df -s ours
Change-Id: Iafa1e15dbddaad97f6992556ebd5118061e52a43
Android Build Merger (Role) [Fri, 20 Jan 2017 20:35:44 +0000 (20:35 +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
Tina Zhou [Fri, 20 Jan 2017 20:35:36 +0000 (20:35 +0000)]
Merge "Generate flat triangles in polygon offset tests." into nougat-cts-dev am:
61d6d95a66 am:
73b7f271a9 am:
0b9596cb35
am:
436488b78f
Change-Id: I90af52af5cefd7ca0302f0fd3d1eccb7a1a6934f
Android Build Merger (Role) [Fri, 20 Jan 2017 20:35:30 +0000 (20:35 +0000)]
Merge "Generate flat triangles in polygon offset tests. am:
975a59ebca am:
02c67b12c1 am:
0e7da13770 am:
0dbb18ee84" into nyc-mr1-dev-plus-aosp
Alexander Galazin [Fri, 20 Jan 2017 20:35:25 +0000 (20:35 +0000)]
Generate flat triangles in polygon offset tests. am:
975a59ebca am:
02c67b12c1 am:
0e7da13770
am:
0dbb18ee84
Change-Id: Iaa60e3cbe62a1ac83550fbe8604cdc99a94d72cf
Android Build Merger (Role) [Fri, 20 Jan 2017 20:35:19 +0000 (20:35 +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
Android Build Merger (Role) [Fri, 20 Jan 2017 20:35:17 +0000 (20:35 +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
Tina Zhou [Fri, 20 Jan 2017 20:35:11 +0000 (20:35 +0000)]
Merge "Relax line width verification in primitive bbox tests" into nougat-cts-dev am:
312a550657 am:
36d3dd2ab1 am:
5debc545bf
am:
ee10cd68f7
Change-Id: I28e63d9f2f5b5b71981a7115d0bfc50b45b3c8b4
Tina Zhou [Fri, 20 Jan 2017 20:35:11 +0000 (20:35 +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
Change-Id: Iecf16e40a8690aa3bd9d4cb8e4ba0cb34bd37558
Android Build Merger (Role) [Fri, 20 Jan 2017 20:34:47 +0000 (20:34 +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
Android Build Merger (Role) [Fri, 20 Jan 2017 20:34:46 +0000 (20:34 +0000)]
Merge "Relax line width verification in primitive bbox tests am:
ba45591407 am:
a11fd8b487 am:
90c49fe030 am:
04d8a8e98a" into nyc-mr1-dev-plus-aosp
Pyry Haulos [Fri, 20 Jan 2017 20:34:41 +0000 (20:34 +0000)]
Remove tests affected by NV/OES_viewport_array extension am:
267c765690 -s ours am:
55fe6e8997 -s ours
am:
7bab558fb8 -s ours
Change-Id: I6a40dd9ca99dfb10ea59d368dad6e2d1e9c093c4
Pyry Haulos [Fri, 20 Jan 2017 20:34:39 +0000 (20:34 +0000)]
Relax line width verification in primitive bbox tests am:
ba45591407 am:
a11fd8b487 am:
90c49fe030
am:
04d8a8e98a
Change-Id: I33b01b0e214df343d63c2876aeb2e5698ad84627
Tina Zhou [Fri, 20 Jan 2017 20:34:27 +0000 (20:34 +0000)]
Merge "Generate flat triangles in polygon offset tests." into nougat-cts-dev am:
61d6d95a66 am:
ea7ea6aeee
am:
562348c4a0
Change-Id: Ie4b8d4ea6a5d36c4ca5d50e1de41688d07c2b880
Alexander Galazin [Fri, 20 Jan 2017 20:34:16 +0000 (20:34 +0000)]
Generate flat triangles in polygon offset tests. am:
975a59ebca am:
b1c225b9d6
am:
f8e27c683d
Change-Id: I056321401e4a6609873ab21b2b816cfbc938afd0
Tina Zhou [Fri, 20 Jan 2017 20:32:02 +0000 (20:32 +0000)]
Merge "Remove tests affected by NV/OES_viewport_array extension" into nougat-cts-dev am:
e98444b9bf -s ours
am:
1d2a009979 -s ours
Change-Id: Ie406079ab3058b2203dbb3811194c086a595f858
Pyry Haulos [Fri, 20 Jan 2017 20:31:48 +0000 (20:31 +0000)]
Remove tests affected by NV/OES_viewport_array extension am:
267c765690 -s ours
am:
55fe6e8997 -s ours
Change-Id: I13085ccdcd995b71cbffdb619de4421ef7918da9
Tina Zhou [Fri, 20 Jan 2017 20:31:32 +0000 (20:31 +0000)]
Merge "Relax line width verification in primitive bbox tests" into nougat-cts-dev am:
312a550657 am:
487543e953
am:
ed835f32e2
Change-Id: I7adf853a3416fc7e19755eb5fd1566145e028c41
Tina Zhou [Fri, 20 Jan 2017 20:31:31 +0000 (20:31 +0000)]
Merge "Generate flat triangles in polygon offset tests." into nougat-cts-dev am:
61d6d95a66
am:
ea7ea6aeee
Change-Id: I45a83cc65cfe838f11d13cac80bdc18ae9fed0fa
Alexander Galazin [Fri, 20 Jan 2017 20:31:19 +0000 (20:31 +0000)]
Generate flat triangles in polygon offset tests. am:
975a59ebca
am:
b1c225b9d6
Change-Id: I9305006c741bbb4109c54b3187473bab91fe4cfb
Pyry Haulos [Fri, 20 Jan 2017 20:31:19 +0000 (20:31 +0000)]
resolve merge conflicts of
ba455914 to master am:
07a7e24da3
am:
218bfe74ff
Change-Id: Iefd1538e6ac00feea390b305bfe1c734024033cc
Tina Zhou [Fri, 20 Jan 2017 20:30:03 +0000 (20:30 +0000)]
Merge "Relax line width verification in primitive bbox tests" into nougat-cts-dev am:
312a550657
am:
487543e953
Change-Id: I4e1060cc6c204387f1520a40b97fa061a9044241
Pyry Haulos [Fri, 20 Jan 2017 20:29:48 +0000 (20:29 +0000)]
resolve merge conflicts of
ba455914 to master
am:
07a7e24da3
Change-Id: Iece28ec157fd5f603009ffb6fc9023cc0164ab1d
Tina Zhou [Fri, 20 Jan 2017 20:28:13 +0000 (20:28 +0000)]
Merge "Remove tests affected by NV/OES_viewport_array extension" into nougat-cts-dev
am:
e98444b9bf -s ours
Change-Id: I35eea6598260946f05bec754e9a627c263cad2f0
Pyry Haulos [Fri, 20 Jan 2017 20:28:12 +0000 (20:28 +0000)]
Remove tests affected by NV/OES_viewport_array extension
am:
267c765690 -s ours
Change-Id: I8f9d7aef632660fe6201035d381485072dbee063
Tina Zhou [Fri, 20 Jan 2017 20:27:56 +0000 (20:27 +0000)]
Merge "Generate flat triangles in polygon offset tests." into nougat-cts-dev
am:
61d6d95a66
Change-Id: I1eb46e5e8e20d1f35eb7c0234e97aa0f0d8c1ea1
Alexander Galazin [Fri, 20 Jan 2017 20:27:55 +0000 (20:27 +0000)]
Generate flat triangles in polygon offset tests.
am:
975a59ebca
Change-Id: Ia1226e8da8462deb895b6e7e8113db5fd500565f
Tina Zhou [Fri, 20 Jan 2017 20:27:45 +0000 (20:27 +0000)]
Merge "Relax line width verification in primitive bbox tests" into nougat-cts-dev
am:
312a550657
Change-Id: Ic9ad221d68e82f4b2fc31a6ca51f21fc731ca31d
Tina Zhou [Fri, 20 Jan 2017 18:46:42 +0000 (18:46 +0000)]
Merge "Remove tests affected by NV/OES_viewport_array extension" into nougat-cts-dev am:
e98444b9bf am:
41c599b77e am:
9d74d882df
am:
b3182128b8
Change-Id: I4d503963d75b7eac201c3735940f953f72720a06
Pyry Haulos [Fri, 20 Jan 2017 18:46:30 +0000 (18:46 +0000)]
Remove tests affected by NV/OES_viewport_array extension am:
267c765690 am:
e4ed95024e am:
578afa4c88
am:
22a8808370
Change-Id: I7d90cb591d49cef4b8de3d361585c98d72586d77
Tina Zhou [Fri, 20 Jan 2017 18:46:16 +0000 (18:46 +0000)]
Merge "Generate flat triangles in polygon offset tests." into nougat-cts-dev am:
61d6d95a66 am:
5611bf398b am:
e2d1c25650
am:
d368eb8664
Change-Id: I73f7ec17d1feb01b22ac98484bd02f36f37dcf1e
Alexander Galazin [Fri, 20 Jan 2017 18:46:07 +0000 (18:46 +0000)]
Generate flat triangles in polygon offset tests. am:
975a59ebca am:
0bde00f9d6 am:
b57eb2d24f
am:
aa9a995cfc
Change-Id: If42ae1242a55f88e8c365b04eac2203d572642df
Tina Zhou [Fri, 20 Jan 2017 18:46:06 +0000 (18:46 +0000)]
Merge "Fix eglBindAPI negative test" into nougat-cts-dev am:
6068dfbf3a am:
839be6fae4 am:
e892f4b76d
am:
5322472db4
Change-Id: I17a1b152115571dd492dc72c0f99fd272224b7f7
Tina Zhou [Fri, 20 Jan 2017 18:45:54 +0000 (18:45 +0000)]
Merge "Relax line width verification in primitive bbox tests" into nougat-cts-dev am:
312a550657 am:
f3d81a3cd9 am:
3b0479c233
am:
0a2fdff220
Change-Id: I28691c6f2c1c2008308bdc3a22a950ed26d04136
projects / platform / upstream / VK-GL-CTS.git / log