[automerger skipped] RESTRICT AUTOMERGE: Relax composite-to-present latency requirement am: 2b6581ff37  -s ours am: ab1d7892bc  -s ours
am: 8a6117ca3f  -s ours

Change-Id: I595afdfb67a3e6bedaa995825250eb6f8174cbb2

[automerger skipped] RESTRICT AUTOMERGE: Relax composite-to-present latency requirement am: 2b6581ff37  -s ours
am: ab1d7892bc  -s ours

Change-Id: I0ff93a883aa47511d94e67dc10db54899e1a1951

[automerger skipped] RESTRICT AUTOMERGE: Relax composite-to-present latency requirement
am: 2b6581ff37  -s ours

Change-Id: I67b1715bd1c85f8ab2199a5e9e4fba67693279fd

RESTRICT AUTOMERGE: Relax composite-to-present latency requirement

Some very low end devices can't reliably do this. Relax in 8.0 CTS; will
keep the 3-frame requirement for 8.1 CTS and later.

Bug: b/70334851
Change-Id: I330b8a48af95e4d76cb5f7d06cacc458649dba25

Merge pie-platform-release to aosp-master - DO NOT MERGE

Change-Id: Ifebd4299e9a7e51575b95d0455913e8facdb86a4

Merge remote-tracking branch 'khronos/vulkan-cts-1.0.2' into oreo-mr1-cts-dev am: d342579a4b am: 40df37a3ec
am: af2f0f22b8

Change-Id: Ie55065e169d642256141c6cb0507d66510739481

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

Change-Id: Ic9f8be50d5a59a6402e347638e67ac1755651812

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

Change-Id: Id57cf5d3697bc52cd5d0fb78da17d430f8e0e62a

Merge remote-tracking branch 'khronos/vulkan-cts-1.1.0' into pie-cts-dev am: c58fe0ed93
am: e5ac759be2

Change-Id: I200aeda019f885cd1d6690eda199844fa3ac24ed

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

Change-Id: I52e767a1cb7c987d2865c80fe217914bcff52dbd

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

Change-Id: Ib59c5ae7ad294e29d1289ced4e5784ab7ee7262a
Bug: b/117653703

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

Change-Id: Ic0ea3a0d6d4214309aee4711ec466ea33263f3a3
Bug: b/117652567

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

Change-Id: I24509b7943339682384362e4c839f66ca6a2d293

Remove dEQP-EGL.functional.wide_color.*_8888_colorspace_p3 from P mustpass am: 38146a3626
am: b57a8fe92b

Change-Id: Ic64806f16de2a11bceaae63abbf18d84053f57b0

Merge remote-tracking branch 'khronos/vulkan-cts-1.1.0' into pie-cts-dev am: 7a9d39fd2a
am: e65bc0852c

Change-Id: I84b8f2cb5693cdd06fb35835ba48e14ca9f62a82

Remove dEQP-EGL.functional.wide_color.*_8888_colorspace_p3 from P mustpass
am: 38146a3626

Change-Id: Ic127c0139b5946b90a64373632971e579be1afe9

Merge remote-tracking branch 'khronos/vulkan-cts-1.1.0' into pie-cts-dev
am: 7a9d39fd2a

Change-Id: I50015ccdaa9dba37be8c5d44d32c546196c66745

Remove dEQP-EGL.functional.wide_color.*_8888_colorspace_p3 from P mustpass

Bug: b/117152494
Change-Id: I2efbc9a52be073fa63179044ae8950aceff5eefd

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

Change-Id: Ia3e6fc9380d6e20ff25e434b07756a19762c2aa3
Bug: b/117148475

VK_KHR_incremental_present: Fix usage flags.

Besides swapchain support we also need
vkGetPhysicalDeviceImageFormatProperties support. Use just the
needed flags instead. As COLOR_ATTACHMENT is required in
VK_KHR_surface, we don't need to check for it.

Affected tests:

dEQP-VK.wsi.*.incremental_present.*

Components: Vulkan
VK-GL-CTS issue: 1395

Change-Id: I4dd0f95da0a8f31c11efe7ce58f12cfbe160a71e

Fix timeout in dEQP-VK.wsi.android test

Changes in Android P have causes the workload in
dEQP-VK.wsi.android.swapchain.simulate_oom.min_image_count
to increase significantly, leading to timeouts on some platforms.
This is worked around by simply touching the watchdog timer
between cases.

Affects:

dEQP-VK.wsi.android.swapchain.simulate_oom.min_image_count

Components: Vulkan

