Module: Mesa Branch: main Commit: 29400a56d51d9da19eb0eccdc4b5563ee8510ade URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=29400a56d51d9da19eb0eccdc4b5563ee8510ade
Author: Connor Abbott <cwabbo...@gmail.com> Date: Mon Nov 6 16:31:37 2023 +0100 tu: Fix getting VkDescriptorSetVariableDescriptorCountLayoutSupport Fix the same mistake that 882fd3c5 fixed which we inherited from radv. Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/26069> --- src/freedreno/ci/freedreno-a618-fails.txt | 36 ----------------------------- src/freedreno/ci/freedreno-a630-fails.txt | 12 ---------- src/freedreno/ci/freedreno-a660-fails.txt | 38 ------------------------------- src/freedreno/vulkan/tu_descriptor_set.cc | 2 +- 4 files changed, 1 insertion(+), 87 deletions(-) diff --git a/src/freedreno/ci/freedreno-a618-fails.txt b/src/freedreno/ci/freedreno-a618-fails.txt index 89edef2f8ab..c58de67178d 100644 --- a/src/freedreno/ci/freedreno-a618-fails.txt +++ b/src/freedreno/ci/freedreno-a618-fails.txt @@ -615,32 +615,6 @@ gmem-dEQP-VK.glsl.derivate.fwidthfine.dynamic_switch.vec3_highp,Crash gmem-dEQP-VK.glsl.derivate.fwidthfine.dynamic_switch.vec4_mediump,Crash # New CTS failures in 1.3.7.0 -dEQP-VK.api.maintenance3_check.support_count_combined_image_sampler,Fail -dEQP-VK.api.maintenance3_check.support_count_combined_image_sampler_extra_bindings,Fail -dEQP-VK.api.maintenance3_check.support_count_combined_image_sampler_extra_bindings_no_variable_size,Fail -dEQP-VK.api.maintenance3_check.support_count_combined_image_sampler_no_variable_size,Fail -dEQP-VK.api.maintenance3_check.support_count_inline_uniform_block,Fail -dEQP-VK.api.maintenance3_check.support_count_inline_uniform_block_no_variable_size,Fail -dEQP-VK.api.maintenance3_check.support_count_input_attachment,Fail -dEQP-VK.api.maintenance3_check.support_count_input_attachment_extra_bindings,Fail -dEQP-VK.api.maintenance3_check.support_count_input_attachment_extra_bindings_no_variable_size,Fail -dEQP-VK.api.maintenance3_check.support_count_input_attachment_no_variable_size,Fail -dEQP-VK.api.maintenance3_check.support_count_sampler,Fail -dEQP-VK.api.maintenance3_check.support_count_sampler_extra_bindings,Fail -dEQP-VK.api.maintenance3_check.support_count_sampler_extra_bindings_no_variable_size,Fail -dEQP-VK.api.maintenance3_check.support_count_sampler_no_variable_size,Fail -dEQP-VK.api.maintenance3_check.support_count_storage_buffer_dynamic,Fail -dEQP-VK.api.maintenance3_check.support_count_storage_buffer_dynamic_extra_bindings,Fail -dEQP-VK.api.maintenance3_check.support_count_storage_buffer_extra_bindings_no_variable_size,Fail -dEQP-VK.api.maintenance3_check.support_count_storage_buffer_no_variable_size,Fail -dEQP-VK.api.maintenance3_check.support_count_storage_image_extra_bindings,Fail -dEQP-VK.api.maintenance3_check.support_count_storage_texel_buffer,Fail -dEQP-VK.api.maintenance3_check.support_count_storage_texel_buffer_extra_bindings,Fail -dEQP-VK.api.maintenance3_check.support_count_storage_texel_buffer_extra_bindings_no_variable_size,Fail -dEQP-VK.api.maintenance3_check.support_count_uniform_buffer,Fail -dEQP-VK.api.maintenance3_check.support_count_uniform_buffer_dynamic_extra_bindings,Fail -dEQP-VK.api.maintenance3_check.support_count_uniform_buffer_extra_bindings,Fail -dEQP-VK.api.maintenance3_check.support_count_uniform_buffer_no_variable_size,Fail dEQP-VK.api.version_check.unavailable_entry_points,Fail dEQP-VK.transform_feedback.primitives_generated_query.concurrent.pipeline_statistics_3.32bit.line_list.indirect,Fail dEQP-VK.transform_feedback.primitives_generated_query.concurrent.pipeline_statistics_3.32bit.line_list_with_adjacency.indirect,Fail @@ -673,8 +647,6 @@ dEQP-VK.transform_feedback.primitives_generated_query.concurrent.pipeline_statis dEQP-VK.transform_feedback.primitives_generated_query.concurrent.pipeline_statistics_3.pgq_64bit_xfb_32bit.triangle_list_with_adjacency.indirect,Fail dEQP-VK.transform_feedback.primitives_generated_query.concurrent.pipeline_statistics_3.pgq_64bit_xfb_32bit.triangle_strip.indirect,Fail dEQP-VK.transform_feedback.primitives_generated_query.concurrent.pipeline_statistics_3.pgq_64bit_xfb_32bit.triangle_strip_with_adjacency.draw,Fail -gmem-dEQP-VK.api.maintenance3_check.support_count_input_attachment_extra_bindings,Fail -gmem-dEQP-VK.api.maintenance3_check.support_count_input_attachment_no_variable_size,Fail gmem-dEQP-VK.glsl.derivate.dfdx.dynamic_switch.float_highp,Crash gmem-dEQP-VK.glsl.derivate.dfdxcoarse.dynamic_loop.vec3_mediump,Crash gmem-dEQP-VK.glsl.derivate.dfdxfine.dynamic_if.vec3_highp,Crash @@ -708,13 +680,6 @@ gmem-dEQP-VK.transform_feedback.primitives_generated_query.concurrent.pipeline_s gmem-dEQP-VK.transform_feedback.primitives_generated_query.concurrent.pipeline_statistics_3.pgq_64bit_xfb_32bit.line_list.draw,Fail gmem-dEQP-VK.dynamic_rendering.partial_secondary_cmd_buff.suballocation.load_store_op_none.depthstencil_d32_sfloat_s8_uint_load_op_depth_load_stencil_none_store_op_depth_store_stencil_none_stencil_write_off,Fail -dEQP-VK.api.maintenance3_check.support_count_inline_uniform_block_extra_bindings_no_variable_size,Fail -dEQP-VK.api.maintenance3_check.support_count_sampled_image,Fail -dEQP-VK.api.maintenance3_check.support_count_storage_buffer_dynamic_extra_bindings_no_variable_size,Fail -dEQP-VK.api.maintenance3_check.support_count_uniform_buffer_dynamic,Fail -dEQP-VK.api.maintenance3_check.support_count_uniform_buffer_extra_bindings_no_variable_size,Fail -dEQP-VK.api.maintenance3_check.support_count_uniform_texel_buffer_extra_bindings_no_variable_size,Fail -dEQP-VK.api.maintenance3_check.support_count_uniform_texel_buffer_no_variable_size,Fail dEQP-VK.dynamic_rendering.primary_cmd_buff.basic.partial_binding_depth_stencil,Fail dEQP-VK.transform_feedback.primitives_generated_query.concurrent.pipeline_statistics_3.64bit.line_list.draw,Fail dEQP-VK.transform_feedback.primitives_generated_query.concurrent.pipeline_statistics_3.64bit.line_strip.draw,Fail @@ -729,7 +694,6 @@ dEQP-VK.transform_feedback.primitives_generated_query.concurrent.pipeline_statis dEQP-VK.transform_feedback.primitives_generated_query.concurrent.pipeline_statistics_3.pgq_64bit_xfb_32bit.line_strip.draw,Fail dEQP-VK.transform_feedback.primitives_generated_query.concurrent.pipeline_statistics_3.pgq_64bit_xfb_32bit.triangle_list.indirect,Fail dEQP-VK.transform_feedback.primitives_generated_query.concurrent.pipeline_statistics_3.pgq_64bit_xfb_32bit.triangle_strip_with_adjacency.indirect,Fail -gmem-dEQP-VK.api.maintenance3_check.support_count_storage_buffer_dynamic_extra_bindings_no_variable_size,Fail gmem-dEQP-VK.glsl.derivate.dfdx.dynamic_if.vec4_mediump,Crash gmem-dEQP-VK.glsl.derivate.dfdxcoarse.dynamic_if.vec3_highp,Crash gmem-dEQP-VK.glsl.derivate.dfdxcoarse.dynamic_if.vec4_highp,Crash diff --git a/src/freedreno/ci/freedreno-a630-fails.txt b/src/freedreno/ci/freedreno-a630-fails.txt index 0f15ebccc57..5d1f6199c71 100644 --- a/src/freedreno/ci/freedreno-a630-fails.txt +++ b/src/freedreno/ci/freedreno-a630-fails.txt @@ -599,17 +599,6 @@ gmem-dEQP-VK.glsl.derivate.fwidthfine.dynamic_if.vec2_mediump,Crash gmem-dEQP-VK.glsl.derivate.fwidthfine.dynamic_loop.vec2_highp,Crash # New CTS failures in 1.3.7.0 -dEQP-VK.api.maintenance3_check.support_count_inline_uniform_block_extra_bindings_no_variable_size,Fail -dEQP-VK.api.maintenance3_check.support_count_input_attachment,Fail -dEQP-VK.api.maintenance3_check.support_count_sampled_image,Fail -dEQP-VK.api.maintenance3_check.support_count_storage_image,Fail -dEQP-VK.api.maintenance3_check.support_count_storage_image_no_variable_size,Fail -dEQP-VK.api.maintenance3_check.support_count_storage_texel_buffer_extra_bindings,Fail -dEQP-VK.api.maintenance3_check.support_count_uniform_buffer,Fail -dEQP-VK.api.maintenance3_check.support_count_uniform_buffer_dynamic,Fail -dEQP-VK.api.maintenance3_check.support_count_uniform_buffer_dynamic_extra_bindings_no_variable_size,Fail -dEQP-VK.api.maintenance3_check.support_count_uniform_buffer_dynamic_no_variable_size,Fail -dEQP-VK.api.maintenance3_check.support_count_uniform_buffer_no_variable_size,Fail dEQP-VK.api.version_check.unavailable_entry_points,Fail dEQP-VK.dynamic_rendering.primary_cmd_buff.basic.partial_binding_depth_stencil,Fail dEQP-VK.transform_feedback.primitives_generated_query.concurrent.pipeline_statistics_3.32bit.point_list.draw,Fail @@ -655,7 +644,6 @@ wayland-dEQP-EGL.functional.render.multi_thread.gles3.other,Fail wayland-dEQP-EGL.functional.render.single_context.gles2.other,Fail wayland-dEQP-EGL.functional.render.single_context.gles3.other,Fail -dEQP-VK.api.maintenance3_check.support_count_uniform_texel_buffer_no_variable_size,Fail dEQP-VK.transform_feedback.primitives_generated_query.concurrent.pipeline_statistics_3.32bit.triangle_strip.draw,Fail gmem-dEQP-VK.glsl.derivate.dfdy.dynamic_if.vec4_highp,Crash gmem-dEQP-VK.transform_feedback.primitives_generated_query.concurrent.pipeline_statistics_1.pgq_32bit_xfb_64bit.triangle_strip_with_adjacency.draw,Fail diff --git a/src/freedreno/ci/freedreno-a660-fails.txt b/src/freedreno/ci/freedreno-a660-fails.txt index 2575449e3c5..382e97d2138 100644 --- a/src/freedreno/ci/freedreno-a660-fails.txt +++ b/src/freedreno/ci/freedreno-a660-fails.txt @@ -38,40 +38,6 @@ gmem-dEQP-VK.spirv_assembly.instruction.graphics.16bit_storage:struct_mixed_type gmem-dEQP-VK.spirv_assembly.instruction.graphics.16bit_storage.struct_mixed_types.uniform_buffer_block_geom,Fail # New CTS failures in 1.3.7.0 -dEQP-VK.api.maintenance3_check.support_count_combined_image_sampler,Fail -dEQP-VK.api.maintenance3_check.support_count_combined_image_sampler_extra_bindings,Fail -dEQP-VK.api.maintenance3_check.support_count_inline_uniform_block,Fail -dEQP-VK.api.maintenance3_check.support_count_inline_uniform_block_extra_bindings,Fail -dEQP-VK.api.maintenance3_check.support_count_inline_uniform_block_no_variable_size,Fail -dEQP-VK.api.maintenance3_check.support_count_input_attachment,Fail -dEQP-VK.api.maintenance3_check.support_count_input_attachment_extra_bindings,Fail -dEQP-VK.api.maintenance3_check.support_count_input_attachment_extra_bindings_no_variable_size,Fail -dEQP-VK.api.maintenance3_check.support_count_input_attachment_no_variable_size,Fail -dEQP-VK.api.maintenance3_check.support_count_sampled_image_extra_bindings,Fail -dEQP-VK.api.maintenance3_check.support_count_sampled_image_extra_bindings_no_variable_size,Fail -dEQP-VK.api.maintenance3_check.support_count_sampler,Fail -dEQP-VK.api.maintenance3_check.support_count_sampler_no_variable_size,Fail -dEQP-VK.api.maintenance3_check.support_count_storage_buffer,Fail -dEQP-VK.api.maintenance3_check.support_count_storage_buffer_dynamic,Fail -dEQP-VK.api.maintenance3_check.support_count_storage_buffer_dynamic_extra_bindings,Fail -dEQP-VK.api.maintenance3_check.support_count_storage_buffer_dynamic_extra_bindings_no_variable_size,Fail -dEQP-VK.api.maintenance3_check.support_count_storage_buffer_dynamic_no_variable_size,Fail -dEQP-VK.api.maintenance3_check.support_count_storage_buffer_extra_bindings,Fail -dEQP-VK.api.maintenance3_check.support_count_storage_buffer_extra_bindings_no_variable_size,Fail -dEQP-VK.api.maintenance3_check.support_count_storage_buffer_no_variable_size,Fail -dEQP-VK.api.maintenance3_check.support_count_storage_image,Fail -dEQP-VK.api.maintenance3_check.support_count_storage_image_extra_bindings,Fail -dEQP-VK.api.maintenance3_check.support_count_storage_texel_buffer,Fail -dEQP-VK.api.maintenance3_check.support_count_storage_texel_buffer_extra_bindings,Fail -dEQP-VK.api.maintenance3_check.support_count_storage_texel_buffer_extra_bindings_no_variable_size,Fail -dEQP-VK.api.maintenance3_check.support_count_uniform_buffer,Fail -dEQP-VK.api.maintenance3_check.support_count_uniform_buffer_dynamic,Fail -dEQP-VK.api.maintenance3_check.support_count_uniform_buffer_dynamic_extra_bindings_no_variable_size,Fail -dEQP-VK.api.maintenance3_check.support_count_uniform_buffer_extra_bindings,Fail -dEQP-VK.api.maintenance3_check.support_count_uniform_buffer_extra_bindings_no_variable_size,Fail -dEQP-VK.api.maintenance3_check.support_count_uniform_texel_buffer,Fail -dEQP-VK.api.maintenance3_check.support_count_uniform_texel_buffer_extra_bindings_no_variable_size,Fail -dEQP-VK.api.maintenance3_check.support_count_uniform_texel_buffer_no_variable_size,Fail dEQP-VK.api.version_check.unavailable_entry_points,Fail dEQP-VK.dynamic_rendering.primary_cmd_buff.basic.partial_binding_depth_stencil,Fail dEQP-VK.transform_feedback.primitives_generated_query.concurrent.pipeline_statistics_3.32bit.line_list.draw,Fail @@ -134,10 +100,6 @@ dEQP-VK.transform_feedback.primitives_generated_query.concurrent.pipeline_statis dEQP-VK.transform_feedback.primitives_generated_query.concurrent.pipeline_statistics_3.pgq_64bit_xfb_32bit.triangle_strip_with_adjacency.indirect,Fail dEQP-VK.transform_feedback.simple.backward_dependency_indirect_beginqueryindexed_streamid_0,Fail dEQP-VK.transform_feedback.simple.backward_dependency_indirect_no_offset_array,Fail -gmem-dEQP-VK.api.maintenance3_check.support_count_input_attachment_extra_bindings,Fail -gmem-dEQP-VK.api.maintenance3_check.support_count_storage_buffer_extra_bindings_no_variable_size,Fail -gmem-dEQP-VK.api.maintenance3_check.support_count_storage_image_extra_bindings,Fail -gmem-dEQP-VK.api.maintenance3_check.support_count_uniform_buffer_extra_bindings,Fail gmem-dEQP-VK.dynamic_rendering.complete_secondary_cmd_buff.suballocation.load_store_op_none.depthstencil_d32_sfloat_s8_uint_load_op_depth_load_stencil_none_store_op_depth_store_stencil_none_stencil_write_off,Fail gmem-dEQP-VK.subgroups.vote.frag_helper.subgroupallequal_ivec2_fragment,Fail gmem-dEQP-VK.transform_feedback.primitives_generated_query.concurrent.pipeline_statistics_1.32bit.triangle_fan.draw,Fail diff --git a/src/freedreno/vulkan/tu_descriptor_set.cc b/src/freedreno/vulkan/tu_descriptor_set.cc index 3dd346bb080..3dab17978a1 100644 --- a/src/freedreno/vulkan/tu_descriptor_set.cc +++ b/src/freedreno/vulkan/tu_descriptor_set.cc @@ -333,7 +333,7 @@ tu_GetDescriptorSetLayoutSupport( DESCRIPTOR_SET_LAYOUT_BINDING_FLAGS_CREATE_INFO); VkDescriptorSetVariableDescriptorCountLayoutSupport *variable_count = vk_find_struct( - (void *) pCreateInfo->pNext, + pSupport->pNext, DESCRIPTOR_SET_VARIABLE_DESCRIPTOR_COUNT_LAYOUT_SUPPORT); const VkMutableDescriptorTypeCreateInfoEXT *mutable_info = vk_find_struct_const(
