Fix: rendering complete times not monotonic am: 59b6ba9bb2 am: c23074d57c
am: 85d1e56494

Change-Id: I163fbb3b0d80663561f5d2fcd67c9b8fa345a358

Fix: rendering complete times not monotonic am: 59b6ba9bb2
am: c23074d57c

Change-Id: I68ded1c7963a388629e34ba5c3fa59755c109ac9

Fix: rendering complete times not monotonic
am: 59b6ba9bb2

Change-Id: I3a1fc45cf76cb1ca0b5cc0e84fceb7808d68537f

Merge "Revert "Revert "Convert external/deqp/android/cts to Android.bp"""

Merge "Merge remote-tracking branch 'khronos/vulkan-cts-1.1.0' into HEAD" into pie-cts-dev
am: b6c2ed7121

Change-Id: I95bd47a45fcaef4d89b765e1f29fb3db5e8f210c

Fix: rendering complete times not monotonic

We run into an intermittent issue that two neighboring
frames have the same rendering complete timestamp.

The timers will always have finite granularity.
The timestamp is in nanosecond but the timer producing
these timestamps might not actually be able to produce
timestamps at 1ns resolution. When the timer used for
these events has not enough granularity, events that
happen very quickly right after one another will appear
as if they appear at the same point in time.

Two neighboring frames have the same timestamp is allowed.

Components: AOSP

VK-GL-CTS issue: 1311
Bug: b/112778381

Affects:
dEQP-EGL.functional.get_frame_timestamps.*

Merge "Merge remote-tracking branch 'khronos/vulkan-cts-1.1.0' into HEAD" into pie-cts-dev

Merge "Update CTS runner after TF interface update"

[automerger skipped] Merge "RESTRICT AUTOMERGE: Backport tests for VK_KHR_draw_indirect_count" into oreo-mr1-cts-dev am: 9bbaf74230  -s ours
am: a51e7a7d9c  -s ours

Change-Id: Ia2a1e26d432456e0fd173e0f9878bf254f4272c8

[automerger skipped] RESTRICT AUTOMERGE: Backport tests for VK_KHR_draw_indirect_count
am: 43622dc64c  -s ours

Change-Id: Ifad35fa0297f9099e3da124153c8200f168611f0

Vulkan AHB - fix incorrect structure definition
am: 181b5cd80e

Change-Id: Ie3c769146a1dc5862067e5a61a194300a7825168

[automerger skipped] Merge "RESTRICT AUTOMERGE: Backport tests for VK_KHR_draw_indirect_count" into oreo-mr1-cts-dev
am: 9bbaf74230  -s ours

Change-Id: I4de7ad984886cb4508f9e5f408e8c8e610f75434

Merge remote-tracking branch 'khronos/vulkan-cts-1.1.0' into HEAD

Change-Id: I8db2d3d6347c92f0f4fdd0d9db07a812a96243d8
Bug: b/112439889

RESTRICT AUTOMERGE: Backport tests for VK_KHR_draw_indirect_count

This change add new tests for VK_KHR_draw_indirect_count
extension, and adds the extension to the whitelist.

New Tests:
dEQP-VK.draw.indirect_draw.*.indirect_draw_count.*
dEQP-VK.draw.indirect_draw.*.indirect_draw_first_instance.*
dEQP-VK.draw.indirect_draw.*.indirect_draw_count_first_instance.*
dEQP-VK.draw.indirect_draw.*.indirect_draw_count_instanced.*

Note: for Android CTS backport, adjusted excluded test list to not impact
previously-passing implementations that don't care about this extension.

Affected tests:
dEQP-VK.api.info.device.extensions

Components: Vulkan, Framework
VK-GL-CTS issue: 1004
Bug: b/111786155

Change-Id: I3d53806eb1a45293a77b940d9c2fa540a6d83d50
(cherry picked from Khronos commit 7b47cd53c6656b866e7c3a3c0a590da85f3b2de1)

Vulkan AHB - fix incorrect structure definition

Fix a missing VkComponentMapping field of the VkAndroidHardwareBufferFormatPropertiesANDROID
structure. This is causing incorrect values to be populated to the
structure, as well as, a stack overwrite of other stack-located locals.

Affects:
dEQP-VK.api.external.memory.android_hardware_buffer.image_formats.r8g8b8a8_unorm
dEQP-VK.api.external.memory.android_hardware_buffer.image_formats.r5g6b5_unorm_pack16
dEQP-VK.api.external.memory.android_hardware_buffer.image_formats.r16g16b16a16_sfloat
dEQP-VK.api.external.memory.android_hardware_buffer.image_formats.a2b10g10r10_unorm_pack32

