platform/upstream/VK-GL-CTS.git
6 years agoMerge remote-tracking branch 'aosp/master' into deqp-dev
Chris Forbes [Fri, 24 Aug 2018 16:14:03 +0000 (09:14 -0700)]
Merge remote-tracking branch 'aosp/master' into deqp-dev

Change-Id: Ic7c969b1b52cf6b3fee8e8879508bf13de9a354e

6 years agoMerge remote-tracking branch 'khronos/master' into HEAD
Chris Forbes [Thu, 23 Aug 2018 17:31:30 +0000 (10:31 -0700)]
Merge remote-tracking branch 'khronos/master' into HEAD

Change-Id: I58c439e2cf8859ca9cae5c78b8e065c5a652b1cd

6 years agoUpdate Vulkan CTS mustpass
Alexander Galazin [Thu, 23 Aug 2018 13:51:53 +0000 (15:51 +0200)]
Update Vulkan CTS mustpass

Components: Vulkan

Change-Id: I419768f938469473196797dc0d68f7776a9affb1

6 years agoAdd cases for structs as inout and out parameters.
Kenneth Russell [Mon, 23 Jul 2018 22:26:47 +0000 (15:26 -0700)]
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

6 years agoFix invalid combinations for texture/copy on ES2 driver
James Hauxwell [Fri, 13 Jul 2018 13:52:40 +0000 (14:52 +0100)]
Fix invalid combinations for texture/copy on ES2 driver

The OES_rgb8_rgba8 extension specification only specifies
RenderbufferStorageOES for additional GL_RGB8/GL_RGBA8 tokens.  ES3 spec
made these mandatory formats for texturing/copying.

Affects:

KHR-GLES2.core.internalformat.texture2d.rgb_unsigned_byte_rgb8
KHR-GLES2.core.internalformat.texture2d.rgba_unsigned_byte_rgb8
KHR-GLES2.core.internalformat.copy_tex_image.rgba8
KHR-GLES2.core.internalformat.copy_tex_image.rgb8

Components: OpenGL
VK-GL-CTS issue: 1260

Change-Id: Icbbd8882c5e623f5ac4725eebf977f535cfbfa31

6 years agoTest push descriptors
Ari Suonpaa [Wed, 8 Aug 2018 10:43:45 +0000 (13:43 +0300)]
Test push descriptors

Added uniform and storage buffer push descriptor tests. Tests for other
descriptor types should be added later.

New tests:

dEQP-VK.pipeline.push_descriptor.*

Components: Vulkan

VK-GL-CTS issue: 1187

Change-Id: I6c8a2ae96f23cff3da1cdeed1659da61e3aa347c

6 years agoRefactor: Compatible compute and graphics VerifyIO
Boris Zanin [Wed, 4 Jul 2018 09:02:23 +0000 (11:02 +0200)]
Refactor: Compatible compute and graphics VerifyIO

Refactoring:
 * Compatibilize VerifyIO function declaration
 * Add isCoreFeatureSupported
 * Graphic shader can run over whole area

Affects tests:
 * dEQP-VK.spirv_assembly.*

Components: Vulkan

VK-GL-CTS issue: 1095

Change-Id: Iba9bab9d40a06f1eba90572cc60f1c334c4b8474

6 years agoSplit subgroups tests into test groups
Slawomir Cygan [Thu, 12 Jul 2018 17:00:15 +0000 (19:00 +0200)]
Split subgroups tests into test groups

Subgroup test hierarchy was a bit too flat, with many test variants
added by permutating test case names.

This change splits the test into compute, graphic, framebuffer..
groups.

Components: Vulkan

VK-GL-CTS Issue: 1276

Affects: dEQP-VK.subgroups.*

Change-Id: I2a3c3a4ad8c5a8116d0c58b41d030b36eccc80e5

6 years agoMerge "RESTRICT AUTOMERGE: Backport tests for VK_KHR_draw_indirect_count"
Treehugger Robot [Tue, 21 Aug 2018 01:12:31 +0000 (01:12 +0000)]
Merge "RESTRICT AUTOMERGE: Backport tests for VK_KHR_draw_indirect_count"

6 years agoRESTRICT AUTOMERGE: Backport tests for VK_KHR_draw_indirect_count
Ostrowski, Igor [Fri, 9 Feb 2018 10:56:15 +0000 (11:56 +0100)]
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)

6 years agoFix: rendering complete times not monotonic am: 59b6ba9bb2 am: c23074d57c
Jiayuan Ren [Mon, 20 Aug 2018 21:55:58 +0000 (14:55 -0700)]
Fix: rendering complete times not monotonic am: 59b6ba9bb2 am: c23074d57c
am: 85d1e56494

Change-Id: I163fbb3b0d80663561f5d2fcd67c9b8fa345a358

6 years agoFix: rendering complete times not monotonic am: 59b6ba9bb2
Jiayuan Ren [Mon, 20 Aug 2018 21:52:12 +0000 (14:52 -0700)]
Fix: rendering complete times not monotonic am: 59b6ba9bb2
am: c23074d57c

Change-Id: I68ded1c7963a388629e34ba5c3fa59755c109ac9

