platform/upstream/VK-GL-CTS.git
4 years agoMerge "Merge vk-gl-cts/opengl-es-cts-3.2.6 into vk-gl-cts/master"
Alexander Galazin [Thu, 23 Jan 2020 16:37:20 +0000 (11:37 -0500)]
Merge "Merge vk-gl-cts/opengl-es-cts-3.2.6 into vk-gl-cts/master"

4 years agodEQP-VK.graphicsfuzz.uv-value-comparison-as-boolean
Venni Ihanakangas [Tue, 19 Nov 2019 07:40:52 +0000 (09:40 +0200)]
dEQP-VK.graphicsfuzz.uv-value-comparison-as-boolean

Components: Vulkan

New Tests:

dEQP-VK.graphicsfuzz.uv-value-comparison-as-boolean

Change-Id: Id36f1477d728cdab7f19eb7477baef8ec78c06b1

4 years agodEQP-VK.graphicsfuzz.injection-switch-as-comparison
Venni Ihanakangas [Mon, 16 Dec 2019 12:16:09 +0000 (14:16 +0200)]
dEQP-VK.graphicsfuzz.injection-switch-as-comparison

Components: Vulkan

New Tests:

dEQP-VK.graphicsfuzz.injection-switch-as-comparison

Change-Id: I28735bed4508d04c9f88397e4b028e5b4e5bad27

4 years agoMerge vk-gl-cts/opengl-es-cts-3.2.6 into vk-gl-cts/master
Alexander Galazin [Thu, 23 Jan 2020 11:06:38 +0000 (12:06 +0100)]
Merge vk-gl-cts/opengl-es-cts-3.2.6 into vk-gl-cts/master

Change-Id: I6c93bbf972e69bc0a3f33a8b70da986085a5104f

4 years agoMerge vk-gl-cts/opengl-es-cts-3.2.5 into vk-gl-cts/opengl-es-cts-3.2.6
Alexander Galazin [Thu, 23 Jan 2020 08:41:23 +0000 (09:41 +0100)]
Merge vk-gl-cts/opengl-es-cts-3.2.5 into vk-gl-cts/opengl-es-cts-3.2.6

Change-Id: I0eff6803c285cd39b3f6eab0343522f48c1701cf

4 years agodEQP-VK.graphicsfuzz.cov-dead-code-unreachable-merge
Ari Suonpaa [Fri, 20 Dec 2019 13:09:47 +0000 (15:09 +0200)]
dEQP-VK.graphicsfuzz.cov-dead-code-unreachable-merge

New Tests:

dEQP-VK.graphicsfuzz.cov-dead-code-unreachable-merge

Components: Vulkan
Change-Id: If288a53195dc3cc7463260056a33286ff9610f8a

4 years agoAdd tests recording multisubpass renderpass instances
Samuel Iglesias Gonsálvez [Fri, 13 Dec 2019 07:10:18 +0000 (08:10 +0100)]
Add tests recording multisubpass renderpass instances

As an implementation could store the current subpass index in the wrong
place, there could be issues when recording multi-subpass renderpass
instances into multiple command buffers simultaneously.

Components: Vulkan
VK-GL-CTS issue: 1942

Added tests:

   dEQP-VK.renderpass*.multiple_subpasses_multiple_command_buffers.test

Change-Id: I475ab8993486d1c58a20aed036e568b6f602bc01

4 years agodEQP-VK.graphicsfuzz.cov-fold-bitwise-and-zero
Ari Suonpaa [Wed, 15 Jan 2020 06:15:08 +0000 (08:15 +0200)]
dEQP-VK.graphicsfuzz.cov-fold-bitwise-and-zero

New Tests:

dEQP-VK.graphicsfuzz.cov-fold-bitwise-and-zero

Components: Vulkan
Change-Id: I13bd8b897db2338590de9253e84722dcdb302e06

4 years agodEQP-VK.graphicsfuzz.nested-for-break-mat-color
Paul Thomson [Wed, 15 Jan 2020 14:09:20 +0000 (14:09 +0000)]
dEQP-VK.graphicsfuzz.nested-for-break-mat-color

Components: Vulkan

New Tests:

dEQP-VK.graphicsfuzz.nested-for-break-mat-color

Change-Id: I369ec647b0730cbf8863fb6bb597793734ced087

4 years agodEQP-VK.graphicsfuzz.global-array-loops
Paul Thomson [Wed, 15 Jan 2020 16:03:36 +0000 (16:03 +0000)]
dEQP-VK.graphicsfuzz.global-array-loops

Components: Vulkan

New Tests:

dEQP-VK.graphicsfuzz.global-array-loops

Change-Id: Icd9b68e77695f2ae01a085897fcd15225e90b0e7

4 years agoTest creation of overly large buffers
Piotr Byszewski [Thu, 5 Dec 2019 15:02:40 +0000 (16:02 +0100)]
Test creation of overly large buffers

Components: Vulkan

VK-GL-CTS issue: 2121

Affects:
dEQP-VK.api.buffer.basic.size_max_uint64

Change-Id: I19fe99b64e60fd4e3c5488da3a7c3acf25dbb080

4 years agoOpenGL ES: Use shader storage alignment
Courtney Goeltzenleuchter [Tue, 17 Dec 2019 14:40:46 +0000 (07:40 -0700)]
OpenGL ES: Use shader storage alignment

Affected Test:
  KHR-GLES31.core.shader_storage_buffer_object.advanced-switchBuffers-vs

Components: OpenGL ES
VK-GL-CTS issue: 2151

Change-Id: If427cad30ac36cc96a29f936e2ef7a0c4a301667

4 years agoMigrate deRoundUp32 to deInt32.h
Courtney Goeltzenleuchter [Fri, 20 Dec 2019 20:29:38 +0000 (13:29 -0700)]
Migrate deRoundUp32 to deInt32.h

deRoundUp32 is used in a number of places, promote to utility function.

Components: OpenGL ES
VK-GL-CTS issue: 2151

Change-Id: I26a648f3c228564c6d269e211a9cb7115b7fcbbe

4 years agoInitialize gl_PointSize if the test draws points
Amy Liu [Tue, 14 Jan 2020 08:34:30 +0000 (16:34 +0800)]
Initialize gl_PointSize if the test draws points

From GLSL specification: "If gl_PointSize is not written to,
its value is undefined in subsequent pipe stages"

Affects:

