From ca66457b0516ef8af5ef17c54460ab8d9aefc5fa Mon Sep 17 00:00:00 2001 From: Gurchetan Singh Date: Sat, 29 Dec 2018 00:07:25 +0100 Subject: virgl: don't flush an empty range Otherwise, the gl-1.0-long-dlist Piglit test crashes. Fixes: db7757 ("virgl: modify how we handle GL_MAP_FLUSH_EXPLICIT_BIT") Reported by airlied@ v2: Exit on any invalid range (Erik) Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=109190 Reviewed-by: Dave Airlie Reviewed-by: Erik Faye-Lund Tested-by: Jakob Bornecrantz --- src/gallium/drivers/virgl/virgl_buffer.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/gallium/drivers/virgl/virgl_buffer.c b/src/gallium/drivers/virgl/virgl_buffer.c index cee26da41b7..4d30c6c340e 100644 --- a/src/gallium/drivers/virgl/virgl_buffer.c +++ b/src/gallium/drivers/virgl/virgl_buffer.c @@ -83,6 +83,9 @@ static void virgl_buffer_transfer_unmap(struct pipe_context *ctx, if (trans->base.usage & PIPE_TRANSFER_WRITE) { struct virgl_screen *vs = virgl_screen(ctx->screen); if (transfer->usage & PIPE_TRANSFER_FLUSH_EXPLICIT) { + if (trans->range.end <= trans->range.start) + goto out; + transfer->box.x += trans->range.start; transfer->box.width = trans->range.end - trans->range.start; trans->offset = transfer->box.x; @@ -96,6 +99,7 @@ static void virgl_buffer_transfer_unmap(struct pipe_context *ctx, } +out: virgl_resource_destroy_transfer(vctx, trans); } -- cgit v1.2.3