6 years agoFix: rendering complete times not monotonic
Jiayuan Ren [Mon, 20 Aug 2018 21:48:05 +0000 (14:48 -0700)]
Fix: rendering complete times not monotonic
am: 59b6ba9bb2

Change-Id: I3a1fc45cf76cb1ca0b5cc0e84fceb7808d68537f

6 years agoMerge "Revert "Revert "Convert external/deqp/android/cts to Android.bp"""
Colin Cross [Mon, 20 Aug 2018 17:21:55 +0000 (17:21 +0000)]
Merge "Revert "Revert "Convert external/deqp/android/cts to Android.bp"""

6 years agoMerge "Merge remote-tracking branch 'khronos/vulkan-cts-1.1.0' into HEAD" into pie...
Chris Forbes [Sat, 18 Aug 2018 00:27:26 +0000 (17:27 -0700)]
Merge "Merge remote-tracking branch 'khronos/vulkan-cts-1.1.0' into HEAD" into pie-cts-dev
am: b6c2ed7121

Change-Id: I95bd47a45fcaef4d89b765e1f29fb3db5e8f210c

6 years agoFix: rendering complete times not monotonic
Jiayuan Ren [Tue, 14 Aug 2018 19:09:01 +0000 (12:09 -0700)]
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.*

6 years agoMerge "Merge remote-tracking branch 'khronos/vulkan-cts-1.1.0' into HEAD" into pie...
Treehugger Robot [Fri, 17 Aug 2018 23:15:48 +0000 (23:15 +0000)]
Merge "Merge remote-tracking branch 'khronos/vulkan-cts-1.1.0' into HEAD" into pie-cts-dev

6 years agoMerge "Update CTS runner after TF interface update"
Julien Desprez [Fri, 17 Aug 2018 17:34:45 +0000 (17:34 +0000)]
Merge "Update CTS runner after TF interface update"

6 years ago[automerger skipped] Merge "RESTRICT AUTOMERGE: Backport tests for VK_KHR_draw_indire...
Ostrowski, Igor [Fri, 17 Aug 2018 01:58:49 +0000 (18:58 -0700)]
[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

6 years ago[automerger skipped] RESTRICT AUTOMERGE: Backport tests for VK_KHR_draw_indirect_count
Ostrowski, Igor [Fri, 17 Aug 2018 00:08:52 +0000 (17:08 -0700)]
[automerger skipped] RESTRICT AUTOMERGE: Backport tests for VK_KHR_draw_indirect_count
am: 43622dc64c  -s ours

Change-Id: Ifad35fa0297f9099e3da124153c8200f168611f0

6 years agoVulkan AHB - fix incorrect structure definition
Tony Zlatinski [Fri, 17 Aug 2018 00:06:12 +0000 (17:06 -0700)]
Vulkan AHB - fix incorrect structure definition
am: 181b5cd80e

Change-Id: Ie3c769146a1dc5862067e5a61a194300a7825168

6 years ago[automerger skipped] Merge "RESTRICT AUTOMERGE: Backport tests for VK_KHR_draw_indire...
Ostrowski, Igor [Fri, 17 Aug 2018 00:04:06 +0000 (17:04 -0700)]
[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

6 years agoMerge remote-tracking branch 'khronos/vulkan-cts-1.1.0' into HEAD
Chris Forbes [Thu, 16 Aug 2018 23:56:16 +0000 (16:56 -0700)]
Merge remote-tracking branch 'khronos/vulkan-cts-1.1.0' into HEAD

Change-Id: I8db2d3d6347c92f0f4fdd0d9db07a812a96243d8
Bug: b/112439889

6 years agoRESTRICT AUTOMERGE: Backport tests for VK_KHR_draw_indirect_count
Ostrowski, Igor [Fri, 9 Feb 2018 10:56:15 +0000 (11:56 +0100)]
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)

6 years agoVulkan AHB - fix incorrect structure definition
Tony Zlatinski [Thu, 16 Aug 2018 13:17:28 +0000 (08:17 -0500)]
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)

6 years agoMerge "RESTRICT AUTOMERGE: Backport tests for VK_KHR_draw_indirect_count" into oreo...
Treehugger Robot [Thu, 16 Aug 2018 18:47:59 +0000 (18:47 +0000)]
Merge "RESTRICT AUTOMERGE: Backport tests for VK_KHR_draw_indirect_count" into oreo-mr1-cts-dev

6 years agoRevert "Revert "Convert external/deqp/android/cts to Android.bp""
Colin Cross [Thu, 16 Aug 2018 18:16:01 +0000 (18:16 +0000)]
Revert "Revert "Convert external/deqp/android/cts to Android.bp""

This reverts commit 10848da9348e610bd6e938836ae846abcf540a3d.

Bug: 112654980
Change-Id: I5c5d5b932eb7df0b710668dadaf788344ca5b1e2

6 years agoMerge "Revert "Convert external/deqp/android/cts to Android.bp""
Treehugger Robot [Wed, 15 Aug 2018 23:48:33 +0000 (23:48 +0000)]
Merge "Revert "Convert external/deqp/android/cts to Android.bp""

6 years agoRevert "Convert external/deqp/android/cts to Android.bp"
Colin Cross [Wed, 15 Aug 2018 21:55:29 +0000 (21:55 +0000)]
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