VK-GL-CTS issue: 1383

Change-Id: If5da804796f85acd3c2b9709a5463951609168dc

Merge remote-tracking branch 'khronos/vulkan-cts-1.1.0' into pie-cts-dev am: 6cf5f05368
am: 92157740ab

Change-Id: Ic6434185a176be24bc9d66beb1f9c6278b136d7f

Merge remote-tracking branch 'khronos/vulkan-cts-1.1.0' into pie-cts-dev
am: 6cf5f05368

Change-Id: I2be685a153ecb2514bd69dd577f458a0e35b62f2

Remove self assignment statement
am: 392cdf8bb2

Change-Id: I7260e1d60de3653720bbefc347120895b6ea8231

Remove self assignment statement

This is redundant. Fixes "-Wself-assign-overloaded" warning.

Test: m
Bug: 110779387
Change-Id: Iefa1c580e062ba61c58a4b6073ddda1111a02c9b

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

Change-Id: Iabe42226d4971e28fe10fb58c79fb21bb020094d
Bug: b/116248353
Bug: b/116439954

Reduces percentage of heap used in memory tests

Heaps can be shared and even fragmented on real systems.
The current percentage of 50% is a little high to reasonably
account for these issues.

Components: Vulkan
VK-GL-CTS issue: 1342

Affects:
dEQP-VK.memory.device_group_allocation.random*

Change-Id: I9a9c7fff05a663facd142a61a505c38925912ed8
(cherry picked from commit 1dab6c690815c1640b7726e05211ec3ab244f935)

Fix pipeline barrier issues in protected memory tests

Set correct stage mask for pipeline barriers, and remove pipeline
barriers that are not needed.

Components: Vulkan

VK-GL-CTS issue: 1373

Affects:
dEQP-VK.protected_memory.buffer.*
dEQP-VK.protected_memory.attachment.*

Change-Id: I6dae7ad02c66649281a35465939437a5fb26dd0e

Fixes WSI protected swapchain allocation tests

Will now throw not supported if swapchain config
cannot fit in the available heap space.

Changes available heap space to fixed 25% of total
reported heap size instead of the current
"total - 2 * imageSize"

Components: Vulkan
VK-GL-CTS issue: 1345

Affects:
dEQP-VK.protected_memory.interaction.wsi.android.swapchain.create.*

Change-Id: I6854ae29b4394d450e47cc78bfb905362a964ec4
(cherry picked from commit f679b545b3b5f06bfb84069a4c712e3988204326)

2Darray compatible flag not allowed for 2D images

Fix for dEQP-VK.api.external.memory.*.image.info tests
incorrectly set create flag VK_IMAGE_CREATE_2D_ARRAY_COMPATIBLE_BIT
for 2D images

Components: Vulkan

Affects:
dEQP-VK.api.external.memory.*.image.info

VK-GL-CTS issue: 1362

Change-Id: I6863fc30177979b913c9e0d4b5814cb857764e27

Consider rounding mode differences in mipmap tests

The tests already tolerate a threshold for rounding mode differences
for the result of a downscaling vkCmdBlitImage, however the accumulated
difference between Round-To-Nearest and Round-To-Zero may exceed the
current threshold. With this change, the expected result is generated
from the preceding device-rendered mipmap instead, so any legitimate
error will always be within the threshold now.

Affects:

dEQP-VK.api.copy_and_blit.core.blit_image.all_formats.generate_mipmaps.*_linear

Components: Vulkan

VK-GL-CTS issue: 1106

Change-Id: I0999419320d1b2384f42fbc8eddda29e79147bd4
(cherry picked from commit b861ca1e6d4c002d4359a71dbff1cdf898e79aca)

Fix copy/paste errors in opundef assembly tests am: 968a3720a4
am: 82c07cfd53

Change-Id: I5c8581c48824d15bf6cfa26be8a35db5e3f147be

Fixes geometry shader invocation dependency am: 30ae419200
am: 9ac8d451a2

Change-Id: I6a5aa4687a0033baa7443dbbe54e33746540845c

Merge remote-tracking branch 'khronos/vulkan-cts-1.1.0' into HEAD am: 5d71d3db31
am: 88e4e53412

Change-Id: I967e2d5b449caf735984ce62fe3bcb9cc33fff5b

Fix copy/paste errors in opundef assembly tests
am: 968a3720a4

Change-Id: I26410dadda21d221b2769b1aa8837af6dd5d284c

Fixes geometry shader invocation dependency
am: 30ae419200

Change-Id: I10d170a12482cbe44602b362fc2b3ce764248220