dEQP-GLES3.functional.primitive_restart.basic.points.*
dEQP-GLES3.functional.fragment_ops.scissor.partial_points

Components: AOSP

VK-GL-CTS issue: 2161

Change-Id: I3016287f7e55331522d6a7a8d562d8b57ab27e43

4 years agoFix image checking for sparse image binding tests
Pawel Ksiezopolski [Thu, 14 Nov 2019 13:56:21 +0000 (14:56 +0100)]
Fix image checking for sparse image binding tests

vkGetPhysicalDeviceSparseImageFormatProperties() function
should only be used for SPARSE_RESIDENCY images.
Removed function call for SPARSE_BINDING tests.

Affects:
dEQP-VK.sparse_resources.image_sparse_binding.*

Components: Vulkan

VK-GL-CTS issue: 2093

Change-Id: I280768df12e99b16060eb9220157e792d1ede65e

4 years agoMerge vk-gl-cts/github-master into vk-gl-cts/master
Alexander Galazin [Sun, 19 Jan 2020 10:52:16 +0000 (11:52 +0100)]
Merge vk-gl-cts/github-master into vk-gl-cts/master

Change-Id: I2256e323016cbd539deb79d0bc6d208da1698aaf

4 years agoMerge pull request #173 from krOoze/acquire_test
Alexander Galazin [Sun, 19 Jan 2020 10:36:03 +0000 (11:36 +0100)]
Merge pull request #173 from krOoze/acquire_test

Add tests of VkSwapchain acquiring too many images

4 years agoMerge vk-gl-cts/vulkan-cts-next-dev into vk-gl-cts/master
Alexander Galazin [Fri, 17 Jan 2020 09:07:59 +0000 (10:07 +0100)]
Merge vk-gl-cts/vulkan-cts-next-dev into vk-gl-cts/master

Change-Id: I0b8416a57af7db43786475fe1f6e846eb100457c

4 years agoMerge vk-gl-cts/vulkan-cts-1.2.1 into vk-gl-cts/master
Alexander Galazin [Thu, 16 Jan 2020 17:51:40 +0000 (18:51 +0100)]
Merge vk-gl-cts/vulkan-cts-1.2.1 into vk-gl-cts/master

Change-Id: I05f8e0d8240f265b9e150f37e580850e7a259a08

4 years agoMerge vk-gl-cts/vulkan-cts-1.1.6 into vk-gl-cts/master
Alexander Galazin [Thu, 16 Jan 2020 14:24:27 +0000 (15:24 +0100)]
Merge vk-gl-cts/vulkan-cts-1.1.6 into vk-gl-cts/master

Change-Id: I84a900086c6b01e5dda04b34aaf1b946cad1750d

4 years agoMerge vk-gl-cts/vulkan-cts-1.2.1 into vk-gl-cts/vulkan-cts-next-dev
Alexander Galazin [Thu, 16 Jan 2020 13:57:08 +0000 (14:57 +0100)]
Merge vk-gl-cts/vulkan-cts-1.2.1 into vk-gl-cts/vulkan-cts-next-dev

Change-Id: Ieecd67926b70899b5a7ecb8685e51a2597e0d889

4 years agoReport Windows EOLs as a failure under Windows
Boris Zanin [Tue, 7 Jan 2020 14:59:35 +0000 (15:59 +0100)]
Report Windows EOLs as a failure under Windows

Make Python 3 to validate line endings under Windows.
We should specify additional parameter to make Python
to keep line endings for the script to analyze.

Components: vulkan

VK-GL-CTS issue: 1665

Change-Id: Ifde3ffb95009d7e0e7c09edced1bf7ef3779db74

4 years agoRun SPIR-V builtin precision tests on 64-bit floats
Ricardo Garcia [Fri, 9 Aug 2019 12:20:51 +0000 (14:20 +0200)]
Run SPIR-V builtin precision tests on 64-bit floats

This commit makes SPIR-V builtin instruction precision tests run on
64-bit floating point values.

It also fixes a few bugs and makes some small changes, hence marking all
precision tests as affected.

New tests:
dEQP-VK.glsl.builtin.precision_double.*

Affected tests:
dEQP-VK.glsl.builtin.precision*

Components: Framework, Vulkan
VK-GL-CTS issue: 1917

Change-Id: I57338af22076322726c7c907ba85e561af7b3e05

4 years agoTest SpecConstantOp/CompositeInsert in arrays and structs
Ricardo Garcia [Wed, 11 Dec 2019 16:34:50 +0000 (17:34 +0100)]
Test SpecConstantOp/CompositeInsert in arrays and structs

This commit modifies the SpecConstantOp test with CompositeInsert in
vectors so it also uses CompositeInsert with arrays and structs, a
combination that was not being tested, and makes test results also
depend on correct execution of the new instructions.

Affected tests:
dEQP-VK.spirv_assembly.instruction.*.opspecconstantop.vector_related*

Components: Vulkan
VK-GL-CTS issue: 2147

Change-Id: I77a29c8b1e4443d3bd4f251ae04c77f451c3405f

4 years agoUpdate SPIR-V Tools
Alexander Galazin [Wed, 15 Jan 2020 16:31:47 +0000 (17:31 +0100)]
Update SPIR-V Tools

Components: Framework

Change-Id: I587a0a0703ee15d308566102ad31d3cc3d3b5edb

4 years agoAdd tests of VkSwapchain acquiring too many images
Petr Kraus [Wed, 13 Nov 2019 23:01:44 +0000 (00:01 +0100)]
Add tests of VkSwapchain acquiring too many images

4 years agoMerge vk-gl-cts/vulkan-cts-1.2.1 into vk-gl-cts/vulkan-cts-next-dev
Alexander Galazin [Wed, 15 Jan 2020 11:49:50 +0000 (12:49 +0100)]
Merge vk-gl-cts/vulkan-cts-1.2.1 into vk-gl-cts/vulkan-cts-next-dev

Change-Id: I6f126fba1d44cfaa9b91d67555f8b37acc57637d

4 years agoMerge vk-gl-cts/vulkan-cts-1.1.6 into vk-gl-cts/vulkan-cts-1.2.1
Alexander Galazin [Wed, 15 Jan 2020 10:41:26 +0000 (11:41 +0100)]
Merge vk-gl-cts/vulkan-cts-1.1.6 into vk-gl-cts/vulkan-cts-1.2.1

Change-Id: Id02e3ec3375ebdb8642e28b334ef3a42158c904a

