From 00d478d96d328516ee8de6076c84ceec4a92094b Mon Sep 17 00:00:00 2001 From: Mike Blumenkrantz Date: Tue, 15 Oct 2024 12:29:23 -0400 Subject: [PATCH] lavapipe: abort on unsupported depth copy ops better than silently failing Part-of: --- src/gallium/frontends/lavapipe/lvp_execute.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/gallium/frontends/lavapipe/lvp_execute.c b/src/gallium/frontends/lavapipe/lvp_execute.c index 52453b29bff..78af130ca1c 100644 --- a/src/gallium/frontends/lavapipe/lvp_execute.c +++ b/src/gallium/frontends/lavapipe/lvp_execute.c @@ -2203,6 +2203,7 @@ copy_depth_rect(uint8_t * dst, src, src_stride, width, height); } else { + abort(); } } else if (dst_format == PIPE_FORMAT_Z24X8_UNORM) { util_format_z24_unorm_s8_uint_unpack_z24(dst, dst_stride, @@ -2213,6 +2214,8 @@ copy_depth_rect(uint8_t * dst, util_format_z32_float_s8x24_uint_unpack_z_float((float *)dst, dst_stride, src, src_stride, width, height); + } else { + abort(); } } else if (dst_format == PIPE_FORMAT_Z32_FLOAT_S8X24_UINT) { if (src_format == PIPE_FORMAT_Z32_FLOAT) @@ -2223,15 +2226,19 @@ copy_depth_rect(uint8_t * dst, util_format_z32_float_s8x24_uint_pack_s_8uint(dst, dst_stride, src, src_stride, width, height); + else + abort(); } else if (dst_format == PIPE_FORMAT_Z24_UNORM_S8_UINT) { if (src_format == PIPE_FORMAT_S8_UINT) util_format_z24_unorm_s8_uint_pack_s_8uint(dst, dst_stride, src, src_stride, width, height); - if (src_format == PIPE_FORMAT_Z24X8_UNORM) + else if (src_format == PIPE_FORMAT_Z24X8_UNORM) util_format_z24_unorm_s8_uint_pack_z24(dst, dst_stride, src, src_stride, width, height); + else + abort(); } }