review.tizen.org Git - platform/upstream/VK-GL-CTS.git/log

Pyry Haulos [Tue, 13 Sep 2016 20:16:08 +0000 (20:16 +0000)]

resolve merge conflicts of 3ffc2f2 to master am: f2c82779ae am: b43199cd47 am: 93119248d0
am: 1f61a3ca8e

Change-Id: I21523670469267f399b8dd564429db738916b322

commit | commitdiff | tree

Daniel Xie [Tue, 13 Sep 2016 20:16:06 +0000 (20:16 +0000)]

Merge "CP: Reduce max iter count in alloc_callback_fail.device" into nougat-cts-dev am: a268fcbaff am: 30b11fbc7b am: 81a9b83fb0 am: 86cd16b155
am: a3e36cb1f1

Change-Id: I6025f0d35cc90eecb9108d1ed4c6155c39420447

commit | commitdiff | tree

Pyry Haulos [Tue, 13 Sep 2016 20:15:25 +0000 (20:15 +0000)]

CP: Reduce max iter count in alloc_callback_fail.device am: ef5688dda6 am: 9872f68221 am: dbe13dabd0 am: a088a07587
am: 76b1d79413

Change-Id: Ib767950114cc7a4de4ef6d1e637e8b4f8d7f80c3

commit | commitdiff | tree

Daniel Xie [Tue, 13 Sep 2016 20:15:24 +0000 (20:15 +0000)]

Merge changes I212a8bc2,I476b6586 into nougat-cts-dev am: 83683a367f am: a69387d887 am: 193118e5b6 am: e6b4e15512
am: 3830218b68

Change-Id: I2a20446f07adb9335bdc0a125e77d6f7133eda00

commit | commitdiff | tree

Pyry Haulos [Tue, 13 Sep 2016 20:15:16 +0000 (20:15 +0000)]

DO NOT MERGE Allow old behavior in image format property tests am: 0825a289c0 -s ours am: c9b0c26d5c -s ours am: fbdbbe93d9 -s ours am: 0ee06597ef
am: ff1593ad79 -s ours

Change-Id: Ie224b17a7b8c6a866f6b86e964ef38d39ee00741

commit | commitdiff | tree

Nanley Chery [Tue, 13 Sep 2016 20:15:05 +0000 (20:15 +0000)]

CP: Fix required sample count tests am: f6a815214a am: b738653968 am: a156cab09b am: b6caa767b7
am: 7a340b78ce

Change-Id: Idf403561e6048604c699fdfc5cbba905334fffa5

commit | commitdiff | tree

Daniel Xie [Tue, 13 Sep 2016 20:15:03 +0000 (20:15 +0000)]

Merge "CP: Fix ext check in EXT_draw_buffers_indexed negative tests" into nougat-cts-dev am: f594c550af am: d1f5a0bee2 am: a78a7b91a8 am: 91767c0280
am: d2b74e1c8b

Change-Id: I5243f2ef82e9871360768491692c22798f2f6031

commit | commitdiff | tree

Pyry Haulos [Tue, 13 Sep 2016 20:13:28 +0000 (20:13 +0000)]

CP: Fix ext check in EXT_draw_buffers_indexed negative tests am: 3962010752 am: bfd422cf9a am: 37b6b43735 am: 451971142f
am: ed3df330db

Change-Id: Iaf23604bf1631cf19e651d0440b2b5a4f1128076

commit | commitdiff | tree

Daniel Xie [Tue, 13 Sep 2016 20:13:26 +0000 (20:13 +0000)]

Merge "CP: Fix geometry shader support check" into nougat-cts-dev am: 54d4c9f476 am: 0c725c5a41 am: b9417cf065 am: 2c4c80401c
am: e801222fc9

Change-Id: Ib2e7deb9edac97d12f55313d43d2a96320c3f631

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Pyry Haulos [Tue, 13 Sep 2016 19:15:46 +0000 (19:15 +0000)]

resolve merge conflicts of 3ffc2f2 to master am: f2c82779ae am: b43199cd47
am: 93119248d0

Change-Id: I79d317d122e5b9f7d1dea940ae7db4f940018d1d

commit | commitdiff | tree