6 years agoMerge "Fix build for surfaceless target"
Chris Forbes [Wed, 15 Aug 2018 14:49:36 +0000 (14:49 +0000)]
Merge "Fix build for surfaceless target"

6 years agoAvoid spurious failures in create_context when desktop GL 3.x is unsupported.
Eric Anholt [Sat, 21 Jul 2018 00:52:28 +0000 (17:52 -0700)]
Avoid spurious failures in create_context when desktop GL 3.x is unsupported.

On a driver advertising GLES 3.0 and GL 2.1, the test was failing with:

  Creating OpenGL context with config ID 29
      Fail, context: 0x00000000, error: EGL_BAD_MATCH

This was because b60ae978ad04 ("Handle unsupported no_config
contexts") added a requirement for GL 3.x, even though EGL doesn't
require that.

Affects: dEQP-EGL.functional.create_context.*
Components: AOSP
VK-GL-CTS issue: 1283
Change-Id: Id99ad51c1d0dca2c68e42a7bffe282f12a101027

6 years agoMerge "Convert external/deqp/android/cts to Android.bp"
Colin Cross [Wed, 15 Aug 2018 01:51:16 +0000 (01:51 +0000)]
Merge "Convert external/deqp/android/cts to Android.bp"

6 years agoUpdate CTS runner after TF interface update
Julien Desprez [Tue, 14 Aug 2018 23:50:12 +0000 (16:50 -0700)]
Update CTS runner after TF interface update

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

6 years agoFix build for surfaceless target
Chris Forbes [Tue, 14 Aug 2018 23:23:12 +0000 (16:23 -0700)]
Fix build for surfaceless target

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

6 years agoMerge remote-tracking branch 'khronos/vulkan-cts-1.0.2' into HEAD am: d502cf9784
Chris Forbes [Mon, 13 Aug 2018 23:35:16 +0000 (16:35 -0700)]
Merge remote-tracking branch 'khronos/vulkan-cts-1.0.2' into HEAD am: d502cf9784
am: c4a6a1e68a

Change-Id: I2bd6a3d3adf162ae02fceea8dcde436c66cc5c0f

6 years agoRemove dEQP-VK.ubo.random.all_shared_buffer.48 from mustpass
Chris Forbes [Mon, 13 Aug 2018 23:34:34 +0000 (16:34 -0700)]
Remove dEQP-VK.ubo.random.all_shared_buffer.48 from mustpass
am: aa99687ef4

Change-Id: If404960e299db089d05906c49b8529729be25df8

6 years agoMerge remote-tracking branch 'khronos/vulkan-cts-1.0.2' into HEAD
Chris Forbes [Mon, 13 Aug 2018 23:26:24 +0000 (16:26 -0700)]
Merge remote-tracking branch 'khronos/vulkan-cts-1.0.2' into HEAD
am: d502cf9784

Change-Id: I070ab06a20d335f4fdb8286d51c64da2cb61836c

6 years agoMerge remote-tracking branch 'aosp/master' into deqp-dev
Chris Forbes [Mon, 13 Aug 2018 20:15:16 +0000 (13:15 -0700)]
Merge remote-tracking branch 'aosp/master' into deqp-dev

Change-Id: I22f18ebbb60ec1cb841e6084433c406154690f1d

6 years agoRemove dEQP-VK.ubo.random.all_shared_buffer.48 from mustpass
Chris Forbes [Mon, 13 Aug 2018 17:56:45 +0000 (10:56 -0700)]
Remove dEQP-VK.ubo.random.all_shared_buffer.48 from mustpass

Bug: b/112540895
Change-Id: I3813d59ecdf99125d1a1ac76a5f8f1d05085df61

6 years agoConvert external/deqp/android/cts to Android.bp
Colin Cross [Fri, 10 Aug 2018 22:48:08 +0000 (15:48 -0700)]
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

6 years agoRESTRICT AUTOMERGE: Backport tests for VK_KHR_draw_indirect_count
Ostrowski, Igor [Fri, 9 Feb 2018 10:56:15 +0000 (11:56 +0100)]
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)

6 years agox11: Keep the window from stealing input.
Eric Anholt [Thu, 12 Apr 2018 21:59:32 +0000 (14:59 -0700)]
x11: Keep the window from stealing input.

When debugging on an X11 desktop and doing repeated runs, it's
unpleasant to have input focus stolen by a series of transient windows
being created.

Components: Framework
Affects: *
VK-GL-CTS issue: 1282
Change-Id: I7bc8e9587e71ac9ebfab726c3926c432b2f04f01

6 years agoRemove broken/redundant barrier for multiview depth/stencil readback
Chris Forbes [Mon, 18 Jun 2018 20:23:15 +0000 (13:23 -0700)]
Remove broken/redundant barrier for multiview depth/stencil readback

This barrier was set up for color writes, not depth/stencil. It was also
unnecessary, so just remove it.

Change-Id: Ieeec7320f40b273f12f669934298f85702a5985b
Components: Vulkan
VK-GL-CTS: 1288
Affects: dEQP-VK.multiview.*

