platform/upstream/VK-GL-CTS.git
7 years agoMerge "Update Android CTS Vulkan mustpass to match 1.0.2" am: 8de4af67bb am: b3191e5847
Pyry Haulos [Tue, 31 Jan 2017 01:53:07 +0000 (01:53 +0000)]
Merge "Update Android CTS Vulkan mustpass to match 1.0.2" am: 8de4af67bb am: b3191e5847
am: eab06747e6

Change-Id: I5215c23f56416f961425db6ac09cee45a0bdddae

7 years agoMerge "Update Android CTS Vulkan mustpass to match 1.0.2" am: 8de4af67bb
Pyry Haulos [Tue, 31 Jan 2017 01:51:07 +0000 (01:51 +0000)]
Merge "Update Android CTS Vulkan mustpass to match 1.0.2" am: 8de4af67bb
am: b3191e5847

Change-Id: Ia6d3877821be9d31771445efe2ad382645dda568

7 years agoMerge "Update Android CTS Vulkan mustpass to match 1.0.2"
Pyry Haulos [Tue, 31 Jan 2017 01:48:37 +0000 (01:48 +0000)]
Merge "Update Android CTS Vulkan mustpass to match 1.0.2"
am: 8de4af67bb

Change-Id: I2accdd355e2d34d9d808ffb9b93afec01d0d345d

7 years agoMerge "Update Android CTS Vulkan mustpass to match 1.0.2"
Treehugger Robot [Tue, 31 Jan 2017 01:45:31 +0000 (01:45 +0000)]
Merge "Update Android CTS Vulkan mustpass to match 1.0.2"

7 years agoAdded gl_BoundingBox built-in type access tests am: ed63f60eb4 am: 2160941ec7
Michael Hadley [Tue, 31 Jan 2017 00:33:07 +0000 (00:33 +0000)]
Added gl_BoundingBox built-in type access tests am: ed63f60eb4 am: 2160941ec7
am: b784ed3d7b

Change-Id: I0be84ee47830fd4264db5865d5851792ebdf290b

7 years agoAdd SSBO block tests am: 04ba289d6e am: ce0a6e4b7b
Michael Hadley [Tue, 31 Jan 2017 00:33:02 +0000 (00:33 +0000)]
Add SSBO block tests am: 04ba289d6e am: ce0a6e4b7b
am: 375a437841

Change-Id: I71203b5172bbd9d03b295ceba1d607ab9fa66675

7 years agoAdded gl_BoundingBox built-in type access tests am: ed63f60eb4
Michael Hadley [Tue, 31 Jan 2017 00:31:04 +0000 (00:31 +0000)]
Added gl_BoundingBox built-in type access tests am: ed63f60eb4
am: 2160941ec7

Change-Id: I8b40a4290decf450cacbd43ea00db90f6f64f2bb

7 years agoAdd SSBO block tests am: 04ba289d6e
Michael Hadley [Tue, 31 Jan 2017 00:31:01 +0000 (00:31 +0000)]
Add SSBO block tests am: 04ba289d6e
am: ce0a6e4b7b

Change-Id: I3a786919bca07ae6f5a4be0c5f5dd992ec3256a7

7 years agoAdded gl_BoundingBox built-in type access tests
Michael Hadley [Tue, 31 Jan 2017 00:28:34 +0000 (00:28 +0000)]
Added gl_BoundingBox built-in type access tests
am: ed63f60eb4

Change-Id: I1d0700b52ee7dfbd51f7e7165df01696d6b299cf

7 years agoAdd SSBO block tests
Michael Hadley [Tue, 31 Jan 2017 00:28:32 +0000 (00:28 +0000)]
Add SSBO block tests
am: 04ba289d6e

Change-Id: I33095ab7cebe48f0941370bf9d0b6c576a90c464

7 years agoUpdate Android CTS Vulkan mustpass to match 1.0.2
Pyry Haulos [Tue, 31 Jan 2017 00:02:32 +0000 (16:02 -0800)]
Update Android CTS Vulkan mustpass to match 1.0.2

This CL updates Android CTS mustpass for Vulkan to match Khronos Vulkan
CTS 1.0.2.0.

Change-Id: Ia2f82b5f6675c67940679eb98f59510f264d62bf

7 years agoAdded gl_BoundingBox built-in type access tests
Michael Hadley [Wed, 14 Dec 2016 20:08:59 +0000 (20:08 +0000)]
Added gl_BoundingBox built-in type access tests

New tests:
- dEQP-GLES31.functional.debug.negative_coverage.callbacks.shader_directive.accessing_bounding_box_type

Change-Id: I8f47dfdfde631f36f6a515459867b59e3c210701

7 years agoAdd SSBO block tests
Michael Hadley [Thu, 1 Dec 2016 17:52:17 +0000 (17:52 +0000)]
Add SSBO block tests

New Tests:
- dEQP-GLES31.functional.debug.negative_coverage.callbacks.ssbo_block.ssbo_block.*

Change-Id: I60d52bc34d9211e93332dcc719535f1f5e4a0596

7 years agoAdd tessellation shader stages to negative layout_binding tests am: b7272b0934 am...
John Richardson [Mon, 30 Jan 2017 20:48:24 +0000 (20:48 +0000)]
Add tessellation shader stages to negative layout_binding tests am: b7272b0934 am: 234af40a4f
am: 7db3ca77ea

Change-Id: Ia5ff0d8f6ca0482059afbf9af0293f1cd20f6c8c

7 years agoAdd new tessellation negative coverage tests am: 1889817926 am: 6505a995c1
John Richardson [Mon, 30 Jan 2017 20:48:14 +0000 (20:48 +0000)]
Add new tessellation negative coverage tests am: 1889817926 am: 6505a995c1
am: 02e452454c

