AlexIndustrial/mesa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

panfrost: Pass batch to panfrost_get_blend

Browse Source 
Signed-off-by: Alyssa Rosenzweig <alyssa@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/10869>
This commit is contained in:
Alyssa Rosenzweig
2021-05-14 15:40:05 -04:00
committed by Marge Bot
parent b98c40ce36
commit 2984d3bf1f
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/gallium/drivers/panfrost/pan_blend_cso.c
+2 -2
View File
@@ -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 ? :
src/gallium/drivers/panfrost/pan_blend_cso.h
+1 -1
View File
@@ -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
src/gallium/drivers/panfrost/pan_cmdstream.c
+1 -1
View File
@@ -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);
}
}