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
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
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
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
Pyry Haulos [Fri, 20 Jan 2017 20:44:37 +0000 (20:44 +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
Change-Id: I11192dcb244d80cfcb7cda06673ba747f11b42bb
Pyry Haulos [Fri, 20 Jan 2017 20:44:35 +0000 (20: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
Change-Id: I2ff4856e06782e3e6043afb577d81985c921ffdd
Pyry Haulos [Fri, 20 Jan 2017 20:44:12 +0000 (20: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
Change-Id: I15227e9016dc8ec8e91c33716ce8df345af780fd
Pyry Haulos [Fri, 20 Jan 2017 20:44:09 +0000 (20:44 +0000)]
Relax line width verification in primitive bbox tests am:
ba45591407 am:
a11fd8b487 am:
90c49fe030 am:
04d8a8e98a am:
ddf3f33d7a
am:
957322a3c7
Change-Id: I3f166ff92a06dcbc9b2fc1e31ac9cbd745fb20bb
Alexander Galazin [Fri, 20 Jan 2017 20:43:35 +0000 (20: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
Change-Id: I8a623470cf0b4dffcda583887ffec0470939cbe5
Alexander Galazin [Fri, 20 Jan 2017 20:43:32 +0000 (20:43 +0000)]
Generate flat triangles in polygon offset tests. am:
975a59ebca am:
02c67b12c1 am:
0e7da13770 am:
0dbb18ee84 am:
b89872b38a
am:
709049d1f3
Change-Id: Iaa3f2aa6ba72f005858523930b675cf13de85245
Tina Zhou [Fri, 20 Jan 2017 20:43:06 +0000 (20:43 +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
Change-Id: I813884399348b918ae6024e5288add33c762effa
Tina Zhou [Fri, 20 Jan 2017 20:43:04 +0000 (20:43 +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
Change-Id: I79402f3a5899977c89603860479bdfe5f3ed5366
Tina Zhou [Fri, 20 Jan 2017 20:42:35 +0000 (20:42 +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
Change-Id: I754c4572f6adb856d384ed18fd12a1998ef22b8c
Tina Zhou [Fri, 20 Jan 2017 20:42:33 +0000 (20:42 +0000)]
Merge "Generate flat triangles in polygon offset tests." into nougat-cts-dev am:
61d6d95a66 am:
ea7ea6aeee am:
562348c4a0 am:
b03f7416cd
am:
94adec74ae
Change-Id: I55a460c691640998fefb402fb178644ac8d1810b
Pyry Haulos [Fri, 20 Jan 2017 20:42:12 +0000 (20:42 +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
Change-Id: I312f88b7f80a26c58abdd579c0abd7825a22be85
Pyry Haulos [Fri, 20 Jan 2017 20:42:10 +0000 (20:42 +0000)]
Relax line width verification in primitive bbox tests am:
ba45591407 am:
a11fd8b487 am:
90c49fe030 am:
04d8a8e98a am:
6734db1692
am:
74bbc068d7
Change-Id: Ifcc406d5d6f5bf877986bb25b93cf33e3174408f
Alexander Galazin [Fri, 20 Jan 2017 20:41:52 +0000 (20:41 +0000)]
Generate flat triangles in polygon offset tests. am:
975a59ebca am:
b1c225b9d6 am:
f8e27c683d am:
5ccc8a2ee8
am:
678de5eb37
Change-Id: I2099fa159371cb4104dc962a6b38d4963d380bab
Tina Zhou [Fri, 20 Jan 2017 20:41:18 +0000 (20:41 +0000)]
Merge "Relax line width verification in primitive bbox tests" into nougat-cts-dev am:
312a550657 am:
487543e953 am:
ed835f32e2 am:
cd215677dd
am:
1d8a06d405
Change-Id: Ib161d31753aad494402828f347231d8524c99b44
Pyry Haulos [Fri, 20 Jan 2017 20:41:05 +0000 (20:41 +0000)]
resolve merge conflicts of
ba455914 to master am:
07a7e24da3 am:
218bfe74ff am:
e37a75a4b9
am:
2d1edbcbc6
Change-Id: I204e1fc1e1172b17d92b8bd85a6a30da5b24e12e
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
Tina Zhou [Fri, 20 Jan 2017 19:01:59 +0000 (19:01 +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
Change-Id: Ia9938b366b0c2dc8e70e98ef8f8a55a808eab3d5
Tina Zhou [Fri, 20 Jan 2017 19:01:56 +0000 (19:01 +0000)]
Merge "Fix eglBindAPI negative test" into nougat-cts-dev am:
6068dfbf3a am:
839be6fae4 am:
e892f4b76d am:
5322472db4 am:
b71168726c
am:
1e1b68d29b
Change-Id: Ic2e7bfd476c78e591b13813cd93a47570df86552
Nicolas Boichat [Fri, 20 Jan 2017 19:01:36 +0000 (19:01 +0000)]
Merge "Fix eglBindAPI negative test am:
09784f8510 am:
b7b2f00530 am:
03a8c9c6f8 am:
6e6f163b3b am:
190054bc17" into nyc-mr2-dev-plus-aosp
am:
e9aae01bae
Change-Id: I7216dd79b4a47f29bd73c6ccac9dfa9b09ac3b5b
Nicolas Boichat [Fri, 20 Jan 2017 19:01:32 +0000 (19:01 +0000)]
Fix eglBindAPI negative test am:
09784f8510 am:
b7b2f00530 am:
03a8c9c6f8 am:
6e6f163b3b am:
190054bc17
am:
9f3d873751
Change-Id: I862a527bc42517f4404112205a7ed431bc74997b
Tina Zhou [Fri, 20 Jan 2017 19:01:10 +0000 (19:01 +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
Change-Id: I9c12ef1e40dc853dc828166a3733fd48a9a9bf27
Tina Zhou [Fri, 20 Jan 2017 19:01:08 +0000 (19:01 +0000)]
Merge "Fix eglBindAPI negative test" into nougat-cts-dev am:
6068dfbf3a am:
839be6fae4 am:
e892f4b76d am:
5322472db4 am:
c775dba9b7
am:
6f69e76b29
Change-Id: Ib6aaa39526eda2a72d58fc554aa0b20db5939a77
Tina Zhou [Fri, 20 Jan 2017 19:00:43 +0000 (19:00 +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
Change-Id: I37f4ccac5ba7c6a4294caed138c62e127406137f
Tina Zhou [Fri, 20 Jan 2017 19:00:41 +0000 (19:00 +0000)]
Merge "Drop incorrect framebuffer texture subtests." into nougat-cts-dev am:
3baf7e3be2 am:
b3f5df9d8f am:
c51b8d9aed am:
ca62006a36 am:
db0b4da47e
am:
c5cf83a659
Change-Id: I1d0ba4d8409684301f5ebb770e2c67ec13592c25
Nicolas Boichat [Fri, 20 Jan 2017 19:00:22 +0000 (19:00 +0000)]
Merge "Fix eglBindAPI negative test am:
09784f8510 am:
b7b2f00530 am:
03a8c9c6f8 am:
6e6f163b3b am:
3401c85689" into nyc-mr2-dev-plus-aosp
am:
7090e0d7c3
Change-Id: I83661ea162842ee4a2652540744fd96927679970
Nicolas Boichat [Fri, 20 Jan 2017 19:00:20 +0000 (19:00 +0000)]
Fix eglBindAPI negative test am:
09784f8510 am:
b7b2f00530 am:
03a8c9c6f8 am:
6e6f163b3b am:
3401c85689
am:
ef54248329
Change-Id: If447d79dec81df25e17b0d58d9a8faf9a207bbb7
Kenneth Graunke [Fri, 20 Jan 2017 19:00:01 +0000 (19:00 +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
Change-Id: I85ba888455dae478be85bd6ae26ad0321b0c4d9f
Kenneth Graunke [Fri, 20 Jan 2017 18:59:59 +0000 (18:59 +0000)]
Drop incorrect framebuffer texture subtests. am:
625d685874 am:
9df734d698 am:
b7e9123835 am:
8d840f0bad am:
f2063e4bd4
am:
d6715f9002
Change-Id: I8f7f30ff1a222a8c50c8f579f224278bf038e88f
Tina Zhou [Fri, 20 Jan 2017 18:59:37 +0000 (18:59 +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
Change-Id: I9292dc710c3129634e1e9aecff422082370116e8
Tina Zhou [Fri, 20 Jan 2017 18:59:35 +0000 (18:59 +0000)]
Merge "Drop incorrect framebuffer texture subtests." into nougat-cts-dev am:
3baf7e3be2 am:
b3f5df9d8f am:
c51b8d9aed am:
ca62006a36 am:
fdd8480d61
am:
41dcd407bb
Change-Id: I0071922b9376af3a54a88d97c7cbf9d92815ea79
Tina Zhou [Fri, 20 Jan 2017 18:59:13 +0000 (18:59 +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
Change-Id: I3edc76c6a0c96a57220a49c909c35fe57f3b3e7b
Tina Zhou [Fri, 20 Jan 2017 18:59:11 +0000 (18:59 +0000)]
Merge "Optimize swapchain OOM tests" into nougat-cts-dev am:
c811d42d99 am:
27b237e149 am:
941703d7ac am:
f118f42c24 am:
e3b76d3762
am:
a2f948ce46
Change-Id: Ifa8e06e5d64204fefbbf616a69e43d2a8f3d3d0c
Kenneth Graunke [Fri, 20 Jan 2017 18:58:53 +0000 (18:58 +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
Change-Id: I12aca96a20fd8434ac4dd8f827a024acef7c04cc
Kenneth Graunke [Fri, 20 Jan 2017 18:58:51 +0000 (18:58 +0000)]
Drop incorrect framebuffer texture subtests. am:
625d685874 am:
9df734d698 am:
b7e9123835 am:
8d840f0bad am:
f06cad8eec
am:
32036df36a
Change-Id: Iaf2a8561e544d5c8bde6c445268ac9441b2289a7
Tina Zhou [Fri, 20 Jan 2017 18:58:29 +0000 (18:58 +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
Change-Id: I1bf3bb77cebf05da2cafc78da3eb2fa72c4586c8
Tina Zhou [Fri, 20 Jan 2017 18:58:28 +0000 (18:58 +0000)]
Merge "Optimize swapchain OOM tests" into nougat-cts-dev am:
c811d42d99 am:
27b237e149 am:
941703d7ac am:
f118f42c24 am:
36b1aa5745
am:
bdfe398260
Change-Id: I5ed33143fd711ecb23e2e0a8c04b5d0f611578aa
Pyry Haulos [Fri, 20 Jan 2017 18:58:05 +0000 (18:58 +0000)]
Merge "Optimize swapchain OOM tests am:
1614827a71 am:
c4cd6ba5e7 am:
58dd13c4bd am:
fee7030974 am:
cc5f7e4994" into nyc-mr2-dev-plus-aosp
am:
52dd024c04
Change-Id: I7d36cc6775181b9d7435e38f2eb8ddfed5657fb6
Pyry Haulos [Fri, 20 Jan 2017 18:58:01 +0000 (18:58 +0000)]
Optimize swapchain OOM tests am:
1614827a71 am:
c4cd6ba5e7 am:
58dd13c4bd am:
fee7030974 am:
cc5f7e4994
am:
d56d1c3290
Change-Id: I88722d4b4f2981ebedee55ecbef90e89afdbafcb
Pyry Haulos [Fri, 20 Jan 2017 18:57:39 +0000 (18:57 +0000)]
Merge "Optimize swapchain OOM tests am:
1614827a71 am:
c4cd6ba5e7 am:
58dd13c4bd am:
fee7030974 am:
d77cb2024c" into nyc-mr2-dev-plus-aosp
am:
92eba862f7
Change-Id: I305ad2898d6d7ae516d04438a351e3a33f5cffd3
Pyry Haulos [Fri, 20 Jan 2017 18:57:37 +0000 (18:57 +0000)]
Optimize swapchain OOM tests am:
1614827a71 am:
c4cd6ba5e7 am:
58dd13c4bd am:
fee7030974 am:
d77cb2024c
am:
2561661eec
Change-Id: Ia828e58be4d5e2aee07290f313cd93a23bc93bb1
Tina Zhou [Fri, 20 Jan 2017 18:57:15 +0000 (18:57 +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
Change-Id: Iee1ff375e7596d305f3c0849be1093ea806f4ea4
Tina Zhou [Fri, 20 Jan 2017 18:57:13 +0000 (18:57 +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
Change-Id: I415c49ef8adab5bac2d21fa1855ca7d1ea319c4a
Tina Zhou [Fri, 20 Jan 2017 18:56:48 +0000 (18:56 +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
Change-Id: I331369c11ebcb20ba3aef5786f94dbfc7df92e15
Tina Zhou [Fri, 20 Jan 2017 18:56:47 +0000 (18:56 +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
Change-Id: I9b812f65b92a96654787532e8bd82582d406b973
Kenneth Graunke [Fri, 20 Jan 2017 18:56:25 +0000 (18:56 +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
Change-Id: I409a4273ebde0ae3292994fc6d831c51d6f95646
Kenneth Graunke [Fri, 20 Jan 2017 18:56:22 +0000 (18:56 +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
Change-Id: I94823d349ea5f06c93c845075cdd0d25c180925b
Kenneth Graunke [Fri, 20 Jan 2017 18:56:02 +0000 (18:56 +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
Change-Id: I2ec5d8db5998c42ab6a403c2b3a56e2117c8fb3c
Kenneth Graunke [Fri, 20 Jan 2017 18:56:00 +0000 (18:56 +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
Change-Id: I203f012b14afa7a012bfa41d1841588092b7dbb6
Tina Zhou [Fri, 20 Jan 2017 18:55:24 +0000 (18:55 +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
Change-Id: Id9de074397751103f0e6603acf9bc00a59f3809c
Tina Zhou [Fri, 20 Jan 2017 18:55:22 +0000 (18:55 +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
Change-Id: I34ed89f179b782eb84697be5f5e6e1b60b8781be
Tina Zhou [Fri, 20 Jan 2017 18:54:59 +0000 (18:54 +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
Change-Id: I3d99a87b5ded7884ba1549dae9f82498ce3c2c6f
Tina Zhou [Fri, 20 Jan 2017 18:54:57 +0000 (18:54 +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
Change-Id: I1ecb46ab0d0a9653252ff61a6c67a36312e4eedd
Mark Adams [Fri, 20 Jan 2017 18:54:40 +0000 (18:54 +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
Change-Id: I5fe5292ec075dc90e6221d8515a32668b8578788
Mark Adams [Fri, 20 Jan 2017 18:54:39 +0000 (18:54 +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
Change-Id: Ibc74c065d8be8be4507d118200fd4919b77f8487
Mark Adams [Fri, 20 Jan 2017 18:54:20 +0000 (18:54 +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
Change-Id: Ifc9509f7843687890dfaa515c3c512929e5b4136
Tina Zhou [Fri, 20 Jan 2017 18:51:11 +0000 (18:51 +0000)]
Merge "Fix eglBindAPI negative test" into nougat-cts-dev am:
6068dfbf3a am:
cc65e08407 am:
be674b63ba am:
e766c1ab54
am:
3bfd4e5494
Change-Id: I3d1d2fa2328a3f88a17bf025209f1684129d6362
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
Nicolas Boichat [Fri, 20 Jan 2017 18:50:57 +0000 (18:50 +0000)]
Fix eglBindAPI negative test am:
09784f8510 am:
2792165177 am:
298b7abce5 am:
13bfe4734c
am:
0cc14a39d7
Change-Id: Ifaf9ffcc92af9654ad529a39b226853898d792d0
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
Tina Zhou [Fri, 20 Jan 2017 18:50:43 +0000 (18:50 +0000)]
Merge "Drop incorrect framebuffer texture subtests." into nougat-cts-dev am:
3baf7e3be2 -s ours am:
7e8c7d9b65 am:
dd6ff4b8da am:
7a0b1861f1
am:
4c094d04f0
Change-Id: I26df302c80ada7f49cf241dcc1610f56363ee2d0
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
Kenneth Graunke [Fri, 20 Jan 2017 18:50:33 +0000 (18:50 +0000)]
Drop incorrect framebuffer texture subtests. am:
625d685874 -s ours am:
727bdb2369 am:
5722a54979 am:
f874bcf9ce
am:
eb8a9dbfda
Change-Id: Ic8b2166af5b250885b1d1275a0e531c95e7bfd58