Change-Id: Ie80c9550edb2f72667248cd7c5d0d122f49da66c

7 years agoAdd tessellation shader stages to negative layout_binding tests am: b7272b0934
John Richardson [Mon, 30 Jan 2017 20:46:25 +0000 (20:46 +0000)]
Add tessellation shader stages to negative layout_binding tests am: b7272b0934
am: 234af40a4f

Change-Id: I04d9dbd56ec699b876b36d7ba8ac7894cfa81101

7 years agoAdd new tessellation negative coverage tests am: 1889817926
John Richardson [Mon, 30 Jan 2017 20:46:14 +0000 (20:46 +0000)]
Add new tessellation negative coverage tests am: 1889817926
am: 6505a995c1

Change-Id: Ic1c997496e29598e0a889ddbc0c260746b60ea00

7 years agoAdd tessellation shader stages to negative layout_binding tests
John Richardson [Mon, 30 Jan 2017 20:43:56 +0000 (20:43 +0000)]
Add tessellation shader stages to negative layout_binding tests
am: b7272b0934

Change-Id: I7b698194e1b617fa6c0e31ba437c1586f2c01a44

7 years agoAdd new tessellation negative coverage tests
John Richardson [Mon, 30 Jan 2017 20:43:44 +0000 (20:43 +0000)]
Add new tessellation negative coverage tests
am: 1889817926

Change-Id: I8f4b76d0c37c88c45512352502ed138acc095fc4

7 years agoAdd tessellation shader stages to negative layout_binding tests
John Richardson [Wed, 23 Nov 2016 14:48:32 +0000 (14:48 +0000)]
Add tessellation shader stages to negative layout_binding tests

Tests groups added to:
- dEQP-GLES31.functional.layout_binding.negative.sampler.sampler2d.*.
- dEQP-GLES31.functional.layout_binding.negative.sampler.sampler3d.*.
- dEQP-GLES31.functional.layout_binding.negative.ubo.*.
- dEQP-GLES31.functional.layout_binding.negative.ssbo.*.
- dEQP-GLES31.functional.layout_binding.negative.image.image2d.*.
- dEQP-GLES31.functional.layout_binding.negative.image.image3d.*.

New tests (tess_control, tess_evalution):
- binding_neg
- binding_over_max
- binding_neg_array
- binding_over_max_array

Extended tests:
- binding_contradictory
- binding_contradictory_array

Change-Id: Ia6b66f1d5316e3bba376a8aea189074b60fbedb5

7 years agoAdd new tessellation negative coverage tests
John Richardson [Wed, 9 Nov 2016 08:34:43 +0000 (08:34 +0000)]
Add new tessellation negative coverage tests

Test groups added to:
- dEQP-GLES31.functional.shaders.linkage.tessellation.varying.rules
- dEQP-GLES31.functional.shaders.linkage.tessellation.layout_declarations.rules (new)
- dEQP-GLES31.functional.shaders.linkage.tessellation.barriers.rules (new)
- dEQP-GLES31.functional.debug.negative_coverage.*.tessellation (new)

New tests:
- output_non_array
- invalid_patch_in_usage
- invalid_patch_out_usage
- invalid_per_patch_qualifier_usage
- output_block_non_array

- invalid_barrier_usage_within_control_flow
- invalid_barrier_usage_after_return

- primitive_mode_mismatch
- spacing_mode_mismatch
- vertex_order_mismatch
- vertex_count_mismatch

- single_tessellation_stage
- invalid_primitive_mode
- tessellation_not_active
- invalid_program_state
- get_programiv
- invalid_program_queries
- tessellation_control_invalid_vertex_count

Change-Id: I0c4f4b407bfe80e09546af51fdb2d184cf310757

7 years agoMerge nougat-mr1-cts-dev into master. am: 2dcacdbe0a am: b196334de5
Xin Li [Thu, 26 Jan 2017 21:15:27 +0000 (21:15 +0000)]
Merge nougat-mr1-cts-dev into  am: 2dcacdbe0a am: b196334de5
am: 769492af1d

Change-Id: Ic9c6eec0b2d1cee2c2efa20531720eb6fb77745b

7 years agoMerge nougat-mr1-cts-dev into master. am: 2dcacdbe0a
Xin Li [Thu, 26 Jan 2017 21:12:27 +0000 (21:12 +0000)]
Merge nougat-mr1-cts-dev into  am: 2dcacdbe0a
am: b196334de5

Change-Id: I28d200d6322de752529169cc1960379774f4fd7f

7 years agoMerge nougat-mr1-cts-dev into master.
Xin Li [Thu, 26 Jan 2017 21:09:27 +0000 (21:09 +0000)]
Merge nougat-mr1-cts-dev into master.
am: 2dcacdbe0a

Change-Id: I4d80ab4fe02c0c7209365b08bf64358f6f7979e8

7 years agoSkip commit 'c5bbebc46ac7725d43692602422ee3fc76cac7b0' on master. am: b1fa5e8f2c...
Xin Li [Thu, 26 Jan 2017 20:40:27 +0000 (20:40 +0000)]
Skip commit 'c5bbebc46ac7725d43692602422ee3fc76cac7b0' on  am: b1fa5e8f2c am: ef0c4176d6
am: 4f65cf0bba

Change-Id: I71cedd451ef3bd6e29f8ece5025c4603defc2091

