Pyry Haulos [Tue, 13 Sep 2016 20:13:24 +0000 (20:13 +0000)]
CP: Fix geometry shader support check am:
0da63cfe1d am:
f4ad130d7b am:
5a2621e728 am:
2babb295c9
am:
100fec00b0
Change-Id: I2666c9e266e673bc15756ff5aefe8a3ccd55b8b7
Daniel Xie [Tue, 13 Sep 2016 20:13:22 +0000 (20:13 +0000)]
Merge "CP: Check and enable VK_KHR_sampler_mirror_clamp_to_edge" into nougat-cts-dev am:
b03302d214 am:
2fd8aaff45 am:
84e69faa6e am:
20bed48388
am:
f5c6f725e1
Change-Id: Icb2e461de62cae77227fbb5a7477acb6da5c1c9b
Pyry Haulos [Tue, 13 Sep 2016 20:13:20 +0000 (20:13 +0000)]
CP: Check and enable VK_KHR_sampler_mirror_clamp_to_edge am:
66ee615c37 am:
aef7f35add am:
966edd3c2c am:
a15e4a91c2
am:
09656384ae
Change-Id: I23d986c90903ed89aaa2c669fa92e302d4b7599a
Daniel Xie [Tue, 13 Sep 2016 20:12:39 +0000 (20:12 +0000)]
Merge changes I85492417,I93389a2c into nougat-cts-dev am:
37eaa88ac2 am:
89da6ddd7b am:
e61860906b am:
baa7680368
am:
b403c19524
Change-Id: I2dabcb4d1ac1c5c0a9c6d3b4e7f886ee91badaf7
Pyry Haulos [Tue, 13 Sep 2016 20:12:31 +0000 (20:12 +0000)]
CP: Limit VkInstance count in object_management.multithreaded* am:
1735b7bcaa am:
a87bd26f5c am:
18e03dc5cb am:
7d793064e8
am:
7c4393eced
Change-Id: Iee8abe766974fa6adac41918f540db8fcbf77601
Pyry Haulos [Tue, 13 Sep 2016 20:12:24 +0000 (20:12 +0000)]
CP: Do not test VkDevice, VkInstance creation OOM paths in WSI tests am:
80ddee1f9b am:
c68e33a5fb am:
1353735b0f am:
bad8b319ed
am:
a0840b47b9
Change-Id: I405cbf8b24bdefa06687a1f7b3a8bd99c3f2936a
Unsuk Jung [Tue, 13 Sep 2016 20:12:23 +0000 (20:12 +0000)]
Merge "Don't require supported binary formats in negative tests." into marshmallow-cts-dev am:
3aa5258338 am:
9ebe97f0a6 am:
21365f0da3 am:
d3ca595ddb am:
fe57fa7f5e
am:
db5a3cdbf4
Change-Id: I622672070657b99ff6703ba71c836221fb73e3d6
Haixia Shi [Tue, 13 Sep 2016 20:12:22 +0000 (20:12 +0000)]
Don't require supported binary formats in negative tests. am:
7cd59a4409 am:
635f454667 am:
a520e3ba8d am:
07ce77fe3d am:
853d7c1761
am:
590242b494
Change-Id: I55e01dafbcdaaf4cb3b7fda87820e3fdd9911f5d
Daniel Xie [Tue, 13 Sep 2016 20:11:43 +0000 (20:11 +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:
41d3ecd6bd -s ours am:
521f245edc -s ours am:
37c812651a
am:
c88d214022 -s ours
Change-Id: Id95cd8b06d15482f4c69f1ae56a769f3c7fb1b0a
Jarkko Pyry [Tue, 13 Sep 2016 20:11:42 +0000 (20:11 +0000)]
DO NOT MERGE CP vertex array test and warning fixes am:
c63640e53a -s ours am:
b136cc9a59 -s ours am:
20259b77cc -s ours am:
b3208d09b8 -s ours am:
3d10a0447f
am:
6627462063 -s ours
Change-Id: I29b89ebb87e68e9b28cc5032386bc2b78c0b471b
Daniel Xie [Tue, 13 Sep 2016 20:11:40 +0000 (20:11 +0000)]
Merge "Fix GLES2 format mismatch" into marshmallow-cts-dev am:
98dd6ac745 am:
5dee7d519c am:
c3a2323bb0 am:
f5175ed08f am:
ce81513080
am:
da92c80fcf
Change-Id: I3994ddaf638e624f14cd9e4df1e82e9fe50c00e0
Stphane Marchesin [Tue, 13 Sep 2016 20:11:38 +0000 (20:11 +0000)]
Fix GLES2 format mismatch am:
4b80682693 am:
9a9c641a84 am:
4faeff24d2 am:
2b2a5dfe41 am:
e4733132c9
am:
3ca964b89e
Change-Id: Ida51bb8f64b65e1d89b7f081b975505484271a93
Haixia Shi [Tue, 13 Sep 2016 20:11:37 +0000 (20:11 +0000)]
Increase no-data timeout to 5 seconds. am:
d00b71cbc3 am:
a7afa30111 am:
9dfb23aeaf am:
bce9c4d0eb am:
31c60e9172
am:
2ca1e9b94f
Change-Id: I59b7f14067140454dad73780b71a80118645ba88
Pyry Haulos [Tue, 13 Sep 2016 19:11:49 +0000 (19:11 +0000)]
CP: Fix geometry shader support check am:
0da63cfe1d am:
f4ad130d7b am:
5a2621e728
am:
2babb295c9
Change-Id: I29865851e5160435d3b907ce393cfe0bc44870bd
Daniel Xie [Tue, 13 Sep 2016 19:11:48 +0000 (19:11 +0000)]
Merge "CP: Check and enable VK_KHR_sampler_mirror_clamp_to_edge" into nougat-cts-dev am:
b03302d214 am:
2fd8aaff45 am:
84e69faa6e
am:
20bed48388
Change-Id: Idfacbf65a2184cf325af1aa364a3dc5a7a1b378b
Pyry Haulos [Tue, 13 Sep 2016 19:11:47 +0000 (19:11 +0000)]
CP: Check and enable VK_KHR_sampler_mirror_clamp_to_edge am:
66ee615c37 am:
aef7f35add am:
966edd3c2c
am:
a15e4a91c2
Change-Id: I2cbde846a3f3814de12a8a46e7d09f2108c731f0
Daniel Xie [Tue, 13 Sep 2016 19:10:13 +0000 (19:10 +0000)]
Merge changes I85492417,I93389a2c into nougat-cts-dev am:
37eaa88ac2 am:
89da6ddd7b am:
e61860906b
am:
baa7680368
Change-Id: I471754b1d44512e919618d404340ff52e83e0666
Pyry Haulos [Tue, 13 Sep 2016 19:10:09 +0000 (19:10 +0000)]
CP: Limit VkInstance count in object_management.multithreaded* am:
1735b7bcaa am:
a87bd26f5c am:
18e03dc5cb
am:
7d793064e8
Change-Id: I8a4098361f87b489226ef3536f4aabccc1333f24
Pyry Haulos [Tue, 13 Sep 2016 19:10:05 +0000 (19:10 +0000)]
CP: Do not test VkDevice, VkInstance creation OOM paths in WSI tests am:
80ddee1f9b am:
c68e33a5fb am:
1353735b0f
am:
bad8b319ed
Change-Id: I0aff91967c014029a3d58b10f3f19dd45f139191
Unsuk Jung [Tue, 13 Sep 2016 19:10:04 +0000 (19:10 +0000)]
Merge "Don't require supported binary formats in negative tests." into marshmallow-cts-dev am:
3aa5258338 am:
9ebe97f0a6 am:
21365f0da3 am:
d3ca595ddb
am:
fe57fa7f5e
Change-Id: Ice37cf66857da4814ff4ae98e11ac2df8ebbf52c
Haixia Shi [Tue, 13 Sep 2016 19:10:03 +0000 (19:10 +0000)]
Don't require supported binary formats in negative tests. am:
7cd59a4409 am:
635f454667 am:
a520e3ba8d am:
07ce77fe3d
am:
853d7c1761
Change-Id: I05e3c4b70ef1c148b557cf543ece0d5e49d1f7d4
Daniel Xie [Tue, 13 Sep 2016 19:09:29 +0000 (19:09 +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:
41d3ecd6bd -s ours am:
521f245edc -s ours
am:
37c812651a
Change-Id: Id88c9d305fb2cd9f63ef158b9643725dcd7f80cf
Jarkko Pyry [Tue, 13 Sep 2016 19:09:29 +0000 (19:09 +0000)]
DO NOT MERGE CP vertex array test and warning fixes am:
c63640e53a -s ours am:
b136cc9a59 -s ours am:
20259b77cc -s ours am:
b3208d09b8 -s ours
am:
3d10a0447f
Change-Id: Icefefb5c728390869fb8dad0e143477252eba08d
Daniel Xie [Tue, 13 Sep 2016 19:09:28 +0000 (19:09 +0000)]
Merge "Fix GLES2 format mismatch" into marshmallow-cts-dev am:
98dd6ac745 am:
5dee7d519c am:
c3a2323bb0 am:
f5175ed08f
am:
ce81513080
Change-Id: I899dcde79abf191d2b72aec732a90b59349cbf86
Stphane Marchesin [Tue, 13 Sep 2016 19:09:27 +0000 (19:09 +0000)]
Fix GLES2 format mismatch am:
4b80682693 am:
9a9c641a84 am:
4faeff24d2 am:
2b2a5dfe41
am:
e4733132c9
Change-Id: I17852505805666b5f1dbbe703d2dffc95554d8b5
Haixia Shi [Tue, 13 Sep 2016 19:09:27 +0000 (19:09 +0000)]
Increase no-data timeout to 5 seconds. am:
d00b71cbc3 am:
a7afa30111 am:
9dfb23aeaf am:
bce9c4d0eb
am:
31c60e9172
Change-Id: I3e0e783db33c0c0a1bae944758107eca4a2621da
Pyry Haulos [Tue, 13 Sep 2016 19:07:34 +0000 (19:07 +0000)]
CP: Fix geometry shader support check am:
0da63cfe1d am:
f4ad130d7b
am:
5a2621e728
Change-Id: I1e97bf11bd6aa91df142a57502fd1393679d04b9
Daniel Xie [Tue, 13 Sep 2016 19:07:32 +0000 (19:07 +0000)]
Merge "CP: Check and enable VK_KHR_sampler_mirror_clamp_to_edge" into nougat-cts-dev am:
b03302d214 am:
2fd8aaff45
am:
84e69faa6e
Change-Id: I2632afd8ede6e3eda21ed5b821a96a5b48723080
Pyry Haulos [Tue, 13 Sep 2016 19:07:30 +0000 (19:07 +0000)]
CP: Check and enable VK_KHR_sampler_mirror_clamp_to_edge am:
66ee615c37 am:
aef7f35add
am:
966edd3c2c
Change-Id: Id26affd2827962a8fca3b92399f125f5e5462ef3
Daniel Xie [Tue, 13 Sep 2016 19:05:44 +0000 (19:05 +0000)]
Merge changes I85492417,I93389a2c into nougat-cts-dev am:
37eaa88ac2 am:
89da6ddd7b
am:
e61860906b
Change-Id: Idd8eecc29a019dc351660b5e2e882d5a8341ceba
Pyry Haulos [Tue, 13 Sep 2016 19:05:26 +0000 (19:05 +0000)]
CP: Limit VkInstance count in object_management.multithreaded* am:
1735b7bcaa am:
a87bd26f5c
am:
18e03dc5cb
Change-Id: Id04fcee398631be0de1d7fb2d8f0cdeee82b942a
Pyry Haulos [Tue, 13 Sep 2016 19:05:13 +0000 (19:05 +0000)]
CP: Do not test VkDevice, VkInstance creation OOM paths in WSI tests am:
80ddee1f9b am:
c68e33a5fb
am:
1353735b0f
Change-Id: I743cf59d1a0c5b344fa63e7481bb52e6a2a1ed7b
Unsuk Jung [Tue, 13 Sep 2016 19:05:11 +0000 (19:05 +0000)]
Merge "Don't require supported binary formats in negative tests." into marshmallow-cts-dev am:
3aa5258338 am:
9ebe97f0a6 am:
21365f0da3
am:
d3ca595ddb
Change-Id: I8b1a9f61648db5d86941e6f07718c9f10e596705
Haixia Shi [Tue, 13 Sep 2016 19:05:09 +0000 (19:05 +0000)]
Don't require supported binary formats in negative tests. am:
7cd59a4409 am:
635f454667 am:
a520e3ba8d
am:
07ce77fe3d
Change-Id: I68ecac3ec8796d64b8bb58f4952264d5bf788a8f
Daniel Xie [Tue, 13 Sep 2016 19:04:35 +0000 (19: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 am:
41d3ecd6bd -s ours
am:
521f245edc -s ours
Change-Id: Id7f3202c8d778f339e21c01c93fb70e455c8d194
Jarkko Pyry [Tue, 13 Sep 2016 19:04:34 +0000 (19:04 +0000)]
DO NOT MERGE CP vertex array test and warning fixes am:
c63640e53a -s ours am:
b136cc9a59 -s ours am:
20259b77cc -s ours
am:
b3208d09b8 -s ours
Change-Id: I64bc89088ab25bd7a1bf8f434a1bde626575e332
Daniel Xie [Tue, 13 Sep 2016 19:04:33 +0000 (19:04 +0000)]
Merge "Fix GLES2 format mismatch" into marshmallow-cts-dev am:
98dd6ac745 am:
5dee7d519c am:
c3a2323bb0
am:
f5175ed08f
Change-Id: I3f66c9046e6f681f2a1e8909d7e4f6c31153117a
Stphane Marchesin [Tue, 13 Sep 2016 19:04:31 +0000 (19:04 +0000)]
Fix GLES2 format mismatch am:
4b80682693 am:
9a9c641a84 am:
4faeff24d2
am:
2b2a5dfe41
Change-Id: Ie9140c7d9c482824d7ca5e7ff6723492aa9d195e
Haixia Shi [Tue, 13 Sep 2016 19:04:29 +0000 (19:04 +0000)]
Increase no-data timeout to 5 seconds. am:
d00b71cbc3 am:
a7afa30111 am:
9dfb23aeaf
am:
bce9c4d0eb
Change-Id: If1acac260b92bdf81a8370e4d6257d2e28e4c3d8
Pyry Haulos [Tue, 13 Sep 2016 19:03:48 +0000 (19:03 +0000)]
CP: Fix geometry shader support check am:
0da63cfe1d
am:
f4ad130d7b
Change-Id: Ibd39ccf75c4f9e13dfd89893cd3a6032d95d3334
Daniel Xie [Tue, 13 Sep 2016 19:03:48 +0000 (19:03 +0000)]
Merge "CP: Check and enable VK_KHR_sampler_mirror_clamp_to_edge" into nougat-cts-dev am:
b03302d214
am:
2fd8aaff45
Change-Id: I3d64c12dfcc07bbd10da83f18f393c6ae5a0c222
Pyry Haulos [Tue, 13 Sep 2016 19:03:47 +0000 (19:03 +0000)]
CP: Check and enable VK_KHR_sampler_mirror_clamp_to_edge am:
66ee615c37
am:
aef7f35add
Change-Id: I536c8dcb7d5474489374c8c0ac3d17b58512eb14
Daniel Xie [Tue, 13 Sep 2016 19:02:28 +0000 (19:02 +0000)]
Merge changes I85492417,I93389a2c into nougat-cts-dev am:
37eaa88ac2
am:
89da6ddd7b
Change-Id: Ia669fe57bd54b6a6dd233f00e3501ee5e8864826
Pyry Haulos [Tue, 13 Sep 2016 19:02:21 +0000 (19:02 +0000)]
CP: Limit VkInstance count in object_management.multithreaded* am:
1735b7bcaa
am:
a87bd26f5c
Change-Id: Ida76c6627f3004632bedf34795f5fda667036c81
Pyry Haulos [Tue, 13 Sep 2016 19:02:16 +0000 (19:02 +0000)]
CP: Do not test VkDevice, VkInstance creation OOM paths in WSI tests am:
80ddee1f9b
am:
c68e33a5fb
Change-Id: If10b8acb49798beb113c0d7d3b09ea06975eb27e
Unsuk Jung [Tue, 13 Sep 2016 19:02:16 +0000 (19:02 +0000)]
Merge "Don't require supported binary formats in negative tests." into marshmallow-cts-dev am:
3aa5258338 am:
9ebe97f0a6
am:
21365f0da3
Change-Id: I8f4111b3bd59b975a3cb2776a440ac168a3acadd
Haixia Shi [Tue, 13 Sep 2016 19:02:15 +0000 (19:02 +0000)]
Don't require supported binary formats in negative tests. am:
7cd59a4409 am:
635f454667
am:
a520e3ba8d
Change-Id: Iab4a5101458004aa42b20692bd0e484d2148675c
Daniel Xie [Tue, 13 Sep 2016 19:01:34 +0000 (19:01 +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:
41d3ecd6bd -s ours
Change-Id: Iaf348d31acaa40b54f51377558bf368d736a10b3
Jarkko Pyry [Tue, 13 Sep 2016 19:01:33 +0000 (19:01 +0000)]
DO NOT MERGE CP vertex array test and warning fixes am:
c63640e53a -s ours am:
b136cc9a59 -s ours
am:
20259b77cc -s ours
Change-Id: I59aea5b40c8b02f3d761717dfd18b5293f344229
Daniel Xie [Tue, 13 Sep 2016 19:01:33 +0000 (19:01 +0000)]
Merge "Fix GLES2 format mismatch" into marshmallow-cts-dev am:
98dd6ac745 am:
5dee7d519c
am:
c3a2323bb0
Change-Id: I8ddf6e81bb2a7af1f520fac69eaf175e3a86a89c
Stphane Marchesin [Tue, 13 Sep 2016 19:01:32 +0000 (19:01 +0000)]
Fix GLES2 format mismatch am:
4b80682693 am:
9a9c641a84
am:
4faeff24d2
Change-Id: Ibbc71c1204a46b010e8a98d0bef16c878620155c
Haixia Shi [Tue, 13 Sep 2016 19:01:32 +0000 (19:01 +0000)]
Increase no-data timeout to 5 seconds. am:
d00b71cbc3 am:
a7afa30111
am:
9dfb23aeaf
Change-Id: I914a0e22ba02c64e8db152ee10ff261f47261a34
Pyry Haulos [Tue, 13 Sep 2016 18:47:30 +0000 (18:47 +0000)]
CP: Fix geometry shader support check
am:
0da63cfe1d
Change-Id: Id94fa9a3eaa0bab514bd68f70e4a418565b17a74
Daniel Xie [Tue, 13 Sep 2016 18:47:29 +0000 (18:47 +0000)]
Merge "CP: Check and enable VK_KHR_sampler_mirror_clamp_to_edge" into nougat-cts-dev
am:
b03302d214
Change-Id: I7279affd1f20795fa61292c05656615fa71f4ae5
Pyry Haulos [Tue, 13 Sep 2016 18:47:28 +0000 (18:47 +0000)]
CP: Check and enable VK_KHR_sampler_mirror_clamp_to_edge
am:
66ee615c37
Change-Id: Ic654aff622dc4c0e2e2b59627bf6a081f805d590
Daniel Xie [Tue, 13 Sep 2016 18:47:26 +0000 (18:47 +0000)]
Merge changes I85492417,I93389a2c into nougat-cts-dev
am:
37eaa88ac2
Change-Id: I6d02e17f212b826c62ca711317450214b4a87e71
Pyry Haulos [Tue, 13 Sep 2016 18:47:26 +0000 (18:47 +0000)]
CP: Limit VkInstance count in object_management.multithreaded*
am:
1735b7bcaa
Change-Id: If043d3065cb9fecc87e1a012bef49af5ef1fd8b5
Pyry Haulos [Tue, 13 Sep 2016 18:47:23 +0000 (18:47 +0000)]
CP: Do not test VkDevice, VkInstance creation OOM paths in WSI tests
am:
80ddee1f9b
Change-Id: If775ead51e363bfd90a49cca10df6f55a3f598f3
Unsuk Jung [Tue, 13 Sep 2016 18:47:21 +0000 (18:47 +0000)]
Merge "Don't require supported binary formats in negative tests." into marshmallow-cts-dev am:
3aa5258338
am:
9ebe97f0a6
Change-Id: I3774107d42492442ffdcda985f90b706d55a0eff
Haixia Shi [Tue, 13 Sep 2016 18:47:21 +0000 (18:47 +0000)]
Don't require supported binary formats in negative tests. am:
7cd59a4409
am:
635f454667
Change-Id: Id987cef0666752e9237ef4433892c5accd3f8379
Daniel Xie [Tue, 13 Sep 2016 18:46:55 +0000 (18:46 +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: I96c93068b1bb4040ffbac15bd3cef9ae2340d2f1
Jarkko Pyry [Tue, 13 Sep 2016 18:46:55 +0000 (18:46 +0000)]
DO NOT MERGE CP vertex array test and warning fixes am:
c63640e53a -s ours
am:
b136cc9a59 -s ours
Change-Id: Ie181e39e7e799eed5ec5f817fda809e86c082800
Daniel Xie [Tue, 13 Sep 2016 18:46:54 +0000 (18:46 +0000)]
Merge "Fix GLES2 format mismatch" into marshmallow-cts-dev am:
98dd6ac745
am:
5dee7d519c
Change-Id: I7fbf4c4a02279fe743a1b088d484acbd948ce604
Stphane Marchesin [Tue, 13 Sep 2016 18:46:54 +0000 (18:46 +0000)]
Fix GLES2 format mismatch am:
4b80682693
am:
9a9c641a84
Change-Id: Ic24eba3990aa9fb563e1501e749dd3f29d99f75b
Haixia Shi [Tue, 13 Sep 2016 18:46:52 +0000 (18:46 +0000)]
Increase no-data timeout to 5 seconds. am:
d00b71cbc3
am:
a7afa30111
Change-Id: Ice660fcf10955047eac6b2ef1c60114d2fb97b0e
Kenneth Graunke [Tue, 13 Sep 2016 18:19:36 +0000 (18:19 +0000)]
Merge "Fix sample_mask_in.bit_count_per_two_samples tests for 2x MSAA." am:
ba98ecd5d0 am:
96bef1f84e am:
347b5cdac0
am:
644058875a
Change-Id: I99d4a6650d9efb87299f9988c8896cfce8a96a1c
Daniel Xie [Tue, 13 Sep 2016 18:19:35 +0000 (18:19 +0000)]
Merge "Merge "CP: Require 'master' config to be supported in Android CTS" into nougat-cts-dev am:
84173082ee am:
72e1df9930 am:
f750d4ffc3 am:
de7e3e2be7 am:
5b059bb044" into nyc-mr1-dev-plus-aosp
am:
3381734324
Change-Id: I63ca6c744d27f88a933a0ce890e9a9fc7c799eb5
Daniel Xie [Tue, 13 Sep 2016 18:19:33 +0000 (18:19 +0000)]
Merge "CP: Require 'master' config to be supported in Android CTS" into nougat-cts-dev am:
84173082ee am:
72e1df9930 am:
f750d4ffc3 am:
de7e3e2be7 am:
5b059bb044
am:
55caa1ac8c
Change-Id: Iab524605cba2e0af1fb34f3b304e4924012910f0
Pyry Haulos [Tue, 13 Sep 2016 18:19:27 +0000 (18:19 +0000)]
Merge "CP: Require 'master' config to be supported in Android CTS am:
03d217bb53 am:
e0c1316159 am:
a2d72443d6 am:
0dd98a178b am:
a08f0162cf" into nyc-mr1-dev-plus-aosp
am:
636ad59ed8
Change-Id: I999e13d8d7f1cf88a4fbb463bb0092d3c0815773
Pyry Haulos [Tue, 13 Sep 2016 18:19:25 +0000 (18:19 +0000)]
CP: Require 'master' config to be supported in Android CTS am:
03d217bb53 am:
e0c1316159 am:
a2d72443d6 am:
0dd98a178b am:
a08f0162cf
am:
3f01dc6c00
Change-Id: Ib463be74c01c3bb56fcd049902b5d69785008dae
Daniel Xie [Tue, 13 Sep 2016 18:09:09 +0000 (18:09 +0000)]
Merge "Merge "CP: Handle EGL_EXT_yuv_surface in eglChooseConfig() tests" into nougat-cts-dev am:
1ad2703e25 am:
d93a153fd4 am:
2e528153da am:
83035b1ffd am:
4f0f622a6c" into nyc-mr1-dev-plus-aosp
am:
2720094d38
Change-Id: I3ff0a4c819ec56ff36e49a736d149ed360b6becf
Daniel Xie [Tue, 13 Sep 2016 18:09:07 +0000 (18:09 +0000)]
Merge "CP: Handle EGL_EXT_yuv_surface in eglChooseConfig() tests" into nougat-cts-dev am:
1ad2703e25 am:
d93a153fd4 am:
2e528153da am:
83035b1ffd am:
4f0f622a6c
am:
1845d28747
Change-Id: Ib901657ef6b5033140d360119c22351313001a01
Pyry Haulos [Tue, 13 Sep 2016 18:09:00 +0000 (18:09 +0000)]
Merge "CP: Handle EGL_EXT_yuv_surface in eglChooseConfig() tests am:
521bb16575 am:
fdd3db3693 am:
16ba586a00 am:
cbb5a33fb9 am:
e6443aa4bb" into nyc-mr1-dev-plus-aosp
am:
8fe45f3e93
Change-Id: If76ec63400191c65226bf74805fc53719d06723b
Pyry Haulos [Tue, 13 Sep 2016 18:08:59 +0000 (18:08 +0000)]
CP: Handle EGL_EXT_yuv_surface in eglChooseConfig() tests am:
521bb16575 am:
fdd3db3693 am:
16ba586a00 am:
cbb5a33fb9 am:
e6443aa4bb
am:
d02e13af9c
Change-Id: Id6984aaf83f7acc74244648e0f53c59fe65e6a0e
Daniel Xie [Tue, 13 Sep 2016 18:08:53 +0000 (18:08 +0000)]
Merge "Merge "Remove a few EGL tests using RGBA4 format from mustpass" into nougat-cts-dev am:
451fa7c581 am:
99925909af am:
1820fdbedc am:
bcb08cddcd am:
429bc243d4" into nyc-mr1-dev-plus-aosp
am:
52cd426d34
Change-Id: Icf75d9d9639df4fb1d5f4bdb2c68ab7be8d9f3ec
Daniel Xie [Tue, 13 Sep 2016 18:08:52 +0000 (18:08 +0000)]
Merge "Remove a few EGL tests using RGBA4 format from mustpass" into nougat-cts-dev am:
451fa7c581 am:
99925909af am:
1820fdbedc am:
bcb08cddcd am:
429bc243d4
am:
ee0b685f12
Change-Id: Ifd9e371b2b2d56f732585da2e2ec5f52712a0f3b
Pyry Haulos [Tue, 13 Sep 2016 18:08:46 +0000 (18:08 +0000)]
Merge "Remove a few EGL tests using RGBA4 format from mustpass am:
3ffc2f243a am:
04c959ca67 am:
9833f3493e am:
08ab72f183 am:
da40bb0fe5" into nyc-mr1-dev-plus-aosp
am:
9890fe3207
Change-Id: I3eaa206d3f9a8276737b1df99ae9d55142bbd60b
Pyry Haulos [Tue, 13 Sep 2016 18:08:45 +0000 (18:08 +0000)]
Remove a few EGL tests using RGBA4 format from mustpass am:
3ffc2f243a am:
04c959ca67 am:
9833f3493e am:
08ab72f183 am:
da40bb0fe5
am:
09a8e1b13f
Change-Id: Ic48e85cffd3aaf93a0588b35ee59b393d87c5165
Daniel Xie [Tue, 13 Sep 2016 18:08:39 +0000 (18:08 +0000)]
Merge "CP: Require 'master' config to be supported in Android CTS" into nougat-cts-dev am:
84173082ee am:
72e1df9930 am:
90bef986f4
am:
56270fdfb8
Change-Id: I13d70e83345a99fbc451721f00928b523634f7bf
Pyry Haulos [Tue, 13 Sep 2016 18:07:53 +0000 (18:07 +0000)]
CP: Require 'master' config to be supported in Android CTS am:
03d217bb53 am:
e0c1316159 am:
c1c16ccda1
am:
3b2f4f5e0f
Change-Id: I7568fbb21ec8d68ff3c15744db6c007e3a70c77a
Daniel Xie [Tue, 13 Sep 2016 18:07:52 +0000 (18:07 +0000)]
Merge "CP: Handle EGL_EXT_yuv_surface in eglChooseConfig() tests" into nougat-cts-dev am:
1ad2703e25 am:
d93a153fd4 am:
0e632cea70
am:
6afd772422
Change-Id: I6b7f1dc682883737872891dd4db0ff823362267b
Pyry Haulos [Tue, 13 Sep 2016 18:07:51 +0000 (18:07 +0000)]
CP: Handle EGL_EXT_yuv_surface in eglChooseConfig() tests am:
521bb16575 am:
fdd3db3693 am:
478b55b980
am:
8e3e68b496
Change-Id: I8172875068eba9140af4fd8d5381ac7a204b1584
Daniel Xie [Tue, 13 Sep 2016 18:07:50 +0000 (18:07 +0000)]
Merge "Remove a few EGL tests using RGBA4 format from mustpass" into nougat-cts-dev am:
451fa7c581 am:
99925909af am:
e5ca3b0f05
am:
298f95e762
Change-Id: I1edcfa1c2844c208e13462e5c3c321d76614325f
Pyry Haulos [Tue, 13 Sep 2016 18:07:48 +0000 (18:07 +0000)]
resolve merge conflicts of 04c959c to nyc-dev-plus-aosp am:
921c48e50a
am:
eeb08c7a18
Change-Id: I9d948105b5a8c37ec3d178011e4846861b873c52
Daniel Xie [Tue, 13 Sep 2016 18:06:15 +0000 (18:06 +0000)]
Merge "Merge "CP: Reduce max iter count in alloc_callback_fail.device" into nougat-cts-dev am:
a268fcbaff am:
a489f7548d am:
5e61259f2e" into nyc-mr1-dev-plus-aosp
am:
d635a0dd0b
Change-Id: I21d6522e2faf7dbfaa9822cda40fb78a14fbead6
Daniel Xie [Tue, 13 Sep 2016 18:06:13 +0000 (18:06 +0000)]
Merge "CP: Reduce max iter count in alloc_callback_fail.device" into nougat-cts-dev am:
a268fcbaff am:
a489f7548d am:
5e61259f2e
am:
64c469c34b
Change-Id: Idb07f56a688f9359ad1e79b7dd56d6c21ff4348c
Daniel Xie [Tue, 13 Sep 2016 18:06:08 +0000 (18:06 +0000)]
Merge "Merge "CP: Reduce max iter count in alloc_callback_fail.device" into nougat-cts-dev am:
a268fcbaff am:
a489f7548d am:
9efea4025d am:
56145b7325 am:
b706a204bf" into nyc-mr1-dev-plus-aosp
am:
4011b13ce3
Change-Id: I70b53ac99e2ffc36881a0932332e94e8cf390a25
Daniel Xie [Tue, 13 Sep 2016 18:06:08 +0000 (18:06 +0000)]
Merge "CP: Reduce max iter count in alloc_callback_fail.device" into nougat-cts-dev am:
a268fcbaff am:
a489f7548d am:
9efea4025d am:
56145b7325 am:
b706a204bf
am:
9bc066caca
Change-Id: I044625b579fdd93857d7ccbdd0847b7d91a3ab6d
Pyry Haulos [Tue, 13 Sep 2016 18:06:01 +0000 (18:06 +0000)]
Merge "CP: Reduce max iter count in alloc_callback_fail.device am:
ef5688dda6 am:
69c9f158f3 am:
41d571f045 am:
f35b2943fc am:
b5768ba6fa" into nyc-mr1-dev-plus-aosp
am:
15ebbdb224
Change-Id: I4d445e540ada40e4bfbf58fe20724c905209a826
Pyry Haulos [Tue, 13 Sep 2016 18:05:59 +0000 (18:05 +0000)]
CP: Reduce max iter count in alloc_callback_fail.device am:
ef5688dda6 am:
69c9f158f3 am:
41d571f045 am:
f35b2943fc am:
b5768ba6fa
am:
2f6f648a3f
Change-Id: Ic2387cd7b0f8ec7465e4cd285e9292124f36cf94
Pyry Haulos [Tue, 13 Sep 2016 18:05:53 +0000 (18:05 +0000)]
Merge "CP: Reduce max iter count in alloc_callback_fail.device am:
ef5688dda6 am:
69c9f158f3 am:
212df0dd39" into nyc-mr1-dev-plus-aosp
am:
c0f9f273a9
Change-Id: I3e791639a39e2f46da37299a79455b55d2bc8965
Pyry Haulos [Tue, 13 Sep 2016 18:05:52 +0000 (18:05 +0000)]
CP: Reduce max iter count in alloc_callback_fail.device am:
ef5688dda6 am:
69c9f158f3 am:
212df0dd39
am:
827fe64146
Change-Id: Id3290c07ee9c8c2424e457f5f39fa00d93a04d8f
Daniel Xie [Tue, 13 Sep 2016 18:05:49 +0000 (18:05 +0000)]
Merge changes from topic 'am-
d93effc2c36944e2a5199ec02939cb56' into nyc-mr1-dev-plus-aosp
am:
a57a3a5e45
Change-Id: I578a721b99c32abad1ba471455355145ec38ea4b
Daniel Xie [Tue, 13 Sep 2016 18:05:47 +0000 (18:05 +0000)]
Merge changes I212a8bc2,I476b6586 into nougat-cts-dev am:
83683a367f am:
b97e86700f am:
636d5cdf56
am:
a1d816d27c
Change-Id: Ib37b60a82d0303916562e1ab909b9084180943c4
Pyry Haulos [Tue, 13 Sep 2016 18:05:36 +0000 (18:05 +0000)]
DO NOT MERGE Allow old behavior in image format property tests am:
0825a289c0 -s ours am:
29574ad7e7 am:
abbf2e05e4
am:
b7ebfc3c10 -s ours
Change-Id: I4329e4aa6e603a6663e6d34b4f0109f5afe55529
Nanley Chery [Tue, 13 Sep 2016 18:05:27 +0000 (18:05 +0000)]
CP: Fix required sample count tests am:
f6a815214a am:
dd22d24f36 am:
aa4fda92b6
am:
d6927f8d8b
Change-Id: Ibb6921f6a02293e6b53361bbbaea4a788c534e08
Daniel Xie [Tue, 13 Sep 2016 18:03:46 +0000 (18:03 +0000)]
Merge "Merge "CP: Fix ext check in EXT_draw_buffers_indexed negative tests" into nougat-cts-dev am:
f594c550af am:
c961253471 am:
81ec722053" into nyc-mr1-dev-plus-aosp
am:
814066a531
Change-Id: I2c3930cbebc331d8acf6bfea8009803b45a89050
Daniel Xie [Tue, 13 Sep 2016 18:03:45 +0000 (18:03 +0000)]
Merge "CP: Fix ext check in EXT_draw_buffers_indexed negative tests" into nougat-cts-dev am:
f594c550af am:
c961253471 am:
81ec722053
am:
51821d08a6
Change-Id: I38de2e5b2f435c15a973b8a44075bbc4286ae2bb
Daniel Xie [Tue, 13 Sep 2016 18:03:40 +0000 (18:03 +0000)]
Merge changes from topic 'am-
77ae52a26b474123bdafaa0a5618ec7b' into nyc-mr1-dev-plus-aosp
am:
d00efe50a8
Change-Id: Ie36ee583fb4ce3182390b234689c3bec8173e6c8
Daniel Xie [Tue, 13 Sep 2016 18:03:39 +0000 (18:03 +0000)]
Merge changes I212a8bc2,I476b6586 into nougat-cts-dev am:
83683a367f am:
b97e86700f am:
91a977c1d3 am:
fad5a803ae am:
9eb945b2c3
am:
56f5dd22e4
Change-Id: I8ed5d9ec1c12aae37b48fab47211a20b4b09b71c