diff --git a/.pick_status.json b/.pick_status.json index e9f9bb2e39a..6d772f22cb0 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -769,7 +769,7 @@ "description": "radeonsi: Report multi-plane formats as unsupported", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "master_sha": null, "because_sha": "826a10255f5f8d444f0318f3e36ff616b41b5d15" }, diff --git a/src/gallium/drivers/radeonsi/si_state.c b/src/gallium/drivers/radeonsi/si_state.c index 88e6bb7109c..7cdaf78413e 100644 --- a/src/gallium/drivers/radeonsi/si_state.c +++ b/src/gallium/drivers/radeonsi/si_state.c @@ -2169,6 +2169,9 @@ static bool si_is_format_supported(struct pipe_screen *screen, enum pipe_format !sscreen->info.has_3d_cube_border_color_mipmap) return false; + if (util_format_get_num_planes(format) >= 2) + return false; + if (MAX2(1, sample_count) < MAX2(1, storage_sample_count)) return false;