Pyry Haulos [Thu, 15 Sep 2016 23:41:09 +0000 (23:41 +0000)]
Merge aosp/upstream-vulkan-cts-1.0-dev into aosp/master am:
1a6d3c9ee7 am:
1d692218d3 am:
927151c175
am:
96a56feb11
Change-Id: Idebdf8b5419468831f8e2667c6e50d1bcbc2c426
Pyry Haulos [Thu, 15 Sep 2016 23:38:35 +0000 (23:38 +0000)]
Merge aosp/upstream-vulkan-cts-1.0-dev into aosp/master am:
1a6d3c9ee7 am:
1d692218d3
am:
927151c175
Change-Id: I20e9d3ac41b67b4731098a64a2be30f1311ec3ad
Pyry Haulos [Thu, 15 Sep 2016 23:35:35 +0000 (23:35 +0000)]
Merge aosp/upstream-vulkan-cts-1.0-dev into aosp/master am:
1a6d3c9ee7
am:
1d692218d3
Change-Id: I925131a5eac48ef205f80695d6a6261b7fde1ac4
Pyry Haulos [Thu, 15 Sep 2016 23:31:58 +0000 (23:31 +0000)]
Merge aosp/upstream-vulkan-cts-1.0-dev into aosp/master
am:
1a6d3c9ee7
Change-Id: I632b1f98db42f54c4798f51d77a1e743ca3934c6
Pyry Haulos [Thu, 15 Sep 2016 21:43:57 +0000 (14:43 -0700)]
Merge aosp/upstream-vulkan-cts-1.0-dev into aosp/master
Change-Id: I850bae53652ab1e2475754324d972e85f2daff99
Pyry Haulos [Thu, 15 Sep 2016 20:03:24 +0000 (13:03 -0700)]
Move texture_filtering.explicit_lod under dEQP-VK.texture
Change-Id: I25a1a6e5910814ef010942d11787b6c5969b4021
Zoltan Janos Szabo [Fri, 15 Jul 2016 10:21:05 +0000 (12:21 +0200)]
Add Vulkan port of the GLES3 texture mipmap tests
Change-Id: I5c5d9d83a7f284cf0f561d4a4725f95e37cb2842
Peter Siket [Fri, 15 Jul 2016 10:14:39 +0000 (12:14 +0200)]
Add Vulkan port of the GLES3 texture filtering tests
Change-Id: I3aaf5ed38ba63067f5d205317f26818ba42df925
Pyry Haulos [Thu, 15 Sep 2016 20:28:45 +0000 (20:28 +0000)]
DO NOT MERGE Allow old behavior in image format property tests am:
a25304112b am:
a9ae8b26a2
am:
6ae5082e37 -s ours
Change-Id: I111997719d39267c3161355f157ff42aaa9ef5d1
Pyry Haulos [Thu, 15 Sep 2016 20:23:39 +0000 (20:23 +0000)]
DO NOT MERGE Allow old behavior in image format property tests am:
a25304112b
am:
a9ae8b26a2
Change-Id: I318734d1bc177d2d8631321c1fa75a92eda40a89
Pyry Haulos [Thu, 15 Sep 2016 20:16:46 +0000 (16:16 -0400)]
Merge "Add new files to Android.mk" into vulkan-cts-1.0-dev
Pyry Haulos [Thu, 15 Sep 2016 20:15:27 +0000 (20:15 +0000)]
DO NOT MERGE Allow old behavior in image format property tests
am:
a25304112b
Change-Id: I94d91c5df6d360a90aa759df9012992868b0a86d
Pyry Haulos [Thu, 15 Sep 2016 20:05:03 +0000 (13:05 -0700)]
Add new files to Android.mk
Change-Id: Ie9dee591212230db3a2d9cafcbdfbc794c966965
Arkadiusz Sarwa [Thu, 21 Jul 2016 07:38:11 +0000 (09:38 +0200)]
Resolve image test: 2d array
New tests:
- dEQP-VK.api.copy_and_blit.resolve_image.whole_copy_before_resolving*
- dEQP-VK.api.copy_and_blit.resolve_image.whole_array_image*
Fixes #438
Change-Id: Idfc02e7ada4c53b5706ac17cb9d32dfd77d22869
Pyry Haulos [Thu, 15 Sep 2016 19:23:11 +0000 (15:23 -0400)]
Merge "Add multisampled storage image load/store test" into vulkan-cts-1.0-dev
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
Bug:
31516480
(cherry picked from commit
0825a289c0d3fc796906790e0190e5771843c4e1)
Change-Id: I40168152251c7ae55d3eaa995bcf44e9f7cec04f
Julius D'souza [Thu, 15 Sep 2016 17:16:46 +0000 (17:16 +0000)]
Merge "Use tradefed AbiUtils"
Pyry Haulos [Tue, 30 Aug 2016 22:50:53 +0000 (15:50 -0700)]
Update framework to vulkan.h 1.0.26
Change-Id: I7ecdeb1dbadd0fb3983f4a49db87781220ef172a
Daniel Xie [Wed, 14 Sep 2016 20:20:45 +0000 (20:20 +0000)]
Merge "CP: Split load/store image tests into sub-groups" into nougat-cts-dev am:
ec5c5c216e am:
7664fa49e5 am:
05ad37b721 am:
f5ba8f9e42
am:
de490e515f
Change-Id: I195250bd280c3f9001e4d92515d2d98576956713
Pyry Haulos [Wed, 14 Sep 2016 20:20:45 +0000 (20:20 +0000)]
resolve merge conflicts of b172f9e to master am:
ed8e08ff82 am:
657bfbfb71 am:
29baf28a2f
am:
cc191e57bf
Change-Id: I83e0feec7501f032e0c291d3b2c28af1f4c0821f
Daniel Xie [Wed, 14 Sep 2016 20:09:32 +0000 (20:09 +0000)]
Merge "CP: Split load/store image tests into sub-groups" into nougat-cts-dev am:
ec5c5c216e am:
7664fa49e5 am:
05ad37b721
am:
f5ba8f9e42
Change-Id: I17056b375f7ec659eeec4aeacca63e62c5afaaeb
Pyry Haulos [Wed, 14 Sep 2016 20:09:31 +0000 (20:09 +0000)]
resolve merge conflicts of b172f9e to master am:
ed8e08ff82 am:
657bfbfb71
am:
29baf28a2f
Change-Id: Ic5e033debdc6cafba026c9f40efaab8c4f83f746
Daniel Xie [Wed, 14 Sep 2016 20:06:34 +0000 (20:06 +0000)]
Merge "CP: Split load/store image tests into sub-groups" into nougat-cts-dev am:
ec5c5c216e am:
7664fa49e5
am:
05ad37b721
Change-Id: I740975c499edb69cef680fd9f206c11851fde099
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
Daniel Xie [Wed, 14 Sep 2016 20:03:35 +0000 (20:03 +0000)]
Merge "CP: Split load/store image tests into sub-groups" into nougat-cts-dev am:
ec5c5c216e
am:
7664fa49e5
Change-Id: I0d5742b8d753b9e00e4c688828f4e6461181e2a5
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 19:54:32 +0000 (19:54 +0000)]
Merge "CP: Split load/store image tests into sub-groups" into nougat-cts-dev
am:
ec5c5c216e
Change-Id: I740f1709bd42aa1986e31a5d9b3192f9070212e0
Daniel Xie [Wed, 14 Sep 2016 19:17:34 +0000 (19:17 +0000)]
Merge "CP: Split load/store image tests into sub-groups" into nougat-cts-dev am:
ec5c5c216e am:
c992a8ba9d am:
9ddfc1fee2 am:
f46c3bd1eb am:
b97db8c198
am:
6f7cf16a63
Change-Id: I5bce9c6a7866d0b523473614976fcb31d3b4b166
Kalle Raita [Wed, 14 Sep 2016 19:17:33 +0000 (19:17 +0000)]
CP: Split load/store image tests into sub-groups am:
b172f9eb57 am:
8afe1d6b23 am:
26df49710f am:
03af70d91b am:
b989b67715
am:
b37b57916c
Change-Id: Ife699c6e287b00870ed247e92e264b54983ee278
Daniel Xie [Wed, 14 Sep 2016 19:17:32 +0000 (19:17 +0000)]
Merge "CP: Split load/store image tests into sub-groups" into nougat-cts-dev am:
ec5c5c216e am:
c992a8ba9d am:
9c2b1c4012
am:
b260761fb8
Change-Id: I9f0a164e03fdcabbf978e45ee2732ce6d153e235
Pyry Haulos [Wed, 14 Sep 2016 19:17:32 +0000 (19:17 +0000)]
resolve merge conflicts of 8afe1d6 to nyc-dev-plus-aosp am:
0d151184d5
am:
f47f5ecf0b
Change-Id: I8c6b0e792ca70866df83d96a6ce2cd6ef24e1f9f
Daniel Xie [Wed, 14 Sep 2016 19:05:34 +0000 (19:05 +0000)]
Merge "CP: Split load/store image tests into sub-groups" into nougat-cts-dev am:
ec5c5c216e am:
c992a8ba9d am:
9ddfc1fee2 am:
f46c3bd1eb
am:
b97db8c198
Change-Id: I88a1c6097d1d31fe5446b0c0dbfa0fa0a9cc66f3
Kalle Raita [Wed, 14 Sep 2016 19:05:32 +0000 (19:05 +0000)]
CP: Split load/store image tests into sub-groups am:
b172f9eb57 am:
8afe1d6b23 am:
26df49710f am:
03af70d91b
am:
b989b67715
Change-Id: Iaaae754abf75f96221d04c42733a2accc5b13ed0
Daniel Xie [Wed, 14 Sep 2016 19:02:31 +0000 (19:02 +0000)]
Merge "CP: Split load/store image tests into sub-groups" into nougat-cts-dev am:
ec5c5c216e am:
c992a8ba9d
am:
9c2b1c4012
Change-Id: I209f398e771bf826ee4bd5b2f6c5d612a880a78d
Pyry Haulos [Wed, 14 Sep 2016 19:02:29 +0000 (19:02 +0000)]
resolve merge conflicts of 8afe1d6 to nyc-dev-plus-aosp
am:
0d151184d5
Change-Id: I25450768dbdbadf87b17e51453a64c7f7ac7a433
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
Daniel Xie [Wed, 14 Sep 2016 18:53:27 +0000 (18:53 +0000)]
Merge "CP: Split load/store image tests into sub-groups" into nougat-cts-dev am:
ec5c5c216e am:
c992a8ba9d am:
9ddfc1fee2
am:
f46c3bd1eb
Change-Id: I9a5f16fa7432a612cb25927cd7926bb659f58a2c
Kalle Raita [Wed, 14 Sep 2016 18:53:26 +0000 (18:53 +0000)]
CP: Split load/store image tests into sub-groups am:
b172f9eb57 am:
8afe1d6b23 am:
26df49710f
am:
03af70d91b
Change-Id: Iaaf55b3c839b003dbcbaaa2e835126b040a8aef4
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:47:57 +0000 (18:47 +0000)]
Merge "CP: Split load/store image tests into sub-groups" into nougat-cts-dev am:
ec5c5c216e am:
c992a8ba9d
am:
9ddfc1fee2
Change-Id: Id818e9ab4a7dda439ed497a4d01d0bd2fe782533
Kalle Raita [Wed, 14 Sep 2016 18:47:56 +0000 (18:47 +0000)]
CP: Split load/store image tests into sub-groups am:
b172f9eb57 am:
8afe1d6b23
am:
26df49710f
Change-Id: I8cb807ff774d7073519206e098e12966a61e7871
Daniel Xie [Wed, 14 Sep 2016 18:41:54 +0000 (18:41 +0000)]
Merge "CP: Split load/store image tests into sub-groups" into nougat-cts-dev am:
ec5c5c216e
am:
c992a8ba9d
Change-Id: I56c5d4e1a0ca5fdb91b2bf6a3b72a4590ce8ed48
Kalle Raita [Wed, 14 Sep 2016 18:41:54 +0000 (18:41 +0000)]
CP: Split load/store image tests into sub-groups am:
b172f9eb57
am:
8afe1d6b23
Change-Id: Ib26511830bd315177922615543f9592c2496564a
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
Maciej Jesionowski [Thu, 28 Jul 2016 08:57:30 +0000 (10:57 +0200)]
Add multisampled storage image load/store test
New tests:
- dEQP-VK.image.load_store_multisample.2d.*
- dEQP-VK.image.load_store_multisample.2d_array.*
Fixes #439
Change-Id: I584f3795dc8f50af753d8dea8b8c47906840770a
Julius D'souza [Tue, 13 Sep 2016 17:40:07 +0000 (10:40 -0700)]
Use tradefed AbiUtils
Bug:
31234712
Change-Id: Ia025471a3626d2d3163a4d1f3be6cad0e643ca97
Jamie Madill [Tue, 13 Sep 2016 20:16:55 +0000 (20:16 +0000)]
Merge "Remove use of varargs.h from deString.c." am:
ca988480be am:
6140614e6d am:
895dcf4469
am:
29fce3bfff
Change-Id: I7cb46e1e1589910eb3590b9459639a72be4f4230
Daniel Xie [Tue, 13 Sep 2016 20:16:53 +0000 (20:16 +0000)]
Merge "CP: Require 'master' config to be supported in Android CTS" into nougat-cts-dev am:
84173082ee am:
e9835d0aa0 am:
dcf24e8326 am:
910b6e1307
am:
3e8cc8637b
Change-Id: I894f2dd0e8079df9155d412f8b0926dacd683242
Pyry Haulos [Tue, 13 Sep 2016 20:16:49 +0000 (20:16 +0000)]
CP: Require 'master' config to be supported in Android CTS am:
03d217bb53 am:
5eaf6f98bd am:
ca2f7af916 am:
82f012b41b
am:
a0b233c828
Change-Id: Id849b1f198aecffa2dc54668d2c5231bed3a3250
Daniel Xie [Tue, 13 Sep 2016 20:16:11 +0000 (20:16 +0000)]
Merge "CP: Handle EGL_EXT_yuv_surface in eglChooseConfig() tests" into nougat-cts-dev am:
1ad2703e25 am:
913aabf8c3 am:
88682bbc44 am:
870b5a5ef2
am:
03f1d2f94f
Change-Id: Ie8a57f4c4d6c9f26cca2de503868248d23369a8c
Pyry Haulos [Tue, 13 Sep 2016 20:16:10 +0000 (20:16 +0000)]
CP: Handle EGL_EXT_yuv_surface in eglChooseConfig() tests am:
521bb16575 am:
8d8aa8f78a am:
e893539121 am:
b371b20cf3
am:
d970510833
Change-Id: I2eb6f8fd64a75cec3c448dbc3e955f9c1a8a4fae
Daniel Xie [Tue, 13 Sep 2016 20:16:09 +0000 (20:16 +0000)]
Merge "Remove a few EGL tests using RGBA4 format from mustpass" into nougat-cts-dev am:
451fa7c581 am:
65b5f9fa73 am:
bc61735bb8 am:
9103405f3c
am:
ec637cb60b
Change-Id: Iaba2caed55651f705ee7e558841ac52417a7d2da
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
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
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
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
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
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
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
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
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
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
Jamie Madill [Tue, 13 Sep 2016 19:16:41 +0000 (19:16 +0000)]
Merge "Remove use of varargs.h from deString.c." am:
ca988480be am:
6140614e6d
am:
895dcf4469
Change-Id: Ib233cae0e17c66ae507c9144b4045dceb7509c30
Daniel Xie [Tue, 13 Sep 2016 19:16:38 +0000 (19:16 +0000)]
Merge "CP: Require 'master' config to be supported in Android CTS" into nougat-cts-dev am:
84173082ee am:
e9835d0aa0 am:
dcf24e8326
am:
910b6e1307
Change-Id: I34a8d98620e522244bcc6e60da9173c5b7b00db1
Pyry Haulos [Tue, 13 Sep 2016 19:16:35 +0000 (19:16 +0000)]
CP: Require 'master' config to be supported in Android CTS am:
03d217bb53 am:
5eaf6f98bd am:
ca2f7af916
am:
82f012b41b
Change-Id: I720780531cfc17eae2c9ac644b4c524bbfedd0ec
Daniel Xie [Tue, 13 Sep 2016 19:15:52 +0000 (19:15 +0000)]
Merge "CP: Handle EGL_EXT_yuv_surface in eglChooseConfig() tests" into nougat-cts-dev am:
1ad2703e25 am:
913aabf8c3 am:
88682bbc44
am:
870b5a5ef2
Change-Id: I8ea128babb024606718a3ef9c15dcf86397add9f
Pyry Haulos [Tue, 13 Sep 2016 19:15:48 +0000 (19:15 +0000)]
CP: Handle EGL_EXT_yuv_surface in eglChooseConfig() tests am:
521bb16575 am:
8d8aa8f78a am:
e893539121
am:
b371b20cf3
Change-Id: Ie45b7cf9acf0ae84729456875b84099c5d4c3f96
Daniel Xie [Tue, 13 Sep 2016 19:15:47 +0000 (19:15 +0000)]
Merge "Remove a few EGL tests using RGBA4 format from mustpass" into nougat-cts-dev am:
451fa7c581 am:
65b5f9fa73 am:
bc61735bb8
am:
9103405f3c
Change-Id: I315e3cd97bf1f224bc82c42bde97ad1f6a591c4a
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
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
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
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
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
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
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
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: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
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
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