6 years agoMerge remote-tracking branch 'khronos/vulkan-cts-1.0.2' into HEAD
Chris Forbes [Wed, 8 Aug 2018 19:12:17 +0000 (12:12 -0700)]
Merge remote-tracking branch 'khronos/vulkan-cts-1.0.2' into HEAD

Change-Id: I60f5de1ad1f48484ffbc786f062075be6db85840

6 years agoMerge pie-cts-dev into master.
Xin Li [Wed, 8 Aug 2018 18:43:04 +0000 (11:43 -0700)]
Merge pie-cts-dev into master.

Bug: 112051819
Change-Id: Ide79ad146b80a923cfd00ec1e526b8b389e54b29

6 years agoMerge remote-tracking branch 'khronos/master' into deqp-dev
Chris Forbes [Tue, 7 Aug 2018 15:50:26 +0000 (08:50 -0700)]
Merge remote-tracking branch 'khronos/master' into deqp-dev

Change-Id: I6183377aa1a154927f42bfb0110c32235498bc37

6 years agoMerge vk-gl-cts/vulkan-cts-1.1.2 into vk-gl-cts/master
Alexander Galazin [Tue, 7 Aug 2018 10:56:36 +0000 (12:56 +0200)]
Merge vk-gl-cts/vulkan-cts-1.1.2 into vk-gl-cts/master

Change-Id: Iab57269d692164943d9ff03cc598dd21a8fd3f8e

6 years agoMerge vk-gl-cts/vulkan-cts-1.1.1 into vk-gl-cts/vulkan-cts-1.1.2
Alexander Galazin [Tue, 7 Aug 2018 10:02:46 +0000 (12:02 +0200)]
Merge vk-gl-cts/vulkan-cts-1.1.1 into vk-gl-cts/vulkan-cts-1.1.2

Change-Id: I87551c21c18956e49aaef393a1f700ad72686912

6 years agoMerge vk-gl-cts/vulkan-cts-1.1.0 into vk-gl-cts/vulkan-cts-1.1.1
Alexander Galazin [Tue, 7 Aug 2018 08:57:19 +0000 (10:57 +0200)]
Merge vk-gl-cts/vulkan-cts-1.1.0 into vk-gl-cts/vulkan-cts-1.1.1

Change-Id: I3ebd996d37e078d937fe79ccc93718b51672e1c4

6 years agoRemoved cache info from logged shaderstrings
Jari Komppa [Wed, 1 Aug 2018 12:52:59 +0000 (15:52 +0300)]
Removed cache info from logged shaderstrings

This fix removes the additional information shader cache includes in the
shader string before logging. Logging change only, does not affect tests
themselves.

Affects: none

Components: Vulkan

VK-GL-CTS issue: 1289

Change-Id: I49f8730816ce28584d9601306ec40be052cee341

6 years agoRemove unconditional depth_clamping for 1.1.1
Simen Kaspersen [Wed, 1 Aug 2018 11:12:14 +0000 (13:12 +0200)]
Remove unconditional depth_clamping for 1.1.1

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.

NB: Carries the same changes as 1.1.0 patch for depth_clamping, along with changes that are specific for 1.1.1.

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: I0e322c65561c25339fe56e3122401d92df7623a6

6 years agoRemove unconditional depth_clamping for 1.1.0
Simen Kaspersen [Mon, 30 Jul 2018 14:36:31 +0000 (16:36 +0200)]
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

6 years agoIncorrect pipeline barrier in multiview.multisample.*
Gary Sweet [Wed, 1 Aug 2018 07:43:47 +0000 (08:43 +0100)]
Incorrect pipeline barrier in multiview.multisample.*

The barrier between the render and the cmdResolveImage()
in the multiview tests is currently src=COLOR_ATTACHMENT_OUTPUT,
dst=COLOR_ATTACHMENT_OUTPUT. The explicit resolve that follows
is a transfer operation so the destination stage needs to be
TRANSFER_READ to express the correct dependency.

Affects:

dEQP-VK.multiview.multisample.*

Components: Vulkan

VK-GL-CTS issue : 1291

Change-Id: I362c6f2e9f57b140c078b8d326caf042d472a4b3

6 years agoMerge Android Pie into master
Xin Li [Mon, 6 Aug 2018 23:50:22 +0000 (16:50 -0700)]
Merge Android Pie into master

Bug: 112104996
Change-Id: I573d3264a618044472c238f9b530cfd9f76ba791

6 years agoMerge vk-gl-cts/opengl-cts-4.6.0 into vk-gl-cts/master
Alexander Galazin [Mon, 6 Aug 2018 06:55:27 +0000 (08:55 +0200)]
Merge vk-gl-cts/opengl-cts-4.6.0 into vk-gl-cts/master

Change-Id: I3903536de72b661991919bbd783928792b8f9591

6 years agoMerge vk-gl-cts/opengl-es-cts-3.2.5 into vk-gl-cts/master
Alexander Galazin [Mon, 6 Aug 2018 06:55:25 +0000 (08:55 +0200)]
Merge vk-gl-cts/opengl-es-cts-3.2.5 into vk-gl-cts/master

Change-Id: Icd986e028cf19310c0cded2462640b68d0b6d4e7

