Mika Isojärvi [Tue, 2 Aug 2016 23:14:50 +0000 (23:14 +0000)]
Merge "Fix image layout in pipeline barrier tests" am:
f61183a55c am:
a42dcee85a
am:
fb0de07694
Change-Id: Ic4efd9ca2493f4205c2724c1a8c49dc4b7c60197
Mika Isojärvi [Tue, 2 Aug 2016 23:11:51 +0000 (23:11 +0000)]
Merge "Fix image layout in pipeline barrier tests" am:
f61183a55c
am:
a42dcee85a
Change-Id: I7d50032a9f08023eeec243a314ea0328dde0aa8a
Mika Isojärvi [Tue, 2 Aug 2016 23:09:21 +0000 (23:09 +0000)]
Merge "Fix image layout in pipeline barrier tests"
am:
f61183a55c
Change-Id: I00f9fdd4bfb60e3fa3c0afd6e7346ade80da45cf
Treehugger Robot [Tue, 2 Aug 2016 23:02:21 +0000 (23:02 +0000)]
Merge "Fix image layout in pipeline barrier tests"
Chih-Hung Hsieh [Tue, 2 Aug 2016 18:02:01 +0000 (18:02 +0000)]
Suppress the google-explicit-constructor warning locally. am:
bded0f944e am:
a33c79fccc
am:
46d16db55d
Change-Id: I92101019a5be679bb225f173e1d9a213e12a28a0
Chih-Hung Hsieh [Tue, 2 Aug 2016 17:59:31 +0000 (17:59 +0000)]
Suppress the google-explicit-constructor warning locally. am:
bded0f944e
am:
a33c79fccc
Change-Id: If7661502a998c9abb95cde697ddcd0d7cb1a461f
Chih-Hung Hsieh [Tue, 2 Aug 2016 17:57:04 +0000 (17:57 +0000)]
Suppress the google-explicit-constructor warning locally.
am:
bded0f944e
Change-Id: I8b9bb93cb55f2d8d57af19f2123f986e4cba0c62
Chih-Hung Hsieh [Tue, 2 Aug 2016 05:33:13 +0000 (22:33 -0700)]
Suppress the google-explicit-constructor warning locally.
* Too many source files and constructors to fix now.
Bug:
28341362
Change-Id: I65c30df6e376cd77a43b80642354ff01d2c0b8df
Test: build with WITH_TIDY=1
Mika Isojärvi [Wed, 15 Jun 2016 18:42:36 +0000 (11:42 -0700)]
Fix image layout in pipeline barrier tests
Change-Id: I8862b728cb9e59d3a115a339badb45fdc0f94067
Daniel Xie [Mon, 1 Aug 2016 20:07:44 +0000 (20:07 +0000)]
Merge \\\\\\\\"DO NOT MERGE CP vertex array test and warning fixes\\\\\\\\" into marshmallow-cts-dev am:
b9c3777b77 -s ours am:
7bc41121c1 am:
3acfedf2ab am:
19de695b8d am:
f0e6d6563c -s ours am:
17c2446a15 am:
45a8f91070
am:
449abdbd00
Change-Id: Ie559b189a41d87d0b7b93f47a9aacda5f5e44cfe
Jarkko Pöyry [Mon, 1 Aug 2016 20:07:41 +0000 (20:07 +0000)]
DO NOT MERGE CP vertex array test and warning fixes am:
c63640e53a -s ours am:
f840c5347f am:
0556e60e67 am:
da626715a4 am:
7d47fbfc18 -s ours am:
20df90f956 am:
e88b68aa9b
am:
82252671f0
Change-Id: Ibf2028d2670ace8e921de0888093fc068660ea70
Jarkko Pöyry [Mon, 1 Aug 2016 20:02:22 +0000 (20:02 +0000)]
Merge \\\\\\\"DO NOT MERGE CP vertex array test and warning fixes\\\\\\\" into marshmallow-cts-dev am:
b9c3777b77 -s ours am:
7bc41121c1 am:
3acfedf2ab am:
19de695b8d am:
f0e6d6563c -s ours am:
17c2446a15
am:
c0a305c1de
Change-Id: I1d9f8809a871c82b8ce12768d96341f12e18b94c
Jarkko Pyry [Mon, 1 Aug 2016 20:02:21 +0000 (20:02 +0000)]
DO NOT MERGE CP vertex array test and warning fixes am:
c63640e53a -s ours am:
f840c5347f am:
0556e60e67 am:
da626715a4 am:
7d47fbfc18 -s ours am:
20df90f956
am:
3186329afc
Change-Id: If80c96324676b388d583ab82776ffdfdaaec811d
Jarkko Pöyry [Mon, 1 Aug 2016 20:02:09 +0000 (20:02 +0000)]
Merge \\\\\\\"DO NOT MERGE CP vertex array test and warning fixes\\\\\\\" into marshmallow-cts-dev am:
b9c3777b77 -s ours am:
7bc41121c1 am:
3acfedf2ab am:
19de695b8d am:
f0e6d6563c -s ours am:
17c2446a15
am:
45a8f91070
Change-Id: I6cd3bdf830f1a56c412d22cde1dc12ae1a234b7a
Jarkko Pyry [Mon, 1 Aug 2016 20:02:08 +0000 (20:02 +0000)]
DO NOT MERGE CP vertex array test and warning fixes am:
c63640e53a -s ours am:
f840c5347f am:
0556e60e67 am:
da626715a4 am:
7d47fbfc18 -s ours am:
20df90f956
am:
e88b68aa9b
Change-Id: Iec7f64d8f9f536d7ad19727ce7a90750470613dd
Daniel Xie [Mon, 1 Aug 2016 19:56:15 +0000 (19:56 +0000)]
Merge \\\\\\"DO NOT MERGE CP vertex array test and warning fixes\\\\\\" into marshmallow-cts-dev am:
b9c3777b77 -s ours am:
7bc41121c1 am:
3acfedf2ab am:
19de695b8d am:
f0e6d6563c -s ours
am:
17c2446a15
Change-Id: I74429448014134828b925aea1f3c43e527aa5099
Jarkko Pöyry [Mon, 1 Aug 2016 19:56:13 +0000 (19:56 +0000)]
DO NOT MERGE CP vertex array test and warning fixes am:
c63640e53a -s ours am:
f840c5347f am:
0556e60e67 am:
da626715a4 am:
7d47fbfc18 -s ours
am:
20df90f956
Change-Id: I4629c90bb414665ef3f09ed95b63782a9c5b9b00
Daniel Xie [Mon, 1 Aug 2016 19:56:07 +0000 (19:56 +0000)]
Merge \\\\\\"DO NOT MERGE CP vertex array test and warning fixes\\\\\\" into marshmallow-cts-dev am:
b9c3777b77 -s ours am:
7bc41121c1 am:
3acfedf2ab am:
19de695b8d am:
f0e6d6563c -s ours
am:
17c2446a15
Change-Id: I091ea77ebbe15d9078a8974e10238f9f6a8a7390
Jarkko Pöyry [Mon, 1 Aug 2016 19:56:07 +0000 (19:56 +0000)]
DO NOT MERGE CP vertex array test and warning fixes am:
c63640e53a -s ours am:
f840c5347f am:
0556e60e67 am:
da626715a4 am:
7d47fbfc18 -s ours
am:
20df90f956
Change-Id: Ifc121c82244db33d7dab5ef04bd538c945764b86
Jarkko Pöyry [Mon, 1 Aug 2016 19:50:44 +0000 (19:50 +0000)]
Merge \\\\\"DO NOT MERGE CP vertex array test and warning fixes\\\\\" into marshmallow-cts-dev am:
b9c3777b77 -s ours am:
7bc41121c1 am:
3acfedf2ab am:
19de695b8d
am:
f0e6d6563c -s ours
Change-Id: I5bc855696a7dc32c808761aa1aacd7bbaf9534da
Jarkko Pyry [Mon, 1 Aug 2016 19:50:42 +0000 (19:50 +0000)]
DO NOT MERGE CP vertex array test and warning fixes am:
c63640e53a -s ours am:
f840c5347f am:
0556e60e67 am:
da626715a4
am:
7d47fbfc18 -s ours
Change-Id: Id6c5816b213a5b22a96e991a67bd4f2949624185
Daniel Xie [Mon, 1 Aug 2016 19:48:06 +0000 (19:48 +0000)]
Merge \\\\"DO NOT MERGE CP vertex array test and warning fixes\\\\" into marshmallow-cts-dev am:
b9c3777b77 -s ours am:
7bc41121c1 am:
3acfedf2ab
am:
19de695b8d
Change-Id: I88fe42c55f28a7e2bb3daa0551e191469a4032a0
Jarkko Pöyry [Mon, 1 Aug 2016 19:48:06 +0000 (19:48 +0000)]
DO NOT MERGE CP vertex array test and warning fixes am:
c63640e53a -s ours am:
f840c5347f am:
0556e60e67
am:
da626715a4
Change-Id: I1ea819ef29479058c52d9238af1b9b234e4bbb94
Jarkko Pöyry [Mon, 1 Aug 2016 19:45:36 +0000 (19:45 +0000)]
Merge \\\"DO NOT MERGE CP vertex array test and warning fixes\\\" into marshmallow-cts-dev am:
b9c3777b77 -s ours am:
7bc41121c1
am:
3acfedf2ab
Change-Id: Iad13015f9b3e5bca530712d578c59ca1312c22e7
Jarkko Pyry [Mon, 1 Aug 2016 19:45:35 +0000 (19:45 +0000)]
DO NOT MERGE CP vertex array test and warning fixes am:
c63640e53a -s ours am:
f840c5347f
am:
0556e60e67
Change-Id: Ic7e87a4e2f257670b0d12520a05133f8abd00416
Daniel Xie [Mon, 1 Aug 2016 19:43:07 +0000 (19:43 +0000)]
Merge \\"DO NOT MERGE CP vertex array test and warning fixes\\" into marshmallow-cts-dev am:
b9c3777b77 -s ours
am:
7bc41121c1
Change-Id: I4174ccb59db2b28655fd46307b9f620833f87316
Jarkko Pöyry [Mon, 1 Aug 2016 19:43:06 +0000 (19:43 +0000)]
DO NOT MERGE CP vertex array test and warning fixes am:
c63640e53a -s ours
am:
f840c5347f
Change-Id: Iedc552312320cdd37b65d986a58f2c7e20075d8a
Jarkko Pöyry [Mon, 1 Aug 2016 19:40:38 +0000 (19:40 +0000)]
Merge \"DO NOT MERGE CP vertex array test and warning fixes\" into marshmallow-cts-dev
am:
b9c3777b77 -s ours
Change-Id: I61fdf061a9d18682387f51d22589794ca2bd2004
Jarkko Pyry [Mon, 1 Aug 2016 19:40:37 +0000 (19:40 +0000)]
DO NOT MERGE CP vertex array test and warning fixes
am:
c63640e53a -s ours
Change-Id: I006f5d42f1e6e09d50a816b499748431c0970e14
Daniel Xie [Mon, 1 Aug 2016 19:36:29 +0000 (19:36 +0000)]
Merge "DO NOT MERGE CP vertex array test and warning fixes" into marshmallow-cts-dev
Chih-Hung Hsieh [Mon, 1 Aug 2016 19:35:35 +0000 (19:35 +0000)]
Fix misc-macro-parentheses warnings in deqp. am:
dc795cd4f3 am:
ca03927b03
am:
4c73adfb72
Change-Id: If6395dbd8cfd7340fc0fe97b8d434526b3e42cb1
Chih-Hung Hsieh [Mon, 1 Aug 2016 19:33:06 +0000 (19:33 +0000)]
Fix misc-macro-parentheses warnings in deqp. am:
dc795cd4f3
am:
ca03927b03
Change-Id: Icc94faaa49764ef1ba8849c9bbc64b57fc7d2fb0
Chih-Hung Hsieh [Mon, 1 Aug 2016 19:30:08 +0000 (19:30 +0000)]
Fix misc-macro-parentheses warnings in deqp.
am:
dc795cd4f3
Change-Id: I42e396cc490048d3b0a76f26bb4dc5c884857154
Chih-Hung Hsieh [Thu, 9 Jun 2016 00:45:40 +0000 (17:45 -0700)]
Fix misc-macro-parentheses warnings in deqp.
* Add parentheses around macro parameters beside binary operators.
* Add NOLINT to suppress wrong clang-tidy warnings.
Bug:
28705665
Change-Id: I8cab8cf2df6edb50806d9fd2324dfea31b127916
Daniel Xie [Thu, 28 Jul 2016 01:11:42 +0000 (01:11 +0000)]
Merge \\\\\\\\"Fix GLES2 format mismatch\\\\\\\\" into marshmallow-cts-dev am:
98dd6ac745 am:
514fc784d3 am:
d2cc27ecd9 am:
fc19d21caf am:
1fb5b8e2d7 am:
730e4b0592 am:
5b2c510e5d
am:
03e844fda9
Change-Id: I7a36136518f21ad99e2d44537b2026c149b74a3d
Stéphane Marchesin [Thu, 28 Jul 2016 01:11:40 +0000 (01:11 +0000)]
Fix GLES2 format mismatch am:
4b80682693 am:
17f31733fd am:
e3284ec499 am:
ea8731ac09 am:
44569cffe2 am:
a327815593 am:
e7d3f86b22
am:
eeb0911e79
Change-Id: I582a5bf74fe1bbe5ee0652f4ebafb220255a7ffe
Stéphane Marchesin [Thu, 28 Jul 2016 00:51:25 +0000 (00:51 +0000)]
Merge \\\\\\\"Fix GLES2 format mismatch\\\\\\\" into marshmallow-cts-dev am:
98dd6ac745 am:
514fc784d3 am:
d2cc27ecd9 am:
fc19d21caf am:
1fb5b8e2d7 am:
730e4b0592
am:
5b2c510e5d
Change-Id: I9a97e55de4f50d7d520cd9e37daa71f80323f137
Stphane Marchesin [Thu, 28 Jul 2016 00:51:24 +0000 (00:51 +0000)]
Fix GLES2 format mismatch am:
4b80682693 am:
17f31733fd am:
e3284ec499 am:
ea8731ac09 am:
44569cffe2 am:
a327815593
am:
e7d3f86b22
Change-Id: I3ce6e73edb5170beb900a89286ada08d321dc0d2
Collin Baker [Thu, 28 Jul 2016 00:30:21 +0000 (00:30 +0000)]
Texture filtering tests in Vulkan am:
8b0f318ec6 am:
4cc35b2fc5
am:
4d7aefa9a2
Change-Id: Ibe3e359cbe3deb65d3a955bb32e76f6396afacd5
Collin Baker [Thu, 28 Jul 2016 00:19:43 +0000 (00:19 +0000)]
Texture filtering tests in Vulkan am:
8b0f318ec6
am:
4cc35b2fc5
Change-Id: I9ad164ba8793a9c36398ed22cd7027ad3eaa664b
Collin Baker [Thu, 28 Jul 2016 00:17:19 +0000 (00:17 +0000)]
Texture filtering tests in Vulkan
am:
8b0f318ec6
Change-Id: I0e18edf968822609534f815dcafd6f1472549835
Stéphane Marchesin [Thu, 28 Jul 2016 00:14:23 +0000 (00:14 +0000)]
Merge \\\\\\\"Fix GLES2 format mismatch\\\\\\\" into marshmallow-cts-dev am:
98dd6ac745 am:
514fc784d3 am:
d2cc27ecd9 am:
fc19d21caf am:
1fb5b8e2d7 am:
730e4b0592
am:
19512b6573
Change-Id: Ifc173728aa83dcd753de8b6b61f26c795e15f7da
Stphane Marchesin [Thu, 28 Jul 2016 00:14:23 +0000 (00:14 +0000)]
Fix GLES2 format mismatch am:
4b80682693 am:
17f31733fd am:
e3284ec499 am:
ea8731ac09 am:
44569cffe2 am:
a327815593
am:
2a8a85901c
Change-Id: I8b334efd2d572b423bebf238886b61d5850e89ad
Daniel Xie [Thu, 28 Jul 2016 00:08:46 +0000 (00:08 +0000)]
Merge \\\\\\"Fix GLES2 format mismatch\\\\\\" into marshmallow-cts-dev am:
98dd6ac745 am:
514fc784d3 am:
d2cc27ecd9 am:
fc19d21caf am:
1fb5b8e2d7
am:
730e4b0592
Change-Id: I3d974c21212550c275d231d1602b0383907a7841
Stéphane Marchesin [Thu, 28 Jul 2016 00:08:45 +0000 (00:08 +0000)]
Fix GLES2 format mismatch am:
4b80682693 am:
17f31733fd am:
e3284ec499 am:
ea8731ac09 am:
44569cffe2
am:
a327815593
Change-Id: I76ea2b901a7be79ca50e5cadf6cf7936908ea5d3
Haixia Shi [Wed, 27 Jul 2016 23:32:22 +0000 (23:32 +0000)]
Increase no-data timeout to 5 seconds. am:
d00b71cbc3 am:
f8083c0977 am:
5e52d6630c am:
10a0d7d015 am:
2c65c609ed am:
3cb59cec28 am:
c82316692f
am:
8dae51d1ca
Change-Id: I8d0348466fb38570200a9d36c7d0bbcb667041e6
Daniel Xie [Wed, 27 Jul 2016 23:23:35 +0000 (23:23 +0000)]
Merge \\\\\\"Fix GLES2 format mismatch\\\\\\" into marshmallow-cts-dev am:
98dd6ac745 am:
514fc784d3 am:
d2cc27ecd9 am:
fc19d21caf am:
1fb5b8e2d7
am:
730e4b0592
Change-Id: I5b0941a50db29d9e57d2e0a7ddc6a514041a1ca0
Stéphane Marchesin [Wed, 27 Jul 2016 23:23:34 +0000 (23:23 +0000)]
Fix GLES2 format mismatch am:
4b80682693 am:
17f31733fd am:
e3284ec499 am:
ea8731ac09 am:
44569cffe2
am:
a327815593
Change-Id: Ia49d1a49f7d1909afaf9c01d1bd0d0be153c42fb
Stéphane Marchesin [Wed, 27 Jul 2016 23:06:33 +0000 (23:06 +0000)]
Merge \\\\\"Fix GLES2 format mismatch\\\\\" into marshmallow-cts-dev am:
98dd6ac745 am:
514fc784d3 am:
d2cc27ecd9 am:
fc19d21caf
am:
1fb5b8e2d7
Change-Id: I4c62d0a774b9b5ee7b1ce6dbbf3d8d255c27198e
Stphane Marchesin [Wed, 27 Jul 2016 23:06:32 +0000 (23:06 +0000)]
Fix GLES2 format mismatch am:
4b80682693 am:
17f31733fd am:
e3284ec499 am:
ea8731ac09
am:
44569cffe2
Change-Id: I68a1b6c0c24c0fc394bb20b877b98de12b6040a7
Daniel Xie [Wed, 27 Jul 2016 23:02:58 +0000 (23:02 +0000)]
Merge \\\\"Fix GLES2 format mismatch\\\\" into marshmallow-cts-dev am:
98dd6ac745 am:
514fc784d3 am:
d2cc27ecd9
am:
fc19d21caf
Change-Id: Ibdc12d7910e3e5b0d9ce08b92fc154d8e0fef40d
Stéphane Marchesin [Wed, 27 Jul 2016 23:02:57 +0000 (23:02 +0000)]
Fix GLES2 format mismatch am:
4b80682693 am:
17f31733fd am:
e3284ec499
am:
ea8731ac09
Change-Id: Iea9125f946b308e830450a27684a8055f350eef2
Haixia Shi [Wed, 27 Jul 2016 23:00:14 +0000 (23:00 +0000)]
Increase no-data timeout to 5 seconds. am:
d00b71cbc3 am:
f8083c0977 am:
5e52d6630c am:
10a0d7d015 am:
2c65c609ed am:
3cb59cec28
am:
c82316692f
Change-Id: I4012302cfb16f0a044f13435335c176cf725dc89
Stéphane Marchesin [Wed, 27 Jul 2016 22:57:28 +0000 (22:57 +0000)]
Merge \\\"Fix GLES2 format mismatch\\\" into marshmallow-cts-dev am:
98dd6ac745 am:
514fc784d3
am:
d2cc27ecd9
Change-Id: I5456eaaa1ff4f60db054e7f97649ef144d1ec4a1
Stphane Marchesin [Wed, 27 Jul 2016 22:57:28 +0000 (22:57 +0000)]
Fix GLES2 format mismatch am:
4b80682693 am:
17f31733fd
am:
e3284ec499
Change-Id: Ied7fb1bf46f929708ae6d91f8234e953c1d5980f
Daniel Xie [Wed, 27 Jul 2016 22:53:25 +0000 (22:53 +0000)]
Merge \\"Fix GLES2 format mismatch\\" into marshmallow-cts-dev am:
98dd6ac745
am:
514fc784d3
Change-Id: Ie29c74f6daf660ef0bbb99e01bcc62804eb9bff5
Stéphane Marchesin [Wed, 27 Jul 2016 22:53:24 +0000 (22:53 +0000)]
Fix GLES2 format mismatch am:
4b80682693
am:
17f31733fd
Change-Id: Ia5625e84621ed7b193d67391f278410b9bef83e0
Stéphane Marchesin [Wed, 27 Jul 2016 22:49:27 +0000 (22:49 +0000)]
Merge \"Fix GLES2 format mismatch\" into marshmallow-cts-dev
am:
98dd6ac745
Change-Id: I996941024609410453b5453ad249f73f1d710258
Stphane Marchesin [Wed, 27 Jul 2016 22:49:25 +0000 (22:49 +0000)]
Fix GLES2 format mismatch
am:
4b80682693
Change-Id: Ib0d76f35894ea035c01b77dfd6b484d6eab32ad3
Daniel Xie [Wed, 27 Jul 2016 22:43:00 +0000 (22:43 +0000)]
Merge "Fix GLES2 format mismatch" into marshmallow-cts-dev
Haixia Shi [Wed, 27 Jul 2016 22:33:23 +0000 (22:33 +0000)]
Increase no-data timeout to 5 seconds. am:
d00b71cbc3 am:
f8083c0977 am:
5e52d6630c am:
10a0d7d015 am:
2c65c609ed am:
3cb59cec28
am:
2af72c5fd8
Change-Id: I2e46a8f8f08cbbdfe5fb352ead7c955a75312511
Haixia Shi [Wed, 27 Jul 2016 22:31:52 +0000 (22:31 +0000)]
Increase no-data timeout to 5 seconds. am:
d00b71cbc3 am:
f8083c0977 am:
5e52d6630c am:
10a0d7d015 am:
2c65c609ed
am:
3cb59cec28
Change-Id: I32c6aa2b9f3c9c84af15ce4988aea29a17dee033
Haixia Shi [Wed, 27 Jul 2016 22:31:26 +0000 (22:31 +0000)]
Increase no-data timeout to 5 seconds. am:
d00b71cbc3 am:
f8083c0977 am:
5e52d6630c am:
10a0d7d015 am:
2c65c609ed
am:
3cb59cec28
Change-Id: I388780b7dddae5b3d0bcb17c1e5da4f7c1ed4d68
Haixia Shi [Wed, 27 Jul 2016 22:14:56 +0000 (22:14 +0000)]
Increase no-data timeout to 5 seconds. am:
d00b71cbc3 am:
f8083c0977 am:
5e52d6630c am:
10a0d7d015
am:
2c65c609ed
Change-Id: I8d6c3aa5769954ef723b3592429d2c7edbacc0cb
Haixia Shi [Wed, 27 Jul 2016 22:11:21 +0000 (22:11 +0000)]
Increase no-data timeout to 5 seconds. am:
d00b71cbc3 am:
f8083c0977 am:
5e52d6630c
am:
10a0d7d015
Change-Id: I8c79ba0f3ab1bec4adf08b3dc806117c9f4c4c37
Haixia Shi [Wed, 27 Jul 2016 22:06:23 +0000 (22:06 +0000)]
Increase no-data timeout to 5 seconds. am:
d00b71cbc3 am:
f8083c0977
am:
5e52d6630c
Change-Id: I079ecec07a8ec169a0fa974a87fa3fb2438c71a9
Haixia Shi [Wed, 27 Jul 2016 22:03:21 +0000 (22:03 +0000)]
Increase no-data timeout to 5 seconds. am:
d00b71cbc3
am:
f8083c0977
Change-Id: I72427dde877e29aa1b902628c50bc61099f6ba41
Haixia Shi [Wed, 27 Jul 2016 21:59:58 +0000 (21:59 +0000)]
Increase no-data timeout to 5 seconds.
am:
d00b71cbc3
Change-Id: I5a73e5e3cb1fd0a0c3b1552e36552c25bbf64271
Collin Baker [Mon, 25 Jul 2016 21:32:02 +0000 (14:32 -0700)]
Texture filtering tests in Vulkan
This is a framework for testing image sampling with explicit LOD in vulkan.
Change-Id: I36ea968d9e4624a76b9a918f5ab7e3d5a9039a55
Pablo Ceballos [Wed, 27 Jul 2016 17:57:22 +0000 (17:57 +0000)]
Merge \\\"Don\\\'t rely on framebuffer contents after eglSwapBuffers\\\" am:
e241ee2d69 am:
b10a8056a2
am:
734fb85f88
Change-Id: Icd73738dd6e2816c17ebd3b967949eb794238125
Pablo Ceballos [Wed, 27 Jul 2016 17:54:52 +0000 (17:54 +0000)]
Merge \\"Don\\'t rely on framebuffer contents after eglSwapBuffers\\" am:
e241ee2d69
am:
b10a8056a2
Change-Id: Id852a2bb756917c06fdc67d7c731b44652a5d468
Pablo Ceballos [Wed, 27 Jul 2016 17:51:54 +0000 (17:51 +0000)]
Merge \"Don\'t rely on framebuffer contents after eglSwapBuffers\"
am:
e241ee2d69
Change-Id: I6959680f3d3f5ad5036614b9ecbe4cb3f7423231
Pablo Ceballos [Wed, 27 Jul 2016 17:46:20 +0000 (17:46 +0000)]
Merge "Don't rely on framebuffer contents after eglSwapBuffers"
Pyry Haulos [Wed, 27 Jul 2016 17:03:21 +0000 (17:03 +0000)]
Update Android CTS mustpass am:
df293b49cd am:
41db7dc40e
am:
af4a755613
Change-Id: I6ce141f02caded2c299db158e5ee4a093874fa3f
Pyry Haulos [Wed, 27 Jul 2016 17:00:52 +0000 (17:00 +0000)]
Update Android CTS mustpass am:
df293b49cd
am:
41db7dc40e
Change-Id: I5a751ebdf686fbaf4da5122576ddd2048171e7c2
Pyry Haulos [Wed, 27 Jul 2016 16:58:22 +0000 (16:58 +0000)]
Update Android CTS mustpass
am:
df293b49cd
Change-Id: I56786f19ef0c27a4527e9773fa6017bbd24c6fd0
Pyry Haulos [Wed, 27 Jul 2016 15:42:16 +0000 (08:42 -0700)]
Update Android CTS mustpass
Change-Id: Icb869468a701a7ef664087ff401f80344719134f
Pyry Haulos [Wed, 27 Jul 2016 15:25:43 +0000 (15:25 +0000)]
Merge upstream vulkan-cts-1.0-dev into AOSP master am:
20a7a532b4 am:
79572f8a12
am:
525d453974
Change-Id: I875683c2153ab37659f1743efa41051749e7e16b
Pyry Haulos [Wed, 27 Jul 2016 15:23:14 +0000 (15:23 +0000)]
Merge upstream vulkan-cts-1.0-dev into AOSP master am:
20a7a532b4
am:
79572f8a12
Change-Id: I9c9083e9d318f487366e1d27955de721b72d7151
Pyry Haulos [Wed, 27 Jul 2016 15:20:13 +0000 (15:20 +0000)]
Merge upstream vulkan-cts-1.0-dev into AOSP master
am:
20a7a532b4
Change-Id: Iee33b99ac2a07a2233c6c187c946fa377c406245
Pyry Haulos [Wed, 27 Jul 2016 01:33:33 +0000 (01:33 +0000)]
DO NOT MERGE revert CTS integration build changes am:
62875f6b9f -s ours am:
38cac339a5 -s ours
am:
15a29b8c84
Change-Id: I3004ecf49b768501d65ca3a9620a624e391689fa
Pyry Haulos [Wed, 27 Jul 2016 01:29:12 +0000 (01:29 +0000)]
DO NOT MERGE revert CTS integration build changes am:
62875f6b9f -s ours
am:
38cac339a5 -s ours
Change-Id: I129d3c7c230e9ab6f189fc1bdd6b165021fd420d
Pyry Haulos [Wed, 27 Jul 2016 01:22:14 +0000 (01:22 +0000)]
DO NOT MERGE revert CTS integration build changes
am:
62875f6b9f -s ours
Change-Id: If0f42949eed1f1b54d2a043d9f3be0506030a8dc
Pablo Ceballos [Thu, 16 Jun 2016 18:58:18 +0000 (11:58 -0700)]
Don't rely on framebuffer contents after eglSwapBuffers
Bug
27129258
Change-Id: Ic1c58d37c665dc9c35daa2b05ca40ecb969ad5dc
Pyry Haulos [Mon, 25 Jul 2016 22:23:26 +0000 (15:23 -0700)]
Merge upstream vulkan-cts-1.0-dev into AOSP master
Pyry Haulos [Tue, 26 Jul 2016 23:26:54 +0000 (16:26 -0700)]
DO NOT MERGE revert CTS integration build changes
Reverts CTS integration makefiles to match marshmallow-cts-dev
Change-Id: I2b99024cee587bc823003df5aef0b555c265e381
Haixia Shi [Tue, 26 Jul 2016 22:08:02 +0000 (15:08 -0700)]
Increase no-data timeout to 5 seconds.
On some low-end hardware we are observing the no-data timeout being exceeded
with no genuine hangs. Some tests take up to 1.7 seconds to complete. By
generously increasing this timeout we can eliminate flakes on slow devices
without any negative side-effects.
Bug:
29870344
Change-Id: I0a3165f26aefb4cdd18acb1ca0dd0210d7fdba69
Pyry Haulos [Mon, 25 Jul 2016 22:17:36 +0000 (15:17 -0700)]
Add new files to Android.mk
Pyry Haulos [Mon, 25 Jul 2016 20:48:35 +0000 (20:48 +0000)]
Merge \\"Add mipmap.2d.projected tests back to mustpass\\" am:
0a874f4a2c
am:
0a50a55ba5
Change-Id: Id49fa0c9427c52cfd189bcae0e29c932eec5e06a
Julius D'souza [Mon, 25 Jul 2016 20:48:35 +0000 (20:48 +0000)]
Merge \\"switch to default Trade Federation ABI class\\" am:
e3235bbd8d
am:
98e547b2b2
Change-Id: Ibb2546ccecc17e683da9756685b09dc24b73404a
Pyry Haulos [Mon, 25 Jul 2016 20:48:34 +0000 (20:48 +0000)]
Merge changes I219c2b3a,I7af6fe67 am:
01cc5733ba
am:
7d8ddf4d02
Change-Id: I4a2e8bb5d0a016f094aa5c40b6717a14c4c6166f
Pyry Haulos [Mon, 25 Jul 2016 20:48:34 +0000 (20:48 +0000)]
Fix license header in testlog.xls am:
e1c6368ea8
am:
0c8837f1e3
Change-Id: I1523683dd76fc5d4a53facd22436ecaa920d725c
Julien Desprez [Mon, 25 Jul 2016 20:48:01 +0000 (20:48 +0000)]
Merge \\\"Fix build with new Interface am:
af51a2acde am:
3b9fe61b5e\\\" into nyc-mr1-dev-plus-aosp am:
114f46a0dc am:
2dc4d39d70
am:
a198339517
Change-Id: Ia3b663687e56eb2520fabaa73fe6f90a965f0d47
Julien Desprez [Mon, 25 Jul 2016 20:48:01 +0000 (20:48 +0000)]
Fix build with new Interface am:
af51a2acde am:
cee1bcdedd am:
93f94f0d2e am:
244b38f434
am:
6829dca527
Change-Id: I6feb4c17c6c08ff702b5fc2d6e846b1f18c22cc8
Julien Desprez [Mon, 25 Jul 2016 20:48:00 +0000 (20:48 +0000)]
Update TF interface for filters am:
fa50dbbefa am:
0a44c2b7c9 am:
797bdc12ba am:
88e3da40a0
am:
ef8287e6f6
Change-Id: Iba685cc0d6276b92a8a0a41d34c5db46c4a5cb66
Julien Desprez [Mon, 25 Jul 2016 20:48:00 +0000 (20:48 +0000)]
Update TF interface for filters am:
fa50dbbefa am:
bec18ccfde am:
047ff644a7 am:
f5907ad07c
am:
ba1e8d722a
Change-Id: I25577817e6510c3f4d713d7c90dc20de3d62efbd
Mika Isojrvi [Mon, 25 Jul 2016 20:47:59 +0000 (20:47 +0000)]
Merge goog/master@c8da37c into stage-aosp- am:
38365a1634 am:
e1fb5fe7df am:
82d89acd57 am:
dd0641f583
am:
061e03a696
Change-Id: Ic5f0b749913102cbb7b69851568ebfce7ca5cdcf
Pyry Haulos [Mon, 25 Jul 2016 20:45:43 +0000 (20:45 +0000)]
Merge \"Add mipmap.2d.projected tests back to mustpass\"
am:
0a874f4a2c
Change-Id: I1df077b8df4c5b875c0f13bba18ee26706cfb440
Julius D'souza [Mon, 25 Jul 2016 20:45:41 +0000 (20:45 +0000)]
Merge \"switch to default Trade Federation ABI class\"
am:
e3235bbd8d
Change-Id: I484047b612b8231c9184d7718c9fac1ee0c91f68
Mika Isojärvi [Mon, 25 Jul 2016 20:45:40 +0000 (20:45 +0000)]
Merge changes I219c2b3a,I7af6fe67
am:
01cc5733ba
Change-Id: Ia8136080aa1caa890c325ed4ed538e3f08456d21