Pyry Haulos [Tue, 22 Aug 2017 21:12:19 +0000 (21:12 +0000)]
Merge vulkan-cts-1.0.2 into aosp/master am:
55da06144c am:
d905a013d0 am:
c91ce3f2a2
am:
dca02bef80
Change-Id: Ic10cb6f345c317690f6a074cf870413895ccaf57
Pyry Haulos [Tue, 22 Aug 2017 21:11:49 +0000 (21:11 +0000)]
Merge "x11_egl: search for glesv1_cm, toggle DEQP_SUPPORT_GLES1 on if found" am:
89c3844ccb am:
17ff0445a7 am:
5fa0204a0a
am:
70b7b394f3
Change-Id: Ic4d03832ab2b116bd125895557f0eee6234d0318
Pyry Haulos [Tue, 22 Aug 2017 21:11:28 +0000 (21:11 +0000)]
Do not re-init GL functions after context reset am:
48870ebe72
am:
b3dddbf271
Change-Id: I3553b689404fbae6704b9288bb5109d031cb0716
Pyry Haulos [Tue, 22 Aug 2017 21:11:06 +0000 (21:11 +0000)]
Do not re-init GL functions after context reset am:
72c880b4c9 am:
a5c0bd16ed am:
8fd7fdf3df
am:
06683b6d0d
Change-Id: Ia8446cbc721cbbb5057661c459ea9858850e43e9
Alexander Galazin [Tue, 22 Aug 2017 21:10:46 +0000 (21:10 +0000)]
Fix shader bugs in OOB tests am:
609d108f89
am:
6600966ac8
Change-Id: Iac5c21ca09d72ff890aa2f6d58a2cf46bcc3ae03
Alexander Galazin [Tue, 22 Aug 2017 21:10:24 +0000 (21:10 +0000)]
Fix shader bugs in OOB tests am:
cf65c56fb4 am:
baf5ae40a9 am:
afc0b6a272
am:
516a43c4f1
Change-Id: Ia03eb8af9e0fc795c28fd5a594d36c8b8a6d2e77
Pyry Haulos [Tue, 22 Aug 2017 21:09:48 +0000 (21:09 +0000)]
resolve merge conflicts of
433645782 to oc-dev-plus-aosp
am:
3a33181ba4
Change-Id: Id339737e93fedf20a36a70d45ad5f11db50f7643
Pyry Haulos [Tue, 22 Aug 2017 21:09:30 +0000 (21:09 +0000)]
Use new LOD approximation rules for OpenGL ES am:
0b6dbeb93e am:
d05ba20fed am:
097f4d1511
am:
52bce38cb6
Change-Id: Ic50f9c44822d4c04838cf9bbe149678e62cc9244
Pyry Haulos [Tue, 22 Aug 2017 21:09:12 +0000 (21:09 +0000)]
Relax LOD computation bounds am:
a9a793142c am:
1aae7665eb am:
126f23f1f4
am:
8da912daf1
Change-Id: I15f81cea0626e82db3980e6e39d705a4b50cb392
Pyry Haulos [Tue, 22 Aug 2017 21:08:58 +0000 (21:08 +0000)]
Merge Vulkan CTS 1.0.2.2 into goog/oc-dev am:
a44ba43f52
am:
5370e5f24b
Change-Id: If42032b5ec1c05d6c6d727e89daea0c0bc0807f3
Pyry Haulos [Tue, 22 Aug 2017 21:08:46 +0000 (21:08 +0000)]
Merge Vulkan CTS 1.0.2.2 into aosp/master am:
d4891aeb29 am:
9e51a9547a am:
f6b03a3a50
am:
2c01c32bac
Change-Id: I34ef952a07cc0037e9349d6cb566e8c53f2820c6
Kalle Raita [Tue, 22 Aug 2017 21:08:17 +0000 (21:08 +0000)]
CP: Update runtime hints for master and Nougat am:
37fdf46649
am:
950100f76e
Change-Id: Ifcd9b34f37fd008765a3adef1fc8baf1af5a3fc7
Kalle Raita [Tue, 22 Aug 2017 21:08:04 +0000 (21:08 +0000)]
Merge "Update runtime hints for master and Nougat" am:
c29c5a7b35 am:
d25e6dcca6 am:
9a3ee57a75
am:
f01815f17d
Change-Id: Ifd5134dac00a50376de3b7ed3693091c7e0e2a02
Pyry Haulos [Tue, 22 Aug 2017 21:07:39 +0000 (21:07 +0000)]
Revert "Allow old behavior in image format property tests" am:
6d962c2a6f am:
8c75e4b367 am:
8ecb06a488
am:
bd01a31a03
Change-Id: I5fd92ef8536079f7dda24145801c5ddd94677f38
James Glanville [Tue, 22 Aug 2017 21:07:26 +0000 (21:07 +0000)]
Fix tests in dEQP-EGL.functional.robustness* am:
fd0b6eda1c am:
d3ac80fae5 am:
54c4090dfe
am:
b4c6add667
Change-Id: I31ac9ae9d664f862db3728d2f71fb5cb08899069
Pyry Haulos [Tue, 22 Aug 2017 21:07:10 +0000 (21:07 +0000)]
Fix GL entry point loading in robustness tests am:
ee81fc2044 am:
7af7cc4764 am:
5222daa01a
am:
5f5a909017
Change-Id: Ic8bc9f51b327946fc508e39481167fc9152361ac
Brian Anderson [Tue, 22 Aug 2017 21:06:51 +0000 (21:06 +0000)]
Remove retire event from eglGetFrameTimestamps am:
1c43c47725 am:
be7f9f0a83 am:
00f5a5956b
am:
728085dbe2
Change-Id: I19fa75f3d972fdea4763a904c29a2b42cac33b9c
Pyry Haulos [Tue, 22 Aug 2017 21:06:35 +0000 (21:06 +0000)]
Fix warning introduced in
2c9e3ec9 am:
521361d83d am:
19bf995047 am:
80b99cc54a am:
b39a206388 am:
5006352564 am:
8aa6812b7c
am:
2545942815
Change-Id: Iaea74315782dbb087b385e435b1f091e6e095fce
Pyry Haulos [Tue, 22 Aug 2017 21:05:56 +0000 (21:05 +0000)]
Fix warning introduced in
2c9e3ec9 am:
521361d83d am:
19bf995047 am:
c4c0f6d489 am:
31d2e24daf am:
e615f79c5a
am:
0676473b72
Change-Id: I58f136a9f30106a51928a7c9de79b1264d6c9556
Pyry Haulos [Tue, 22 Aug 2017 21:05:30 +0000 (21:05 +0000)]
Fix warning introduced in
2c9e3ec9 am:
521361d83d am:
5f34117776 am:
eba2559865 am:
99f3ab7c5a am:
91a3078a37 am:
bcca961424 am:
d3a3351f43
am:
f686bd5f57
Change-Id: I27cf7eef9e68d91fbe5c6d6507a36a942317474d
Pyry Haulos [Tue, 22 Aug 2017 21:05:03 +0000 (21:05 +0000)]
Fix warning introduced in
2c9e3ec9 am:
d8b452a753 am:
03dde47b9d am:
9333757172
am:
48b95fe358
Change-Id: I9ce95f265efc18f68fd94489d23bbc21f70aef3c
Alexander Galazin [Tue, 22 Aug 2017 21:04:44 +0000 (21:04 +0000)]
Merge "Merge "Further relax line verification in primitive bbox tests" into nougat-cts-dev am:
0532365740 am:
468843cf08 am:
085f13d8da am:
981b8742da" into nyc-mr2-dev-plus-aosp am:
31f2366386
am:
de5423ea05
Change-Id: Ie653ac95d94b4cdc48a1b189d8736c25f22aa2a3
Alexander Galazin [Tue, 22 Aug 2017 21:04:18 +0000 (21:04 +0000)]
Merge "Further relax line verification in primitive bbox tests" into nougat-cts-dev am:
0532365740 am:
dce98dc6e9 am:
650fc6607d am:
2e13d553b0 am:
cb66bf73ac am:
e17e4e54b0 am:
6428468a8b
am:
5f6e45bf92
Change-Id: I2814cec474b0da8d7d368171d5140ed1efd73641
Alexander Galazin [Tue, 22 Aug 2017 21:03:53 +0000 (21:03 +0000)]
Merge "Further relax line verification in primitive bbox tests" into nougat-cts-dev am:
0532365740 am:
468843cf08 am:
726720187d am:
19a2ee6b36 am:
94f99f7054 am:
7540f5a544
am:
819e026dfc
Change-Id: I108446e07223816dfde1ae03df8991a13e0f0ea4
Pyry Haulos [Tue, 22 Aug 2017 21:03:29 +0000 (21:03 +0000)]
Fix warnings in new EGL tests am:
de0c0ce818 am:
ea8380f2db am:
8e517dcc33
am:
688c264fa0
Change-Id: I411ee6ede3c31e51f572dfdae6cf9a82db1450b5
Alexander Galazin [Tue, 22 Aug 2017 21:03:18 +0000 (21:03 +0000)]
Use glReadnPixels only if KHR_robustness is supported am:
d99ba132d9 am:
875d3c2990 am:
4a2a606f28 am:
31335b5fc3 am:
4a75760b34 am:
ff6b243c33 am:
e9179721a7
am:
d4f1cddd22
Change-Id: Ie7b232da190323bd366bee01530e9ff1fa52aebc
Alexander Galazin [Tue, 22 Aug 2017 21:03:05 +0000 (21:03 +0000)]
Merge "Use glReadnPixels only if KHR_robustness is supported am:
d99ba132d9 am:
d01980d03d am:
1efb4d5fdd am:
a03d5cd549 am:
db3b4ad59a" into nyc-mr2-dev-plus-aosp am:
6886889dd2
am:
49c0db9055
Change-Id: I7aa65fedda420b83fb15b7b96597e4f24983566a
Alexander Galazin [Tue, 22 Aug 2017 21:02:53 +0000 (21:02 +0000)]
Use glReadnPixels only if KHR_robustness is supported am:
d99ba132d9 am:
d01980d03d am:
19b4a4e7ac am:
2d0dfec91d am:
38a71682fd
am:
29a6f6dab4
Change-Id: Ib6c8e3fbce2ea545043aae08ed97795a8a80a4d0
Kenneth Graunke [Tue, 22 Aug 2017 21:02:40 +0000 (21:02 +0000)]
Merge "Fix stencil bits when creating reference image in depth stencil tests" am:
1f9e724a41 am:
17f944d740 am:
e6980259ca
am:
b7c8854c31
Change-Id: I037fa52f109dcf8ff3c38257530d803d6b240748
Sunny Sun [Tue, 22 Aug 2017 21:02:30 +0000 (21:02 +0000)]
Fix typo in dEQP-GLES31.functional.srgb_texture_decode.skip_decode.* am:
e05b3a9c94 am:
6b525a74ec am:
148faca50c
am:
ffc29271fa
Change-Id: Iec47851a7d7b53d44b8c3f87a27368e8ebb8ac9c
Brian Anderson [Tue, 22 Aug 2017 21:02:18 +0000 (21:02 +0000)]
Fix flakiness of compositeDeadline check of eglGetFrameTimestsmps am:
40fd86f16f am:
7cc41a5dfc am:
f4f65e7140
am:
5a70f10096
Change-Id: I962f73d54818640dab46584ea94e4eee8b407172
John Richardson [Tue, 22 Aug 2017 21:02:06 +0000 (21:02 +0000)]
Merge "Modify EGL robustness tests to use VBOs" am:
c9dcf19f73 am:
c3629c05cc am:
27d6b7fdb7
am:
8cf37a8380
Change-Id: I7605edd142dcf0b73c349be6e7c99bb087a6a500
Pyry Haulos [Tue, 22 Aug 2017 21:01:52 +0000 (21:01 +0000)]
Fix "null" ID in sRGB decode tests am:
ab0a5da69e am:
d1d2cbde30 am:
52d58263af
am:
55dec29e44
Change-Id: I7a0b1aa72eee846d51cd0f7d942401f30f0d306e
Mark Adams [Tue, 22 Aug 2017 21:01:33 +0000 (21:01 +0000)]
Modify single_tessellation_stage to check for GL_NV_gpu_shader5 am:
2c74c73891 am:
ffd7498e5b am:
5a3babd313
am:
1381e8fffb
Change-Id: I7fc59410b0bb5fe7b41e50ba80bf7107e4ed5ffb
John Richardson [Tue, 22 Aug 2017 21:01:10 +0000 (21:01 +0000)]
Add new robustness extension tests am:
83c250d247 am:
9df12c2edc am:
630f00b166
am:
38b41d45fa
Change-Id: Id0c2e7296b70657f0449cb3820fd44487db1684e
Mika Isojrvi [Tue, 22 Aug 2017 21:00:52 +0000 (21:00 +0000)]
Fix tessellation support checks in negative binding tests am:
698b728335 am:
04deca9bc5 am:
d059396f65
am:
5789d2cb51
Change-Id: I42896b05ef86e6967d9b388b1753b9ae13ddf0f6
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