4 years agoAdd memory barrier to fragment shader interlock tests.
Szymon Szczyrbak [Tue, 14 Jan 2020 12:40:51 +0000 (13:40 +0100)]
Add memory barrier to fragment shader interlock tests.

Image or buffer written by GPU are copied to host-visible buffer used to
verify test's results.
Added a TRANSFER_WRITE/HOST_READ pipeline barrier to make sure that the data
accessed by host is up-to-date.

Component: Vulkan

Affects: dEQP-VK.fragment_shader_interlock.basic.*

VK-GL-CTS Issue: 2165

Change-Id: I6d458b2e650a3813e62948d670b8a53e864aed37

4 years agoModify test line position in LinesTestInstance::generateLines()
Juan A. Suarez Romero [Wed, 8 Jan 2020 11:58:40 +0000 (11:58 +0000)]
Modify test line position in LinesTestInstance::generateLines()

This slightly change a test line position in order to fix
dEQP-VK.rasterization.primitives.no_stipple.smooth_lines_wide, to avoid
a false failure according to comments in CL#5152.

Affects: dEQP-VK.rasterization.primitives.*

Components: Vulkan

Change-Id: Ie8bde1d1d32f76939ce4a4ba21aaec4c471edd63

4 years agoMerge vk-gl-cts/master into vk-gl-cts/vulkan-cts-next-dev
Alexander Galazin [Tue, 14 Jan 2020 09:05:34 +0000 (10:05 +0100)]
Merge vk-gl-cts/master into vk-gl-cts/vulkan-cts-next-dev

Change-Id: I6786178171047f7bb790e4bb3f97539f1c9f314a

4 years agoMerge vk-gl-cts/vulkan-cts-1.2.1 into vk-gl-cts/vulkan-cts-next-dev
Alexander Galazin [Tue, 14 Jan 2020 07:51:12 +0000 (08:51 +0100)]
Merge vk-gl-cts/vulkan-cts-1.2.1 into vk-gl-cts/vulkan-cts-next-dev

Change-Id: I91079781c52f5bbb325ce987f9bd7aeea450f388

4 years agoMerge vk-gl-cts/vulkan-cts-1.1.6 into vk-gl-cts/vulkan-cts-1.2.1
Alexander Galazin [Tue, 14 Jan 2020 06:50:35 +0000 (07:50 +0100)]
Merge vk-gl-cts/vulkan-cts-1.1.6 into vk-gl-cts/vulkan-cts-1.2.1

Change-Id: I968d4cdd3c04321a4ff2544597203c77589a4d45

4 years agoMerge vk-gl-cts/vulkan-cts-1.2.1 into vk-gl-cts/vulkan-cts-next-dev
Alexander Galazin [Mon, 13 Jan 2020 19:51:00 +0000 (20:51 +0100)]
Merge vk-gl-cts/vulkan-cts-1.2.1 into vk-gl-cts/vulkan-cts-next-dev

Change-Id: I04f9f2bf7d4c1f75bd19279465d7e192cb50ca72

4 years agoMerge vk-gl-cts/vulkan-cts-1.1.6 into vk-gl-cts/master
Alexander Galazin [Mon, 13 Jan 2020 17:28:05 +0000 (18:28 +0100)]
Merge vk-gl-cts/vulkan-cts-1.1.6 into vk-gl-cts/master

Change-Id: I0997c33ed5207880e09439a2fdd7a77d1f902bc5

4 years agoMerge vk-gl-cts/vulkan-cts-1.2.0 into vk-gl-cts/vulkan-cts-1.2.1
Alexander Galazin [Mon, 13 Jan 2020 17:26:53 +0000 (18:26 +0100)]
Merge vk-gl-cts/vulkan-cts-1.2.0 into vk-gl-cts/vulkan-cts-1.2.1

Change-Id: I543ba324319cd3d227400be69d1d02bc323e6c0e

4 years agoMerge vk-gl-cts/vulkan-cts-1.1.5 into vk-gl-cts/vulkan-cts-1.1.6
Alexander Galazin [Mon, 13 Jan 2020 14:34:33 +0000 (15:34 +0100)]
Merge vk-gl-cts/vulkan-cts-1.1.5 into vk-gl-cts/vulkan-cts-1.1.6

Change-Id: I654934956a489ddcdec47ac8fc3e2fe638929950

4 years agoMerge vk-gl-cts/vulkan-cts-1.1.5 into vk-gl-cts/vulkan-cts-1.2.0
Alexander Galazin [Mon, 13 Jan 2020 14:33:52 +0000 (15:33 +0100)]
Merge vk-gl-cts/vulkan-cts-1.1.5 into vk-gl-cts/vulkan-cts-1.2.0

Change-Id: Ifc85777682563e4ec769d2b32dbb4b3584a649a5

4 years agoAllow tests to pass with a ES3+ context.
Emmanuel Tanguy [Mon, 7 Oct 2019 12:49:25 +0000 (13:49 +0100)]
Allow tests to pass with a ES3+ context.

Setting gl_MaxDrawBuffers ref value to GL_MAX_DRAW_BUFFERS for ES3 context.

Reduce code duplication where the same check exists in other tests.

Components: OpenGL ES

VK-GL-CTS issue: 2011

Affected tests:
dEQP-GLES2.functional.shaders.builtin_variable.max_draw_buffers_vertex
dEQP-GLES2.functional.shaders.builtin_variable.max_draw_buffers_fragment
dEQP-GLES2.functional.negative_api.buffer.framebuffer_texture2d
dEQP-GLES2.functional.texture.mipmap.cube.*

Change-Id: I6c5e522940256c98b54e5533f29fdafeac60a256
(cherry picked from commit 96d4f7bafa35a9567eef5c4d7658a316837b8a0b)

4 years agoMerge vk-gl-cts/vulkan-cts-1.1.4 into vk-gl-cts/vulkan-cts-1.1.5
Alexander Galazin [Mon, 13 Jan 2020 12:10:10 +0000 (13:10 +0100)]
Merge vk-gl-cts/vulkan-cts-1.1.4 into vk-gl-cts/vulkan-cts-1.1.5

Change-Id: I420bc4aa41a2f7a67434b4f674c3d3aa161dc6c3

4 years agoMerge vk-gl-cts/vulkan-cts-1.1.3 into vk-gl-cts/vulkan-cts-1.1.4
Alexander Galazin [Mon, 13 Jan 2020 10:54:20 +0000 (11:54 +0100)]
Merge vk-gl-cts/vulkan-cts-1.1.3 into vk-gl-cts/vulkan-cts-1.1.4