Daniel Xie [Tue, 13 Sep 2016 19:15:45 +0000 (19:15 +0000)]

Merge "CP: Reduce max iter count in alloc_callback_fail.device" into nougat-cts-dev am: a268fcbaff am: 30b11fbc7b am: 81a9b83fb0
am: 86cd16b155

Change-Id: Ic3d0f870dbd0a70371fb4aabcfec927f54cdaac1

commit | commitdiff | tree

Pyry Haulos [Tue, 13 Sep 2016 19:15:09 +0000 (19:15 +0000)]

CP: Reduce max iter count in alloc_callback_fail.device am: ef5688dda6 am: 9872f68221 am: dbe13dabd0
am: a088a07587

Change-Id: I9776639a0e6c010c5417ef0f7fbf4c24c17f706e

commit | commitdiff | tree

Daniel Xie [Tue, 13 Sep 2016 19:15:07 +0000 (19:15 +0000)]

Merge changes I212a8bc2,I476b6586 into nougat-cts-dev am: 83683a367f am: a69387d887 am: 193118e5b6
am: e6b4e15512

Change-Id: Ieaa589c1bf7220cb2c8abbd20170853cb8f6c319

commit | commitdiff | tree

Pyry Haulos [Tue, 13 Sep 2016 19:15:02 +0000 (19:15 +0000)]

DO NOT MERGE Allow old behavior in image format property tests am: 0825a289c0 -s ours am: c9b0c26d5c -s ours am: fbdbbe93d9 -s ours
am: 0ee06597ef

Change-Id: If77e612a36d34bea73de0bb8ac7df2078bbdd05d

commit | commitdiff | tree

Nanley Chery [Tue, 13 Sep 2016 19:14:57 +0000 (19:14 +0000)]

CP: Fix required sample count tests am: f6a815214a am: b738653968 am: a156cab09b
am: b6caa767b7

Change-Id: I1873c70e56a8ff2459036eff883f2604449aeafa

commit | commitdiff | tree

Daniel Xie [Tue, 13 Sep 2016 19:14:56 +0000 (19:14 +0000)]

Merge "CP: Fix ext check in EXT_draw_buffers_indexed negative tests" into nougat-cts-dev am: f594c550af am: d1f5a0bee2 am: a78a7b91a8
am: 91767c0280

Change-Id: Id78b34b40291db5be2b2536f9f2f1263ec9f2040

commit | commitdiff | tree

Pyry Haulos [Tue, 13 Sep 2016 19:11:51 +0000 (19:11 +0000)]

CP: Fix ext check in EXT_draw_buffers_indexed negative tests am: 3962010752 am: bfd422cf9a am: 37b6b43735
am: 451971142f

Change-Id: I7dc9d63ae1c0fd773cf731c0c6b125f634415329

commit | commitdiff | tree

Daniel Xie [Tue, 13 Sep 2016 19:11:50 +0000 (19:11 +0000)]

Merge "CP: Fix geometry shader support check" into nougat-cts-dev am: 54d4c9f476 am: 0c725c5a41 am: b9417cf065
am: 2c4c80401c

Change-Id: I71e5d3716ad723a675e889a1fd5d2476317e9c4d

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Pyry Haulos [Tue, 13 Sep 2016 19:10:00 +0000 (19:10 +0000)]

resolve merge conflicts of 3ffc2f2 to master am: f2c82779ae
am: b43199cd47

Change-Id: I5524fb9992aacac7b2bb78048f0b1243c5a03bf9

commit | commitdiff | tree

Daniel Xie [Tue, 13 Sep 2016 19:09:58 +0000 (19:09 +0000)]

Merge "CP: Reduce max iter count in alloc_callback_fail.device" into nougat-cts-dev am: a268fcbaff am: 30b11fbc7b
am: 81a9b83fb0

Change-Id: I7247f1e986895927c4eee0f870db9091f1f5f493

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Pyry Haulos [Tue, 13 Sep 2016 19:09:26 +0000 (19:09 +0000)]

CP: Reduce max iter count in alloc_callback_fail.device am: ef5688dda6 am: 9872f68221
am: dbe13dabd0

Change-Id: Iad766a192402077c74c745aba8003c9e455ac42f

commit | commitdiff | tree