6 years agoMerge vk-gl-cts/opengl-es-cts-3.2.4 into vk-gl-cts/opengl-es-cts-3.2.5
Alexander Galazin [Mon, 6 Aug 2018 06:55:21 +0000 (08:55 +0200)]
Merge vk-gl-cts/opengl-es-cts-3.2.4 into vk-gl-cts/opengl-es-cts-3.2.5

Change-Id: I02ed0b86e13f8210020fbfd8baaca74b60a1551f

6 years agoMerge vk-gl-cts/vulkan-cts-1.1.2 into vk-gl-cts/master
Alexander Galazin [Thu, 2 Aug 2018 11:27:35 +0000 (13:27 +0200)]
Merge vk-gl-cts/vulkan-cts-1.1.2 into vk-gl-cts/master

Change-Id: Id793ef1b34ec89095cd6071dda6252ff32d37f36

6 years agoMerge vk-gl-cts/vulkan-cts-1.1.1 into vk-gl-cts/vulkan-cts-1.1.2
Alexander Galazin [Thu, 2 Aug 2018 10:14:08 +0000 (12:14 +0200)]
Merge vk-gl-cts/vulkan-cts-1.1.1 into vk-gl-cts/vulkan-cts-1.1.2

Change-Id: I7d44b39c208f999dcc86793250fecdb69258a165

6 years agoMerge vk-gl-cts/vulkan-cts-1.1.0 into vk-gl-cts/vulkan-cts-1.1.1
Alexander Galazin [Thu, 2 Aug 2018 08:27:48 +0000 (10:27 +0200)]
Merge vk-gl-cts/vulkan-cts-1.1.0 into vk-gl-cts/vulkan-cts-1.1.1

Change-Id: I2b3ff32206b0408c16dd93bc643bdc9bf928dcda

6 years agoMerge vk-gl-cts/vulkan-cts-1.0.2 into vk-gl-cts/vulkan-cts-1.1.0
Alexander Galazin [Thu, 2 Aug 2018 08:27:46 +0000 (10:27 +0200)]
Merge vk-gl-cts/vulkan-cts-1.0.2 into vk-gl-cts/vulkan-cts-1.1.0

Change-Id: I178311e0fa4f5276ab325b65460074f60e42c222

6 years agoDon't used a fragment output in the shader storage buffer object test
Dave Airlie [Mon, 30 Apr 2018 04:51:38 +0000 (05:51 +0100)]
Don't used a fragment output in the shader storage buffer object test

This test doesn't require a fragment shader output, and if we are
on a system which has only 8 combined shader output resources,
this stops the test from executing.

Components: OpenGL
VK-GL-CTS Issue: 985
Affects:
KHR-GL45.shader_storage_buffer_object.advanced-unsizedArrayLength-fs-std430-vec

Change-Id: Ib0883e09d84022c1dac5bc2f22787c0e91efba1c

6 years agoFix build when SPIRV-Tools is not present
Chris Forbes [Thu, 2 Aug 2018 00:16:17 +0000 (17:16 -0700)]
Fix build when SPIRV-Tools is not present

This function does not require SPIRV-Tools, and is still used when it
is not present.

Components: Framework
VK-GL-CTS: 1293

Change-Id: I9ce49db2e6e55e8d379c713c9fe39d15fb7ecbd6

6 years agoInvalidate memory in draw tests
Alexander Galazin [Tue, 3 Oct 2017 19:29:50 +0000 (21:29 +0200)]
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)

6 years agoUpdate CTS version of gl.xml
Tate Hornbeck [Fri, 20 Jul 2018 16:20:50 +0000 (12:20 -0400)]
Update CTS version of gl.xml

Pulls in fix for getGraphicsResetStatusEXT

Components: OpenGL
VK-GL-CTS issue: 1247

Affects:
dEQP-EGL.functional.robustness.create_context.no_reset_notification

Change-Id: I3081d0b6dbfa4436e29cb7b4d52840575f9d40a0

6 years agoMerge remote-tracking branch 'khronos/master' into deqp-dev
Chris Forbes [Fri, 27 Jul 2018 16:33:15 +0000 (09:33 -0700)]
Merge remote-tracking branch 'khronos/master' into deqp-dev

Change-Id: Ie2f5d01b30f9c10b0081b4d784d3c6fcbb72eb63

6 years agoUpdate Vulkan mustpass
Alexander Galazin [Fri, 27 Jul 2018 13:13:54 +0000 (15:13 +0200)]
Update Vulkan mustpass

Components: Vulkan

Change-Id: Idd0cb00dd39c82d5604fde918e742f49fa1e14b9

6 years agoNew tests for pointers as function parameters
Ari Suonpaa [Mon, 4 Jun 2018 06:49:05 +0000 (09:49 +0300)]
New tests for pointers as function parameters

These new tests fill a coverage hole for passing multiple pointers
to functions and using these pointers to modify data. Alias decoration
is used where needed.

New tests:

dEQP-VK.spirv_assembly.instruction.*.pointer_parameter.*

Components: Vulkan

VK-GL-CTS issue: 1174

Change-Id: I5fc6b0f1b1b5a706acd671b9ecc4e928f988d6c3
(cherry picked from commit ecccf1c61e853a3bef40df45eb3f488c7a0493ae)

