Daniel Xie [Tue, 13 Sep 2016 17:02:17 +0000 (17:02 +0000)]
Merge "CP: Reduce max iter count in alloc_callback_fail.device" into nougat-cts-dev am:
a268fcbaff
am:
a489f7548d
Change-Id: I4077e41f0db49d3514d60f616d6370023a0ef01b
Pyry Haulos [Tue, 13 Sep 2016 17:02:16 +0000 (17:02 +0000)]
CP: Reduce max iter count in alloc_callback_fail.device am:
ef5688dda6
am:
69c9f158f3
Change-Id: Ib2bca226b671198635c2db69cc6b57b9a4f07a36
Daniel Xie [Tue, 13 Sep 2016 17:01:15 +0000 (17:01 +0000)]
Merge changes I212a8bc2,I476b6586 into nougat-cts-dev am:
83683a367f
am:
b97e86700f
Change-Id: Ib25afbf03262430b1d6f6e9a15975354f45ab4ad
Pyry Haulos [Tue, 13 Sep 2016 17:01:11 +0000 (17:01 +0000)]
DO NOT MERGE Allow old behavior in image format property tests am:
0825a289c0 -s ours
am:
29574ad7e7
Change-Id: Ibbc02b9eed0315de346b82ef6d245cc293689e5f
Nanley Chery [Tue, 13 Sep 2016 17:01:09 +0000 (17:01 +0000)]
CP: Fix required sample count tests am:
f6a815214a
am:
dd22d24f36
Change-Id: I0e0954b624aa67877604fae568ae2574bc11b8db
Daniel Xie [Tue, 13 Sep 2016 17:01:09 +0000 (17:01 +0000)]
Merge "CP: Fix ext check in EXT_draw_buffers_indexed negative tests" into nougat-cts-dev am:
f594c550af
am:
c961253471
Change-Id: I61e7c246383826df1389a94b0c762ffd1e4627e7
Pyry Haulos [Tue, 13 Sep 2016 17:01:08 +0000 (17:01 +0000)]
CP: Fix ext check in EXT_draw_buffers_indexed negative tests am:
3962010752
am:
f44a35c51b
Change-Id: I674b1ba62799494efe8f1fc4af65773c4481743e
Daniel Xie [Tue, 13 Sep 2016 17:01:08 +0000 (17:01 +0000)]
Merge "CP: Fix geometry shader support check" into nougat-cts-dev am:
54d4c9f476
am:
37f5919c34
Change-Id: Ia798ebba97cba3ba1d1d6e8ab9cdb196ba8c275f
Pyry Haulos [Tue, 13 Sep 2016 17:01:07 +0000 (17:01 +0000)]
CP: Fix geometry shader support check am:
0da63cfe1d
am:
705c0dd3b0
Change-Id: I9d01b24328e40920358e4a38f0c351ea3872cb08
Daniel Xie [Tue, 13 Sep 2016 17:00:17 +0000 (17:00 +0000)]
Merge "CP: Check and enable VK_KHR_sampler_mirror_clamp_to_edge" into nougat-cts-dev am:
b03302d214
am:
c26f38fd47
Change-Id: I1f69d5f92f8cb83f7b0bce5072789909fe769419
Pyry Haulos [Tue, 13 Sep 2016 17:00:17 +0000 (17:00 +0000)]
CP: Check and enable VK_KHR_sampler_mirror_clamp_to_edge am:
66ee615c37
am:
b040934957
Change-Id: I75cd33c64be34d326d72c5f709b180e43044a496
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:58:31 +0000 (16:58 +0000)]
Merge "CP: Reduce max iter count in alloc_callback_fail.device" into nougat-cts-dev
am:
a268fcbaff
Change-Id: I18cc3ec3b8aaad7d2a81908045b78bb99cad34c0
Pyry Haulos [Tue, 13 Sep 2016 16:58:30 +0000 (16:58 +0000)]
CP: Reduce max iter count in alloc_callback_fail.device
am:
ef5688dda6
Change-Id: Iad514fcf15e4346d7609b72bbf7a68310f1f740a
Daniel Xie [Tue, 13 Sep 2016 16:57:19 +0000 (16:57 +0000)]
Merge changes I212a8bc2,I476b6586 into nougat-cts-dev
am:
83683a367f
Change-Id: I29dee0d68369668c015578941b19c1a04ad12026
Pyry Haulos [Tue, 13 Sep 2016 16:57:19 +0000 (16:57 +0000)]
DO NOT MERGE Allow old behavior in image format property tests
am:
0825a289c0 -s ours
Change-Id: Ieca132cc84b227a00007ac86c69197890a48bdfa
Nanley Chery [Tue, 13 Sep 2016 16:57:18 +0000 (16:57 +0000)]
CP: Fix required sample count tests
am:
f6a815214a
Change-Id: I5fa4a1342e6b8ccefb4d1e3782a456d3bf64328a
Daniel Xie [Tue, 13 Sep 2016 16:57:17 +0000 (16:57 +0000)]
Merge "CP: Fix ext check in EXT_draw_buffers_indexed negative tests" into nougat-cts-dev
am:
f594c550af
Change-Id: I3625f5712b3608d707772bbd8619098ad2bb7afa
Pyry Haulos [Tue, 13 Sep 2016 16:57:17 +0000 (16:57 +0000)]
CP: Fix ext check in EXT_draw_buffers_indexed negative tests
am:
3962010752
Change-Id: I03fbe13d5dd307497a33d89c4d4acb2abf758087
Daniel Xie [Tue, 13 Sep 2016 16:57:17 +0000 (16:57 +0000)]
Merge "CP: Fix geometry shader support check" into nougat-cts-dev
am:
54d4c9f476
Change-Id: I74b0651ad282c00e5ac515acd566252855ad475a
Pyry Haulos [Tue, 13 Sep 2016 16:57:16 +0000 (16:57 +0000)]
CP: Fix geometry shader support check
am:
0da63cfe1d
Change-Id: I450620a3ba64a02a7e4241a7b5f8f3fb2ec22aa0
Daniel Xie [Tue, 13 Sep 2016 16:57:16 +0000 (16:57 +0000)]
Merge "CP: Check and enable VK_KHR_sampler_mirror_clamp_to_edge" into nougat-cts-dev
am:
b03302d214
Change-Id: If061883679a5e21e9364a0ebe7eaad34ba2faf4c
Pyry Haulos [Tue, 13 Sep 2016 16:57:15 +0000 (16:57 +0000)]
CP: Check and enable VK_KHR_sampler_mirror_clamp_to_edge
am:
66ee615c37
Change-Id: I91d202db27ad1cf7cfb1c0efcea166daa4257f81
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:43:30 +0000 (16:43 +0000)]
Merge "CP: Reduce max iter count in alloc_callback_fail.device" into nougat-cts-dev
Daniel Xie [Tue, 13 Sep 2016 16:43:20 +0000 (16:43 +0000)]
Merge changes I212a8bc2,I476b6586 into nougat-cts-dev
* changes:
DO NOT MERGE Allow old behavior in image format property tests
CP: Fix required sample count tests
Daniel Xie [Tue, 13 Sep 2016 16:43:15 +0000 (16:43 +0000)]
Merge "CP: Fix ext check in EXT_draw_buffers_indexed negative tests" into nougat-cts-dev
Daniel Xie [Tue, 13 Sep 2016 16:43:11 +0000 (16:43 +0000)]
Merge "CP: Fix geometry shader support check" into nougat-cts-dev
Daniel Xie [Tue, 13 Sep 2016 16:43:06 +0000 (16:43 +0000)]
Merge "CP: Check and enable VK_KHR_sampler_mirror_clamp_to_edge" into nougat-cts-dev
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
Pyry Haulos [Wed, 31 Aug 2016 16:45:39 +0000 (09:45 -0700)]
DO NOT MERGE Allow old behavior in image format property tests
Vulkan API specification has changed in respect to what sample counts
vkGetPhysicalDeviceImageFormatProperties() should report. The change has
been made after initial Android Nougat drivers were frozen. For NYC CTS
we need to tolerate the old behavior and issue compatibility warning
instead.
Bug:
30739954
Change-Id: I212a8bc2b948760d3bf457e1c0e1199e0a8cc31e
Nanley Chery [Tue, 19 Apr 2016 19:13:58 +0000 (12:13 -0700)]
CP: Fix required sample count tests
According to,
Table 11.1. Image and image view parameter compatibility requirements
Only non-cube images with type VK_IMAGE_TYPE_2D can have sample counts
greater than one.
In addition, the following properties should hold for multisampled
images: the formats must support being used in a color or depth/stencil
attachment, or in a storage image when shaderStorageImageMultisample is
supported. Images not fitting the above descriptions may have a sample
count of one or zero (in error conditions). Align tests for sample
counts to this behavior.
Bug:
30739954
(cherry picked from commit
dc4227d5ec87080f5dad810b5e33ae3b3fa014a4)
Change-Id: I476b6586c351bddfb9f0b92cd7ec45fb9cc297c8
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: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: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 [Mon, 8 Aug 2016 18:08:47 +0000 (11:08 -0700)]
CP: Check and enable VK_KHR_sampler_mirror_clamp_to_edge
Several tests in dEQP-VK.pipeline group assume that
VK_SAMPLER_ADDRESS_MODE_MIRROR_CLAMP_TO_EDGE mode is supported. Spec
actually requires that VK_KHR_sampler_mirror_clamp_to_edge is enabled if
that mode is used.
This change enables VK_KHR_sampler_mirror_clamp_to_edge in default
device, if supported, and adds relevant checks in the test code.
In the future we'll want to clean this up by giving test cases more
control about the device configuration they need.
Fixes #339
Bug:
29996742
(cherry picked from commit
ed8561a07cdb1bb7730eccf9025b738838392464)
Change-Id: I12312f0e48d20724c082f31c4ab03792dbb44826
Pyry Haulos [Mon, 8 Aug 2016 19:34:35 +0000 (12:34 -0700)]
CP: Fix geometry shader support check
Bug:
30738286
(cherry picked from commit
83470b2dcbff396773f94d7a1448c12362ad3380)
Change-Id: Ife07ebd21f115114441ac8dc794a8d9e12c8acae
Pyry Haulos [Thu, 11 Aug 2016 20:32:47 +0000 (13:32 -0700)]
CP: Fix ext check in EXT_draw_buffers_indexed negative tests
Bug:
30738817
(cherry picked from commit
cdfbadd0238044279cbc928bac9d895b002bcca6)
Change-Id: Iab592f4f97896995b6fb5a0f3a7ce0d885f9b834
Pyry Haulos [Thu, 18 Aug 2016 14:29:04 +0000 (15:29 +0100)]
CP: Reduce max iter count in alloc_callback_fail.device
Creating VkDevice can be costly operation so we need to limit number of
tries to a pretty low value. Other tests already use per-thread limit of
20.
Additionally, this patch adds a way to override the limit by specifying
--deqp-test-iteration-count=N command line parameter. This is useful for
full OOM testing.
Bug:
30811856
(cherry picked from commit
3b17fd4c4e2d450f34f68989ff786939032cdcb9)
Change-Id: Ib3aaeff24d7753d52a6a444abfbecf863803c9ec
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 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
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
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
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