Merge remote-tracking branch 'khronos/vulkan-cts-1.1.0' into HEAD
am: 5d71d3db31

Change-Id: I3b519e81eaf4562d5ae7b3220926f3359fd6a787

Fix copy/paste errors in opundef assembly tests

The tests were using %is_nan_0 repeatedly instead of %is_nan_<i>

Affects: dEQP-VK.spirv_assembly.instruction.graphics.opundef.*
(likely only the vec4float32 and matrix subsets)
Component: Vulkan
VK-GL-CTS: 1315
Bug: b/115746164

Change-Id: I2bed6e94f6867c424c5102ef3eeab8ac32021dcd
(cherry picked from commit a46089154137e0939c02bdcabc74f5daa303ffb2)

Fixes geometry shader invocation dependency

dEQP-VK.tessellation.invariance.* updates a SSBO
expecting the implementation to execute the GS
once per primitive. Changes the test to allow
multiple invocations.

Components: Vulkan
VK-GL-CTS Issue: 1281

Affects:
dEQP-VK.tessellation.invariance.*
Bug: b/115698932

Change-Id: I6ed17a8afb413587bb38487ec9952f569a250193

Fix RobustnessVertexAccessInstance bounds check

The bounds check preformed by
VertexAccessInstance::isValueWithinVertexBufferOrZero() needs to round
the value rather than truncating it when encoding it. When
`value * 0x3FFu` is casted to a deUint32 it's possible for the result to
be truncated instead of rounded causing unintended test failures.

Affects: dEQP-VK.robustness.vertex_access.a2b10g10r10_unorm_pack32.draw.vertex_incomplete

Components: Vulkan

VK-GL-CTS issue: 1351

Change-Id: Ib034b3e29fdbbbd4670e2bbdedad07492abf5cd4
(cherry picked from commit fed61233a802b5a8e7f6e634d0ef698e9155a94c)

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

Adjust excluded test list to suppress newly added tests from upstream
change.

Bug: b/113270678
Change-Id: I24f786f10c5d4fbf4ff0112d5fc162770ab8024f

Merge "Move P risky mustpass back into master mustpass."
am: 9149a0bed5

Change-Id: I45c442830e60f31a0835d6e7c9cc0bbc05f578e3

Merge "Move P risky mustpass back into master mustpass."

Move P risky mustpass back into master mustpass.

Cleanup from end of P cycle.

Change-Id: Ia56125389e7ae08e24640cae4dc70ec44ec06cb3
Components: AOSP
Affects: Android mustpass lists only

teglImageFormatTests: call glFinish after creating the buffer in the client API am: 84c981292b am: 18638d541a
am: 4cc490b54a

Change-Id: I8d8a3c429cd1c0d307c94cddc883f017e5245de0

teglImageFormatTests: call glFinish after creating the buffer in the client API am: 84c981292b
am: 18638d541a

Change-Id: If19a6a3ff7941199488fc4315f366972af7589fb

teglImageFormatTests: call glFinish after creating the buffer in the client API
am: 84c981292b

Change-Id: I8aa77457a80755cc3bdad38930e5f63696a475b6

Remove dependency on IStrictShardableTest
am: 7a945c7235

Change-Id: I8225df77b6824caf374fdf385bc88acea92bc0e1

teglImageFormatTests: call glFinish after creating the buffer in the client API

According to section 3.7.3.2 (Order of Rendering Operations Between
Contexts) of the EGL spec, the application is responsible for
synchronization between different rendering contexts even in the same
thread.

Some of the tests execute a sequence of operations like this (see
MultiContextRenderTests::init):

1. ctx0: create image
2. ctx0: read from image
3. ctx0: clear image
4. ctx1: recreate image
5. ctx0: read from image
6. ctx1: read from image

This change adds a call to glFinish between steps 4 and 5 that is needed
for correctness. Note that other parts of the same file already call
glFinish, e.g. the various Render actions.

Components: EGL
VK-GL-CTS issue: 857
Affects:
dEQP-EGL.functional.image.render_multiple_contexts.gles2_*_read_pixels
Bug: b/115514127

Change-Id: I4dc50f7516374405596653d7006165819b95b6fa
(cherry picked from Khronos commit e9c93ece28719bcdde74e75dae114f8188e380a3)

Remove dependency on IStrictShardableTest

Interface is not used anymore.

Test: make cts, run cts-unit-tests
Bug: 112426228
Change-Id: I95ac293a4b8a585fe7bf8adea3d55c1faf6548e1

