diff options
| author | Mike Blumenkrantz <michael.blumenkrantz@gmail.com> | 2021-03-22 11:39:21 -0400 |
|---|---|---|
| committer | Marge Bot <eric+marge@anholt.net> | 2021-03-30 15:12:59 +0000 |
| commit | 11926342e398b072706a9229329ec8dbd7748863 (patch) | |
| tree | c934d90bad7ea7c88342b60d70b5ce87f9b6249c | |
| parent | dc5d02ca545552e037b3b755a15bbd5a28bca65b (diff) | |
zink: also check for device lost reset on flush
if there's a reset callback available, call that instead of cycling
Reviewed-by: Dave Airlie <airlied@redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/9885>
| -rw-r--r-- | src/gallium/drivers/zink/zink_context.c | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/src/gallium/drivers/zink/zink_context.c b/src/gallium/drivers/zink/zink_context.c index 4cef7b468de..681cc2d9764 100644 --- a/src/gallium/drivers/zink/zink_context.c +++ b/src/gallium/drivers/zink/zink_context.c @@ -1381,11 +1381,16 @@ flush_batch(struct zink_context *ctx) zink_end_render_pass(ctx, batch); zink_end_batch(ctx, batch); - incr_curr_batch(ctx); + if (ctx->batch.state->is_device_lost && ctx->reset.reset) { + ctx->is_device_lost = true; + ctx->reset.reset(ctx->reset.data, PIPE_GUILTY_CONTEXT_RESET); + } else { + incr_curr_batch(ctx); - zink_start_batch(ctx, batch); - if (zink_screen(ctx->base.screen)->info.have_EXT_transform_feedback && ctx->num_so_targets) - ctx->dirty_so_targets = true; + zink_start_batch(ctx, batch); + if (zink_screen(ctx->base.screen)->info.have_EXT_transform_feedback && ctx->num_so_targets) + ctx->dirty_so_targets = true; + } } struct zink_batch * |