Change-Id: Id9ed312f96fa266a0e3809211b14566ece03e791

4 years agoMerge vk-gl-cts/vulkan-cts-1.1.2 into vk-gl-cts/vulkan-cts-1.1.3
Alexander Galazin [Mon, 13 Jan 2020 09:45:56 +0000 (10:45 +0100)]
Merge vk-gl-cts/vulkan-cts-1.1.2 into vk-gl-cts/vulkan-cts-1.1.3

Change-Id: I37d5b18d5980372057827bc4435239be98fd30bc

4 years agoFix SPIR-V assembly tests with bad cfgs
Alan Baker [Mon, 25 Nov 2019 18:03:36 +0000 (13:03 -0500)]
Fix SPIR-V assembly tests with bad cfgs

* Update SPIR-V assembly tests to not declare a continue target as a
merge block

Component: Vulkan

VK-GL-CTS Issue: 2122

Affects:
dEQP-VK.spirv_assembly.instruction.graphics.switch_block_order.out_of_order*
dEQP-VK.spirv_assembly.instruction.graphics.opphi.out_of_order*
dEQP-VK.spirv_assembly.instruction.graphics.loop.multi_block_loop_construct*
dEQP-VK.spirv_assembly.instruction.graphics.loop.multi_block_continue_construct*
dEQP-VK.spirv_assembly.instruction.graphics.loop.continue*
dEQP-VK.spirv_assembly.instruction.graphics.loop.break*
dEQP-VK.spirv_assembly.instruction.graphics.loop.return*

Change-Id: I370331414aae27b53ed79b448b72581e2352c3d7

4 years agoMerge vk-gl-cts/master into vk-gl-cts/vulkan-cts-next-dev
Alexander Galazin [Sun, 5 Jan 2020 11:50:56 +0000 (14:50 +0300)]
Merge vk-gl-cts/master into vk-gl-cts/vulkan-cts-next-dev

Change-Id: I848936309a3dff9b27ccee2fc1eddc785d87ef6c

4 years agoMerge vk-gl-cts/vulkan-cts-1.2.1 into vk-gl-cts/vulkan-cts-next-dev
Alexander Galazin [Sun, 5 Jan 2020 11:17:10 +0000 (14:17 +0300)]
Merge vk-gl-cts/vulkan-cts-1.2.1 into vk-gl-cts/vulkan-cts-next-dev

Change-Id: I5ef4fab8334c908c996573a0fec9ec80f33f0788

4 years agoExtend multiview/occlusion queries tests
Piotr Byszewski [Tue, 10 Dec 2019 16:47:57 +0000 (17:47 +0100)]
Extend multiview/occlusion queries tests

Adds tests for multiview interaction with non-precise occlusion
queries.

Components: Vulkan

VK-GL-CTS issue: 1943

Affects:
dEQP-VK.multiview.queries.*
dEQP-VK.multiview.non_precise_queries.*
dEQP-VK.multiview.renderpass2.queries.*
dEQP-VK.multiview.renderpass2.non_precise_queries.*

Change-Id: Iff69f640fd62a949cba9660c20838167e8ce5bfb

4 years agodEQP-VK.graphicsfuzz.switch-case-with-undefined-expression
Venni Ihanakangas [Mon, 16 Dec 2019 11:01:31 +0000 (13:01 +0200)]
dEQP-VK.graphicsfuzz.switch-case-with-undefined-expression

Components: Vulkan

New Tests:

dEQP-VK.graphicsfuzz.switch-case-with-undefined-expression

Change-Id: Ifc03b32c6e77ea067af4117397b54f19670dcdcd

4 years agodEQP-VK.graphicsfuzz.return-inside-loop-in-function
Venni Ihanakangas [Mon, 16 Dec 2019 11:23:51 +0000 (13:23 +0200)]
dEQP-VK.graphicsfuzz.return-inside-loop-in-function

Components: Vulkan

New Tests:

dEQP-VK.graphicsfuzz.return-inside-loop-in-function

Change-Id: Iecac2b9b639402b1bdfae3f23de5472271f55e5a

4 years agoMerge vk-gl-cts/vulkan-cts-1.1.6 into vk-gl-cts/vulkan-cts-1.2.1
Alexander Galazin [Sun, 5 Jan 2020 10:06:15 +0000 (13:06 +0300)]
Merge vk-gl-cts/vulkan-cts-1.1.6 into vk-gl-cts/vulkan-cts-1.2.1

Change-Id: If9768a5f553036d5fc3e5fc52051368a37481f08

4 years agoMerge vk-gl-cts/vulkan-cts-1.1.6 into vk-gl-cts/master
Alexander Galazin [Sun, 5 Jan 2020 10:04:42 +0000 (13:04 +0300)]
Merge vk-gl-cts/vulkan-cts-1.1.6 into vk-gl-cts/master

Change-Id: Ic25e82563986f46ea4a8b9356d0579f299740420

4 years agoMerge vk-gl-cts/vulkan-cts-1.2.0 into vk-gl-cts/vulkan-cts-1.2.1
Alexander Galazin [Sun, 5 Jan 2020 09:19:26 +0000 (12:19 +0300)]
Merge vk-gl-cts/vulkan-cts-1.2.0 into vk-gl-cts/vulkan-cts-1.2.1

Change-Id: I287aadcb16a73697d29d1d13f8de019c0508defd

4 years agoMerge vk-gl-cts/vulkan-cts-1.1.5 into vk-gl-cts/vulkan-cts-1.1.6
Alexander Galazin [Sun, 5 Jan 2020 08:33:44 +0000 (11:33 +0300)]
Merge vk-gl-cts/vulkan-cts-1.1.5 into vk-gl-cts/vulkan-cts-1.1.6

Change-Id: Id7608050ab3f1c5ce3d26a1480af0de7d90d75ff

4 years agoMerge vk-gl-cts/vulkan-cts-1.1.5 into vk-gl-cts/vulkan-cts-1.2.0
Alexander Galazin [Sun, 5 Jan 2020 08:33:03 +0000 (11:33 +0300)]
Merge vk-gl-cts/vulkan-cts-1.1.5 into vk-gl-cts/vulkan-cts-1.2.0

Change-Id: I5ebdf2135fdd096d8d35da3ba7d489270f30eba5

