Tina Zhou [Tue, 22 Aug 2017 20:05:54 +0000 (20:05 +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
am:
2f6cf734f8
Change-Id: Ie6888f76dfc8b936b79d28d7d50acf7ba4015b28
Alexander Galazin [Tue, 22 Aug 2017 20:05:17 +0000 (20:05 +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
am:
ed947b61ab
Change-Id: I55afec651c6b6a70c15c3993e6cdf9517d110839
Alexander Galazin [Tue, 22 Aug 2017 20:04:05 +0000 (20:04 +0000)]
Generate flat triangles in polygon offset tests. am:
975a59ebca am:
0bde00f9d6 am:
b57eb2d24f am:
aa9a995cfc am:
afc69d0dd1 am:
f7bcd5d876 am:
4fdce7d4d1
am:
1ead02dfc6
Change-Id: I6ef16bc7b94ebb962fe8744da97cf36e94e7d36a
Tina Zhou [Tue, 22 Aug 2017 20:03:25 +0000 (20:03 +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 am:
bb99be6bcd
am:
178fdad625
Change-Id: Id93307c696c142e2be99248dadc5ac6f93526733
Tina Zhou [Tue, 22 Aug 2017 20:02:50 +0000 (20:02 +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 am:
10374df5c4
am:
8a09cd85d6
Change-Id: Icb30357f1001ecedbc972820076cc450014b0ad7
Pyry Haulos [Tue, 22 Aug 2017 20:02:32 +0000 (20:02 +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 am:
140a9f7e32
am:
76d12d66d0
Change-Id: I6920670e0cdbbc732ae34d79cbb712e579e616e5
Pyry Haulos [Tue, 22 Aug 2017 20:02:10 +0000 (20:02 +0000)]
Relax line width verification in primitive bbox tests am:
ba45591407 am:
b4fbc02e3c am:
b9b63c17d2 am:
4f191e12a9 am:
c29aba4a88 am:
e29f3de157 am:
befdc5649a
am:
a4f27e56a9
Change-Id: I6f7c04425b5556f1fef027a425bfa6d18e32619a
Tina Zhou [Tue, 22 Aug 2017 20:01:53 +0000 (20:01 +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 am:
1a22842512
am:
ba94cb3ad6
Change-Id: I6dfa2ebe25c7fdf18dbbdff645b8333de7ecff02
Tina Zhou [Tue, 22 Aug 2017 20:01:37 +0000 (20:01 +0000)]
Merge "Fix eglBindAPI negative test" into nougat-cts-dev am:
6068dfbf3a am:
365f81e68c am:
15cde0b466 am:
b21dbe99b2 am:
930d6894e5 am:
1a09b5270f am:
5999552dcf
am:
5d26ea8bed
Change-Id: I8655ebf9f352cec3cb25bf1d3c34cc1104ccf1b6
Nicolas Boichat [Tue, 22 Aug 2017 20:01:21 +0000 (20:01 +0000)]
Merge "Fix eglBindAPI negative test am:
09784f8510 am:
3342150f5a am:
1af587d644 am:
52211c87ed am:
fc116aa764 am:
5b5f75828b" into nyc-mr2-dev-plus-aosp am:
f40c8d91c6
am:
699fa6ce88
Change-Id: Iea7748eb5d30a9d3c85ca76ea9fd4d49cbd451eb
Nicolas Boichat [Tue, 22 Aug 2017 20:01:03 +0000 (20:01 +0000)]
Fix eglBindAPI negative test am:
09784f8510 am:
3342150f5a am:
1af587d644 am:
52211c87ed am:
fc116aa764 am:
5b5f75828b am:
a8199aac7c
am:
7f0cc5baf8
Change-Id: I757c31d1964f1d49b6d0b50fc05cd4304a4062b1
Tina Zhou [Tue, 22 Aug 2017 20:00:30 +0000 (20:00 +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 am:
072c251d10
am:
64cc77a2d7 -s ours
Change-Id: I743e8ae6251093948156cce830ed4e9617b1cd82
Tina Zhou [Tue, 22 Aug 2017 19:59:51 +0000 (19:59 +0000)]
Merge "Drop incorrect framebuffer texture subtests." into nougat-cts-dev am:
3baf7e3be2 am:
a580ae91f8 am:
816d6bdb88 am:
f49c7ce972 am:
a91d8f9bf5 am:
6fd723a7cc am:
bd1a96bd10
am:
058c463e80 -s ours
Change-Id: I69952db9d0670c292db610f65102e086604191b1
Kenneth Graunke [Tue, 22 Aug 2017 19:59:12 +0000 (19:59 +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 am:
1c4dcaec85
am:
22d532ae44 -s ours
Change-Id: I7735a4d1aa1bf8dbe88b5da4dea3c6a12b98c476
Kenneth Graunke [Tue, 22 Aug 2017 19:58:41 +0000 (19:58 +0000)]
Drop incorrect framebuffer texture subtests. am:
625d685874 am:
25b6d76b01 am:
6f6f3d78fc am:
18805bd38c am:
ce197d0f27 am:
0e230d6099 am:
2032b1fbed
am:
42ad161115 -s ours
Change-Id: Iaf66b53b32d9496d751dc0fb2998c873351b9506
Tina Zhou [Tue, 22 Aug 2017 19:58:07 +0000 (19:58 +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 am:
8f231318dc
am:
305025ae84
Change-Id: I8683b8a1741f927508c56f43e64c3cf6213a74be
Tina Zhou [Tue, 22 Aug 2017 19:57:30 +0000 (19:57 +0000)]
Merge "Optimize swapchain OOM tests" into nougat-cts-dev am:
c811d42d99 am:
6d4c0dca61 am:
d64bb66820 am:
ec68ba0951 am:
b7985f162a am:
4ab2fada98 am:
d9e96ae59b
am:
a6963b76bf
Change-Id: I876e342195bd2cb4eefb825e0013616d8daa9eb9
Pyry Haulos [Tue, 22 Aug 2017 19:57:00 +0000 (19:57 +0000)]
Merge "Optimize swapchain OOM tests am:
1614827a71 am:
2cfe132119 am:
00ab17bd23 am:
c9b7dae8a8 am:
acce97d998 am:
23baea4982" into nyc-mr2-dev-plus-aosp am:
1fbdd02485
am:
8e5ee8a4f8
Change-Id: I36f3e382d22854f153a7647fb74240f35038a700
Pyry Haulos [Tue, 22 Aug 2017 19:56:40 +0000 (19:56 +0000)]
Optimize swapchain OOM tests am:
1614827a71 am:
2cfe132119 am:
00ab17bd23 am:
c9b7dae8a8 am:
acce97d998 am:
23baea4982 am:
f6a0d45a54
am:
0410c59722
Change-Id: I4626e66653087a1677a0b49b6c5f08c4774f6cf2
Tina Zhou [Tue, 22 Aug 2017 19:56:20 +0000 (19:56 +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 am:
db7525e0dc
am:
a89936ca4d
Change-Id: I1a14a141464b8101a49be56dc74e5f124a3a7a11
Tina Zhou [Tue, 22 Aug 2017 19:50:50 +0000 (19:50 +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 am:
c5e76fa2a2
am:
5fe83954f2
Change-Id: Ib78a1ed3fddf19e8ed1d3f64ebc6689395e33016
Kenneth Graunke [Tue, 22 Aug 2017 19:50:34 +0000 (19:50 +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 am:
6192e24e15
am:
23db5638d1
Change-Id: I21a80f967d47ef12ec164c87f2a25635724483e9
Kenneth Graunke [Tue, 22 Aug 2017 19:50:21 +0000 (19:50 +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 am:
03e08ec810
am:
22c3f9624a
Change-Id: Ib0219e5326f6e88828329eb0268107253ddbf776
Tina Zhou [Tue, 22 Aug 2017 19:50:04 +0000 (19:50 +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 am:
44bab0a654 -s ours
am:
89918ce31e -s ours
Change-Id: Ice68b82590b0fa1d5978f9884a2f163e12ec7b64
Tina Zhou [Tue, 22 Aug 2017 19:49:41 +0000 (19:49 +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 am:
3d8ac1f5a5 -s ours
am:
67ffa16c50 -s ours
Change-Id: I7636a67cd403b0cf1d63b63599b290eb68da8c2e
Mark Adams [Tue, 22 Aug 2017 19:49:12 +0000 (19:49 +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 am:
d9abcf26e5 -s ours
am:
04a95d4c7c -s ours
Change-Id: I787c52c2696950906eec00ff2c8ff9f5e73c17f0
Mark Adams [Tue, 22 Aug 2017 19:48:44 +0000 (19:48 +0000)]
Add support for EGL_EXT_pixel_format_float am:
521bf8a7c3 am:
4b7baeace7 am:
86683f95c7 am:
0624edb1ce am:
234daba7b4 am:
8d164d1990 -s ours am:
bf21c39e9a -s ours
am:
0bcfb6255c -s ours
Change-Id: I6f40cc3ba8929784565b1e0f29c4edaadef91f60
Tina Zhou [Tue, 22 Aug 2017 19:48:03 +0000 (19:48 +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 am:
f5600f9aaf -s ours
am:
421ec17515 -s ours
Change-Id: I6430248b72b92f18c60e80a5007bc16cfe0fe8d6
Tina Zhou [Tue, 22 Aug 2017 19:47:10 +0000 (19:47 +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 am:
5653120f84 -s ours
am:
f215c5ffab -s ours
Change-Id: Iae5a5d85e038713c00f6a3267551b9abac2c7f93
Pyry Haulos [Tue, 22 Aug 2017 19:46:20 +0000 (19:46 +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 am:
76768aa15e -s ours
am:
5278ffdd2a -s ours
Change-Id: I960ebd58ca15845cc3c6949bcce3111a0a6128f3
Pyry Haulos [Tue, 22 Aug 2017 19:46:02 +0000 (19:46 +0000)]
Remove tests affected by NV/OES_viewport_array extension am:
267c765690 am:
0004ce1767 am:
ee2a180f00 am:
20860eb2df am:
2ecead38c4 -s ours am:
b1fe967ef0 -s ours
am:
ac7365be3d -s ours
Change-Id: I3804968996f25171f6a54aef7a4ac38db3ad14d5
Tina Zhou [Tue, 22 Aug 2017 19:45:46 +0000 (19:45 +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 am:
bb2bb196e2
am:
d5f9a459b9
Change-Id: I6fd65d04d6513c35196fe3081b3e5be19f3566cd
Tina Zhou [Tue, 22 Aug 2017 19:45:28 +0000 (19:45 +0000)]
Merge "Generate flat triangles in polygon offset tests." into nougat-cts-dev am:
61d6d95a66 am:
73b7f271a9 am:
0b9596cb35 am:
436488b78f am:
e89621e593 am:
f8c8d5ff8d
am:
96ac2db74f
Change-Id: I71c3ad547ecb67bea2722ddabe305993c6073b52
Pyry Haulos [Tue, 22 Aug 2017 19:45:04 +0000 (19:45 +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 am:
058d1a53d2
am:
ee4c986c2d
Change-Id: I6b4bbfc8d73e0bdcaf892641f101286036b528c3
Pyry Haulos [Tue, 22 Aug 2017 19:44:44 +0000 (19:44 +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 am:
ff1ea61283
am:
377b97eb12
Change-Id: Ia2bc1d515484a57729b1a1088bd4503fca9befd0
Pyry Haulos [Tue, 22 Aug 2017 19:44:21 +0000 (19:44 +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 am:
0265d22b8c
am:
c06d7cb976
Change-Id: Ibb39aa0aa367c3891ae05d09842498b4bfab3b37
Pyry Haulos [Tue, 22 Aug 2017 19:43:45 +0000 (19:43 +0000)]
Relax line width verification in primitive bbox tests am:
ba45591407 am:
a11fd8b487 am:
90c49fe030 am:
04d8a8e98a am:
ddf3f33d7a am:
957322a3c7
am:
625a1dc440
Change-Id: Ie00b57eb9e99f1cce05f01065161ae43b7728262
Alexander Galazin [Tue, 22 Aug 2017 19:43:15 +0000 (19:43 +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 am:
d9b4127ee3
am:
ce7aae0c17
Change-Id: Ib5b085cea0ed2d2624f2d0b572d85173cdd2e533
Alexander Galazin [Tue, 22 Aug 2017 19:42:42 +0000 (19:42 +0000)]
Generate flat triangles in polygon offset tests. am:
975a59ebca am:
02c67b12c1 am:
0e7da13770 am:
0dbb18ee84 am:
b89872b38a am:
709049d1f3
am:
4b12f97d1b
Change-Id: I74a9416d4c406a7f941f8e2c08c32478ee5acfa4
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