From 2984d3bf1f5e847202604c767c716b7d3d4e4568 Mon Sep 17 00:00:00 2001 From: Alyssa Rosenzweig Date: Fri, 14 May 2021 15:40:05 -0400 Subject: [PATCH] panfrost: Pass batch to panfrost_get_blend Signed-off-by: Alyssa Rosenzweig Part-of: --- src/gallium/drivers/panfrost/pan_blend_cso.c | 4 ++-- src/gallium/drivers/panfrost/pan_blend_cso.h | 2 +- src/gallium/drivers/panfrost/pan_cmdstream.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/gallium/drivers/panfrost/pan_blend_cso.c b/src/gallium/drivers/panfrost/pan_blend_cso.c index f5a6cc76131..7e20cb822d5 100644 --- a/src/gallium/drivers/panfrost/pan_blend_cso.c +++ b/src/gallium/drivers/panfrost/pan_blend_cso.c @@ -153,10 +153,10 @@ panfrost_set_blend_color(struct pipe_context *pipe, /* Create a final blend given the context */ mali_ptr -panfrost_get_blend_for_context(struct panfrost_context *ctx, unsigned rti, struct panfrost_bo **bo, unsigned *shader_offset) +panfrost_get_blend(struct panfrost_batch *batch, unsigned rti, struct panfrost_bo **bo, unsigned *shader_offset) { + struct panfrost_context *ctx = batch->ctx; struct panfrost_device *dev = pan_device(ctx->base.screen); - struct panfrost_batch *batch = panfrost_get_batch_for_fbo(ctx); struct pipe_framebuffer_state *fb = &ctx->pipe_framebuffer; enum pipe_format fmt = fb->cbufs[rti]->format; unsigned nr_samples = fb->cbufs[rti]->nr_samples ? : diff --git a/src/gallium/drivers/panfrost/pan_blend_cso.h b/src/gallium/drivers/panfrost/pan_blend_cso.h index 851782a0ece..2e1d8ec483a 100644 --- a/src/gallium/drivers/panfrost/pan_blend_cso.h +++ b/src/gallium/drivers/panfrost/pan_blend_cso.h @@ -53,6 +53,6 @@ void panfrost_blend_context_init(struct pipe_context *pipe); mali_ptr -panfrost_get_blend_for_context(struct panfrost_context *ctx, unsigned rt, struct panfrost_bo **bo, unsigned *shader_offset); +panfrost_get_blend(struct panfrost_batch *batch, unsigned rt, struct panfrost_bo **bo, unsigned *shader_offset); #endif diff --git a/src/gallium/drivers/panfrost/pan_cmdstream.c b/src/gallium/drivers/panfrost/pan_cmdstream.c index 0425091a54f..fbafa211f76 100644 --- a/src/gallium/drivers/panfrost/pan_cmdstream.c +++ b/src/gallium/drivers/panfrost/pan_cmdstream.c @@ -734,7 +734,7 @@ panfrost_emit_frag_shader_meta(struct panfrost_batch *batch) for (unsigned c = 0; c < ctx->pipe_framebuffer.nr_cbufs; ++c) { if (ctx->pipe_framebuffer.cbufs[c]) { - blend_shaders[c] = panfrost_get_blend_for_context(ctx, + blend_shaders[c] = panfrost_get_blend(batch, c, &shader_bo, &shader_offset); } }