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

radeonsi: properly destroy the GS copy shader and scratch_bo for compute

Browse source 
Cc: 10.2 10.3 <mesa-stable@lists.freedesktop.org>
Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
(cherry picked from commit dc05a9e4e0)
[Emil Velikov: remove unref scratch_bo, s/si_shader/si_pipe_shader/]
Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
This commit is contained in:
Marek Olšák 2014-09-18 23:48:04 +02:00 • committed by Emil Velikov
parent 4748d2f065
commit 8e2d0f59f7
2 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/gallium/drivers/radeonsi/si_shader.c
View file

@ -2894,5 +2894,9 @@ out:
void si_pipe_shader_destroy(struct pipe_context *ctx, struct si_pipe_shader *shader)
{
if (shader->gs_copy_shader)
si_pipe_shader_destroy(ctx, shader->gs_copy_shader);
r600_resource_reference(&shader->bo, NULL);
r600_resource_reference(&shader->scratch_bo, NULL);
}

7
src/gallium/drivers/radeonsi/si_state.c
View file

@ -2316,9 +2316,10 @@ static void si_delete_shader_selector(struct pipe_context *ctx,
while (p) {
c = p->next_variant;
if (sel->type == PIPE_SHADER_GEOMETRY)
if (sel->type == PIPE_SHADER_GEOMETRY) {
si_pm4_delete_state(sctx, gs, p->pm4);
else if (sel->type == PIPE_SHADER_FRAGMENT)
si_pm4_delete_state(sctx, vs, p->gs_copy_shader->pm4);
} else if (sel->type == PIPE_SHADER_FRAGMENT)
si_pm4_delete_state(sctx, ps, p->pm4);
else if (p->key.vs.as_es)
si_pm4_delete_state(sctx, es, p->pm4);
@ -2331,7 +2332,7 @@ static void si_delete_shader_selector(struct pipe_context *ctx,
free(sel->tokens);
free(sel);
}
}
static void si_delete_vs_shader(struct pipe_context *ctx, void *state)
{