6 years agoNew tests for pointers as function parameters
Ari Suonpaa [Mon, 4 Jun 2018 06:49:05 +0000 (09:49 +0300)]
New tests for pointers as function parameters

These new tests fill a coverage hole for passing multiple pointers
to functions and using these pointers to modify data. Alias decoration
is used where needed.

New tests:

dEQP-VK.spirv_assembly.instruction.*.pointer_parameter.*

Components: Vulkan

VK-GL-CTS issue: 1174

Change-Id: I5fc6b0f1b1b5a706acd671b9ecc4e928f988d6c3

6 years agoUpdate GLES mustpass
Alexander Galazin [Fri, 27 Jul 2018 10:54:39 +0000 (12:54 +0200)]
Update GLES mustpass

Components: OpenGL

Change-Id: Id6a3d2dd92e70b7b9729bda74f8caaa2b8e91527

6 years agoStart 1.1.3 mustpass
Alexander Galazin [Fri, 27 Jul 2018 09:23:43 +0000 (11:23 +0200)]
Start 1.1.3 mustpass

Components: Vulkan

Change-Id: I0c325c93380dc8553e832728cf6ac95282fbea0d

6 years agoMerge remote-tracking branch 'khronos/master' into deqp-dev
Chris Forbes [Thu, 26 Jul 2018 18:23:01 +0000 (11:23 -0700)]
Merge remote-tracking branch 'khronos/master' into deqp-dev

Change-Id: Ied47a2d2050599c52a9e08843c342f8e14fef50d

6 years agoAdd tests for vkCmdClearColorImage on linear images
Jason Ekstrand [Thu, 12 Jul 2018 19:59:03 +0000 (12:59 -0700)]
Add tests for vkCmdClearColorImage on linear images

New Tests:
dEQP-VK.api.image_clearing.*.clear_color_image.*.linear.*

Renamed Tests:
dEQP-VK.api.image_clearing.*.clear_color_image.*

Components: Vulkan

Change-Id: If0be7b57f7a779fda88b1dd64d15113d115eced2

6 years agoMerge vk-gl-cts/opengl-es-cts-3.2.5 into vk-gl-cts/master
Alexander Galazin [Thu, 26 Jul 2018 14:31:49 +0000 (16:31 +0200)]
Merge vk-gl-cts/opengl-es-cts-3.2.5 into vk-gl-cts/master

Change-Id: I46b6332876af27cea732a67613759229f7028f7a

6 years agoMerge vk-gl-cts/vulkan-cts-1.1.1 into vk-gl-cts/master
Alexander Galazin [Thu, 26 Jul 2018 13:12:27 +0000 (15:12 +0200)]
Merge vk-gl-cts/vulkan-cts-1.1.1 into vk-gl-cts/master

Change-Id: Ifacca1cc17b596f770f07b1e497342f23bc4cf61

6 years agoMerge vk-gl-cts/aosp-deqp-dev into vk-gl-cts/master
Alexander Galazin [Thu, 26 Jul 2018 12:44:32 +0000 (14:44 +0200)]
Merge vk-gl-cts/aosp-deqp-dev into vk-gl-cts/master

Change-Id: I8f337795a44a35d1058412c49c09702b297203ca

6 years agoUpdate transform feedback tests
Yabin Zheng [Tue, 17 Jul 2018 06:41:57 +0000 (14:41 +0800)]
Update transform feedback tests

GLES3.2 spec made a change in 2018/5/14 version, that The
TRANSFORM_FEEDBACK_BUFFER_BINDING generic buffer binding point has now
been moved to context state, rather than per-object state, and should
be unaffected by glBindTransformFeedback command.

Some tests follow the old standard that they use glBindTransformFeedback
function to change the binding point status.

Components: OpenGL

Affects: KHR-GLES31.core.vertex_attrib_binding.advanced-iterations

VK-GL-CTS issue: 1275

Change-Id: I9a0296ef273321ef8b039986b92baf2353838a99

6 years agoMerge vk-gl-cts/github-master into vk-gl-cts/master
Alexander Galazin [Thu, 26 Jul 2018 08:47:38 +0000 (10:47 +0200)]
Merge vk-gl-cts/github-master into vk-gl-cts/master

Change-Id: I4a1a3f2e84c071dc18b3a8247fb0679d6c2d84e3

6 years agoEnsure that SPIR-V Headers are always present
Alexander Galazin [Fri, 20 Jul 2018 10:51:58 +0000 (12:51 +0200)]
Ensure that SPIR-V Headers are always present

Components: Vulkan, OpenGL, Framework

VK-GL-CTS public issue: 108

Change-Id: I6172080e4c025b6ad671ca9c33e08f6fdf8ded6a

6 years agoCall eglSwapBuffers() to ensure wayland surface is attached
Juan A. Suarez Romero [Thu, 7 Jun 2018 10:22:18 +0000 (10:22 +0000)]
Call eglSwapBuffers() to ensure wayland surface is attached

Resize surface tests initially create a window and a surface, ensure
that both has the same size, then perform a window resize, and ensure
that both windows and the surface has the same size.

When using a Wayland target, checking the window size is done calling
wl_egl_window_get_attached_size(). This actually returns the size of the
attached buffer, which is done calling wl_surface_attach().

