fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-05 09:38:07 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

mesa/st: release variants for active programs before unref

Browse source 
Programs can be shared among many contexts and each program holds a
variant list which has context specific variants. When context gets
destroyed it must make sure it relases all variants, otherwise remaining
context that utilizes same program will attempt to save a zombie shader
for already deleted context when releasing program and its variants.

Fixes:
   dEQP-EGL.functional.sharing.gles2.program.render

and other flaky multihread dEQP-EGL failures.

v2: pass program pointer via & (Marek)

Signed-off-by: Tapani Pälli <tapani.palli@intel.com>
Reviewed-by: Marek Olšák <marek.olsak@amd.com>
Reviewed-by: Jordan Justen <jordan.l.justen@intel.com>
Cc: mesa-stable@lists.freedesktop.org
Tested-by: Marge Bot <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4386>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4386>
This commit is contained in:
Tapani Pälli 2020-04-01 12:08:41 +03:00
parent 4822cc9700
commit 84e845c969
3 changed files with 22 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/mesa/state_tracker/st_context.c
View file

@ -1070,12 +1070,12 @@ st_destroy_context(struct st_context *st)
simple_mtx_destroy(&st->zombie_sampler_views.mutex);
simple_mtx_destroy(&st->zombie_shaders.mutex);
st_reference_prog(st, &st->fp, NULL);
st_reference_prog(st, &st->gp, NULL);
st_reference_prog(st, &st->vp, NULL);
st_reference_prog(st, &st->tcp, NULL);
st_reference_prog(st, &st->tep, NULL);
st_reference_prog(st, &st->cp, NULL);
st_release_program(st, &st->fp);
st_release_program(st, &st->gp);
st_release_program(st, &st->vp);
st_release_program(st, &st->tcp);
st_release_program(st, &st->tep);
st_release_program(st, &st->cp);
/* release framebuffer in the winsys buffers list */
LIST_FOR_EACH_ENTRY_SAFE_REV(stfb, next, &st->winsys_buffers, head) {

13
src/mesa/state_tracker/st_program.c
View file

@ -334,6 +334,19 @@ st_release_variants(struct st_context *st, struct st_program *p)
*/
}
/**
* Free all basic program variants and unref program.
*/
void
st_release_program(struct st_context *st, struct st_program **p)
{
if (!*p)
return;
st_release_variants(st, *p);
st_reference_prog(st, p, NULL);
}
void
st_finalize_nir_before_variants(struct nir_shader *nir)
{

3
src/mesa/state_tracker/st_program.h
View file

@ -317,6 +317,9 @@ st_get_common_variant(struct st_context *st,
extern void
st_release_variants(struct st_context *st, struct st_program *p);
extern void
st_release_program(struct st_context *st, struct st_program **p);
extern void
st_destroy_program_variants(struct st_context *st);