Pyry Haulos [Wed, 14 Sep 2016 20:06:32 +0000 (20:06 +0000)]
resolve merge conflicts of b172f9e to master am:
ed8e08ff82
am:
657bfbfb71
Change-Id: I329c5178d1e1f453313f99ca9019ba9f7ba3fa8c
Pyry Haulos [Wed, 14 Sep 2016 20:03:34 +0000 (20:03 +0000)]
resolve merge conflicts of b172f9e to master
am:
ed8e08ff82
Change-Id: I87eea013265484e330874608de507e8f6c193e02
Daniel Xie [Wed, 14 Sep 2016 18:59:32 +0000 (18:59 +0000)]
Merge "CP: Split load/store image tests into sub-groups" into nougat-cts-dev am:
ec5c5c216e
am:
c992a8ba9d
Change-Id: Ie9a389b9d5b1b478115d25d411f3b13b0a5e3b5f
Pyry Haulos [Wed, 14 Sep 2016 18:51:18 +0000 (11:51 -0700)]
resolve merge conflicts of 8afe1d6 to nyc-dev-plus-aosp
Change-Id: I590938d9af1d9d7071a6c256d38c2e5d006c1e7e
Daniel Xie [Wed, 14 Sep 2016 18:38:57 +0000 (18:38 +0000)]
Merge "CP: Split load/store image tests into sub-groups" into nougat-cts-dev
am:
ec5c5c216e
Change-Id: Ie5a92b067caf223b0df3b07f451579454bd1debc
Kalle Raita [Wed, 14 Sep 2016 18:38:57 +0000 (18:38 +0000)]
CP: Split load/store image tests into sub-groups
am:
b172f9eb57
Change-Id: I073d39676cbe70007fa730e6279cea49c1f3758a
Pyry Haulos [Wed, 14 Sep 2016 18:21:59 +0000 (11:21 -0700)]
resolve merge conflicts of b172f9e to master
Change-Id: I0c7d20251f170c86f21312222abfc0803a697c1d
Daniel Xie [Wed, 14 Sep 2016 18:15:10 +0000 (18:15 +0000)]
Merge "CP: Split load/store image tests into sub-groups" into nougat-cts-dev
Jamie Madill [Tue, 13 Sep 2016 19:13:08 +0000 (19:13 +0000)]
Merge "Remove use of varargs.h from deString.c." am:
ca988480be
am:
6140614e6d
Change-Id: I30c54a09b4a594beac8c5d2156f3bf3c07a73bce
Daniel Xie [Tue, 13 Sep 2016 19:12:41 +0000 (19:12 +0000)]
Merge "CP: Require 'master' config to be supported in Android CTS" into nougat-cts-dev am:
84173082ee am:
e9835d0aa0
am:
dcf24e8326
Change-Id: I1b29b5eeca77fff3e8db9059a92bec74edd5060d
Pyry Haulos [Tue, 13 Sep 2016 19:12:38 +0000 (19:12 +0000)]
CP: Require 'master' config to be supported in Android CTS am:
03d217bb53 am:
5eaf6f98bd
am:
ca2f7af916
Change-Id: Ica084483e8ad0446a35484fb4811a589d4f2b2d4
Daniel Xie [Tue, 13 Sep 2016 19:12:35 +0000 (19:12 +0000)]
Merge "CP: Handle EGL_EXT_yuv_surface in eglChooseConfig() tests" into nougat-cts-dev am:
1ad2703e25 am:
913aabf8c3
am:
88682bbc44
Change-Id: I09c2d484d251e83f977d0878ea6b9326fa943a69
Pyry Haulos [Tue, 13 Sep 2016 19:12:33 +0000 (19:12 +0000)]
CP: Handle EGL_EXT_yuv_surface in eglChooseConfig() tests am:
521bb16575 am:
8d8aa8f78a
am:
e893539121
Change-Id: Iac20c0f248ec966de8cdbc7d55bce312eded230a
Daniel Xie [Tue, 13 Sep 2016 19:12:31 +0000 (19:12 +0000)]
Merge "Remove a few EGL tests using RGBA4 format from mustpass" into nougat-cts-dev am:
451fa7c581 am:
65b5f9fa73
am:
bc61735bb8
Change-Id: I4ef0eb703ca17f6bf418a24e8ed15eecd941c262
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
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
Jamie Madill [Tue, 13 Sep 2016 19:09:49 +0000 (19:09 +0000)]
Merge "Remove use of varargs.h from deString.c."
am:
ca988480be
Change-Id: Ia5d220880a054269ef1d2f21297086ec9f4a700d
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
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
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
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
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
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
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
Daniel Xie [Tue, 13 Sep 2016 19:07:35 +0000 (19:07 +0000)]
Merge "CP: Require 'master' config to be supported in Android CTS" into nougat-cts-dev am:
84173082ee
am:
e9835d0aa0
Change-Id: Ife2715575e55a709cda64fb854743d40cf38332c
Pyry Haulos [Tue, 13 Sep 2016 19:07:34 +0000 (19:07 +0000)]
CP: Require 'master' config to be supported in Android CTS am:
03d217bb53
am:
5eaf6f98bd
Change-Id: If2ce0d401e5d46e6746bdbb0ec248bf49fa0d6b3
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:33 +0000 (19:07 +0000)]
Merge "CP: Handle EGL_EXT_yuv_surface in eglChooseConfig() tests" into nougat-cts-dev am:
1ad2703e25
am:
913aabf8c3
Change-Id: I8c32d73f6585e7b0c9c28ed19d3a645f8b95c816
Pyry Haulos [Tue, 13 Sep 2016 19:07:33 +0000 (19:07 +0000)]
CP: Handle EGL_EXT_yuv_surface in eglChooseConfig() tests am:
521bb16575
am:
8d8aa8f78a
Change-Id: I4ba15b1907dce4478ab5c6e532de6c5a962acd31
Daniel Xie [Tue, 13 Sep 2016 19:07:32 +0000 (19:07 +0000)]
Merge "Remove a few EGL tests using RGBA4 format from mustpass" into nougat-cts-dev am:
451fa7c581
am:
65b5f9fa73
Change-Id: I4d37488b7995de46c34b0018a3f07ef98a89f335
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:21 +0000 (19:05 +0000)]
resolve merge conflicts of 3ffc2f2 to master
am:
f2c82779ae
Change-Id: If42ab81eae41f7e0c61abb4997df4221361fd0b7
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
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
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
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
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
Treehugger Robot [Tue, 13 Sep 2016 19:04:35 +0000 (19:04 +0000)]
Merge "Remove use of varargs.h from deString.c."
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
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
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
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:50 +0000 (19:03 +0000)]
CP: Fix ext check in EXT_draw_buffers_indexed negative tests am:
3962010752
am:
bfd422cf9a
Change-Id: I2a572f2925098c51c5f31b592f09e2978cfa92e1
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
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
Daniel Xie [Tue, 13 Sep 2016 18:59:03 +0000 (18:59 +0000)]
Merge "CP: Require 'master' config to be supported in Android CTS" into nougat-cts-dev
am:
84173082ee
Change-Id: I766949543602454bff23742a314d00c4532f41d5
Pyry Haulos [Tue, 13 Sep 2016 18:59:02 +0000 (18:59 +0000)]
CP: Require 'master' config to be supported in Android CTS
am:
03d217bb53
Change-Id: Ic330a2d7eb30081a3f7642b1e804f6ad3adfe83f
Daniel Xie [Tue, 13 Sep 2016 18:59:00 +0000 (18:59 +0000)]
Merge "CP: Handle EGL_EXT_yuv_surface in eglChooseConfig() tests" into nougat-cts-dev
am:
1ad2703e25
Change-Id: I30672a8055d06a2fabaa57ac6b27af29d5a1f786
Pyry Haulos [Tue, 13 Sep 2016 18:58:59 +0000 (18:58 +0000)]
CP: Handle EGL_EXT_yuv_surface in eglChooseConfig() tests
am:
521bb16575
Change-Id: Ic1cbab12b8439e65790c3f0c9bf10f1bae2e7ebb
Daniel Xie [Tue, 13 Sep 2016 18:58:56 +0000 (18:58 +0000)]
Merge "Remove a few EGL tests using RGBA4 format from mustpass" into nougat-cts-dev
am:
451fa7c581
Change-Id: If88bb8b4171508813a0127bbaf27867a4510a01e
Pyry Haulos [Tue, 13 Sep 2016 18:55:40 +0000 (11:55 -0700)]
resolve merge conflicts of 3ffc2f2 to master
Change-Id: I07d298ed07bd4ddf30742317bab83b660df76fb9
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
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
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
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
Nanley Chery [Tue, 13 Sep 2016 18:48:27 +0000 (18:48 +0000)]
CP: Fix required sample count tests
am:
f6a815214a
Change-Id: I7e697e19ac7f1648fffc123a3e28ea0766fe5d9b
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
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
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
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 17:19:43 +0000 (17:19 +0000)]
Merge "Fix sample_mask_in.bit_count_per_two_samples tests for 2x MSAA." am:
ba98ecd5d0
am:
96bef1f84e
Change-Id: I370b5202f02268f6013db05c4056d0ba464ad0df
Kenneth Graunke [Tue, 13 Sep 2016 17:17:12 +0000 (17:17 +0000)]
Merge "Fix sample_mask_in.bit_count_per_two_samples tests for 2x MSAA."
am:
ba98ecd5d0
Change-Id: I37c1c6e5070c6fa66d9bcec03d4ce22d6127106b
Jamie Madill [Thu, 4 Aug 2016 14:06:52 +0000 (10:06 -0400)]
Remove use of varargs.h from deString.c.
This file is no longer necessary for MSVS, and messes up the Clang
Windows build.
Daniel Xie [Tue, 13 Sep 2016 17:15:10 +0000 (17:15 +0000)]
Merge "CP: Require 'master' config to be supported in Android CTS" into nougat-cts-dev am:
84173082ee
am:
72e1df9930
Change-Id: I5a9374fdb7183b3a0a1f5bc4d880217d27edb3dd
Pyry Haulos [Tue, 13 Sep 2016 17:15:09 +0000 (17:15 +0000)]
CP: Require 'master' config to be supported in Android CTS am:
03d217bb53
am:
e0c1316159
Change-Id: I7fb762a09b8f7e004f11f64c1387bb120890d516
Daniel Xie [Tue, 13 Sep 2016 17:15:08 +0000 (17:15 +0000)]
Merge "CP: Handle EGL_EXT_yuv_surface in eglChooseConfig() tests" into nougat-cts-dev am:
1ad2703e25
am:
d93a153fd4
Change-Id: I7de86ea2c0785bbeb62f0fe881d2459247eedcab
Pyry Haulos [Tue, 13 Sep 2016 17:15:08 +0000 (17:15 +0000)]
CP: Handle EGL_EXT_yuv_surface in eglChooseConfig() tests am:
521bb16575
am:
fdd3db3693
Change-Id: I853620ed4b08bde808111b9f84fef9bd0e068b4b
Daniel Xie [Tue, 13 Sep 2016 17:15:05 +0000 (17:15 +0000)]
Merge "Remove a few EGL tests using RGBA4 format from mustpass" into nougat-cts-dev am:
451fa7c581
am:
99925909af
Change-Id: I87b00ff49e2c9f3016d5a4a88bac7fa15cd4ed48
projects / platform / upstream / VK-GL-CTS.git / log