Components: Vulkan
VK-GL-CTS issue: 1305
VK-GL-CTS issue: 1316
Bug: b/112705952

Change-Id: I81eb1cc605912bf0adebe67b65d7ccdd31236ec9
(cherry picked from Khronos commit 0116a17ddb4eb4f25624698bc0ba1c68e51a6950)

Merge "RESTRICT AUTOMERGE: Backport tests for VK_KHR_draw_indirect_count" into oreo-mr1-cts-dev

Revert "Revert "Convert external/deqp/android/cts to Android.bp""

This reverts commit 10848da9348e610bd6e938836ae846abcf540a3d.

Bug: 112654980
Change-Id: I5c5d5b932eb7df0b710668dadaf788344ca5b1e2

Merge "Revert "Convert external/deqp/android/cts to Android.bp""

Revert "Convert external/deqp/android/cts to Android.bp"

This reverts commit e674df42dddcba06641861912154be98a7937884.

Reason for revert: broke tradefed/general_tests_zip
Bug: 112654980

Change-Id: I251b5e2372cb9c7c12e87ce94c07222a97500406

Merge "Fix build for surfaceless target"

Merge "Convert external/deqp/android/cts to Android.bp"

Update CTS runner after TF interface update

Test: unit tests
Bug: 112468193
Change-Id: I82a0ef4c894ad56dc426e856cfb3dfdbb70d8edd

Fix build for surfaceless target

Bug: crbug/873651
Change-Id: I80b88bd6022edbe7936c17e11d1f3f79d8b9500d
Components: Framework

Merge remote-tracking branch 'khronos/vulkan-cts-1.0.2' into HEAD am: d502cf9784
am: c4a6a1e68a

Change-Id: I2bd6a3d3adf162ae02fceea8dcde436c66cc5c0f

Remove dEQP-VK.ubo.random.all_shared_buffer.48 from mustpass
am: aa99687ef4

Change-Id: If404960e299db089d05906c49b8529729be25df8

Merge remote-tracking branch 'khronos/vulkan-cts-1.0.2' into HEAD
am: d502cf9784

Change-Id: I070ab06a20d335f4fdb8286d51c64da2cb61836c

Remove dEQP-VK.ubo.random.all_shared_buffer.48 from mustpass

Bug: b/112540895
Change-Id: I3813d59ecdf99125d1a1ac76a5f8f1d05085df61

Convert external/deqp/android/cts to Android.bp

See build/soong/README.md for more information.

Test: external/deqp/android/cts/runner/tests/run_tests.sh
Test: cts-tradefed run commandAndExit cts -m CtsDeqpTestCases
Change-Id: I0ac2ff5cc91c18ff27e26b1827c6f6eb1598ae7b

RESTRICT AUTOMERGE: Backport tests for VK_KHR_draw_indirect_count

This change add new tests for VK_KHR_draw_indirect_count
extension, and adds the extension to the whitelist.

New Tests:
dEQP-VK.draw.indirect_draw.*.indirect_draw_count.*
dEQP-VK.draw.indirect_draw.*.indirect_draw_first_instance.*
dEQP-VK.draw.indirect_draw.*.indirect_draw_count_first_instance.*
dEQP-VK.draw.indirect_draw.*.indirect_draw_count_instanced.*

Note: for Android CTS backport, adjusted excluded test list to not impact
previously-passing implementations that don't care about this extension.

Affected tests:
dEQP-VK.api.info.device.extensions

Components: Vulkan, Framework
VK-GL-CTS issue: 1004
Bug: b/111786155

Change-Id: I3d53806eb1a45293a77b940d9c2fa540a6d83d50
(cherry picked from Khronos commit 7b47cd53c6656b866e7c3a3c0a590da85f3b2de1)

Merge remote-tracking branch 'khronos/vulkan-cts-1.0.2' into HEAD

Change-Id: I60f5de1ad1f48484ffbc786f062075be6db85840

Merge pie-cts-dev into master.

Bug: 112051819
Change-Id: Ide79ad146b80a923cfd00ec1e526b8b389e54b29

Remove unconditional depth_clamping for 1.1.0

Changed depthClampEnable from VK_TRUE to VK_FALSE where it is not needed.
Depth clamp specific tests in builtin_var.fragdepth set as not supported for incompatible systems.

