Kalle Raita [Sat, 21 Jan 2017 01:00:23 +0000 (01:00 +0000)]
Merge changes from topic 'am-
afbe65226c664d438460b33cb5a405a8' into nyc-mr1-dev am:
59cabbec64 am:
30d7647d1a am:
f390386f29
am:
89aee89302
Change-Id: Ia1c7bfdc3824e86308c430ae7b152145642bdf42
Kalle Raita [Sat, 21 Jan 2017 01:00:16 +0000 (01:00 +0000)]
CP: Remove two read-backs from copy image tests am:
263e135474 am:
a691d5ca5c am:
133b1f4004 am:
d027dbfab7 am:
60623645b1
am:
47f02beb9e
Change-Id: I3cfeeb498299c2e209c90b30e8ae03a9ef4008fc
Kalle Raita [Sat, 21 Jan 2017 01:00:08 +0000 (01:00 +0000)]
CP: Non-compressed copy image target size (64,64,8 am:
7aff1a044f am:
8afffd6f14 am:
26033dda95 am:
a589a9c3e7 am:
ae4278b487
am:
15dc7ab507
Change-Id: Iae6c84a91f5f1441d6e28a87a32e6c67e5321ec4
Kalle Raita [Sat, 21 Jan 2017 00:59:47 +0000 (00:59 +0000)]
CP: Remove two read-backs from copy image tests am:
263e135474 am:
15f98c4682 am:
1e01d9996c am:
46a71ac84b am:
55222675a2 am:
8c8ba6b6e7
am:
bd239739e4
Change-Id: I7d2c62a504f0fe48076a6c0471da892b4ee3517a
Kalle Raita [Sat, 21 Jan 2017 00:59:39 +0000 (00:59 +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
Change-Id: I064d900623d88666516146e7562a5189ee763230
Kalle Raita [Sat, 21 Jan 2017 00:53:45 +0000 (00:53 +0000)]
CP: Remove two read-backs from copy image tests am:
263e135474 -s ours am:
462575748a am:
86e2ff7051 am:
33eec04a9a
am:
9c27db80ef
Change-Id: Iff6ca95a6e4af000f3865ae723fb7054e8987347
Kalle Raita [Sat, 21 Jan 2017 00:53:32 +0000 (00:53 +0000)]
CP: Non-compressed copy image target size (64,64,8 am:
7aff1a044f am:
8bb21c1262 am:
c080a2efba am:
0670d1bd72
am:
54a9810ee1
Change-Id: I4e5c48fa913eabfafb153378dd74463898a74f99
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
Tina Zhou [Fri, 20 Jan 2017 21:10:57 +0000 (21:10 +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
Change-Id: Ib0cc75a3fd6f67f88dc584da02cebc8aaac6327b
Pyry Haulos [Fri, 20 Jan 2017 21:10:43 +0000 (21:10 +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
Change-Id: Iaed98939a809e5f8ac329b428ce663ed5f2cdbdd
Tina Zhou [Fri, 20 Jan 2017 21:10:28 +0000 (21:10 +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
Change-Id: Ic78cf80bfa4e386f56710c9ccd7a6a9c21e4cedf
Alexander Galazin [Fri, 20 Jan 2017 21:10:16 +0000 (21:10 +0000)]
Generate flat triangles in polygon offset tests. am:
975a59ebca am:
0bde00f9d6 am:
b57eb2d24f am:
aa9a995cfc am:
afc69d0dd1 am:
0e3f2fcb41
am:
fa5e828111
Change-Id: Id1268ed909ebcd955bb71f2c2a20b0e4a9e5ff49
Tina Zhou [Fri, 20 Jan 2017 21:10:03 +0000 (21:10 +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
Change-Id: Idbed9a2d2d23622650f32c7350f53a359e01597e
Pyry Haulos [Fri, 20 Jan 2017 21:09:49 +0000 (21:09 +0000)]
Relax line width verification in primitive bbox tests am:
ba45591407 am:
b4fbc02e3c am:
b9b63c17d2 am:
4f191e12a9 am:
c29aba4a88 am:
a9cd3623d3
am:
102133f902
Change-Id: Ic5f610fce703724e9d6dacf1ff2bdc32a98eb993
Tina Zhou [Fri, 20 Jan 2017 21:09:33 +0000 (21:09 +0000)]
Merge "Fix eglBindAPI negative test" into nougat-cts-dev am:
6068dfbf3a am:
365f81e68c am:
15cde0b466 am:
b21dbe99b2 am:
930d6894e5 am:
02a44043d8
am:
36e6937809
Change-Id: I191f0ab4fb16834501b92a5d4295072d15a9e653
Nicolas Boichat [Fri, 20 Jan 2017 21:09:19 +0000 (21:09 +0000)]
Fix eglBindAPI negative test am:
09784f8510 am:
3342150f5a am:
1af587d644 am:
52211c87ed am:
fc116aa764 am:
9e92f92f57
am:
0075efc88a
Change-Id: If6b73019726c57326d4a1149b14671007c10483d
Tina Zhou [Fri, 20 Jan 2017 21:09:06 +0000 (21:09 +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
Change-Id: Ifef8cadec0a7e54c69e4afd5f4c7a12236bc5799
Kenneth Graunke [Fri, 20 Jan 2017 21:08:53 +0000 (21:08 +0000)]
Drop incorrect framebuffer texture subtests. am:
625d685874 am:
25b6d76b01 am:
6f6f3d78fc am:
18805bd38c am:
ce197d0f27 am:
ac112a3efa
am:
4f51a66b4b
Change-Id: Id8fa73a8ef5c4820546cc2639ad008e7668dc31a
Tina Zhou [Fri, 20 Jan 2017 21:08:40 +0000 (21:08 +0000)]
Merge "Optimize swapchain OOM tests" into nougat-cts-dev am:
c811d42d99 am:
6d4c0dca61 am:
d64bb66820 am:
ec68ba0951 am:
b7985f162a am:
4e37c3bcf2
am:
34555e78f1
Change-Id: If86cd579fb7b80d38d025fd538a7cc2562868e0d
Pyry Haulos [Fri, 20 Jan 2017 21:08:27 +0000 (21:08 +0000)]
Optimize swapchain OOM tests am:
1614827a71 am:
2cfe132119 am:
00ab17bd23 am:
c9b7dae8a8 am:
acce97d998 am:
dda77bf145
am:
c08b02f568
Change-Id: I9368639471746966b7030592aff2176b7c27bfb2
Tina Zhou [Fri, 20 Jan 2017 21:08:15 +0000 (21:08 +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
Change-Id: Ib79e75eea51f5438c5fcd74eaa1aa2f78cf321c8
Kenneth Graunke [Fri, 20 Jan 2017 21:04:26 +0000 (21:04 +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
Change-Id: I81b227f3a9c3fd2df760fabaa0d28d707fadd192
Kenneth Graunke [Fri, 20 Jan 2017 21:04:24 +0000 (21:04 +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
Change-Id: I4a6b5ac25d28fe9142f8b933177cea1915f73903
Tina Zhou [Fri, 20 Jan 2017 21:03:58 +0000 (21:03 +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
Change-Id: Ie921753e17d5a27eb3bce19bc46ee30cbbd06c7f
Tina Zhou [Fri, 20 Jan 2017 21:03:55 +0000 (21:03 +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
Change-Id: Icc099ddabc2fff2ec6fa52e4f251ef0bed494b24
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
Mark Adams [Fri, 20 Jan 2017 21:03:34 +0000 (21:03 +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
Change-Id: Ibf1d0326d0be689fb9d49c183db75d7c93772098
Mark Adams [Fri, 20 Jan 2017 21:03:31 +0000 (21:03 +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
Change-Id: Idee1b3826a97fd4543e7cd2473865e78aa7e2c95
Tina Zhou [Fri, 20 Jan 2017 21:03:08 +0000 (21:03 +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
Change-Id: I7d1829acbe25fec86f756ecf665453192a7c28d7
Tina Zhou [Fri, 20 Jan 2017 21:03:05 +0000 (21:03 +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
Change-Id: Id566b25884e46e56865d8314fba7c2f4e855531d
Pyry Haulos [Fri, 20 Jan 2017 21:02:41 +0000 (21:02 +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
Change-Id: I680b60f009e8697ea0d67409d1e07456e367f2ef
Pyry Haulos [Fri, 20 Jan 2017 21:02:37 +0000 (21:02 +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
Change-Id: Ic083d1c2d52192a1174d8c85b166102b190f395e
Tina Zhou [Fri, 20 Jan 2017 21:02:14 +0000 (21:02 +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
Change-Id: I568ad401507c70716d49473b7ac3413b2e0a4ddc
Tina Zhou [Fri, 20 Jan 2017 21:02:12 +0000 (21:02 +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
Change-Id: Id9b146a5046a0c93a6dd7d39ca7562b38f742b83
Tina Zhou [Fri, 20 Jan 2017 21:01:48 +0000 (21:01 +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
Change-Id: Id70658e778b7715e14310708b4b14cdf499a4ae8
Tina Zhou [Fri, 20 Jan 2017 21:01:45 +0000 (21:01 +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
Change-Id: I03d3deb90878fe03b5c7c00e1bb3605fc7759b2d
Alexander Galazin [Fri, 20 Jan 2017 21:01:25 +0000 (21:01 +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
Change-Id: Id088c9233e2f9c04e6e98b32d48a478db8eaf826
Alexander Galazin [Fri, 20 Jan 2017 21:01:23 +0000 (21:01 +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
Change-Id: I884d90049e518e28da4ce0ca587d378c0bef5b86
Alexander Galazin [Fri, 20 Jan 2017 21:01:03 +0000 (21:01 +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
Change-Id: I780dac91f831cc16da9f9ea8eee3d2b3d7b0bd39
Alexander Galazin [Fri, 20 Jan 2017 21:01:01 +0000 (21:01 +0000)]
Generate flat triangles in polygon offset tests. am:
975a59ebca am:
02c67b12c1 am:
0e7da13770 am:
0dbb18ee84 am:
4c08ce83d1
am:
01ccf676e3
Change-Id: I2a28f613b6d21de009e5eaf955ec4a7cd38c8f8c
Tina Zhou [Fri, 20 Jan 2017 21:00:39 +0000 (21:00 +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
Change-Id: I1ca088eb31cbf21b0643b1dfcbbadff33bbb78f5
Tina Zhou [Fri, 20 Jan 2017 21:00:30 +0000 (21:00 +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
Change-Id: Ic955cc1965e86c6863065694b0bb258544d460d8
Tina Zhou [Fri, 20 Jan 2017 21:00:07 +0000 (21:00 +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
Change-Id: I289895432f366e810da907270c5a0e25e6185cee
Tina Zhou [Fri, 20 Jan 2017 21:00:04 +0000 (21:00 +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
Change-Id: Ie7d3c55b24b9a4d33d96a4c9dda577cd6d518906
Tina Zhou [Fri, 20 Jan 2017 20:59:40 +0000 (20:59 +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
Change-Id: I62c6ee92e840e9df6bb7c7fa18c51709b52e60ec
Tina Zhou [Fri, 20 Jan 2017 20:59:35 +0000 (20:59 +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
Change-Id: I67875ae50bbb82539fcbc9f38cc1d92e3b3c98d5
Tina Zhou [Fri, 20 Jan 2017 20:59:10 +0000 (20:59 +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
Change-Id: I6894e5f90b2c57d43a36896da8a388e43702ac36
Tina Zhou [Fri, 20 Jan 2017 20:59:07 +0000 (20:59 +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
Change-Id: Ic8c7f71b789b4012591da21583fa3739c83420a5
Pyry Haulos [Fri, 20 Jan 2017 20:58:44 +0000 (20:58 +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
Change-Id: I275becb76aef6cb3bf219bc438aa8ee5b012c73b
Pyry Haulos [Fri, 20 Jan 2017 20:58:40 +0000 (20:58 +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
Change-Id: Iffc1781093fb35750d0b6d443a46bc5748445ab8
Pyry Haulos [Fri, 20 Jan 2017 20:58:16 +0000 (20:58 +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
Change-Id: I6d13dfd8cf3f66075c29f7516efd4fd1e420fb56
Pyry Haulos [Fri, 20 Jan 2017 20:58:12 +0000 (20:58 +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
Change-Id: I02c059e358761b38ee1e769b9a938abc475967ae
Tina Zhou [Fri, 20 Jan 2017 20:57:49 +0000 (20:57 +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
Change-Id: I6821e3a4efc0d2febfb7bd2bf39e3d732ff4bf14
Tina Zhou [Fri, 20 Jan 2017 20:57:46 +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 am:
c0d6b5c22b -s ours
am:
ab3c5142fa -s ours
Change-Id: I29c7f66d9c9695e2655f0a47ce38faa700f49794
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
Pyry Haulos [Fri, 20 Jan 2017 20:57:17 +0000 (20:57 +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
Change-Id: I28a1e7d6667d2101ffd9ee6023775ac7fcb63b1d
Pyry Haulos [Fri, 20 Jan 2017 20:57:15 +0000 (20:57 +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
Change-Id: I5b9b9bed2aea34ef9e785d4789466d90b81e3599
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:48 +0000 (20:56 +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
Change-Id: Ic17bb443ec60de537989f4770d3ef140a1810cb3
Tina Zhou [Fri, 20 Jan 2017 20:56:46 +0000 (20:56 +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
Change-Id: I114c30236f3ea3d0df06831ecb8a63ea91e2efe2
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
Alexander Galazin [Fri, 20 Jan 2017 20:56:24 +0000 (20:56 +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
Change-Id: I02deb616cdf9ebb358d1f5def005b830ad93677d
Alexander Galazin [Fri, 20 Jan 2017 20:56:22 +0000 (20:56 +0000)]
Generate flat triangles in polygon offset tests. am:
975a59ebca am:
0bde00f9d6 am:
b57eb2d24f am:
aa9a995cfc am:
afc69d0dd1 am:
f7bcd5d876
am:
4fdce7d4d1
Change-Id: I33c47fd6ed72205f72be885cc79a8ba4a8857db2
projects / platform / upstream / VK-GL-CTS.git / log