Xin Li [Thu, 19 Jul 2018 20:50:07 +0000 (13:50 -0700)]
Merge pi-dev-plus-aosp-without-vendor into stage-dr1-aosp-master
Bug:
111615259
Change-Id: I87d2bd40f7e70f8e88af237d5814dc517b9cb00c
Chris Forbes [Fri, 13 Jul 2018 04:38:15 +0000 (21:38 -0700)]
Merge remote-tracking branch 'khronos/vulkan-cts-1.0.2' into oreo-mr1-cts-dev am:
f76e580fa8 am:
e98bb687e8
am:
94319eb2a1
Change-Id: I94c91520c6f728834d161a35122aa8d98dfae429
Chris Forbes [Fri, 13 Jul 2018 04:36:57 +0000 (21:36 -0700)]
Merge remote-tracking branch 'khronos/vulkan-cts-1.0.2' into oreo-mr1-cts-dev am:
f76e580fa8 am:
3dbe2392e0
am:
5deca7d16a
Change-Id: I09d4b83db7d2efea31d1ed14601d52970a4bb13d
Chris Forbes [Fri, 13 Jul 2018 04:30:02 +0000 (21:30 -0700)]
Merge remote-tracking branch 'khronos/vulkan-cts-1.0.2' into oreo-mr1-cts-dev am:
f76e580fa8 am:
4f5c080667
am:
8513fc09e5
Change-Id: I39550e531966b7b36f50007818a42096d45e1817
Chris Forbes [Fri, 13 Jul 2018 04:10:06 +0000 (21:10 -0700)]
Merge remote-tracking branch 'khronos/vulkan-cts-1.0.2' into oreo-mr1-cts-dev am:
f76e580fa8
am:
e98bb687e8
Change-Id: I78953a8c073b0dd51f44a949b0ebd7878c2fdc26
Chris Forbes [Fri, 13 Jul 2018 03:57:21 +0000 (20:57 -0700)]
Merge remote-tracking branch 'khronos/vulkan-cts-1.0.2' into oreo-mr1-cts-dev am:
f76e580fa8
am:
3dbe2392e0
Change-Id: Id3ef31723825f737b0ef1cf8ffc2bf5119196700
Chris Forbes [Fri, 13 Jul 2018 03:49:15 +0000 (20:49 -0700)]
Merge remote-tracking branch 'khronos/vulkan-cts-1.0.2' into oreo-mr1-cts-dev am:
f76e580fa8
am:
4f5c080667
Change-Id: I4a0d60762e86b10431aa99861a5f711765ec4a3c
Chris Forbes [Fri, 13 Jul 2018 02:11:26 +0000 (19:11 -0700)]
Merge remote-tracking branch 'khronos/vulkan-cts-1.0.2' into oreo-mr1-cts-dev
am:
f76e580fa8
Change-Id: Ieb0eae5a1356d251a38221b7a6b28e16db01fa96
Chris Forbes [Fri, 13 Jul 2018 02:09:22 +0000 (19:09 -0700)]
Merge remote-tracking branch 'khronos/vulkan-cts-1.0.2' into oreo-mr1-cts-dev
am:
f76e580fa8
Change-Id: I3d6f0a34c3655ac0992c10441c39dc7e35b23df4
Chris Forbes [Fri, 13 Jul 2018 01:59:16 +0000 (18:59 -0700)]
Merge remote-tracking branch 'khronos/vulkan-cts-1.0.2' into oreo-mr1-cts-dev
am:
f76e580fa8
Change-Id: Ia91eb9f08334aa37a565a37bd835d7451d90650a
Chris Forbes [Tue, 10 Jul 2018 01:01:37 +0000 (18:01 -0700)]
Merge remote-tracking branch 'khronos/vulkan-cts-1.0.2' into oreo-mr1-cts-dev
Change-Id: I84e14849790aee60eacb6b1cff5cbaeb8059848d
Bug: b/
111319193
Chris Forbes [Tue, 10 Jul 2018 20:33:49 +0000 (13:33 -0700)]
Merge remote-tracking branch 'khronos/vulkan-cts-1.1.0' into HEAD
am:
6e9239c7ad
Change-Id: Ia77474e9bfeea7c8f878eb50c2af58a10a577090
Chris Forbes [Mon, 9 Jul 2018 22:46:34 +0000 (15:46 -0700)]
Merge remote-tracking branch 'khronos/vulkan-cts-1.1.0' into HEAD
Change-Id: Ib606d7514da21014bfd9e699633512c7b8062ad0
Bug: b/
111276114
Chris Forbes [Mon, 9 Jul 2018 21:20:32 +0000 (14:20 -0700)]
Merge remote-tracking branch 'khronos/vulkan-cts-1.1.0' into HEAD
am:
947ee3c60c
Change-Id: Ia78a467b59a539f6adc447aa5e59f6c018c0a329
Alexander Galazin [Sun, 8 Jul 2018 16:11:07 +0000 (18:11 +0200)]
Merge vk-gl-cts/vulkan-cts-1.0.2 into vk-gl-cts/vulkan-cts-1.1.0
Change-Id: Ie88a7283bd969891282983a549c6d18901a9ee7b
Marcin Rogucki [Wed, 25 Oct 2017 11:33:44 +0000 (13:33 +0200)]
gl_PrimitiveIDIn tests have sketchy loop bounds.
Components: Vulkan
VK-GL-CTS issue: 778
Updates:
dEQP-VK.geometry.basic.primitive_id_in
dEQP-VK.geometry.basic.primitive_id_in_restarted
Change-Id: Icd2be56814de18067ce058a5f2a1da80338f80d6
(cherry picked from commit
52b7de31e0bccf62ca28d820f4dc2d0d52793aa8)
Jarred Davies [Thu, 5 Apr 2018 09:51:23 +0000 (10:51 +0100)]
Drop linear filter requirement from YCbCr tests
Remove requirement for YCbCr base formats to support
VK_FORMAT_FEATURE_SAMPLED_IMAGE_YCBCR_CONVERSION_LINEAR_FILTER_BIT from
format_properties tests.
The standard does not require support for this feature
from any YCbCr format.
Affects:
dEQP-VK.api.info.format_properties.g8_b8_r8_3plane_420_unorm
dEQP-VK.api.info.format_properties.g8_b8r8_2plane_420_unorm
Components: Vulkan
VK-GL-CTS issue: 1090
Change-Id: I6fa1c6c7a7f9768c2001972ae1f04173310aa652
(cherry picked from commit
eab78dce0d08f4ec22cece6be8003f554ede5882)
Chris Forbes [Fri, 6 Jul 2018 20:20:29 +0000 (13:20 -0700)]
Merge remote-tracking branch 'khronos/vulkan-cts-1.1.0' into HEAD
Change-Id: I2afae3b649256d7107c76e6039affc116eae2004
Bug: b/
111211233
Alexander Galazin [Fri, 6 Jul 2018 20:06:52 +0000 (22:06 +0200)]
Merge vk-gl-cts/vulkan-cts-1.0.2 into vk-gl-cts/vulkan-cts-1.1.0
Change-Id: I141a0abc53983443da9a5bb7c905538f1ddb4f22
Alexander Galazin [Fri, 6 Jul 2018 10:24:12 +0000 (12:24 +0200)]
Merge vk-gl-cts/github-vulkan-cts-1.1.0 into vk-gl-cts/vulkan-cts-1.1.0
Change-Id: I29544b2f3f6b7bee65ac6ac1339eb52176efe5a5
Alexander Galazin [Fri, 6 Jul 2018 10:21:32 +0000 (12:21 +0200)]
Fix build error introduced by the previous commit
Components: Vulkan
Chris Forbes [Fri, 2 Mar 2018 21:22:20 +0000 (13:22 -0800)]
Compile shaders for 1.0-compatible tests as SPIRV 1.0, not max supported
Components: Vulkan
VK-GL-CTS: 1232
Change-Id: I5a440f97f79be0e6d37d89018ae8b611e9d4e7c1
Chris Forbes [Wed, 27 Jun 2018 02:08:56 +0000 (19:08 -0700)]
Allow two images worth of alignment slop in protected heap
am:
0fd6d1afa4
Change-Id: Icb9a902c9897ba043f7554be5b44483eaf06c44d
Alexander Galazin [Fri, 15 Jun 2018 13:03:53 +0000 (15:03 +0200)]
Merge pull request #99 from AIOOB/patch-1
Require extension for the deviceFeatures2 test
Chris Forbes [Tue, 12 Jun 2018 18:03:59 +0000 (11:03 -0700)]
Fix protected memory buffer tests to do proper operation
Update and copy variants of these tests were doing the FILL operation
instead.
Change-Id: Iede9e71f50c1d2d5699b35ad9b86fc6237714977
Components: Vulkan
Affects: dEQP-VK.protected_memory.buffer.*
VK-GL-CTS: 1215
(cherry picked from commit
39fbe90f21cb24b46e1bbc2d49e75604453977c0)
Stephen Gallimore [Tue, 12 Jun 2018 14:35:46 +0000 (15:35 +0100)]
Memory binding tests not invaidating host memory before results check.
Affected tests:
dEQP-VK.memory.binding.*.buffer_*
Components: Vulkan
VK-GL-CTS issue: 1214
Change-Id: Ib347401ee818a42487df001f3ba76247b157321c
Chris Forbes [Mon, 11 Jun 2018 22:50:16 +0000 (15:50 -0700)]
Allow two images worth of alignment slop in protected heap
Bug: b/
109757443
Test: dEQP-VK.protected_memory.interaction.wsi.android.swapchain.create#min_image_count
Change-Id: I01b3a72986e9f35b4ec15a146e4dc576758c02ce
Colin Cross [Sat, 9 Jun 2018 16:05:36 +0000 (09:05 -0700)]
Fix duplicate <uses-sdk> elements in com.drawelements.deqp am:
be5b8ae675
am:
a60e35a7c3
Change-Id: I1c182ec0da2ffeded40e588740fc4a8439a505f9
Xin Li [Sat, 9 Jun 2018 08:54:13 +0000 (01:54 -0700)]
Merge pi-dev-plus-aosp-without-vendor into stage-aosp-master
am:
5a8888e88d
Change-Id: I1e75407d431ed1a28ee5c94e478d57f0f86f1062
Colin Cross [Fri, 8 Jun 2018 23:51:49 +0000 (16:51 -0700)]
Fix duplicate <uses-sdk> elements in com.drawelements.deqp
am:
be5b8ae675
Change-Id: I06f0e9e927af9f64077a31e404259cd837750591
Xin Li [Fri, 8 Jun 2018 18:07:02 +0000 (11:07 -0700)]
Merge pi-dev-plus-aosp-without-vendor into stage-aosp-master
Bug:
79597307
Change-Id: If2ada4dd7bce7602babdb2090dc4cda82b184fc1
Chris Forbes [Wed, 30 May 2018 16:26:57 +0000 (09:26 -0700)]
Don't rely on unspecified argument evaluation order in atomic swap tests
Bug: b/
78779994
Test: dEQP-VK.protected_memory.ssbo.ssbo_atomic.fragment.compswap.random.*
VK-GL-CTS: 1198
Components: Vulkan
Change-Id: Ifba8940745c28a32ca631beb374394a5e3fe508b
(cherry picked from Android commit
51e0000bcde19cee3c0e4686c0a3caec121b3c42)
Colin Cross [Thu, 7 Jun 2018 23:25:53 +0000 (16:25 -0700)]
Fix duplicate <uses-sdk> elements in com.drawelements.deqp
PackageManager is probably ignoring the first one.
Bug:
78447299
Test: m com.drawelements.deqp
Change-Id: Ifeaebbf1f4e8ada3c14c25d5f533f3444d2d9940
Chris Forbes [Fri, 1 Jun 2018 21:25:05 +0000 (14:25 -0700)]
Fix arm32 check to work on armv8 32bit mode
am:
add785f6ef
Change-Id: I919d43a00faec2dcf35996997efc613c31e570a5
Chris Forbes [Fri, 1 Jun 2018 19:42:26 +0000 (12:42 -0700)]
Fix arm32 check to work on armv8 32bit mode
Change-Id: Ied79c61ad64eb1011d97be0fb3d727fb2c1bab36
Bug: b/
79545607
Test: dEQP-VK.dynamic_state.rs_state*
Chris Forbes [Fri, 1 Jun 2018 00:17:16 +0000 (17:17 -0700)]
[automerger skipped] Merge "DO NOT MERGE: GetDevices: Also allow `\-` to be part of the host name" am:
6f687edc46 -s ours
am:
d1cb9980e5 -s ours
Change-Id: Iaf8e7f613c1b5fa2a91eec34f008c0f76bf9bd6b
Chris Forbes [Thu, 31 May 2018 23:49:52 +0000 (16:49 -0700)]
[automerger skipped] Merge "DO NOT MERGE: GetDevices: Also allow `\-` to be part of the host name"
am:
6f687edc46 -s ours
Change-Id: I9710bde0d777131a9068fc554185e50bfa68efbc
Chris Forbes [Thu, 31 May 2018 21:02:21 +0000 (21:02 +0000)]
Merge "DO NOT MERGE: GetDevices: Also allow `\-` to be part of the host name"
Chris Forbes [Tue, 29 May 2018 19:26:19 +0000 (12:26 -0700)]
Request required 16bit storage features in UConvert/SConvert tests
These tests require specific features within the 16bit storage extension
Change-Id: I573b8ca69209ec36b3c249f5b9a638d4e7743209
Components: Vulkan
Bug: b/
78779994
VK-GL-CTS: 1195
Affects: dEQP-VK.spirv_assembly.instruction.compute.*
(cherry picked from Android commit
20426c97899d621fba9bcbae9374ec5439beedd6)
Chris Forbes [Wed, 30 May 2018 20:31:57 +0000 (13:31 -0700)]
Don't rely on unspecified argument evaluation order in atomic swap tests
am:
51e0000bcd
Change-Id: Ieeeb2b708fc72335d421795b569307a8fb3d01b1
Chris Forbes [Wed, 30 May 2018 16:26:57 +0000 (09:26 -0700)]
Don't rely on unspecified argument evaluation order in atomic swap tests
Bug: b/
78779994
Test: dEQP-VK.protected_memory.ssbo.ssbo_atomic.fragment.compswap.random.*
Change-Id: Ifba8940745c28a32ca631beb374394a5e3fe508b
Chris Forbes [Tue, 29 May 2018 21:13:34 +0000 (14:13 -0700)]
Request required 16bit storage features in UConvert/SConvert tests
am:
20426c9789
Change-Id: Ia2e1b73b5733be5678980f859338641560131ad2
Chris Forbes [Tue, 29 May 2018 19:26:19 +0000 (12:26 -0700)]
Request required 16bit storage features in UConvert/SConvert tests
These tests require specific features within the 16bit storage extension
Change-Id: I573b8ca69209ec36b3c249f5b9a638d4e7743209
Components: Vulkan
Bug: b/
78779994
Test: tests now verified to skip on Sailfish
Joan Bonet Orantos [Tue, 22 May 2018 08:09:05 +0000 (10:09 +0200)]
Fix dependencies in vulkan pipeline test
The srcStageMask field in the subpass dependency was not strict
enough. This can cause that the incoming subpasses, that try to copy
samples from this subpass, may try to read content that may not be
written yet.
Affects:
dEQP-VK.pipeline.multisample.min_sample_shading.min_*
Components: Vulkan
VK-GL-CTS issue: 1185
Change-Id: Ide5e3d2a709e8fe26d23ada1d20bf2eb27beffd8
Jesse Hall [Wed, 16 May 2018 23:56:54 +0000 (16:56 -0700)]
Limit protected swapchain images based on memory
A surface's maxImageCount isn't based on the swapchain image extents
or format, so it's valid for swapchain creation to fail for
out-of-memory reasons even when the image count is within the
supported range.
This is particularly problematic for protected swapchains, since many
implementations have a limit on the total amount of protected memory
that can be allocated which is much smaller than total device memory.
This change estimates how much memory is used by protected swapchain
images, compares that to the size of heaps that support protected
memory types, and doesn't try to create swapchains that would have
more images than would fit within that size.
Components: Vulkan
VK-GL-CTS Issue: 1167
Affects:
dEQP-VK.protected_memory.interaction.wsi.*.swapchain.create.min_image_count
Change-Id: I6cc3bd25f7f22de8424f9e3375ade35fac26a884
Graeme Leese [Thu, 26 Apr 2018 14:06:12 +0000 (15:06 +0100)]
Clear image layer 0 in memory commitment test
Components: Vulkan
Affected: dEQP-VK.api.get_memory_commitment.memory_commitment
VK-GL-CTS issue: 1151
Change-Id: I95676f18f91470248ac19270778b897626a31f2c
Nicolas Boichat [Fri, 18 May 2018 00:11:36 +0000 (17:11 -0700)]
Merge "GetDevices: Also allow `\-` to be part of the host name" into pi-dev
am:
7e127b82c4
Change-Id: I6951a56d074ff970246235e4e1bdf08dd9d354b1
TreeHugger Robot [Thu, 17 May 2018 23:41:11 +0000 (23:41 +0000)]
Merge "GetDevices: Also allow `\-` to be part of the host name" into pi-dev
Jesse Hall [Thu, 17 May 2018 22:07:25 +0000 (15:07 -0700)]
Merge "Limit protected swapchain images based on memory" into pi-dev
am:
ae2ba92fb2
Change-Id: I1ae06e3a6ff26e8931e0147b7dc07f2a44e53afc
TreeHugger Robot [Thu, 17 May 2018 21:56:33 +0000 (21:56 +0000)]
Merge "Limit protected swapchain images based on memory" into pi-dev
Chris Forbes [Thu, 17 May 2018 18:20:24 +0000 (11:20 -0700)]
Merge remote-tracking branch 'khronos/vulkan-cts-1.1.0' into pi-dev
am:
e75fb389ce
Change-Id: Iceff81a070a005635aee4d046ac14f39d91c74d2
Chris Forbes [Thu, 17 May 2018 14:40:06 +0000 (07:40 -0700)]
Merge remote-tracking branch 'khronos/vulkan-cts-1.1.0' into pi-dev
Bug: b/
79920276
Test: CtsDeqpTestCases
Change-Id: I5278d1865efc379687d88a368d48ef64cce455bc
Jesse Hall [Wed, 16 May 2018 23:56:54 +0000 (16:56 -0700)]
Limit protected swapchain images based on memory
A surface's maxImageCount isn't based on the swapchain image extents
or format, so it's valid for swapchain creation to fail for
out-of-memory reasons even when the image count is within the
supported range.
This is particularly problematic for protected swapchains, since many
implementations have a limit on the total amount of protected memory
that can be allocated which is much smaller than total device memory.
This change estimates how much memory is used by protected swapchain
images, compares that to the size of heaps that support protected
memory types, and doesn't try to create swapchains that would have
more images than would fit within that size.
Components: Vulkan
VK-GL-CTS Issue: 1167
Affects:
dEQP-VK.protected_memory.interaction.wsi.*.swapchain.create.min_image_count
Bug:
77319653
Test: dEQP-VK.protected_memory.interaction.wsi.android.swapchain.create.min_image_count
Change-Id: I6cc3bd25f7f22de8424f9e3375ade35fac26a884
Chris Forbes [Mon, 14 May 2018 18:28:02 +0000 (11:28 -0700)]
Backport AHB test changes from Khronos review
am:
9829d36b5a
Change-Id: I82459631b0ec75918e47b7609669100059e41a61
Alexander Galazin [Fri, 11 May 2018 13:28:20 +0000 (15:28 +0200)]
Merge vk-gl-cts/vulkan-cts-1.0.2 into vk-gl-cts/vulkan-cts-1.1.0
Change-Id: I06a95f88214707d9108a46f7374a5e8e0f9bdb59
Chris Forbes [Thu, 10 May 2018 22:58:21 +0000 (15:58 -0700)]
Backport AHB test changes from Khronos review
Change-Id: I902646e380d18c8c4ee165a7bfe3c6aee6735aa6
Components: Vulkan
Bug: b/
79540301
Test: CtsDeqpTestCases
Nicolas Boichat [Wed, 9 May 2018 00:44:11 +0000 (08:44 +0800)]
GetDevices: Also allow `\-` to be part of the host name
Bug: b/
79494592
Change-Id: I2e79a8389be53300296f07bcbae902a717da2d5e
Nicolas Boichat [Thu, 5 Apr 2018 08:25:25 +0000 (16:25 +0800)]
DO NOT MERGE: GetDevices: Also allow `\-` to be part of the host name
Change-Id: Ib4eaa0f1ded74d8733f378675fe509cf5a6b1c2b
Chris Forbes [Thu, 3 May 2018 23:21:03 +0000 (16:21 -0700)]
Don't leak ref to native handle in external memory tests
am:
17eb70bae8
Change-Id: Iefe80456c8b0d7701c4a79cc892ef4d39244bd6a
Chris Forbes [Thu, 3 May 2018 22:03:53 +0000 (15:03 -0700)]
Don't leak ref to native handle in external memory tests
Based on a later revision to https://gerrit.khronos.org/#/c/2455
Bug: b/
79216732
Change-Id: I4aab353d1d9a8ecb818c682b60d274ce82ef6d38
Affects: dEQP-VK.api.external.memory.android_hardware_buffer.*
Components: Vulkan
Test: CtsDeqpTestCases
android-build-prod (mdb) [Tue, 1 May 2018 17:55:42 +0000 (10:55 -0700)]
[automerger skipped] Merge "DO NOT MERGE: Merge remote-tracking branch 'khronos/vulkan-cts-1.0.2' into HEAD" into oreo-mr1-cts-dev am:
ea8d8c6e51 -s ours am:
b42c18f792 -s ours
am:
43e7ea94f9
Change-Id: Ifc691bfc9d81d3ba6749f2f63686ec3de272f440
android-build-prod (mdb) [Tue, 1 May 2018 17:41:37 +0000 (10:41 -0700)]
[automerger skipped] Merge "DO NOT MERGE: Merge remote-tracking branch 'khronos/vulkan-cts-1.0.2' into HEAD" into oreo-mr1-cts-dev am:
ea8d8c6e51 -s ours am:
b9ddb8a5e6 -s ours
am:
2caa0005d1 -s ours
Change-Id: I3c1f5ee19a9d57ba873ef11d4b8c2deb7a20f29b
android-build-prod (mdb) [Tue, 1 May 2018 17:41:35 +0000 (10:41 -0700)]
[automerger skipped] Merge "DO NOT MERGE: Merge remote-tracking branch 'khronos/vulkan-cts-1.0.2' into HEAD" into oreo-mr1-cts-dev am:
ea8d8c6e51 -s ours
am:
b42c18f792 -s ours
Change-Id: I2caad18103299cdd4a44db0ae4562442a5a711a8
android-build-prod (mdb) [Tue, 1 May 2018 17:37:02 +0000 (10:37 -0700)]
[automerger skipped] Merge "DO NOT MERGE: Merge remote-tracking branch 'khronos/vulkan-cts-1.0.2' into HEAD" into oreo-mr1-cts-dev
am:
ea8d8c6e51 -s ours
Change-Id: I4198a0ed4f80ff23cb9d55f7ff8e75ccf900a4f2
android-build-prod (mdb) [Tue, 1 May 2018 17:37:01 +0000 (10:37 -0700)]
[automerger skipped] Merge "DO NOT MERGE: Merge remote-tracking branch 'khronos/vulkan-cts-1.0.2' into HEAD" into oreo-mr1-cts-dev am:
ea8d8c6e51 -s ours
am:
b9ddb8a5e6 -s ours
Change-Id: I7476bbb201a31459c388ea363a17c1bdbb6b8fea
android-build-prod (mdb) [Tue, 1 May 2018 17:27:58 +0000 (10:27 -0700)]
[automerger skipped] Merge "DO NOT MERGE: Merge remote-tracking branch 'khronos/vulkan-cts-1.0.2' into HEAD" into oreo-mr1-cts-dev
am:
ea8d8c6e51 -s ours
Change-Id: Iafc1890dde07fdf56154e1742ce2d59648bc02af
android-build-prod (mdb) [Tue, 1 May 2018 17:23:07 +0000 (17:23 +0000)]
Merge "DO NOT MERGE: Merge remote-tracking branch 'khronos/vulkan-cts-1.0.2' into HEAD" into oreo-mr1-cts-dev
Lloyd Pique [Mon, 30 Apr 2018 19:58:44 +0000 (12:58 -0700)]
Allow the window to be recreated in the middle of a test am:
30ef1bf331 am:
38611cff1b am:
d7ea694527 am:
1d7d6b0558 am:
edae3a9f2d
am:
459fb27e0e
Change-Id: I04df320284f1a0241e7bcdc39261976d44ba752e
Android Build Merger (Role) [Mon, 30 Apr 2018 19:58:08 +0000 (19:58 +0000)]
Merge "Allow the window to be recreated in the middle of a test am:
30ef1bf331 am:
38611cff1b am:
6eca3b9153 am:
9800dc3074 am:
6b71e26ff1" into pi-dev-plus-aosp
Lloyd Pique [Mon, 30 Apr 2018 19:58:03 +0000 (12:58 -0700)]
Allow the window to be recreated in the middle of a test am:
30ef1bf331 am:
38611cff1b am:
6eca3b9153 am:
9800dc3074
am:
6b71e26ff1
Change-Id: I1e1fa53e337ad527648c406eeb3b81b8bbba74d9
Lloyd Pique [Mon, 30 Apr 2018 19:58:01 +0000 (12:58 -0700)]
[automerger] Allow the window to be recreated in the middle of a test am:
30ef1bf331 am:
982b9bf1e4 am:
20d14be89f am:
e00e690cfb am:
040aaa4dc6 am:
1213a776a6 am:
b614d39194
am:
a59bf087fd
Change-Id: Id99663e245f0c04e653c9cf99b10d341de0be445
Lloyd Pique [Mon, 30 Apr 2018 19:54:43 +0000 (12:54 -0700)]
Allow the window to be recreated in the middle of a test am:
30ef1bf331 am:
38611cff1b am:
6eca3b9153
am:
9800dc3074
Change-Id: I7e2fff3665bd75ac5c470aa2ca7fd69b6a6acd14
Lloyd Pique [Mon, 30 Apr 2018 19:54:24 +0000 (12:54 -0700)]
Allow the window to be recreated in the middle of a test am:
30ef1bf331 am:
38611cff1b am:
d7ea694527 am:
1d7d6b0558
am:
edae3a9f2d
Change-Id: I60c1f1fab6359a7036d1f51fd879abb1c5fa9b20
Lloyd Pique [Mon, 30 Apr 2018 19:54:00 +0000 (12:54 -0700)]
[automerger] Allow the window to be recreated in the middle of a test am:
30ef1bf331 am:
982b9bf1e4 am:
20d14be89f am:
e00e690cfb am:
040aaa4dc6 am:
1213a776a6
am:
b614d39194
Change-Id: I5d3ccd0767e7413341cfe6e9c1c1d0512a0d3e0a
Lloyd Pique [Mon, 30 Apr 2018 19:53:55 +0000 (12:53 -0700)]
Allow the window to be recreated in the middle of a test am:
30ef1bf331 am:
38611cff1b am:
6eca3b9153 am:
5f0bdcf623
am:
1306ffa833
Change-Id: I20efe4790094a717d9ec7d3c3fc5f71701dabe26
Lloyd Pique [Mon, 30 Apr 2018 19:44:45 +0000 (12:44 -0700)]
Allow the window to be recreated in the middle of a test am:
30ef1bf331 am:
38611cff1b am:
d7ea694527
am:
1d7d6b0558
Change-Id: I63f4193542ed4b50ccbfa2b43edc589558a1abb4
Lloyd Pique [Mon, 30 Apr 2018 19:44:30 +0000 (12:44 -0700)]
Allow the window to be recreated in the middle of a test am:
30ef1bf331 am:
38611cff1b am:
6eca3b9153
am:
5f0bdcf623
Change-Id: I4d05bd26ddde90158c564156ce4349696cc78489
Lloyd Pique [Mon, 30 Apr 2018 19:44:27 +0000 (12:44 -0700)]
[automerger] Allow the window to be recreated in the middle of a test am:
30ef1bf331 am:
982b9bf1e4 am:
20d14be89f am:
e00e690cfb am:
040aaa4dc6
am:
1213a776a6
Change-Id: I5a3e06a0da4005235b1a87c4e0770a2ef80150eb
Lloyd Pique [Mon, 30 Apr 2018 19:43:51 +0000 (12:43 -0700)]
Allow the window to be recreated in the middle of a test am:
30ef1bf331 am:
38611cff1b
am:
d7ea694527
Change-Id: I69f3211031c9704b0148edf26d1a598129bf3944
Lloyd Pique [Mon, 30 Apr 2018 19:41:22 +0000 (12:41 -0700)]
Allow the window to be recreated in the middle of a test am:
30ef1bf331 am:
38611cff1b
am:
6eca3b9153
Change-Id: I5f508032fae03c0ab342e0b1547d77812f03e779
Lloyd Pique [Mon, 30 Apr 2018 19:40:23 +0000 (12:40 -0700)]
[automerger] Allow the window to be recreated in the middle of a test am:
30ef1bf331 am:
982b9bf1e4 am:
20d14be89f am:
e00e690cfb
am:
040aaa4dc6
Change-Id: Iad8cdf7b3cbdcc382a3d41df29369cf12ae32c8d
Lloyd Pique [Mon, 30 Apr 2018 19:40:22 +0000 (12:40 -0700)]
Allow the window to be recreated in the middle of a test am:
30ef1bf331
am:
38611cff1b
Change-Id: If75c089eace7e4d67dbb28abfa7928a769decc6a
Lloyd Pique [Mon, 30 Apr 2018 19:34:53 +0000 (12:34 -0700)]
Allow the window to be recreated in the middle of a test am:
30ef1bf331 am:
38611cff1b
am:
6eca3b9153
Change-Id: I9347f789b79bf1bbcb128aab72ff4e62a662537a
Android Build Merger (Role) [Mon, 30 Apr 2018 19:33:00 +0000 (19:33 +0000)]
[automerger] Allow the window to be recreated in the middle of a test am:
30ef1bf331 am:
982b9bf1e4 am:
20d14be89f am:
e00e690cfb
Change-Id: Ic5dc053bb7ea5d82429b4acaa54063c042049e52
Android Build Merger (Role) [Mon, 30 Apr 2018 19:32:59 +0000 (19:32 +0000)]
[automerger] Allow the window to be recreated in the middle of a test am:
30ef1bf331 am:
982b9bf1e4 am:
20d14be89f
Change-Id: I62e863ad7c0e7408438f5f8f919472c58c2c8d32
Android Build Merger (Role) [Mon, 30 Apr 2018 19:32:58 +0000 (19:32 +0000)]
[automerger] Allow the window to be recreated in the middle of a test am:
30ef1bf331 am:
982b9bf1e4
Change-Id: Ib4998ca20b55378973547524d86dbf2b6f0017cf
Lloyd Pique [Mon, 30 Apr 2018 19:32:47 +0000 (12:32 -0700)]
Allow the window to be recreated in the middle of a test
am:
30ef1bf331
Change-Id: I8150c542b5735cddf900bfa0ac8b1118789d9ea3
Lloyd Pique [Mon, 30 Apr 2018 19:30:50 +0000 (12:30 -0700)]
Allow the window to be recreated in the middle of a test am:
30ef1bf331
am:
38611cff1b
Change-Id: Ib6b7ff02fe67679472877a9cc5dff04f7d01a17a
Lloyd Pique [Mon, 30 Apr 2018 19:26:18 +0000 (12:26 -0700)]
Allow the window to be recreated in the middle of a test
am:
30ef1bf331
Change-Id: Ic2683d5ad4515c3d65339b5027e76b1574374548
android-build-prod (mdb) [Mon, 30 Apr 2018 17:56:53 +0000 (10:56 -0700)]
[automerger skipped] Merge "DO NOT MERGE: Merge remote-tracking branch 'khronos/vulkan-cts-1.0.2' into HEAD" into oreo-cts-dev am:
354706417a -s ours am:
d496dc5ba1 am:
a3bacba8b1 am:
93b3acbf1e -s ours
am:
e4b23a9608
Change-Id: I4a8a3fcc75d39c6101d23289c8016094fc33f780
android-build-prod (mdb) [Mon, 30 Apr 2018 17:52:35 +0000 (10:52 -0700)]
[automerger skipped] Merge "DO NOT MERGE: Merge remote-tracking branch 'khronos/vulkan-cts-1.0.2' into HEAD" into oreo-cts-dev am:
354706417a -s ours am:
d496dc5ba1 am:
a3bacba8b1
am:
93b3acbf1e -s ours
Change-Id: I817dfabfcdca5c9944053c10774dffd97c7ed2f8
android-build-prod (mdb) [Mon, 30 Apr 2018 17:52:35 +0000 (10:52 -0700)]
[automerger skipped] Merge "DO NOT MERGE: Merge remote-tracking branch 'khronos/vulkan-cts-1.0.2' into HEAD" into oreo-cts-dev am:
354706417a -s ours am:
c78fc14ea5 -s ours am:
1d8110d340 -s ours
am:
2f8335f3fb -s ours
Change-Id: Ibe60a588218fffee8a4497bca2614b290de518d6
android-build-prod (mdb) [Mon, 30 Apr 2018 17:48:15 +0000 (10:48 -0700)]
[automerger skipped] Merge "DO NOT MERGE: Merge remote-tracking branch 'khronos/vulkan-cts-1.0.2' into HEAD" into oreo-cts-dev am:
354706417a -s ours am:
d496dc5ba1
am:
a3bacba8b1
Change-Id: I15dbddb5b202e4a7eac6a67fb62fab4d3084ff9a
android-build-prod (mdb) [Mon, 30 Apr 2018 17:48:15 +0000 (10:48 -0700)]
[automerger skipped] Merge "DO NOT MERGE: Merge remote-tracking branch 'khronos/vulkan-cts-1.0.2' into HEAD" into oreo-cts-dev am:
354706417a -s ours am:
c78fc14ea5 -s ours am:
64399483f6 -s ours
am:
45afde55e4
Change-Id: Ie09b4b592f40958b411f5588342be46cd8e74c35
android-build-prod (mdb) [Mon, 30 Apr 2018 17:47:59 +0000 (10:47 -0700)]
[automerger skipped] Merge "DO NOT MERGE: Merge remote-tracking branch 'khronos/vulkan-cts-1.0.2' into HEAD" into oreo-cts-dev am:
354706417a -s ours am:
c78fc14ea5 -s ours
am:
1d8110d340 -s ours
Change-Id: Ia6700fe5419e974a5ecde0aa777c8287453dddd8
android-build-prod (mdb) [Mon, 30 Apr 2018 17:44:08 +0000 (10:44 -0700)]
[automerger skipped] Merge "DO NOT MERGE: Merge remote-tracking branch 'khronos/vulkan-cts-1.0.2' into HEAD" into oreo-cts-dev am:
354706417a -s ours
am:
d496dc5ba1
Change-Id: Ide9aaa6f6834f5060f179188434c8f69d286ce68
android-build-prod (mdb) [Mon, 30 Apr 2018 17:44:05 +0000 (10:44 -0700)]
[automerger skipped] Merge "DO NOT MERGE: Merge remote-tracking branch 'khronos/vulkan-cts-1.0.2' into HEAD" into oreo-cts-dev am:
354706417a -s ours am:
c78fc14ea5 -s ours
am:
64399483f6 -s ours
Change-Id: I0cd61f2281758f35ffa898bd299af36fc3b46e7b
android-build-prod (mdb) [Mon, 30 Apr 2018 17:39:59 +0000 (10:39 -0700)]
[automerger skipped] Merge "DO NOT MERGE: Merge remote-tracking branch 'khronos/vulkan-cts-1.0.2' into HEAD" into oreo-cts-dev
am:
354706417a -s ours
Change-Id: I302c847ae29c25072081d06b17e78671b7358df0
android-build-prod (mdb) [Mon, 30 Apr 2018 17:39:59 +0000 (10:39 -0700)]
[automerger skipped] Merge "DO NOT MERGE: Merge remote-tracking branch 'khronos/vulkan-cts-1.0.2' into HEAD" into oreo-cts-dev am:
354706417a -s ours
am:
c78fc14ea5 -s ours
Change-Id: Ib2acbf2e335b712ea3f16c46168915079b16e6a2
android-build-prod (mdb) [Mon, 30 Apr 2018 17:36:57 +0000 (10:36 -0700)]
[automerger skipped] Merge "DO NOT MERGE: Merge remote-tracking branch 'khronos/vulkan-cts-1.0.2' into HEAD" into oreo-cts-dev am:
354706417a -s ours
am:
c78fc14ea5 -s ours
Change-Id: Iedf43f729df806befedad07e7f8ae5d7b4bddd92
projects / platform / upstream / VK-GL-CTS.git / log