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
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
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
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: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: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: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
Android Build Merger (Role) [Fri, 20 Jan 2017 20:42:14 +0000 (20:42 +0000)]
Merge "Fix eglBindAPI negative test am:
09784f8510 am:
3342150f5a am:
1af587d644 am:
52211c87ed am:
fc116aa764 am:
5b5f75828b" into nyc-mr2-dev-plus-aosp
Nicolas Boichat [Fri, 20 Jan 2017 20:42:08 +0000 (20:42 +0000)]
Fix eglBindAPI negative test am:
09784f8510 am:
3342150f5a am:
1af587d644 am:
52211c87ed am:
fc116aa764
am:
5b5f75828b
Change-Id: I1d59566df19a116593926ea8d1a09cd47d10745b
Android Build Merger (Role) [Fri, 20 Jan 2017 20:42:03 +0000 (20:42 +0000)]
Merge "Merge "Drop incorrect framebuffer texture subtests." into nougat-cts-dev am:
3baf7e3be2 am:
a580ae91f8 am:
816d6bdb88 am:
f49c7ce972 am:
a91d8f9bf5 am:
6fd723a7cc" into nyc-mr2-dev-plus-aosp
Tina Zhou [Fri, 20 Jan 2017 20:41:56 +0000 (20:41 +0000)]
Merge "Drop incorrect framebuffer texture subtests." into nougat-cts-dev am:
3baf7e3be2 am:
a580ae91f8 am:
816d6bdb88 am:
f49c7ce972 am:
a91d8f9bf5
am:
6fd723a7cc
Change-Id: Ifbc5a19b90aad47f9be8192efe75048683a03873
Android Build Merger (Role) [Fri, 20 Jan 2017 20:41:52 +0000 (20:41 +0000)]
Merge "Drop incorrect framebuffer texture subtests. am:
625d685874 am:
25b6d76b01 am:
6f6f3d78fc am:
18805bd38c am:
ce197d0f27 am:
0e230d6099" into nyc-mr2-dev-plus-aosp
Kenneth Graunke [Fri, 20 Jan 2017 20:41:47 +0000 (20:41 +0000)]
Drop incorrect framebuffer texture subtests. am:
625d685874 am:
25b6d76b01 am:
6f6f3d78fc am:
18805bd38c am:
ce197d0f27
am:
0e230d6099
Change-Id: Ibc4efb0fbd54c7c9ecec669bf673f139b22efd87
Android Build Merger (Role) [Fri, 20 Jan 2017 20:41:42 +0000 (20:41 +0000)]
Merge "Merge "Optimize swapchain OOM tests" into nougat-cts-dev am:
c811d42d99 am:
6d4c0dca61 am:
d64bb66820 am:
ec68ba0951 am:
b7985f162a am:
4ab2fada98" into nyc-mr2-dev-plus-aosp
Tina Zhou [Fri, 20 Jan 2017 20:41:31 +0000 (20:41 +0000)]
Merge "Optimize swapchain OOM tests" into nougat-cts-dev am:
c811d42d99 am:
6d4c0dca61 am:
d64bb66820 am:
ec68ba0951 am:
b7985f162a
am:
4ab2fada98
Change-Id: I43a4b603f4fa5128cf79e4833c01a176435edcb2
Android Build Merger (Role) [Fri, 20 Jan 2017 20:41:27 +0000 (20:41 +0000)]
Merge "Optimize swapchain OOM tests am:
1614827a71 am:
2cfe132119 am:
00ab17bd23 am:
c9b7dae8a8 am:
acce97d998 am:
23baea4982" into nyc-mr2-dev-plus-aosp
Pyry Haulos [Fri, 20 Jan 2017 20:41:20 +0000 (20:41 +0000)]
Optimize swapchain OOM tests am:
1614827a71 am:
2cfe132119 am:
00ab17bd23 am:
c9b7dae8a8 am:
acce97d998
am:
23baea4982
Change-Id: Ia7f263826f508fc64ae006fae383da00d45d3932
Android Build Merger (Role) [Fri, 20 Jan 2017 20:41:15 +0000 (20:41 +0000)]
Merge "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:
cfc3d67576" into nyc-mr2-dev-plus-aosp
Tina Zhou [Fri, 20 Jan 2017 20:41:08 +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
am:
cfc3d67576
Change-Id: I379d29db9a55a018c5f6e9b4a21c594e633c3c82
Android Build Merger (Role) [Fri, 20 Jan 2017 20:41:03 +0000 (20:41 +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:
602c392f12" into nyc-mr2-dev-plus-aosp
Kenneth Graunke [Fri, 20 Jan 2017 20:40:58 +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
am:
602c392f12
Change-Id: I4af0fd340d3c0dc1486f7b824eb4e938c2696c4a
Android Build Merger (Role) [Fri, 20 Jan 2017 20:40:54 +0000 (20:40 +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 am:
ee59a7cc22 -s ours" into nyc-mr2-dev-plus-aosp
Tina Zhou [Fri, 20 Jan 2017 20:40:46 +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
am:
ee59a7cc22 -s ours
Change-Id: I0e7fc2f94781ce5e81a90a1ba89aa3a9bf89e272
Android Build Merger (Role) [Fri, 20 Jan 2017 20:40:41 +0000 (20:40 +0000)]
Merge "Add support for EGL_EXT_pixel_format_float am:
521bf8a7c3 am:
4b7baeace7 am:
86683f95c7 am:
0624edb1ce am:
234daba7b4 am:
8d164d1990 -s ours" into nyc-mr2-dev-plus-aosp
Mark Adams [Fri, 20 Jan 2017 20:40:36 +0000 (20:40 +0000)]
Add support for EGL_EXT_pixel_format_float am:
521bf8a7c3 am:
4b7baeace7 am:
86683f95c7 am:
0624edb1ce am:
234daba7b4
am:
8d164d1990 -s ours
Change-Id: Iabde3389ba6347e64f350f2148d892148f9412c2
Android Build Merger (Role) [Fri, 20 Jan 2017 20:40:30 +0000 (20:40 +0000)]
Merge "Merge "Remove tests affected by NV/OES_viewport_array extension" into nougat-cts-dev am:
e98444b9bf am:
ce3144c3e5 am:
29dde7d04d am:
4ac909cfeb am:
011ccfc134 -s ours" into nyc-mr2-dev-plus-aosp
Tina Zhou [Fri, 20 Jan 2017 20:40:24 +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
am:
011ccfc134 -s ours
Change-Id: I4a07ac9fd96b628ce4b17c578428acadbf6e9efe
Android Build Merger (Role) [Fri, 20 Jan 2017 20:40:18 +0000 (20:40 +0000)]
Merge "Remove tests affected by NV/OES_viewport_array extension am:
267c765690 am:
0004ce1767 am:
ee2a180f00 am:
20860eb2df am:
2ecead38c4 -s ours" into nyc-mr2-dev-plus-aosp
Pyry Haulos [Fri, 20 Jan 2017 20:40:11 +0000 (20:40 +0000)]
Remove tests affected by NV/OES_viewport_array extension am:
267c765690 am:
0004ce1767 am:
ee2a180f00 am:
20860eb2df
am:
2ecead38c4 -s ours
Change-Id: If53ec51f785570f35e94883ea30c7a4f1b49e1c0
Android Build Merger (Role) [Fri, 20 Jan 2017 20:40:05 +0000 (20:40 +0000)]
Merge "Merge "Generate flat triangles in polygon offset tests." into nougat-cts-dev am:
61d6d95a66 am:
73b7f271a9 am:
0b9596cb35 am:
436488b78f am:
e89621e593" into nyc-mr2-dev-plus-aosp
Android Build Merger (Role) [Fri, 20 Jan 2017 20:40:00 +0000 (20:40 +0000)]
Merge "Merge "Relax line width verification in primitive bbox tests am:
ba45591407 am:
a11fd8b487 am:
90c49fe030 am:
04d8a8e98a" into nyc-mr1-dev-plus-aosp am:
c60e446249" into nyc-mr2-dev-plus-aosp
Tina Zhou [Fri, 20 Jan 2017 20:39:58 +0000 (20:39 +0000)]
Merge "Generate flat triangles in polygon offset tests." into nougat-cts-dev am:
61d6d95a66 am:
73b7f271a9 am:
0b9596cb35 am:
436488b78f
am:
e89621e593
Change-Id: I5147a55b71384271477d3612f6d99e608aadbfd5
Android Build Merger (Role) [Fri, 20 Jan 2017 20:39:55 +0000 (20:39 +0000)]
Merge "Relax line width verification in primitive bbox tests am:
ba45591407 am:
a11fd8b487 am:
90c49fe030 am:
04d8a8e98a am:
ddf3f33d7a" into nyc-mr2-dev-plus-aosp
Android Build Merger (Role) [Fri, 20 Jan 2017 20:39:53 +0000 (20:39 +0000)]
Merge "Generate flat triangles in polygon offset tests. am:
975a59ebca am:
02c67b12c1 am:
0e7da13770 am:
0dbb18ee84 am:
b89872b38a" into nyc-mr2-dev-plus-aosp
Pyry Haulos [Fri, 20 Jan 2017 20:39:47 +0000 (20:39 +0000)]
Merge "Relax line width verification in primitive bbox tests am:
ba45591407 am:
a11fd8b487 am:
90c49fe030 am:
04d8a8e98a" into nyc-mr1-dev-plus-aosp
am:
c60e446249
Change-Id: I34a167669c1b214014be2512510cd7dfd90f4fe0
Alexander Galazin [Fri, 20 Jan 2017 20:39:47 +0000 (20:39 +0000)]
Generate flat triangles in polygon offset tests. am:
975a59ebca am:
02c67b12c1 am:
0e7da13770 am:
0dbb18ee84
am:
b89872b38a
Change-Id: If85180461ad53a14e1916b1197b29552c96eda58
Pyry Haulos [Fri, 20 Jan 2017 20:39:45 +0000 (20:39 +0000)]
Relax line width verification in primitive bbox tests am:
ba45591407 am:
a11fd8b487 am:
90c49fe030 am:
04d8a8e98a
am:
ddf3f33d7a
Change-Id: I5d8d981500f817508ca9aa92f9623f72152c2ae1
Android Build Merger (Role) [Fri, 20 Jan 2017 20:39:13 +0000 (20:39 +0000)]
Merge "Merge "Relax line width verification in primitive bbox tests" into nougat-cts-dev am:
312a550657 am:
36d3dd2ab1 am:
5debc545bf am:
ee10cd68f7 am:
09377becd7" into nyc-mr2-dev-plus-aosp
Tina Zhou [Fri, 20 Jan 2017 20:39:06 +0000 (20:39 +0000)]
Merge "Relax line width verification in primitive bbox tests" into nougat-cts-dev am:
312a550657 am:
36d3dd2ab1 am:
5debc545bf am:
ee10cd68f7
am:
09377becd7
Change-Id: I4b92c88b54ce077aa49166cf4e3bddb19e7fd32a
Android Build Merger (Role) [Fri, 20 Jan 2017 20:39:04 +0000 (20:39 +0000)]
Merge "Merge "Generate flat triangles in polygon offset tests." into nougat-cts-dev am:
61d6d95a66 am:
ea7ea6aeee am:
562348c4a0 am:
b03f7416cd" into nyc-mr2-dev-plus-aosp
Android Build Merger (Role) [Fri, 20 Jan 2017 20:39:01 +0000 (20:39 +0000)]
Merge "Relax line width verification in primitive bbox tests am:
ba45591407 am:
a11fd8b487 am:
90c49fe030 am:
04d8a8e98a am:
6734db1692" into nyc-mr2-dev-plus-aosp
Tina Zhou [Fri, 20 Jan 2017 20:38:57 +0000 (20:38 +0000)]
Merge "Generate flat triangles in polygon offset tests." into nougat-cts-dev am:
61d6d95a66 am:
ea7ea6aeee am:
562348c4a0
am:
b03f7416cd
Change-Id: I8787f3c6cb048fd3b46d2d2dc3f2969512d57b5a
Pyry Haulos [Fri, 20 Jan 2017 20:38:53 +0000 (20:38 +0000)]
Relax line width verification in primitive bbox tests am:
ba45591407 am:
a11fd8b487 am:
90c49fe030 am:
04d8a8e98a
am:
6734db1692
Change-Id: I66cac3fdeb6f6f16e0462ff8344788514379e612
Alexander Galazin [Fri, 20 Jan 2017 20:38:48 +0000 (20:38 +0000)]
Generate flat triangles in polygon offset tests. am:
975a59ebca am:
b1c225b9d6 am:
f8e27c683d
am:
5ccc8a2ee8
Change-Id: Ife678f63425f52d37fcd11aeca8f6ca492804447
Tina Zhou [Fri, 20 Jan 2017 20:38:37 +0000 (20:38 +0000)]
Merge "Relax line width verification in primitive bbox tests" into nougat-cts-dev am:
312a550657 am:
487543e953 am:
ed835f32e2
am:
cd215677dd
Change-Id: I45dd8aa166b78a4b96f38a5b679442ae45c11470
Pyry Haulos [Fri, 20 Jan 2017 20:38:25 +0000 (20:38 +0000)]
resolve merge conflicts of
ba455914 to master am:
07a7e24da3 am:
218bfe74ff
am:
e37a75a4b9
Change-Id: I582bdbc5d438c490fd3a0bc12a623b49221b64e8
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 "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
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
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
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
Pyry Haulos [Fri, 20 Jan 2017 18:51:48 +0000 (18:51 +0000)]
Remove tests affected by NV/OES_viewport_array extension am:
267c765690 am:
e4ed95024e am:
578afa4c88 am:
22a8808370
am:
7b177f2f34
Change-Id: I7a84c1f91d3d345cccda4c647646f6117359dca7
Tina Zhou [Fri, 20 Jan 2017 18:51:33 +0000 (18:51 +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: I0a4f828f7c2afd3b0136dcdda78b11704254208c
Alexander Galazin [Fri, 20 Jan 2017 18:51:23 +0000 (18:51 +0000)]
Generate flat triangles in polygon offset tests. am:
975a59ebca am:
0bde00f9d6 am:
b57eb2d24f am:
aa9a995cfc
am:
afc69d0dd1
Change-Id: Icee90416d4de26213e6150b1227fb4125af8eb02
Tina Zhou [Fri, 20 Jan 2017 18:51:10 +0000 (18:51 +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: I4e0bf57c975ab1280648e3e342f1c1938f8d4c60
Android Build Merger (Role) [Fri, 20 Jan 2017 18:51:10 +0000 (18:51 +0000)]
Merge "Merge "Fix eglBindAPI negative test" into nougat-cts-dev am:
6068dfbf3a am:
839be6fae4 am:
e892f4b76d am:
5322472db4 am:
b71168726c" into nyc-mr2-dev-plus-aosp
Tina Zhou [Fri, 20 Jan 2017 18:51:00 +0000 (18:51 +0000)]
Merge "Fix eglBindAPI negative test" into nougat-cts-dev am:
6068dfbf3a am:
839be6fae4 am:
e892f4b76d am:
5322472db4
am:
b71168726c
Change-Id: I42d70e2e5775742c0c781d833b2bc08867f70318
Android Build Merger (Role) [Fri, 20 Jan 2017 18:50:49 +0000 (18:50 +0000)]
Merge "Fix eglBindAPI negative test am:
09784f8510 am:
b7b2f00530 am:
03a8c9c6f8 am:
6e6f163b3b am:
190054bc17" into nyc-mr2-dev-plus-aosp
Pyry Haulos [Fri, 20 Jan 2017 18:50:45 +0000 (18:50 +0000)]
Relax line width verification in primitive bbox tests am:
ba45591407 am:
b4fbc02e3c am:
b9b63c17d2 am:
4f191e12a9
am:
c29aba4a88
Change-Id: I86948a145dbfd8add6fc29433d0edb34f40198a8
Nicolas Boichat [Fri, 20 Jan 2017 18:50:42 +0000 (18:50 +0000)]
Fix eglBindAPI negative test am:
09784f8510 am:
b7b2f00530 am:
03a8c9c6f8 am:
6e6f163b3b
am:
190054bc17
Change-Id: I8e72c1dbb4cd704c5def759492b7fc9265c973b0
Android Build Merger (Role) [Fri, 20 Jan 2017 18:50:38 +0000 (18:50 +0000)]
Merge "Merge "Fix eglBindAPI negative test" into nougat-cts-dev am:
6068dfbf3a am:
839be6fae4 am:
e892f4b76d am:
5322472db4 am:
c775dba9b7" into nyc-mr2-dev-plus-aosp
Android Build Merger (Role) [Fri, 20 Jan 2017 18:50:35 +0000 (18:50 +0000)]
Merge "Merge "Drop incorrect framebuffer texture subtests." into nougat-cts-dev am:
3baf7e3be2 am:
b3f5df9d8f am:
c51b8d9aed am:
ca62006a36 am:
db0b4da47e" into nyc-mr2-dev-plus-aosp
Tina Zhou [Fri, 20 Jan 2017 18:50:34 +0000 (18:50 +0000)]
Merge "Fix eglBindAPI negative test" into nougat-cts-dev am:
6068dfbf3a am:
365f81e68c am:
15cde0b466 am:
b21dbe99b2
am:
930d6894e5
Change-Id: I37592ae622c1e3886380220a157099f147b92c51
Tina Zhou [Fri, 20 Jan 2017 18:50:31 +0000 (18:50 +0000)]
Merge "Fix eglBindAPI negative test" into nougat-cts-dev am:
6068dfbf3a am:
839be6fae4 am:
e892f4b76d am:
5322472db4
am:
c775dba9b7
Change-Id: Iec06d72575a2670e48bcea1b78d353e105d38c91
Tina Zhou [Fri, 20 Jan 2017 18:50:28 +0000 (18:50 +0000)]
Merge "Drop incorrect framebuffer texture subtests." into nougat-cts-dev am:
3baf7e3be2 am:
b3f5df9d8f am:
c51b8d9aed am:
ca62006a36
am:
db0b4da47e
Change-Id: I8d970364b87a9e70785ddb530f0bd2a61408ba63
Android Build Merger (Role) [Fri, 20 Jan 2017 18:50:25 +0000 (18:50 +0000)]
Merge "Fix eglBindAPI negative test am:
09784f8510 am:
b7b2f00530 am:
03a8c9c6f8 am:
6e6f163b3b am:
3401c85689" into nyc-mr2-dev-plus-aosp
Android Build Merger (Role) [Fri, 20 Jan 2017 18:50:20 +0000 (18:50 +0000)]
Merge "Drop incorrect framebuffer texture subtests. am:
625d685874 am:
9df734d698 am:
b7e9123835 am:
8d840f0bad am:
f2063e4bd4" into nyc-mr2-dev-plus-aosp
Nicolas Boichat [Fri, 20 Jan 2017 18:50:17 +0000 (18:50 +0000)]
Fix eglBindAPI negative test am:
09784f8510 am:
b7b2f00530 am:
03a8c9c6f8 am:
6e6f163b3b
am:
3401c85689
Change-Id: I2f83b07eb9d7316cbf9ed54b2ac0f5b7a4069f21
Nicolas Boichat [Fri, 20 Jan 2017 18:50:14 +0000 (18:50 +0000)]
Fix eglBindAPI negative test am:
09784f8510 am:
3342150f5a am:
1af587d644 am:
52211c87ed
am:
fc116aa764
Change-Id: Ic090c0d72943048502b71e4f5df9a06827bdb7fe
Kenneth Graunke [Fri, 20 Jan 2017 18:50:13 +0000 (18:50 +0000)]
Drop incorrect framebuffer texture subtests. am:
625d685874 am:
9df734d698 am:
b7e9123835 am:
8d840f0bad
am:
f2063e4bd4
Change-Id: I4eee1171446075ef482c95ec6d47f727c5b70e04
Android Build Merger (Role) [Fri, 20 Jan 2017 18:50:12 +0000 (18:50 +0000)]
Merge "Merge "Drop incorrect framebuffer texture subtests." into nougat-cts-dev am:
3baf7e3be2 am:
b3f5df9d8f am:
c51b8d9aed am:
ca62006a36 am:
fdd8480d61" into nyc-mr2-dev-plus-aosp
Tina Zhou [Fri, 20 Jan 2017 18:50:05 +0000 (18:50 +0000)]
Merge "Drop incorrect framebuffer texture subtests." into nougat-cts-dev am:
3baf7e3be2 am:
b3f5df9d8f am:
c51b8d9aed am:
ca62006a36
am:
fdd8480d61
Change-Id: Icbd403318866895a52642f010759407956c0c005
Android Build Merger (Role) [Fri, 20 Jan 2017 18:50:04 +0000 (18:50 +0000)]
Merge "Merge "Optimize swapchain OOM tests" into nougat-cts-dev am:
c811d42d99 am:
27b237e149 am:
941703d7ac am:
f118f42c24 am:
e3b76d3762" into nyc-mr2-dev-plus-aosp
Tina Zhou [Fri, 20 Jan 2017 18:50:03 +0000 (18:50 +0000)]
Merge "Drop incorrect framebuffer texture subtests." into nougat-cts-dev am:
3baf7e3be2 am:
a580ae91f8 am:
816d6bdb88 am:
f49c7ce972
am:
a91d8f9bf5
Change-Id: I0c604c951d025c09b1716e6fcc0817e5be028738
Android Build Merger (Role) [Fri, 20 Jan 2017 18:49:58 +0000 (18:49 +0000)]
Merge "Drop incorrect framebuffer texture subtests. am:
625d685874 am:
9df734d698 am:
b7e9123835 am:
8d840f0bad am:
f06cad8eec" into nyc-mr2-dev-plus-aosp
projects / platform / upstream / VK-GL-CTS.git / log