fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-05 18:18:06 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Revert "nvk: Enable VK_KHR_shader_subgroup_uniform_control_flow"

Browse source 
This reverts commit ac5d529c65.  We're
failing 4 of the tests:

dEQP-VK.reconvergence.subgroup_uniform_control_flow_ballot.compute.nesting4.1.2
dEQP-VK.reconvergence.subgroup_uniform_control_flow_elect.compute.nesting4.1.2
dEQP-VK.reconvergence.workgroup_uniform_control_flow_ballot.compute.nesting4.1.2
dEQP-VK.reconvergence.workgroup_uniform_control_flow_elect.compute.nesting4.1.2

This is because we aren't guaranteeing re-convergence for loop
continues.

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/28221>
This commit is contained in:
Faith Ekstrand 2024-03-15 21:42:49 -05:00
parent f424ef1801
commit 7bd1d4848c
4 changed files with 1 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
docs/features.txt
View file

@ -539,7 +539,7 @@ Khronos extensions that are not part of any Vulkan version:
VK_KHR_shader_expect_assume DONE (anv, dzn, hasvk, lvp, nvk, panvk, pvr, radv, tu, v3dv, vn)
VK_KHR_shader_maximal_reconvergence DONE (lvp, radv)
VK_KHR_shader_subgroup_rotate DONE (anv, radv)
VK_KHR_shader_subgroup_uniform_control_flow DONE (anv, hasvk, nvk, radv)
VK_KHR_shader_subgroup_uniform_control_flow DONE (anv, hasvk, radv)
VK_KHR_shader_quad_control DONE (radv)
VK_KHR_shared_presentable_image not started
VK_KHR_surface DONE (anv, dzn, hasvk, lvp, nvk, panvk, pvr, radv, tu, v3dv, vn)

1
docs/relnotes/new_features.txt
View file

@ -10,4 +10,3 @@ OpenGL 4.6 on Asahi
OpenGL ES 3.2 on Asahi
Mali G610 and G310 on Panfrost
Mali T600 on Panfrost
VK_KHR_shader_subgroup_uniform_control_flow on NVK

4
src/nouveau/vulkan/nvk_physical_device.c
View file

@ -147,7 +147,6 @@ nvk_get_device_extensions(const struct nvk_instance *instance,
.KHR_shader_integer_dot_product = true,
.KHR_shader_non_semantic_info = true,
.KHR_shader_subgroup_extended_types = true,
.KHR_shader_subgroup_uniform_control_flow = nvk_use_nak(info),
.KHR_shader_terminate_invocation =
(nvk_nak_stages(info) & VK_SHADER_STAGE_FRAGMENT_BIT) != 0,
.KHR_spirv_1_4 = true,
@ -557,9 +556,6 @@ nvk_get_device_features(const struct nv_device_info *info,
/* VK_EXT_shader_object */
.shaderObject = true,
/* VK_KHR_shader_subgroup_uniform_control_flow */
.shaderSubgroupUniformControlFlow = nvk_use_nak(info),
/* VK_EXT_texel_buffer_alignment */
.texelBufferAlignment = true,

1
src/nouveau/vulkan/nvk_shader.c
View file

@ -156,7 +156,6 @@ nvk_get_spirv_options(struct vk_physical_device *vk_pdev,
.subgroup_basic = true,
.subgroup_quad = true,
.subgroup_shuffle = true,
.subgroup_uniform_control_flow = true,
.subgroup_vote = true,
.tessellation = true,
.transform_feedback = true,