diff options
| author | Younes Manton <younes.m@gmail.com> | 2009-12-28 17:33:34 -0500 |
|---|---|---|
| committer | Younes Manton <younes.m@gmail.com> | 2009-12-28 17:59:01 -0500 |
| commit | 85dcc070719ef6a6bcf65dc4996b1733f63912d8 (patch) | |
| tree | 909e191a4b44987761756c53514cdc950ce4ea14 /src/gallium/drivers/nv40/nv40_screen.c | |
| parent | cb9214f33030e1f482d59049c239f20061d24ad8 (diff) | |
nouveau: Unreference state/buffer objects on context/screen destruction.
- unreference state objects so that buffer objects are unreferenced and
eventually destroyed
- free channel at screen's destruction
Based on Krzysztof Smiechowicz's patch.
Diffstat (limited to 'src/gallium/drivers/nv40/nv40_screen.c')
| -rw-r--r-- | src/gallium/drivers/nv40/nv40_screen.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/src/gallium/drivers/nv40/nv40_screen.c b/src/gallium/drivers/nv40/nv40_screen.c index bd13dfddd1..d01e712805 100644 --- a/src/gallium/drivers/nv40/nv40_screen.c +++ b/src/gallium/drivers/nv40/nv40_screen.c @@ -140,6 +140,12 @@ static void nv40_screen_destroy(struct pipe_screen *pscreen) { struct nv40_screen *screen = nv40_screen(pscreen); + unsigned i; + + for (i = 0; i < NV40_STATE_MAX; i++) { + if (screen->state[i]) + so_ref(NULL, &screen->state[i]); + } nouveau_resource_free(&screen->vp_exec_heap); nouveau_resource_free(&screen->vp_data_heap); @@ -147,6 +153,7 @@ nv40_screen_destroy(struct pipe_screen *pscreen) nouveau_notifier_free(&screen->query); nouveau_notifier_free(&screen->sync); nouveau_grobj_free(&screen->curie); + nv04_surface_2d_takedown(&screen->eng2d); nouveau_screen_fini(&screen->base); |