diff --git a/src/freedreno/ci/freedreno-a618-flakes.txt b/src/freedreno/ci/freedreno-a618-flakes.txt index cc629cb88a5..c0909b7139b 100644 --- a/src/freedreno/ci/freedreno-a618-flakes.txt +++ b/src/freedreno/ci/freedreno-a618-flakes.txt @@ -241,7 +241,6 @@ dEQP-VK.draw.dynamic_rendering.primary_cmd_buff.multi_draw.mosaic.indexed_random dEQP-VK.binding_model.shader_access.primary_cmd_buf.bind.with_template.storage_image.tess_ctrl.single_descriptor.1d_base_slice dEQP-VK.renderpass.suballocation.multisample_resolve.layers_6.r32g32b32a32_uint.samples_2_resolve_level_2 gmem-dEQP-VK.synchronization2.cross_instance.dedicated.write_image_tess_eval_read_image_compute_indirect.image_128x128_r8g8b8a8_unorm_binary_semaphore_fence_fd -bypass-dEQP-VK.renderpass2.fragment_density_map.2_views.render.non_divisible_density_size.2_samples.static_subsampled_2_2_multiviewport dEQP-VK.draw.dynamic_rendering.primary_cmd_buff.multi_draw.mosaic.indexed_mixed.16_draws.stride_extra_4.1_instance.tess_geom.single_view.offset_6_no_draw_id dEQP-VK.spirv_assembly.instruction.graphics.image_sampler.imagesample.combined_image_sampler_separate_descriptors.optypeimage_mismatch.rgba16ui.depth_property.unknown.shader_tesse gmem-dEQP-VK.binding_model.shader_access.secondary_cmd_buf.bind2.with_push.sampler_mutable.tess_ctrl.single_descriptor.2d diff --git a/src/freedreno/ci/freedreno-a660-flakes.txt b/src/freedreno/ci/freedreno-a660-flakes.txt index 69d6ccb96d3..ee03613793d 100644 --- a/src/freedreno/ci/freedreno-a660-flakes.txt +++ b/src/freedreno/ci/freedreno-a660-flakes.txt @@ -4,7 +4,6 @@ KHR-GL46.shader_subroutine.control_flow_and_returned_subroutine_values_used_as_s dEQP-VK.fragment_operations.scissor.multi_viewport.scissor_7 # Updated by ci-collate, found in this job run: https://gitlab.freedesktop.org/mesa/mesa/-/jobs/56164989 -bypass-dEQP-VK.renderpass2.fragment_density_map.2_views.render.non_divisible_density_size.2_samples.static_subsampled_2_1_multiviewport dEQP-VK.binding_model.shader_access.secondary_cmd_buf.with_template.sampler_mutable.tess_eval.multiple_descriptor_sets.multiple_discontiguous_descriptors.2d_array_base_slice # Updated by ci-collate, found in this job run: https://gitlab.freedesktop.org/mesa/mesa/-/jobs/56164990 @@ -15,7 +14,6 @@ dEQP-VK.tessellation.invariance.outer_edge_index_independence.triangles_equal_sp # Updated by ci-collate dEQP-VK.spirv_assembly.instruction.graphics.float16.logical.opfordlessthanequal_vector_geom -bypass-dEQP-VK.renderpass2.fragment_density_map.2_views.render.non_divisible_density_size.2_samples.static_subsampled_2_2_multiviewport dEQP-VK.clipping.user_defined.clip_cull_distance_dynamic_index.vert_geom.8 dEQP-VK.clipping.user_defined.clip_cull_distance.vert_tess.4_4_fragmentshader_read gmem-dEQP-VK.pipeline.pipeline_library.extended_dynamic_state.after_pipelines.rasterization_stream_none_to_one @@ -25,7 +23,6 @@ dEQP-VK.spirv_assembly.type.scalar.i32.bit_field_u_extract_offset8_count8_geom dEQP-VK.synchronization.cross_instance.dedicated.write_draw_indirect_read_image_tess_eval.image_128x128_r8g8b8a8_unorm_binary_semaphore_dma_buf dEQP-VK.tessellation.invariance.outer_edge_division.quads_fractional_even_spacing dEQP-VK.binding_model.shader_access.primary_cmd_buf.bind.with_push.combined_image_sampler_mutable.tess_eval.descriptor_array.1d_array -dEQP-VK.renderpass2.fragment_density_map.2_views.render.divisible_density_size.2_samples.static_subsampled_1_2_multiviewport dEQP-VK.reconvergence.workgroup_uniform_control_flow_ballot.compute.nesting4.7.38 dEQP-VK.query_pool.statistics_query.host_query_reset.geometry_shader_primitives.secondary.64bits_cmdcopyquerypoolresults_triangle_list_clear_depth @@ -38,9 +35,6 @@ KHR-GL46.texture_view.view_classes # Appeared after decreasing the fraction dEQP-VK.binding_model.shader_access.primary_cmd_buf.bind2.with_push_template.sampler_immutable.geometry.multiple_discontiguous_descriptors.1d_array_base_slice dEQP-VK.clipping.user_defined.clip_distance.vert_geom.4_fragmentshader_read -dEQP-VK.renderpass2.fragment_density_map.2_views.render.non_divisible_density_size.2_samples.static_subsampled_1_2_multiviewport -dEQP-VK.renderpass2.fragment_density_map.2_views.render.divisible_density_size.2_samples.static_subsampled_2_1_multiviewport -dEQP-VK.renderpass2.fragment_density_map.2_views.render.divisible_density_size.2_samples.static_subsampled_2_2_multiviewport dEQP-VK.subgroups.clustered.compute.subgroupclusteredmax_i64vec4_requiredsubgroupsize dEQP-VK.subgroups.clustered.compute.subgroupclusteredmul_i64vec4_requiredsubgroupsize dEQP-VK.subgroups.clustered.compute.subgroupclusteredmin_u64vec4_requiredsubgroupsize @@ -53,10 +47,7 @@ dEQP-VK.tessellation.invariance.outer_edge_symmetry.quads_fractional_odd_spacing dEQP-VK.tessellation.invariance.outer_edge_symmetry.triangles_fractional_odd_spacing_cw dEQP-VK.tessellation.invariance.outer_edge_index_independence.triangles_fractional_even_spacing_cw_point_mode dEQP-VK.tessellation.invariance.outer_triangle_set.quads_fractional_odd_spacing -bypass-dEQP-VK.renderpass2.fragment_density_map.2_views.render.divisible_density_size.2_samples.static_subsampled_2_2_multiviewportg gmem-dEQP-VK.synchronization.cross_instance.suballocated.write_ssbo_tess_control_read_ubo_texel_fragment.buffer_16384_binary_semaphore_fd -gmem-dEQP-VK.renderpass2.fragment_density_map.2_views.render.divisible_density_size.2_samples.static_subsampled_2_2_multiviewport -gmem-dEQP-VK.renderpass2.fragment_density_map.2_views.render.non_divisible_density_size.2_samples.static_subsampled_2_1_multiviewport gmem-dEQP-VK.synchronization.op.single_queue.fence.write_ssbo_tess_control_read_ssbo_tess_control.buffer_262144 # With linux kernel 6.13-rc4 uprev diff --git a/src/freedreno/ci/freedreno-a750-flakes.txt b/src/freedreno/ci/freedreno-a750-flakes.txt index 6171f2285f4..2b637478fea 100644 --- a/src/freedreno/ci/freedreno-a750-flakes.txt +++ b/src/freedreno/ci/freedreno-a750-flakes.txt @@ -173,14 +173,6 @@ dEQP-VK.query_pool.occlusion_query.get_results_size_32_stride_12_with_availabili dEQP-VK.query_pool.statistics_query.fragment_shader_invocations.primary.64bits_dstoffset_cmdcopyquerypoolresults_triangle_fan_clear_depth dEQP-VK.renderpass.suballocation.multisample_resolve.layers_6.r16_sfloat.samples_4_resolve_level_2 -dEQP-VK.renderpass2.fragment_density_map.2_views.render.divisible_density_size.2_samples.static_subsampled_1_1_multiviewport -dEQP-VK.renderpass2.fragment_density_map.2_views.render.divisible_density_size.2_samples.static_subsampled_1_2_multiviewport -dEQP-VK.renderpass2.fragment_density_map.2_views.render.divisible_density_size.2_samples.static_subsampled_2_1_multiviewport -dEQP-VK.renderpass2.fragment_density_map.2_views.render.divisible_density_size.2_samples.static_subsampled_2_2_multiviewport -dEQP-VK.renderpass2.fragment_density_map.2_views.render.non_divisible_density_size.2_samples.static_subsampled_1_1_multiviewport -dEQP-VK.renderpass2.fragment_density_map.2_views.render.non_divisible_density_size.2_samples.static_subsampled_1_2_multiviewport -dEQP-VK.renderpass2.fragment_density_map.2_views.render.non_divisible_density_size.2_samples.static_subsampled_2_1_multiviewport -dEQP-VK.renderpass2.fragment_density_map.2_views.render.non_divisible_density_size.2_samples.static_subsampled_2_2_multiviewport dEQP-VK.renderpass2.suballocation.multisample_resolve.layers_6.r8g8b8a8_snorm.samples_4_resolve_level_2 dEQP-VK.renderpass2.suballocation.multisample_resolve.r32g32b32a32_sfloat.max_attachments_8_samples_4 @@ -253,16 +245,6 @@ dEQP-VK.ubo.2_level_array.scalar.column_major_mat3.fragment dEQP-VK.ubo.3_level_array.std430.mat4x2.both_comp_access -dynamic-dEQP-VK.renderpass2.fragment_density_map.2_views.render.divisible_density_size.2_samples.static_subsampled_1_1_multiviewport -dynamic-dEQP-VK.renderpass2.fragment_density_map.2_views.render.divisible_density_size.2_samples.static_subsampled_1_2_multiviewport -dynamic-dEQP-VK.renderpass2.fragment_density_map.2_views.render.divisible_density_size.2_samples.static_subsampled_2_1_multiviewport -dynamic-dEQP-VK.renderpass2.fragment_density_map.2_views.render.divisible_density_size.2_samples.static_subsampled_2_2_multiviewport -dynamic-dEQP-VK.renderpass2.fragment_density_map.2_views.render.non_divisible_density_size.2_samples.static_subsampled_1_1_multiviewport -dynamic-dEQP-VK.renderpass2.fragment_density_map.2_views.render.non_divisible_density_size.2_samples.static_subsampled_1_2_multiviewport -dynamic-dEQP-VK.renderpass2.fragment_density_map.2_views.render.non_divisible_density_size.2_samples.static_subsampled_2_1_multiviewport -dynamic-dEQP-VK.renderpass2.fragment_density_map.2_views.render.non_divisible_density_size.2_samples.static_subsampled_2_2_multiviewport - - gmem-dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.2d.linear.remaining_array_layers.r16g16_unorm_33x128 gmem-dEQP-VK.binding_model.descriptor_buffer.embedded_imm_samplers.graphics_geom_buffers1_samplers4 diff --git a/src/freedreno/vulkan/tu_pipeline.cc b/src/freedreno/vulkan/tu_pipeline.cc index 22b1c58225b..a9dc691bfa1 100644 --- a/src/freedreno/vulkan/tu_pipeline.cc +++ b/src/freedreno/vulkan/tu_pipeline.cc @@ -2637,6 +2637,7 @@ tu6_emit_viewport_fdm(struct tu_cs *cs, struct tu_cmd_buffer *cmd, unsigned size = TU_CALLX(cmd->device, tu6_viewport_size)(cmd->device, &state.vp, &state.rs); tu_cs_begin_sub_stream(&cmd->sub_cs, size, cs); tu_create_fdm_bin_patchpoint(cmd, cs, size, fdm_apply_viewports, state); + cmd->state.rp.shared_viewport |= !cmd->state.per_view_viewport; } static const enum mesa_vk_dynamic_graphics_state tu_scissor_state[] = {