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
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
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
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 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
Tina Zhou [Fri, 20 Jan 2017 18:50:31 +0000 (18:50 +0000)]
Merge "Fix eglBindAPI negative test" into nougat-cts-dev am:
6068dfbf3a am:
839be6fae4 am:
e892f4b76d am:
5322472db4
am:
c775dba9b7
Change-Id: Iec06d72575a2670e48bcea1b78d353e105d38c91
Tina Zhou [Fri, 20 Jan 2017 18:50:28 +0000 (18:50 +0000)]
Merge "Drop incorrect framebuffer texture subtests." into nougat-cts-dev am:
3baf7e3be2 am:
b3f5df9d8f am:
c51b8d9aed am:
ca62006a36
am:
db0b4da47e
Change-Id: I8d970364b87a9e70785ddb530f0bd2a61408ba63
Android Build Merger (Role) [Fri, 20 Jan 2017 18:50:25 +0000 (18:50 +0000)]
Merge "Fix eglBindAPI negative test am:
09784f8510 am:
b7b2f00530 am:
03a8c9c6f8 am:
6e6f163b3b am:
3401c85689" into nyc-mr2-dev-plus-aosp
Android Build Merger (Role) [Fri, 20 Jan 2017 18:50:20 +0000 (18:50 +0000)]
Merge "Drop incorrect framebuffer texture subtests. am:
625d685874 am:
9df734d698 am:
b7e9123835 am:
8d840f0bad am:
f2063e4bd4" into nyc-mr2-dev-plus-aosp
Nicolas Boichat [Fri, 20 Jan 2017 18:50:17 +0000 (18:50 +0000)]
Fix eglBindAPI negative test am:
09784f8510 am:
b7b2f00530 am:
03a8c9c6f8 am:
6e6f163b3b
am:
3401c85689
Change-Id: I2f83b07eb9d7316cbf9ed54b2ac0f5b7a4069f21
Kenneth Graunke [Fri, 20 Jan 2017 18:50:13 +0000 (18:50 +0000)]
Drop incorrect framebuffer texture subtests. am:
625d685874 am:
9df734d698 am:
b7e9123835 am:
8d840f0bad
am:
f2063e4bd4
Change-Id: I4eee1171446075ef482c95ec6d47f727c5b70e04
Tina Zhou [Fri, 20 Jan 2017 18:50:13 +0000 (18:50 +0000)]
Merge "Optimize swapchain OOM tests" into nougat-cts-dev am:
c811d42d99 am:
e8956e54ae am:
38c76f88d2 am:
8d012e6420
am:
e8bd96831a
Change-Id: Ie5033377953109a51cdaf294b66c8dd557abbd85
Android Build Merger (Role) [Fri, 20 Jan 2017 18:50:12 +0000 (18:50 +0000)]
Merge "Merge "Drop incorrect framebuffer texture subtests." into nougat-cts-dev am:
3baf7e3be2 am:
b3f5df9d8f am:
c51b8d9aed am:
ca62006a36 am:
fdd8480d61" into nyc-mr2-dev-plus-aosp
Tina Zhou [Fri, 20 Jan 2017 18:50:05 +0000 (18:50 +0000)]
Merge "Drop incorrect framebuffer texture subtests." into nougat-cts-dev am:
3baf7e3be2 am:
b3f5df9d8f am:
c51b8d9aed am:
ca62006a36
am:
fdd8480d61
Change-Id: Icbd403318866895a52642f010759407956c0c005
Android Build Merger (Role) [Fri, 20 Jan 2017 18:50:04 +0000 (18:50 +0000)]
Merge "Merge "Optimize swapchain OOM tests" into nougat-cts-dev am:
c811d42d99 am:
27b237e149 am:
941703d7ac am:
f118f42c24 am:
e3b76d3762" into nyc-mr2-dev-plus-aosp
Android Build Merger (Role) [Fri, 20 Jan 2017 18:49:58 +0000 (18:49 +0000)]
Merge "Drop incorrect framebuffer texture subtests. am:
625d685874 am:
9df734d698 am:
b7e9123835 am:
8d840f0bad am:
f06cad8eec" into nyc-mr2-dev-plus-aosp
Tina Zhou [Fri, 20 Jan 2017 18:49:57 +0000 (18:49 +0000)]
Merge "Optimize swapchain OOM tests" into nougat-cts-dev am:
c811d42d99 am:
27b237e149 am:
941703d7ac am:
f118f42c24
am:
e3b76d3762
Change-Id: Ibf7780711e82ebdea81d88b9712cb6c3216928b6
Pyry Haulos [Fri, 20 Jan 2017 18:49:57 +0000 (18:49 +0000)]
Optimize swapchain OOM tests am:
1614827a71 am:
1f1eac5e9e am:
b925a5dac5 am:
5dc21b2fbe
am:
40af4e1840
Change-Id: Ic8bcb056fe9b23280fd3ed4ea4a9651a86e99c0f
Kenneth Graunke [Fri, 20 Jan 2017 18:49:52 +0000 (18:49 +0000)]
Drop incorrect framebuffer texture subtests. am:
625d685874 am:
9df734d698 am:
b7e9123835 am:
8d840f0bad
am:
f06cad8eec
Change-Id: Ibf4e598e4807987f2af209cf0d456ab4ce49ed4d
Android Build Merger (Role) [Fri, 20 Jan 2017 18:49:46 +0000 (18:49 +0000)]
Merge "Merge "Optimize swapchain OOM tests" into nougat-cts-dev am:
c811d42d99 am:
27b237e149 am:
941703d7ac am:
f118f42c24 am:
36b1aa5745" into nyc-mr2-dev-plus-aosp
Tina Zhou [Fri, 20 Jan 2017 18:49:41 +0000 (18:49 +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
Change-Id: I876113c2302165168b8116b7049c17222afd5855
Tina Zhou [Fri, 20 Jan 2017 18:49:40 +0000 (18:49 +0000)]
Merge "Optimize swapchain OOM tests" into nougat-cts-dev am:
c811d42d99 am:
27b237e149 am:
941703d7ac am:
f118f42c24
am:
36b1aa5745
Change-Id: I662ff45d05608b3c2a551f23fe5969fe5e6ec62e
Android Build Merger (Role) [Fri, 20 Jan 2017 18:49:37 +0000 (18:49 +0000)]
Merge "Optimize swapchain OOM tests am:
1614827a71 am:
c4cd6ba5e7 am:
58dd13c4bd am:
fee7030974 am:
cc5f7e4994" into nyc-mr2-dev-plus-aosp
Android Build Merger (Role) [Fri, 20 Jan 2017 18:49:34 +0000 (18:49 +0000)]
Merge "Optimize swapchain OOM tests am:
1614827a71 am:
c4cd6ba5e7 am:
58dd13c4bd am:
fee7030974 am:
d77cb2024c" into nyc-mr2-dev-plus-aosp
Pyry Haulos [Fri, 20 Jan 2017 18:49:31 +0000 (18:49 +0000)]
Optimize swapchain OOM tests am:
1614827a71 am:
c4cd6ba5e7 am:
58dd13c4bd am:
fee7030974
am:
cc5f7e4994
Change-Id: Ifaa0328a831afc1ca87de4c28764e3fbff7ead72
Kenneth Graunke [Fri, 20 Jan 2017 18:49:31 +0000 (18:49 +0000)]
Fix internal format/type for ES3 3D + depth/stencil negative API tests. am:
2ed3a5a66f am:
bd1ce838a0 am:
f39baeb2fe am:
9a67cbf7f0
am:
4e2d71278a
Change-Id: I1d46939bc2e493d97ad18a22c82fe12989a8298e
Pyry Haulos [Fri, 20 Jan 2017 18:49:27 +0000 (18:49 +0000)]
Optimize swapchain OOM tests am:
1614827a71 am:
c4cd6ba5e7 am:
58dd13c4bd am:
fee7030974
am:
d77cb2024c
Change-Id: I6e48ea7eb82197f5e946e6a29efccbd0a46b15d7
Android Build Merger (Role) [Fri, 20 Jan 2017 18:49:24 +0000 (18:49 +0000)]
Merge "Merge "Fix internal format/type for ES3 3D + depth/stencil negative API tests." into nougat-cts-dev am:
0991459ed1 am:
0a2fc88750 am:
842ee2b145 am:
c9c5b8e584 am:
a564528ab7" into nyc-mr2-dev-plus-aosp
Android Build Merger (Role) [Fri, 20 Jan 2017 18:49:22 +0000 (18:49 +0000)]
Merge "Merge "Fix internal format/type for ES3 3D + depth/stencil negative API tests." into nougat-cts-dev am:
0991459ed1 am:
0a2fc88750 am:
842ee2b145 am:
c9c5b8e584 am:
e7ce491cb7" into nyc-mr2-dev-plus-aosp
Tina Zhou [Fri, 20 Jan 2017 18:49:18 +0000 (18:49 +0000)]
Merge "Fix internal format/type for ES3 3D + depth/stencil negative API tests." into nougat-cts-dev am:
0991459ed1 am:
0a2fc88750 am:
842ee2b145 am:
c9c5b8e584
am:
a564528ab7
Change-Id: Id779115d9ee3bab99e794c26f4d4a57bf633587d
Tina Zhou [Fri, 20 Jan 2017 18:49:15 +0000 (18:49 +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
Change-Id: I2a6a40ba5e0d3b66d8f5361243b81436f66a5064
Tina Zhou [Fri, 20 Jan 2017 18:49:14 +0000 (18:49 +0000)]
Merge "Fix internal format/type for ES3 3D + depth/stencil negative API tests." into nougat-cts-dev am:
0991459ed1 am:
0a2fc88750 am:
842ee2b145 am:
c9c5b8e584
am:
e7ce491cb7
Change-Id: I4f0ca6b0edfc38c64927916fe4d19e0764bb7a3c
Android Build Merger (Role) [Fri, 20 Jan 2017 18:49:12 +0000 (18:49 +0000)]
Merge "Fix internal format/type for ES3 3D + depth/stencil negative API tests. am:
2ed3a5a66f am:
ad563bc887 am:
c05194f0c9 am:
b33cfac0b1 am:
0dfdc9322c" into nyc-mr2-dev-plus-aosp
Android Build Merger (Role) [Fri, 20 Jan 2017 18:49:10 +0000 (18:49 +0000)]
Merge "Fix internal format/type for ES3 3D + depth/stencil negative API tests. am:
2ed3a5a66f am:
ad563bc887 am:
c05194f0c9 am:
b33cfac0b1 am:
ec34d4f308" into nyc-mr2-dev-plus-aosp
Kenneth Graunke [Fri, 20 Jan 2017 18:49:05 +0000 (18:49 +0000)]
Fix internal format/type for ES3 3D + depth/stencil negative API tests. am:
2ed3a5a66f am:
ad563bc887 am:
c05194f0c9 am:
b33cfac0b1
am:
ec34d4f308
Change-Id: I9ffca14eb9d2b3fcbf05f0262db64d834e00a95d
Kenneth Graunke [Fri, 20 Jan 2017 18:49:04 +0000 (18:49 +0000)]
Fix internal format/type for ES3 3D + depth/stencil negative API tests. am:
2ed3a5a66f am:
ad563bc887 am:
c05194f0c9 am:
b33cfac0b1
am:
0dfdc9322c
Change-Id: I0c596fc390f71a98be764aff8d8ea4f1b5d22478
Mark Adams [Fri, 20 Jan 2017 18:49:04 +0000 (18:49 +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
Change-Id: I914f06c8c362ff7ee49e07304ee94e5b3a920465
Android Build Merger (Role) [Fri, 20 Jan 2017 18:48:59 +0000 (18:48 +0000)]
Merge "Merge "Add support for EGL_EXT_pixel_format_float" into nougat-cts-dev am:
13a05434cc am:
4fc6c2e455 am:
57763dc162 am:
24141a0482 am:
084605e329 -s ours" into nyc-mr2-dev-plus-aosp
Android Build Merger (Role) [Fri, 20 Jan 2017 18:48:58 +0000 (18:48 +0000)]
Merge "Merge "Add support for EGL_EXT_pixel_format_float" into nougat-cts-dev am:
13a05434cc am:
4fc6c2e455 am:
57763dc162 am:
24141a0482 -s ours am:
859095b088 -s ours" into nyc-mr2-dev-plus-aosp
Tina Zhou [Fri, 20 Jan 2017 18:48:53 +0000 (18:48 +0000)]
Merge "Add support for EGL_EXT_pixel_format_float" into nougat-cts-dev am:
13a05434cc am:
4fc6c2e455 am:
57763dc162 am:
24141a0482
am:
084605e329 -s ours
Change-Id: I4173b532f1df3d9a4dbc26331551c8da015e8193
Tina Zhou [Fri, 20 Jan 2017 18:48:51 +0000 (18:48 +0000)]
Merge "Add support for EGL_EXT_pixel_format_float" into nougat-cts-dev am:
13a05434cc am:
4fc6c2e455 am:
57763dc162 am:
24141a0482 -s ours
am:
859095b088 -s ours
Change-Id: I037b36edd201147c73d74e7c6dd37436f2c6993a
Android Build Merger (Role) [Fri, 20 Jan 2017 18:48:47 +0000 (18:48 +0000)]
Merge "Add support for EGL_EXT_pixel_format_float am:
521bf8a7c3 am:
28a6ef5df2 am:
69a929f82c am:
c68e6bbdef am:
ea60da8b8d -s ours" into nyc-mr2-dev-plus-aosp
Mark Adams [Fri, 20 Jan 2017 18:48:42 +0000 (18:48 +0000)]
Add support for EGL_EXT_pixel_format_float am:
521bf8a7c3 am:
28a6ef5df2 am:
69a929f82c am:
c68e6bbdef
am:
ea60da8b8d -s ours
Change-Id: Ice9061b0e0091332b57d1a59d7bc000f9b780d9c
Mark Adams [Fri, 20 Jan 2017 18:48:37 +0000 (18:48 +0000)]
Add support for EGL_EXT_pixel_format_float am:
521bf8a7c3 am:
28a6ef5df2 am:
69a929f82c am:
c68e6bbdef -s ours
am:
2495d02e3f -s ours
Change-Id: I6dc62cda139340ee9ebda71dc69192f4c3691406
Tina Zhou [Fri, 20 Jan 2017 18:46:06 +0000 (18:46 +0000)]
Merge "Fix eglBindAPI negative test" into nougat-cts-dev am:
6068dfbf3a am:
839be6fae4 am:
e892f4b76d
am:
5322472db4
Change-Id: I17a1b152115571dd492dc72c0f99fd272224b7f7
Tina Zhou [Fri, 20 Jan 2017 18:46:06 +0000 (18:46 +0000)]
Merge "Fix eglBindAPI negative test" into nougat-cts-dev am:
6068dfbf3a am:
cc65e08407 am:
be674b63ba
am:
e766c1ab54
Change-Id: I620b5ed1b7ca9f78efc4068fad69b06f59f7c354
Tina Zhou [Fri, 20 Jan 2017 18:46:03 +0000 (18:46 +0000)]
Merge "Fix eglBindAPI negative test" into nougat-cts-dev am:
6068dfbf3a am:
839be6fae4 am:
e892f4b76d
am:
5322472db4
Change-Id: I040b02b1b9e3a62157dc5574be6d6b574a214fb2
Nicolas Boichat [Fri, 20 Jan 2017 18:45:53 +0000 (18:45 +0000)]
Fix eglBindAPI negative test am:
09784f8510 am:
2792165177 am:
298b7abce5
am:
13bfe4734c
Change-Id: I0f4d77baf53b1511caae8c9e4dc80e1dda5d16d7
Nicolas Boichat [Fri, 20 Jan 2017 18:45:53 +0000 (18:45 +0000)]
Fix eglBindAPI negative test am:
09784f8510 am:
b7b2f00530 am:
03a8c9c6f8
am:
6e6f163b3b
Change-Id: I53fa00969a264ea715e3f2399dcc834bdf68c648
Nicolas Boichat [Fri, 20 Jan 2017 18:45:45 +0000 (18:45 +0000)]
Fix eglBindAPI negative test am:
09784f8510 am:
b7b2f00530 am:
03a8c9c6f8
am:
6e6f163b3b
Change-Id: Ic06d7d4b42be19edbb7ba5ea2424eb0163be9e9d
Tina Zhou [Fri, 20 Jan 2017 18:45:41 +0000 (18:45 +0000)]
Merge "Drop incorrect framebuffer texture subtests." into nougat-cts-dev am:
3baf7e3be2 am:
b3f5df9d8f am:
c51b8d9aed
am:
ca62006a36
Change-Id: I35f4dd69bb5505b43ea094e552bd5e931e0a2803
Tina Zhou [Fri, 20 Jan 2017 18:45:40 +0000 (18:45 +0000)]
Merge "Drop incorrect framebuffer texture subtests." into nougat-cts-dev am:
3baf7e3be2 -s ours am:
7e8c7d9b65 am:
dd6ff4b8da
am:
7a0b1861f1
Change-Id: I11b820ce600ad3760eb5e5beac6524baf9903114