7 years agoMerge commit '2a9d42a651ef444f32f0a6e60711bb2c371d3fce' from nougat-cts-mr1-dev to...
Xin Li [Thu, 26 Jan 2017 20:40:20 +0000 (20:40 +0000)]
Merge commit '2a9d42a651ef444f32f0a6e60711bb2c371d3fce' from nougat-cts-mr1-dev to  am: 04974c3449 am: 1f9853e006
am: e9a25e7e34

Change-Id: Ib75bb206d5423e89bf53b3011ab918ec41f8046b

7 years agoSkip commit 'c5bbebc46ac7725d43692602422ee3fc76cac7b0' on master. am: b1fa5e8f2c
Xin Li [Thu, 26 Jan 2017 20:37:32 +0000 (20:37 +0000)]
Skip commit 'c5bbebc46ac7725d43692602422ee3fc76cac7b0' on  am: b1fa5e8f2c
am: ef0c4176d6

Change-Id: I722cc549948cf2de67e6f73e9567c1fd60b81dd3

7 years agoMerge commit '2a9d42a651ef444f32f0a6e60711bb2c371d3fce' from nougat-cts-mr1-dev to...
Xin Li [Thu, 26 Jan 2017 20:37:23 +0000 (20:37 +0000)]
Merge commit '2a9d42a651ef444f32f0a6e60711bb2c371d3fce' from nougat-cts-mr1-dev to  am: 04974c3449
am: 1f9853e006

Change-Id: I17f55595d2971b1fc98cda86a96d8bba4880dcc1

7 years agoSkip commit 'c5bbebc46ac7725d43692602422ee3fc76cac7b0' on master.
Xin Li [Thu, 26 Jan 2017 20:34:33 +0000 (20:34 +0000)]
Skip commit 'c5bbebc46ac7725d43692602422ee3fc76cac7b0' on 
am: b1fa5e8f2c

Change-Id: If4100aebe657cc11438526fc0d0151d4158e2372

7 years agoMerge commit '2a9d42a651ef444f32f0a6e60711bb2c371d3fce' from nougat-cts-mr1-dev to...
Xin Li [Thu, 26 Jan 2017 20:34:22 +0000 (20:34 +0000)]
Merge commit '2a9d42a651ef444f32f0a6e60711bb2c371d3fce' from nougat-cts-mr1-dev to 
am: 04974c3449

Change-Id: Idd92a7eeffaa2a6aec507dc3c886a6f08eea47be

7 years agoMerge nougat-mr1-cts-dev into master.
Xin Li [Thu, 26 Jan 2017 18:55:24 +0000 (10:55 -0800)]
Merge nougat-mr1-cts-dev into master.

7 years agoSkip commit 'c5bbebc46ac7725d43692602422ee3fc76cac7b0' on master.
Xin Li [Thu, 26 Jan 2017 18:53:54 +0000 (10:53 -0800)]
Skip commit 'c5bbebc46ac7725d43692602422ee3fc76cac7b0' on 

7 years agoMerge commit '2a9d42a651ef444f32f0a6e60711bb2c371d3fce' from
Xin Li [Thu, 26 Jan 2017 18:28:31 +0000 (10:28 -0800)]
Merge commit '2a9d42a651ef444f32f0a6e60711bb2c371d3fce' from
nougat-cts-mr1-dev to master.

Change-Id: I9ad6799aaae603a05c0cc65bcff60df8bff88a95

7 years agoAdd eglChooseConfig() tests for EXT_pixel_format_float am: 54c090f981 am: 225e1e1eb7
Pyry Haulos [Tue, 24 Jan 2017 23:25:55 +0000 (23:25 +0000)]
Add eglChooseConfig() tests for EXT_pixel_format_float am: 54c090f981 am: 225e1e1eb7
am: f7c70217d6

Change-Id: Ib8f1f8aba7758c82266e4b32ad33fe1f0336867e

7 years agoAdd basic test for EGL_KHR_no_config_context am: d7ec39dd04 am: a05826c329
Pyry Haulos [Tue, 24 Jan 2017 23:25:52 +0000 (23:25 +0000)]
Add basic test for EGL_KHR_no_config_context am: d7ec39dd04 am: a05826c329
am: 726be5f657

Change-Id: Idd4cbec6935fb1fbbc465aa0e416258033002e4c

7 years agoAdd eglChooseConfig() tests for EXT_pixel_format_float am: 54c090f981
Pyry Haulos [Tue, 24 Jan 2017 23:23:24 +0000 (23:23 +0000)]
Add eglChooseConfig() tests for EXT_pixel_format_float am: 54c090f981
am: 225e1e1eb7

Change-Id: I9fdd2a30032317a761150e5f7f3bf51f31d4ff37

7 years agoAdd basic test for EGL_KHR_no_config_context am: d7ec39dd04
Pyry Haulos [Tue, 24 Jan 2017 23:23:21 +0000 (23:23 +0000)]
Add basic test for EGL_KHR_no_config_context am: d7ec39dd04
am: a05826c329

Change-Id: I136e25b6981efdba8aeebce666a7f8bd516da486

7 years agoAdd eglChooseConfig() tests for EXT_pixel_format_float
Pyry Haulos [Tue, 24 Jan 2017 23:21:22 +0000 (23:21 +0000)]
Add eglChooseConfig() tests for EXT_pixel_format_float
am: 54c090f981

Change-Id: I03e6ac5098e24cdf1234734412b485ef8ba6e9a2

7 years agoAdd basic test for EGL_KHR_no_config_context
Pyry Haulos [Tue, 24 Jan 2017 23:21:20 +0000 (23:21 +0000)]
Add basic test for EGL_KHR_no_config_context
am: d7ec39dd04

Change-Id: I8d311d08ebdb37f1eb81e1a22b14b587d0b31357