4 years agoMerge vk-gl-cts/vulkan-cts-1.1.4 into vk-gl-cts/vulkan-cts-1.1.5
Alexander Galazin [Sun, 5 Jan 2020 07:48:47 +0000 (10:48 +0300)]
Merge vk-gl-cts/vulkan-cts-1.1.4 into vk-gl-cts/vulkan-cts-1.1.5

Change-Id: I51213fc50189215a04c9206a8b805962052235cb

4 years agoMerge vk-gl-cts/vulkan-cts-1.1.3 into vk-gl-cts/vulkan-cts-1.1.4
Alexander Galazin [Sun, 5 Jan 2020 06:36:56 +0000 (09:36 +0300)]
Merge vk-gl-cts/vulkan-cts-1.1.3 into vk-gl-cts/vulkan-cts-1.1.4

Change-Id: I2a051b8a36b997c3f904ddd78657de8c1719a53b

4 years agoAllows NaNs in an assert
Matthew Netsch [Fri, 20 Dec 2019 20:46:11 +0000 (15:46 -0500)]
Allows NaNs in an assert

Components: Vulkan
VK-GL-CTS Issue: 2103

Affects:
dEQP-VK.spirv_assembly.instruction.compute.float16.arithmetic_*

Change-Id: I5848660d120b5a4a07df589a74f47b8ca30befb5

4 years agoAdds subgroup ops stage check
Matthew Netsch [Fri, 20 Dec 2019 20:43:04 +0000 (15:43 -0500)]
Adds subgroup ops stage check

Components: Vulkan
VK-GL-CTS Issue: 2084

Affects:
dEQP-VK.memory_model.message_passing.*.subgroup.*
dEQP-VK.memory_model.write_after_read.ext.*.subgroup.*

Change-Id: Ibb820b4d3de1782bc844f3eb32b6e752745e9976

4 years agoFix some bugs for EGL cases
Jian Li [Mon, 9 Dec 2019 05:24:05 +0000 (13:24 +0800)]
Fix some bugs for EGL cases

eglTerminate() wasn't called in proper sequence.
Resource wasn't released properly for not supported cases.

Affects:

dEQP-EGL.functional.image.*
dEQP-EGL.functional.resize.*
dEQP-EGL.functional.buffer_age.*
dEQP-EGL.functional.partial_update.*

Components: AOSP

VK-GL-CTS issue: 2153

Change-Id: Ic0a82aa176b9a8344f757916d61ea8f64c58eca5

4 years agoUse VK_FORMAT_R32G32_UINT in unused attachment sparse filling tests
Chris Forbes [Thu, 19 Dec 2019 22:09:31 +0000 (14:09 -0800)]
Use VK_FORMAT_R32G32_UINT in unused attachment sparse filling tests

VK_FORMAT_R16G16_UINT is not guaranteed to be supported as a storage
image. Use something that is.

VK-GL-CTS Issue: 2155
Components: Vulkan
Affects: dEQP-VK.renderpass.suballocation.attachment_sparse_filling.*

Change-Id: I9a116f824aa8ca00c2bf174b8786c8f9ae2cdafa

4 years agoMerge vk-gl-cts/master into vk-gl-cts/vulkan-cts-next-dev
Alexander Galazin [Mon, 23 Dec 2019 08:29:55 +0000 (09:29 +0100)]
Merge vk-gl-cts/master into vk-gl-cts/vulkan-cts-next-dev

Change-Id: Ia77aacd61e797a2d68f03ae19aaee4f3a4568bcd

4 years agoMerge vk-gl-cts/vulkan-cts-1.2.1 into vk-gl-cts/vulkan-cts-next-dev
Alexander Galazin [Sat, 21 Dec 2019 14:11:11 +0000 (15:11 +0100)]
Merge vk-gl-cts/vulkan-cts-1.2.1 into vk-gl-cts/vulkan-cts-next-dev

Change-Id: If270234dc06580cfeeed71c07920829576431fed

4 years agoMerge vk-gl-cts/vulkan-cts-1.1.6 into vk-gl-cts/master
Alexander Galazin [Sat, 21 Dec 2019 11:24:10 +0000 (12:24 +0100)]
Merge vk-gl-cts/vulkan-cts-1.1.6 into vk-gl-cts/master

Change-Id: I30fda495247058cbc41eff78d875a633748f28ff

4 years agoMerge vk-gl-cts/vulkan-cts-1.1.6 into vk-gl-cts/vulkan-cts-1.2.1
Alexander Galazin [Sat, 21 Dec 2019 11:23:06 +0000 (12:23 +0100)]
Merge vk-gl-cts/vulkan-cts-1.1.6 into vk-gl-cts/vulkan-cts-1.2.1

Change-Id: I4b8288ca5eab177cd2a6c2684a78a6cf8786b739

4 years agoRe-enable tests
Alexander Galazin [Sat, 21 Dec 2019 09:50:50 +0000 (10:50 +0100)]
Re-enable tests

Change-Id: Ic4d90d99b69ef931ba2f3f49538201762eb6746e

4 years agoMerge vk-gl-cts/vulkan-cts-1.2.1 into vk-gl-cts/vulkan-cts-next-dev
Alexander Galazin [Sat, 21 Dec 2019 09:34:14 +0000 (10:34 +0100)]
Merge vk-gl-cts/vulkan-cts-1.2.1 into vk-gl-cts/vulkan-cts-next-dev

Change-Id: I68bfd98e153ba71f563004668c1cf56aa429b57d

4 years agoUpdate SPIR-V Tools
Alexander Galazin [Wed, 18 Dec 2019 18:56:23 +0000 (19:56 +0100)]
Update SPIR-V Tools

Components: Framework

Change-Id: Ifef943741a8d8532f5c289e8121d6c503a0a537d

4 years agoMerge vk-gl-cts/vulkan-cts-1.2.0 into vk-gl-cts/vulkan-cts-next-dev
Alexander Galazin [Fri, 20 Dec 2019 20:56:09 +0000 (21:56 +0100)]
Merge vk-gl-cts/vulkan-cts-1.2.0 into vk-gl-cts/vulkan-cts-next-dev

Change-Id: I8c1f03c690605b73d41577eb715fc439c30e19e9

4 years agoMerge vk-gl-cts/vulkan-cts-1.1.6 into vk-gl-cts/vulkan-cts-1.2.1
Alexander Galazin [Fri, 20 Dec 2019 20:55:23 +0000 (21:55 +0100)]
Merge vk-gl-cts/vulkan-cts-1.1.6 into vk-gl-cts/vulkan-cts-1.2.1

