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
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
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
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: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:
cc65e08407 am:
be674b63ba
am:
e766c1ab54
Change-Id: I620b5ed1b7ca9f78efc4068fad69b06f59f7c354
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: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
Tina Zhou [Fri, 20 Jan 2017 18:45:34 +0000 (18:45 +0000)]
Merge "Drop incorrect framebuffer texture subtests." into nougat-cts-dev am:
3baf7e3be2 am:
b3f5df9d8f am:
c51b8d9aed
am:
ca62006a36
Change-Id: Ifb3d8f517048913f39af17aba5d5132fd3ee7ec4
Kenneth Graunke [Fri, 20 Jan 2017 18:45:30 +0000 (18:45 +0000)]
Drop incorrect framebuffer texture subtests. am:
625d685874 -s ours am:
727bdb2369 am:
5722a54979
am:
f874bcf9ce
Change-Id: Ibb5c2b8b30b2744b7da0757ff7a2ba726a352f2b
Kenneth Graunke [Fri, 20 Jan 2017 18:45:29 +0000 (18:45 +0000)]
Drop incorrect framebuffer texture subtests. am:
625d685874 am:
9df734d698 am:
b7e9123835
am:
8d840f0bad
Change-Id: I721340b243d0dc83a5b38b7eb812d22ca865a2cb
Kenneth Graunke [Fri, 20 Jan 2017 18:45:23 +0000 (18:45 +0000)]
Drop incorrect framebuffer texture subtests. am:
625d685874 am:
9df734d698 am:
b7e9123835
am:
8d840f0bad
Change-Id: I015944b8dda822eadc6dd03d6ee663dfa3e8ae4e
Tina Zhou [Fri, 20 Jan 2017 18:45:19 +0000 (18:45 +0000)]
Merge "Optimize swapchain OOM tests" into nougat-cts-dev am:
c811d42d99 am:
27b237e149 am:
941703d7ac
am:
f118f42c24
Change-Id: Ibef92f208dbe3494855c4a99df9231f773db3615
Tina Zhou [Fri, 20 Jan 2017 18:45:18 +0000 (18:45 +0000)]
Merge "Optimize swapchain OOM tests" into nougat-cts-dev am:
c811d42d99 am:
e8956e54ae am:
38c76f88d2
am:
8d012e6420
Change-Id: Iae6aea1f732a6d2e78681cd27f5a695233fb7448
Tina Zhou [Fri, 20 Jan 2017 18:45:13 +0000 (18:45 +0000)]
Merge "Optimize swapchain OOM tests" into nougat-cts-dev am:
c811d42d99 am:
27b237e149 am:
941703d7ac
am:
f118f42c24
Change-Id: I4244e07271b11dcc5b1ed0f9607658bc366537e2
Pyry Haulos [Fri, 20 Jan 2017 18:45:06 +0000 (18:45 +0000)]
Optimize swapchain OOM tests am:
1614827a71 am:
1f1eac5e9e am:
b925a5dac5
am:
5dc21b2fbe
Change-Id: Ie361c9499d0e212e76cff4374a44de0b4db74816
Pyry Haulos [Fri, 20 Jan 2017 18:45:02 +0000 (18:45 +0000)]
Optimize swapchain OOM tests am:
1614827a71 am:
c4cd6ba5e7 am:
58dd13c4bd
am:
fee7030974
Change-Id: Ia726b40126f2c236ad09771608bdedc526dbbbc4
Pyry Haulos [Fri, 20 Jan 2017 18:45:02 +0000 (18:45 +0000)]
Optimize swapchain OOM tests am:
1614827a71 am:
c4cd6ba5e7 am:
58dd13c4bd
am:
fee7030974
Change-Id: I5e6dbd7cb7635510d0c372e01536b1e1dc8cc534
Tina Zhou [Fri, 20 Jan 2017 18:44:46 +0000 (18:44 +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
Change-Id: I2f392cd85882740de149dccf361c1eb53ceec645
Tina Zhou [Fri, 20 Jan 2017 18:44:45 +0000 (18:44 +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
Change-Id: I66c81804cf252d4fa72add8676f15fb6874a808f
Tina Zhou [Fri, 20 Jan 2017 18:44:45 +0000 (18:44 +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
Change-Id: I4c2ff9110cc28e1fc883ba8ff9797c801151a7b2
Kenneth Graunke [Fri, 20 Jan 2017 18:44:36 +0000 (18:44 +0000)]
Fix internal format/type for ES3 3D + depth/stencil negative API tests. am:
2ed3a5a66f am:
ad563bc887 am:
c05194f0c9
am:
b33cfac0b1
Change-Id: I2a35ba903fd92e6cc6f44ef2d29e08ca694ebe9e
Kenneth Graunke [Fri, 20 Jan 2017 18:44:35 +0000 (18:44 +0000)]
Fix internal format/type for ES3 3D + depth/stencil negative API tests. am:
2ed3a5a66f am:
bd1ce838a0 am:
f39baeb2fe
am:
9a67cbf7f0
Change-Id: I4389d9a704e6887e0c6dc6b0f48812c6c2c5c941
Kenneth Graunke [Fri, 20 Jan 2017 18:44:35 +0000 (18:44 +0000)]
Fix internal format/type for ES3 3D + depth/stencil negative API tests. am:
2ed3a5a66f am:
ad563bc887 am:
c05194f0c9
am:
b33cfac0b1
Change-Id: I5fde28fe60d630f3bd7822c203ba4b09895092f6
Tina Zhou [Fri, 20 Jan 2017 18:44:25 +0000 (18:44 +0000)]
Merge "Add support for EGL_EXT_pixel_format_float" into nougat-cts-dev am:
13a05434cc am:
4fc6c2e455 am:
57763dc162
am:
24141a0482
Change-Id: I5ce0ad2f3e4c13eebeb0632b71f8a2b7a1a1062c
Tina Zhou [Fri, 20 Jan 2017 18:44:24 +0000 (18:44 +0000)]
Merge "Add support for EGL_EXT_pixel_format_float" into nougat-cts-dev am:
13a05434cc am:
4fc6c2e455 am:
57763dc162
am:
24141a0482 -s ours
Change-Id: I13df84dda146ef5421308701446209fe6ba6db5c
Tina Zhou [Fri, 20 Jan 2017 18:44:21 +0000 (18:44 +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
Change-Id: I534675ef9f033f5b45a00e4e3c78c3b97cd6a400
Mark Adams [Fri, 20 Jan 2017 18:44:15 +0000 (18:44 +0000)]
Add support for EGL_EXT_pixel_format_float am:
521bf8a7c3 am:
28a6ef5df2 am:
69a929f82c
am:
c68e6bbdef
Change-Id: I743a76813168d2cd1bf2a4c3d08b19e78f6d0357
Mark Adams [Fri, 20 Jan 2017 18:44:13 +0000 (18:44 +0000)]
Add support for EGL_EXT_pixel_format_float am:
521bf8a7c3 am:
28a6ef5df2 am:
69a929f82c
am:
c68e6bbdef -s ours
Change-Id: I3fcab53906b9583971cb162d16cedec0620d5bde