But wl_surface_attach() is only guaranteed to be done when calling
eglSwapBuffers(); if wl_egl_window_get_attached_size() is invoked
before, it can return 0, as no buffer is attached yet.

To avoid this problem, ensure a buffer is attached before getting the
window size.

Affects:
dEQP-EGL.functional.resize.surface_size.*

Components: OpenGL

VK-GL-CTS issue: 594

Change-Id: I74fb9a10b269ea1e1f7a63457fb0df76f8604547

6 years agoMerge pull request #119 from karolherbst/fix_51
Alexander Galazin [Thu, 26 Jul 2018 07:14:12 +0000 (09:14 +0200)]
Merge pull request #119 from karolherbst/fix_51

Properly handle edge case in GL FP64 tests

6 years agoRequest queue with sparse support only when needed
Alexander Galazin [Fri, 20 Jul 2018 09:12:17 +0000 (11:12 +0200)]
Request queue with sparse support only when needed

Commit a598fe87 added tests for sparse D/S/DS images and
at the same time turned many texture tests into NotSupported
on implementations what do not support sparse.

Components: Vulkan

Affects:
dEQP-VK.texture.compressed.*
dEQP-VK.glsl.texture_functions.texture.sparse*shadow*
dEQP-VK.glsl.texture_gather.*depth32f*sparse*
dEQP-VK.texture.shadow.*sparse*

VK-GL-CTS issue: 1277

Change-Id: I83392d4f1060efbe0b1eebb0dfa8c8d5306113db

6 years agoMerge remote-tracking branch 'khronos/vulkan-cts-1.1.0' into stage-aosp-pi-cts-dev
Chris Forbes [Wed, 25 Jul 2018 21:07:54 +0000 (14:07 -0700)]
Merge remote-tracking branch 'khronos/vulkan-cts-1.1.0' into stage-aosp-pi-cts-dev

Bug: b/111845139
Change-Id: I7cc4f644cfc54904213b959338b80f990f034351

6 years agoBackport post-P AHardwareBuffer changes from Khronos CTS
Chris Forbes [Thu, 19 Jul 2018 23:47:11 +0000 (16:47 -0700)]
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

6 years agoMerge remote-tracking branch 'khronos/master' into deqp-dev
Chris Forbes [Fri, 20 Jul 2018 16:42:17 +0000 (09:42 -0700)]
Merge remote-tracking branch 'khronos/master' into deqp-dev

Change-Id: Id3c4bfc8862ff4d36b40ea9fc91fd5441b0e6ba9

6 years agoDon't fail DisplayPlaneProperties2 with no display
Liam Middlebrook [Mon, 9 Jul 2018 19:27:02 +0000 (12:27 -0700)]
Don't fail DisplayPlaneProperties2 with no display

Instead, we should mark this test as not supported. The Vulkan spec
states that:
    Devices must support at least one plane on each display

If there are no displays connected, the driver is allowed to return 0
planes.

VK-GL-CTS issue: 1271
Components: Vulkan

Change-Id: I097224fbdf3e25c921ac9b96d16954caab1bb895
Affects: dEQP-VK.wsi.display.get_display_plane_properties2

6 years agoAdd tests for max fragment input component limit
Toni Merilehti [Tue, 22 May 2018 07:42:05 +0000 (10:42 +0300)]
Add tests for max fragment input component limit

New tests for fragment shader using input components
near device's maximum advertised limits. Also added
a new file for upcoming shader tests operating at
device's limits.

New tests:

dEQP-VK.glsl.limits.near_max.fragment_input.components_*

Components: Vulkan

VK-GL-CTS Issue 1128

Change-Id: Ib64d2f85016d8d552632d6a7d3f9a69ebe87a5c5

6 years agoAdd AHardwareBuffer external memory test for format/usage flags.
Khushal [Fri, 23 Mar 2018 02:27:50 +0000 (19:27 -0700)]
Add AHardwareBuffer external memory test for format/usage flags.

Added tests:
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: 738

Change-Id: I59726b742aee3a74a98615745bb6da1bfdf46c0b

6 years agoMerge vk-gl-cts/vulkan-cts-1.1.1 into vk-gl-cts/master
Alexander Galazin [Thu, 19 Jul 2018 10:12:05 +0000 (12:12 +0200)]
Merge vk-gl-cts/vulkan-cts-1.1.1 into vk-gl-cts/master

Change-Id: I3795395ebc46986139592bd622500863be77d8fd

6 years agoMerge vk-gl-cts/opengl-es-cts-3.2.5 into vk-gl-cts/master
Alexander Galazin [Thu, 19 Jul 2018 10:11:33 +0000 (12:11 +0200)]
Merge vk-gl-cts/opengl-es-cts-3.2.5 into vk-gl-cts/master

Change-Id: I007b37f5ae9318d15dc1134f7865081aa40cf5de

6 years agoMerge vk-gl-cts/aosp-deqp-dev into vk-gl-cts/master
Alexander Galazin [Thu, 19 Jul 2018 07:00:04 +0000 (09:00 +0200)]
Merge vk-gl-cts/aosp-deqp-dev into vk-gl-cts/master

