Tina Zhou [Tue, 22 Aug 2017 19:42:14 +0000 (19:42 +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 am:
3db7131bdf
am:
37b681c300
Change-Id: I05dc65cb0a4a85f34f8adf5f17ccb9abf7eab69e
Tina Zhou [Tue, 22 Aug 2017 19:41:34 +0000 (19:41 +0000)]
Merge "Relax line width verification in primitive bbox tests" into nougat-cts-dev am:
312a550657 am:
36d3dd2ab1 am:
5debc545bf am:
ee10cd68f7 am:
09377becd7 am:
40c5c485ff
am:
e40b89e7b4
Change-Id: Ie753a31e252540a94ed6ff00603f10fefbcedac7
Tina Zhou [Tue, 22 Aug 2017 19:41:01 +0000 (19:41 +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 am:
dfdb3bb243
am:
53b0618ee8
Change-Id: I60a2bdc94bc50b3f701295de1b03a4d47df52f28
Tina Zhou [Tue, 22 Aug 2017 19:40:47 +0000 (19:40 +0000)]
Merge "Generate flat triangles in polygon offset tests." into nougat-cts-dev am:
61d6d95a66 am:
ea7ea6aeee am:
562348c4a0 am:
b03f7416cd am:
94adec74ae
am:
af6ce9c1aa
Change-Id: I22256192778f7b914caaec5e49afe4509277b363
Pyry Haulos [Tue, 22 Aug 2017 19:40:33 +0000 (19:40 +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 am:
c9967871b3
am:
8c878710f0
Change-Id: I6b43bd47a75702e5f4746d1d4bb4b107a74044df
Pyry Haulos [Tue, 22 Aug 2017 19:40:20 +0000 (19:40 +0000)]
Relax line width verification in primitive bbox tests am:
ba45591407 am:
a11fd8b487 am:
90c49fe030 am:
04d8a8e98a am:
6734db1692 am:
74bbc068d7
am:
c9c670873f
Change-Id: I7e6a03d93065f8ba93155f77866a18b510fade3f
Alexander Galazin [Tue, 22 Aug 2017 19:40:02 +0000 (19:40 +0000)]
Generate flat triangles in polygon offset tests. am:
975a59ebca am:
b1c225b9d6 am:
f8e27c683d am:
5ccc8a2ee8 am:
678de5eb37
am:
172992bc49
Change-Id: I945a448e1e435248be1728bb0d703f889e254440
Tina Zhou [Tue, 22 Aug 2017 19:39:49 +0000 (19:39 +0000)]
Merge "Relax line width verification in primitive bbox tests" into nougat-cts-dev am:
312a550657 am:
487543e953 am:
ed835f32e2 am:
cd215677dd am:
1d8a06d405
am:
2350c4f9f3
Change-Id: Id1434c582540bb03e463c774d4373c783dffefe0
Pyry Haulos [Tue, 22 Aug 2017 19:39:29 +0000 (19:39 +0000)]
resolve merge conflicts of
ba455914 to master am:
07a7e24da3 am:
218bfe74ff am:
e37a75a4b9 am:
2d1edbcbc6
am:
a1d7048d03
Change-Id: I1ba478d3d4dc3c3a881260781bf143b0b7ef2e0f
Tina Zhou [Tue, 22 Aug 2017 19:39:05 +0000 (19:39 +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 am:
d94251a4ee
am:
ebcb02c692
Change-Id: I43b7b5f4a60aa29e5ca2dfc5fb3b84f8327e06e9
Tina Zhou [Tue, 22 Aug 2017 19:38:43 +0000 (19:38 +0000)]
Merge "Fix eglBindAPI negative test" into nougat-cts-dev am:
6068dfbf3a am:
839be6fae4 am:
e892f4b76d am:
5322472db4 am:
b71168726c am:
1e1b68d29b
am:
deb7756f2b
Change-Id: Ib2b62c520e79c3f17c8aa8977e40f62f06eb2cee
Nicolas Boichat [Tue, 22 Aug 2017 19:38:18 +0000 (19:38 +0000)]
Merge "Fix eglBindAPI negative test am:
09784f8510 am:
b7b2f00530 am:
03a8c9c6f8 am:
6e6f163b3b am:
190054bc17" into nyc-mr2-dev-plus-aosp am:
e9aae01bae
am:
2b277a3ece
Change-Id: I5c5ba5e0c0054eee4545ffaed9c867965e0366e3
Nicolas Boichat [Tue, 22 Aug 2017 19:37:50 +0000 (19:37 +0000)]
Fix eglBindAPI negative test am:
09784f8510 am:
b7b2f00530 am:
03a8c9c6f8 am:
6e6f163b3b am:
190054bc17 am:
9f3d873751
am:
b3f12548a6
Change-Id: I40963e7797cfba12beec28e92d055c0deaebfb93
Tina Zhou [Tue, 22 Aug 2017 19:37:07 +0000 (19:37 +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 am:
49a8b52d3a
am:
61aec40a6f
Change-Id: I53c3e2341f5290eede05bf714f84f0e95a420cc1
Tina Zhou [Tue, 22 Aug 2017 19:36:41 +0000 (19:36 +0000)]
Merge "Fix eglBindAPI negative test" into nougat-cts-dev am:
6068dfbf3a am:
839be6fae4 am:
e892f4b76d am:
5322472db4 am:
c775dba9b7 am:
6f69e76b29
am:
f8fb7786bc
Change-Id: Ie00598aa092d1e0c24823f3b1cd39c21bb981fe5
Tina Zhou [Tue, 22 Aug 2017 19:36:13 +0000 (19:36 +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 am:
83f1c9448f
am:
c944241c91 -s ours
Change-Id: I2838bf32f9d01480763b562920bdc2ba9c6208ba
Tina Zhou [Tue, 22 Aug 2017 19:35:40 +0000 (19:35 +0000)]
Merge "Drop incorrect framebuffer texture subtests." into nougat-cts-dev am:
3baf7e3be2 am:
b3f5df9d8f am:
c51b8d9aed am:
ca62006a36 am:
db0b4da47e am:
c5cf83a659
am:
bc0c06c44e -s ours
Change-Id: Id51b4467e38632dc06a0d0476cb4036e51e0a424
Nicolas Boichat [Tue, 22 Aug 2017 19:35:08 +0000 (19:35 +0000)]
Merge "Fix eglBindAPI negative test am:
09784f8510 am:
b7b2f00530 am:
03a8c9c6f8 am:
6e6f163b3b am:
3401c85689" into nyc-mr2-dev-plus-aosp am:
7090e0d7c3
am:
b97d297f67
Change-Id: I3ff24480bd2fcaa41678a6c6cf3eb2eb43e97e71
Nicolas Boichat [Tue, 22 Aug 2017 19:34:51 +0000 (19:34 +0000)]
Fix eglBindAPI negative test am:
09784f8510 am:
b7b2f00530 am:
03a8c9c6f8 am:
6e6f163b3b am:
3401c85689 am:
ef54248329
am:
0d83404b48
Change-Id: I08b71dba68a2fcaaa14bb45af989319f3d7df82c
Kenneth Graunke [Tue, 22 Aug 2017 19:34:28 +0000 (19:34 +0000)]
Merge "Drop incorrect framebuffer texture subtests. am:
625d685874 am:
9df734d698 am:
b7e9123835 am:
8d840f0bad am:
f2063e4bd4" into nyc-mr2-dev-plus-aosp am:
c755407f78
am:
f9eb1f80f6 -s ours
Change-Id: Icb56b6e8e729e168d3645be905de1bb410570ae7
Kenneth Graunke [Tue, 22 Aug 2017 19:34:12 +0000 (19:34 +0000)]
Drop incorrect framebuffer texture subtests. am:
625d685874 am:
9df734d698 am:
b7e9123835 am:
8d840f0bad am:
f2063e4bd4 am:
d6715f9002
am:
f856388611 -s ours
Change-Id: Idaf749a9c8cd35767e8b6dbe621e2049e83687f1
Tina Zhou [Tue, 22 Aug 2017 19:33:48 +0000 (19:33 +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 am:
484a0785b5
am:
1fa60cfb49 -s ours
Change-Id: Idca3c80c0bbb8a761c2d9b1a7e7c8ea0220b4abe
Tina Zhou [Tue, 22 Aug 2017 19:33:23 +0000 (19:33 +0000)]
Merge "Drop incorrect framebuffer texture subtests." into nougat-cts-dev am:
3baf7e3be2 am:
b3f5df9d8f am:
c51b8d9aed am:
ca62006a36 am:
fdd8480d61 am:
41dcd407bb
am:
d16cc640c9 -s ours
Change-Id: I7a5f2f65bb2665b05fb24915b62ecb85c3ecc240
Tina Zhou [Tue, 22 Aug 2017 19:32:52 +0000 (19:32 +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 am:
5c9af00a13
am:
ea8fc92adb
Change-Id: Ie0021d02d98d9afd482c3947c7c2a85b011b5636
Tina Zhou [Tue, 22 Aug 2017 19:32:24 +0000 (19:32 +0000)]
Merge "Optimize swapchain OOM tests" into nougat-cts-dev am:
c811d42d99 am:
27b237e149 am:
941703d7ac am:
f118f42c24 am:
e3b76d3762 am:
a2f948ce46
am:
0f3f2f2fd6
Change-Id: I1bc6ecc505c65934196db14d5492ba4fa35bcdf7
Kenneth Graunke [Tue, 22 Aug 2017 19:31:53 +0000 (19:31 +0000)]
Merge "Drop incorrect framebuffer texture subtests. am:
625d685874 am:
9df734d698 am:
b7e9123835 am:
8d840f0bad am:
f06cad8eec" into nyc-mr2-dev-plus-aosp am:
bd63d460ae
am:
957671ab97 -s ours
Change-Id: Ifa13c7e6bd60d54b6cfbea646cdbc5cc037ec8bb
Kenneth Graunke [Tue, 22 Aug 2017 19:31:24 +0000 (19:31 +0000)]
Drop incorrect framebuffer texture subtests. am:
625d685874 am:
9df734d698 am:
b7e9123835 am:
8d840f0bad am:
f06cad8eec am:
32036df36a
am:
a9ebb8485a -s ours
Change-Id: I100fb5d071767c0911ed8fc9230c72d71afb0ede
Tina Zhou [Tue, 22 Aug 2017 19:30:27 +0000 (19:30 +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 am:
1d32715390
am:
c3edecf7e2
Change-Id: Ib8dc9a7e9d830fcee369ae18ca93ef09ba3b1351
Tina Zhou [Tue, 22 Aug 2017 19:30:10 +0000 (19:30 +0000)]
Merge "Optimize swapchain OOM tests" into nougat-cts-dev am:
c811d42d99 am:
27b237e149 am:
941703d7ac am:
f118f42c24 am:
36b1aa5745 am:
bdfe398260
am:
e6df2559af
Change-Id: I19a797db2d44e9944d8553bc51d52469767bcf83
Pyry Haulos [Tue, 22 Aug 2017 19:29:56 +0000 (19:29 +0000)]
Merge "Optimize swapchain OOM tests am:
1614827a71 am:
c4cd6ba5e7 am:
58dd13c4bd am:
fee7030974 am:
cc5f7e4994" into nyc-mr2-dev-plus-aosp am:
52dd024c04
am:
d98a48ab51
Change-Id: Ic6de8d0bb62bde55221e474c7928d87dd4def20a
Pyry Haulos [Tue, 22 Aug 2017 19:29:39 +0000 (19:29 +0000)]
Optimize swapchain OOM tests am:
1614827a71 am:
c4cd6ba5e7 am:
58dd13c4bd am:
fee7030974 am:
cc5f7e4994 am:
d56d1c3290
am:
c708235561
Change-Id: I987935b5a7305442e7ed75ce86d3c35dab09681a
Pyry Haulos [Tue, 22 Aug 2017 19:29:21 +0000 (19:29 +0000)]
Merge "Optimize swapchain OOM tests am:
1614827a71 am:
c4cd6ba5e7 am:
58dd13c4bd am:
fee7030974 am:
d77cb2024c" into nyc-mr2-dev-plus-aosp am:
92eba862f7
am:
dc9b9cb245
Change-Id: Ie7b2f0cccf9906989c464e15c64225bbf9a85132
Pyry Haulos [Tue, 22 Aug 2017 19:29:06 +0000 (19:29 +0000)]
Optimize swapchain OOM tests am:
1614827a71 am:
c4cd6ba5e7 am:
58dd13c4bd am:
fee7030974 am:
d77cb2024c am:
2561661eec
am:
80a79b2b13
Change-Id: I1c1fbe676cbdcd540ef34289ef48b1b429de4577
Tina Zhou [Tue, 22 Aug 2017 19:28:46 +0000 (19:28 +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 am:
9df578208a
am:
b250b9c67e
Change-Id: Iaaba8e515d7eb7bff9211d663480287a160d7fc9
Tina Zhou [Tue, 22 Aug 2017 19:28:23 +0000 (19:28 +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 am:
19f8c954a0
am:
524e622fa5
Change-Id: Ib61867c09ddc22ab42cebfb4e85225d130dbfaa1
Tina Zhou [Tue, 22 Aug 2017 19:27:55 +0000 (19:27 +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 am:
c506612495
am:
a330a6f852
Change-Id: I2203b2e9a313200f1fbaed23e20596c9299d21c6
Tina Zhou [Tue, 22 Aug 2017 19:27:23 +0000 (19:27 +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 am:
d3eb75cd75
am:
f7258c4ed9
Change-Id: I18bb92c1f1a0b5fdfc109893f13ac665e8a2c590
Kenneth Graunke [Tue, 22 Aug 2017 19:26:55 +0000 (19:26 +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 am:
3d67dd20fb
am:
12ce791e4d
Change-Id: I50fc5a5a1bf2d2439893c5c90b90deb934b00fec
Kenneth Graunke [Tue, 22 Aug 2017 19:26:24 +0000 (19:26 +0000)]
Fix internal format/type for ES3 3D + depth/stencil negative API tests. am:
2ed3a5a66f am:
ad563bc887 am:
c05194f0c9 am:
b33cfac0b1 am:
0dfdc9322c am:
cae91aff99
am:
17d6038c4c
Change-Id: I5fe9e47a485dad5768aa29ae53b826cf88d5c15d
Kenneth Graunke [Tue, 22 Aug 2017 19:25:56 +0000 (19:25 +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 am:
9245c78b12
am:
c7b3d13d04
Change-Id: Iba35e862de92baade1d2e12534f6e12e6a586ae9
Kenneth Graunke [Tue, 22 Aug 2017 19:25:32 +0000 (19:25 +0000)]
Fix internal format/type for ES3 3D + depth/stencil negative API tests. am:
2ed3a5a66f am:
ad563bc887 am:
c05194f0c9 am:
b33cfac0b1 am:
ec34d4f308 am:
507cb66b04
am:
f7d0529341
Change-Id: I3c0c0813fdfdf547bf45f4fd7c076718bab731bf
Tina Zhou [Tue, 22 Aug 2017 19:25:13 +0000 (19:25 +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 am:
47953075f3 -s ours
am:
0dd94f2847 -s ours
Change-Id: I48ed5b0042149e0b4b2181b129a7b07ada5bf1a5
Tina Zhou [Tue, 22 Aug 2017 19:24:55 +0000 (19:24 +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 am:
0e39ad8575 -s ours
am:
889e7a2209 -s ours
Change-Id: Ie7344d512a0d56a41c991a67378708a23f851f4b
Tina Zhou [Tue, 22 Aug 2017 19:24:38 +0000 (19:24 +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 am:
ece798f87b -s ours
am:
ee29a031b3 -s ours
Change-Id: Ic24f61576cf5ca51ca9470fbea1693e4a6dd2d86
Tina Zhou [Tue, 22 Aug 2017 19:24:19 +0000 (19:24 +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 am:
9ff54d7eec -s ours
am:
0ee382d06f -s ours
Change-Id: I7e9ca3ca9f8e54f08d3180f8a9c35cd23c1ecef5
Mark Adams [Tue, 22 Aug 2017 19:23:59 +0000 (19:23 +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 am:
a45c4b9824 -s ours
am:
5b83855d2d -s ours
Change-Id: Iaa76ef92a6d5bb352120a6e479681a97b2932818
Mark Adams [Tue, 22 Aug 2017 19:23:16 +0000 (19:23 +0000)]
Add support for EGL_EXT_pixel_format_float am:
521bf8a7c3 am:
28a6ef5df2 am:
69a929f82c am:
c68e6bbdef am:
ea60da8b8d -s ours am:
9770026602 -s ours
am:
f42daafd9c -s ours
Change-Id: I05072bbb7f5d43920d8777baa5e02d937f0eaf9f
Mark Adams [Tue, 22 Aug 2017 19:22:42 +0000 (19:22 +0000)]
Add support for EGL_EXT_pixel_format_float am:
521bf8a7c3 am:
28a6ef5df2 am:
69a929f82c am:
c68e6bbdef -s ours am:
2495d02e3f -s ours am:
3ff70c7042 -s ours
am:
ebf139ff93 -s ours
Change-Id: I28d7c4d3cb79495eba5b9d057074e016a2a13cb7
Tina Zhou [Tue, 22 Aug 2017 19:21:53 +0000 (19:21 +0000)]
Merge "Fix eglBindAPI negative test" into nougat-cts-dev am:
6068dfbf3a am:
cc65e08407 am:
be674b63ba am:
e766c1ab54 am:
3bfd4e5494
am:
1e74fd13f6
Change-Id: If4d79f8f18146afb9af62666b2a00ce40a6d04fc
Nicolas Boichat [Tue, 22 Aug 2017 19:21:26 +0000 (19:21 +0000)]
Fix eglBindAPI negative test am:
09784f8510 am:
2792165177 am:
298b7abce5 am:
13bfe4734c am:
0cc14a39d7
am:
b7874eb592
Change-Id: Iafb5bbd354ddc605c7a9d5532f6a51a284e99071
Tina Zhou [Tue, 22 Aug 2017 19:21:01 +0000 (19:21 +0000)]
Merge "Drop incorrect framebuffer texture subtests." into nougat-cts-dev am:
3baf7e3be2 -s ours am:
7e8c7d9b65 am:
dd6ff4b8da am:
7a0b1861f1 am:
4c094d04f0
am:
ee4d4d2847 -s ours
Change-Id: I03777b7ef38b001e26f84f00d9bd930cab0779d3
Kenneth Graunke [Tue, 22 Aug 2017 19:20:36 +0000 (19:20 +0000)]
Drop incorrect framebuffer texture subtests. am:
625d685874 -s ours am:
727bdb2369 am:
5722a54979 am:
f874bcf9ce am:
eb8a9dbfda
am:
ec86e30f5c -s ours
Change-Id: Ieee30c63685194e5df685370fd0e576417d9224c
Tina Zhou [Tue, 22 Aug 2017 19:20:07 +0000 (19:20 +0000)]
Merge "Optimize swapchain OOM tests" into nougat-cts-dev am:
c811d42d99 am:
e8956e54ae am:
38c76f88d2 am:
8d012e6420 am:
e8bd96831a
am:
4dff354254
Change-Id: I34ba1e07dd872ac35051cc28622d0cd68f4ab2c8
Pyry Haulos [Tue, 22 Aug 2017 19:19:38 +0000 (19:19 +0000)]
Optimize swapchain OOM tests am:
1614827a71 am:
1f1eac5e9e am:
b925a5dac5 am:
5dc21b2fbe am:
40af4e1840
am:
52bf525ee9
Change-Id: I5c373ad55ba9f6fb4574aec126e0c91d19fe4216
Tina Zhou [Tue, 22 Aug 2017 19:19:25 +0000 (19:19 +0000)]
Merge "Fix internal format/type for ES3 3D + depth/stencil negative API tests." into nougat-cts-dev am:
0991459ed1 am:
98d1096b90 am:
cce2a7ac8a am:
3a89a56478 am:
05b93b9941
am:
539b6271fc
Change-Id: I7449a2cda6242c0cbcfb5f91bd30245a03cd9272
Kenneth Graunke [Tue, 22 Aug 2017 19:19:10 +0000 (19:19 +0000)]
Fix internal format/type for ES3 3D + depth/stencil negative API tests. am:
2ed3a5a66f am:
bd1ce838a0 am:
f39baeb2fe am:
9a67cbf7f0 am:
4e2d71278a
am:
f09024ae84
Change-Id: I1e52154a662ad06d2a5ff3a392798d60e5193287
Tina Zhou [Tue, 22 Aug 2017 19:18:56 +0000 (19:18 +0000)]
Merge "Add support for EGL_EXT_pixel_format_float" into nougat-cts-dev am:
13a05434cc -s ours am:
306e8af13e -s ours am:
f067fabd45 -s ours am:
d2a256d19c -s ours am:
b13f7686c6 -s ours
am:
d196e6383e -s ours
Change-Id: Ic1e629d36bd039fe619e5715af0991dc0e3824e5
Mark Adams [Tue, 22 Aug 2017 19:18:35 +0000 (19:18 +0000)]
Add support for EGL_EXT_pixel_format_float am:
521bf8a7c3 -s ours am:
509b577c43 -s ours am:
8d2e58f7d4 -s ours am:
1695023c7a -s ours am:
d41e913b67 -s ours
am:
00848d2ac5 -s ours
Change-Id: I8b961d14db9258c798d137d10b7a4d5cd5721cdb
Pyry Haulos [Tue, 22 Aug 2017 19:18:17 +0000 (19:18 +0000)]
Merge "Revert "Workaround for GCC aarch64 compiler bug"" am:
516ebfdd41 am:
9c717a588e am:
c4cb0189d4 am:
7ef10bcc65
am:
b055386ab9
Change-Id: I9ad4347ac6f621de992dccfc0cdf1f71e2c7bbf0
Pyry Haulos [Tue, 22 Aug 2017 19:18:00 +0000 (19:18 +0000)]
Reverse the expectation in SSO match_different_[member_]struct_names am:
68f263d56a am:
024b0b1fe8 am:
13b388f7c9 am:
eef96ab840
am:
821aa67fca
Change-Id: I216ed0efb920606804d70d090cb4dc4b1cc95f4c
Pyry Haulos [Tue, 22 Aug 2017 19:17:41 +0000 (19:17 +0000)]
Merge "Use LDR mode in astc.block_size_remainder sRGB cases" am:
a9633080be am:
7ac1db8733 am:
07295a6acf am:
614970b163
am:
eb2214704b
Change-Id: Id2668cf05986413478158af657d802ee2113730c
Pyry Haulos [Tue, 22 Aug 2017 19:17:08 +0000 (19:17 +0000)]
Merge "Use LDR mode when decompressing sRGB ASTC formats" am:
c1c0ce48bb am:
82a5091500 am:
f7bec6f999 am:
6f14023665
am:
9a421b6be9
Change-Id: I10c94e9fb16a6e85abbc94a037dd595687558efe
Julien Desprez [Tue, 22 Aug 2017 19:16:29 +0000 (19:16 +0000)]
Merge "Ensure extra shards are still CTS compatible"
am:
2ec8cadcda
Change-Id: I27f080583d6dc9be171166b282e234060da21669
Pyry Haulos [Tue, 22 Aug 2017 19:16:05 +0000 (19:16 +0000)]
Merge aosp/upstream-vulkan-cts-1.0-dev into aosp/master am:
dd398940da am:
9662ce0ae6 am:
0333604e9c am:
833b10c828
am:
e090bf72d4
Change-Id: Iab77399e3768478d5af4a63175a11ec62cbb42b9
Anuj Phogat [Tue, 22 Aug 2017 19:15:36 +0000 (19:15 +0000)]
Merge "ES{2,3}: Clamp the x, y location of the viewport's bottom-left corner" am:
132a3ba810 am:
097b678fca am:
7634e2ea68 am:
5f7cf3f541
am:
daad88847a
Change-Id: I5b5c9a9420c1a09c9dd267c79acb0e8170cdce3f
Xin Li [Tue, 22 Aug 2017 19:15:01 +0000 (19:15 +0000)]
Merge changes from topic 'am-
3e509cc2c5f147e5b2d84c53284e013e' into nyc-mr2-dev-plus-aosp am:
52ad7b0022
am:
9332507f29
Change-Id: Ia915b29cd4da81f46a25737f64e3f54f63e2a16e
Xin Li [Tue, 22 Aug 2017 19:14:55 +0000 (19:14 +0000)]
Skip commit '
302bd7c6b3d468e33b19b693a25d67f2b54b961c' on nougat-mr1-cts-dev. am:
c5bbebc46a -s ours am:
c40b13062c am:
c58c0d9cc6 am:
be02537646 am:
47d6cb634f
am:
6520707bb8
Change-Id: I75631389e4457f521d0d5570805035deb6986d4d
Xin Li [Tue, 22 Aug 2017 19:14:48 +0000 (19:14 +0000)]
Merge commit '
09e8b66d03077e9a9b310145112cfd0e747e06f3' from nougat-cts-dev to nougat-cts-mr1-dev. am:
2a9d42a651 am:
c3801f447c am:
43afd5fa99 am:
d7680c7cc0 am:
323062fb5e
am:
a4bf1f8d02
Change-Id: Ie41bb91478ca5642814fdc571276f967ef69cce5
Xin Li [Tue, 22 Aug 2017 19:14:28 +0000 (19:14 +0000)]
Skip commit '
302bd7c6b3d468e33b19b693a25d67f2b54b961c' on nougat-mr1-cts-dev. am:
c5bbebc46a -s ours am:
c40b13062c am:
c58c0d9cc6 am:
c6868a4a91 am:
b08d9c90ca
am:
7fa904153a
Change-Id: I898153fe307837cca84e3b885e7580644e6d64fb
Xin Li [Tue, 22 Aug 2017 19:14:19 +0000 (19:14 +0000)]
Merge commit '
09e8b66d03077e9a9b310145112cfd0e747e06f3' from nougat-cts-dev to nougat-cts-mr1-dev. am:
2a9d42a651 am:
c3801f447c am:
43afd5fa99 am:
53454dcae6 am:
f8ffd1d896
am:
5fdb13fc11
Change-Id: I600549327c2134e8e21728f7406b217566b925c5
Tapani Plli [Tue, 22 Aug 2017 19:14:05 +0000 (19:14 +0000)]
tcuX11: fix to wait for matching ConfigureNotify am:
0cfa22d49d am:
0cf2b91e28 am:
f62cbc3258 am:
195b079afd
am:
caa4311374
Change-Id: I2e181dfae636e9aee9d2dfd3e9c0bdd643883581
Pyry Haulos [Tue, 22 Aug 2017 19:13:53 +0000 (19:13 +0000)]
Merge aosp/upstream-vulkan-cts-1.0-dev into aosp/master am:
47d74e847e am:
c7c28e6fa6 am:
9f0de1066b am:
76d1c8c075
am:
99742a81cf
Change-Id: I3640deb1afed3b79fb47f5bcf05afb9c975d48b1
Kalle Raita [Tue, 22 Aug 2017 19:13:40 +0000 (19:13 +0000)]
Merge "Remove two read-backs from copy image tests" am:
7c1eed0087 am:
000f76f35b am:
000857e231 am:
2a1cf8c522
am:
2287e5fd2b
Change-Id: I4e09f622e2c8836509086908174a5d7bb5dbe90d
Pyry Haulos [Tue, 22 Aug 2017 19:13:17 +0000 (19:13 +0000)]
Merge aosp/upstream-vulkan-cts-1.0-dev into aosp/master am:
dd932ed858 am:
a0b7513d8a am:
411501013d am:
d98580d2a3
am:
c2641a0223
Change-Id: I17ccdac38833ca484f047ed774d74bf1f6be9475
Pyry Haulos [Tue, 22 Aug 2017 19:12:49 +0000 (19:12 +0000)]
DO NOT MERGE: Remove changed texel buffer access tests from mustpass am:
302bd7c6b3 -s ours am:
fb82c2f3ed am:
0ae27e7ebe am:
4f3a58d096 am:
05dbe9e32b -s ours am:
ef6ea5e119 am:
671d60dd51 -s ours
am:
d1fad12029 -s ours
Change-Id: I3b9290731f606eed2a7e2dc3ea35dbb6d23eaf55
Pyry Haulos [Tue, 22 Aug 2017 19:12:28 +0000 (19:12 +0000)]
DO NOT MERGE: Remove a few changed Vulkan tests from mustpass am:
09e8b66d03 -s ours am:
5cdea1cc60 am:
7bc5d2910f am:
d45c6244d5 am:
d4f55ad2fc -s ours am:
263983df1a am:
190b46cea3 -s ours
am:
db1927b791 -s ours
Change-Id: I79c69680a03653e3b537fa9dd463f134d48e29bc
Pyry Haulos [Tue, 22 Aug 2017 19:12:02 +0000 (19:12 +0000)]
DO NOT MERGE: Remove changed texel buffer access tests from mustpass am:
302bd7c6b3 -s ours am:
fb82c2f3ed am:
0ae27e7ebe am:
4f3a58d096 am:
05dbe9e32b am:
e4a68e1243 -s ours am:
6264c6a63e -s ours
am:
7d304c128d -s ours
Change-Id: I662f0c7fd7c3e0619a8842d9410377f5f45ed1de
Pyry Haulos [Tue, 22 Aug 2017 19:11:49 +0000 (19:11 +0000)]
DO NOT MERGE: Remove a few changed Vulkan tests from mustpass am:
09e8b66d03 -s ours am:
5cdea1cc60 am:
7bc5d2910f am:
d45c6244d5 am:
d4f55ad2fc am:
3c52169d8d -s ours am:
e35c23aec7 -s ours
am:
6059948883 -s ours
Change-Id: I18c66ebf30962ab9fcbbcdf57b4662360774288c
Pyry Haulos [Tue, 22 Aug 2017 19:11:33 +0000 (19:11 +0000)]
Merge "Merge aosp/upstream-vulkan-cts-1.0-dev into aosp/master" am:
736c624044 am:
932d0bdeb9 am:
a01755fe6a am:
61c907f0c7
am:
050f17a002
Change-Id: Iff0aead3ae819fb095efd43565300787e097c6a5
Pyry Haulos [Tue, 22 Aug 2017 19:11:12 +0000 (19:11 +0000)]
Merge aosp/upstream-vulkan-cts-1.0-dev into aosp/master am:
2d64b0f13c am:
8777374f40 am:
bc83b2482a am:
24a8ccd37c
am:
0112aff473
Change-Id: I7ecafd1786ac3df008b2a1785eb667ad9fa0240b
Pyry Haulos [Tue, 22 Aug 2017 19:10:53 +0000 (19:10 +0000)]
DO NOT MERGE: Remove changed texel buffer access tests from mustpass am:
302bd7c6b3 -s ours am:
6e07797321 -s ours am:
59cbc8ca5c -s ours am:
da64283477 am:
8bfaa4ed9f -s ours
am:
64dfce5044 -s ours
Change-Id: I6c89d67639a72e6b98babb2a3f6b5b2e37d4a5ab
Pyry Haulos [Tue, 22 Aug 2017 19:10:45 +0000 (19:10 +0000)]
DO NOT MERGE: Remove a few changed Vulkan tests from mustpass am:
09e8b66d03 -s ours am:
bea56ac1e8 -s ours am:
f3191b63b7 -s ours am:
eb8fced4b9 am:
5ee70d0770 -s ours
am:
29fc22c45b -s ours
Change-Id: I5d01917a7522e4e2ba7190fd804904aac9acb5ef
Mark Adams [Tue, 22 Aug 2017 19:10:31 +0000 (19:10 +0000)]
Add support for EGL_EXT_pixel_format_float am:
08d24954e0 am:
571b73ee95 am:
c0294985c1 am:
813fe4d237
am:
07f214e26e
Change-Id: Ifd32901a5989eea06645462673b5cb27f39bcb90
Kalle Raita [Tue, 22 Aug 2017 19:10:17 +0000 (19:10 +0000)]
install.py continues if adb uninstall fails am:
a8253801a6 am:
282854f393 am:
eec4581321 am:
1f3ae31525
am:
317afd3d0d
Change-Id: Ibb7f57fad578a0c78422a9b76388d00102df50c6
Xin Li [Tue, 22 Aug 2017 19:10:05 +0000 (19:10 +0000)]
Merge "Cherry-pick the following missing commits from nyc-mr1-dev prior to b/
33090058, which was lost as a result of merge
01c922fc267ea41cc1c6cb83cde7ba6da200dc38: am:
77f62518ec am:
3d11686e0e am:
3d0f2fb381" into nyc-mr2-dev-plus-aosp am:
231078fb46
am:
2533d1e095
Change-Id: Ifcda7f4220122ac10efb926e472f61f6724c018b
Xin Li [Tue, 22 Aug 2017 19:09:48 +0000 (19:09 +0000)]
Cherry-pick the following missing commits from nyc-mr1-dev prior to b/
33090058, which was lost as a result of merge
01c922fc267ea41cc1c6cb83cde7ba6da200dc38: am:
77f62518ec am:
3d11686e0e am:
3d0f2fb381 am:
ed086fd003
am:
dbf8a43c5d
Change-Id: I13a79cf86bb5691d28333c7f507d29d1a68579fc
Xin Li [Tue, 22 Aug 2017 19:09:27 +0000 (19:09 +0000)]
Cherry-pick the following missing commits from nyc-mr1-dev prior to b/
33090058, which was lost as a result of merge
01c922fc267ea41cc1c6cb83cde7ba6da200dc38: am:
77f62518ec am:
3d11686e0e am:
72d633abbd am:
2c3475cb3a
am:
b8356b461c
Change-Id: I189332f4d10687f78dd34f04cf3305002a3e541d
Kalle Raita [Tue, 22 Aug 2017 19:09:05 +0000 (19:09 +0000)]
Merge "Add options for reading in filters from files"
am:
749fc8934e
Change-Id: I3c38d2207e9c664b613287b4518381842455c32e
Tina Zhou [Tue, 22 Aug 2017 19:08:44 +0000 (19:08 +0000)]
Merge "Blacklist match_different_[member_]struct_names SSO validation tests." into nougat-cts-dev am:
4acf725866 am:
22bf0dfa43 am:
2d0cce04d9 am:
8d55e05ba8 am:
6f7af0f1fd am:
399626de90 am:
57b0f45347
am:
0e22621731
Change-Id: I9fb826e11b54976883f4d1cdf79052f8a230a528
Kenneth Graunke [Tue, 22 Aug 2017 19:08:05 +0000 (19:08 +0000)]
Blacklist match_different_[member_]struct_names SSO validation tests. am:
b81edb4477 am:
c823e5456f am:
42c0ad1d1b am:
8c2c2894e4 am:
f611e70b3d am:
15fe9ce8a2 am:
33b578aa61
am:
2eed8d84dc
Change-Id: I8da3c1bbe4b2a26af0075f0dd7a948e041bd4b73
Tina Zhou [Tue, 22 Aug 2017 19:07:49 +0000 (19:07 +0000)]
Merge "Merge "Blacklist match_different_[member_]struct_names SSO validation tests." into nougat-cts-dev am:
4acf725866 am:
22bf0dfa43 am:
2d0cce04d9 am:
8d55e05ba8 am:
6f7af0f1fd am:
d4d6d9753b" into nyc-mr2-dev-plus-aosp am:
4fbdeebb2f
am:
9e17f4de95
Change-Id: I3647755f8d0aa08df6e54f23b116613b87f180de
Tina Zhou [Tue, 22 Aug 2017 19:07:33 +0000 (19:07 +0000)]
Merge "Blacklist match_different_[member_]struct_names SSO validation tests." into nougat-cts-dev am:
4acf725866 am:
22bf0dfa43 am:
2d0cce04d9 am:
8d55e05ba8 am:
6f7af0f1fd am:
d4d6d9753b am:
e563dd6699
am:
eafa282f5b
Change-Id: I46ba29b24c872c163a2bf5a7338f90705377aa71
Kenneth Graunke [Tue, 22 Aug 2017 19:07:19 +0000 (19:07 +0000)]
Merge "Blacklist match_different_[member_]struct_names SSO validation tests. am:
b81edb4477 am:
c823e5456f am:
42c0ad1d1b am:
8c2c2894e4 am:
f611e70b3d am:
beccdd90c3" into nyc-mr2-dev-plus-aosp am:
732ec7c09e
am:
fc5b53be97
Change-Id: I5ba0a2309f5dc0c4c45155e59dab1aa87f909396
Kenneth Graunke [Tue, 22 Aug 2017 19:07:05 +0000 (19:07 +0000)]
Blacklist match_different_[member_]struct_names SSO validation tests. am:
b81edb4477 am:
c823e5456f am:
42c0ad1d1b am:
8c2c2894e4 am:
f611e70b3d am:
beccdd90c3 am:
827c0a734b
am:
a73b2140c4
Change-Id: Iadfe7e29cb3783ea77b321517d536658c9f7e177
Tina Zhou [Tue, 22 Aug 2017 19:06:36 +0000 (19:06 +0000)]
Merge "Blacklist match_different_[member_]struct_names SSO validation tests." into nougat-cts-dev am:
4acf725866 am:
736369667b am:
53c8574bda am:
29003e52d0 am:
c1757958a7
am:
86bf2dd78b
Change-Id: I882d54216015327f3089c5afea7c8613ad841f30
David Sodman [Tue, 22 Aug 2017 19:06:21 +0000 (19:06 +0000)]
resolve merge conflicts of b81edb4 to master am:
ce5292f584 am:
49ddc6319b am:
f07ca045e6 am:
8122cc866a
am:
52f20bd5fe
Change-Id: I7bb0e908ba72467a0c8d80ff5cc4218b156e513c
Tina Zhou [Tue, 22 Aug 2017 19:06:04 +0000 (19:06 +0000)]
Merge "Change GL_MAX_TESS_CONTROL_TOTAL_OUTPUT_COMPONENTS minmax to 2048" into nougat-cts-dev am:
ce7ccaab4a am:
a164d23f5c am:
490048f2a6 am:
c056a421a1 am:
3d24f19c31
am:
b1e8479dd7
Change-Id: Iaa1eae22d3686e55d812d1efdb0f8392dff55db6
Pyry Haulos [Tue, 22 Aug 2017 19:05:43 +0000 (19:05 +0000)]
Change GL_MAX_TESS_CONTROL_TOTAL_OUTPUT_COMPONENTS minmax to 2048 am:
a42836566d am:
c1e020bec5 am:
5ca19fdb34 am:
d5fa5e4357 am:
2f030d9731
am:
002f6f7424
Change-Id: I900296b1e54b2a91fb161ab2aa71ad3b1a52091d
Tina Zhou [Tue, 22 Aug 2017 19:05:04 +0000 (19:05 +0000)]
Merge changes I7c2ffd66,Ib53b245d,I4862cca3 into nougat-cts-dev am:
4812d6d47f am:
f2ab59be70 am:
a911a04556 am:
aa9cd15468 am:
2597c25fd9
am:
8c889579e3
Change-Id: I0821549683c6ee00467742304abb0e2be3f5f5da
Pyry Haulos [Tue, 22 Aug 2017 19:04:55 +0000 (19:04 +0000)]
Update glslang to d02dc5d am:
b0ce1f083e -s ours am:
ce56d4629c am:
ad154a3284 am:
62f7b49be7 am:
80758ecfbf
am:
7415fb41cd
Change-Id: I7f5f5632e295ca3020ac2f192a95f7de15e672d3
projects / platform / upstream / VK-GL-CTS.git / log