Change-Id: I54ba10b36ec4fabe9d4c9d6ff66857c8e2bbef62

4 years agoAccount for VS executing more than once when atomics are used.
Matthew Netsch [Fri, 4 Oct 2019 15:46:04 +0000 (11:46 -0400)]
Account for VS executing more than once when atomics are used.

Components: Vulkan

Affects: dEQP-VK.glsl.opaque_type_indexing.atomic_counter.*
         dEQP-VK.glsl.atomic_operations.*

Change-Id: I15eabf9b47af204fd13370efdc323af141b6b11b

4 years agoMerge vk-gl-cts/vulkan-cts-1.2.0 into vk-gl-cts/vulkan-cts-1.2.1
Alexander Galazin [Fri, 20 Dec 2019 15:20:52 +0000 (16:20 +0100)]
Merge vk-gl-cts/vulkan-cts-1.2.0 into vk-gl-cts/vulkan-cts-1.2.1

Change-Id: I5e885ca6903eb166df83a1387c5592559e7df469

4 years agoMerge vk-gl-cts/vulkan-cts-1.1.6 into vk-gl-cts/master
Alexander Galazin [Fri, 20 Dec 2019 14:59:20 +0000 (15:59 +0100)]
Merge vk-gl-cts/vulkan-cts-1.1.6 into vk-gl-cts/master

Change-Id: I35a136bf885def6a7aa1222b4c54433f2d8723fc

4 years agoAdd buffer reference comparison tests
Ricardo Garcia [Wed, 23 Oct 2019 09:46:15 +0000 (11:46 +0200)]
Add buffer reference comparison tests

This commit adds tests to convert buffer references to both uint64_t and
uvec2 and compare them against zero and against other references.

In addition, new test variants also check cross conversions, i.e., when
a reference is loaded as a uint64_t and later converted to uvec2 or vice
versa.

New tests:
dEQP-VK.binding_model.buffer_device_address.*.convertchecku64.*
dEQP-VK.binding_model.buffer_device_address.*.convertcheckuv2.*
dEQP-VK.binding_model.buffer_device_address.*.crossconvertu2p.*
dEQP-VK.binding_model.buffer_device_address.*.crossconvertp2u.*

Components: Vulkan
VK-GL-CTS issue: 1968

Change-Id: I4ae5b66473953097a52f169e5b8c425647eedb2c
(cherry picked from commit d0ee43aaa980dab94ed247e467999864373868d8)

4 years agoMerge vk-gl-cts/vulkan-cts-1.1.5 into vk-gl-cts/vulkan-cts-1.2.0
Alexander Galazin [Fri, 20 Dec 2019 12:51:17 +0000 (13:51 +0100)]
Merge vk-gl-cts/vulkan-cts-1.1.5 into vk-gl-cts/vulkan-cts-1.2.0

Change-Id: If326d580f29fd87e9e72e81a11a39e8629d35bb5

4 years agoMerge vk-gl-cts/vulkan-cts-1.1.5 into vk-gl-cts/vulkan-cts-1.1.6
Alexander Galazin [Fri, 20 Dec 2019 12:50:25 +0000 (13:50 +0100)]
Merge vk-gl-cts/vulkan-cts-1.1.5 into vk-gl-cts/vulkan-cts-1.1.6

Change-Id: I0f9446b635621472d72566a6176c7d0c00306263

4 years agoAvoid undefined behaviour when calculating subgroup ballot masks
Dae Kim [Fri, 13 Dec 2019 09:26:05 +0000 (09:26 +0000)]
Avoid undefined behaviour when calculating subgroup ballot masks

The affected tests are shifting the bits of the last component of the
computed ballot masks by 32. However, the SPIR-V specification
establishes that the result of OpShift* is undefined if `Shift` is
greater than *or equal* to the bit width of the components of `Base`.

Affects:

dEQP-VK.subgroups.ballot_other.*

Components: Vulkan

VK-GL-CTS issue: 2083

Change-Id: I8c9b4373f1429669a40741986916e8d71b7eb573

4 years agoAdded DMA buffer external memory cases to cross instance sharing tests
Samuel Iglesias Gonsálvez [Thu, 28 Nov 2019 15:19:46 +0000 (16:19 +0100)]
Added DMA buffer external memory cases to cross instance sharing tests

Components: Vulkan
VK-GL-CTS issue: 1861

Added tests:

   dEQP-VK.synchronization.cross_instance.*_dma_buf

Change-Id: I50dbf8af816e45ee122a5e15390d619daf19335a

4 years agoAdd buffer reference comparison tests
Ricardo Garcia [Wed, 23 Oct 2019 09:46:15 +0000 (11:46 +0200)]
Add buffer reference comparison tests

This commit adds tests to convert buffer references to both uint64_t and
uvec2 and compare them against zero and against other references.

In addition, new test variants also check cross conversions, i.e., when
a reference is loaded as a uint64_t and later converted to uvec2 or vice
versa.

New tests:
dEQP-VK.binding_model.buffer_device_address.*.convertchecku64.*
dEQP-VK.binding_model.buffer_device_address.*.convertcheckuv2.*
dEQP-VK.binding_model.buffer_device_address.*.crossconvertu2p.*
dEQP-VK.binding_model.buffer_device_address.*.crossconvertp2u.*

Components: Vulkan
VK-GL-CTS issue: 1968

Change-Id: I4ae5b66473953097a52f169e5b8c425647eedb2c

4 years agoAdd SPIR-V Invariant decoration tests
Pawel Ksiezopolski [Tue, 15 Oct 2019 13:28:14 +0000 (15:28 +0200)]
Add SPIR-V Invariant decoration tests

Migration of the OpenGL Invariant decoration tests to Vulkan.
Modified structs and classes from vktDrawUtil.hpp so that they
may perform more than one rendering at once.

New tests:
dEQP-VK.glsl.invariance.*

Affects:
dEQP-VK.clipping.*
dEQP-VK.glsl.builtin_var.*
dEQP-VK.ycbcr.query.*

Components: Vulkan Framework

VK-GL-CTS issue: 2007

Change-Id: I0774f50c5a818b9ce4d012e4a1be5fdc1cbabb63