Change-Id: I393e8dfab66e2b4b1d5ccdb2684a92e6c0581999

6 years agoFix 8bit uniform buffers arrays strides
Arkadiusz Sarwa [Wed, 11 Jul 2018 14:47:23 +0000 (16:47 +0200)]
Fix 8bit uniform buffers arrays strides

Affects:
dEQP-VK.spirv_assembly.instruction.*.8bit_storage.*

Components: Vulkan

VK-GL-CTS issue: 1269

Change-Id: I3f761efbe6a7e5edc66bc6846eaf90ac4453bd78

6 years agoFix dEQP-GLES3.functional.fbo.multiview.*
Fei Yang [Mon, 2 Jul 2018 08:48:40 +0000 (16:48 +0800)]
Fix dEQP-GLES3.functional.fbo.multiview.*

When the width of render target is an odd value, these tests failed.

The reason is these tests set default sample parameters and sample from
a 512x512 surface, where the left/right views have different colors.
When the width of render target is an odd value, the color of central
line is undefined.

As these tests' purpose is mainly want to verify whether the left/right
views have the different color, but not exactly care what the central
line is, a simple solution is just skip the check of central line.

Components: OpenGL

VK-GL-CTS issue: 1256

Affects: dEQP-GLES3.functional.fbo.multiview.*

Change-Id: I62c86dc7269864a3919b11a331178bfc54d65ab0

6 years agoLoosen threshold in Texture3D tests
Yabin Zheng [Tue, 22 May 2018 03:02:27 +0000 (11:02 +0800)]
Loosen threshold in Texture3D tests

The verification function should consider both src and dst formats
when computing allowed error threshold.

Components: OpenGL

Affects:
KHR-GLES2.texture_3d.sub_image.*

VK-GL-CTS issue: 1243

Change-Id: Ie53aed63724aa75a0da697e30e7625a309acf76b

6 years agoSome glCopyTexSubImage3D related tests conflict with GLES3.2 spec
Yabin Zheng [Fri, 22 Jun 2018 01:50:06 +0000 (09:50 +0800)]
Some glCopyTexSubImage3D related tests conflict with GLES3.2 spec

According to the GLES3.2 spec,  An INVALID_OPERATION error is generated if the
component sizes of internalformat do not exactly match the corresponding
component sizes of the source buffer's effective internal format when call the
glCopyTExSubImage3D function.

The test format is GL_RGBA8, while different config ID will result in different
format in the render buffer. The number of channel bits of some format are not
equal to GL_RGBA8. So we should add a new FBO to restrict the test behavior.

Components: OpenGL

Affects: KHR-GLES2.texture_3d.copy_sub_image.*

VK-GL-CTS issue: 1240

Change-Id: I35c066fce990038e95da1e04197d659929fd8e86

6 years agoFix swap_buffers_with_damage.resize* hang on X11
Lujin Wang [Tue, 26 Jun 2018 18:47:39 +0000 (11:47 -0700)]
Fix swap_buffers_with_damage.resize* hang on X11

In SwapBuffersWithDamageTest, the second time setSurfaceSize() was
called, because the size values were the same as the first call, the
test would hang with XNextEvent() in XlibWindow::setDimensions() waiting
for a ConfigureNotify event that Xserver would not deliver in
ConfigureWindow() if size was not changed.

Changing the if conditions causes size values to change for neighboring
setSurfaceSize calls and resolves the hang.

Affects:
dEQP-EGL.functional.swap_buffers_with_damage.resize*

Components: egl

VK-GL-CTS issue: 1238

Change-Id: I78177ffbef4f7f380d850ad43d83317f82401c7b

6 years agoMerge remote-tracking branch 'khronos/master' into deqp-dev
Chris Forbes [Fri, 13 Jul 2018 18:33:07 +0000 (11:33 -0700)]
Merge remote-tracking branch 'khronos/master' into deqp-dev

Change-Id: I40b59c801207ce6fa52450ba83f719a56b153b0f

6 years agoMerge vk-gl-cts/vulkan-cts-1.1.1 into vk-gl-cts/master
Alexander Galazin [Fri, 13 Jul 2018 14:54:16 +0000 (16:54 +0200)]
Merge vk-gl-cts/vulkan-cts-1.1.1 into vk-gl-cts/master

Change-Id: I8e4654033220a53f244768f319fb054026b30509

6 years agoMerge vk-gl-cts/vulkan-cts-1.1.0 into vk-gl-cts/vulkan-cts-1.1.1
Alexander Galazin [Fri, 13 Jul 2018 14:54:12 +0000 (16:54 +0200)]
Merge vk-gl-cts/vulkan-cts-1.1.0 into vk-gl-cts/vulkan-cts-1.1.1

Change-Id: I92ddc3da6a7d67e926eb54beeaf1c190fcf7e87a

6 years agoMerge vk-gl-cts/opengl-cts-4.6.0 into vk-gl-cts/master
Alexander Galazin [Fri, 13 Jul 2018 13:18:16 +0000 (15:18 +0200)]
Merge vk-gl-cts/opengl-cts-4.6.0 into vk-gl-cts/master

Change-Id: I1e3e296b56699e97e9d536332fd6c4405b6f8cf2