[automerger skipped] [RESTRICT AUTOMERGE] Merge remote-tracking branch 'khronos/vulkan-cts-1.0.2' into oreo-mr1-cts-dev am: df6a2ffc6e  -s ours am: 4eb31660f7  -s ours
am: daa43c5187  -s ours

Change-Id: I2a706688237f2e0d26b1c8445098198d340f3727

[automerger skipped] [RESTRICT AUTOMERGE] Merge remote-tracking branch 'khronos/vulkan-cts-1.0.2' into oreo-mr1-cts-dev am: df6a2ffc6e  -s ours
am: 4eb31660f7  -s ours

Change-Id: Id4582490a4045249c6c2818ac51548d047460011

[automerger skipped] [RESTRICT AUTOMERGE] Merge remote-tracking branch 'khronos/vulkan-cts-1.0.2' into oreo-mr1-cts-dev
am: df6a2ffc6e  -s ours

Change-Id: I5a7f593b5301a76a4e4a1d89c9d06a2a08a4fe50

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

Change-Id: I5a095ab6fddfaa9ce687f8627b58ec12176ba660

Fixes tessellation triangle check

Tessellators may produce inner vertices positioned
on the edge of a primitive when used with fractional
odd spacing and the inner tessellation level is one.

Point mode doesn't factor into this rule

Components: Vulkan
VK-GL-CTS Issue: 1273

Affects:
dEQP-VK.tessellation.primitive_discard.*

Change-Id: Ida8c75d4275403eaae8b52fe55f3ed9e61dd2d6e

Merge "Suppress -Wimplicit-fallthrough."
am: a4a3ea5486

Change-Id: I41a9b7efab1a49f10f5baf1cbab12502d88b3a48

Merge "Suppress -Wimplicit-fallthrough."

Merge changes from topic "p-renderpass2" into pie-cts-dev am: 79749eabc6
am: c387216281

Change-Id: Ief1f19b5218249ea70ad9b2a636441bdcd879fbd

Merge changes from topic "p-renderpass2" into pie-cts-dev
am: 79749eabc6

Change-Id: I0ddba5851971235127ae29b7047ef095ee6b2b16

Merge changes from topic "p-renderpass2" into pie-cts-dev

* changes:
  Incorrect enum values for VK_KHR_create_renderpass2
  Allowed device extensions list is missing entry
  Tests for VK_KHR_create_renderpass2

Suppress -Wimplicit-fallthrough.

-Wimplicit-fallthrough will be enabled globally.

Test: build with global -Wimplicit-fallthrough.
Change-Id: I0f1dea676f1cf551339036767f141aa5717cea3e

Incorrect enum values for VK_KHR_create_renderpass2

Some VkStructureType enum values added for VK_KHR_create_renderpass2 are
not in accordance with current Vulkan headers and the Vulkan
specification.

Components: Vulkan

VK-GL-CTS issue: 1321

Affects: dEQP-VK.*renderpass2.*
Bug: b/112923550

Change-Id: I51031d538bc427e56bbf56f603f200b513834d67
(cherry picked from Khronos commit c83b0de6829ff1e4beb451d52549e40377c27a34)

[RESTRICT AUTOMERGE] Merge remote-tracking branch 'khronos/vulkan-cts-1.0.2' into oreo-mr1-cts-dev

Bug: b/113276290

Change-Id: I77d325ade51309e96151c77804f97f86c3712117

Fix issues in ProtectedMemCopyBufferToImage

Fixes the following issues:

* pipeline barriers were not correct: wrong stages and wrong access masks
  were used
* R32G32B32A32_UINT image view was sampled from sampler2D

Affects: dEQP-VK.protected_memory.image.copy_buffer_to_image.*

Components: Vulkan

VK-GL-CTS issue: 1326

Change-Id: I9d7eb9f8d9c2dcda1d7dd1f3b0e68e71fcd8c8f9

Add cases for structs as inout and out parameters.
am: e9540af222

Change-Id: Idc5a66f296ecef53d6a0410a260605d47e60c367

Reinstate dot & reflect tests
am: 69740b4570

Change-Id: Id7cbfd95751692b1b102d9aefade639b3d28db2a

Add cases for structs as inout and out parameters.

Structs with lowp, mediump and highp (when supported in fragment
shaders) members are tested as inout and out parameters in both ES 2.0
and 3.0 shaders.

The highp variant of this test catches a bug which was found by the
Three.js community in https://github.com/mrdoob/three.js/issues/14137 .
Similar tests were integrated into the WebGL conformance suite in
https://github.com/KhronosGroup/WebGL/pull/2663 .

