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: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: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: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: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
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
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: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
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
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
Tina Zhou [Fri, 20 Jan 2017 18:49:57 +0000 (18:49 +0000)]
Merge "Optimize swapchain OOM tests" into nougat-cts-dev am:
c811d42d99 am:
27b237e149 am:
941703d7ac am:
f118f42c24
am:
e3b76d3762
Change-Id: Ibf7780711e82ebdea81d88b9712cb6c3216928b6
Kenneth Graunke [Fri, 20 Jan 2017 18:49:53 +0000 (18:49 +0000)]
Drop incorrect framebuffer texture subtests. am:
625d685874 am:
25b6d76b01 am:
6f6f3d78fc am:
18805bd38c
am:
ce197d0f27
Change-Id: Ic2149ee3bb89d1f8abf4d980a7e100c16fef2241
Kenneth Graunke [Fri, 20 Jan 2017 18:49:52 +0000 (18:49 +0000)]
Drop incorrect framebuffer texture subtests. am:
625d685874 am:
9df734d698 am:
b7e9123835 am:
8d840f0bad
am:
f06cad8eec
Change-Id: Ibf4e598e4807987f2af209cf0d456ab4ce49ed4d
Android Build Merger (Role) [Fri, 20 Jan 2017 18:49:46 +0000 (18:49 +0000)]
Merge "Merge "Optimize swapchain OOM tests" into nougat-cts-dev am:
c811d42d99 am:
27b237e149 am:
941703d7ac am:
f118f42c24 am:
36b1aa5745" into nyc-mr2-dev-plus-aosp
Tina Zhou [Fri, 20 Jan 2017 18:49:40 +0000 (18:49 +0000)]
Merge "Optimize swapchain OOM tests" into nougat-cts-dev am:
c811d42d99 am:
27b237e149 am:
941703d7ac am:
f118f42c24
am:
36b1aa5745
Change-Id: I662ff45d05608b3c2a551f23fe5969fe5e6ec62e
Android Build Merger (Role) [Fri, 20 Jan 2017 18:49:37 +0000 (18:49 +0000)]
Merge "Optimize swapchain OOM tests am:
1614827a71 am:
c4cd6ba5e7 am:
58dd13c4bd am:
fee7030974 am:
cc5f7e4994" into nyc-mr2-dev-plus-aosp
Android Build Merger (Role) [Fri, 20 Jan 2017 18:49:34 +0000 (18:49 +0000)]
Merge "Optimize swapchain OOM tests am:
1614827a71 am:
c4cd6ba5e7 am:
58dd13c4bd am:
fee7030974 am:
d77cb2024c" into nyc-mr2-dev-plus-aosp
Tina Zhou [Fri, 20 Jan 2017 18:49:33 +0000 (18:49 +0000)]
Merge "Optimize swapchain OOM tests" into nougat-cts-dev am:
c811d42d99 am:
6d4c0dca61 am:
d64bb66820 am:
ec68ba0951
am:
b7985f162a
Change-Id: I1912ccb4b215fd4eb85feb05d48847553393b2fb
Pyry Haulos [Fri, 20 Jan 2017 18:49:31 +0000 (18:49 +0000)]
Optimize swapchain OOM tests am:
1614827a71 am:
c4cd6ba5e7 am:
58dd13c4bd am:
fee7030974
am:
cc5f7e4994
Change-Id: Ifaa0328a831afc1ca87de4c28764e3fbff7ead72
Pyry Haulos [Fri, 20 Jan 2017 18:49:27 +0000 (18:49 +0000)]
Optimize swapchain OOM tests am:
1614827a71 am:
c4cd6ba5e7 am:
58dd13c4bd am:
fee7030974
am:
d77cb2024c
Change-Id: I6e48ea7eb82197f5e946e6a29efccbd0a46b15d7
Android Build Merger (Role) [Fri, 20 Jan 2017 18:49:24 +0000 (18:49 +0000)]
Merge "Merge "Fix internal format/type for ES3 3D + depth/stencil negative API tests." into nougat-cts-dev am:
0991459ed1 am:
0a2fc88750 am:
842ee2b145 am:
c9c5b8e584 am:
a564528ab7" into nyc-mr2-dev-plus-aosp
Android Build Merger (Role) [Fri, 20 Jan 2017 18:49:22 +0000 (18:49 +0000)]
Merge "Merge "Fix internal format/type for ES3 3D + depth/stencil negative API tests." into nougat-cts-dev am:
0991459ed1 am:
0a2fc88750 am:
842ee2b145 am:
c9c5b8e584 am:
e7ce491cb7" into nyc-mr2-dev-plus-aosp
Pyry Haulos [Fri, 20 Jan 2017 18:49:21 +0000 (18:49 +0000)]
Optimize swapchain OOM tests am:
1614827a71 am:
2cfe132119 am:
00ab17bd23 am:
c9b7dae8a8
am:
acce97d998
Change-Id: I3f1f0a974805a6f888e2dfe294f76bab927e1f34
Tina Zhou [Fri, 20 Jan 2017 18:49:18 +0000 (18:49 +0000)]
Merge "Fix internal format/type for ES3 3D + depth/stencil negative API tests." into nougat-cts-dev am:
0991459ed1 am:
0a2fc88750 am:
842ee2b145 am:
c9c5b8e584
am:
a564528ab7
Change-Id: Id779115d9ee3bab99e794c26f4d4a57bf633587d
Tina Zhou [Fri, 20 Jan 2017 18:49:14 +0000 (18:49 +0000)]
Merge "Fix internal format/type for ES3 3D + depth/stencil negative API tests." into nougat-cts-dev am:
0991459ed1 am:
0a2fc88750 am:
842ee2b145 am:
c9c5b8e584
am:
e7ce491cb7
Change-Id: I4f0ca6b0edfc38c64927916fe4d19e0764bb7a3c
Android Build Merger (Role) [Fri, 20 Jan 2017 18:49:12 +0000 (18:49 +0000)]
Merge "Fix internal format/type for ES3 3D + depth/stencil negative API tests. am:
2ed3a5a66f am:
ad563bc887 am:
c05194f0c9 am:
b33cfac0b1 am:
0dfdc9322c" into nyc-mr2-dev-plus-aosp
Tina Zhou [Fri, 20 Jan 2017 18:49:11 +0000 (18:49 +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: I9c65341b0053f025f8993ff45bb9d80e6af3a453
Android Build Merger (Role) [Fri, 20 Jan 2017 18:49:10 +0000 (18:49 +0000)]
Merge "Fix internal format/type for ES3 3D + depth/stencil negative API tests. am:
2ed3a5a66f am:
ad563bc887 am:
c05194f0c9 am:
b33cfac0b1 am:
ec34d4f308" into nyc-mr2-dev-plus-aosp
Kenneth Graunke [Fri, 20 Jan 2017 18:49:05 +0000 (18:49 +0000)]
Fix internal format/type for ES3 3D + depth/stencil negative API tests. am:
2ed3a5a66f am:
ad563bc887 am:
c05194f0c9 am:
b33cfac0b1
am:
ec34d4f308
Change-Id: I9ffca14eb9d2b3fcbf05f0262db64d834e00a95d
Kenneth Graunke [Fri, 20 Jan 2017 18:49:04 +0000 (18:49 +0000)]
Fix internal format/type for ES3 3D + depth/stencil negative API tests. am:
2ed3a5a66f am:
ad563bc887 am:
c05194f0c9 am:
b33cfac0b1
am:
0dfdc9322c
Change-Id: I0c596fc390f71a98be764aff8d8ea4f1b5d22478
Kenneth Graunke [Fri, 20 Jan 2017 18:49:01 +0000 (18:49 +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: Ifa7496d89483f78cbea88aa8e603247686b7bbf0
Android Build Merger (Role) [Fri, 20 Jan 2017 18:48:59 +0000 (18:48 +0000)]
Merge "Merge "Add support for EGL_EXT_pixel_format_float" into nougat-cts-dev am:
13a05434cc am:
4fc6c2e455 am:
57763dc162 am:
24141a0482 am:
084605e329 -s ours" into nyc-mr2-dev-plus-aosp
Android Build Merger (Role) [Fri, 20 Jan 2017 18:48:58 +0000 (18:48 +0000)]
Merge "Merge "Add support for EGL_EXT_pixel_format_float" into nougat-cts-dev am:
13a05434cc am:
4fc6c2e455 am:
57763dc162 am:
24141a0482 -s ours am:
859095b088 -s ours" into nyc-mr2-dev-plus-aosp
Tina Zhou [Fri, 20 Jan 2017 18:48:53 +0000 (18:48 +0000)]
Merge "Add support for EGL_EXT_pixel_format_float" into nougat-cts-dev am:
13a05434cc am:
4fc6c2e455 am:
57763dc162 am:
24141a0482
am:
084605e329 -s ours
Change-Id: I4173b532f1df3d9a4dbc26331551c8da015e8193
Tina Zhou [Fri, 20 Jan 2017 18:48:51 +0000 (18:48 +0000)]
Merge "Add support for EGL_EXT_pixel_format_float" into nougat-cts-dev am:
13a05434cc am:
4fc6c2e455 am:
57763dc162 am:
24141a0482 -s ours
am:
859095b088 -s ours
Change-Id: I037b36edd201147c73d74e7c6dd37436f2c6993a
Tina Zhou [Fri, 20 Jan 2017 18:48:48 +0000 (18:48 +0000)]
Merge "Add support for EGL_EXT_pixel_format_float" into nougat-cts-dev am:
13a05434cc am:
5f30178321 am:
764cd6e60b am:
0a683a56e7
am:
e961416ca6
Change-Id: Ice7700675ce2e0feab066cf89b4a0ce9d7a93c66
Android Build Merger (Role) [Fri, 20 Jan 2017 18:48:47 +0000 (18:48 +0000)]
Merge "Add support for EGL_EXT_pixel_format_float am:
521bf8a7c3 am:
28a6ef5df2 am:
69a929f82c am:
c68e6bbdef am:
ea60da8b8d -s ours" into nyc-mr2-dev-plus-aosp
Mark Adams [Fri, 20 Jan 2017 18:48:42 +0000 (18:48 +0000)]
Add support for EGL_EXT_pixel_format_float am:
521bf8a7c3 am:
28a6ef5df2 am:
69a929f82c am:
c68e6bbdef
am:
ea60da8b8d -s ours
Change-Id: Ice9061b0e0091332b57d1a59d7bc000f9b780d9c
Mark Adams [Fri, 20 Jan 2017 18:48:39 +0000 (18:48 +0000)]
Add support for EGL_EXT_pixel_format_float am:
521bf8a7c3 am:
4b7baeace7 am:
86683f95c7 am:
0624edb1ce
am:
234daba7b4
Change-Id: Ibde5185477db4f67db7a8f79ea124d52e22fcc6c
Mark Adams [Fri, 20 Jan 2017 18:48:37 +0000 (18:48 +0000)]
Add support for EGL_EXT_pixel_format_float am:
521bf8a7c3 am:
28a6ef5df2 am:
69a929f82c am:
c68e6bbdef -s ours
am:
2495d02e3f -s ours
Change-Id: I6dc62cda139340ee9ebda71dc69192f4c3691406
Tina Zhou [Fri, 20 Jan 2017 18:47:15 +0000 (18:47 +0000)]
Merge "Remove tests affected by NV/OES_viewport_array extension" into nougat-cts-dev am:
e98444b9bf am:
ce3144c3e5 am:
29dde7d04d
am:
4ac909cfeb
Change-Id: If70fa0b064ecfe16aa2090c36981df138d03119f
Pyry Haulos [Fri, 20 Jan 2017 18:47:02 +0000 (18:47 +0000)]
Remove tests affected by NV/OES_viewport_array extension am:
267c765690 am:
0004ce1767 am:
ee2a180f00
am:
20860eb2df
Change-Id: Ifdb76d42aad05e5527e94a89ab3deedcd60493ed
Tina Zhou [Fri, 20 Jan 2017 18:46:49 +0000 (18:46 +0000)]
Merge "Generate flat triangles in polygon offset tests." into nougat-cts-dev am:
61d6d95a66 am:
73b7f271a9 am:
0b9596cb35
am:
436488b78f
Change-Id: I67465b5720b496c731e86ea7cdaa23dc85109a31
Alexander Galazin [Fri, 20 Jan 2017 18:46:38 +0000 (18:46 +0000)]
Generate flat triangles in polygon offset tests. am:
975a59ebca am:
02c67b12c1 am:
0e7da13770
am:
0dbb18ee84
Change-Id: I761c6070f063711939073561052951e40f8abaea
Tina Zhou [Fri, 20 Jan 2017 18:46:27 +0000 (18:46 +0000)]
Merge "Relax line width verification in primitive bbox tests" into nougat-cts-dev am:
312a550657 am:
36d3dd2ab1 am:
5debc545bf
am:
ee10cd68f7
Change-Id: I019c733753bc99b9c2b82f8c21c5bd8b049220c7
Pyry Haulos [Fri, 20 Jan 2017 18:46:15 +0000 (18:46 +0000)]
Relax line width verification in primitive bbox tests am:
ba45591407 am:
a11fd8b487 am:
90c49fe030
am:
04d8a8e98a
Change-Id: I73c8531c939d3c8ecd075aa121748e47b32b83ec
projects / platform / upstream / VK-GL-CTS.git / log