Affects:
dEQP-VK.device_group.*
dEQP-VK.api.object_management.*.graphics_pipeline
dEQP-VK.binding_model.shader_access.*
dEQP-VK.glsl.builtin_var.fragdepth.*
dEQP-VK.synchronization.smoke.*
dEQP-VK.renderpass.*
dEQP-VK.spirv_assembly.*
dEQP-VK.api.smoke.unused_resolve_attachment
dEQP-VK.wsi.android.incremental_present.*
dEQP-VK.memory.pipeline_barrier.*

Components: Vulkan

VK-GL-CTS issue: 1286

Change-Id: Ia869da75a74800543afb4f8fddd8bf5e8f7f4a7f

Merge Android Pie into master

Bug: 112104996
Change-Id: I573d3264a618044472c238f9b530cfd9f76ba791

Merge vk-gl-cts/vulkan-cts-1.0.2 into vk-gl-cts/vulkan-cts-1.1.0

Change-Id: I178311e0fa4f5276ab325b65460074f60e42c222

Invalidate memory in draw tests

The test group writes to non-coherent device memory with device,
but fails to call the required invalidate on the region before
reading mapped memory with host.

Components: Vulkan

VK-GL-CTS issue: 529

Affects: dEQP-VK.draw.*

Change-Id: Icf4aa6ea80c8c046e41b37402457b7f094d7ae50
(cherry picked from commit 1ce6e233a6245a1cf81a2a4e88b87c5d381a119a)

Merge remote-tracking branch 'khronos/vulkan-cts-1.1.0' into stage-aosp-pi-cts-dev

Bug: b/111845139
Change-Id: I7cc4f644cfc54904213b959338b80f990f034351

Backport post-P AHardwareBuffer changes from Khronos CTS

This includes all the changes approved by Khronos to these tests between
the time we initially landed them for P CTS, and the upstream changes
being accepted.

Bug: b/75981905, b/109927547
Change-Id: I23550489a55af36089451384f75f62ae54f99c27

Allow two images worth of alignment slop in protected heap

We previously backed off by one image worth, but it's not enough in some
cases.

Components: Vulkan
VK-GL-CTS: 1262
Bug: b/109757443
Test: dEQP-VK.protected_memory.interaction.wsi.android.swapchain.create#min_image_count
Change-Id: I01b3a72986e9f35b4ec15a146e4dc576758c02ce
(cherry picked from Android commit 0fd6d1afa4d00ffd3da1d2d1898f32d4e879209d)

Protected memory image access tests not flushing staging buffer

Affected tests:
dEQP-VK.protected_memory.image.access.*

Components: Vulkan

VK-GL-CTS issue: 1264

Change-Id: I30a6e3b0118b6874b9bfdf625aadec9c0fe54710

Merge remote-tracking branch 'khronos/vulkan-cts-1.0.2' into oreo-mr1-cts-dev am: f76e580fa8
am: e98bb687e8

Change-Id: I78953a8c073b0dd51f44a949b0ebd7878c2fdc26

Merge remote-tracking branch 'khronos/vulkan-cts-1.0.2' into oreo-mr1-cts-dev
am: f76e580fa8

Change-Id: Ieb0eae5a1356d251a38221b7a6b28e16db01fa96

Merge remote-tracking branch 'khronos/vulkan-cts-1.0.2' into oreo-mr1-cts-dev
am: f76e580fa8

Change-Id: Ia91eb9f08334aa37a565a37bd835d7451d90650a

Merge remote-tracking branch 'khronos/vulkan-cts-1.0.2' into oreo-mr1-cts-dev

Change-Id: I84e14849790aee60eacb6b1cff5cbaeb8059848d
Bug: b/111319193

Merge remote-tracking branch 'khronos/vulkan-cts-1.1.0' into HEAD

Change-Id: Ib606d7514da21014bfd9e699633512c7b8062ad0
Bug: b/111276114

Merge vk-gl-cts/vulkan-cts-1.0.2 into vk-gl-cts/vulkan-cts-1.1.0

Change-Id: Ie88a7283bd969891282983a549c6d18901a9ee7b

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)

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)

Merge remote-tracking branch 'khronos/vulkan-cts-1.1.0' into HEAD

Change-Id: I2afae3b649256d7107c76e6039affc116eae2004
Bug: b/111211233

Merge vk-gl-cts/vulkan-cts-1.0.2 into vk-gl-cts/vulkan-cts-1.1.0

Change-Id: I141a0abc53983443da9a5bb7c905538f1ddb4f22

Merge vk-gl-cts/github-vulkan-cts-1.1.0 into vk-gl-cts/vulkan-cts-1.1.0

