diff --git a/.pick_status.json b/.pick_status.json index 8b0b94fc726..15df425daf4 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -1144,7 +1144,7 @@ "description": "pan/texture: Correctly handle slice stride for MSAA", "nominated": true, "nomination_type": 2, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": "db20152c8a85a425dd54b27cc00961d2b5a4650f", "notes": null diff --git a/src/panfrost/lib/pan_texture.c b/src/panfrost/lib/pan_texture.c index 99df8f37de1..165ba2c768d 100644 --- a/src/panfrost/lib/pan_texture.c +++ b/src/panfrost/lib/pan_texture.c @@ -435,7 +435,7 @@ panfrost_emit_plane(const struct pan_image_view *iview, cfg.two_plane_yuv_chroma.secondary_pointer = sections[plane_index + 1].pointer; } else if (!panfrost_format_is_yuv(layout->format)) { - cfg.slice_stride = layout->nr_samples + cfg.slice_stride = layout->nr_samples > 1 ? surface_stride : panfrost_get_layer_stride(layout, level); }