4 years agoldexp tests do not test corner cases correctly
Graeme Leese [Thu, 3 Oct 2019 13:29:19 +0000 (14:29 +0100)]
ldexp tests do not test corner cases correctly

The ldexp tests never correctly implemented the resolution of bugzilla
11180, which specified that exp == 128 should give correct results.

Components: Vulkan
Affects: dEQP-VK.glsl.builtin.precision*.ldexp.*

Change-Id: Ic532df4b570f87602edf0ff8f302c04e7a35f174

4 years agoFix bad merge from https://gerrit.khronos.org/#/c/5107/
Piers Daniell [Wed, 11 Dec 2019 22:19:18 +0000 (15:19 -0700)]
Fix bad merge from https://gerrit.khronos.org/#/c/5107/

When https://gerrit.khronos.org/#/c/4874/ was cherry-picked
to the vulkan-cts-1.1.6 branch it would have hit conflicts
with the new VK_EXT_line_rasterization tests from
https://gerrit.khronos.org/#/c/3997/.

This CL fixes a bad conflict resolution in
tcuRasterizationVerifier.cpp that forced the verification
mode of all line types top be scrict, when they should
have got their verification mode from
scene.verificationMode.

This CL also modifies the position of the test lines
for case 2 of LinesTestInstance::generateLines(). The
position of the last line, added with CL 5107, was moved
lower to avoid excessive overlap with the other three
lines. This excessive overlap caused many pixels to
share edges and aggravate a minor flaw in the software
line rasterizer where it always assumes full coverage on
pixels that share edges of two or more triangles.
They may actually still be only partial coverage when
doing smooth or multisample rendering, and forcing it
to full coverage won't match what hardware does.

Affects: dEQP-VK.rasterization.primitives.*

Components: Vulkan

VK-GL-CTS Issue: 2062

Change-Id: Ie865f46c24e8265fd47354faaf9be5efd002b2d4

4 years agoFix invalid CFG in SPIR-V 1.4 tests
Alan Baker [Thu, 19 Dec 2019 14:57:38 +0000 (09:57 -0500)]
Fix invalid CFG in SPIR-V 1.4 tests

VK-GL-CTS Issue: 2122

Component: Vulkan

Affected tests:
dEQP-VK.spirv_assembly.instruction.spirv1p4.opptrdiff.variable_pointers_vars_ssbo_2_diff
dEQP-VK.spirv_assembly.instruction.spirv1p4.opptrequal.variable_pointers_ssbo_2_equal
dEQP-VK.spirv_assembly.instruction.spirv1p4.opptrnotequal.variable_pointers_ssbo_2_not_equal
dEQP-VK.spirv_assembly.instruction.spirv1p4.nonwritable.function_nonwritable
dEQP-VK.spirv_assembly.instruction.spirv1p4.nonwritable.private_nonwritable

Change-Id: Ie886aba331a7721d3d3468dd8c616ca7ab2d5664

4 years agoFix invalid CFG in SPIR-V 1.4 tests
Alan Baker [Thu, 19 Dec 2019 14:50:54 +0000 (09:50 -0500)]
Fix invalid CFG in SPIR-V 1.4 tests

VK-GL-CTS Issue: 2122

Component: Vulkan

Affected tests:
dEQP-VK.spirv_assembly.instruction.spirv1p4.opptrdiff.variable_pointers_vars_ssbo_2_diff
dEQP-VK.spirv_assembly.instruction.spirv1p4.opptrequal.variable_pointers_ssbo_2_equal
dEQP-VK.spirv_assembly.instruction.spirv1p4.opptrnotequal.variable_pointers_ssbo_2_not_equal
dEQP-VK.spirv_assembly.instruction.spirv1p4.nonwritable.function_nonwritable
dEQP-VK.spirv_assembly.instruction.spirv1p4.nonwritable.private_nonwritable

Change-Id: Ifcdae634224c08be8ebbd7efaa9e63c046acbae5

4 years agoFix texture shadow test using image views with zero aspect
Slawomir Cygan [Fri, 6 Dec 2019 13:26:00 +0000 (14:26 +0100)]
Fix texture shadow test using image views with zero aspect

addCubeTexture / add2DArrayTexture functions are wrongly used, backingMode is
passed as view aspect, leading to 0 aspect being used in vkImageViewCreateInfo

Components: Vulkan

VK-GL-CTS Issue: 2144

Affects:
    dEQP-VK.texture.shadow.2d_array.*
    dEQP-VK.texture.shadow.cube.*

Change-Id: I4c338756bb6e693b815c39ab8dc5c0c046fad2a5
(cherry picked from commit b969f4eca91c110200389673c5b7d0500b2b3e59)

4 years agoFix texture shadow test using image views with zero aspect
Slawomir Cygan [Fri, 6 Dec 2019 13:26:00 +0000 (14:26 +0100)]
Fix texture shadow test using image views with zero aspect

addCubeTexture / add2DArrayTexture functions are wrongly used, backingMode is
passed as view aspect, leading to 0 aspect being used in vkImageViewCreateInfo

Components: Vulkan

VK-GL-CTS Issue: 2144

Affects:
    dEQP-VK.texture.shadow.2d_array.*
    dEQP-VK.texture.shadow.cube.*

Change-Id: I4c338756bb6e693b815c39ab8dc5c0c046fad2a5

4 years agoFix initializaztion
Alexander Galazin [Wed, 18 Dec 2019 12:00:58 +0000 (13:00 +0100)]
Fix initializaztion

Components: Vulkan

Change-Id: I291da7875b6604829cd5c6af789a3a9d67a4236b

4 years agoWhitelist Vulkan CTS 1.2.1.0
Alexander Galazin [Wed, 18 Dec 2019 08:04:27 +0000 (09:04 +0100)]
Whitelist Vulkan CTS 1.2.1.0

Affects: dEQP-VK.api.driver_properties.properties

Components: Vulkan

Change-Id: I695bd9e5dc036ca3f96be8f58ffc400a86a5ef31

4 years agoMerge vk-gl-cts/master into vk-gl-cts/vulkan-cts-next-dev
Alexander Galazin [Tue, 17 Dec 2019 19:45:09 +0000 (20:45 +0100)]
Merge vk-gl-cts/master into vk-gl-cts/vulkan-cts-next-dev

Change-Id: I33077806ad26f3035b0de21db7e64eefc9390ea8