Verified on:
  Qualcomm Adreno 308 (LG Aristo) - bug reproduces in both ES2 and ES3
                                    highp fragment shaders
  Qualcomm Adreno 540 (Pixel 2),
  NVIDIA Tegra (SHIELD Tablet) - all tests pass

New tests:

dEQP-GLES[23].functional.shaders.struct.local.parameter_inout_*
dEQP-GLES[23].functional.shaders.struct.local.parameter_out_*

VK-GL-CTS Issue 1280

Change-Id: Ie332aede0ad52453815d9e123145ec035009430b
(cherry picked from commit 3b0365b1a090c4e15f72b2cb877ee15f65c8befe)

Reinstate dot & reflect tests

There is now enough coverage of alternative evaluation orders that these
can be enabled.

Bug: b/28767510
Change-Id: I65de890cd8106ff12f4f5bf76e3db31966681023

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

Change-Id: I5b4bdc020c0dda7ec55aafd498cd1f1193b9c77b

Fix copy/paste errors in opundef assembly tests

The tests were using %is_nan_0 repeatedly instead of %is_nan_<i>

Affects: dEQP-VK.spirv_assembly.instruction.graphics.opundef.*
(likely only the vec4float32 and matrix subsets)
Component: Vulkan
VK-GL-CTS: 1315

Change-Id: I2bed6e94f6867c424c5102ef3eeab8ac32021dcd
(cherry picked from commit a46089154137e0939c02bdcabc74f5daa303ffb2)

Allowed device extensions list is missing entry

VK_KHR_create_renderpass2 is missing from the list of allowed
extensions in dEQP-VK.api.info.device.extensions test.
This causes the test to fail if the extension is exposed
in the driver.

Affects:

dEQP-VK.api.info.device.extensions

Components: Vulkan

VK-GL-CTS issue: 1208

Change-Id: I7024db0f775487b5601b5e8c82a807c58d070883
(cherry picked from commit 62deeb1fc1bcda275ff652c6466f9570a2fad75d)
(cherry picked from commit 08648ab26fa428fa6ca1c111adc085ae6eec16c6)

Bug: b/112923550

Tests for VK_KHR_create_renderpass2

Add tests:
 * dEQP-VK.renderpass2.*

Affects tests:
 * dEQP-VK.renderpass.*

Framework's Context class extended with functions
 * requireDeviceExtension
 * requireInstanceExtension

Components: Vulkan, Framework

VK-GL-CTS issue: 1011
Change-Id: Ibc125466cc3c91f7c8558d6518a0c9f854e50108
(cherry picked from Khronos commit fc812af6874f7779ec5913228cc768686a9a0505)

(Backported to P CTS)

Bug: b/112923550

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: Ic9e38a24419afd26f7c8cf96259ddc6e1f03d85b
(cherry picked from Khronos commit 7b47cd53c6656b866e7c3a3c0a590da85f3b2de1)

(cherry picked from commit 43622dc64ce9f19461828b0bd62ca5342c26eb40)

[automerger skipped] Merge "RESTRICT AUTOMERGE: Backport tests for VK_KHR_draw_indirect_count"
am: 28b85b9cbf  -s ours

Change-Id: I8da6ee75518078077d0dc23a69966a8b77ca67b1

Merge "RESTRICT AUTOMERGE: Backport tests for VK_KHR_draw_indirect_count"

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: I7078e1104c1ebd29320fa04afa20549757e56bc5
(cherry picked from Khronos commit 7b47cd53c6656b866e7c3a3c0a590da85f3b2de1)

(cherry picked from commit 43622dc64ce9f19461828b0bd62ca5342c26eb40)

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

Change-Id: I3cac071d1a12e49aa858ccbb9a9f51de42a3fdc7

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"""
am: be909a7240

Change-Id: Iacd941bb92b3ca63ef76d42c6a5866f80898ef1f

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
am: d726e253e6

Change-Id: I12533a50285c69c38cb757d0925c988bebe70bb0

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"
am: 41748660a7

Change-Id: Ic90e82e241c3fbe77541d061ed8dd927af5b87ca

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
am: 1100f40633  -s ours

Change-Id: I02a0e309d972aba50a4e9a0375ba0994b03c1dac

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

Change-Id: I25b552dd569b6a500379028e2b01e1c419010651

Vulkan AHB - fix incorrect structure definition am: 181b5cd80e
am: c283b22ff1

Change-Id: I7740188a1a6eb8245b0c510ac46a04d45cd40bf8

[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