diff options
| author | Brian Paul <brianp@vmware.com> | 2009-05-13 10:33:21 -0600 |
|---|---|---|
| committer | Brian Paul <brianp@vmware.com> | 2009-05-13 10:33:21 -0600 |
| commit | 3039acfc5db67f3935f9c30a9f17193ab52b20a9 (patch) | |
| tree | 49c770f360234977c1098e3d0c373da31ac7576c /src/mesa/drivers/dri/intel/intel_context.c | |
| parent | 10c4a10b979bddd099287dec5b69243c2ade8ade (diff) | |
| parent | 2e4e34689022ecfcc7dc107427db90cc52a94d63 (diff) | |
Merge branch 'mesa_7_5_branch'
Conflicts:
src/mesa/main/arrayobj.c
src/mesa/main/arrayobj.h
src/mesa/main/context.c
Diffstat (limited to 'src/mesa/drivers/dri/intel/intel_context.c')
| -rw-r--r-- | src/mesa/drivers/dri/intel/intel_context.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/mesa/drivers/dri/intel/intel_context.c b/src/mesa/drivers/dri/intel/intel_context.c index 7c77a1c819..5d65e521c2 100644 --- a/src/mesa/drivers/dri/intel/intel_context.c +++ b/src/mesa/drivers/dri/intel/intel_context.c @@ -28,6 +28,7 @@ #include "main/glheader.h" #include "main/context.h" +#include "main/arrayobj.h" #include "main/extensions.h" #include "main/framebuffer.h" #include "main/imports.h" @@ -755,6 +756,8 @@ intelDestroyContext(__DRIcontextPrivate * driContextPriv) INTEL_FIREVERTICES(intel); + _mesa_delete_array_object(&intel->ctx, intel->clear.arrayObj); + intel->vtbl.destroy(intel); release_texture_heaps = (intel->ctx.Shared->RefCount == 1); |