pvr: Fix the isp samples per tile calculation

The samples per tile calculation was incorrect for sample count 4 and 8.

Fix:
dEQP-VK.pipeline.monolithic.multisample.std_sample_locations.draw.depth.samples_4.*
dEQP-VK.pipeline.monolithic.multisample.std_sample_locations.draw.stencil.samples_4.*

Backport-to: 26.0

Signed-off-by: Nick Hamilton <nick.hamilton@imgtec.com>
Reviewed-by: Frank Binns <frank.binns@imgtec.com>
Reviewed-by: Simon Perretta <simon.perretta@imgtec.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/39580>
This commit is contained in:
Nick Hamilton 2026-01-27 11:31:11 +00:00 committed by Marge Bot
parent c3e12429c5
commit 9f9788330e
2 changed files with 3 additions and 37 deletions

View file

@ -50,41 +50,6 @@ dEQP-VK.multiview.renderpass2.input_attachments.no_queries.8,Fail
dEQP-VK.multiview.renderpass2.input_attachments.no_queries.8_1_1_8,Fail
dEQP-VK.multiview.renderpass2.input_attachments.no_queries.max_multi_view_view_count,Fail
dEQP-VK.pipeline.monolithic.empty_fs.masked_samples,Fail
dEQP-VK.pipeline.monolithic.multisample.std_sample_locations.draw.depth.samples_4.separate_renderpass_clear_attachments_same_pattern,Fail
dEQP-VK.pipeline.monolithic.multisample.std_sample_locations.draw.depth.samples_4.separate_renderpass_clear_attachments_same_pattern_event,Fail
dEQP-VK.pipeline.monolithic.multisample.std_sample_locations.draw.depth.samples_4.separate_renderpass_clear_attachments_same_pattern_general_layout,Fail
dEQP-VK.pipeline.monolithic.multisample.std_sample_locations.draw.depth.samples_4.separate_renderpass_clear_attachments_same_pattern_secondary_cmd_buf,Fail
dEQP-VK.pipeline.monolithic.multisample.std_sample_locations.draw.depth.samples_4.separate_renderpass_clear_image_same_pattern,Fail
dEQP-VK.pipeline.monolithic.multisample.std_sample_locations.draw.depth.samples_4.separate_renderpass_clear_image_same_pattern_event,Fail
dEQP-VK.pipeline.monolithic.multisample.std_sample_locations.draw.depth.samples_4.separate_renderpass_clear_image_same_pattern_general_layout,Fail
dEQP-VK.pipeline.monolithic.multisample.std_sample_locations.draw.depth.samples_4.separate_renderpass_clear_image_same_pattern_general_layout_event,Fail
dEQP-VK.pipeline.monolithic.multisample.std_sample_locations.draw.depth.samples_4.separate_renderpass_clear_image_same_pattern_secondary_cmd_buf,Fail
dEQP-VK.pipeline.monolithic.multisample.std_sample_locations.draw.depth.samples_4.separate_renderpass_clear_image_same_pattern_secondary_cmd_buf_general_layout,Fail
dEQP-VK.pipeline.monolithic.multisample.std_sample_locations.draw.depth.samples_4.separate_renderpass_clear_image_same_pattern_secondary_cmd_buf_general_layout_event,Fail
dEQP-VK.pipeline.monolithic.multisample.std_sample_locations.draw.depth.samples_4.separate_renderpass_load_op_clear_same_pattern,Fail
dEQP-VK.pipeline.monolithic.multisample.std_sample_locations.draw.depth.samples_4.separate_renderpass_load_op_clear_same_pattern_secondary_cmd_buf_general_layout,Fail
dEQP-VK.pipeline.monolithic.multisample.std_sample_locations.draw.depth.samples_4.separate_renderpass_no_clear_same_pattern_event,Fail
dEQP-VK.pipeline.monolithic.multisample.std_sample_locations.draw.depth.samples_4.separate_subpass_clear_attachments_same_pattern,Fail
dEQP-VK.pipeline.monolithic.multisample.std_sample_locations.draw.depth.samples_4.separate_subpass_no_clear_same_pattern,Fail
dEQP-VK.pipeline.monolithic.multisample.std_sample_locations.draw.depth.samples_4.separate_subpass_no_clear_same_pattern_secondary_cmd_buf,Fail
dEQP-VK.pipeline.monolithic.multisample.std_sample_locations.draw.stencil.samples_4.same_subpass_clear_attachments_same_pattern,Fail
dEQP-VK.pipeline.monolithic.multisample.std_sample_locations.draw.stencil.samples_4.same_subpass_no_clear_same_pattern,Fail
dEQP-VK.pipeline.monolithic.multisample.std_sample_locations.draw.stencil.samples_4.separate_renderpass_clear_attachments_same_pattern,Fail
dEQP-VK.pipeline.monolithic.multisample.std_sample_locations.draw.stencil.samples_4.separate_renderpass_clear_attachments_same_pattern_event,Fail
dEQP-VK.pipeline.monolithic.multisample.std_sample_locations.draw.stencil.samples_4.separate_renderpass_clear_attachments_same_pattern_general_layout,Fail
dEQP-VK.pipeline.monolithic.multisample.std_sample_locations.draw.stencil.samples_4.separate_renderpass_clear_image_same_pattern,Fail
dEQP-VK.pipeline.monolithic.multisample.std_sample_locations.draw.stencil.samples_4.separate_renderpass_clear_image_same_pattern_event,Fail
dEQP-VK.pipeline.monolithic.multisample.std_sample_locations.draw.stencil.samples_4.separate_renderpass_clear_image_same_pattern_general_layout,Fail
dEQP-VK.pipeline.monolithic.multisample.std_sample_locations.draw.stencil.samples_4.separate_renderpass_clear_image_same_pattern_general_layout_event,Fail
dEQP-VK.pipeline.monolithic.multisample.std_sample_locations.draw.stencil.samples_4.separate_renderpass_clear_image_same_pattern_secondary_cmd_buf,Fail
dEQP-VK.pipeline.monolithic.multisample.std_sample_locations.draw.stencil.samples_4.separate_renderpass_clear_image_same_pattern_secondary_cmd_buf_general_layout,Fail
dEQP-VK.pipeline.monolithic.multisample.std_sample_locations.draw.stencil.samples_4.separate_renderpass_clear_image_same_pattern_secondary_cmd_buf_general_layout_event,Fail
dEQP-VK.pipeline.monolithic.multisample.std_sample_locations.draw.stencil.samples_4.separate_renderpass_load_op_clear_same_pattern,Fail
dEQP-VK.pipeline.monolithic.multisample.std_sample_locations.draw.stencil.samples_4.separate_renderpass_no_clear_same_pattern,Fail
dEQP-VK.pipeline.monolithic.multisample.std_sample_locations.draw.stencil.samples_4.separate_renderpass_no_clear_same_pattern_general_layout,Fail
dEQP-VK.pipeline.monolithic.multisample.std_sample_locations.draw.stencil.samples_4.separate_renderpass_no_clear_same_pattern_general_layout_event,Fail
dEQP-VK.pipeline.monolithic.multisample.std_sample_locations.draw.stencil.samples_4.separate_renderpass_no_clear_same_pattern_secondary_cmd_buf,Fail
dEQP-VK.pipeline.monolithic.multisample.std_sample_locations.draw.stencil.samples_4.separate_subpass_clear_attachments_same_pattern,Fail
dEQP-VK.pipeline.monolithic.stencil.no_stencil_att.dynamic_rendering.dynamic_enable.d24_unorm_s8_uint,Fail
dEQP-VK.pipeline.monolithic.stencil.no_stencil_att.dynamic_rendering.dynamic_enable.d32_sfloat_s8_uint,Fail
dEQP-VK.pipeline.monolithic.stencil.no_stencil_att.dynamic_rendering.static_enable.d24_unorm_s8_uint,Fail

View file

@ -92,12 +92,13 @@ rogue_get_isp_samples_per_tile_xy(const struct pvr_device_info *dev_info,
if (samples_per_pixel == 2 || samples_per_pixel == 4)
*x_out *= 2;
if (samples_per_pixel == 2)
if (samples_per_pixel == 4)
*y_out *= 2;
break;
case 8:
*y_out *= 2;
if (samples_per_pixel == 2)
*y_out *= 2;
break;
default:
assert(!"Unsupported number of samples");