Mesa (master): freedreno: use fd_bc_alloc_batch instead of fd_batch_create.

[GitLab Mirror]

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

Author: Hyunjun Ko <zzoon at igalia.com>
Date:   Wed Oct 24 10:57:15 2018 +0900

freedreno: use fd_bc_alloc_batch instead of fd_batch_create.

Following the commit 2385d7b066 and 8e798e28f7, for resource dependancy
tracking.

Fixes: dEQP-GLES31.functional.image_load_store.early_fragment_tests.no_early_fragment_tests_depth_fbo
with FD_MESA_DEBUG=inorder

Signed-off-by: Rob Clark <robdclark at gmail.com>

---

 src/gallium/drivers/freedreno/a5xx/fd5_blitter.c | 2 +-
 src/gallium/drivers/freedreno/freedreno_batch.c  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/gallium/drivers/freedreno/a5xx/fd5_blitter.c b/src/gallium/drivers/freedreno/a5xx/fd5_blitter.c
index 6e8177d344..09ff2b71ec 100644
--- a/src/gallium/drivers/freedreno/a5xx/fd5_blitter.c
+++ b/src/gallium/drivers/freedreno/a5xx/fd5_blitter.c
@@ -459,7 +459,7 @@ fd5_blitter_blit(struct fd_context *ctx, const struct pipe_blit_info *info)
 		return;
 	}
 
-	batch = fd_batch_create(ctx, true);
+	batch = fd_bc_alloc_batch(&ctx->screen->batch_cache, ctx, true);
 
 	fd5_emit_restore(batch, batch->draw);
 	fd5_emit_lrz_flush(batch->draw);
diff --git a/src/gallium/drivers/freedreno/freedreno_batch.c b/src/gallium/drivers/freedreno/freedreno_batch.c
index ff42d6c138..a46fbecf2d 100644
--- a/src/gallium/drivers/freedreno/freedreno_batch.c
+++ b/src/gallium/drivers/freedreno/freedreno_batch.c
@@ -358,7 +358,7 @@ fd_batch_flush(struct fd_batch *batch, bool sync, bool force)
 			 */
 			new_batch = NULL;
 		} else {
-			new_batch = fd_batch_create(ctx, false);
+			new_batch = fd_bc_alloc_batch(&ctx->screen->batch_cache, ctx, false);
 			util_copy_framebuffer_state(&new_batch->framebuffer, &batch->framebuffer);
 		}