Kalle Raita [Tue, 22 Aug 2017 18:37:20 +0000 (18:37 +0000)]
CP: Use empty region when buffer age is not supported am:
8230646213 am:
5997f85ae1 am:
61e8a65852 am:
11a76fa000
am:
9ec536d1e1
Change-Id: I3206ed8f12720dd90d17dafb52c4a7a3390cd1b9
Tina Zhou [Tue, 22 Aug 2017 18:36:55 +0000 (18:36 +0000)]
Merge "Fix deStrnlen fall-back implementation" into nougat-cts-dev am:
a04db6628e am:
b484689e86 am:
b7b7984913 am:
d12482a525
am:
ccb8fde217
Change-Id: If0dc13f5f66dad71be6926a44cdaa96216dde9fc
Pyry Haulos [Tue, 22 Aug 2017 18:36:38 +0000 (18:36 +0000)]
Fix deStrnlen fall-back implementation am:
54ebe093a9 am:
d4fee8c43b am:
778bc2435a am:
583765b8b2
am:
859833aab0
Change-Id: Id50efa7c952aeb588cd03c886e7f68e822bf9e67
Tina Zhou [Tue, 22 Aug 2017 18:36:22 +0000 (18:36 +0000)]
Merge "Remove a few preprocessor cases testing undefined behavior" into nougat-cts-dev am:
4275d2099c am:
75cbc40ebf am:
6ef846f260 am:
99e0f4ab5e
am:
18dcbb32ef
Change-Id: I4f03e156e1ac6972c1f4327749a3c699cf7580a7
Pyry Haulos [Tue, 22 Aug 2017 18:36:05 +0000 (18:36 +0000)]
resolve merge conflicts of e5f7483 to master am:
c4598ea31b am:
8e2e181bd6 am:
cd63b8bc85
am:
e713959f89
Change-Id: I2b1ca5f8b99ea1162fd71d0e729e377604086a9b
Tina Zhou [Tue, 22 Aug 2017 18:35:51 +0000 (18:35 +0000)]
Merge "Check for shader type support in negative precise tests" into nougat-cts-dev am:
c30d04b8e7 am:
3766bd80e2 am:
298ccacd02 am:
39fb3ed56c am:
7d8ad93b46 am:
7398574447
am:
533566c569
Change-Id: I542b32d0d7e22d672805f6c12f98a757ad4a70e6
Pyry Haulos [Tue, 22 Aug 2017 18:35:38 +0000 (18:35 +0000)]
Check for shader type support in negative precise tests am:
4a3a2d79a0 am:
dd142e90db am:
def3338070 am:
6dee5b33a4 am:
5d2d0738a7 am:
9911b7cbe5
am:
a01df562fa
Change-Id: I1c1afb8b97f35254d22ad7aaacad442d9953277f
Tina Zhou [Tue, 22 Aug 2017 18:35:23 +0000 (18:35 +0000)]
Merge "Check for shader type support in negative shader directive tests" into nougat-cts-dev am:
a3513e86ff am:
5b8758faed am:
17116fd375 am:
8ab480579c am:
2e202ebf40 am:
7ea4640e9e
am:
9627603c6d
Change-Id: I41734946eae685047f83ec3bcf85c48d44208a25
Pyry Haulos [Tue, 22 Aug 2017 18:35:05 +0000 (18:35 +0000)]
Check for shader type support in negative shader directive tests am:
cf6e6ab134 am:
b9611b0106 am:
86ccb86120 am:
cd315fa2d3 am:
a4d11f02f8 am:
f5b5eae442
am:
848bbeaee8
Change-Id: I3420e52a466376d76437df277ca5bebb8afe5b76
Tina Zhou [Tue, 22 Aug 2017 18:34:33 +0000 (18:34 +0000)]
Merge "Check for shader type support in negative precise tests" into nougat-cts-dev am:
c30d04b8e7 am:
5d4bf790d7 am:
c5237d7240 am:
b2429a3bf2
am:
8db9edd40f
Change-Id: I9587fd7c889b757c1766a6dd6e6989aff5a0ceee
Pyry Haulos [Tue, 22 Aug 2017 18:34:19 +0000 (18:34 +0000)]
Check for shader type support in negative precise tests am:
4a3a2d79a0 am:
09137b73d2 am:
21efe91dfc am:
39ac26a1e7
am:
ce93ba4342
Change-Id: I321cefdf0520d6b2db06ba185f566941a8b00957
Tina Zhou [Tue, 22 Aug 2017 18:34:07 +0000 (18:34 +0000)]
Merge "Check for shader type support in negative shader directive tests" into nougat-cts-dev am:
a3513e86ff am:
6fa068040b am:
444946b13a am:
a2f17e5e54
am:
5b8c86ea92
Change-Id: Id7fc06cc78039de161a4ceec108dd78d785325b4
Pyry Haulos [Tue, 22 Aug 2017 18:33:53 +0000 (18:33 +0000)]
Check for shader type support in negative shader directive tests am:
cf6e6ab134 am:
3dd07d23f6 am:
29d64a978d am:
83815b4221
am:
d108cb3faf
Change-Id: Ifbc875c100bdf35a528747a4318abecb7e28e35d
Colin Cross [Tue, 22 Aug 2017 18:33:39 +0000 (18:33 +0000)]
Fix -Wc++11-narrowing warnings am:
41460f757d am:
90b58859d2 am:
f2ca32c7af
am:
dc163299e9
Change-Id: I0c44dab71a70ea04a4e2e91fb8772a169f089513
Pyry Haulos [Tue, 22 Aug 2017 18:33:27 +0000 (18:33 +0000)]
Merge aosp/upstream-vulkan-cts-1.0-dev into aosp/master am:
5f69b27051 am:
399f8849cf am:
fabd9f85b1
am:
9265197311
Change-Id: Ic2309f6d074825c627da75283f9add3fa05dcafc
Elliott Hughes [Tue, 22 Aug 2017 18:33:13 +0000 (18:33 +0000)]
Merge "Only Windows has strnlen_s." am:
6d40724402 am:
a0e2e2b4be am:
294fcf964c am:
da2bd89612
am:
cb418c345c
Change-Id: Icc2fb533a54ede2a190afd884fdebf29882d9be3
Pyry Haulos [Tue, 22 Aug 2017 18:32:51 +0000 (18:32 +0000)]
Cherry-pick image_format_properties changes from upstream am:
43227ff1db am:
2ede225b00 am:
12ead731f2 am:
e14b1813e4 am:
2c374ee3a2 am:
21b557d3c3
am:
043191f5ad
Change-Id: I089f3bb3e64e7945468a03fb035f7f0838975050
Pyry Haulos [Tue, 22 Aug 2017 18:32:37 +0000 (18:32 +0000)]
Cherry-pick image_format_properties changes from upstream am:
43227ff1db am:
40996a98a2 am:
3edf5fa179 am:
2e3f075e22 am:
91762df407
am:
e6f0b0e41d
Change-Id: Iae16e8a7ff0467d44a27f01a3b29d14c2516f526
Pyry Haulos [Tue, 22 Aug 2017 18:32:16 +0000 (18:32 +0000)]
Cherry-pick image_format_properties changes from upstream am:
43227ff1db am:
2ede225b00 am:
6b6e193ea7 am:
94316bd1db
am:
42b75f6993
Change-Id: Id066ba0e162ed18c6db284b1f8b70a2775396884
Pyry Haulos [Tue, 22 Aug 2017 18:32:01 +0000 (18:32 +0000)]
Merge aosp/upstream-vulkan-cts-1.0-dev into aosp/master am:
984f29db76 am:
26c200ccb2 am:
853e372b40 am:
1319ab2985
am:
3342f78603
Change-Id: Ibd49a7e885e0f192abd4d4efe9b2b35294714f29
Pyry Haulos [Tue, 22 Aug 2017 18:31:45 +0000 (18:31 +0000)]
Revert "DO NOT MERGE Check only valid usages in image format query tests" am:
2a98f95c03 am:
6897aa1d74 -s ours am:
113a395a8c -s ours
am:
98a0e7017a -s ours
Change-Id: I83da3cfba139f8992e98ec0a221e52116cbeee30
Mika Isojrvi [Tue, 22 Aug 2017 18:31:33 +0000 (18:31 +0000)]
DO NOT MERGE Check only valid usages in image format query tests am:
c41d4d8427 am:
10bd378424 -s ours am:
c7a8034995 -s ours
am:
1143c73d02 -s ours
Change-Id: I41fcee52b94e3ff71932463ced77857ea05937a8
Pyry Haulos [Tue, 22 Aug 2017 18:31:17 +0000 (18:31 +0000)]
Merge aosp/upstream-vulkan-cts-1.0-dev into aosp/master am:
2f2ce0f048 am:
ea762c3174 am:
54fec9051e am:
7de6e0f3dd
am:
12568ee7fd
Change-Id: I12dbc1c0ca6b861b37b9f5168617d69226dfd35e
Pyry Haulos [Tue, 22 Aug 2017 18:31:02 +0000 (18:31 +0000)]
Merge aosp/upstream-vulkan-cts-1.0-dev into aosp/master am:
c85249943b am:
c5b63ae362 am:
49c86a205b am:
f03289c1cf
am:
c27db44702
Change-Id: Ie5ce6ec390de11dffc5e48bd4ed3775d6e8f4c12
Pyry Haulos [Tue, 22 Aug 2017 18:30:47 +0000 (18:30 +0000)]
Add license to a few utility scripts am:
f85b5c9705 am:
b30ed56bec am:
824fd20932 am:
94a8958855
am:
46e9b2768f
Change-Id: Iaabd5db4c31949a44c4fea798d2b87f409a4f7bb
Pyry Haulos [Tue, 22 Aug 2017 18:30:34 +0000 (18:30 +0000)]
Merge "Get rid of indirection when adding module directories in build" am:
fb175316d0 am:
25272a76cb am:
54b623bd05 am:
958ecd3143
am:
56687324bc
Change-Id: Ife161ecc6aab6f3e064ae2776cd82bd48ba2a7be
Pyry Haulos [Tue, 22 Aug 2017 18:30:19 +0000 (18:30 +0000)]
Merge "Remove few obsolete target files" am:
082248137d am:
6798ebf3c7 am:
9db4f9ce9a am:
89ccd0912b
am:
3bde1037f1
Change-Id: I1914948350c6b265b935a39e981a74336ffb8a5b
Pyry Haulos [Tue, 22 Aug 2017 18:30:04 +0000 (18:30 +0000)]
Merge "Add license header to main CMake files" am:
e2b5873fd8 am:
a6f3496c76 am:
5f34112b30 am:
3b110e4995
am:
8c03813598
Change-Id: Ic979fa90a81251b58889b961f2ef97b1fa62590c
Pyry Haulos [Tue, 22 Aug 2017 18:29:44 +0000 (18:29 +0000)]
Merge "Be more civil in comments" am:
775f724bcc am:
c678e93e1c am:
a1669de8bd am:
29fff31289
am:
f4b3d48ba2
Change-Id: Ia2e6dfe96b3e9a702f9d1aba71132d60a4927810
Pyry Haulos [Tue, 22 Aug 2017 18:29:24 +0000 (18:29 +0000)]
Remove obsolete cmake toolchain files am:
2e95c38041 am:
c196d5602f am:
2f6f15d081 am:
64ba23bee4
am:
8be5509f1d
Change-Id: I959424d0d02b05b10770482c6f2ea9ed201a8ff9
Pyry Haulos [Tue, 22 Aug 2017 18:29:08 +0000 (18:29 +0000)]
Merge aosp/upstream-vulkan-cts-1.0-dev into aosp/master am:
d04e72de0b am:
eac76634d8 am:
ee7ef1e2e9 am:
f3d24e55d9
am:
6c60542c23
Change-Id: I5448311acc22c4dcfc553a17bdcd351babe2e8ed
Pyry Haulos [Tue, 22 Aug 2017 18:28:56 +0000 (18:28 +0000)]
Merge aosp/upstream-vulkan-cts-1.0-dev into aosp/master am:
b3729a6431 am:
1e31d89c2a am:
d1438e5585 am:
f1fdce7bb4
am:
3dbc293d8b
Change-Id: I5d8b6783616995d1b6c02e8c349b41d9f3f3acae
Mika Isojrvi [Tue, 22 Aug 2017 18:28:41 +0000 (18:28 +0000)]
Use LDR decompression in reference for SRGB ASTC formats. am:
4db2fa91a1 am:
723b085184 am:
3cbc836706 am:
2ffe1e252e
am:
8c42018db1
Change-Id: I8467a6bf9b6164cc91a90ec9fe02fd3048315470
Pyry Haulos [Tue, 22 Aug 2017 18:28:29 +0000 (18:28 +0000)]
Merge aosp/upstream-vulkan-cts-1.0-dev into aosp/master am:
1a6d3c9ee7 am:
1d692218d3 am:
927151c175 am:
96a56feb11
am:
4fa5bb8303
Change-Id: I839b89f855df6bc6354b31ef0b5a7e65dae82154
Pyry Haulos [Tue, 22 Aug 2017 18:28:16 +0000 (18:28 +0000)]
DO NOT MERGE Allow old behavior in image format property tests am:
a25304112b am:
a9ae8b26a2 am:
6ae5082e37 -s ours
am:
7c87437844 -s ours
Change-Id: I76fd7c2ace7ae558018ae83d725c92b17ccdf28e
Julius D'souza [Tue, 22 Aug 2017 18:28:03 +0000 (18:28 +0000)]
Merge "Use tradefed AbiUtils"
am:
a571ae0f5d
Change-Id: Iee320688f05bdccbd6e40a0bab93e6e71d699072
Daniel Xie [Tue, 22 Aug 2017 18:27:47 +0000 (18:27 +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
am:
36d502c6ab
Change-Id: Id626e6c068e27f2761ec8d61c0b1b20b415fe683
Pyry Haulos [Tue, 22 Aug 2017 18:26:41 +0000 (18:26 +0000)]
resolve merge conflicts of b172f9e to master am:
ed8e08ff82 am:
657bfbfb71 am:
29baf28a2f am:
cc191e57bf
am:
843e8d6309
Change-Id: I295ed4a196593e358bffc99579fb5d302e3fefbb
Daniel Xie [Tue, 22 Aug 2017 18:26:18 +0000 (18:26 +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
am:
f6554f3007
Change-Id: Ib4232dc564d3dbbc9e4df8eff01a379a71d0e68a
Kalle Raita [Tue, 22 Aug 2017 18:25:51 +0000 (18:25 +0000)]
CP: Split load/store image tests into sub-groups am:
b172f9eb57 am:
8afe1d6b23 am:
26df49710f am:
03af70d91b am:
b989b67715 am:
b37b57916c
am:
336fcaca0e
Change-Id: I8f6ff966523657aef74c5df29a303edcb1f2c43a
Daniel Xie [Tue, 22 Aug 2017 18:25:34 +0000 (18:25 +0000)]
Merge "CP: Split load/store image tests into sub-groups" into nougat-cts-dev am:
ec5c5c216e am:
c992a8ba9d am:
9c2b1c4012 am:
b260761fb8
am:
faa5670151
Change-Id: Id6fabf0f9312aac73c3efeba1d77e5bbbab809e4
Pyry Haulos [Tue, 22 Aug 2017 18:25:16 +0000 (18:25 +0000)]
resolve merge conflicts of 8afe1d6 to nyc-dev-plus-aosp am:
0d151184d5 am:
f47f5ecf0b
am:
47091c824b
Change-Id: Ic42562aad89852a5d04f8830d67d5ca7010bd42f
Jamie Madill [Tue, 22 Aug 2017 18:24:58 +0000 (18:24 +0000)]
Merge "Remove use of varargs.h from deString.c." am:
ca988480be am:
6140614e6d am:
895dcf4469 am:
29fce3bfff
am:
cd345ef77f
Change-Id: I7661500b5257d22b4f3fb24cb25614925e359dcc
Daniel Xie [Tue, 22 Aug 2017 18:24:42 +0000 (18:24 +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
am:
4bb2e99278
Change-Id: Ic1ecf0b0ac4a730d487c5d7192107807c56b3d6b
Pyry Haulos [Tue, 22 Aug 2017 18:24:23 +0000 (18:24 +0000)]
CP: Require 'master' config to be supported in Android CTS am:
03d217bb53 am:
5eaf6f98bd am:
ca2f7af916 am:
82f012b41b am:
a0b233c828
am:
46e3804f97
Change-Id: I6b9167e37a548a71b0049dac7c8f035304a763fa
Daniel Xie [Tue, 22 Aug 2017 18:24:07 +0000 (18:24 +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
am:
35c1af2289
Change-Id: Ia03cefcc10810f79954f2d5079f53b0cffc7fffb
Pyry Haulos [Tue, 22 Aug 2017 18:23:53 +0000 (18:23 +0000)]
CP: Handle EGL_EXT_yuv_surface in eglChooseConfig() tests am:
521bb16575 am:
8d8aa8f78a am:
e893539121 am:
b371b20cf3 am:
d970510833
am:
54ee11db1c
Change-Id: I1f608af1d3bf7b154b6e35810e5271284d9d53a6
Daniel Xie [Tue, 22 Aug 2017 18:23:38 +0000 (18:23 +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
am:
9ddb7ea57e
Change-Id: Ie71ee09ee374589b25cb0deae38102cafa716ac2
Pyry Haulos [Tue, 22 Aug 2017 18:23:19 +0000 (18:23 +0000)]
resolve merge conflicts of 3ffc2f2 to master am:
f2c82779ae am:
b43199cd47 am:
93119248d0 am:
1f61a3ca8e
am:
9e62d162fc
Change-Id: I214da293c66f68b23f595ddf75aa7e51107371b8
Daniel Xie [Tue, 22 Aug 2017 18:23:02 +0000 (18:23 +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
am:
e4b580ab8d
Change-Id: I97c7f65c024edfd127158c08be9a46b39ba47bd2
Pyry Haulos [Tue, 22 Aug 2017 18:22:34 +0000 (18:22 +0000)]
CP: Reduce max iter count in alloc_callback_fail.device am:
ef5688dda6 am:
9872f68221 am:
dbe13dabd0 am:
a088a07587 am:
76b1d79413
am:
c956f34694
Change-Id: Iaa57a7a1100d30ca7057bbe9081abea175135fd6
Daniel Xie [Tue, 22 Aug 2017 18:22:02 +0000 (18:22 +0000)]
Merge changes I212a8bc2,I476b6586 into nougat-cts-dev am:
83683a367f am:
a69387d887 am:
193118e5b6 am:
e6b4e15512 am:
3830218b68
am:
77336cdec1
Change-Id: I6095be19548b9fe0b9a77ed01a6f6e173d9fe63d
Pyry Haulos [Tue, 22 Aug 2017 18:21:57 +0000 (18:21 +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
am:
582688df21 -s ours
Change-Id: I54cf94669d9d75dd0a94c74a08bfd17d0c9122d5
Nanley Chery [Tue, 22 Aug 2017 18:21:51 +0000 (18:21 +0000)]
CP: Fix required sample count tests am:
f6a815214a am:
b738653968 am:
a156cab09b am:
b6caa767b7 am:
7a340b78ce
am:
9aa4cb53bc
Change-Id: If8fe934f18dc2e4ab171518252bba9e67e5871f7
Daniel Xie [Tue, 22 Aug 2017 18:21:28 +0000 (18:21 +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
am:
f253c561a3
Change-Id: Ie82f10318306707f39ccfb6ce3b769c4c19405de
Pyry Haulos [Tue, 22 Aug 2017 18:21:10 +0000 (18:21 +0000)]
CP: Fix ext check in EXT_draw_buffers_indexed negative tests am:
3962010752 am:
bfd422cf9a am:
37b6b43735 am:
451971142f am:
ed3df330db
am:
9747e3081c
Change-Id: Ifec3289c6ff3dc29aaa2c98618015dd713018999
Daniel Xie [Tue, 22 Aug 2017 18:20:46 +0000 (18:20 +0000)]
Merge "CP: Fix geometry shader support check" into nougat-cts-dev am:
54d4c9f476 am:
0c725c5a41 am:
b9417cf065 am:
2c4c80401c am:
e801222fc9
am:
036e6dbac6
Change-Id: Ie8bc9fd4f95c131af0e7a5b46488b921647bc8bf
Pyry Haulos [Tue, 22 Aug 2017 18:20:14 +0000 (18:20 +0000)]
CP: Fix geometry shader support check am:
0da63cfe1d am:
f4ad130d7b am:
5a2621e728 am:
2babb295c9 am:
100fec00b0
am:
68333fbaba
Change-Id: I3021c4e91dda085bbd38af1fe5cbdfd04a9e4378
Daniel Xie [Tue, 22 Aug 2017 18:19:30 +0000 (18:19 +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
am:
eda75ac3ad
Change-Id: Ia08030c74f2fe7bb71578fbcc6b1a0606069c923
Pyry Haulos [Tue, 22 Aug 2017 18:19:13 +0000 (18:19 +0000)]
CP: Check and enable VK_KHR_sampler_mirror_clamp_to_edge am:
66ee615c37 am:
aef7f35add am:
966edd3c2c am:
a15e4a91c2 am:
09656384ae
am:
71eeb35b3b
Change-Id: I63f3aa0a968b79a4d719cd9785d8414e6baf4698
Daniel Xie [Tue, 22 Aug 2017 18:18:45 +0000 (18:18 +0000)]
Merge changes I85492417,I93389a2c into nougat-cts-dev am:
37eaa88ac2 am:
89da6ddd7b am:
e61860906b am:
baa7680368 am:
b403c19524
am:
b6d1e63153
Change-Id: I9c160f3986f13d7f9547b6d243c2b4ec1db1c157
Pyry Haulos [Tue, 22 Aug 2017 18:18:38 +0000 (18:18 +0000)]
CP: Limit VkInstance count in object_management.multithreaded* am:
1735b7bcaa am:
a87bd26f5c am:
18e03dc5cb am:
7d793064e8 am:
7c4393eced
am:
f97ca6696e
Change-Id: I34d42632476f49b44382aff684e2546a20175970
Pyry Haulos [Tue, 22 Aug 2017 18:18:30 +0000 (18:18 +0000)]
CP: Do not test VkDevice, VkInstance creation OOM paths in WSI tests am:
80ddee1f9b am:
c68e33a5fb am:
1353735b0f am:
bad8b319ed am:
a0840b47b9
am:
e2cd94c2b2
Change-Id: I9862c4260ab1c78efbc37a4ccfbfdde290bf68af
Unsuk Jung [Tue, 22 Aug 2017 18:18:16 +0000 (18:18 +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
am:
3fd42240fa
Change-Id: I50206d02eb64c74f39ab3721b1b89186f5eda052
Haixia Shi [Tue, 22 Aug 2017 18:17:59 +0000 (18:17 +0000)]
Don't require supported binary formats in negative tests. am:
7cd59a4409 am:
635f454667 am:
a520e3ba8d am:
07ce77fe3d am:
853d7c1761 am:
590242b494
am:
2104ae8b65
Change-Id: I22f57779211b519f279c96e92f77e2f6f42b5ccb
Daniel Xie [Tue, 22 Aug 2017 18:17:34 +0000 (18:17 +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
am:
28c0fa6be6 -s ours
Change-Id: I270a5dcda5c7e75f64a45a769feae5dc55369abf
Jarkko Pyry [Tue, 22 Aug 2017 18:17:14 +0000 (18:17 +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
am:
7abaac90df -s ours
Change-Id: I9ba1ca60b949387f96fcdb564fca538420f91932
Daniel Xie [Tue, 22 Aug 2017 18:17:01 +0000 (18:17 +0000)]
Merge "Fix GLES2 format mismatch" into marshmallow-cts-dev am:
98dd6ac745 am:
5dee7d519c am:
c3a2323bb0 am:
f5175ed08f am:
ce81513080 am:
da92c80fcf
am:
0bcbe3568c
Change-Id: I507d753b7a89efd681e373cc20600ad515e6b292
Stphane Marchesin [Tue, 22 Aug 2017 18:16:47 +0000 (18:16 +0000)]
Fix GLES2 format mismatch am:
4b80682693 am:
9a9c641a84 am:
4faeff24d2 am:
2b2a5dfe41 am:
e4733132c9 am:
3ca964b89e
am:
af9aaa875f
Change-Id: I461c086c0cac496b7ab6e4b06b058c5a563e37ed
Haixia Shi [Tue, 22 Aug 2017 18:16:22 +0000 (18:16 +0000)]
Increase no-data timeout to 5 seconds. am:
d00b71cbc3 am:
a7afa30111 am:
9dfb23aeaf am:
bce9c4d0eb am:
31c60e9172 am:
2ca1e9b94f
am:
f17baa29bc
Change-Id: I97e41b6f05a6710d56e5c175a31cdf2cff50d1d3
Kenneth Graunke [Tue, 22 Aug 2017 18:16:02 +0000 (18:16 +0000)]
Merge "Fix sample_mask_in.bit_count_per_two_samples tests for 2x MSAA." am:
ba98ecd5d0 am:
96bef1f84e am:
347b5cdac0 am:
644058875a
am:
18e68f0078
Change-Id: I248a680b994e500945c2fabd9f69c912397dfeff
Daniel Xie [Tue, 22 Aug 2017 18:15:49 +0000 (18:15 +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
am:
3f6493985f
Change-Id: I25852ad9f2be17c3cd1a625d1ab2269f6ee9aed2
Daniel Xie [Tue, 22 Aug 2017 18:15:30 +0000 (18:15 +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
am:
5308189b3f
Change-Id: Ibdbea47f5ec55ca7ab47bdd4f5d21eed26087eb1
Pyry Haulos [Tue, 22 Aug 2017 18:15:11 +0000 (18:15 +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
am:
f2ebab3013
Change-Id: Ib8af176d1e652962e1d8dcc9024868e9adaadb89
Pyry Haulos [Tue, 22 Aug 2017 18:14:51 +0000 (18:14 +0000)]
CP: Require 'master' config to be supported in Android CTS am:
03d217bb53 am:
e0c1316159 am:
a2d72443d6 am:
0dd98a178b am:
a08f0162cf am:
3f01dc6c00
am:
c21f3c207d
Change-Id: I8b17a10feff9feffa3e98d8369584114b2c08dae
Daniel Xie [Tue, 22 Aug 2017 18:14:38 +0000 (18:14 +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
am:
8f2ebfd68d
Change-Id: Ib337d9b8be5b9bc2f287016418ecafbe089c554b
Daniel Xie [Tue, 22 Aug 2017 18:14:18 +0000 (18:14 +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
am:
0836bca742
Change-Id: Ia960992ac1a80ef58a7e9f24b87dfe557aacac21
Pyry Haulos [Tue, 22 Aug 2017 18:14:01 +0000 (18:14 +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
am:
2c8904249e
Change-Id: I7bfe64a290c5d701412784ce5f0f0950b0272b79
Pyry Haulos [Tue, 22 Aug 2017 18:13:47 +0000 (18:13 +0000)]
CP: Handle EGL_EXT_yuv_surface in eglChooseConfig() tests am:
521bb16575 am:
fdd3db3693 am:
16ba586a00 am:
cbb5a33fb9 am:
e6443aa4bb am:
d02e13af9c
am:
d93779a9ca
Change-Id: I3851e7147d7ed4ceb7be797c13c159f3f059e85c
Daniel Xie [Tue, 22 Aug 2017 18:13:32 +0000 (18:13 +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
am:
283e7df9c5
Change-Id: I116db07d83d8a77638ebd504700a186ae0a50156
Daniel Xie [Tue, 22 Aug 2017 18:13:15 +0000 (18:13 +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
am:
ef740b5803
Change-Id: I6cbd3722d688d82064e88c434d718c1d912354f0
Pyry Haulos [Tue, 22 Aug 2017 18:12:49 +0000 (18:12 +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
am:
1a37edc8e1
Change-Id: Ie11af24ac4c76e2eb2f8be0103257ecb2523d137
Pyry Haulos [Tue, 22 Aug 2017 18:12:15 +0000 (18:12 +0000)]
Remove a few EGL tests using RGBA4 format from mustpass am:
3ffc2f243a am:
04c959ca67 am:
9833f3493e am:
08ab72f183 am:
da40bb0fe5 am:
09a8e1b13f
am:
267b2dadb5
Change-Id: I34412af560e6868c8eace46af75660028485f9f4
Daniel Xie [Tue, 22 Aug 2017 18:11:43 +0000 (18:11 +0000)]
Merge "CP: Require 'master' config to be supported in Android CTS" into nougat-cts-dev am:
84173082ee am:
72e1df9930 am:
90bef986f4 am:
56270fdfb8
am:
4fbd59a8c5
Change-Id: Id2a462100d3253128d0a9d22786a6dbfffaec717
Pyry Haulos [Tue, 22 Aug 2017 18:11:27 +0000 (18:11 +0000)]
CP: Require 'master' config to be supported in Android CTS am:
03d217bb53 am:
e0c1316159 am:
c1c16ccda1 am:
3b2f4f5e0f
am:
3d26b784dd
Change-Id: Iab0ab821a46aaf52791f91691077da429f8a1807
Daniel Xie [Tue, 22 Aug 2017 18:11:13 +0000 (18:11 +0000)]
Merge "CP: Handle EGL_EXT_yuv_surface in eglChooseConfig() tests" into nougat-cts-dev am:
1ad2703e25 am:
d93a153fd4 am:
0e632cea70 am:
6afd772422
am:
ff1e60f679
Change-Id: Ic8f212beee474830b59f22e35b0a0a3912eceaec
Pyry Haulos [Tue, 22 Aug 2017 18:10:57 +0000 (18:10 +0000)]
CP: Handle EGL_EXT_yuv_surface in eglChooseConfig() tests am:
521bb16575 am:
fdd3db3693 am:
478b55b980 am:
8e3e68b496
am:
bdc68b2ca9
Change-Id: Id8a3a78f8cb9380aa2cbaf48649a691081a390e8
Daniel Xie [Tue, 22 Aug 2017 18:10:38 +0000 (18:10 +0000)]
Merge "Remove a few EGL tests using RGBA4 format from mustpass" into nougat-cts-dev am:
451fa7c581 am:
99925909af am:
e5ca3b0f05 am:
298f95e762
am:
6e278e9172
Change-Id: I4723e9eab2c66c3dd7a2ebe7ecbda0dba4586885
Pyry Haulos [Tue, 22 Aug 2017 18:10:21 +0000 (18:10 +0000)]
resolve merge conflicts of 04c959c to nyc-dev-plus-aosp am:
921c48e50a am:
eeb08c7a18
am:
d5dbe5eec1
Change-Id: Ide7ff8ab768878a04485f8e0c33ca08d34f775f4
Daniel Xie [Tue, 22 Aug 2017 18:09:53 +0000 (18:09 +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
am:
7c0f9f16e2
Change-Id: If80281c8ce3e1a2b338c5b014535d8067aea31f5
Daniel Xie [Tue, 22 Aug 2017 18:09:37 +0000 (18:09 +0000)]
Merge "CP: Reduce max iter count in alloc_callback_fail.device" into nougat-cts-dev am:
a268fcbaff am:
a489f7548d am:
5e61259f2e am:
64c469c34b
am:
513a21e843
Change-Id: Icd9afe865d9106f9af190db3d97dfff5c33c1c90
Daniel Xie [Tue, 22 Aug 2017 18:09:21 +0000 (18:09 +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
am:
74c7a464c5
Change-Id: Ic45887a4c0a3e51f001bc49436043007db3a6920
Daniel Xie [Tue, 22 Aug 2017 18:09:03 +0000 (18:09 +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
am:
cbfa79a0bb
Change-Id: I2cb9b54d17cd8641dd83b5e95244a4dc38ee7f8c
Pyry Haulos [Tue, 22 Aug 2017 18:08:49 +0000 (18:08 +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
am:
03bf9d9f5c
Change-Id: I6f1d76ca7327f89bb0bfa117a93b1d3b3e47a717
Pyry Haulos [Tue, 22 Aug 2017 18:08:33 +0000 (18:08 +0000)]
CP: Reduce max iter count in alloc_callback_fail.device am:
ef5688dda6 am:
69c9f158f3 am:
41d571f045 am:
f35b2943fc am:
b5768ba6fa am:
2f6f648a3f
am:
d9c27af578
Change-Id: Icf2a86373b4e7300fa97dcfcf850b5e16c52c011
Pyry Haulos [Tue, 22 Aug 2017 18:08:15 +0000 (18:08 +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
am:
d7ca1b3b99
Change-Id: I2e7d69d7fd53aadfae846e6016d6ccfc3b4f2856
Pyry Haulos [Tue, 22 Aug 2017 18:07:59 +0000 (18:07 +0000)]
CP: Reduce max iter count in alloc_callback_fail.device am:
ef5688dda6 am:
69c9f158f3 am:
212df0dd39 am:
827fe64146
am:
757dd66a82
Change-Id: If2d7e066304aecf57e1f28b76bed9c9bdd06d640
Daniel Xie [Tue, 22 Aug 2017 18:06:19 +0000 (18:06 +0000)]
Merge changes from topic 'am-
d93effc2c36944e2a5199ec02939cb56' into nyc-mr1-dev-plus-aosp am:
a57a3a5e45
am:
7f19157869
Change-Id: Ib08823c2a6ac1e914b31a718ddac632b908aba3e
Daniel Xie [Tue, 22 Aug 2017 18:06:08 +0000 (18:06 +0000)]
Merge changes I212a8bc2,I476b6586 into nougat-cts-dev am:
83683a367f am:
b97e86700f am:
636d5cdf56 am:
a1d816d27c
am:
e3d06ac287
Change-Id: I830179c5f8a5cb57b28fcfd27f09fb5b6b522352
Pyry Haulos [Tue, 22 Aug 2017 18:05:59 +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
am:
9b5212c12d -s ours
Change-Id: I85486a3c640ab4ed359c71bc531968018595c7fb
projects / platform / upstream / VK-GL-CTS.git / log