7 years agoAdd eglChooseConfig() tests for EXT_pixel_format_float
Pyry Haulos [Fri, 20 Jan 2017 18:30:13 +0000 (10:30 -0800)]
Add eglChooseConfig() tests for EXT_pixel_format_float

These tests verify that eglChooseConfig() filters configs correctly
based on EGL_COLOR_COMPONENT_TYPE_EXT attribute.

Change-Id: Icaaffee69dd46a9044149c01c8fe8b7ec8928305

7 years agoAdd basic test for EGL_KHR_no_config_context
Pyry Haulos [Fri, 20 Jan 2017 19:04:46 +0000 (11:04 -0800)]
Add basic test for EGL_KHR_no_config_context

Change-Id: I14aa3f38ea8d2aaa224c13a992d41cf5ef546f6e

7 years agoMerge aosp/upstream-vulkan-cts-1.0-dev into aosp/master am: 68408cad8f am: 81e6e20395
Pyry Haulos [Tue, 24 Jan 2017 19:48:12 +0000 (19:48 +0000)]
Merge aosp/upstream-vulkan-cts-1.0-dev into aosp/master am: 68408cad8f am: 81e6e20395
am: 65d27d1ecb

Change-Id: I888b7e7d8168e0aa004fb708ca6eb9bf42a68e6a

7 years agoMerge aosp/upstream-vulkan-cts-1.0-dev into aosp/master am: 68408cad8f
Pyry Haulos [Tue, 24 Jan 2017 19:45:39 +0000 (19:45 +0000)]
Merge aosp/upstream-vulkan-cts-1.0-dev into aosp/master am: 68408cad8f
am: 81e6e20395

Change-Id: Ia2a6111596af7621485b406da9ad5b046f8a43d5

7 years agoMerge aosp/upstream-vulkan-cts-1.0-dev into aosp/master
Pyry Haulos [Tue, 24 Jan 2017 19:43:39 +0000 (19:43 +0000)]
Merge aosp/upstream-vulkan-cts-1.0-dev into aosp/master
am: 68408cad8f

Change-Id: I80f0e00e63ebbfe674b4f5d60e5da1a72084066b

7 years agoMerge aosp/upstream-vulkan-cts-1.0-dev into aosp/master
Pyry Haulos [Tue, 24 Jan 2017 17:07:51 +0000 (09:07 -0800)]
Merge aosp/upstream-vulkan-cts-1.0-dev into aosp/master

Change-Id: Ifee45dee9fe57a8386c468dfedfb822c329f2504

