Kalle Raita [Sat, 21 Jan 2017 00:53:02 +0000 (00:53 +0000)]
Merge changes from topic 'am-
afbe65226c664d438460b33cb5a405a8' into nyc-mr1-dev am:
59cabbec64 am:
30d7647d1a
am:
f390386f29
Change-Id: I16bdc20c14b0edaa5bbc1457ec55fd3e78dd1515
Kalle Raita [Sat, 21 Jan 2017 00:52:58 +0000 (00:52 +0000)]
CP: Remove two read-backs from copy image tests am:
263e135474 am:
a691d5ca5c am:
133b1f4004 am:
d027dbfab7
am:
60623645b1
Change-Id: I23a94a4d6426fd34a71bd7a2e271de43e984deab
Kalle Raita [Sat, 21 Jan 2017 00:52:55 +0000 (00:52 +0000)]
CP: Non-compressed copy image target size (64,64,8 am:
7aff1a044f am:
8afffd6f14 am:
26033dda95 am:
a589a9c3e7
am:
ae4278b487
Change-Id: I3ef91de828fccd7707bfd59d9a4f551ce7634746
Kalle Raita [Sat, 21 Jan 2017 00:52:38 +0000 (00:52 +0000)]
CP: Remove two read-backs from copy image tests am:
263e135474 am:
15f98c4682 am:
1e01d9996c am:
46a71ac84b am:
55222675a2
am:
8c8ba6b6e7
Change-Id: I3bc933803cfc3e2ccb34f7109051bfbccf4c3826
Kalle Raita [Sat, 21 Jan 2017 00:52:36 +0000 (00:52 +0000)]
CP: Non-compressed copy image target size (64,64,8 am:
7aff1a044f am:
0a8b1151da am:
7e383871b1 am:
a49a3b9496 am:
db0570a3fb
am:
6626543a3a
Change-Id: If324273286245820f1372d2baaa033846907dfae
Kalle Raita [Sat, 21 Jan 2017 00:48:54 +0000 (00:48 +0000)]
CP: Remove two read-backs from copy image tests am:
263e135474 -s ours am:
462575748a am:
86e2ff7051
am:
33eec04a9a
Change-Id: I9bdbe54cd23a186d93801702ab548cbb810b3f0f
Kalle Raita [Sat, 21 Jan 2017 00:48:48 +0000 (00:48 +0000)]
CP: Non-compressed copy image target size (64,64,8 am:
7aff1a044f am:
8bb21c1262 am:
c080a2efba
am:
0670d1bd72
Change-Id: I628bdee8aa41fb40022e546d9ccd03dc09956238
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:37:58 +0000 (00:37 +0000)]
Merge changes from topic 'am-
afbe65226c664d438460b33cb5a405a8' into nyc-mr1-dev am:
59cabbec64
am:
30d7647d1a
Change-Id: Iad519b2a47b619a0e0fe828ce258ceb457c7b1d2
Kalle Raita [Sat, 21 Jan 2017 00:37:55 +0000 (00:37 +0000)]
CP: Remove two read-backs from copy image tests am:
263e135474 am:
a691d5ca5c am:
133b1f4004
am:
d027dbfab7
Change-Id: I5dbf8dae03e54892c9bf1d1e10f9553a976ca25a
Kalle Raita [Sat, 21 Jan 2017 00:37:52 +0000 (00:37 +0000)]
CP: Non-compressed copy image target size (64,64,8 am:
7aff1a044f am:
8afffd6f14 am:
26033dda95
am:
a589a9c3e7
Change-Id: Iac07614345badc477a1dad0cf50258de1f0ee435
Kalle Raita [Sat, 21 Jan 2017 00:37:35 +0000 (00:37 +0000)]
CP: Remove two read-backs from copy image tests am:
263e135474 am:
15f98c4682 am:
1e01d9996c am:
46a71ac84b
am:
55222675a2
Change-Id: I99a3917b5044349213f2dc0de277a348a141db6d
Kalle Raita [Sat, 21 Jan 2017 00:37:33 +0000 (00:37 +0000)]
CP: Non-compressed copy image target size (64,64,8 am:
7aff1a044f am:
0a8b1151da am:
7e383871b1 am:
a49a3b9496
am:
db0570a3fb
Change-Id: I02ab9fcd89302f5b8c7647dd2d8baaa0cc89b774
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
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:57:36 +0000 (20:57 +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
Change-Id: I66750d4b28ee2f30be24e731a9009d58a98a59ba
Pyry Haulos [Fri, 20 Jan 2017 20:57:20 +0000 (20:57 +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
Change-Id: I072a21265fefda540ff83a785d5bbed61b32a79e
Tina Zhou [Fri, 20 Jan 2017 20:57:06 +0000 (20:57 +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
Change-Id: I1268204c6293f6ea03b60e304a90e3fe5525aadf
Alexander Galazin [Fri, 20 Jan 2017 20:56:54 +0000 (20:56 +0000)]
Generate flat triangles in polygon offset tests. am:
975a59ebca am:
0bde00f9d6 am:
b57eb2d24f am:
aa9a995cfc am:
afc69d0dd1
am:
0e3f2fcb41
Change-Id: Ifc7e16cdf9db3bb38a28a7f480a43a1dc7d64227
Tina Zhou [Fri, 20 Jan 2017 20:56:39 +0000 (20:56 +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
Change-Id: I3a27944219ba6c7ea0cda03ebd0d65eb7bd57612
Pyry Haulos [Fri, 20 Jan 2017 20:56:24 +0000 (20:56 +0000)]
Relax line width verification in primitive bbox tests am:
ba45591407 am:
b4fbc02e3c am:
b9b63c17d2 am:
4f191e12a9 am:
c29aba4a88
am:
a9cd3623d3
Change-Id: I65bdbeb0aba8c782aa9d3399e12c5f6ca6f19285
Tina Zhou [Fri, 20 Jan 2017 20:56:08 +0000 (20:56 +0000)]
Merge "Fix eglBindAPI negative test" into nougat-cts-dev am:
6068dfbf3a am:
365f81e68c am:
15cde0b466 am:
b21dbe99b2 am:
930d6894e5
am:
02a44043d8
Change-Id: I4c5bbbbdadaae47a719e8af05254b075ff4c41e8
Nicolas Boichat [Fri, 20 Jan 2017 20:55:54 +0000 (20:55 +0000)]
Fix eglBindAPI negative test am:
09784f8510 am:
3342150f5a am:
1af587d644 am:
52211c87ed am:
fc116aa764
am:
9e92f92f57
Change-Id: I68b3eb1fba405c54ae91076add05d6e442434fb7
Tina Zhou [Fri, 20 Jan 2017 20:55:39 +0000 (20:55 +0000)]
Merge "Drop incorrect framebuffer texture subtests." into nougat-cts-dev am:
3baf7e3be2 am:
a580ae91f8 am:
816d6bdb88 am:
f49c7ce972 am:
a91d8f9bf5
am:
c9e3a51cd3
Change-Id: I23581f8b7ca3e156a43bbd89e46e337c5fb5b869
Kenneth Graunke [Fri, 20 Jan 2017 20:55:26 +0000 (20:55 +0000)]
Drop incorrect framebuffer texture subtests. am:
625d685874 am:
25b6d76b01 am:
6f6f3d78fc am:
18805bd38c am:
ce197d0f27
am:
ac112a3efa
Change-Id: I410f4a137ea08b546c016caebd78705611deec7e
Tina Zhou [Fri, 20 Jan 2017 20:55:08 +0000 (20:55 +0000)]
Merge "Optimize swapchain OOM tests" into nougat-cts-dev am:
c811d42d99 am:
6d4c0dca61 am:
d64bb66820 am:
ec68ba0951 am:
b7985f162a
am:
4e37c3bcf2
Change-Id: Ia9a6763a23a5ec8f176b01183a9656546075c6ab
Pyry Haulos [Fri, 20 Jan 2017 20:54:54 +0000 (20:54 +0000)]
Optimize swapchain OOM tests am:
1614827a71 am:
2cfe132119 am:
00ab17bd23 am:
c9b7dae8a8 am:
acce97d998
am:
dda77bf145
Change-Id: Iac0fba1c0dc93ae52c498c50de482eb57fa54dd4
Tina Zhou [Fri, 20 Jan 2017 20:54:40 +0000 (20:54 +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
Change-Id: I7b229784f85f92d08fc1130fef4dc6e5100d9565
Android Build Merger (Role) [Fri, 20 Jan 2017 20:47:35 +0000 (20:47 +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
Kenneth Graunke [Fri, 20 Jan 2017 20:47:29 +0000 (20:47 +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
Change-Id: I945144d4cc2c17944e03bbeaafaf4bb10a465a62
Android Build Merger (Role) [Fri, 20 Jan 2017 20:47:19 +0000 (20:47 +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
Tina Zhou [Fri, 20 Jan 2017 20:47:12 +0000 (20:47 +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
Change-Id: I9966b7a980cac344e75e4810dd05699775d03cad
Android Build Merger (Role) [Fri, 20 Jan 2017 20:47:02 +0000 (20:47 +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
Mark Adams [Fri, 20 Jan 2017 20:46:57 +0000 (20:46 +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
Change-Id: I5ed211775089c1316522de4757278364d692cde4
Android Build Merger (Role) [Fri, 20 Jan 2017 20:46:47 +0000 (20:46 +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
Tina Zhou [Fri, 20 Jan 2017 20:46:40 +0000 (20:46 +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
Change-Id: I4fe705ee4db0cb5b1e5c27331aa1cd703c90e34a
Android Build Merger (Role) [Fri, 20 Jan 2017 20:46:27 +0000 (20:46 +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
Pyry Haulos [Fri, 20 Jan 2017 20:46:20 +0000 (20:46 +0000)]
Remove tests affected by NV/OES_viewport_array extension am:
267c765690 am:
0004ce1767 am:
ee2a180f00 am:
20860eb2df -s ours
am:
a4982bfb72 -s ours
Change-Id: I70c5745be0a607b14bff00ef872087d8fe6201b9
Android Build Merger (Role) [Fri, 20 Jan 2017 20:46:07 +0000 (20:46 +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
Android Build Merger (Role) [Fri, 20 Jan 2017 20:46:02 +0000 (20:46 +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
Tina Zhou [Fri, 20 Jan 2017 20:45:54 +0000 (20:45 +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
Change-Id: I0ae9df9e5f9225aef57aabd039136f9400ae2b8e
Tina Zhou [Fri, 20 Jan 2017 20:45:50 +0000 (20:45 +0000)]
Merge "Generate flat triangles in polygon offset tests." into nougat-cts-dev am:
61d6d95a66 am:
73b7f271a9 am:
0b9596cb35 am:
436488b78f
am:
336f66bfc4
Change-Id: I639413972a8f2c7ef6561c3f39bf13d7a7e07f04
Android Build Merger (Role) [Fri, 20 Jan 2017 20:45:34 +0000 (20:45 +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
Android Build Merger (Role) [Fri, 20 Jan 2017 20:45:30 +0000 (20:45 +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
Alexander Galazin [Fri, 20 Jan 2017 20:45:24 +0000 (20:45 +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
Change-Id: Ic3dbfa7fbdcd3159365e207e516e4a3745fc2751
Alexander Galazin [Fri, 20 Jan 2017 20:45:19 +0000 (20:45 +0000)]
Generate flat triangles in polygon offset tests. am:
975a59ebca am:
02c67b12c1 am:
0e7da13770 am:
0dbb18ee84
am:
4c08ce83d1
Change-Id: Ibaef63c51e4f6c85576d08d759e6b24abf8f560f
Android Build Merger (Role) [Fri, 20 Jan 2017 20:45:05 +0000 (20:45 +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
Android Build Merger (Role) [Fri, 20 Jan 2017 20:45:00 +0000 (20:45 +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
Tina Zhou [Fri, 20 Jan 2017 20:44:53 +0000 (20:44 +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
Change-Id: I807cdfeb8bf38096382be6549b863f5da5c3859a
Tina Zhou [Fri, 20 Jan 2017 20:44:50 +0000 (20:44 +0000)]
Merge "Relax line width verification in primitive bbox tests" into nougat-cts-dev am:
312a550657 am:
36d3dd2ab1 am:
5debc545bf am:
ee10cd68f7
am:
bc02b9f045
Change-Id: Id3422968d394dd61cfa7e9f8a84c5afe21b057cf
Android Build Merger (Role) [Fri, 20 Jan 2017 20:44:32 +0000 (20:44 +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
Android Build Merger (Role) [Fri, 20 Jan 2017 20:44:26 +0000 (20:44 +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
Tina Zhou [Fri, 20 Jan 2017 20:44:18 +0000 (20:44 +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
Change-Id: Ibf415e822ead5d6498b0e1d940baaf0aa545be25
Tina Zhou [Fri, 20 Jan 2017 20:44:15 +0000 (20:44 +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
Change-Id: Ibb5d4533d489ec240aea3d66f48abed8c70a0222
Android Build Merger (Role) [Fri, 20 Jan 2017 20:44:00 +0000 (20:44 +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
Android Build Merger (Role) [Fri, 20 Jan 2017 20:43:55 +0000 (20:43 +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
Pyry Haulos [Fri, 20 Jan 2017 20:43:48 +0000 (20:43 +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
Change-Id: I9f17439cc94f6e47850dc9784bf4fb492170c568
Pyry Haulos [Fri, 20 Jan 2017 20:43:45 +0000 (20:43 +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
Change-Id: I3fcbec0414216c7beb1066b31607841743b44308
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
Android Build Merger (Role) [Fri, 20 Jan 2017 20:43:35 +0000 (20:43 +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
Tina Zhou [Fri, 20 Jan 2017 20:43:29 +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
am:
c0d6b5c22b -s ours
Change-Id: I7eb3481b4c93bcc4de011b97739f829dcfa77d56
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
Android Build Merger (Role) [Fri, 20 Jan 2017 20:43:23 +0000 (20:43 +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
Pyry Haulos [Fri, 20 Jan 2017 20:43:17 +0000 (20:43 +0000)]
Remove tests affected by NV/OES_viewport_array extension am:
267c765690 am:
e4ed95024e am:
578afa4c88 am:
22a8808370 am:
7b177f2f34
am:
3665d90d07 -s ours
Change-Id: I337bf941721008a733672911b327e36be7b458ca
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
Android Build Merger (Role) [Fri, 20 Jan 2017 20:43:10 +0000 (20:43 +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
Tina Zhou [Fri, 20 Jan 2017 20:43:02 +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
am:
987939f284
Change-Id: Ic7b839e2663709f543e34d129d7efedf4d107f39
Android Build Merger (Role) [Fri, 20 Jan 2017 20:42:58 +0000 (20:42 +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
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
Alexander Galazin [Fri, 20 Jan 2017 20:42:53 +0000 (20:42 +0000)]
Generate flat triangles in polygon offset tests. am:
975a59ebca am:
0bde00f9d6 am:
b57eb2d24f am:
aa9a995cfc am:
afc69d0dd1
am:
f7bcd5d876
Change-Id: Iab624c49bc1e5ab249c6e7338c75f9bf019680c0
Android Build Merger (Role) [Fri, 20 Jan 2017 20:42:48 +0000 (20:42 +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
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
Tina Zhou [Fri, 20 Jan 2017 20:42:42 +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
am:
a4ca32e8d3
Change-Id: If535925b571294338b6edcf80e388189967ba23e
Android Build Merger (Role) [Fri, 20 Jan 2017 20:42:37 +0000 (20:42 +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
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
Pyry Haulos [Fri, 20 Jan 2017 20:42:30 +0000 (20:42 +0000)]
Relax line width verification in primitive bbox tests am:
ba45591407 am:
b4fbc02e3c am:
b9b63c17d2 am:
4f191e12a9 am:
c29aba4a88
am:
e29f3de157
Change-Id: I2c96677d85c255e0f2355a5c619db592b39f224d
Android Build Merger (Role) [Fri, 20 Jan 2017 20:42:25 +0000 (20:42 +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
Tina Zhou [Fri, 20 Jan 2017 20:42:19 +0000 (20:42 +0000)]
Merge "Fix eglBindAPI negative test" into nougat-cts-dev am:
6068dfbf3a am:
365f81e68c am:
15cde0b466 am:
b21dbe99b2 am:
930d6894e5
am:
1a09b5270f
Change-Id: I73cff9b7c4b40fb5dcd58c0d330a310da7194f68
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