radeonsi: don't abort for descriptor failures, let the winsys handle it
authorMarek Olšák <marek.olsak@amd.com>
Mon, 7 Aug 2023 02:05:56 +0000 (22:05 -0400)
committerMarge Bot <emma+marge@anholt.net>
Thu, 17 Aug 2023 15:34:07 +0000 (15:34 +0000)
Reviewed-by: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/24732>

src/gallium/drivers/radeonsi/si_descriptors.c

index d05746a..0edb7c1 100644 (file)
@@ -137,8 +137,8 @@ static void si_upload_descriptors(struct si_context *sctx, struct si_descriptors
                   si_optimal_tcc_alignment(sctx, upload_size), &buffer_offset,
                   (struct pipe_resource **)&desc->buffer, (void **)&ptr);
    if (!desc->buffer) {
-      fprintf(stderr, "radeonsi: not enough memory to upload descriptors\n");
-      abort();
+      sctx->ws->ctx_set_sw_reset_status(sctx->ctx, PIPE_GUILTY_CONTEXT_RESET,
+                                        "radeonsi: not enough memory to upload descriptors\n");
       return;
    }