7 years agoMerge "Merge "x11: Call XInitThreads()" into nougat-cts-dev am: cbdbf95222 am: a74d50...
Android Build Merger (Role) [Mon, 23 Jan 2017 19:55:36 +0000 (19:55 +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

7 years agoMerge "x11: Call XInitThreads()" into nougat-cts-dev am: cbdbf95222 am: a74d50ffda...
Tina Zhou [Mon, 23 Jan 2017 19:55:28 +0000 (19:55 +0000)]
Merge "x11: Call XInitThreads()" into nougat-cts-dev am: cbdbf95222 am: a74d50ffda am: b92f7d676f am: d46ac1a0ca am: bb7e6b4f15
am: 63b680c857

Change-Id: Ic0e2be5565045db085ba67326572b230ad874fd5

7 years agoMerge "x11: Call XInitThreads() am: 5d11c9d2c0 am: f465d82fa5 am: 0ed6cc912e am:...
Android Build Merger (Role) [Mon, 23 Jan 2017 19:55:19 +0000 (19:55 +0000)]
Merge "x11: Call XInitThreads() am: 5d11c9d2c0 am: f465d82fa5 am: 0ed6cc912e am: e7ee6541a9 am: 587123a671 am: e5286dbaf7" into nyc-mr2-dev-plus-aosp

7 years agox11: Call XInitThreads() am: 5d11c9d2c0 am: f465d82fa5 am: 0ed6cc912e am: e7ee6541a9...
Chad Versace [Mon, 23 Jan 2017 19:55:11 +0000 (19:55 +0000)]
x11: Call XInitThreads() am: 5d11c9d2c0 am: f465d82fa5 am: 0ed6cc912e am: e7ee6541a9 am: 587123a671
am: e5286dbaf7

Change-Id: Ic7c13f85a75875f5295360200ebddd1e198fc064

7 years agoMerge "Merge "x11: Call XInitThreads()" into nougat-cts-dev am: cbdbf95222 am: a74d50...
Android Build Merger (Role) [Mon, 23 Jan 2017 19:55:09 +0000 (19:55 +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

7 years agoMerge "Merge "x11: Fix deadlock" into nougat-cts-dev am: 34b869eeea am: 05f26155f0...
Android Build Merger (Role) [Mon, 23 Jan 2017 19:55:03 +0000 (19:55 +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

7 years agoMerge "x11: Call XInitThreads()" into nougat-cts-dev am: cbdbf95222 am: a74d50ffda...
Tina Zhou [Mon, 23 Jan 2017 19:55:02 +0000 (19:55 +0000)]
Merge "x11: Call XInitThreads()" into nougat-cts-dev am: cbdbf95222 am: a74d50ffda am: b92f7d676f am: d46ac1a0ca am: bb7e6b4f15
am: 120b5fb421

Change-Id: Ic2d80a109db0037a8e399935f6ee565cbee19e76

7 years agoMerge "x11: Fix deadlock" into nougat-cts-dev am: 34b869eeea am: 05f26155f0 am: 7bb50...
Tina Zhou [Mon, 23 Jan 2017 19:54:56 +0000 (19:54 +0000)]
Merge "x11: Fix deadlock" into nougat-cts-dev am: 34b869eeea am: 05f26155f0 am: 7bb5047d5e am: 1b341143c0 am: d737e16da8
am: 100bd75cb7

Change-Id: Iadf1e0c66d1eb783f4ba06f05d9f4761ad7a4ff2

7 years agoMerge "x11: Call XInitThreads() am: 5d11c9d2c0 am: f465d82fa5 am: 0ed6cc912e am:...
Android Build Merger (Role) [Mon, 23 Jan 2017 19:54:56 +0000 (19:54 +0000)]
Merge "x11: Call XInitThreads() am: 5d11c9d2c0 am: f465d82fa5 am: 0ed6cc912e am: e7ee6541a9 am: 587123a671 am: b57d3123ac" into nyc-mr2-dev-plus-aosp

7 years agoMerge "x11: Fix deadlock am: 5e863331b2 am: 7d0ad652ff am: ca5a475223 am: 319a51d5dd...
Android Build Merger (Role) [Mon, 23 Jan 2017 19:54:51 +0000 (19:54 +0000)]
Merge "x11: Fix deadlock am: 5e863331b2 am: 7d0ad652ff am: ca5a475223 am: 319a51d5dd am: 97cc16aa0a am: ab54c5b0ef" into nyc-mr2-dev-plus-aosp

7 years agox11: Call XInitThreads() am: 5d11c9d2c0 am: f465d82fa5 am: 0ed6cc912e am: e7ee6541a9...
Chad Versace [Mon, 23 Jan 2017 19:54:49 +0000 (19:54 +0000)]
x11: Call XInitThreads() am: 5d11c9d2c0 am: f465d82fa5 am: 0ed6cc912e am: e7ee6541a9 am: 587123a671
am: b57d3123ac

Change-Id: I1a0587e87848589b15961c4ca7b4508bd95fcf47

7 years agox11: Fix deadlock am: 5e863331b2 am: 7d0ad652ff am: ca5a475223 am: 319a51d5dd am...
Chad Versace [Mon, 23 Jan 2017 19:54:45 +0000 (19:54 +0000)]
x11: Fix deadlock am: 5e863331b2 am: 7d0ad652ff am: ca5a475223 am: 319a51d5dd am: 97cc16aa0a
am: ab54c5b0ef

Change-Id: Ic5a53f171405f0d983b8460835f358881efd4427

7 years agoMerge "Merge "x11: Fix deadlock" into nougat-cts-dev am: 34b869eeea am: 05f26155f0...
Android Build Merger (Role) [Mon, 23 Jan 2017 19:54:44 +0000 (19:54 +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

7 years agoMerge "Merge "x11: Call XInitThreads()" into nougat-cts-dev am: cbdbf95222 am: 6aef23...
Android Build Merger (Role) [Mon, 23 Jan 2017 19:54:39 +0000 (19:54 +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

7 years agoMerge "x11: Fix deadlock" into nougat-cts-dev am: 34b869eeea am: 05f26155f0 am: 7bb50...
Tina Zhou [Mon, 23 Jan 2017 19:54:37 +0000 (19:54 +0000)]
Merge "x11: Fix deadlock" into nougat-cts-dev am: 34b869eeea am: 05f26155f0 am: 7bb5047d5e am: 1b341143c0 am: d737e16da8
am: b969431bfd

Change-Id: I845abdddf5abbb505dbdfbd939d2f6285e7ee0da

7 years agoMerge "x11: Call XInitThreads()" into nougat-cts-dev am: cbdbf95222 am: 6aef236dd0...
Tina Zhou [Mon, 23 Jan 2017 19:54:31 +0000 (19:54 +0000)]
Merge "x11: Call XInitThreads()" into nougat-cts-dev am: cbdbf95222 am: 6aef236dd0 am: f23a03362a am: 40ff9476c8
am: ac78f3c5b7

Change-Id: I79cb795f0224730897b2c7686d7c780c8549fc13

7 years agoMerge "x11: Fix deadlock am: 5e863331b2 am: 7d0ad652ff am: ca5a475223 am: 319a51d5dd...
Android Build Merger (Role) [Mon, 23 Jan 2017 19:54:31 +0000 (19:54 +0000)]
Merge "x11: Fix deadlock am: 5e863331b2 am: 7d0ad652ff am: ca5a475223 am: 319a51d5dd am: 97cc16aa0a am: 8b86967b6f" into nyc-mr2-dev-plus-aosp

7 years agoMerge "x11: Call XInitThreads() am: 5d11c9d2c0 am: 0fe4efcfa8 am: 8c04df2e48 am:...
Android Build Merger (Role) [Mon, 23 Jan 2017 19:54:25 +0000 (19:54 +0000)]
Merge "x11: Call XInitThreads() am: 5d11c9d2c0 am: 0fe4efcfa8 am: 8c04df2e48 am: c6bf22467b am: 9c925d6e4b" into nyc-mr2-dev-plus-aosp

7 years agox11: Fix deadlock am: 5e863331b2 am: 7d0ad652ff am: ca5a475223 am: 319a51d5dd am...
Chad Versace [Mon, 23 Jan 2017 19:54:24 +0000 (19:54 +0000)]
x11: Fix deadlock am: 5e863331b2 am: 7d0ad652ff am: ca5a475223 am: 319a51d5dd am: 97cc16aa0a
am: 8b86967b6f

Change-Id: Iae536afd28f2bc3f5f4b6997f32813989b387e7c

7 years agox11: Call XInitThreads() am: 5d11c9d2c0 am: 0fe4efcfa8 am: 8c04df2e48 am: c6bf22467b
Chad Versace [Mon, 23 Jan 2017 19:54:19 +0000 (19:54 +0000)]
x11: Call XInitThreads() am: 5d11c9d2c0 am: 0fe4efcfa8 am: 8c04df2e48 am: c6bf22467b
am: 9c925d6e4b

Change-Id: I4ddd26d42910a4c89b6935a60ea287fee53f339a

7 years agoMerge "Merge "x11: Call XInitThreads()" into nougat-cts-dev am: cbdbf95222 am: 6aef23...
Android Build Merger (Role) [Mon, 23 Jan 2017 19:54:18 +0000 (19:54 +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

7 years agoMerge "x11: Call XInitThreads()" into nougat-cts-dev am: cbdbf95222 am: 6aef236dd0...
Tina Zhou [Mon, 23 Jan 2017 19:54:12 +0000 (19:54 +0000)]
Merge "x11: Call XInitThreads()" into nougat-cts-dev am: cbdbf95222 am: 6aef236dd0 am: f23a03362a am: 40ff9476c8
am: e775b6f623

Change-Id: I089e912a67bdac73c08569b34356a7ad205b68d7

7 years agoMerge "Merge "x11: Fix deadlock" into nougat-cts-dev am: 34b869eeea am: b6766f9949...
Android Build Merger (Role) [Mon, 23 Jan 2017 19:54:09 +0000 (19:54 +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

7 years agoMerge "x11: Call XInitThreads() am: 5d11c9d2c0 am: 0fe4efcfa8 am: 8c04df2e48 am:...
Android Build Merger (Role) [Mon, 23 Jan 2017 19:54:07 +0000 (19:54 +0000)]
Merge "x11: Call XInitThreads() am: 5d11c9d2c0 am: 0fe4efcfa8 am: 8c04df2e48 am: c6bf22467b am: 6d9bd5e858" into nyc-mr2-dev-plus-aosp

7 years agoMerge "x11: Fix deadlock" into nougat-cts-dev am: 34b869eeea am: b6766f9949 am: 7b1b2...
Tina Zhou [Mon, 23 Jan 2017 19:54:02 +0000 (19:54 +0000)]
Merge "x11: Fix deadlock" into nougat-cts-dev am: 34b869eeea am: b6766f9949 am: 7b1b2f4509 am: ce18fbd526
am: 243a52b3c7

Change-Id: Ic16c4f83b7c340b0685d11a1cebb2b6abcf938dd

7 years agox11: Call XInitThreads() am: 5d11c9d2c0 am: 0fe4efcfa8 am: 8c04df2e48 am: c6bf22467b
Chad Versace [Mon, 23 Jan 2017 19:54:00 +0000 (19:54 +0000)]
x11: Call XInitThreads() am: 5d11c9d2c0 am: 0fe4efcfa8 am: 8c04df2e48 am: c6bf22467b
am: 6d9bd5e858

Change-Id: I22709bd75e0b1bb4cfc42ab0b2bf74b912f993ce

7 years agoMerge "x11: Fix deadlock am: 5e863331b2 am: f49e8bfc0e am: 1eb4f43dc4 am: c1c16c73e6...
Android Build Merger (Role) [Mon, 23 Jan 2017 19:53:57 +0000 (19:53 +0000)]
Merge "x11: Fix deadlock am: 5e863331b2 am: f49e8bfc0e am: 1eb4f43dc4 am: c1c16c73e6 am: a2c167bef6" into nyc-mr2-dev-plus-aosp

7 years agox11: Fix deadlock am: 5e863331b2 am: f49e8bfc0e am: 1eb4f43dc4 am: c1c16c73e6
Chad Versace [Mon, 23 Jan 2017 19:53:50 +0000 (19:53 +0000)]
x11: Fix deadlock am: 5e863331b2 am: f49e8bfc0e am: 1eb4f43dc4 am: c1c16c73e6
am: a2c167bef6

Change-Id: I349e1177e9026bfcc78ab4cb25d27d11a4d11031

7 years agoMerge "x11: Fix deadlock" into nougat-cts-dev am: 34b869eeea am: b6766f9949 am: 7b1b2...
Tina Zhou [Mon, 23 Jan 2017 19:53:46 +0000 (19:53 +0000)]
Merge "x11: Fix deadlock" into nougat-cts-dev am: 34b869eeea am: b6766f9949 am: 7b1b2f4509 am: ce18fbd526
am: aee042a887

Change-Id: I44fe76bc54ae72df6bb2754e6d0369c0aef5bfb5

7 years agox11: Fix deadlock am: 5e863331b2 am: f49e8bfc0e am: 1eb4f43dc4 am: c1c16c73e6
Chad Versace [Mon, 23 Jan 2017 19:53:34 +0000 (19:53 +0000)]
x11: Fix deadlock am: 5e863331b2 am: f49e8bfc0e am: 1eb4f43dc4 am: c1c16c73e6
am: 5a37f3c8ca

Change-Id: I5fa4924235db443b75777bf8896d29bbcc1cff19

7 years agoMerge "x11: Call XInitThreads()" into nougat-cts-dev am: cbdbf95222 am: a74d50ffda...
Tina Zhou [Mon, 23 Jan 2017 19:47:41 +0000 (19:47 +0000)]
Merge "x11: Call XInitThreads()" into nougat-cts-dev am: cbdbf95222 am: a74d50ffda am: b92f7d676f am: d46ac1a0ca
am: bb7e6b4f15

Change-Id: I7bcbd90f63e2e377023ca01c84d8288fbfa72899

7 years agox11: Call XInitThreads() am: 5d11c9d2c0 am: f465d82fa5 am: 0ed6cc912e am: e7ee6541a9
Chad Versace [Mon, 23 Jan 2017 19:47:28 +0000 (19:47 +0000)]
x11: Call XInitThreads() am: 5d11c9d2c0 am: f465d82fa5 am: 0ed6cc912e am: e7ee6541a9
am: 587123a671

Change-Id: Ice737a2f0af8cd00df9e4ffb41508a2e6fff7308

7 years agoMerge "x11: Fix deadlock" into nougat-cts-dev am: 34b869eeea am: 05f26155f0 am: 7bb50...
Tina Zhou [Mon, 23 Jan 2017 19:47:14 +0000 (19:47 +0000)]
Merge "x11: Fix deadlock" into nougat-cts-dev am: 34b869eeea am: 05f26155f0 am: 7bb5047d5e am: 1b341143c0
am: d737e16da8

Change-Id: I78275ecfcd4083a2202b9c93da27d1c67d73d4c6

7 years agox11: Fix deadlock am: 5e863331b2 am: 7d0ad652ff am: ca5a475223 am: 319a51d5dd
Chad Versace [Mon, 23 Jan 2017 19:46:59 +0000 (19:46 +0000)]
x11: Fix deadlock am: 5e863331b2 am: 7d0ad652ff am: ca5a475223 am: 319a51d5dd
am: 97cc16aa0a

Change-Id: Id2519746b786bdb934ae7dc9da3d9aab11ae1620

7 years agoMerge "x11: Call XInitThreads()" into nougat-cts-dev am: cbdbf95222 am: 6aef236dd0...
Tina Zhou [Mon, 23 Jan 2017 19:46:44 +0000 (19:46 +0000)]
Merge "x11: Call XInitThreads()" into nougat-cts-dev am: cbdbf95222 am: 6aef236dd0 am: f23a03362a
am: 40ff9476c8

Change-Id: I9d7b630eb034e76830e9ccfa47d881278b3def09

7 years agox11: Call XInitThreads() am: 5d11c9d2c0 am: 0fe4efcfa8 am: 8c04df2e48
Chad Versace [Mon, 23 Jan 2017 19:46:24 +0000 (19:46 +0000)]
x11: Call XInitThreads() am: 5d11c9d2c0 am: 0fe4efcfa8 am: 8c04df2e48
am: c6bf22467b

Change-Id: I178d4051826827c2f785f9d6ca8507fab1d4a931

7 years agoMerge "x11: Fix deadlock" into nougat-cts-dev am: 34b869eeea am: b6766f9949 am: 7b1b2...
Tina Zhou [Mon, 23 Jan 2017 19:46:10 +0000 (19:46 +0000)]
Merge "x11: Fix deadlock" into nougat-cts-dev am: 34b869eeea am: b6766f9949 am: 7b1b2f4509
am: ce18fbd526

Change-Id: I024c4287173d6b46f9752c42387ba23a6768d8e9

7 years agox11: Fix deadlock am: 5e863331b2 am: f49e8bfc0e am: 1eb4f43dc4
Chad Versace [Mon, 23 Jan 2017 19:45:55 +0000 (19:45 +0000)]
x11: Fix deadlock am: 5e863331b2 am: f49e8bfc0e am: 1eb4f43dc4
am: c1c16c73e6

Change-Id: Icfb6d4528e2b5c27ccb47095b8a3abc85c180c3c

7 years agoMerge "x11: Call XInitThreads()" into nougat-cts-dev am: cbdbf95222 am: a74d50ffda...
Tina Zhou [Mon, 23 Jan 2017 19:45:33 +0000 (19:45 +0000)]
Merge "x11: Call XInitThreads()" into nougat-cts-dev am: cbdbf95222 am: a74d50ffda am: b92f7d676f am: d46ac1a0ca
am: bb7e6b4f15

Change-Id: I2ee13c332f808a952055d23e58daecbf42f6cdc6

7 years agox11: Call XInitThreads() am: 5d11c9d2c0 am: f465d82fa5 am: 0ed6cc912e am: e7ee6541a9
Chad Versace [Mon, 23 Jan 2017 19:45:17 +0000 (19:45 +0000)]
x11: Call XInitThreads() am: 5d11c9d2c0 am: f465d82fa5 am: 0ed6cc912e am: e7ee6541a9
am: 587123a671

Change-Id: I204cbf00315effedd04ec616a9c4ddb51ae20e2e

7 years agoMerge "x11: Fix deadlock" into nougat-cts-dev am: 34b869eeea am: 05f26155f0 am: 7bb50...
Tina Zhou [Mon, 23 Jan 2017 19:45:01 +0000 (19:45 +0000)]
Merge "x11: Fix deadlock" into nougat-cts-dev am: 34b869eeea am: 05f26155f0 am: 7bb5047d5e am: 1b341143c0
am: d737e16da8

Change-Id: I1f2ecb78180c0f911844355d7ca838642d22b770

7 years agox11: Fix deadlock am: 5e863331b2 am: 7d0ad652ff am: ca5a475223 am: 319a51d5dd
Chad Versace [Mon, 23 Jan 2017 19:44:49 +0000 (19:44 +0000)]
x11: Fix deadlock am: 5e863331b2 am: 7d0ad652ff am: ca5a475223 am: 319a51d5dd
am: 97cc16aa0a

Change-Id: I506baa320008c9b3f38ba7cc1934946fa11b9dde

7 years agoMerge "x11: Call XInitThreads()" into nougat-cts-dev am: cbdbf95222 am: 6aef236dd0...
Tina Zhou [Mon, 23 Jan 2017 19:44:35 +0000 (19:44 +0000)]
Merge "x11: Call XInitThreads()" into nougat-cts-dev am: cbdbf95222 am: 6aef236dd0 am: f23a03362a
am: 40ff9476c8

Change-Id: I0e2c458fead527c19754665a6230c3575488f67c

7 years agox11: Call XInitThreads() am: 5d11c9d2c0 am: 0fe4efcfa8 am: 8c04df2e48
Chad Versace [Mon, 23 Jan 2017 19:44:17 +0000 (19:44 +0000)]
x11: Call XInitThreads() am: 5d11c9d2c0 am: 0fe4efcfa8 am: 8c04df2e48
am: c6bf22467b

Change-Id: Iaa3af04f0f5d8199b2bdb3e77d61f9c7712a652a

7 years agoMerge "x11: Fix deadlock" into nougat-cts-dev am: 34b869eeea am: b6766f9949 am: 7b1b2...
Tina Zhou [Mon, 23 Jan 2017 19:44:04 +0000 (19:44 +0000)]
Merge "x11: Fix deadlock" into nougat-cts-dev am: 34b869eeea am: b6766f9949 am: 7b1b2f4509
am: ce18fbd526

Change-Id: I09e8f4fb4dfc224e48334540dc507fee18ee9368

7 years agox11: Fix deadlock am: 5e863331b2 am: f49e8bfc0e am: 1eb4f43dc4
Chad Versace [Mon, 23 Jan 2017 19:43:51 +0000 (19:43 +0000)]
x11: Fix deadlock am: 5e863331b2 am: f49e8bfc0e am: 1eb4f43dc4
am: c1c16c73e6

Change-Id: Icb646126efe9305543fea1668983d89b53035a32

7 years agoMerge "x11: Call XInitThreads()" into nougat-cts-dev am: cbdbf95222 am: a74d50ffda...
Tina Zhou [Mon, 23 Jan 2017 19:38:47 +0000 (19:38 +0000)]
Merge "x11: Call XInitThreads()" into nougat-cts-dev am: cbdbf95222 am: a74d50ffda am: b92f7d676f
am: d46ac1a0ca

Change-Id: I9e8b270b31328b2ae2619c144685cdf1239f1765

7 years agox11: Call XInitThreads() am: 5d11c9d2c0 am: f465d82fa5 am: 0ed6cc912e
Chad Versace [Mon, 23 Jan 2017 19:38:37 +0000 (19:38 +0000)]
x11: Call XInitThreads() am: 5d11c9d2c0 am: f465d82fa5 am: 0ed6cc912e
am: e7ee6541a9

Change-Id: I7f8e0c8c52bf28353af47abea83f09e20500b7dd

7 years agoMerge "x11: Fix deadlock" into nougat-cts-dev am: 34b869eeea am: 05f26155f0 am: 7bb50...
Tina Zhou [Mon, 23 Jan 2017 19:38:26 +0000 (19:38 +0000)]
Merge "x11: Fix deadlock" into nougat-cts-dev am: 34b869eeea am: 05f26155f0 am: 7bb5047d5e
am: 1b341143c0

Change-Id: Ib5ce54db7e4a82a80c10538931f2fd01b6bd6502

7 years agox11: Fix deadlock am: 5e863331b2 am: 7d0ad652ff am: ca5a475223
Chad Versace [Mon, 23 Jan 2017 19:38:10 +0000 (19:38 +0000)]
x11: Fix deadlock am: 5e863331b2 am: 7d0ad652ff am: ca5a475223
am: 319a51d5dd

Change-Id: I4ea299b0da691d4b057690ed63662e13e246b9ce

7 years agoMerge "x11: Call XInitThreads()" into nougat-cts-dev am: cbdbf95222 am: 6aef236dd0
Tina Zhou [Mon, 23 Jan 2017 19:37:59 +0000 (19:37 +0000)]
Merge "x11: Call XInitThreads()" into nougat-cts-dev am: cbdbf95222 am: 6aef236dd0
am: f23a03362a

Change-Id: I386402636396dd6d956197dc1d2e1127bb145019

7 years agox11: Call XInitThreads() am: 5d11c9d2c0 am: 0fe4efcfa8
Chad Versace [Mon, 23 Jan 2017 19:37:48 +0000 (19:37 +0000)]
x11: Call XInitThreads() am: 5d11c9d2c0 am: 0fe4efcfa8
am: 8c04df2e48

Change-Id: Iec487e77848eb572b190561d836bf2a903f84820

7 years agoMerge "x11: Fix deadlock" into nougat-cts-dev am: 34b869eeea am: b6766f9949
Tina Zhou [Mon, 23 Jan 2017 19:37:22 +0000 (19:37 +0000)]
Merge "x11: Fix deadlock" into nougat-cts-dev am: 34b869eeea am: b6766f9949
am: 7b1b2f4509

Change-Id: I69d17f550317280f58c89feb0092cbcfe70730e0

7 years agox11: Fix deadlock am: 5e863331b2 am: f49e8bfc0e
Chad Versace [Mon, 23 Jan 2017 19:37:08 +0000 (19:37 +0000)]
x11: Fix deadlock am: 5e863331b2 am: f49e8bfc0e
am: 1eb4f43dc4

Change-Id: Ifa42ea781f68bf222c085febb068690003c52f6b

7 years agoMerge "x11: Call XInitThreads()" into nougat-cts-dev am: cbdbf95222 am: a6f61be6c3...
Tina Zhou [Mon, 23 Jan 2017 19:31:06 +0000 (19:31 +0000)]
Merge "x11: Call XInitThreads()" into nougat-cts-dev am: cbdbf95222 am: a6f61be6c3 am: 63d6f4041f
am: 977c4c7527

Change-Id: I8d2f5aa3ffe405ebb19d2272236424db296f44db