Pyry Haulos [Tue, 22 Aug 2017 21:00:32 +0000 (21:00 +0000)]
Merge Vulkan CTS 1.0.2.1 into AOSP am:
71ddde91a1 am:
78f497a2fa am:
b3eb60301a
am:
dd8727b43c
Change-Id: Iea83892c6f033a2718fbd581884df17ccfcb2215
Graeme Leese [Tue, 22 Aug 2017 21:00:14 +0000 (21:00 +0000)]
Fix extension support checks in negative api tests am:
0297569515 am:
52b47cb46a am:
a4b71dab4b
am:
154cefda10
Change-Id: I84f4e95b1e4df907757fcb1ac73c1596e4090b4a
Pyry Haulos [Tue, 22 Aug 2017 20:59:53 +0000 (20:59 +0000)]
Merge "Drop MAX_TESS_CONTROL_TOTAL_OUTPUT_COMPONENTS to 2048" am:
eae50b9cdb am:
f138de1efa am:
625103915e
am:
8c980dfcb5
Change-Id: Id2608f6ef42ef8c3b21abc758dc567d493550c35
Mark Adams [Tue, 22 Aug 2017 20:59:33 +0000 (20:59 +0000)]
Modify tessellation_not_active to check for GL_NV_gpu_shader5 am:
0e7a9e61ae am:
2598aa2ce0 am:
c0fbc9800f
am:
ceeb4ee68f
Change-Id: Ia479de492b473f68bc93db531c816f0f4f173672
Pyry Haulos [Tue, 22 Aug 2017 20:59:14 +0000 (20:59 +0000)]
Merge "Fix whitespace issues" am:
09b0225a8a am:
f8b6504bce am:
3ab3152bbc
am:
3f62f8f60c
Change-Id: I4e6f7c4435affd90293fe32ad024b2d26d9a486a
John Richardson [Tue, 22 Aug 2017 20:58:54 +0000 (20:58 +0000)]
Add non-seperable TCS-but-no-TES subcase and fix draw time check subcase am:
59999de58c am:
7620b8e998 am:
e15f8d24b5
am:
46a3d8d0aa
Change-Id: I28ae1a7ab10f72faad0e28153bd76fde320ef9bb
Brian Anderson [Tue, 22 Aug 2017 20:58:33 +0000 (20:58 +0000)]
Add GetFrameTimestamps tests am:
e288d40afc am:
3ba03a8a72 am:
08ab339a5b
am:
c0812bbdbc
Change-Id: Id9164b4dbeb1f8ea659e478018512b6fbbcceea2
Mark Adams [Tue, 22 Aug 2017 20:58:13 +0000 (20:58 +0000)]
Merge "Fix multiple resource leaks in new srgb_texture_decode tests" am:
d4a9effab0 am:
cedac8ca54 am:
499cbe679f
am:
c764e9118a
Change-Id: I1cba641909435e6388a21a87a58f26fdc41d37a9
Kalle Raita [Tue, 22 Aug 2017 20:57:33 +0000 (20:57 +0000)]
Merge "Reduce read pixel calls in copy image tests" am:
dbec7154ee am:
0213098549 am:
04ad91051d
am:
fa26a4b412
Change-Id: I600f10df0acfe56a3d5372813c0b332413f7def4
Kalle Raita [Tue, 22 Aug 2017 20:57:06 +0000 (20:57 +0000)]
Merge "Restructure copy image test iterations" am:
7ac38a6fa1 am:
dae41c30d3 am:
11a3c5d0a1
am:
d972c0b2e3
Change-Id: I9f9ec45317743a048f6ae59fc68552bfe6bf0567
Pyry Haulos [Tue, 22 Aug 2017 20:56:54 +0000 (20:56 +0000)]
Merge changes Icb29d2da,Ida906e21 am:
fc868645e2 am:
1cf9161f6f am:
12b6e41013
am:
f6587ed1bc
Change-Id: I486aa995b48ccfdac70dcf61311b2946ecaca9eb
Michael Hadley [Tue, 22 Aug 2017 20:56:40 +0000 (20:56 +0000)]
Add sRGB skip decode test am:
b4d41f1ef0 am:
f6cf6363b2 am:
345202e258 am:
e82d2447ee
am:
8869cdd506
Change-Id: I1c5dbad69903ab2d84948c154e660f07e9118da5
Kenneth Graunke [Tue, 22 Aug 2017 20:56:28 +0000 (20:56 +0000)]
Fix a few bugs in a EGL_KHR_no_config_context test. am:
2a2a2ab8c7 am:
e06124d7f5 am:
08bf23d700 am:
41976113bf
am:
f5f4ef0f89
Change-Id: I5d510a1097aecd80e52416c00c49c1e749ff0a11
Mika Isojrvi [Tue, 22 Aug 2017 20:56:15 +0000 (20:56 +0000)]
Limit changes by xor to upper 8 bits in mixed atomic tests am:
6bc3c7a634 am:
ebc8257bba am:
31a4d9b3b6 am:
19045bffb6 am:
53fbafc635 am:
15762b0fa5 am:
feba2a67f1
am:
90fb322448
Change-Id: Ibe0ca035b2e8b6d0b0f7c160fcdc9845daa63edf
Mika Isojrvi [Tue, 22 Aug 2017 20:55:59 +0000 (20:55 +0000)]
Limit changes by xor to upper 8 bits in mixed atomic tests am:
6bc3c7a634 am:
eef2e716e7 am:
bdff405d5a am:
92584aee17 am:
0c2ea240da am:
9d33492787
am:
f066c4a1ba
Change-Id: I91acbdeabe5d0d700fc9655cfca43e2a366b6b45
Mika Isojrvi [Tue, 22 Aug 2017 20:55:32 +0000 (20:55 +0000)]
Limit changes by xor to upper 8 bits in mixed atomic tests am:
6bc3c7a634 am:
eef2e716e7 am:
06811e1c44 am:
fbe1e80216 am:
ff2167f6cc am:
155a8f9b34
am:
b3fc643ed8
Change-Id: I6327adb89447bb10a887115692f2387c1b32714e
Mika Isojrvi [Tue, 22 Aug 2017 20:55:12 +0000 (20:55 +0000)]
Limit changes by xor to upper 8 bits in mixed atomic tests am:
6bc3c7a634 am:
ebc8257bba am:
31a4d9b3b6 am:
19045bffb6 am:
53fbafc635 am:
fbf76f4e30 am:
48855b941d
am:
86564873e0
Change-Id: I02eabe074a46d5ecc6c170ccb9d5cfc7d33ead97
Mika Isojrvi [Tue, 22 Aug 2017 20:54:35 +0000 (20:54 +0000)]
Limit changes by xor to upper 8 bits in mixed atomic tests am:
6bc3c7a634 am:
eef2e716e7 am:
bdff405d5a am:
92584aee17 am:
a9ab882914 am:
bfc7402e30
am:
c8b4dc20eb
Change-Id: I57b21f09837e852088c14d6b89d68cad2de44901
Dan Albert [Tue, 22 Aug 2017 20:54:10 +0000 (20:54 +0000)]
Merge "Use deFloatIsNaN, not isnan." am:
4e49222745 am:
dd33e61339 am:
558bba7fca am:
145b0db605
am:
46833b6513
Change-Id: Iaed5567d52c2e0ac4c2fcaf5ebf01560c6f8240f
Kalle Raita [Tue, 22 Aug 2017 20:53:49 +0000 (20:53 +0000)]
Merge "Add EGL NYC master list into CTS files"
am:
e1f562a7e9
Change-Id: I68126c16183286445c20a21d12780e92e2afedc6
Mika Isojarvi [Tue, 22 Aug 2017 20:53:17 +0000 (20:53 +0000)]
Merge "Fix out of bounds accesses in TexImage*DParamsCase." am:
60902d4e1b am:
8fd3b63b26 am:
99299ab23b am:
b45f3cac98
am:
adb84ed401
Change-Id: I9cbe6bf8ddd923ba340cf23a77905375d29b7ba8
Mika Isojrvi [Tue, 22 Aug 2017 20:52:49 +0000 (20:52 +0000)]
Fix Android builds compiler flags am:
e2af5c745d am:
7755688536 am:
c5a0adfad3 am:
26464b094e
am:
fc0f5a9a06
Change-Id: I6fd4b8f16837373d8489eb9d2f2e2ef18bbee155
Kalle Raita [Tue, 22 Aug 2017 20:52:23 +0000 (20:52 +0000)]
Merge "Check NDK version in the app build script" am:
197032faf3 am:
cf0f927df4 am:
57ca78aa24 am:
331d69c679
am:
f127beb667
Change-Id: Ia45023c32faf90fa68125f94f39ceafc1f7c397b
Pyry Haulos [Tue, 22 Aug 2017 20:52:01 +0000 (20:52 +0000)]
Android: Test that mandatory extensions are supported am:
2ef3d2cadd am:
00f38de808 am:
8d31028c39 am:
fe8dd11baf
am:
1766646020
Change-Id: Id6f320103a780e77dec903bf4f4eebe02ed5648a
Pyry Haulos [Tue, 22 Aug 2017 20:51:41 +0000 (20:51 +0000)]
Android: Test that no Vulkan layers are enumerated am:
4f0cdcd709 am:
a32b452f31 am:
0e2633c228 am:
0781553102
am:
71a1fa6ed1
Change-Id: I0b20235b29cee9471c12ec801c9ee24b11bbb201
Pyry Haulos [Tue, 22 Aug 2017 20:51:25 +0000 (20:51 +0000)]
Android: Check KHX, GOOGLE, and ANDROID extensions am:
5d9562a8c6 am:
efd1deb8d7 am:
e6d5552bb8 am:
3b132b7cb3
am:
07405983be
Change-Id: I3ecb39c6b61c793806f00819bfc82501deba81ea
Pyry Haulos [Tue, 22 Aug 2017 20:51:09 +0000 (20:51 +0000)]
Merge "Update Android CTS Vulkan mustpass to match 1.0.2" am:
8de4af67bb am:
b3191e5847 am:
eab06747e6 am:
a57d2a88f8
am:
592966fd1c
Change-Id: Ifdf7d3970020f879c6c21b8dc2c5d55594b250ee
Michael Hadley [Tue, 22 Aug 2017 20:50:46 +0000 (20:50 +0000)]
Added gl_BoundingBox built-in type access tests am:
ed63f60eb4 am:
2160941ec7 am:
b784ed3d7b am:
5f5f4b0a64
am:
7c1f24ddb1
Change-Id: I572ebd57b2794afab1ebbb8bd2655fcbf2687f7f
Michael Hadley [Tue, 22 Aug 2017 20:50:38 +0000 (20:50 +0000)]
Add SSBO block tests am:
04ba289d6e am:
ce0a6e4b7b am:
375a437841 am:
a27e5f265d
am:
ba02853785
Change-Id: Ifc98e2ac4511016472b0b781781f06fcdd402da0
John Richardson [Tue, 22 Aug 2017 20:50:17 +0000 (20:50 +0000)]
Add tessellation shader stages to negative layout_binding tests am:
b7272b0934 am:
234af40a4f am:
7db3ca77ea am:
70767a5308
am:
a506cc4f46
Change-Id: I33afdf0d28d34dc2633180c91623eca477d2d87c
John Richardson [Tue, 22 Aug 2017 20:49:56 +0000 (20:49 +0000)]
Add new tessellation negative coverage tests am:
1889817926 am:
6505a995c1 am:
02e452454c am:
91623e041e
am:
4f6c419055
Change-Id: I9e6b232b07c4ace9775f24e5cc5b6b27211312cc
Xin Li [Tue, 22 Aug 2017 20:49:32 +0000 (20:49 +0000)]
Merge nougat-mr1-cts-dev into am:
2dcacdbe0a am:
b196334de5 am:
769492af1d am:
03c2353df4
am:
99151e6b0b
Change-Id: Ibf7a32b3b1badfb29283a0b42cc4023840ba977e
Xin Li [Tue, 22 Aug 2017 20:48:57 +0000 (20:48 +0000)]
Skip commit '
c5bbebc46ac7725d43692602422ee3fc76cac7b0' on am:
b1fa5e8f2c am:
ef0c4176d6 am:
4f65cf0bba am:
e9b300de33
am:
7def512f01
Change-Id: Ied17eaf6cd1ced743e14dc9cf10e1af9f31a51f2
Xin Li [Tue, 22 Aug 2017 20:48:29 +0000 (20:48 +0000)]
Merge commit '
2a9d42a651ef444f32f0a6e60711bb2c371d3fce' from nougat-cts-mr1-dev to am:
04974c3449 am:
1f9853e006 am:
e9a25e7e34 am:
045eb76c67
am:
e7d7588724
Change-Id: I41ece2970c2b3411b915634be2f58f7330d3ffd2
Pyry Haulos [Tue, 22 Aug 2017 20:47:45 +0000 (20:47 +0000)]
Add eglChooseConfig() tests for EXT_pixel_format_float am:
54c090f981 am:
225e1e1eb7 am:
f7c70217d6 am:
1969316fda
am:
3127c5bc95
Change-Id: I76689f1c251be2c592bfaafc5d2919279898c092
Pyry Haulos [Tue, 22 Aug 2017 20:47:21 +0000 (20:47 +0000)]
Add basic test for EGL_KHR_no_config_context am:
d7ec39dd04 am:
a05826c329 am:
726be5f657 am:
fa43529a16
am:
3819a33264
Change-Id: I132a67c52dcdfaf303d0d0d6b861d021269d474d
Pyry Haulos [Tue, 22 Aug 2017 20:46:53 +0000 (20:46 +0000)]
Merge aosp/upstream-vulkan-cts-1.0-dev into aosp/master am:
68408cad8f am:
81e6e20395 am:
65d27d1ecb am:
9b38704f93
am:
79f9356d50
Change-Id: I699758a10d92ac3a62c2abc4ade015f0b75fae29
Tina Zhou [Tue, 22 Aug 2017 20:46:36 +0000 (20:46 +0000)]
Merge "Merge "x11: Call XInitThreads()" into nougat-cts-dev am:
cbdbf95222 am:
a74d50ffda am:
b92f7d676f am:
d46ac1a0ca am:
bb7e6b4f15 am:
63b680c857" into nyc-mr2-dev-plus-aosp am:
6d932de5ea
am:
655a26d348
Change-Id: If09629e4ed62aebf382ef6685d2702c54b2fc3ab
Tina Zhou [Tue, 22 Aug 2017 20:46:15 +0000 (20:46 +0000)]
Merge "x11: Call XInitThreads()" into nougat-cts-dev am:
cbdbf95222 am:
a74d50ffda am:
b92f7d676f am:
d46ac1a0ca am:
bb7e6b4f15 am:
63b680c857 am:
36fde730bf
am:
22867dd50e
Change-Id: Ib61a4eb5b40e4ffce740844db264c0146e4f23ff
Chad Versace [Tue, 22 Aug 2017 20:45:56 +0000 (20:45 +0000)]
Merge "x11: Call XInitThreads() am:
5d11c9d2c0 am:
f465d82fa5 am:
0ed6cc912e am:
e7ee6541a9 am:
587123a671 am:
e5286dbaf7" into nyc-mr2-dev-plus-aosp am:
ca30439bc2
am:
06a607b061
Change-Id: I759a33eb0d9223763327636e589b3bcae65c70e9
Chad Versace [Tue, 22 Aug 2017 20:45:37 +0000 (20:45 +0000)]
x11: Call XInitThreads() am:
5d11c9d2c0 am:
f465d82fa5 am:
0ed6cc912e am:
e7ee6541a9 am:
587123a671 am:
e5286dbaf7 am:
8d7c277158
am:
b6ec89e9af
Change-Id: I9db697b46540291c194702a3e331ae6284b6a266
Tina Zhou [Tue, 22 Aug 2017 20:45:17 +0000 (20:45 +0000)]
Merge "Merge "x11: Call XInitThreads()" into nougat-cts-dev am:
cbdbf95222 am:
a74d50ffda am:
b92f7d676f am:
d46ac1a0ca am:
bb7e6b4f15 am:
120b5fb421" into nyc-mr2-dev-plus-aosp am:
305270d6d6
am:
6b748a77a5
Change-Id: If41c2d0446c27ce0d70c103587f4169eb9a153ed
Tina Zhou [Tue, 22 Aug 2017 20:44:50 +0000 (20:44 +0000)]
Merge "x11: Call XInitThreads()" into nougat-cts-dev am:
cbdbf95222 am:
a74d50ffda am:
b92f7d676f am:
d46ac1a0ca am:
bb7e6b4f15 am:
120b5fb421 am:
7dcbcecdc3
am:
808646a680
Change-Id: I6455ad239a2ab7e1166e39ebaaac8be54df530ba
Tina Zhou [Tue, 22 Aug 2017 20:44:21 +0000 (20:44 +0000)]
Merge "Merge "x11: Fix deadlock" into nougat-cts-dev am:
34b869eeea am:
05f26155f0 am:
7bb5047d5e am:
1b341143c0 am:
d737e16da8 am:
100bd75cb7" into nyc-mr2-dev-plus-aosp am:
6cf94e941b
am:
a1ad9965da
Change-Id: I948a07f2e4401225266751d70eb2a1d21f6f81c9
Tina Zhou [Tue, 22 Aug 2017 20:43:47 +0000 (20:43 +0000)]
Merge "x11: Fix deadlock" into nougat-cts-dev am:
34b869eeea am:
05f26155f0 am:
7bb5047d5e am:
1b341143c0 am:
d737e16da8 am:
100bd75cb7 am:
0520585424
am:
af1267ba5f
Change-Id: I2690658581e2641cd61282e22e8ad37c3b3dc958
Chad Versace [Tue, 22 Aug 2017 20:43:13 +0000 (20:43 +0000)]
Merge "x11: Call XInitThreads() am:
5d11c9d2c0 am:
f465d82fa5 am:
0ed6cc912e am:
e7ee6541a9 am:
587123a671 am:
b57d3123ac" into nyc-mr2-dev-plus-aosp am:
c3ee6c9e59
am:
4571e7c02d
Change-Id: I26ce1e5b648c349e03b2bc0882533e629985d855
Chad Versace [Tue, 22 Aug 2017 20:42:38 +0000 (20:42 +0000)]
x11: Call XInitThreads() am:
5d11c9d2c0 am:
f465d82fa5 am:
0ed6cc912e am:
e7ee6541a9 am:
587123a671 am:
b57d3123ac am:
a3d1fd9bc6
am:
f7546773aa
Change-Id: Ib74b4a5f19f403f3a41d61277fb75aae108d263f
Chad Versace [Tue, 22 Aug 2017 20:41:58 +0000 (20:41 +0000)]
Merge "x11: Fix deadlock am:
5e863331b2 am:
7d0ad652ff am:
ca5a475223 am:
319a51d5dd am:
97cc16aa0a am:
ab54c5b0ef" into nyc-mr2-dev-plus-aosp am:
a366b6e884
am:
c2525d73af
Change-Id: I60a472ea05cd389eda50e9910bb27046f5c56507
Chad Versace [Tue, 22 Aug 2017 20:41:15 +0000 (20:41 +0000)]
x11: Fix deadlock am:
5e863331b2 am:
7d0ad652ff am:
ca5a475223 am:
319a51d5dd am:
97cc16aa0a am:
ab54c5b0ef am:
5e2981c0c7
am:
f1b483026f
Change-Id: Ib667fd553ab87f43a5f534c2f3e527be53c2ec32
Tina Zhou [Tue, 22 Aug 2017 20:40:58 +0000 (20:40 +0000)]
Merge "Merge "x11: Fix deadlock" into nougat-cts-dev am:
34b869eeea am:
05f26155f0 am:
7bb5047d5e am:
1b341143c0 am:
d737e16da8 am:
b969431bfd" into nyc-mr2-dev-plus-aosp am:
417cdbb829
am:
8caded009f
Change-Id: Ifccc6ac9ae444ef2fbacaead3c343e0ba605c122
Tina Zhou [Tue, 22 Aug 2017 20:40:43 +0000 (20:40 +0000)]
Merge "x11: Fix deadlock" into nougat-cts-dev am:
34b869eeea am:
05f26155f0 am:
7bb5047d5e am:
1b341143c0 am:
d737e16da8 am:
b969431bfd am:
f837b00a7e
am:
16444b303f
Change-Id: I0a70107b4820a2c837539701ac7e7c47a61de6e5
Tina Zhou [Tue, 22 Aug 2017 20:40:27 +0000 (20:40 +0000)]
Merge "Merge "x11: Call XInitThreads()" into nougat-cts-dev am:
cbdbf95222 am:
6aef236dd0 am:
f23a03362a am:
40ff9476c8 am:
ac78f3c5b7" into nyc-mr2-dev-plus-aosp am:
508ef296d8
am:
db3f6f0f48
Change-Id: Ic188fb635893ed60130bc0ad1c2d7231109fd780
Tina Zhou [Tue, 22 Aug 2017 20:40:10 +0000 (20:40 +0000)]
Merge "x11: Call XInitThreads()" into nougat-cts-dev am:
cbdbf95222 am:
6aef236dd0 am:
f23a03362a am:
40ff9476c8 am:
ac78f3c5b7 am:
5f2ae2d09c
am:
5901732d26
Change-Id: Ic20824a3c4716697a368b23a817085b141f96a08
Chad Versace [Tue, 22 Aug 2017 20:39:52 +0000 (20:39 +0000)]
Merge "x11: Fix deadlock am:
5e863331b2 am:
7d0ad652ff am:
ca5a475223 am:
319a51d5dd am:
97cc16aa0a am:
8b86967b6f" into nyc-mr2-dev-plus-aosp am:
e5b8804c39
am:
046abc286f
Change-Id: I8f8fd362feb657149c3705d9fe39d5039d08d1a5
Chad Versace [Tue, 22 Aug 2017 20:39:32 +0000 (20:39 +0000)]
x11: Fix deadlock am:
5e863331b2 am:
7d0ad652ff am:
ca5a475223 am:
319a51d5dd am:
97cc16aa0a am:
8b86967b6f am:
d7d2897995
am:
2bdcc4700a
Change-Id: I1a08a30f9daf55f15108e3faec8ca2105f49cb07
Chad Versace [Tue, 22 Aug 2017 20:39:08 +0000 (20:39 +0000)]
Merge "x11: Call XInitThreads() am:
5d11c9d2c0 am:
0fe4efcfa8 am:
8c04df2e48 am:
c6bf22467b am:
9c925d6e4b" into nyc-mr2-dev-plus-aosp am:
85a4283f70
am:
b8b59d006f
Change-Id: I7df3da1da3479c93bd3bdbc4619e8487123b2140
Chad Versace [Tue, 22 Aug 2017 20:38:42 +0000 (20:38 +0000)]
x11: Call XInitThreads() am:
5d11c9d2c0 am:
0fe4efcfa8 am:
8c04df2e48 am:
c6bf22467b am:
9c925d6e4b am:
064f3b12bf
am:
8a0850e289
Change-Id: I150f04e03a545432dc81e658bbccb5b935abb2cf
Tina Zhou [Tue, 22 Aug 2017 20:38:07 +0000 (20:38 +0000)]
Merge "Merge "x11: Call XInitThreads()" into nougat-cts-dev am:
cbdbf95222 am:
6aef236dd0 am:
f23a03362a am:
40ff9476c8 am:
e775b6f623" into nyc-mr2-dev-plus-aosp am:
33b8a60c2e
am:
85ec913b61
Change-Id: I2a2b245bfbfa5e7c88fce3581c6a35bf8239b00d
Tina Zhou [Tue, 22 Aug 2017 20:37:27 +0000 (20:37 +0000)]
Merge "x11: Call XInitThreads()" into nougat-cts-dev am:
cbdbf95222 am:
6aef236dd0 am:
f23a03362a am:
40ff9476c8 am:
e775b6f623 am:
ebd824c364
am:
1c8f10e814
Change-Id: If98a7b295ab097ce2b906a39bead26114c726309
Tina Zhou [Tue, 22 Aug 2017 20:36:57 +0000 (20:36 +0000)]
Merge "Merge "x11: Fix deadlock" into nougat-cts-dev am:
34b869eeea am:
b6766f9949 am:
7b1b2f4509 am:
ce18fbd526 am:
243a52b3c7" into nyc-mr2-dev-plus-aosp am:
513d6ae450
am:
6642262b18
Change-Id: Ie411be7ba420eecaaba6e029d8c28739cc09a26d
Tina Zhou [Tue, 22 Aug 2017 20:36:22 +0000 (20:36 +0000)]
Merge "x11: Fix deadlock" into nougat-cts-dev am:
34b869eeea am:
b6766f9949 am:
7b1b2f4509 am:
ce18fbd526 am:
243a52b3c7 am:
b2b1341dbf
am:
eb4d5280cf
Change-Id: I78e1e5c0c71e787f0a37278e2e03bf8425cad17b
Chad Versace [Tue, 22 Aug 2017 20:35:53 +0000 (20:35 +0000)]
Merge "x11: Call XInitThreads() am:
5d11c9d2c0 am:
0fe4efcfa8 am:
8c04df2e48 am:
c6bf22467b am:
6d9bd5e858" into nyc-mr2-dev-plus-aosp am:
8e18c56bea
am:
66d79158cc
Change-Id: I824cb1c6099369471b3d727f2d2e40c9eacd389b
Chad Versace [Tue, 22 Aug 2017 20:35:36 +0000 (20:35 +0000)]
x11: Call XInitThreads() am:
5d11c9d2c0 am:
0fe4efcfa8 am:
8c04df2e48 am:
c6bf22467b am:
6d9bd5e858 am:
c0ae8e7cc0
am:
7cf10533bf
Change-Id: Iac399500107d0902f2836a7f2fb35dc3936f2e33
Chad Versace [Tue, 22 Aug 2017 20:35:20 +0000 (20:35 +0000)]
Merge "x11: Fix deadlock am:
5e863331b2 am:
f49e8bfc0e am:
1eb4f43dc4 am:
c1c16c73e6 am:
a2c167bef6" into nyc-mr2-dev-plus-aosp am:
5655d18351
am:
7bd0c1202c
Change-Id: I506f14d59c5a91b9c65b92ae2a778599ec2ecda4
Chad Versace [Tue, 22 Aug 2017 20:35:03 +0000 (20:35 +0000)]
x11: Fix deadlock am:
5e863331b2 am:
f49e8bfc0e am:
1eb4f43dc4 am:
c1c16c73e6 am:
a2c167bef6 am:
3ce8a6bb44
am:
b58209d17b
Change-Id: I3d4773c590102a77439b56c5e191affbed9cc216
Tina Zhou [Tue, 22 Aug 2017 20:34:46 +0000 (20:34 +0000)]
Merge "x11: Fix deadlock" into nougat-cts-dev am:
34b869eeea am:
b6766f9949 am:
7b1b2f4509 am:
ce18fbd526 am:
aee042a887 am:
e721cf66ec
am:
f0ef04cf5d
Change-Id: I79b829d6df5d39f58dcf649cb19736be2edd0b76
Chad Versace [Tue, 22 Aug 2017 20:34:29 +0000 (20:34 +0000)]
x11: Fix deadlock am:
5e863331b2 am:
f49e8bfc0e am:
1eb4f43dc4 am:
c1c16c73e6 am:
5a37f3c8ca am:
dc23d8bda4
am:
347d7ec658
Change-Id: Ib18ce720a7178f615d900f23d646a3c118c0e66f
Tina Zhou [Tue, 22 Aug 2017 20:34:11 +0000 (20:34 +0000)]
Merge "x11: Call XInitThreads()" into nougat-cts-dev am:
cbdbf95222 am:
a6f61be6c3 am:
63d6f4041f am:
977c4c7527 am:
99638edf78
am:
7daa34fc2f
Change-Id: I58b7773d52d88d663bba5517a181a1167f0e269a
Chad Versace [Tue, 22 Aug 2017 20:33:47 +0000 (20:33 +0000)]
x11: Call XInitThreads() am:
5d11c9d2c0 am:
91a1b97b09 am:
f7dc04d927 am:
7e99d9d115 am:
5ce2636243
am:
6f5aed9611
Change-Id: I4686cdcaf5fc2a65f3056094a5420b739b15b8d2
Tina Zhou [Tue, 22 Aug 2017 20:33:23 +0000 (20:33 +0000)]
Merge "x11: Fix deadlock" into nougat-cts-dev am:
34b869eeea am:
f1dcdc55d5 am:
011e9a2331 am:
2c73a05f63 am:
7212d76131
am:
80b7cbe0fb
Change-Id: I02a1d15148a0461073ace47e5781526ce7786a63
Chad Versace [Tue, 22 Aug 2017 20:32:57 +0000 (20:32 +0000)]
x11: Fix deadlock am:
5e863331b2 am:
cef17b4f69 am:
cc7bb08734 am:
2e6b99b9f2 am:
df22ad0da3
am:
15f8a6d785
Change-Id: I45176d563b0ed1be961371921e2c0c01cfc2f39c
Kalle Raita [Tue, 22 Aug 2017 20:32:13 +0000 (20:32 +0000)]
Merge changes from topic 'am-
afbe65226c664d438460b33cb5a405a8' into nyc-mr1-dev am:
59cabbec64 am:
30d7647d1a am:
e6a281d8fd am:
d3fe6938e0
am:
f67751d540
Change-Id: I556bbe60d8720358e8dfcdafdd5a97c4370e827a
Kalle Raita [Tue, 22 Aug 2017 20:31:43 +0000 (20:31 +0000)]
CP: Remove two read-backs from copy image tests am:
263e135474 am:
a691d5ca5c am:
133b1f4004 am:
d027dbfab7 am:
c6600427cf am:
f80e687d4b
am:
d350f2eb82
Change-Id: Ie42476c707fdfeb108ef6ef562298e8673b1ff3b
Kalle Raita [Tue, 22 Aug 2017 20:31:11 +0000 (20:31 +0000)]
CP: Non-compressed copy image target size (64,64,8 am:
7aff1a044f am:
8afffd6f14 am:
26033dda95 am:
a589a9c3e7 am:
0b8845ead5 am:
5aedc50789
am:
4aa30153c2
Change-Id: I485ad40dbff7e5e24af4b99b7a4cadc695a97925
Kalle Raita [Tue, 22 Aug 2017 20:30:37 +0000 (20:30 +0000)]
CP: Remove two read-backs from copy image tests am:
263e135474 am:
15f98c4682 am:
1e01d9996c am:
46a71ac84b am:
55222675a2 am:
b392aa0efd am:
0d785aba32
am:
6771c7c482
Change-Id: I96e70ff2062211abfbc7ade805c599ab4560dffb
Kalle Raita [Tue, 22 Aug 2017 20:30:21 +0000 (20:30 +0000)]
CP: Non-compressed copy image target size (64,64,8 am:
7aff1a044f am:
0a8b1151da am:
7e383871b1 am:
a49a3b9496 am:
db0570a3fb am:
60583880da am:
951fe8aff8
am:
3958f63d3f
Change-Id: Ifd0b280f496900c947e31399e02178ec8687b9c2
Kalle Raita [Tue, 22 Aug 2017 20:29:49 +0000 (20:29 +0000)]
Merge changes from topic 'am-
afbe65226c664d438460b33cb5a405a8' into nyc-mr1-dev am:
59cabbec64 am:
30d7647d1a am:
f390386f29 am:
89aee89302
am:
9c4a1afa50
Change-Id: Ica1b4657f130b048827c595f6e892cb1d0fa2e86
Kalle Raita [Tue, 22 Aug 2017 20:29:39 +0000 (20:29 +0000)]
CP: Remove two read-backs from copy image tests am:
263e135474 am:
a691d5ca5c am:
133b1f4004 am:
d027dbfab7 am:
60623645b1 am:
47f02beb9e
am:
46ff8823f8
Change-Id: I122fc74dd18e5c3f69ea1fe91ccb5cb984fe6268
Kalle Raita [Tue, 22 Aug 2017 20:29:28 +0000 (20:29 +0000)]
CP: Non-compressed copy image target size (64,64,8 am:
7aff1a044f am:
8afffd6f14 am:
26033dda95 am:
a589a9c3e7 am:
ae4278b487 am:
15dc7ab507
am:
e5e3660015
Change-Id: Ie5e0504d1f9864e027eca6d44a04f3036986436a
Kalle Raita [Tue, 22 Aug 2017 20:29:08 +0000 (20:29 +0000)]
CP: Remove two read-backs from copy image tests am:
263e135474 am:
15f98c4682 am:
1e01d9996c am:
46a71ac84b am:
55222675a2 am:
8c8ba6b6e7 am:
bd239739e4
am:
873898d4b0
Change-Id: I08d179485b5ceb219c5ecb04f94659d93e9853f0
Kalle Raita [Tue, 22 Aug 2017 20:28:56 +0000 (20:28 +0000)]
CP: Non-compressed copy image target size (64,64,8 am:
7aff1a044f am:
0a8b1151da am:
7e383871b1 am:
a49a3b9496 am:
db0570a3fb am:
6626543a3a am:
6050c77b48
am:
f80019343b
Change-Id: I721301af93caa8356d773e4321d4ab6d89ee5f94
Kalle Raita [Tue, 22 Aug 2017 20:28:24 +0000 (20:28 +0000)]
CP: Remove two read-backs from copy image tests am:
263e135474 -s ours am:
462575748a am:
86e2ff7051 am:
33eec04a9a am:
9c27db80ef
am:
c9244da7c9
Change-Id: Ibd814c66c30f29ccb66e4293bc288a0ab502ad97
Kalle Raita [Tue, 22 Aug 2017 20:28:00 +0000 (20:28 +0000)]
CP: Non-compressed copy image target size (64,64,8 am:
7aff1a044f am:
8bb21c1262 am:
c080a2efba am:
0670d1bd72 am:
54a9810ee1
am:
f359e01ac7
Change-Id: If658cd17078100499c490df5009ac70c7229d605
Tina Zhou [Tue, 22 Aug 2017 20:27:34 +0000 (20:27 +0000)]
Merge "Remove tests affected by NV/OES_viewport_array extension" into nougat-cts-dev am:
e98444b9bf am:
41c599b77e am:
9d74d882df am:
b3182128b8 am:
a9eaaaca53 -s ours am:
fd5c16b5cc -s ours am:
8b23a3675e -s ours
am:
cc956d5af9 -s ours
Change-Id: Idb7215a99963eff80f0aaa826a46c42b69fed74d
Pyry Haulos [Tue, 22 Aug 2017 20:26:55 +0000 (20:26 +0000)]
Remove tests affected by NV/OES_viewport_array extension am:
267c765690 am:
e4ed95024e am:
578afa4c88 am:
22a8808370 am:
7b177f2f34 -s ours am:
d8fcc99946 -s ours am:
afa9925458 -s ours
am:
53e4033507 -s ours
Change-Id: I5b2b53076638a1eb9cb1c43ee9f0d4554dd1a191
Tina Zhou [Tue, 22 Aug 2017 20:26:23 +0000 (20:26 +0000)]
Merge "Generate flat triangles in polygon offset tests." into nougat-cts-dev am:
61d6d95a66 am:
5611bf398b am:
e2d1c25650 am:
d368eb8664 am:
8cfa8cb220 am:
cb5a254427 am:
bcd9ecefa9
am:
4662208829
Change-Id: I4bc3ec32c475fded78bbe87f0191101088091210
Alexander Galazin [Tue, 22 Aug 2017 20:25:52 +0000 (20:25 +0000)]
Generate flat triangles in polygon offset tests. am:
975a59ebca am:
0bde00f9d6 am:
b57eb2d24f am:
aa9a995cfc am:
afc69d0dd1 am:
0e3f2fcb41 am:
fa5e828111
am:
9055b0aac5
Change-Id: I054b985a97409b82a16f96597f4da58fb959c0d1
Tina Zhou [Tue, 22 Aug 2017 20:24:48 +0000 (20:24 +0000)]
Merge "Relax line width verification in primitive bbox tests" into nougat-cts-dev am:
312a550657 am:
f3d81a3cd9 am:
3b0479c233 am:
0a2fdff220 am:
d8355f769b am:
49858ea9f7 am:
d4fbf4c6bb
am:
249c4337c7
Change-Id: I9cbfe2869f6e399895222b4f15e719d4001ced3a
Pyry Haulos [Tue, 22 Aug 2017 20:24:28 +0000 (20:24 +0000)]
Relax line width verification in primitive bbox tests am:
ba45591407 am:
b4fbc02e3c am:
b9b63c17d2 am:
4f191e12a9 am:
c29aba4a88 am:
a9cd3623d3 am:
102133f902
am:
7842edb00c
Change-Id: I010e2d0054a5ead58995c37ef5baf2e6cf39b66f
Tina Zhou [Tue, 22 Aug 2017 20:24:11 +0000 (20:24 +0000)]
Merge "Fix eglBindAPI negative test" into nougat-cts-dev am:
6068dfbf3a am:
365f81e68c am:
15cde0b466 am:
b21dbe99b2 am:
930d6894e5 am:
02a44043d8 am:
36e6937809
am:
b136c8668e
Change-Id: Ib2fc8904714a10b5b1f8720d1e8dff48129c058c
Nicolas Boichat [Tue, 22 Aug 2017 20:23:53 +0000 (20:23 +0000)]
Fix eglBindAPI negative test am:
09784f8510 am:
3342150f5a am:
1af587d644 am:
52211c87ed am:
fc116aa764 am:
9e92f92f57 am:
0075efc88a
am:
9436a00607
Change-Id: I710a9445ac54af8364b4a42cf7835be273825ac0
Tina Zhou [Tue, 22 Aug 2017 20:23:36 +0000 (20:23 +0000)]
Merge "Drop incorrect framebuffer texture subtests." into nougat-cts-dev am:
3baf7e3be2 am:
a580ae91f8 am:
816d6bdb88 am:
f49c7ce972 am:
a91d8f9bf5 am:
c9e3a51cd3 am:
a87887160e
am:
444141f34c -s ours
Change-Id: Ie9a7ee1e1b320381a459a9fda5726c84d308bd8c
Kenneth Graunke [Tue, 22 Aug 2017 20:23:13 +0000 (20:23 +0000)]
Drop incorrect framebuffer texture subtests. am:
625d685874 am:
25b6d76b01 am:
6f6f3d78fc am:
18805bd38c am:
ce197d0f27 am:
ac112a3efa am:
4f51a66b4b
am:
c796f582c8 -s ours
Change-Id: I63a56e945233e3e776051141c4040928fb20621b
Tina Zhou [Tue, 22 Aug 2017 20:22:43 +0000 (20:22 +0000)]
Merge "Optimize swapchain OOM tests" into nougat-cts-dev am:
c811d42d99 am:
6d4c0dca61 am:
d64bb66820 am:
ec68ba0951 am:
b7985f162a am:
4e37c3bcf2 am:
34555e78f1
am:
c8124c1184
Change-Id: I3fe6fcb5ce8ad48add0016659cab38d5bf512c32
Pyry Haulos [Tue, 22 Aug 2017 20:22:18 +0000 (20:22 +0000)]
Optimize swapchain OOM tests am:
1614827a71 am:
2cfe132119 am:
00ab17bd23 am:
c9b7dae8a8 am:
acce97d998 am:
dda77bf145 am:
c08b02f568
am:
7a03ba225f
Change-Id: I5a2a1eb991df309068fffa5f49d2b396ec2de527
Tina Zhou [Tue, 22 Aug 2017 20:21:45 +0000 (20:21 +0000)]
Merge "Fix internal format/type for ES3 3D + depth/stencil negative API tests." into nougat-cts-dev am:
0991459ed1 am:
e19d6a6859 am:
e0e2260a4a am:
222ef92210 am:
c6747b082f am:
1a84cd74f0 am:
ee8fb54633
am:
a5fe056c67
Change-Id: Iacafecf55a168ded027bb8de97ee8f27ccfc6a9c
Kenneth Graunke [Tue, 22 Aug 2017 20:21:14 +0000 (20:21 +0000)]
Merge "Fix internal format/type for ES3 3D + depth/stencil negative API tests. am:
2ed3a5a66f am:
6a6f549150 am:
f9b870fb5b am:
b47baae90a am:
76a7f607a5 am:
bdbc876fc7" into nyc-mr2-dev-plus-aosp am:
eed66f190e
am:
cd2f7a60f9
Change-Id: I2a860ddfa96d9613f976f84dd5a1338efef8beb7
Kenneth Graunke [Tue, 22 Aug 2017 20:20:43 +0000 (20:20 +0000)]
Fix internal format/type for ES3 3D + depth/stencil negative API tests. am:
2ed3a5a66f am:
6a6f549150 am:
f9b870fb5b am:
b47baae90a am:
76a7f607a5 am:
bdbc876fc7 am:
517bc8386f
am:
112b6c5a69
Change-Id: Ic5fb002953590b41e90a69a4619274679c220817
Tina Zhou [Tue, 22 Aug 2017 20:20:14 +0000 (20:20 +0000)]
Merge "Merge "Add support for EGL_EXT_pixel_format_float" into nougat-cts-dev am:
13a05434cc am:
5f30178321 am:
764cd6e60b am:
0a683a56e7 am:
e961416ca6 -s ours am:
8cddd0f806 -s ours" into nyc-mr2-dev-plus-aosp am:
54349c2293 -s ours
am:
d1ce66946a -s ours
Change-Id: Icb23e3126e0ecf4c8cc9740e6c7843549b649ffc
Tina Zhou [Tue, 22 Aug 2017 20:19:38 +0000 (20:19 +0000)]
Merge "Add support for EGL_EXT_pixel_format_float" into nougat-cts-dev am:
13a05434cc am:
5f30178321 am:
764cd6e60b am:
0a683a56e7 am:
e961416ca6 -s ours am:
8cddd0f806 -s ours am:
11baa951a3 -s ours
am:
de04a2812a -s ours
Change-Id: I750cbf47934704fb2534045ff2df0180aa03b39d