Daniel Xie [Tue, 13 Sep 2016 19:09:24 +0000 (19:09 +0000)]

Merge changes I212a8bc2,I476b6586 into nougat-cts-dev am: 83683a367f am: a69387d887
am: 193118e5b6

Change-Id: I74271b75533ee760e7bb0353f6b1d685bc1f9cb6

commit | commitdiff | tree

Pyry Haulos [Tue, 13 Sep 2016 19:09:18 +0000 (19:09 +0000)]

DO NOT MERGE Allow old behavior in image format property tests am: 0825a289c0 -s ours am: c9b0c26d5c -s ours
am: fbdbbe93d9 -s ours

Change-Id: Ibeb666162d339eac984b4ee40607494de3cf3b92

commit | commitdiff | tree

Nanley Chery [Tue, 13 Sep 2016 19:09:12 +0000 (19:09 +0000)]

CP: Fix required sample count tests am: f6a815214a am: b738653968
am: a156cab09b

Change-Id: I71ad0c72c090974ecb14d01caebfc8e30a9997a7

commit | commitdiff | tree

Daniel Xie [Tue, 13 Sep 2016 19:09:08 +0000 (19:09 +0000)]

Merge "CP: Fix ext check in EXT_draw_buffers_indexed negative tests" into nougat-cts-dev am: f594c550af am: d1f5a0bee2
am: a78a7b91a8

Change-Id: I2a0365dc24e2898bb0c0ecfac9dfbef55716f229

commit | commitdiff | tree

Pyry Haulos [Tue, 13 Sep 2016 19:07:39 +0000 (19:07 +0000)]

CP: Fix ext check in EXT_draw_buffers_indexed negative tests am: 3962010752 am: bfd422cf9a
am: 37b6b43735

Change-Id: I63dceb7c212e89a67871c95342260b076aa51e64

commit | commitdiff | tree

Daniel Xie [Tue, 13 Sep 2016 19:07:37 +0000 (19:07 +0000)]

Merge "CP: Fix geometry shader support check" into nougat-cts-dev am: 54d4c9f476 am: 0c725c5a41
am: b9417cf065

Change-Id: I2a8a992d4728cbb46c1243f5cf235a2231f7c9ab

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Pyry Haulos [Tue, 13 Sep 2016 19:05:21 +0000 (19:05 +0000)]

resolve merge conflicts of 3ffc2f2 to master
am: f2c82779ae

Change-Id: If42ab81eae41f7e0c61abb4997df4221361fd0b7

commit | commitdiff | tree

Daniel Xie [Tue, 13 Sep 2016 19:05:20 +0000 (19:05 +0000)]

Merge "CP: Reduce max iter count in alloc_callback_fail.device" into nougat-cts-dev am: a268fcbaff
am: 30b11fbc7b

Change-Id: I6bd7765879a05665e975b97ae501fcb1616159dd

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Pyry Haulos [Tue, 13 Sep 2016 19:04:45 +0000 (19:04 +0000)]

CP: Reduce max iter count in alloc_callback_fail.device am: ef5688dda6
am: 9872f68221

Change-Id: I397b9b4f8abc857ce917e8a539a65ad4f965715b

commit | commitdiff | tree

Daniel Xie [Tue, 13 Sep 2016 19:04:44 +0000 (19:04 +0000)]

Merge changes I212a8bc2,I476b6586 into nougat-cts-dev am: 83683a367f
am: a69387d887

Change-Id: I9c336b20b449ba22fa94b3a61bbcb9bbec76e8d8

commit | commitdiff | tree

Pyry Haulos [Tue, 13 Sep 2016 19:04:38 +0000 (19:04 +0000)]

DO NOT MERGE Allow old behavior in image format property tests am: 0825a289c0 -s ours
am: c9b0c26d5c -s ours

Change-Id: I28c85a91c915aee441951ffaffcb7b8fe0c57f5e

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Nanley Chery [Tue, 13 Sep 2016 19:04:33 +0000 (19:04 +0000)]

CP: Fix required sample count tests am: f6a815214a
am: b738653968

Change-Id: I56546a9ab91eadfcfb6a1e39704652c84376cd7e

commit | commitdiff | tree

