panfrost: Don't leak NIR blend shaders
Right now we create shaders that are not attached to any memory
context, leading to memory leaks. Ideally, we should free the NIR
shader as soon as we've turned it into a binary, but there's no
function explicitly destroy a shader. Let's attach those to the blend
state so they get destroyed when this state is freed.
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>
diff --git a/src/gallium/drivers/panfrost/pan_blend_cso.c b/src/gallium/drivers/panfrost/pan_blend_cso.c
index 4b724e2..a334199 100644
--- a/src/gallium/drivers/panfrost/pan_blend_cso.c
+++ b/src/gallium/drivers/panfrost/pan_blend_cso.c
@@ -89,7 +89,7 @@
/* Cache miss. Build one instead, cache it, and go */
struct panfrost_blend_shader generated =
- panfrost_compile_blend_shader(ctx, &blend->base, fmt, rt);
+ panfrost_compile_blend_shader(ctx, blend, fmt, rt);
shader = mem_dup(&generated, sizeof(generated));
_mesa_hash_table_u64_insert(shaders, key, shader);
diff --git a/src/gallium/drivers/panfrost/pan_blend_shaders.c b/src/gallium/drivers/panfrost/pan_blend_shaders.c
index 8564fa0..bfaf474 100644
--- a/src/gallium/drivers/panfrost/pan_blend_shaders.c
+++ b/src/gallium/drivers/panfrost/pan_blend_shaders.c
@@ -132,7 +132,7 @@
struct panfrost_blend_shader
panfrost_compile_blend_shader(
struct panfrost_context *ctx,
- struct pipe_blend_state *cso,
+ struct panfrost_blend_state *state,
enum pipe_format format,
unsigned rt)
{
@@ -143,7 +143,7 @@
/* Build the shader */
- nir_shader *shader = nir_shader_create(NULL, MESA_SHADER_FRAGMENT, &midgard_nir_options, NULL);
+ nir_shader *shader = nir_shader_create(state, MESA_SHADER_FRAGMENT, &midgard_nir_options, NULL);
nir_function *fn = nir_function_create(shader, "main");
nir_function_impl *impl = nir_function_impl_create(fn);
@@ -201,8 +201,7 @@
/* Build a trivial blend shader */
nir_store_var(b, c_out, s_src[0], 0xFF);
- nir_lower_blend_options options =
- nir_make_options(cso, rt);
+ nir_lower_blend_options options = nir_make_options(&state->base, rt);
options.format = format;
options.src1 = s_src[1];
diff --git a/src/gallium/drivers/panfrost/pan_blend_shaders.h b/src/gallium/drivers/panfrost/pan_blend_shaders.h
index cd32376..40185cd 100644
--- a/src/gallium/drivers/panfrost/pan_blend_shaders.h
+++ b/src/gallium/drivers/panfrost/pan_blend_shaders.h
@@ -34,7 +34,7 @@
struct panfrost_blend_shader
panfrost_compile_blend_shader(
struct panfrost_context *ctx,
- struct pipe_blend_state *cso,
+ struct panfrost_blend_state *state,
enum pipe_format format,
unsigned rt);