Change-Id: I29544b2f3f6b7bee65ac6ac1339eb52176efe5a5

Fix build error introduced by the previous commit

Components: Vulkan

Compile shaders for 1.0-compatible tests as SPIRV 1.0, not max supported

Components: Vulkan
VK-GL-CTS: 1232

Change-Id: I5a440f97f79be0e6d37d89018ae8b611e9d4e7c1

Merge pull request #99 from AIOOB/patch-1

Require extension for the deviceFeatures2 test

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)

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

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

Fix duplicate <uses-sdk> elements in com.drawelements.deqp
am: be5b8ae675

Change-Id: I06f0e9e927af9f64077a31e404259cd837750591

Merge pi-dev-plus-aosp-without-vendor into stage-aosp-master

Bug: 79597307
Change-Id: If2ada4dd7bce7602babdb2090dc4cda82b184fc1

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)

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

Fix arm32 check to work on armv8 32bit mode
am: add785f6ef

Change-Id: I919d43a00faec2dcf35996997efc613c31e570a5

Fix arm32 check to work on armv8 32bit mode

Change-Id: Ied79c61ad64eb1011d97be0fb3d727fb2c1bab36
Bug: b/79545607
Test: dEQP-VK.dynamic_state.rs_state*

[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

[automerger skipped] Merge "DO NOT MERGE: GetDevices: Also allow `\-` to be part of the host name"
am: 6f687edc46  -s ours

Change-Id: I9710bde0d777131a9068fc554185e50bfa68efbc

Merge "DO NOT MERGE: GetDevices: Also allow `\-` to be part of the host name"

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)

Don't rely on unspecified argument evaluation order in atomic swap tests
am: 51e0000bcd

Change-Id: Ieeeb2b708fc72335d421795b569307a8fb3d01b1

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

Request required 16bit storage features in UConvert/SConvert tests
am: 20426c9789

Change-Id: Ia2e1b73b5733be5678980f859338641560131ad2

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

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

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

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

Merge "GetDevices: Also allow `\-` to be part of the host name" into pi-dev
am: 7e127b82c4

Change-Id: I6951a56d074ff970246235e4e1bdf08dd9d354b1

Merge "GetDevices: Also allow `\-` to be part of the host name" into pi-dev

Merge "Limit protected swapchain images based on memory" into pi-dev
am: ae2ba92fb2

Change-Id: I1ae06e3a6ff26e8931e0147b7dc07f2a44e53afc

Merge "Limit protected swapchain images based on memory" into pi-dev

Merge remote-tracking branch 'khronos/vulkan-cts-1.1.0' into pi-dev
am: e75fb389ce

Change-Id: Iceff81a070a005635aee4d046ac14f39d91c74d2

Merge remote-tracking branch 'khronos/vulkan-cts-1.1.0' into pi-dev

Bug: b/79920276
Test: CtsDeqpTestCases

Change-Id: I5278d1865efc379687d88a368d48ef64cce455bc

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

Backport AHB test changes from Khronos review
am: 9829d36b5a

Change-Id: I82459631b0ec75918e47b7609669100059e41a61

Merge vk-gl-cts/vulkan-cts-1.0.2 into vk-gl-cts/vulkan-cts-1.1.0

Change-Id: I06a95f88214707d9108a46f7374a5e8e0f9bdb59

Backport AHB test changes from Khronos review

Change-Id: I902646e380d18c8c4ee165a7bfe3c6aee6735aa6
Components: Vulkan
Bug: b/79540301
Test: CtsDeqpTestCases

GetDevices: Also allow `\-` to be part of the host name

Bug: b/79494592

Change-Id: I2e79a8389be53300296f07bcbae902a717da2d5e

DO NOT MERGE: GetDevices: Also allow `\-` to be part of the host name

Change-Id: Ib4eaa0f1ded74d8733f378675fe509cf5a6b1c2b

Don't leak ref to native handle in external memory tests
am: 17eb70bae8

Change-Id: Iefe80456c8b0d7701c4a79cc892ef4d39244bd6a

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

[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

[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

[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

[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

[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

[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

Merge "DO NOT MERGE: Merge remote-tracking branch 'khronos/vulkan-cts-1.0.2' into HEAD" into oreo-mr1-cts-dev

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

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

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

[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

Allow the window to be recreated in the middle of a test am: 30ef1bf331 am: 38611cff1b am: 6eca3b9153
am: 9800dc3074

Change-Id: I7e2fff3665bd75ac5c470aa2ca7fd69b6a6acd14

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