4 years agoMerge vk-gl-cts/vulkan-cts-1.2.0 into vk-gl-cts/vulkan-cts-next-dev
Alexander Galazin [Tue, 17 Dec 2019 18:03:54 +0000 (19:03 +0100)]
Merge vk-gl-cts/vulkan-cts-1.2.0 into vk-gl-cts/vulkan-cts-next-dev

Change-Id: I0203949263fcf64b57646556bf90655c36d82b4c

4 years agoMerge vk-gl-cts/vulkan-cts-1.1.6 into vk-gl-cts/master
Alexander Galazin [Tue, 17 Dec 2019 16:42:08 +0000 (17:42 +0100)]
Merge vk-gl-cts/vulkan-cts-1.1.6 into vk-gl-cts/master

Change-Id: I1480366fa7076b474ea7d3da34a1375c09b9da0c

4 years agoMerge vk-gl-cts/vulkan-cts-1.1.5 into vk-gl-cts/vulkan-cts-1.1.6
Alexander Galazin [Tue, 17 Dec 2019 15:30:21 +0000 (16:30 +0100)]
Merge vk-gl-cts/vulkan-cts-1.1.5 into vk-gl-cts/vulkan-cts-1.1.6

Change-Id: I7054b3a97f5f57fb5d5829f21991efe70108c77a

4 years agoMerge vk-gl-cts/vulkan-cts-1.1.5 into vk-gl-cts/vulkan-cts-1.2.0
Alexander Galazin [Tue, 17 Dec 2019 15:29:31 +0000 (16:29 +0100)]
Merge vk-gl-cts/vulkan-cts-1.1.5 into vk-gl-cts/vulkan-cts-1.2.0

Change-Id: I8752672f5ba4807bc8e638b117a7c37d5e161d05

4 years agoMerge vk-gl-cts/vulkan-cts-1.1.4 into vk-gl-cts/vulkan-cts-1.1.5
Alexander Galazin [Tue, 17 Dec 2019 14:34:21 +0000 (15:34 +0100)]
Merge vk-gl-cts/vulkan-cts-1.1.4 into vk-gl-cts/vulkan-cts-1.1.5

Change-Id: I4d9b046396a757d9fce9a0a326b150deb37015ce

4 years agoMerge vk-gl-cts/vulkan-cts-1.1.3 into vk-gl-cts/vulkan-cts-1.1.4
Alexander Galazin [Tue, 17 Dec 2019 12:32:46 +0000 (13:32 +0100)]
Merge vk-gl-cts/vulkan-cts-1.1.3 into vk-gl-cts/vulkan-cts-1.1.4

Change-Id: Ia01386a2e8fec477414b8488a7bfa883265c32ec

4 years agodEQP-VK.graphicsfuzz.modf-temp-modf-color
Paul Thomson [Tue, 8 Oct 2019 15:18:27 +0000 (16:18 +0100)]
dEQP-VK.graphicsfuzz.modf-temp-modf-color

Components: Vulkan

New Tests:

dEQP-VK.graphicsfuzz.modf-temp-modf-color

Change-Id: Ib41611b5813421bdfe24e4e9e4f2ccde4c9d008b

4 years agoMerge vk-gl-cts/vulkan-cts-1.1.2 into vk-gl-cts/vulkan-cts-1.1.3
Alexander Galazin [Tue, 17 Dec 2019 10:58:46 +0000 (11:58 +0100)]
Merge vk-gl-cts/vulkan-cts-1.1.2 into vk-gl-cts/vulkan-cts-1.1.3

Change-Id: Iecc5fe7d8f5119a46a78fd7d6f3c3b613c45059d

4 years agoFix setting Amber fence timeout
Slawomir Cygan [Thu, 5 Dec 2019 18:27:11 +0000 (19:27 +0100)]
Fix setting Amber fence timeout

The call to SetFenceTimeout() does nothing, if the Amber
document is not parsed yet (it's a pimpl doing NOP, when
pimpl is not set).

Move setting the fence timeout after document parsing.

Components: Vulkan,Framework

VK-GL-CTS Issue 2119

Affects: dEQP-VK.*   (Amber tests only).

Change-Id: I9debec1bc2709ad7ad2170a887dabc9bd92bd148

4 years agoAdd helper function to query extension properties
Boris Zanin [Fri, 6 Dec 2019 10:18:10 +0000 (11:18 +0100)]
Add helper function to query extension properties

Introduce template function getPhysicalDeviceExtensionProperties
that enables to query physical device extension properties in one call.

Components: Framework

VK-GL-CTS issue: 2142

Change-Id: I252fd5deb9883d1c93b7163ef26f13a479b685de

4 years agoRe-include some Android CTS tests
Paul Thomson [Mon, 9 Dec 2019 16:03:38 +0000 (16:03 +0000)]
Re-include some Android CTS tests

Components: Android

Included tests:

dEQP-VK.glsl.builtin.precision.*
dEQP-VK.spirv_assembly.instruction.compute.opfunord.*
dEQP-VK.spirv_assembly.instruction.*.indexing.*u32*
dEQP-VK.spirv_assembly.instruction.*.indexing.*s32*

Change-Id: Ib9be1f9ef388c7baeaf8f11b1dd7e60efdf72dc5

4 years agoProvide a highp variable to MAKE_HIGH_BALLOT_RESULT
Paul Thomson [Thu, 5 Dec 2019 18:13:00 +0000 (18:13 +0000)]
Provide a highp variable to MAKE_HIGH_BALLOT_RESULT

The MAKE_HIGH_BALLOT_RESULT macro assumes the input is 32bit.
Given a mediump variable, ex: gl_SubgroupSize, would produce an
undefined result when the input value is >= 16 and the computation
is in 16 bits.
Provide a highp input would ensure the computation is in 32 bits.

Affects:
  dEQP-VK.subgroups.ballot_other.*

Components: vulkan

VK-GL-CTS issue: 1894

Change-Id: I22987f20be3d08444c52cb722fc23494777a5636

4 years agoRemove event tests which use illegal behaviour
Peter Quayle [Thu, 5 Dec 2019 11:34:25 +0000 (11:34 +0000)]
Remove event tests which use illegal behaviour

Two event tests were relying on being able to wait on the device for
an event to be set on the host. This behaviour is not allowed.

Affects:

dEQP-VK.synchronization.smoke.events
dEQP-VK.synchronization.basic.event.host_set_device_wait

Components: Vulkan

VK-GL-CTS issue: 2108

Change-Id: Idbb8b4e2468d617b3e47d5055622789a2dd3eb00