fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-01-17 22:10:21 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

panfrost: Allocate blit_blend with ralloc()

Browse source 
This way we can use blend states as memory context which will help
simplify the blend shader creation/destruction logic.

Signed-off-by: Boris Brezillon <boris.brezillon@collabora.com>
Reviewed-by: Alyssa Rosenzweig <alyssa.rosenzweig@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/7066>
This commit is contained in:
Boris Brezillon 2020-10-08 10:49:12 +02:00 • committed by Marge Bot
parent 0a74a04ba5
commit 8a5b885c94
3 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/gallium/drivers/panfrost/pan_context.c
View file

@ -1608,8 +1608,9 @@ panfrost_create_context(struct pipe_screen *screen, void *priv, unsigned flags)
panfrost_batch_init(ctx);
if (!(dev->quirks & IS_BIFROST)) {
ctx->blit_blend = rzalloc(ctx, struct panfrost_blend_state);
for (unsigned c = 0; c < PIPE_MAX_COLOR_BUFS; ++c)
ctx->blit_blend.rt[c].shaders = _mesa_hash_table_u64_create(ctx);
ctx->blit_blend->rt[c].shaders = _mesa_hash_table_u64_create(ctx);
}
/* By default mask everything on */

2
src/gallium/drivers/panfrost/pan_context.h
View file

@ -178,7 +178,7 @@ struct panfrost_context {
unsigned sample_mask;
unsigned min_samples;
struct panfrost_blend_state blit_blend;
struct panfrost_blend_state *blit_blend;
};
/* Corresponds to the CSO */

3
src/gallium/drivers/panfrost/pan_job.c
View file

@ -854,7 +854,8 @@ panfrost_load_surface(struct panfrost_batch *batch, struct pipe_surface *surf, u
if (loc >= FRAG_RESULT_DATA0 && !panfrost_can_fixed_blend(rsrc->base.format)) {
struct panfrost_blend_shader *b =
panfrost_get_blend_shader(batch->ctx, &batch->ctx->blit_blend, rsrc->base.format, loc - FRAG_RESULT_DATA0);
panfrost_get_blend_shader(batch->ctx, batch->ctx->blit_blend,
rsrc->base.format, loc - FRAG_RESULT_DATA0);
struct panfrost_bo *bo = panfrost_batch_create_bo(batch, b->size,
PAN_BO_EXECUTE,