r600g: Also clear bc data when we're destroying a shader.

[airlied: remove unused vars]

Signed-off-by: Tilman Sauerbeck <tilman@code-monkey.de>
Signed-off-by: Dave Airlie <airlied@redhat.com>
This commit is contained in:
Tilman Sauerbeck
2010-10-23 13:33:22 +02:00
committed by Dave Airlie
parent ccb9be1056
commit f4a2c62af5
3 changed files with 39 additions and 1 deletions
+36
View File
@@ -871,3 +871,39 @@ int r600_bc_build(struct r600_bc *bc)
}
return 0;
}
void r600_bc_clear(struct r600_bc *bc)
{
struct r600_bc_cf *cf, *next_cf;
free(bc->bytecode);
bc->bytecode = NULL;
LIST_FOR_EACH_ENTRY_SAFE(cf, next_cf, &bc->cf, list) {
struct r600_bc_alu *alu, *next_alu;
struct r600_bc_tex *tex, *next_tex;
struct r600_bc_tex *vtx, *next_vtx;
LIST_FOR_EACH_ENTRY_SAFE(alu, next_alu, &cf->alu, list) {
free(alu);
}
LIST_INITHEAD(&cf->alu);
LIST_FOR_EACH_ENTRY_SAFE(tex, next_tex, &cf->tex, list) {
free(tex);
}
LIST_INITHEAD(&cf->tex);
LIST_FOR_EACH_ENTRY_SAFE(vtx, next_vtx, &cf->vtx, list) {
free(vtx);
}
LIST_INITHEAD(&cf->vtx);
free(cf);
}
LIST_INITHEAD(&cf->list);
}
+1
View File
@@ -185,6 +185,7 @@ int eg_bc_cf_build(struct r600_bc *bc, struct r600_bc_cf *cf);
/* r600_asm.c */
int r600_bc_init(struct r600_bc *bc, enum radeon_family family);
void r600_bc_clear(struct r600_bc *bc);
int r600_bc_add_alu(struct r600_bc *bc, const struct r600_bc_alu *alu);
int r600_bc_add_literal(struct r600_bc *bc, const u32 *value);
int r600_bc_add_vtx(struct r600_bc *bc, const struct r600_bc_vtx *vtx);
+2 -1
View File
@@ -342,10 +342,11 @@ void
r600_pipe_shader_destroy(struct pipe_context *ctx, struct r600_pipe_shader *shader)
{
struct r600_pipe_context *rctx = (struct r600_pipe_context *)ctx;
struct r600_bc_cf *cf, *next_cf;
r600_bo_reference(rctx->radeon, &shader->bo, NULL);
r600_bc_clear(&shader->shader.bc);
/* FIXME: is there more stuff to free? */
}