Nicolas Boichat [Fri, 20 Jan 2017 21:09:19 +0000 (21:09 +0000)]
Fix eglBindAPI negative test am:
09784f8510 am:
3342150f5a am:
1af587d644 am:
52211c87ed am:
fc116aa764 am:
9e92f92f57
am:
0075efc88a
Change-Id: If6b73019726c57326d4a1149b14671007c10483d
Tina Zhou [Fri, 20 Jan 2017 21:09:06 +0000 (21:09 +0000)]
Merge "Drop incorrect framebuffer texture subtests." into nougat-cts-dev am:
3baf7e3be2 am:
a580ae91f8 am:
816d6bdb88 am:
f49c7ce972 am:
a91d8f9bf5 am:
c9e3a51cd3
am:
a87887160e
Change-Id: Ifef8cadec0a7e54c69e4afd5f4c7a12236bc5799
Kenneth Graunke [Fri, 20 Jan 2017 21:08:53 +0000 (21:08 +0000)]
Drop incorrect framebuffer texture subtests. am:
625d685874 am:
25b6d76b01 am:
6f6f3d78fc am:
18805bd38c am:
ce197d0f27 am:
ac112a3efa
am:
4f51a66b4b
Change-Id: Id8fa73a8ef5c4820546cc2639ad008e7668dc31a
Tina Zhou [Fri, 20 Jan 2017 21:08:40 +0000 (21:08 +0000)]
Merge "Optimize swapchain OOM tests" into nougat-cts-dev am:
c811d42d99 am:
6d4c0dca61 am:
d64bb66820 am:
ec68ba0951 am:
b7985f162a am:
4e37c3bcf2
am:
34555e78f1
Change-Id: If86cd579fb7b80d38d025fd538a7cc2562868e0d
Pyry Haulos [Fri, 20 Jan 2017 21:08:27 +0000 (21:08 +0000)]
Optimize swapchain OOM tests am:
1614827a71 am:
2cfe132119 am:
00ab17bd23 am:
c9b7dae8a8 am:
acce97d998 am:
dda77bf145
am:
c08b02f568
Change-Id: I9368639471746966b7030592aff2176b7c27bfb2
Tina Zhou [Fri, 20 Jan 2017 21:08:15 +0000 (21:08 +0000)]
Merge "Fix internal format/type for ES3 3D + depth/stencil negative API tests." into nougat-cts-dev am:
0991459ed1 am:
e19d6a6859 am:
e0e2260a4a am:
222ef92210 am:
c6747b082f am:
1a84cd74f0
am:
ee8fb54633
Change-Id: Ib79e75eea51f5438c5fcd74eaa1aa2f78cf321c8
Kenneth Graunke [Fri, 20 Jan 2017 21:04:26 +0000 (21:04 +0000)]
Merge "Fix internal format/type for ES3 3D + depth/stencil negative API tests. am:
2ed3a5a66f am:
6a6f549150 am:
f9b870fb5b am:
b47baae90a am:
76a7f607a5 am:
bdbc876fc7" into nyc-mr2-dev-plus-aosp
am:
eed66f190e
Change-Id: I81b227f3a9c3fd2df760fabaa0d28d707fadd192
Kenneth Graunke [Fri, 20 Jan 2017 21:04:24 +0000 (21:04 +0000)]
Fix internal format/type for ES3 3D + depth/stencil negative API tests. am:
2ed3a5a66f am:
6a6f549150 am:
f9b870fb5b am:
b47baae90a am:
76a7f607a5 am:
bdbc876fc7
am:
517bc8386f
Change-Id: I4a6b5ac25d28fe9142f8b933177cea1915f73903
Tina Zhou [Fri, 20 Jan 2017 21:03:58 +0000 (21:03 +0000)]
Merge "Merge "Add support for EGL_EXT_pixel_format_float" into nougat-cts-dev am:
13a05434cc am:
5f30178321 am:
764cd6e60b am:
0a683a56e7 am:
e961416ca6 -s ours am:
8cddd0f806 -s ours" into nyc-mr2-dev-plus-aosp
am:
54349c2293 -s ours
Change-Id: Ie921753e17d5a27eb3bce19bc46ee30cbbd06c7f
Tina Zhou [Fri, 20 Jan 2017 21:03:55 +0000 (21:03 +0000)]
Merge "Add support for EGL_EXT_pixel_format_float" into nougat-cts-dev am:
13a05434cc am:
5f30178321 am:
764cd6e60b am:
0a683a56e7 am:
e961416ca6 -s ours am:
8cddd0f806 -s ours
am:
11baa951a3 -s ours
Change-Id: Icc099ddabc2fff2ec6fa52e4f251ef0bed494b24
Mark Adams [Fri, 20 Jan 2017 21:03:34 +0000 (21:03 +0000)]
Merge "Add support for EGL_EXT_pixel_format_float am:
521bf8a7c3 am:
4b7baeace7 am:
86683f95c7 am:
0624edb1ce am:
234daba7b4 -s ours am:
7f9e23d176 -s ours" into nyc-mr2-dev-plus-aosp
am:
1fe7e3fe7c -s ours
Change-Id: Ibf1d0326d0be689fb9d49c183db75d7c93772098
Mark Adams [Fri, 20 Jan 2017 21:03:31 +0000 (21:03 +0000)]
Add support for EGL_EXT_pixel_format_float am:
521bf8a7c3 am:
4b7baeace7 am:
86683f95c7 am:
0624edb1ce am:
234daba7b4 -s ours am:
7f9e23d176 -s ours
am:
d65e9700af -s ours
Change-Id: Idee1b3826a97fd4543e7cd2473865e78aa7e2c95
Tina Zhou [Fri, 20 Jan 2017 21:03:08 +0000 (21:03 +0000)]
Merge "Merge "Remove tests affected by NV/OES_viewport_array extension" into nougat-cts-dev am:
e98444b9bf am:
ce3144c3e5 am:
29dde7d04d am:
4ac909cfeb -s ours am:
50df351a0f -s ours" into nyc-mr2-dev-plus-aosp
am:
37b8c78167 -s ours
Change-Id: I7d1829acbe25fec86f756ecf665453192a7c28d7
Tina Zhou [Fri, 20 Jan 2017 21:03:05 +0000 (21:03 +0000)]
Merge "Remove tests affected by NV/OES_viewport_array extension" into nougat-cts-dev am:
e98444b9bf am:
ce3144c3e5 am:
29dde7d04d am:
4ac909cfeb -s ours am:
50df351a0f -s ours
am:
fc588a0281 -s ours
Change-Id: Id566b25884e46e56865d8314fba7c2f4e855531d
Pyry Haulos [Fri, 20 Jan 2017 21:02:41 +0000 (21:02 +0000)]
Merge "Remove tests affected by NV/OES_viewport_array extension am:
267c765690 am:
0004ce1767 am:
ee2a180f00 am:
20860eb2df -s ours am:
a4982bfb72 -s ours" into nyc-mr2-dev-plus-aosp
am:
4b45e7bd91 -s ours
Change-Id: I680b60f009e8697ea0d67409d1e07456e367f2ef
Pyry Haulos [Fri, 20 Jan 2017 21:02:37 +0000 (21:02 +0000)]
Remove tests affected by NV/OES_viewport_array extension am:
267c765690 am:
0004ce1767 am:
ee2a180f00 am:
20860eb2df -s ours am:
a4982bfb72 -s ours
am:
22f1c94794 -s ours
Change-Id: Ic083d1c2d52192a1174d8c85b166102b190f395e
Tina Zhou [Fri, 20 Jan 2017 21:02:14 +0000 (21:02 +0000)]
Merge "Merge "Merge "Generate flat triangles in polygon offset tests." into nougat-cts-dev am:
61d6d95a66 am:
73b7f271a9 am:
0b9596cb35 am:
436488b78f" into nyc-mr1-dev-plus-aosp am:
715c4b7814" into nyc-mr2-dev-plus-aosp
am:
adf01af3de
Change-Id: I568ad401507c70716d49473b7ac3413b2e0a4ddc
Tina Zhou [Fri, 20 Jan 2017 21:02:12 +0000 (21:02 +0000)]
Merge "Merge "Generate flat triangles in polygon offset tests." into nougat-cts-dev am:
61d6d95a66 am:
73b7f271a9 am:
0b9596cb35 am:
436488b78f" into nyc-mr1-dev-plus-aosp am:
715c4b7814
am:
2b9d5aeaed
Change-Id: Id9b146a5046a0c93a6dd7d39ca7562b38f742b83
Tina Zhou [Fri, 20 Jan 2017 21:01:48 +0000 (21:01 +0000)]
Merge "Merge "Generate flat triangles in polygon offset tests." into nougat-cts-dev am:
61d6d95a66 am:
73b7f271a9 am:
0b9596cb35 am:
436488b78f am:
336f66bfc4" into nyc-mr2-dev-plus-aosp
am:
f91ebf94ee
Change-Id: Id70658e778b7715e14310708b4b14cdf499a4ae8
Tina Zhou [Fri, 20 Jan 2017 21:01:45 +0000 (21:01 +0000)]
Merge "Generate flat triangles in polygon offset tests." into nougat-cts-dev am:
61d6d95a66 am:
73b7f271a9 am:
0b9596cb35 am:
436488b78f am:
336f66bfc4
am:
b292b527a2
Change-Id: I03d3deb90878fe03b5c7c00e1bb3605fc7759b2d
Alexander Galazin [Fri, 20 Jan 2017 21:01:25 +0000 (21:01 +0000)]
Merge "Merge "Generate flat triangles in polygon offset tests. am:
975a59ebca am:
02c67b12c1 am:
0e7da13770 am:
0dbb18ee84" into nyc-mr1-dev-plus-aosp am:
146f745175" into nyc-mr2-dev-plus-aosp
am:
4e03af8651
Change-Id: Id088c9233e2f9c04e6e98b32d48a478db8eaf826
Alexander Galazin [Fri, 20 Jan 2017 21:01:23 +0000 (21:01 +0000)]
Merge "Generate flat triangles in polygon offset tests. am:
975a59ebca am:
02c67b12c1 am:
0e7da13770 am:
0dbb18ee84" into nyc-mr1-dev-plus-aosp am:
146f745175
am:
530e6896b9
Change-Id: I884d90049e518e28da4ce0ca587d378c0bef5b86
Alexander Galazin [Fri, 20 Jan 2017 21:01:03 +0000 (21:01 +0000)]
Merge "Generate flat triangles in polygon offset tests. am:
975a59ebca am:
02c67b12c1 am:
0e7da13770 am:
0dbb18ee84 am:
4c08ce83d1" into nyc-mr2-dev-plus-aosp
am:
301456c250
Change-Id: I780dac91f831cc16da9f9ea8eee3d2b3d7b0bd39
Alexander Galazin [Fri, 20 Jan 2017 21:01:01 +0000 (21:01 +0000)]
Generate flat triangles in polygon offset tests. am:
975a59ebca am:
02c67b12c1 am:
0e7da13770 am:
0dbb18ee84 am:
4c08ce83d1
am:
01ccf676e3
Change-Id: I2a28f613b6d21de009e5eaf955ec4a7cd38c8f8c
Tina Zhou [Fri, 20 Jan 2017 21:00:39 +0000 (21:00 +0000)]
Merge "Merge "Merge "Relax line width verification in primitive bbox tests" into nougat-cts-dev am:
312a550657 am:
36d3dd2ab1 am:
5debc545bf am:
ee10cd68f7" into nyc-mr1-dev-plus-aosp am:
977fa4ba31" into nyc-mr2-dev-plus-aosp
am:
ae5446cbdc
Change-Id: I1ca088eb31cbf21b0643b1dfcbbadff33bbb78f5
Tina Zhou [Fri, 20 Jan 2017 21:00:30 +0000 (21:00 +0000)]
Merge "Merge "Relax line width verification in primitive bbox tests" into nougat-cts-dev am:
312a550657 am:
36d3dd2ab1 am:
5debc545bf am:
ee10cd68f7" into nyc-mr1-dev-plus-aosp am:
977fa4ba31
am:
1fb18eaaf9
Change-Id: Ic955cc1965e86c6863065694b0bb258544d460d8
Tina Zhou [Fri, 20 Jan 2017 21:00:07 +0000 (21:00 +0000)]
Merge "Merge "Relax line width verification in primitive bbox tests" into nougat-cts-dev am:
312a550657 am:
36d3dd2ab1 am:
5debc545bf am:
ee10cd68f7 am:
bc02b9f045" into nyc-mr2-dev-plus-aosp
am:
d065cd796c
Change-Id: I289895432f366e810da907270c5a0e25e6185cee
Tina Zhou [Fri, 20 Jan 2017 21:00:04 +0000 (21:00 +0000)]
Merge "Relax line width verification in primitive bbox tests" into nougat-cts-dev am:
312a550657 am:
36d3dd2ab1 am:
5debc545bf am:
ee10cd68f7 am:
bc02b9f045
am:
54491f9f70
Change-Id: Ie7d3c55b24b9a4d33d96a4c9dda577cd6d518906
Tina Zhou [Fri, 20 Jan 2017 20:59:40 +0000 (20:59 +0000)]
Merge "Merge "Merge "Remove tests affected by NV/OES_viewport_array extension" into nougat-cts-dev am:
e98444b9bf -s ours am:
1d2a009979 -s ours am:
2c6307af33 -s ours" into nyc-mr1-dev-plus-aosp am:
cf38dd18f9 -s ours" into nyc-mr2-dev-plus-aosp
am:
8ddf92f83f -s ours
Change-Id: I62c6ee92e840e9df6bb7c7fa18c51709b52e60ec
Tina Zhou [Fri, 20 Jan 2017 20:59:35 +0000 (20:59 +0000)]
Merge "Merge "Remove tests affected by NV/OES_viewport_array extension" into nougat-cts-dev am:
e98444b9bf -s ours am:
1d2a009979 -s ours am:
2c6307af33 -s ours" into nyc-mr1-dev-plus-aosp am:
cf38dd18f9 -s ours
am:
731f55380c -s ours
Change-Id: I67875ae50bbb82539fcbc9f38cc1d92e3b3c98d5
Tina Zhou [Fri, 20 Jan 2017 20:59:10 +0000 (20:59 +0000)]
Merge "Merge "Remove tests affected by NV/OES_viewport_array extension" into nougat-cts-dev am:
e98444b9bf -s ours am:
1d2a009979 -s ours am:
2c6307af33 -s ours am:
57ac8058b6 -s ours" into nyc-mr2-dev-plus-aosp
am:
85830e3e45 -s ours
Change-Id: I6894e5f90b2c57d43a36896da8a388e43702ac36
Tina Zhou [Fri, 20 Jan 2017 20:59:07 +0000 (20:59 +0000)]
Merge "Remove tests affected by NV/OES_viewport_array extension" into nougat-cts-dev am:
e98444b9bf -s ours am:
1d2a009979 -s ours am:
2c6307af33 -s ours am:
57ac8058b6 -s ours
am:
91f0b198ee -s ours
Change-Id: Ic8c7f71b789b4012591da21583fa3739c83420a5
Pyry Haulos [Fri, 20 Jan 2017 20:58:44 +0000 (20:58 +0000)]
Merge "Merge "Remove tests affected by NV/OES_viewport_array extension am:
267c765690 -s ours am:
55fe6e8997 -s ours am:
7bab558fb8 -s ours" into nyc-mr1-dev-plus-aosp am:
a185466ba9 -s ours" into nyc-mr2-dev-plus-aosp
am:
9f321a7874 -s ours
Change-Id: I275becb76aef6cb3bf219bc438aa8ee5b012c73b
Pyry Haulos [Fri, 20 Jan 2017 20:58:40 +0000 (20:58 +0000)]
Merge "Remove tests affected by NV/OES_viewport_array extension am:
267c765690 -s ours am:
55fe6e8997 -s ours am:
7bab558fb8 -s ours" into nyc-mr1-dev-plus-aosp am:
a185466ba9 -s ours
am:
3b908a5583 -s ours
Change-Id: Iffc1781093fb35750d0b6d443a46bc5748445ab8
Pyry Haulos [Fri, 20 Jan 2017 20:58:16 +0000 (20:58 +0000)]
Merge "Remove tests affected by NV/OES_viewport_array extension am:
267c765690 -s ours am:
55fe6e8997 -s ours am:
7bab558fb8 -s ours am:
578e9af267 -s ours" into nyc-mr2-dev-plus-aosp
am:
00e79d6cb0 -s ours
Change-Id: I6d13dfd8cf3f66075c29f7516efd4fd1e420fb56
Pyry Haulos [Fri, 20 Jan 2017 20:58:12 +0000 (20:58 +0000)]
Remove tests affected by NV/OES_viewport_array extension am:
267c765690 -s ours am:
55fe6e8997 -s ours am:
7bab558fb8 -s ours am:
578e9af267 -s ours
am:
a98fc6842f -s ours
Change-Id: I02c059e358761b38ee1e769b9a938abc475967ae
Tina Zhou [Fri, 20 Jan 2017 20:57:49 +0000 (20:57 +0000)]
Merge "Merge "Remove tests affected by NV/OES_viewport_array extension" into nougat-cts-dev am:
e98444b9bf am:
41c599b77e am:
9d74d882df am:
b3182128b8 am:
a9eaaaca53 am:
c0d6b5c22b -s ours" into nyc-mr2-dev-plus-aosp
am:
1a7a472c46 -s ours
Change-Id: I6821e3a4efc0d2febfb7bd2bf39e3d732ff4bf14
Tina Zhou [Fri, 20 Jan 2017 20:57:46 +0000 (20:57 +0000)]
Merge "Remove tests affected by NV/OES_viewport_array extension" into nougat-cts-dev am:
e98444b9bf am:
41c599b77e am:
9d74d882df am:
b3182128b8 am:
a9eaaaca53 am:
c0d6b5c22b -s ours
am:
ab3c5142fa -s ours
Change-Id: I29c7f66d9c9695e2655f0a47ce38faa700f49794
Pyry Haulos [Fri, 20 Jan 2017 20:57:17 +0000 (20:57 +0000)]
Merge "Remove tests affected by NV/OES_viewport_array extension am:
267c765690 am:
e4ed95024e am:
578afa4c88 am:
22a8808370 am:
7b177f2f34 am:
3665d90d07 -s ours" into nyc-mr2-dev-plus-aosp
am:
0814dedc8b -s ours
Change-Id: I28a1e7d6667d2101ffd9ee6023775ac7fcb63b1d
Pyry Haulos [Fri, 20 Jan 2017 20:57:15 +0000 (20:57 +0000)]
Remove tests affected by NV/OES_viewport_array extension am:
267c765690 am:
e4ed95024e am:
578afa4c88 am:
22a8808370 am:
7b177f2f34 am:
3665d90d07 -s ours
am:
606e0ad44f -s ours
Change-Id: I5b9b9bed2aea34ef9e785d4789466d90b81e3599
Tina Zhou [Fri, 20 Jan 2017 20:56:48 +0000 (20:56 +0000)]
Merge "Merge "Generate flat triangles in polygon offset tests." into nougat-cts-dev am:
61d6d95a66 am:
5611bf398b am:
e2d1c25650 am:
d368eb8664 am:
8cfa8cb220 am:
987939f284" into nyc-mr2-dev-plus-aosp
am:
c4617ac622
Change-Id: Ic17bb443ec60de537989f4770d3ef140a1810cb3
Tina Zhou [Fri, 20 Jan 2017 20:56:46 +0000 (20:56 +0000)]
Merge "Generate flat triangles in polygon offset tests." into nougat-cts-dev am:
61d6d95a66 am:
5611bf398b am:
e2d1c25650 am:
d368eb8664 am:
8cfa8cb220 am:
987939f284
am:
92f412bb50
Change-Id: I114c30236f3ea3d0df06831ecb8a63ea91e2efe2
Alexander Galazin [Fri, 20 Jan 2017 20:56:24 +0000 (20:56 +0000)]
Merge "Generate flat triangles in polygon offset tests. am:
975a59ebca am:
0bde00f9d6 am:
b57eb2d24f am:
aa9a995cfc am:
afc69d0dd1 am:
f7bcd5d876" into nyc-mr2-dev-plus-aosp
am:
d6eee093f9
Change-Id: I02deb616cdf9ebb358d1f5def005b830ad93677d
Alexander Galazin [Fri, 20 Jan 2017 20:56:22 +0000 (20:56 +0000)]
Generate flat triangles in polygon offset tests. am:
975a59ebca am:
0bde00f9d6 am:
b57eb2d24f am:
aa9a995cfc am:
afc69d0dd1 am:
f7bcd5d876
am:
4fdce7d4d1
Change-Id: I33c47fd6ed72205f72be885cc79a8ba4a8857db2
Tina Zhou [Fri, 20 Jan 2017 20:55:58 +0000 (20:55 +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
Change-Id: I1a1480e1ea48894a06a915d1b894efca356643d5
Tina Zhou [Fri, 20 Jan 2017 20:55:56 +0000 (20:55 +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
Change-Id: I88d4e7a2dd9a5ae8fb489e67ef55505db90182a1
Nicolas Boichat [Fri, 20 Jan 2017 20:55:54 +0000 (20:55 +0000)]
Fix eglBindAPI negative test am:
09784f8510 am:
3342150f5a am:
1af587d644 am:
52211c87ed am:
fc116aa764
am:
9e92f92f57
Change-Id: I68b3eb1fba405c54ae91076add05d6e442434fb7
Tina Zhou [Fri, 20 Jan 2017 20:55:39 +0000 (20:55 +0000)]
Merge "Drop incorrect framebuffer texture subtests." into nougat-cts-dev am:
3baf7e3be2 am:
a580ae91f8 am:
816d6bdb88 am:
f49c7ce972 am:
a91d8f9bf5
am:
c9e3a51cd3
Change-Id: I23581f8b7ca3e156a43bbd89e46e337c5fb5b869
Pyry Haulos [Fri, 20 Jan 2017 20:55:30 +0000 (20:55 +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
Change-Id: If70d6ac6b5af0931d89eef4184d89fba5a49857c
Pyry Haulos [Fri, 20 Jan 2017 20:55:28 +0000 (20:55 +0000)]
Relax line width verification in primitive bbox tests am:
ba45591407 am:
b4fbc02e3c am:
b9b63c17d2 am:
4f191e12a9 am:
c29aba4a88 am:
e29f3de157
am:
befdc5649a
Change-Id: I971d0bad1d7f71ad0561cf986067995042fde79b
Kenneth Graunke [Fri, 20 Jan 2017 20:55:26 +0000 (20:55 +0000)]
Drop incorrect framebuffer texture subtests. am:
625d685874 am:
25b6d76b01 am:
6f6f3d78fc am:
18805bd38c am:
ce197d0f27
am:
ac112a3efa
Change-Id: I410f4a137ea08b546c016caebd78705611deec7e
Tina Zhou [Fri, 20 Jan 2017 20:55:08 +0000 (20:55 +0000)]
Merge "Optimize swapchain OOM tests" into nougat-cts-dev am:
c811d42d99 am:
6d4c0dca61 am:
d64bb66820 am:
ec68ba0951 am:
b7985f162a
am:
4e37c3bcf2
Change-Id: Ia9a6763a23a5ec8f176b01183a9656546075c6ab
Tina Zhou [Fri, 20 Jan 2017 20:55:00 +0000 (20:55 +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
Change-Id: Ia0224916079992f0bdac6e93c30343da867d89d5
Tina Zhou [Fri, 20 Jan 2017 20:54:57 +0000 (20:54 +0000)]
Merge "Fix eglBindAPI negative test" into nougat-cts-dev am:
6068dfbf3a am:
365f81e68c am:
15cde0b466 am:
b21dbe99b2 am:
930d6894e5 am:
1a09b5270f
am:
5999552dcf
Change-Id: I3fda49a151e4dc26f101bda6648342c41bf0d2ed
Pyry Haulos [Fri, 20 Jan 2017 20:54:54 +0000 (20:54 +0000)]
Optimize swapchain OOM tests am:
1614827a71 am:
2cfe132119 am:
00ab17bd23 am:
c9b7dae8a8 am:
acce97d998
am:
dda77bf145
Change-Id: Iac0fba1c0dc93ae52c498c50de482eb57fa54dd4
Tina Zhou [Fri, 20 Jan 2017 20:54:40 +0000 (20:54 +0000)]
Merge "Fix internal format/type for ES3 3D + depth/stencil negative API tests." into nougat-cts-dev am:
0991459ed1 am:
e19d6a6859 am:
e0e2260a4a am:
222ef92210 am:
c6747b082f
am:
1a84cd74f0
Change-Id: I7b229784f85f92d08fc1130fef4dc6e5100d9565
Nicolas Boichat [Fri, 20 Jan 2017 20:54:31 +0000 (20:54 +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
Change-Id: I36b39dbff29f9b1fd6fd6e6a2ee2c76a575025cd
Nicolas Boichat [Fri, 20 Jan 2017 20:54:29 +0000 (20:54 +0000)]
Fix eglBindAPI negative test am:
09784f8510 am:
3342150f5a am:
1af587d644 am:
52211c87ed am:
fc116aa764 am:
5b5f75828b
am:
a8199aac7c
Change-Id: Ic0f81126c4f712c2708fc51afb51a15506d90407
Tina Zhou [Fri, 20 Jan 2017 20:54:04 +0000 (20:54 +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
Change-Id: I8689598e3e2ea9195fc3d75ff14320cc9ac0c65f
Tina Zhou [Fri, 20 Jan 2017 20:54:02 +0000 (20:54 +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
Change-Id: I200ed13156d9736f95cf5423bbf1f364ae204301
Kenneth Graunke [Fri, 20 Jan 2017 20:53:40 +0000 (20:53 +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
Change-Id: I202b495357f5ae8ede6b5d6aa0cc7fcb73b8cc4f
Kenneth Graunke [Fri, 20 Jan 2017 20:53:39 +0000 (20:53 +0000)]
Drop incorrect framebuffer texture subtests. am:
625d685874 am:
25b6d76b01 am:
6f6f3d78fc am:
18805bd38c am:
ce197d0f27 am:
0e230d6099
am:
2032b1fbed
Change-Id: Id9cea46c263ec49a22844e8cde517bcc77c46851
Tina Zhou [Fri, 20 Jan 2017 20:53:13 +0000 (20:53 +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
Change-Id: I1bf17123bb98ead4f4c99918600745a3d926e695
Tina Zhou [Fri, 20 Jan 2017 20:53:10 +0000 (20:53 +0000)]
Merge "Optimize swapchain OOM tests" into nougat-cts-dev am:
c811d42d99 am:
6d4c0dca61 am:
d64bb66820 am:
ec68ba0951 am:
b7985f162a am:
4ab2fada98
am:
d9e96ae59b
Change-Id: Id166754d6b9d5d353272cf7ee8c6aea41c82c7bf
Pyry Haulos [Fri, 20 Jan 2017 20:52:36 +0000 (20:52 +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
Change-Id: I623e62c54185b1d5a7e303db3e1034e6c32604c1
Pyry Haulos [Fri, 20 Jan 2017 20:52:34 +0000 (20:52 +0000)]
Optimize swapchain OOM tests am:
1614827a71 am:
2cfe132119 am:
00ab17bd23 am:
c9b7dae8a8 am:
acce97d998 am:
23baea4982
am:
f6a0d45a54
Change-Id: I3f4eabfbba6bc68c02773aea27027a120ffcfc9f
Tina Zhou [Fri, 20 Jan 2017 20:52:06 +0000 (20:52 +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
Change-Id: I181488f4fc1e2802a28e644de77ac9a37a38000f
Tina Zhou [Fri, 20 Jan 2017 20:52:03 +0000 (20:52 +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
Change-Id: I3bff6ed474e901089070cb435adf8dad33083d87
Kenneth Graunke [Fri, 20 Jan 2017 20:51:39 +0000 (20:51 +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
Change-Id: I8270fd4b8489d516ff37eb603d2e3f9022d2d712
Kenneth Graunke [Fri, 20 Jan 2017 20:51:37 +0000 (20:51 +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
Change-Id: I4e05a357f81f8830b2976cd9edae3cf5696ee7d1
Android Build Merger (Role) [Fri, 20 Jan 2017 20:47:35 +0000 (20:47 +0000)]
Merge "Fix internal format/type for ES3 3D + depth/stencil negative API tests. am:
2ed3a5a66f am:
6a6f549150 am:
f9b870fb5b am:
b47baae90a am:
76a7f607a5 am:
bdbc876fc7" into nyc-mr2-dev-plus-aosp
Kenneth Graunke [Fri, 20 Jan 2017 20:47:29 +0000 (20:47 +0000)]
Fix internal format/type for ES3 3D + depth/stencil negative API tests. am:
2ed3a5a66f am:
6a6f549150 am:
f9b870fb5b am:
b47baae90a am:
76a7f607a5
am:
bdbc876fc7
Change-Id: I945144d4cc2c17944e03bbeaafaf4bb10a465a62
Android Build Merger (Role) [Fri, 20 Jan 2017 20:47:19 +0000 (20:47 +0000)]
Merge "Merge "Add support for EGL_EXT_pixel_format_float" into nougat-cts-dev am:
13a05434cc am:
5f30178321 am:
764cd6e60b am:
0a683a56e7 am:
e961416ca6 -s ours am:
8cddd0f806 -s ours" into nyc-mr2-dev-plus-aosp
Tina Zhou [Fri, 20 Jan 2017 20:47:12 +0000 (20:47 +0000)]
Merge "Add support for EGL_EXT_pixel_format_float" into nougat-cts-dev am:
13a05434cc am:
5f30178321 am:
764cd6e60b am:
0a683a56e7 am:
e961416ca6 -s ours
am:
8cddd0f806 -s ours
Change-Id: I9966b7a980cac344e75e4810dd05699775d03cad
Tina Zhou [Fri, 20 Jan 2017 20:47:12 +0000 (20:47 +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
Change-Id: Ieb884c16b84c8e7d9baf9d31b338cda37f853c6e
Tina Zhou [Fri, 20 Jan 2017 20:47:10 +0000 (20:47 +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
Change-Id: Ia685a237ee165ef19ceb70b1ebb8059064b6c0d3
Android Build Merger (Role) [Fri, 20 Jan 2017 20:47:02 +0000 (20:47 +0000)]
Merge "Add support for EGL_EXT_pixel_format_float am:
521bf8a7c3 am:
4b7baeace7 am:
86683f95c7 am:
0624edb1ce am:
234daba7b4 -s ours am:
7f9e23d176 -s ours" into nyc-mr2-dev-plus-aosp
Mark Adams [Fri, 20 Jan 2017 20:46:57 +0000 (20:46 +0000)]
Add support for EGL_EXT_pixel_format_float am:
521bf8a7c3 am:
4b7baeace7 am:
86683f95c7 am:
0624edb1ce am:
234daba7b4 -s ours
am:
7f9e23d176 -s ours
Change-Id: I5ed211775089c1316522de4757278364d692cde4
Android Build Merger (Role) [Fri, 20 Jan 2017 20:46:47 +0000 (20:46 +0000)]
Merge "Merge "Remove tests affected by NV/OES_viewport_array extension" into nougat-cts-dev am:
e98444b9bf am:
ce3144c3e5 am:
29dde7d04d am:
4ac909cfeb -s ours am:
50df351a0f -s ours" into nyc-mr2-dev-plus-aosp
Mark Adams [Fri, 20 Jan 2017 20:46:46 +0000 (20:46 +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
Change-Id: I82b1cdf1d716fd361499f819523ab68a5c6d5176
Mark Adams [Fri, 20 Jan 2017 20:46:43 +0000 (20:46 +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
Change-Id: Ibde452be050688ea27142a277c1712001f8d76a1
Tina Zhou [Fri, 20 Jan 2017 20:46:40 +0000 (20:46 +0000)]
Merge "Remove tests affected by NV/OES_viewport_array extension" into nougat-cts-dev am:
e98444b9bf am:
ce3144c3e5 am:
29dde7d04d am:
4ac909cfeb -s ours
am:
50df351a0f -s ours
Change-Id: I4fe705ee4db0cb5b1e5c27331aa1cd703c90e34a
Android Build Merger (Role) [Fri, 20 Jan 2017 20:46:27 +0000 (20:46 +0000)]
Merge "Remove tests affected by NV/OES_viewport_array extension am:
267c765690 am:
0004ce1767 am:
ee2a180f00 am:
20860eb2df -s ours am:
a4982bfb72 -s ours" into nyc-mr2-dev-plus-aosp
Pyry Haulos [Fri, 20 Jan 2017 20:46:20 +0000 (20:46 +0000)]
Remove tests affected by NV/OES_viewport_array extension am:
267c765690 am:
0004ce1767 am:
ee2a180f00 am:
20860eb2df -s ours
am:
a4982bfb72 -s ours
Change-Id: I70c5745be0a607b14bff00ef872087d8fe6201b9
Android Build Merger (Role) [Fri, 20 Jan 2017 20:46:07 +0000 (20:46 +0000)]
Merge "Merge "Merge "Generate flat triangles in polygon offset tests." into nougat-cts-dev am:
61d6d95a66 am:
73b7f271a9 am:
0b9596cb35 am:
436488b78f" into nyc-mr1-dev-plus-aosp am:
715c4b7814" into nyc-mr2-dev-plus-aosp
Tina Zhou [Fri, 20 Jan 2017 20:46:07 +0000 (20:46 +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
Change-Id: I415a1f65dffb0b5d3218653bfd34653535b7081d
Android Build Merger (Role) [Fri, 20 Jan 2017 20:46:02 +0000 (20:46 +0000)]
Merge "Merge "Generate flat triangles in polygon offset tests." into nougat-cts-dev am:
61d6d95a66 am:
73b7f271a9 am:
0b9596cb35 am:
436488b78f am:
336f66bfc4" into nyc-mr2-dev-plus-aosp
Tina Zhou [Fri, 20 Jan 2017 20:46:02 +0000 (20:46 +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
Change-Id: I902e942aba6d8db4b856a81ac6d6f42b382cc488
Tina Zhou [Fri, 20 Jan 2017 20:45:54 +0000 (20:45 +0000)]
Merge "Merge "Generate flat triangles in polygon offset tests." into nougat-cts-dev am:
61d6d95a66 am:
73b7f271a9 am:
0b9596cb35 am:
436488b78f" into nyc-mr1-dev-plus-aosp
am:
715c4b7814
Change-Id: I0ae9df9e5f9225aef57aabd039136f9400ae2b8e
Tina Zhou [Fri, 20 Jan 2017 20:45:50 +0000 (20:45 +0000)]
Merge "Generate flat triangles in polygon offset tests." into nougat-cts-dev am:
61d6d95a66 am:
73b7f271a9 am:
0b9596cb35 am:
436488b78f
am:
336f66bfc4
Change-Id: I639413972a8f2c7ef6561c3f39bf13d7a7e07f04
Pyry Haulos [Fri, 20 Jan 2017 20:45:36 +0000 (20:45 +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
Change-Id: Ie48f61086e3b2a54c0ed414a2871497590e2b2fe
Android Build Merger (Role) [Fri, 20 Jan 2017 20:45:34 +0000 (20:45 +0000)]
Merge "Merge "Generate flat triangles in polygon offset tests. am:
975a59ebca am:
02c67b12c1 am:
0e7da13770 am:
0dbb18ee84" into nyc-mr1-dev-plus-aosp am:
146f745175" into nyc-mr2-dev-plus-aosp
Pyry Haulos [Fri, 20 Jan 2017 20:45:34 +0000 (20:45 +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
Change-Id: I9bbe74ac29a4cae2c06c24dcc810f2092c3b8ca6
Android Build Merger (Role) [Fri, 20 Jan 2017 20:45:30 +0000 (20:45 +0000)]
Merge "Generate flat triangles in polygon offset tests. am:
975a59ebca am:
02c67b12c1 am:
0e7da13770 am:
0dbb18ee84 am:
4c08ce83d1" into nyc-mr2-dev-plus-aosp
Alexander Galazin [Fri, 20 Jan 2017 20:45:24 +0000 (20:45 +0000)]
Merge "Generate flat triangles in polygon offset tests. am:
975a59ebca am:
02c67b12c1 am:
0e7da13770 am:
0dbb18ee84" into nyc-mr1-dev-plus-aosp
am:
146f745175
Change-Id: Ic3dbfa7fbdcd3159365e207e516e4a3745fc2751
Alexander Galazin [Fri, 20 Jan 2017 20:45:19 +0000 (20:45 +0000)]
Generate flat triangles in polygon offset tests. am:
975a59ebca am:
02c67b12c1 am:
0e7da13770 am:
0dbb18ee84
am:
4c08ce83d1
Change-Id: Ibaef63c51e4f6c85576d08d759e6b24abf8f560f
Tina Zhou [Fri, 20 Jan 2017 20:45:07 +0000 (20: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
Change-Id: Iaa00f7ffbd59828a53bf1809e1178ed86c84928b
Android Build Merger (Role) [Fri, 20 Jan 2017 20:45:05 +0000 (20:45 +0000)]
Merge "Merge "Merge "Relax line width verification in primitive bbox tests" into nougat-cts-dev am:
312a550657 am:
36d3dd2ab1 am:
5debc545bf am:
ee10cd68f7" into nyc-mr1-dev-plus-aosp am:
977fa4ba31" into nyc-mr2-dev-plus-aosp
Tina Zhou [Fri, 20 Jan 2017 20:45:04 +0000 (20: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
Change-Id: I8291da4b9d2958acc6fdd74dacd8201d9f1607e0
Android Build Merger (Role) [Fri, 20 Jan 2017 20:45:00 +0000 (20:45 +0000)]
Merge "Merge "Relax line width verification in primitive bbox tests" into nougat-cts-dev am:
312a550657 am:
36d3dd2ab1 am:
5debc545bf am:
ee10cd68f7 am:
bc02b9f045" into nyc-mr2-dev-plus-aosp