From 4fa692872bf4e7ad9ecef28c81c00f53c5ed9b0d Mon Sep 17 00:00:00 2001 From: Rob Clark Date: Sun, 1 Mar 2020 14:16:59 -0800 Subject: [PATCH] freedreno: fix FD_MESA_DEBUG=inorder Fixes: 2c07e03b792 ("freedreno: allow ctx->batch to be NULL") Signed-off-by: Rob Clark Part-of: (cherry picked from commit b3efa2a4da206112f6c9b5adb2df37c2efe646e6) --- .pick_status.json | 2 +- src/gallium/drivers/freedreno/freedreno_state.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index 48d6b989a21..c8944a35687 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -103,7 +103,7 @@ "description": "freedreno: fix FD_MESA_DEBUG=inorder", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "master_sha": null, "because_sha": "2c07e03b792d57ae807a6953f0d8ff5f4bcdffd0" }, diff --git a/src/gallium/drivers/freedreno/freedreno_state.c b/src/gallium/drivers/freedreno/freedreno_state.c index 8a757ee96d4..d9c8f9f89a2 100644 --- a/src/gallium/drivers/freedreno/freedreno_state.c +++ b/src/gallium/drivers/freedreno/freedreno_state.c @@ -252,7 +252,7 @@ fd_set_framebuffer_state(struct pipe_context *pctx, } fd_batch_reference(&old_batch, NULL); - } else { + } else if (ctx->batch) { DBG("%d: cbufs[0]=%p, zsbuf=%p", ctx->batch->needs_flush, framebuffer->cbufs[0], framebuffer->zsbuf); fd_batch_flush(ctx->batch);