Daniel Xie [Tue, 13 Sep 2016 17:08:45 +0000 (17:08 +0000)]
Merge changes I85492417,I93389a2c into nougat-cts-dev am:
37eaa88ac2 am:
a7dc5ef89b am:
4b783d2db9
am:
00ca87ab81
Change-Id: Iaa554a2995f23acf71f7606d0ddf00cb8fc44c26
Pyry Haulos [Tue, 13 Sep 2016 17:08:42 +0000 (17:08 +0000)]
CP: Limit VkInstance count in object_management.multithreaded* am:
1735b7bcaa am:
d030a8fd2b am:
fc557472cb
am:
b4ba085af5
Change-Id: Ic774a7addb3fca63ae8f7eee3522b44021c31c91
Pyry Haulos [Tue, 13 Sep 2016 17:08:40 +0000 (17:08 +0000)]
CP: Do not test VkDevice, VkInstance creation OOM paths in WSI tests am:
80ddee1f9b am:
96a5fefcf2 am:
f8e9fa9d52
am:
33bde8aa3e
Change-Id: I04b011eca94b6499a2782ad55288b7561491ee72
Daniel Xie [Tue, 13 Sep 2016 17:03:12 +0000 (17:03 +0000)]
Merge changes I85492417,I93389a2c into nougat-cts-dev am:
37eaa88ac2 am:
a7dc5ef89b
am:
4b783d2db9
Change-Id: I63638f6b6e7af34645c210aa5eade81b348b28ee
Pyry Haulos [Tue, 13 Sep 2016 17:03:11 +0000 (17:03 +0000)]
CP: Limit VkInstance count in object_management.multithreaded* am:
1735b7bcaa am:
d030a8fd2b
am:
fc557472cb
Change-Id: I2386af8dc92448fd20065e81872a372aaccdbde8
Pyry Haulos [Tue, 13 Sep 2016 17:03:09 +0000 (17:03 +0000)]
CP: Do not test VkDevice, VkInstance creation OOM paths in WSI tests am:
80ddee1f9b am:
96a5fefcf2
am:
f8e9fa9d52
Change-Id: I291135b80c1dda538fc403424236b18487e943a3
Daniel Xie [Tue, 13 Sep 2016 17:00:16 +0000 (17:00 +0000)]
Merge changes I85492417,I93389a2c into nougat-cts-dev am:
37eaa88ac2
am:
a7dc5ef89b
Change-Id: I50907e813c211098054846237debca1520e5607e
Pyry Haulos [Tue, 13 Sep 2016 17:00:14 +0000 (17:00 +0000)]
CP: Limit VkInstance count in object_management.multithreaded* am:
1735b7bcaa
am:
d030a8fd2b
Change-Id: If99d17e9768c2bb26a87157d26ae2723680c0989
Pyry Haulos [Tue, 13 Sep 2016 17:00:12 +0000 (17:00 +0000)]
CP: Do not test VkDevice, VkInstance creation OOM paths in WSI tests am:
80ddee1f9b
am:
96a5fefcf2
Change-Id: Iae8fea4bb50ddded802ac4e3bf57b258c3979262
Daniel Xie [Tue, 13 Sep 2016 16:57:15 +0000 (16:57 +0000)]
Merge changes I85492417,I93389a2c into nougat-cts-dev
am:
37eaa88ac2
Change-Id: Ifd718e72afa57309ea88cfb09f9073cd87c1c116
Pyry Haulos [Tue, 13 Sep 2016 16:57:15 +0000 (16:57 +0000)]
CP: Limit VkInstance count in object_management.multithreaded*
am:
1735b7bcaa
Change-Id: I39a1830375fcf215ef30cfc4fbb8571c482f7a7b
Pyry Haulos [Tue, 13 Sep 2016 16:57:13 +0000 (16:57 +0000)]
CP: Do not test VkDevice, VkInstance creation OOM paths in WSI tests
am:
80ddee1f9b
Change-Id: I425d8b909cf1323888bf06293822fcb958050806
Daniel Xie [Tue, 13 Sep 2016 16:42:54 +0000 (16:42 +0000)]
Merge changes I85492417,I93389a2c into nougat-cts-dev
* changes:
CP: Limit VkInstance count in object_management.multithreaded*
CP: Do not test VkDevice, VkInstance creation OOM paths in WSI tests
Unsuk Jung [Tue, 30 Aug 2016 21:12:42 +0000 (21:12 +0000)]
Merge "Don't require supported binary formats in negative tests." into marshmallow-cts-dev am:
3aa5258338 am:
26449babc6 am:
3b524eaf98 am:
b5668f25eb am:
33a50549c0 am:
645b74d517 am:
782593182a
am:
71dc8179e6
Change-Id: Ibee549e50c575a5b180996e0fcba01b6d38f1e86
Haixia Shi [Tue, 30 Aug 2016 21:12:42 +0000 (21:12 +0000)]
Don't require supported binary formats in negative tests. am:
7cd59a4409 am:
d7b53b803a am:
da87d1a895 am:
fbd60126d8 am:
9f9397285c am:
b275e16083 am:
d32629cd9c
am:
0c72826968
Change-Id: I30f9945a54ea15cee7d98c0139cf6e8dfa6b0769
Unsuk Jung [Tue, 30 Aug 2016 21:09:43 +0000 (21:09 +0000)]
Merge "Don't require supported binary formats in negative tests." into marshmallow-cts-dev am:
3aa5258338 am:
26449babc6 am:
3b524eaf98 am:
b5668f25eb am:
33a50549c0 am:
645b74d517
am:
782593182a
Change-Id: Idb03772bbb5715e3454a472c8e4407e858c53123
Haixia Shi [Tue, 30 Aug 2016 21:09:42 +0000 (21:09 +0000)]
Don't require supported binary formats in negative tests. am:
7cd59a4409 am:
d7b53b803a am:
da87d1a895 am:
fbd60126d8 am:
9f9397285c am:
b275e16083
am:
d32629cd9c
Change-Id: Iebb95b6a1518b4a2589e9b0e894c2a18327d8870
Unsuk Jung [Tue, 30 Aug 2016 21:06:42 +0000 (21:06 +0000)]
Merge "Don't require supported binary formats in negative tests." into marshmallow-cts-dev am:
3aa5258338 am:
26449babc6 am:
3b524eaf98 am:
b5668f25eb am:
33a50549c0
am:
645b74d517
Change-Id: I75c9aacb5f1c248523c27ebc6b0737da273ad54d
Haixia Shi [Tue, 30 Aug 2016 21:06:42 +0000 (21:06 +0000)]
Don't require supported binary formats in negative tests. am:
7cd59a4409 am:
d7b53b803a am:
da87d1a895 am:
fbd60126d8 am:
9f9397285c
am:
b275e16083
Change-Id: I1ac2f6680ab142722ddd93b8ceb0ececb73bf43e
Unsuk Jung [Tue, 30 Aug 2016 21:04:16 +0000 (21:04 +0000)]
Merge "Don't require supported binary formats in negative tests." into marshmallow-cts-dev am:
3aa5258338 am:
26449babc6 am:
3b524eaf98 am:
b5668f25eb
am:
33a50549c0
Change-Id: I53640d8db345a91f4d5b71e4ee7b689915da033e
Haixia Shi [Tue, 30 Aug 2016 21:04:14 +0000 (21:04 +0000)]
Don't require supported binary formats in negative tests. am:
7cd59a4409 am:
d7b53b803a am:
da87d1a895 am:
fbd60126d8
am:
9f9397285c
Change-Id: Ia93cba686bb0d6cda7ab48762c1a5ea49cb745e8
Unsuk Jung [Tue, 30 Aug 2016 21:01:11 +0000 (21:01 +0000)]
Merge "Don't require supported binary formats in negative tests." into marshmallow-cts-dev am:
3aa5258338 am:
9ebe97f0a6 am:
7172745842 am:
9cb847787f
am:
572542e25a
Change-Id: Id8fe5f28839175ca7a1b2eb091f3bf9fc941119d
Haixia Shi [Tue, 30 Aug 2016 21:01:11 +0000 (21:01 +0000)]
Don't require supported binary formats in negative tests. am:
7cd59a4409 am:
635f454667 am:
cb0a43030f am:
aa3b3981d6
am:
1c5c354bea
Change-Id: If59721c7832d4cf6b445581b06f033b431c150c7
Unsuk Jung [Tue, 30 Aug 2016 21:01:10 +0000 (21:01 +0000)]
Merge "Don't require supported binary formats in negative tests." into marshmallow-cts-dev am:
3aa5258338 am:
26449babc6 am:
3b524eaf98
am:
b5668f25eb
Change-Id: Ib611d0835e5820100d4a7b72ec27822d65dd3a30
Haixia Shi [Tue, 30 Aug 2016 21:01:10 +0000 (21:01 +0000)]
Don't require supported binary formats in negative tests. am:
7cd59a4409 am:
d7b53b803a am:
da87d1a895
am:
fbd60126d8
Change-Id: Ic9a257d5f7111e05747599ac94492a6677bbf613
Unsuk Jung [Tue, 30 Aug 2016 20:58:10 +0000 (20:58 +0000)]
Merge "Don't require supported binary formats in negative tests." into marshmallow-cts-dev am:
3aa5258338 am:
26449babc6
am:
3b524eaf98
Change-Id: I7408b44cef1b4b55b22e422cfbd21ff490cee99b
Haixia Shi [Tue, 30 Aug 2016 20:58:10 +0000 (20:58 +0000)]
Don't require supported binary formats in negative tests. am:
7cd59a4409 am:
d7b53b803a
am:
da87d1a895
Change-Id: Iff769a80a773618376215027cf9979fd9c1689c5
Unsuk Jung [Tue, 30 Aug 2016 20:55:42 +0000 (20:55 +0000)]
Merge "Don't require supported binary formats in negative tests." into marshmallow-cts-dev am:
3aa5258338 am:
9ebe97f0a6 am:
7172745842
am:
9cb847787f
Change-Id: Ic7841fc2cb15c69fb8c009a491c8eca61f4f6631
Haixia Shi [Tue, 30 Aug 2016 20:55:41 +0000 (20:55 +0000)]
Don't require supported binary formats in negative tests. am:
7cd59a4409 am:
635f454667 am:
cb0a43030f
am:
aa3b3981d6
Change-Id: I816ab80f8b94ee35d6f86a8d54bfb4dd230b3339
Unsuk Jung [Tue, 30 Aug 2016 20:52:41 +0000 (20:52 +0000)]
Merge "Don't require supported binary formats in negative tests." into marshmallow-cts-dev am:
3aa5258338 am:
9ebe97f0a6
am:
7172745842
Change-Id: I511cf23bf6d0741fa06006ce8cbfa2b52aa4a447
Unsuk Jung [Tue, 30 Aug 2016 20:52:40 +0000 (20:52 +0000)]
Merge "Don't require supported binary formats in negative tests." into marshmallow-cts-dev am:
3aa5258338
am:
26449babc6
Change-Id: Iba176fd150b1ef2a99899889a0883839f6c1c5fe
Haixia Shi [Tue, 30 Aug 2016 20:52:40 +0000 (20:52 +0000)]
Don't require supported binary formats in negative tests. am:
7cd59a4409
am:
d7b53b803a
Change-Id: I8425b099bdc9ccad4411a2697bb862dbb4e9b4fd
Haixia Shi [Tue, 30 Aug 2016 20:52:40 +0000 (20:52 +0000)]
Don't require supported binary formats in negative tests. am:
7cd59a4409 am:
635f454667
am:
cb0a43030f
Change-Id: I42b6df861ebcd8b830504c2c10bec31b6d7dde3f
Unsuk Jung [Tue, 30 Aug 2016 20:47:13 +0000 (20:47 +0000)]
Merge "Don't require supported binary formats in negative tests." into marshmallow-cts-dev am:
3aa5258338
am:
9ebe97f0a6
Change-Id: Ie18b88cd488f3a3ac39808551641ed271706c9d7
Unsuk Jung [Tue, 30 Aug 2016 20:47:12 +0000 (20:47 +0000)]
Merge "Don't require supported binary formats in negative tests." into marshmallow-cts-dev
am:
3aa5258338
Change-Id: I623faec4a5e3a54b19318e0e3f8b8c5c577e05c7
Haixia Shi [Tue, 30 Aug 2016 20:47:12 +0000 (20:47 +0000)]
Don't require supported binary formats in negative tests. am:
7cd59a4409
am:
635f454667
Change-Id: I08b511553f4770b9dca819f5d66a80f5f7bad189
Haixia Shi [Tue, 30 Aug 2016 20:47:11 +0000 (20:47 +0000)]
Don't require supported binary formats in negative tests.
am:
7cd59a4409
Change-Id: I29319033c246fdeb96aef437d9074bcaf2a80ab6
Unsuk Jung [Tue, 30 Aug 2016 20:44:03 +0000 (20:44 +0000)]
Merge "Don't require supported binary formats in negative tests." into marshmallow-cts-dev
am:
3aa5258338
Change-Id: I8cb9cdf8f87cacaa2cb4c586953f884a3cfee098
Haixia Shi [Tue, 30 Aug 2016 20:44:02 +0000 (20:44 +0000)]
Don't require supported binary formats in negative tests.
am:
7cd59a4409
Change-Id: If08ea28912fe10ddc570841c8862d0918b1c224d
Unsuk Jung [Tue, 30 Aug 2016 20:39:55 +0000 (20:39 +0000)]
Merge "Don't require supported binary formats in negative tests." into marshmallow-cts-dev
Pyry Haulos [Thu, 11 Aug 2016 21:14:23 +0000 (14:14 -0700)]
CP: Limit VkInstance count in object_management.multithreaded*
Bug:
30811856
(cherry picked from commit
fe2c3850aa70fd4ad253856de08e49f241e0fc90)
Change-Id: I854924178a7732eae44fd140340490c453fe3a03
Pyry Haulos [Thu, 18 Aug 2016 14:22:00 +0000 (15:22 +0100)]
CP: Do not test VkDevice, VkInstance creation OOM paths in WSI tests
VkInstance and VkDevice creation OOM simulation is done already in
dEQP-VK.api.object_management.alloc_callback fail and repeating testing
in WSI tests just wastes time.
Since we want to trigger OOM even if implementation calls into instance-
or device-level callbacks, this is done by setting a mode in
DeterministicFailAllocator that stops alloc counting and failure
simulation.
Bug:
30811856
(cherry picked from commit
2dd2c2dc560092c80b636551237758b62fae78d7)
Change-Id: I93389a2c6b85f2dd8407824afb25d68770d4e6bd
Daniel Xie [Thu, 25 Aug 2016 23:16:34 +0000 (23:16 +0000)]
Merge "DO NOT MERGE CP vertex array test and warning fixes" into marshmallow-cts-dev am:
b9c3777b77 -s ours am:
245bd3ffc4 -s ours am:
26f19c81f9 am:
a39ebfe9c3
am:
0e802c4e0e
Change-Id: I31ae7a7c36335ae75c48e50ec5a7096dc43e6acc
Jarkko Pyry [Thu, 25 Aug 2016 23:16:34 +0000 (23:16 +0000)]
DO NOT MERGE CP vertex array test and warning fixes am:
c63640e53a -s ours am:
b136cc9a59 -s ours am:
92c0bc5e13 am:
fa9b0a2d1d
am:
54c18e5ac4
Change-Id: I4f6f9bcd89add6a32b18ccaa56f0ead88ac3cbd2
Daniel Xie [Thu, 25 Aug 2016 23:16:33 +0000 (23:16 +0000)]
Merge "Fix GLES2 format mismatch" into marshmallow-cts-dev am:
98dd6ac745 am:
5dee7d519c am:
ad2ff2cee6 am:
1c0e65455b
am:
bfb286324f
Change-Id: Ie7b73a468c410bbbba70510d91e30bda1e23d977
Stphane Marchesin [Thu, 25 Aug 2016 23:16:33 +0000 (23:16 +0000)]
Fix GLES2 format mismatch am:
4b80682693 am:
9a9c641a84 am:
1369e6796f am:
2021e578a5
am:
e99b668de1
Change-Id: I2f4fcbed697cc61bbc7bb90b59646f0bad10701f
Haixia Shi [Thu, 25 Aug 2016 23:16:32 +0000 (23:16 +0000)]
Increase no-data timeout to 5 seconds. am:
d00b71cbc3 am:
a7afa30111 am:
dbeebd4714 am:
bf408ea638
am:
4fbb89056a
Change-Id: I24f8db4297aea98c5e66607cbe6704d6fd3490d5
Daniel Xie [Thu, 25 Aug 2016 22:51:59 +0000 (22:51 +0000)]
Merge "DO NOT MERGE CP vertex array test and warning fixes" into marshmallow-cts-dev am:
b9c3777b77 -s ours am:
245bd3ffc4 -s ours am:
26f19c81f9
am:
a39ebfe9c3
Change-Id: Idd77a0b566540b717ea80685af6f3aae84aed0b7
Jarkko Pyry [Thu, 25 Aug 2016 22:51:59 +0000 (22:51 +0000)]
DO NOT MERGE CP vertex array test and warning fixes am:
c63640e53a -s ours am:
b136cc9a59 -s ours am:
92c0bc5e13
am:
fa9b0a2d1d
Change-Id: Ife742cdd47f8d4635225fe4fdd35acd3be5d5af9
Daniel Xie [Thu, 25 Aug 2016 22:51:58 +0000 (22:51 +0000)]
Merge "Fix GLES2 format mismatch" into marshmallow-cts-dev am:
98dd6ac745 am:
5dee7d519c am:
ad2ff2cee6
am:
1c0e65455b
Change-Id: If0b269aea3dd7f0fafde2fdf991c4bc10d436bff
Stphane Marchesin [Thu, 25 Aug 2016 22:51:58 +0000 (22:51 +0000)]
Fix GLES2 format mismatch am:
4b80682693 am:
9a9c641a84 am:
1369e6796f
am:
2021e578a5
Change-Id: I6171505266ec0b86adb02b088d885b2cbac6f40b
Haixia Shi [Thu, 25 Aug 2016 22:51:57 +0000 (22:51 +0000)]
Increase no-data timeout to 5 seconds. am:
d00b71cbc3 am:
a7afa30111 am:
dbeebd4714
am:
bf408ea638
Change-Id: I5f4fd18c2e4b146b4c3c6a59da54462a13160b96
Daniel Xie [Thu, 25 Aug 2016 22:29:40 +0000 (22:29 +0000)]
Merge "DO NOT MERGE CP vertex array test and warning fixes" into marshmallow-cts-dev am:
b9c3777b77 -s ours am:
245bd3ffc4 -s ours
am:
26f19c81f9
Change-Id: I5cfe0317438eb71f82065ac482572e856174ab17
Jarkko Pyry [Thu, 25 Aug 2016 22:29:39 +0000 (22:29 +0000)]
DO NOT MERGE CP vertex array test and warning fixes am:
c63640e53a -s ours am:
b136cc9a59 -s ours
am:
92c0bc5e13
Change-Id: I24aa2d0710247781cec60f9c1910ea5c49f4ff67
Daniel Xie [Thu, 25 Aug 2016 22:29:39 +0000 (22:29 +0000)]
Merge "Fix GLES2 format mismatch" into marshmallow-cts-dev am:
98dd6ac745 am:
5dee7d519c
am:
ad2ff2cee6
Change-Id: I2c5b9b21296f89892cb2238aebbd9326a55114e2
Stphane Marchesin [Thu, 25 Aug 2016 22:29:38 +0000 (22:29 +0000)]
Fix GLES2 format mismatch am:
4b80682693 am:
9a9c641a84
am:
1369e6796f
Change-Id: I29c8bc4b858cbcfc394891eb7cdc25b7f544e87d
Haixia Shi [Thu, 25 Aug 2016 22:29:38 +0000 (22:29 +0000)]
Increase no-data timeout to 5 seconds. am:
d00b71cbc3 am:
a7afa30111
am:
dbeebd4714
Change-Id: I86f6af5a7cee3391c06e020b3f8a9a8d0eef768f
Daniel Xie [Thu, 25 Aug 2016 22:04:10 +0000 (22:04 +0000)]
Merge "DO NOT MERGE CP vertex array test and warning fixes" into marshmallow-cts-dev am:
b9c3777b77 -s ours
am:
245bd3ffc4 -s ours
Change-Id: Ice096b7549e78143f62fb4491d600b4d4e1c208b
Jarkko Pyry [Thu, 25 Aug 2016 22:04:09 +0000 (22:04 +0000)]
DO NOT MERGE CP vertex array test and warning fixes am:
c63640e53a -s ours
am:
b136cc9a59 -s ours
Change-Id: Id1a15ed9baa652984a35cade94fe3b47357314f6
Daniel Xie [Thu, 25 Aug 2016 22:04:07 +0000 (22:04 +0000)]
Merge "Fix GLES2 format mismatch" into marshmallow-cts-dev am:
98dd6ac745
am:
5dee7d519c
Change-Id: Ibcb76009f261152e15569719e5f776bc48207f15
Stphane Marchesin [Thu, 25 Aug 2016 22:04:05 +0000 (22:04 +0000)]
Fix GLES2 format mismatch am:
4b80682693
am:
9a9c641a84
Change-Id: I9a55d673f77d5a195cee11cddaaf0d8c06cacf2b
Haixia Shi [Thu, 25 Aug 2016 22:04:03 +0000 (22:04 +0000)]
Increase no-data timeout to 5 seconds. am:
d00b71cbc3
am:
a7afa30111
Change-Id: Ic0a0405b7e0bdf637875b136f9fc51cd955a3c67
Haixia Shi [Thu, 25 Aug 2016 21:24:06 +0000 (14:24 -0700)]
Don't require supported binary formats in negative tests.
Bug:
26906411
Change-Id: Ic1b50096695fbcd64d6af312d56f12c4381a5b7a
Daniel Xie [Thu, 25 Aug 2016 20:52:41 +0000 (20:52 +0000)]
Merge "DO NOT MERGE CP vertex array test and warning fixes" into marshmallow-cts-dev
am:
b9c3777b77 -s ours
Change-Id: I08bbe10aebbbd22e20b7fc98307be51f7629a353
Jarkko Pyry [Thu, 25 Aug 2016 20:52:40 +0000 (20:52 +0000)]
DO NOT MERGE CP vertex array test and warning fixes
am:
c63640e53a -s ours
Change-Id: If7c81a04a11470c6690daa793dedb3affaaeeb79
Daniel Xie [Thu, 25 Aug 2016 20:52:40 +0000 (20:52 +0000)]
Merge "Fix GLES2 format mismatch" into marshmallow-cts-dev
am:
98dd6ac745
Change-Id: I849a65a2f31bf0203935d3c73369c3e777a71c66
Stphane Marchesin [Thu, 25 Aug 2016 20:52:39 +0000 (20:52 +0000)]
Fix GLES2 format mismatch
am:
4b80682693
Change-Id: I7495cac0e459bbe38d9a38b4fb66bcbf9140c844
Haixia Shi [Thu, 25 Aug 2016 20:52:39 +0000 (20:52 +0000)]
Increase no-data timeout to 5 seconds.
am:
d00b71cbc3
Change-Id: Ifeac2af6683b130a36ba69e5b8aee95092df1d14
Aaron Holden [Tue, 23 Aug 2016 20:44:21 +0000 (20:44 +0000)]
Merge "Copy collect-tests-only option in DeqpTestRunner" into nyc-mr1-dev
am:
b9152fed9f
Change-Id: I7af2707f5b48af288391aa8534a855e38bd758b5
Aaron Holden [Tue, 23 Aug 2016 20:44:21 +0000 (20:44 +0000)]
Copy collect-tests-only option in DeqpTestRunner
am:
ab73207152
Change-Id: Ie147549a6bb24b1b34f52f1d255dd83fcc363be9
Aaron Holden [Tue, 23 Aug 2016 20:37:40 +0000 (20:37 +0000)]
Merge "Copy collect-tests-only option in DeqpTestRunner" into nyc-mr1-dev
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: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
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
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
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
projects / platform / upstream / VK-GL-CTS.git / log