Module: Mesa
Branch: master
Commit: c77e0948c7583748edf5269e0ff37a34ebf887f0
URL:    
http://cgit.freedesktop.org/mesa/mesa/commit/?id=c77e0948c7583748edf5269e0ff37a34ebf887f0

Author: Rob Clark <[email protected]>
Date:   Wed Aug 29 16:04:22 2018 -0400

freedreno/batch: fix crash in !reorder case

We aren't using the batch-cache if reorder==false.

Signed-off-by: Rob Clark <[email protected]>

---

 src/gallium/drivers/freedreno/freedreno_batch.c | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/gallium/drivers/freedreno/freedreno_batch.c 
b/src/gallium/drivers/freedreno/freedreno_batch.c
index dd4b1ca9e6..36b834f401 100644
--- a/src/gallium/drivers/freedreno/freedreno_batch.c
+++ b/src/gallium/drivers/freedreno/freedreno_batch.c
@@ -352,8 +352,14 @@ fd_batch_flush(struct fd_batch *batch, bool sync, bool 
force)
 
        if (newbatch) {
                struct fd_context *ctx = batch->ctx;
-               struct fd_batch *new_batch =
-                       fd_batch_from_fb(&ctx->screen->batch_cache, ctx, 
&batch->framebuffer);
+               struct fd_batch *new_batch;
+
+               if (ctx->screen->reorder) {
+                       new_batch = fd_batch_from_fb(&ctx->screen->batch_cache,
+                                       ctx, &batch->framebuffer);
+               } else {
+                       new_batch = fd_batch_create(ctx, false);
+               }
 
                util_copy_framebuffer_state(&new_batch->framebuffer, 
&batch->framebuffer);
 

_______________________________________________
mesa-commit mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/mesa-commit

Reply via email to