Daniel Xie [Tue, 13 Sep 2016 19:04:33 +0000 (19:04 +0000)]

Merge "CP: Fix ext check in EXT_draw_buffers_indexed negative tests" into nougat-cts-dev am: f594c550af
am: d1f5a0bee2

Change-Id: Ibc284e55ba659f7775c4ad6a1561025bcdea02d7

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Pyry Haulos [Tue, 13 Sep 2016 19:03:50 +0000 (19:03 +0000)]

CP: Fix ext check in EXT_draw_buffers_indexed negative tests am: 3962010752
am: bfd422cf9a

Change-Id: I2a572f2925098c51c5f31b592f09e2978cfa92e1

commit | commitdiff | tree

Daniel Xie [Tue, 13 Sep 2016 19:03:49 +0000 (19:03 +0000)]

Merge "CP: Fix geometry shader support check" into nougat-cts-dev am: 54d4c9f476
am: 0c725c5a41

Change-Id: I1f44b3c0449459a57c28748c01caa8d012971439

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Pyry Haulos [Tue, 13 Sep 2016 18:55:40 +0000 (11:55 -0700)]

resolve merge conflicts of 3ffc2f2 to master

Change-Id: I07d298ed07bd4ddf30742317bab83b660df76fb9

commit | commitdiff | tree

Daniel Xie [Tue, 13 Sep 2016 18:48:41 +0000 (18:48 +0000)]

Merge "CP: Reduce max iter count in alloc_callback_fail.device" into nougat-cts-dev
am: a268fcbaff

Change-Id: Ic3fe280bfa845811e3331b787c5b3ce0e82d3416

commit | commitdiff | tree

Pyry Haulos [Tue, 13 Sep 2016 18:48:40 +0000 (18:48 +0000)]

CP: Reduce max iter count in alloc_callback_fail.device
am: ef5688dda6

Change-Id: I6d9a12724828b96cbb9f7ecc74f36d3a9419d167

commit | commitdiff | tree

Daniel Xie [Tue, 13 Sep 2016 18:48:35 +0000 (18:48 +0000)]

Merge changes I212a8bc2,I476b6586 into nougat-cts-dev
am: 83683a367f

Change-Id: Id16aa41cac62e174574184d9deb00550dbd507a1

commit | commitdiff | tree

Pyry Haulos [Tue, 13 Sep 2016 18:48:34 +0000 (18:48 +0000)]

DO NOT MERGE Allow old behavior in image format property tests
am: 0825a289c0 -s ours

Change-Id: I3a0eb1f790ddfb0ca10bba0717e964d1139513bf

commit | commitdiff | tree

Nanley Chery [Tue, 13 Sep 2016 18:48:27 +0000 (18:48 +0000)]

CP: Fix required sample count tests
am: f6a815214a

Change-Id: I7e697e19ac7f1648fffc123a3e28ea0766fe5d9b

commit | commitdiff | tree

Daniel Xie [Tue, 13 Sep 2016 18:48:23 +0000 (18:48 +0000)]

Merge "CP: Fix ext check in EXT_draw_buffers_indexed negative tests" into nougat-cts-dev
am: f594c550af

Change-Id: I1d972e7094a87100847b822413e59914333832fd

commit | commitdiff | tree

Pyry Haulos [Tue, 13 Sep 2016 18:48:21 +0000 (18:48 +0000)]

CP: Fix ext check in EXT_draw_buffers_indexed negative tests
am: 3962010752

Change-Id: Ia83f5bf6db8579d21e99781883ee59501760e52c

commit | commitdiff | tree

Daniel Xie [Tue, 13 Sep 2016 18:47:30 +0000 (18:47 +0000)]

Merge "CP: Fix geometry shader support check" into nougat-cts-dev
am: 54d4c9f476

Change-Id: I16f170e6a8b1814353473dd382da85aee2508e15

commit | commitdiff | tree

Pyry Haulos [Tue, 13 Sep 2016 18:47:30 +0000 (18:47 +0000)]

CP: Fix geometry shader support check
am: 0da63cfe1d

Change-Id: Id94fa9a3eaa0bab514bd68f70e4a418565b17a74

commit | commitdiff | tree

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

commit | commitdiff | tree

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