From: Matthew Netsch Date: Sun, 23 Jan 2022 01:56:51 +0000 (+0000) Subject: Merge vk-gl-cts/vulkan-cts-1.3.0 into vk-gl-cts/vulkan-cts-1.3.1 X-Git-Tag: upstream/1.3.5~332^2~41 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=dae471766c889dbd5c0e9cba61cddc7c49ef48b1;p=platform%2Fupstream%2FVK-GL-CTS.git Merge vk-gl-cts/vulkan-cts-1.3.0 into vk-gl-cts/vulkan-cts-1.3.1 Change-Id: I262c53439a37757a2b000b0529f74f5da064b84c --- dae471766c889dbd5c0e9cba61cddc7c49ef48b1 diff --cc android/cts/master/vk-master-2021-03-01/subgroups.txt index 9ade86b,a6d9b1c..ce25a80 --- a/android/cts/master/vk-master-2021-03-01/subgroups.txt +++ b/android/cts/master/vk-master-2021-03-01/subgroups.txt @@@ -4881,9 -4881,10 +4881,11 @@@ dEQP-VK.subgroups.ballot_mask.ext_shade dEQP-VK.subgroups.ballot_mask.ext_shader_subgroup_ballot.ray_tracing.gl_subgroupgtmaskarb dEQP-VK.subgroups.ballot_mask.ext_shader_subgroup_ballot.ray_tracing.gl_subgrouplemaskarb dEQP-VK.subgroups.ballot_mask.ext_shader_subgroup_ballot.ray_tracing.gl_subgroupltmaskarb +dEQP-VK.subgroups.multiple_dispatches.uniform_subgroup_size dEQP-VK.subgroups.size_control.generic.subgroup_size_properties dEQP-VK.subgroups.size_control.graphics.allow_varying_subgroup_size + dEQP-VK.subgroups.size_control.graphics.allow_varying_subgroup_size_spirv16 + dEQP-VK.subgroups.size_control.graphics.allow_varying_subgroup_size_flags_spirv16 dEQP-VK.subgroups.size_control.graphics.required_subgroup_size_max dEQP-VK.subgroups.size_control.graphics.required_subgroup_size_min dEQP-VK.subgroups.size_control.compute.allow_varying_subgroup_size diff --cc android/cts/master/vk-master/subgroups.txt index 8c38cc3,aba23b2..9a3f321 --- a/android/cts/master/vk-master/subgroups.txt +++ b/android/cts/master/vk-master/subgroups.txt @@@ -20865,9 -20865,10 +20865,11 @@@ dEQP-VK.subgroups.ballot_mask.ext_shade dEQP-VK.subgroups.ballot_mask.ext_shader_subgroup_ballot.ray_tracing.gl_subgroupgtmaskarb dEQP-VK.subgroups.ballot_mask.ext_shader_subgroup_ballot.ray_tracing.gl_subgrouplemaskarb dEQP-VK.subgroups.ballot_mask.ext_shader_subgroup_ballot.ray_tracing.gl_subgroupltmaskarb +dEQP-VK.subgroups.multiple_dispatches.uniform_subgroup_size dEQP-VK.subgroups.size_control.generic.subgroup_size_properties dEQP-VK.subgroups.size_control.graphics.allow_varying_subgroup_size + dEQP-VK.subgroups.size_control.graphics.allow_varying_subgroup_size_spirv16 + dEQP-VK.subgroups.size_control.graphics.allow_varying_subgroup_size_flags_spirv16 dEQP-VK.subgroups.size_control.graphics.required_subgroup_size_max dEQP-VK.subgroups.size_control.graphics.required_subgroup_size_min dEQP-VK.subgroups.size_control.compute.allow_varying_subgroup_size diff --cc external/vulkancts/mustpass/master/vk-default/subgroups.txt index 8c38cc3,aba23b2..9a3f321 --- a/external/vulkancts/mustpass/master/vk-default/subgroups.txt +++ b/external/vulkancts/mustpass/master/vk-default/subgroups.txt @@@ -20865,9 -20865,10 +20865,11 @@@ dEQP-VK.subgroups.ballot_mask.ext_shade dEQP-VK.subgroups.ballot_mask.ext_shader_subgroup_ballot.ray_tracing.gl_subgroupgtmaskarb dEQP-VK.subgroups.ballot_mask.ext_shader_subgroup_ballot.ray_tracing.gl_subgrouplemaskarb dEQP-VK.subgroups.ballot_mask.ext_shader_subgroup_ballot.ray_tracing.gl_subgroupltmaskarb +dEQP-VK.subgroups.multiple_dispatches.uniform_subgroup_size dEQP-VK.subgroups.size_control.generic.subgroup_size_properties dEQP-VK.subgroups.size_control.graphics.allow_varying_subgroup_size + dEQP-VK.subgroups.size_control.graphics.allow_varying_subgroup_size_spirv16 + dEQP-VK.subgroups.size_control.graphics.allow_varying_subgroup_size_flags_spirv16 dEQP-VK.subgroups.size_control.graphics.required_subgroup_size_max dEQP-VK.subgroups.size_control.graphics.required_subgroup_size_min dEQP-VK.subgroups.size_control.compute.allow_varying_subgroup_size